X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=6c744c2722b963a8209b21fb0e0bdf07eef9b735;hp=73e67b294fce4f7a88c2fc9a6b3c6a4096885a69;hb=3abd4b7d5ab303f8d990c104748e5d5aef4db355;hpb=ca31d8d669faaf6041d270f16b4006972f058f07 diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index 73e67b29..6c744c27 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -20,8 +20,8 @@ #include "qtuiapplication.h" -#include #include +#include #include #ifdef HAVE_KDE4 @@ -109,30 +109,6 @@ bool QtUiApplication::init() return false; } - // Checking if settings Icon Theme is valid - QString savedIcontheme = QtUiSettings().value("IconTheme", QVariant("")).toString(); -#ifndef WITH_OXYGEN - if (savedIcontheme == "oxygen") - QtUiSettings().remove("IconTheme"); -#endif -#ifndef WITH_BREEZE - if (savedIcontheme == "breeze") - QtUiSettings().remove("IconTheme"); -#endif -#ifndef WITH_BREEZE_DARK - if (savedIcontheme == "breezedark") - QtUiSettings().remove("IconTheme"); -#endif - - // Set the icon theme - if (Quassel::isOptionSet("icontheme")) - QIcon::setThemeName(Quassel::optionValue("icontheme")); - else if (QtUiSettings().value("IconTheme", QVariant("")).toString() != "") - QIcon::setThemeName(QtUiSettings().value("IconTheme").toString()); - else if (QIcon::themeName().isEmpty()) - // Some platforms don't set a default icon theme; chances are we can find our bundled theme though - QIcon::setThemeName("breeze"); - Client::init(new QtUi()); // Init UI only after the event loop has started @@ -143,7 +119,6 @@ bool QtUiApplication::init() QtUi::mainWindow()->quit(); }); - return true; } return false;