X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=43f248a23529be81851f4a57c9cf67a2a1aba753;hp=426b398e65557a8d8880c212c91738c958cf3e91;hb=7fcfb895c67d3769e985905cbc0bc885f5e52b56;hpb=dbdca302fc349d0e3d46aa0d8091c08b2df28af5

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 426b398e..43f248a2 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -21,10 +21,6 @@
 #ifndef _UISTYLE_H_
 #define _UISTYLE_H_
 
-#ifndef SPUTDEV
-# include "old-uistyle.h"
-#else
-
 #include <QDataStream>
 #include <QTextCharFormat>
 #include <QTextLayout>
@@ -40,7 +36,7 @@ class UiStyle {
     UiStyle(const QString &settingsKey);
     virtual ~UiStyle();
 
-    typedef QList<QPair<int, quint32> > FormatList;
+    typedef QList<QPair<quint16, quint32> > FormatList;
 
     //! This enumerates the possible formats a text element may have. */
     /** These formats are ordered on increasing importance, in cases where a given property is specified
@@ -161,5 +157,4 @@ QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList);
 
 Q_DECLARE_METATYPE(UiStyle::FormatList);
 
-#endif // SPUTDEV
 #endif