Revert "Work around MOC ignoring -D options by having dummy stubs"

This has been fixed in our cmake module, workaround no longer needed.

This reverts commit 4e80050d6bf8ef944dd5af2be8f24ea8e8eec0b2.

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index b75af1b..35dd1f5 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -675,11 +675,6 @@ void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
   // qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
 }
 
   // qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
 }
 

-#else /* HAVE_DBUS */
-
-void MainWin::desktopNotificationClosed(uint, uint) {}
-void MainWin::desktopNotificationInvoked(uint, const QString &) {}
-

 #endif /* HAVE_DBUS */
 
 void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {
 #endif /* HAVE_DBUS */
 
 void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 7373541..b2ea75a 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -107,8 +107,10 @@ class MainWin : public QMainWindow {
     void loadLayout();
     void saveLayout();
 
     void loadLayout();
     void saveLayout();
 

+#ifdef HAVE_DBUS

     void desktopNotificationClosed(uint id, uint reason);
     void desktopNotificationInvoked(uint id, const QString & action);
     void desktopNotificationClosed(uint id, uint reason);
     void desktopNotificationInvoked(uint id, const QString & action);

+#endif

 
   signals:
     void connectToCore(const QVariantMap &connInfo);
 
   signals:
     void connectToCore(const QVariantMap &connInfo);