Separating type definitions from the miserable remains of global.*

[quassel.git] / src / common / message.h

diff --git a/src/common/message.h b/src/common/message.h
index 878acfa..4374283 100644 (file)
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -48,16 +48,18 @@ class Message {
     QString sender() const;
     Type type() const;
     quint8 flags() const;
-    QDateTime timeStamp() const;
+    QDateTime timestamp() const;
 
-    QString formattedTimeStamp();
+    QString formattedTimestamp();
     QString formattedSender();
     QString formattedText();
 
+    //static QString formattedToHtml(const QString &);
+
     void format();
 
   private:
-    QDateTime _timeStamp;
+    QDateTime _timestamp;
     MsgId _msgId;
     BufferInfo _buffer;
     QString _text;
@@ -65,7 +67,7 @@ class Message {
     Type _type;
     quint8 _flags;
 
-    QString _formattedTimeStamp, _formattedSender, _formattedText; // cache
+    QString _formattedTimestamp, _formattedSender, _formattedText; // cache
 
     /** Convert mIRC control codes to our own */
     QString mircToInternal(QString);