From 28f2fcf4e38d30c4bdb3fcf141a7f42e9a16019f Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 2 Aug 2018 17:12:06 +0200 Subject: Revert "[shared/server] define preferred styles and enable it if supported" Pointless code!? Makes theme look ugly with Qt5 at least with no apparent advantage whatsoever. This reverts commit 7cf83493fdaca88fd3dbc736d5ca9d86dd7f9e83. --- src/server/main.cpp | 10 ---------- src/shared/settings.h | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/server/main.cpp b/src/server/main.cpp index 769fedb..f804c1a 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -1,7 +1,6 @@ #include #include #include "mainwindow/mainwindow.h" -#include "../shared/settings.h" #include "serverapp/serverapp.h" using std::cout; @@ -36,14 +35,5 @@ int main(int argc, char** argv) } } - QStringList supportedStyles = QStyleFactory::keys(); - for (QString style : PREFERRED_STYLES) { - if (supportedStyles.contains(style)) { - qDebug() << "Setting style to: " << style; - app.setStyle(style); - break; - } - } - return app.exec(); } diff --git a/src/shared/settings.h b/src/shared/settings.h index 7b1fc3c..2713693 100644 --- a/src/shared/settings.h +++ b/src/shared/settings.h @@ -2,12 +2,11 @@ #define _SETTINGS_H_ #include -#include #define CLIENT_PORT 5194 static const QString CLIENT_PORT_STR(QString::number(CLIENT_PORT)); static const QByteArray CLIENT_PORT_ARRAY(QString::number(CLIENT_PORT).toUtf8()); -static const QStringList PREFERRED_STYLES(QStringList() << "GTK+" << "Motif" << "Plastique" << "Windows"); + #define SERVICE_DISCOVERY_PORT 3492 #define PING_TIMEOUT_MS 30000 -- cgit v1.2.3-55-g7522