Work with destructors

psi-im · May 15, 2024 · af7c543 · af7c543
1 parent 7e60d35
commit af7c543
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/mainwin.cpp b/src/mainwin.cpp
@@ -560,6 +560,12 @@ MainWin::~MainWin()
         delete d->tray;
         d->tray = nullptr;
     }
+#ifdef USE_TASKBARNOTIFIER
+    if (d->taskBarNotifier) {
+        delete d->taskBarNotifier;
+        d->taskBarNotifier = nullptr;
+    }
+#endif
 
     saveToolbarsState();
 

diff --git a/src/widgets/taskbarnotifier.cpp b/src/widgets/taskbarnotifier.cpp
@@ -59,6 +59,7 @@ class TaskBarNotifier::Private {
     void setIconCount(uint count = 0);
     void restoreDefaultIcon();
 #ifdef USE_DBUS
+    ~Private() = default;
     void setDesktopPath(const QString &appName);
 #elif defined(Q_OS_WINDOWS)
     ~Private();
@@ -217,27 +218,24 @@ QImage TaskBarNotifier::Private::makeIconCaption(const QImage &image, const QStr
 HICON TaskBarNotifier::Private::getHICONfromQImage(const QImage &image) const
 {
     if (image.isNull())
-        return nullptr;
+        return {};
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     auto p = QPixmap::fromImage(image);
     return QtWin::toHICON(p);
 #else
     return image.toHICON();
 #endif
-    return nullptr;
+    return {};
 }
 
 void TaskBarNotifier::Private::doFlashTaskbarIcon()
 {
-    const int count = 0;
-    const int speed = 0;
-
     FLASHWINFO fi;
     fi.cbSize    = sizeof(FLASHWINFO);
     fi.hwnd      = hwnd_;
     fi.dwFlags   = (urgent_) ? FLASHW_ALL | FLASHW_TIMER : FLASHW_STOP;
-    fi.uCount    = count;
-    fi.dwTimeout = speed;
+    fi.uCount    = 0;
+    fi.dwTimeout = 0;
     FlashWindowEx(&fi);
 }
 
@@ -256,6 +254,8 @@ TaskBarNotifier::TaskBarNotifier(QWidget *parent)
 #endif
 }
 
+TaskBarNotifier::~TaskBarNotifier() = default;
+
 void TaskBarNotifier::setIconCountCaption(uint count, const QImage &icon)
 {
 #ifdef Q_OS_WINDOWS

diff --git a/src/widgets/taskbarnotifier.h b/src/widgets/taskbarnotifier.h
@@ -28,7 +28,8 @@ class QWidget;
 class TaskBarNotifier {
 public:
     explicit TaskBarNotifier(QWidget *parent = nullptr);
-    void setIconCountCaption(uint count, const QImage &icon = QImage());
+    ~TaskBarNotifier();
+    void setIconCountCaption(uint count, const QImage &icon = {});
     void removeIconCountCaption();
     bool isActive();