Prevent ChatView from scrolling up 1px on buffer switch, fixes #544

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

diff --git a/src/common/identity.h b/src/common/identity.h
index a71e0ee..3e9a560 100644 (file)
--- a/src/common/identity.h
+++ b/src/common/identity.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  *
@@ -60,8 +60,8 @@ public:
 
   void setToDefaults();
 
-  bool operator==(const Identity &other);
-  bool operator!=(const Identity &other);
+  bool operator==(const Identity &other) const;
+  bool operator!=(const Identity &other) const;
 
   inline bool isValid() const { return id().isValid(); }
 
@@ -106,7 +106,7 @@ public slots:
   void setPartReason(const QString &reason);
   void setQuitReason(const QString &reason);
 
-  void update(const Identity &other);
+  void copyFrom(const Identity &other);
 
 signals:
   void idSet(IdentityId id);
@@ -147,6 +147,8 @@ private:
   QString _ident, _kickReason, _partReason, _quitReason;
 
   void init();
+  QString defaultNick();
+  QString defaultRealName();
 
   friend QDataStream &operator>>(QDataStream &in, Identity &identity);
 };