Some small stuff, like adding semicolons to Qt macro defs in order to not

[quassel.git] / src / client / buffer.cpp

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index c8f375d..917d71a 100644 (file)
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -17,18 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include "buffer.h"
 
 #include "client.h"
-#include "buffer.h"
 #include "util.h"
 
-/*
-Buffer::Buffer(QString netname, QString bufname) {
-  Buffer(BufferId(0, netname, bufname));
-
-
-}
-*/
 
 Buffer::Buffer(BufferId bufid) {
   id = bufid;
@@ -92,7 +85,7 @@ QList<AbstractUiMsg *> Buffer::contents() const {
    return layoutedMsgs;
 }
 
-VarMap Buffer::nickList() const {
+QVariantMap Buffer::nickList() const {
    return nicks;
 }
 
@@ -145,13 +138,13 @@ void Buffer::setTopic(QString t) {
   emit bufferUpdated(this);
 }
 
-void Buffer::addNick(QString nick, VarMap props) {
+void Buffer::addNick(QString nick, QVariantMap props) {
   if(nick == ownNick()) setActive(true);
   nicks[nick] = props;
   emit nickListChanged(nicks);
 }
 
-void Buffer::updateNick(QString nick, VarMap props) {
+void Buffer::updateNick(QString nick, QVariantMap props) {
   nicks[nick] = props;
   emit nickListChanged(nicks);
 }
@@ -172,9 +165,3 @@ void Buffer::setOwnNick(QString nick) {
   _ownNick = nick;
   emit ownNickSet(nick);
 }
-
-/****************************************************************************************/
-
-
-/****************************************************************************************/
-