X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=843d2f225167653f6efc6d6261c0d066e801f1ac;hp=928b07bf0afcdbe28336053dc1ea5d4f65787bd2;hb=d33a73406dc7b2a41c97d169b865836f6fce4980;hpb=6853298d912ce9d4bc339187e8a53963b8ec3c41

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 928b07bf..843d2f22 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -49,7 +49,7 @@ public:
    *         Also, we _do_ rely on certain properties of these values in styleString() and friends!
    */
   enum FormatType {
-    None            = 0x00000000,
+    Base            = 0x00000000,
     Invalid         = 0xffffffff,
 
     // Message Formats (mutually exclusive!)
@@ -105,7 +105,7 @@ public:
   class StyledMessage;
 
   static FormatType formatType(Message::Type msgType);
-  static StyledString styleString(const QString &string, quint32 baseFormat = None);
+  static StyledString styleString(const QString &string, quint32 baseFormat = Base);
   static QString mircToInternal(const QString &);
   static inline QString timestampFormatString() { return _timestampFormatString; }
 
@@ -153,8 +153,6 @@ public:
   QString decoratedSender() const;
   const QString &plainContents() const;
 
-  inline FormatType timestampFormat() const { return UiStyle::Timestamp; }
-  FormatType senderFormat() const;
   const FormatList &contentsFormatList() const;
 
   quint8 senderHash() const;