Making Quassel slowly ready for its first release...

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

diff --git a/src/common/message.h b/src/common/message.h
index 68047db..98379a2 100644 (file)
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -21,12 +21,11 @@
 #ifndef _MESSAGE_H_
 #define _MESSAGE_H_
 
-#include <QCoreApplication>
 #include <QString>
 #include <QDateTime>
 
 #include "bufferinfo.h"
-#include "global.h"
+#include "types.h"
 
 class Message {
   Q_DECLARE_TR_FUNCTIONS(Message);
@@ -48,9 +47,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 +58,7 @@ class Message {
     void format();
 
   private:
-    QDateTime _timeStamp;
+    QDateTime _timestamp;
     MsgId _msgId;
     BufferInfo _buffer;
     QString _text;
@@ -67,7 +66,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);