From b9e178a9ee6660ed0530d0b75a34b1a1e842b9e9 Mon Sep 17 00:00:00 2001 From: Adam Potolsky Date: Sat, 14 Feb 2015 19:22:08 -0800 Subject: [PATCH] Fixed compiler warning on non-windows systems. --- src/gui/src/MainWindow.cpp | 6 ++++-- src/gui/src/MainWindow.h | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 2f652a5c..b5b0ce11 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -997,9 +997,9 @@ void MainWindow::on_m_pButtonApply_clicked() startSynergy(); } +#if defined(Q_OS_WIN) bool MainWindow::isServiceRunning(QString name) { -#if defined(Q_OS_WIN) SC_HANDLE hSCManager; hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (hSCManager == NULL) { @@ -1029,6 +1029,9 @@ bool MainWindow::isServiceRunning(QString name) return true; } } +#else +bool MainWindow::isServiceRunning() +{ #endif return false; } @@ -1066,7 +1069,6 @@ void MainWindow::downloadBonjour() return; } - if (m_pDataDownloader == NULL) { m_pDataDownloader = new DataDownloader(this); connect(m_pDataDownloader, SIGNAL(isComplete()), SLOT(installBonjour())); diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 79afecd2..c57fa1cd 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -156,7 +156,11 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase void stopDesktop(); void changeEvent(QEvent* event); void retranslateMenuBar(); +#if defined(Q_OS_WIN) bool isServiceRunning(QString name); +#else + bool isServiceRunning(); +#endif bool isBonjourRunning(); void downloadBonjour(); void promptAutoConfig();