X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=4e1bd775d992c480cca818a156d6c02590c8841d;hb=b795a7b7b42ab546b1a6db2cba6091f5c3aa91fc;hp=141ff335069b24138747e8d8a197bab735814ba7;hpb=1566f62849f9011656d9111b99f023d694bb8805;p=quassel.git

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 141ff335..4e1bd775 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -24,9 +24,6 @@
 #include "uisettings.h"
 #include "util.h"
 
-// FIXME remove with migration code
-#include <QSettings>
-
 UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // register FormatList if that hasn't happened yet
   // FIXME I don't think this actually avoids double registration... then again... does it hurt?
@@ -36,24 +33,6 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
     Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
   }
 
-  // FIXME remove migration at some point
-  // We remove old settings if we find them, since they conflict
-#ifdef Q_WS_MAC
-  QSettings mys(QCoreApplication::organizationDomain(), Quassel::buildInfo().clientApplicationName);
-#else
-  QSettings mys(QCoreApplication::organizationName(), Quassel::buildInfo().clientApplicationName);
-#endif
-  mys.beginGroup("QtUi");
-  if(mys.childGroups().contains("Colors")) {
-    qDebug() << "Removing obsolete UiStyle settings!";
-    mys.endGroup();
-    mys.remove("Ui");
-    mys.remove("QtUiStyle");
-    mys.remove("QtUiStyleNew");
-    mys.remove("QtUi/Colors");
-    mys.sync();
-  }
-
   _defaultFont = QFont("Monospace", QApplication::font().pointSize());
 
   // Default format
@@ -318,7 +297,7 @@ UiStyle::StyledMessage::StyledMessage(const Message &msg)
 {
 }
 
-void UiStyle::StyledMessage::style(UiStyle *style) {
+void UiStyle::StyledMessage::style(UiStyle *style) const {
   QString user = userFromMask(sender());
   QString host = hostFromMask(sender());
   QString nick = nickFromMask(sender());
@@ -442,6 +421,7 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
   }
 }
 
+
 /***********************************************************************************/
 
 QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) {