From 3fd6b73c4e47d458c91e491120d442fa27c3b646 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sat, 25 Nov 2017 20:15:54 +0900
Subject: [PATCH] Little fix
---
app/src/handlers/desktopthemehandler.cpp | 4 ++--
app/src/handlers/desktopthemehandler.h | 3 ---
app/src/websockets/websocketserver.cpp | 4 ----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/app/src/handlers/desktopthemehandler.cpp b/app/src/handlers/desktopthemehandler.cpp
index 20869ec..01eaa22 100644
--- a/app/src/handlers/desktopthemehandler.cpp
+++ b/app/src/handlers/desktopthemehandler.cpp
@@ -96,9 +96,9 @@ bool DesktopThemeHandler::isApplicableType(const QString &installType) const
return applicableTypes.contains(installType);
}
-#ifdef QTLIB_UNIX
bool DesktopThemeHandler::applyTheme(const QString &path, const QString &installType) const
{
+#ifdef QTLIB_UNIX
if (QFileInfo::exists(path) && isApplicableType(installType)) {
auto desktop = desktopEnvironment();
@@ -196,7 +196,7 @@ bool DesktopThemeHandler::applyTheme(const QString &path, const QString &install
}
}
}
+#endif
return false;
}
-#endif
diff --git a/app/src/handlers/desktopthemehandler.h b/app/src/handlers/desktopthemehandler.h
index 9ba1f4a..73d77f1 100644
--- a/app/src/handlers/desktopthemehandler.h
+++ b/app/src/handlers/desktopthemehandler.h
@@ -12,8 +12,5 @@ public:
public slots:
QString desktopEnvironment() const;
bool isApplicableType(const QString &installType) const;
-
-#ifdef QTLIB_UNIX
bool applyTheme(const QString &path, const QString &installType) const;
-#endif
};
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index d6931ab..85732e3 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -370,11 +370,7 @@ void WebSocketServer::receiveMessage(const QString &id, const QString &func, con
resultData.append(desktopThemeHandler_->isApplicableType(data.at(0).toString()));
}
else if (func == "DesktopThemeHandler::applyTheme") {
-#ifdef QTLIB_UNIX
resultData.append(desktopThemeHandler_->applyTheme(data.at(0).toString(), data.at(1).toString()));
-#else
- resultData.append(false);
-#endif
}
// Not supported
else {
--
GitLab