Qt UI: fix dock menu for Mac OS X

These slots are used only in Mac OS X. But due to bug in moc they cannot be placed in #ifdef block.
ekzobrain · Jul 12, 2013 · 24c4cbe · 24c4cbe
1 parent 0e6f14a
commit 24c4cbe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/eiskaltdcpp-qt/src/MainWindow.cpp b/eiskaltdcpp-qt/src/MainWindow.cpp
@@ -2949,6 +2949,26 @@ void MainWindow::on(dcpp::TimerManagerListener::Second, uint64_t ticks) noexcept
     emit coreUpdateStats(map);
 }
 
+void MainWindow::slotShowSpeedLimits(){
+    Notification *N = Notification::getInstance();
+    if (N)
+        N->slotShowSpeedLimits();
+}
+
+void MainWindow::slotSupressTxt(){
+    Notification *N = Notification::getInstance();
+    QAction *act = qobject_cast<QAction*>(sender());
+    if (N && act)
+        N->setSupressTxt(act->isChecked());
+}
+
+void MainWindow::slotSupressSnd(){
+    Notification *N = Notification::getInstance();
+    QAction *act = qobject_cast<QAction*>(sender());
+    if (N && act)
+        N->setSupressSnd(act->isChecked());
+}
+
 #if defined(Q_WS_MAC)
 extern void qt_mac_set_dock_menu(QMenu *menu); // Qt internal function
 
@@ -2978,25 +2998,5 @@ void MainWindow::initDockMenuBar(){
 
     qt_mac_set_dock_menu(menu);
 }
-
-void MainWindow::slotShowSpeedLimits(){
-    Notification *N = Notification::getInstance();
-    if (N)
-        N->slotShowSpeedLimits();
-}
-
-void MainWindow::slotSupressTxt(){
-    Notification *N = Notification::getInstance();
-    QAction *act = qobject_cast<QAction*>(sender());
-    if (N && act)
-        N->setSupressTxt(act->isChecked());
-}
-
-void MainWindow::slotSupressSnd(){
-    Notification *N = Notification::getInstance();
-    QAction *act = qobject_cast<QAction*>(sender());
-    if (N && act)
-        N->setSupressSnd(act->isChecked());
-}
 #endif // defined(Q_WS_MAC)
 
diff --git a/eiskaltdcpp-qt/src/MainWindow.h b/eiskaltdcpp-qt/src/MainWindow.h
@@ -242,11 +242,12 @@ friend class dcpp::Singleton<MainWindow>;
         void slotUpdateFavHubMenu();
         void slotConnectFavHub(QAction*);
 
-#if defined(Q_WS_MAC)
+        // These slots are used only in Mac OS X.
+        // But due to bug in moc they cannot be placed in #ifdef block.
         void slotShowSpeedLimits();
         void slotSupressTxt();
         void slotSupressSnd();
-#endif
+        //
 
     Q_SIGNALS:
         void coreLogMessage(const QString&);