X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=fc4dfccbeaa470467be30c277092cb201c46aacb;hp=46ae4849d262e242aaa45d970c11fe88efd00518;hb=1cad7d10240a398c11af0043720d675e631f016f;hpb=4046593abc81847b9c78c9bc02f5bdc949aace5d

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 46ae4849..fc4dfccb 100644
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -26,11 +26,11 @@
 
 Message::Message(BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
   : _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
-  _timeStamp = QDateTime::currentDateTime().toUTC();
+  _timestamp = QDateTime::currentDateTime().toUTC();
 }
 
 Message::Message(QDateTime __ts, BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
-  : _timeStamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
+  : _timestamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
 
 }
 
@@ -62,8 +62,8 @@ quint8 Message::flags() const {
    return _flags;
 }
 
-QDateTime Message::timeStamp() const {
-  return _timeStamp;
+QDateTime Message::timestamp() const {
+  return _timestamp;
 }
 
 QString Message::mircToInternal(QString mirc) {
@@ -118,7 +118,7 @@ void Message::format() {
   QString networkName = buffer().network();
   QString bufferName = buffer().buffer();
 
-  _formattedTimeStamp = tr("%DT[%1]").arg(timeStamp().toLocalTime().toString("hh:mm:ss"));
+  _formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
 
   QString s, t;
   switch(type()) {
@@ -169,9 +169,9 @@ void Message::format() {
   _formattedText = t;
 }
 
-QString Message::formattedTimeStamp() {
+QString Message::formattedTimestamp() {
   format();
-  return _formattedTimeStamp;
+  return _formattedTimestamp;
 }
 
 QString Message::formattedSender() {
@@ -193,7 +193,7 @@ QString Message::formattedToHtml(const QString &f) {
 */
 
 QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  out << (quint32)msg.timeStamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
+  out << (quint32)msg.timestamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
       << msg.buffer() << msg.sender().toUtf8() << msg.text().toUtf8();
   return out;
 }
@@ -207,7 +207,7 @@ QDataStream &operator>>(QDataStream &in, Message &msg) {
   msg._type = (Message::Type)t;
   msg._flags = (quint8)f;
   msg._buffer = buf;
-  msg._timeStamp = QDateTime::fromTime_t(ts);
+  msg._timestamp = QDateTime::fromTime_t(ts);
   msg._sender = QString::fromUtf8(s);
   msg._text = QString::fromUtf8(m);
   return in;