Storing format length as quint16 rather than int.

[quassel.git] / src / uisupport / uistyle.h

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index ce0735c..43f248a 100644 (file)
--- 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
@@ -121,14 +117,14 @@ class UiStyle {
     };
 
     struct StyledString {
-      QString text;
-      FormatList formats;  // starting pos, ftypes
+      QString plainText;
+      FormatList formatList;  // starting pos, ftypes
     };
 
     struct StyledMessage {
       StyledString timestamp;
       StyledString sender;
-      StyledString text;
+      StyledString contents;
     };
 
     StyledString styleString(const QString &);
@@ -161,5 +157,4 @@ QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList);
 
 Q_DECLARE_METATYPE(UiStyle::FormatList);
 
-#endif // SPUTDEV
 #endif