fixes #513 - crash when connection fails

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

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index f2f84ff..ed0e945 100644 (file)
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _IRCUSER_H_
-#define _IRCUSER_H_
+#ifndef IRCUSER_H
+#define IRCUSER_H
 
 #include <QSet>
 #include <QString>
@@ -28,9 +28,9 @@
 #include <QDateTime>
 
 #include "syncableobject.h"
-#include "network.h"
 
 class SignalProxy;
+class Network;
 class IrcChannel;
 
 class IrcUser : public SyncableObject {
@@ -57,13 +57,13 @@ public:
   IrcUser(const QString &hostmask, Network *network);
   virtual ~IrcUser();
 
-  inline QString user() const { return network()->decodeServerString(_user); }
-  inline QString host() const { return network()->decodeServerString(_host); }
-  inline QString nick() const { return network()->decodeServerString(_nick); }
-  inline QString realName() const { return network()->decodeServerString(_realName); }
+  inline QString user() const { return _user; }
+  inline QString host() const { return _host; }
+  inline QString nick() const { return _nick; }
+  inline QString realName() const { return _realName; }
   QString hostmask() const;
   inline bool isAway() const { return _away; }
-  inline QString awayMessage() const { return network()->decodeServerString(_awayMessage); }
+  inline QString awayMessage() const { return _awayMessage; }
   QDateTime idleTime();
   inline QDateTime loginTime() const { return _loginTime; }
   inline QString server() const { return _server; }
@@ -110,6 +110,7 @@ public slots:
   void joinChannel(const QString &channelname);
   void partChannel(IrcChannel *channel);
   void partChannel(const QString &channelname);
+  void quit();
 
   void addUserModes(const QString &modes);
   void removeUserModes(const QString &modes);
@@ -134,6 +135,7 @@ signals:
 
   // void channelJoined(QString channel);
   void channelParted(QString channel);
+  void quited();
 
   void userModesAdded(QString modes);
   void userModesRemoved(QString modes);
@@ -153,11 +155,11 @@ private:
 
   bool _initialized;
 
-  QByteArray _nick;
-  QByteArray _user;
-  QByteArray _host;
-  QByteArray _realName;
-  QByteArray _awayMessage;
+  QString _nick;
+  QString _user;
+  QString _host;
+  QString _realName;
+  QString _awayMessage;
   bool _away;
   QString _server;
   QDateTime _idleTime;