Fixed stranger messages in chat

Fixed compile error on msvc2010
alekseysidorov · Feb 1, 2013 · 72dc426 · 72dc426
1 parent a0e6d0b
commit 72dc426
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/api/messagemodel.cpp b/src/api/messagemodel.cpp
@@ -155,8 +155,9 @@ void MessageListModel::setClient(Client *client)
             auto longPoll = d->client.data()->longPoll();
             connect(longPoll, SIGNAL(messageFlagsReplaced(int, int, int)), SLOT(replaceMessageFlags(int, int, int)));
             connect(longPoll, SIGNAL(messageFlagsReseted(int,int,int)), SLOT(resetMessageFlags(int,int)));
-            connect(longPoll, SIGNAL(messageAdded(Vreen::Message)), SLOT(addMessage(Vreen::Message)));
         }
+        if (client)
+            client->disconnect(this);
     }
 }
 

diff --git a/src/qml/src/dialogsmodel.cpp b/src/qml/src/dialogsmodel.cpp
@@ -46,14 +46,15 @@ DialogsModel::DialogsModel(QObject *parent) :
     m_unreadCount(0)
 {
     setSortOrder(Qt::DescendingOrder);
+    connect(this, SIGNAL(clientChanged(Vreen::Client*)), SLOT(onClientChanged(Vreen::Client*)));
 }
 void DialogsModel::setUnreadCount(int count)
 {
     m_unreadCount = count;
     emit unreadCountChanged(count);
 }
 
-Vreen::Reply *DialogsModel::getDialogs(int offset, int count, int previewLength)
+Vreen::Reply *DialogsModel::getDialogs(int count, int offset, int previewLength)
 {
     if (!client()) {
         qWarning("Dialog model must have a client!");
@@ -78,6 +79,13 @@ void DialogsModel::onDialogsReceived(const QVariant &dialogs)
     }
 }
 
+void DialogsModel::onClientChanged(Vreen::Client *client)
+{
+    if (client) {
+        connect(client->longPoll(), SIGNAL(messageAdded(Vreen::Message)), SLOT(addMessage(Vreen::Message)));
+    }
+}
+
 int DialogsModel::unreadCount() const
 {
     return m_unreadCount;

diff --git a/src/qml/src/dialogsmodel.h b/src/qml/src/dialogsmodel.h
@@ -39,16 +39,16 @@ class DialogsModel : public Vreen::MessageListModel
     void setUnreadCount(int count);
     int unreadCount() const;
 public slots:
-    Vreen::Reply *getDialogs(int offset = 0, int count = 25, int previewLength = -1);
+    Vreen::Reply *getDialogs(int count = 25, int offset = 0, int previewLength = -1);
 signals:
-    void clientChanged(QObject*);
     void unreadCountChanged(int count);
 protected:
     virtual void doReplaceMessage(int index, const::Vreen::Message &message);
     virtual void doInsertMessage(int index, const::Vreen::Message &message);
     virtual void doRemoveMessage(int index);
 private slots:
     void onDialogsReceived(const QVariant &dialogs);
+    void onClientChanged(Vreen::Client *client);
 private:
     int m_unreadCount;
 };

diff --git a/src/qml/src/newsfeedmodel.cpp b/src/qml/src/newsfeedmodel.cpp
@@ -196,7 +196,7 @@ static bool newsItemMoreThan(const Vreen::NewsItem &a, const Vreen::NewsItem &b)
 
 void NewsFeedModel::onNewsRecieved(const Vreen::NewsItemList &items)
 {
-    for (auto item : items) {
+    foreach (auto item, items) {
         if (findNews(item.postId()) == -1) {
             auto index = Vreen::lowerBound(m_newsList, item, newsItemMoreThan);
             insertNews(index, item);