X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=43742839d6e36380f3fc090072a3b79d612b85e8;hb=924e2c01204da172a071d34485936b379372e497;hp=68047db5c993876fb2c5f1761e282fe71e9326e6;hpb=52380175425bdab29f825c9cd17a0e4c1952c2db;p=quassel.git

diff --git a/src/common/message.h b/src/common/message.h
index 68047db5..43742839 100644
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -48,9 +48,9 @@ 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();
 
@@ -59,7 +59,7 @@ class Message {
     void format();
 
   private:
-    QDateTime _timeStamp;
+    QDateTime _timestamp;
     MsgId _msgId;
     BufferInfo _buffer;
     QString _text;
@@ -67,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);