From ad044fbc9375793886b4a8b0a80286109bc00d7b Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Wed, 14 Jun 2017 01:02:43 +0200 Subject: [PATCH] Modify classes to be QObjects --- src/capture/buttonhandler.cpp | 8 ++++++-- src/capture/buttonhandler.h | 8 +++++--- src/capture/capturewidget.cpp | 7 +++---- src/capture/screenshot.cpp | 5 ++++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/capture/buttonhandler.cpp b/src/capture/buttonhandler.cpp index 744939b6..e63b72d6 100644 --- a/src/capture/buttonhandler.cpp +++ b/src/capture/buttonhandler.cpp @@ -25,14 +25,18 @@ namespace { const int SEPARATION = 6; } -ButtonHandler::ButtonHandler(const QVector &v) { +ButtonHandler::ButtonHandler(const QVector &v, QObject *parent) : + QObject(parent) +{ if (!v.isEmpty()) { m_distance = v[0]->getButtonBaseSize() + SEPARATION; m_vectorButtons = v; } } -ButtonHandler::ButtonHandler() { +ButtonHandler::ButtonHandler(QObject *parent) : + QObject(parent) +{ } void ButtonHandler::hide() { diff --git a/src/capture/buttonhandler.h b/src/capture/buttonhandler.h index e6be2bc9..cae6a59f 100644 --- a/src/capture/buttonhandler.h +++ b/src/capture/buttonhandler.h @@ -20,15 +20,17 @@ #include "button.h" #include +#include class Button; class QRect; class QPoint; -class ButtonHandler { +class ButtonHandler : public QObject { + Q_OBJECT public: - ButtonHandler(const QVector&); - ButtonHandler(); + ButtonHandler(const QVector&, QObject *parent = 0); + ButtonHandler(QObject *parent = 0); void hide(); void show(); diff --git a/src/capture/capturewidget.cpp b/src/capture/capturewidget.cpp index 18cb7b33..27715e79 100644 --- a/src/capture/capturewidget.cpp +++ b/src/capture/capturewidget.cpp @@ -83,7 +83,7 @@ CaptureWidget::CaptureWidget(QWidget *parent) : setCursor(Qt::CrossCursor); initShortcuts(); // create buttons - m_buttonHandler = new ButtonHandler(); + m_buttonHandler = new ButtonHandler(this); redefineButtons(); m_buttonHandler->hide(); // init screenshot @@ -99,8 +99,7 @@ CaptureWidget::CaptureWidget(QWidget *parent) : } CaptureWidget::~CaptureWidget() { - delete(m_buttonHandler); - delete(m_screenshot); + } // redefineButtons retrieves the buttons configured to be shown with the @@ -530,7 +529,7 @@ void CaptureWidget::createCapture() { close(); return; } - m_screenshot = new Screenshot(screen->grabWindow(0)); + m_screenshot = new Screenshot(screen->grabWindow(0), this); } void CaptureWidget::initShortcuts() { diff --git a/src/capture/screenshot.cpp b/src/capture/screenshot.cpp index 340e2f0f..c1b625c9 100644 --- a/src/capture/screenshot.cpp +++ b/src/capture/screenshot.cpp @@ -37,7 +37,10 @@ Screenshot::Screenshot(const QPixmap &p, QObject *parent) : QObject(parent), m_baseScreenshot(p), - m_modifiedScreenshot(p) {} + m_modifiedScreenshot(p) +{ + +} Screenshot::~Screenshot() { }