X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientbacklogmanager.h;h=aa58a4df43051abd291f8a45e1dae9078e9e2bd2;hp=e0bcfa30ce82c25fea762d398807c42b92e0c811;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/client/clientbacklogmanager.h b/src/client/clientbacklogmanager.h
index e0bcfa30..aa58a4df 100644
--- a/src/client/clientbacklogmanager.h
+++ b/src/client/clientbacklogmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,45 +15,61 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef CLIENTBACKLOGMANAGER_H
-#define CLIENTBACKLOGMANAGER_H
+#pragma once
+
+#include "client-export.h"
 
 #include "backlogmanager.h"
 #include "message.h"
 
 class BacklogRequester;
 
-class ClientBacklogManager : public BacklogManager {
-  Q_OBJECT
+class CLIENT_EXPORT ClientBacklogManager : public BacklogManager
+{
+    Q_OBJECT
 
 public:
-  ClientBacklogManager(QObject *parent = 0);
+    ClientBacklogManager(QObject *parent = nullptr);
 
-  // helper for the backlogRequester, as it isn't a QObject and can't emit itself
-  inline void emitMessagesRequested(const QString &msg) const { emit messagesRequested(msg); }
+    // helper for the backlogRequester, as it isn't a QObject and can't emit itself
+    inline void emitMessagesRequested(const QString &msg) const { emit messagesRequested(msg); }
 
-  void reset();
+    void reset();
 
 public slots:
-  virtual void receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs);
-  virtual void receiveBacklogAll(MsgId first, MsgId last, int limit, int additional, QVariantList msgs);
-  void requestInitialBacklog();
+    QVariantList requestBacklog(BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0) override;
+    void receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs) override;
+    void receiveBacklogAll(MsgId first, MsgId last, int limit, int additional, QVariantList msgs) override;
+
+    void requestInitialBacklog();
+
+    void checkForBacklog(BufferId bufferId);
+    void checkForBacklog(const BufferIdList &bufferIds);
 
 signals:
-  void messagesReceived(BufferId bufferId, int count) const;
-  void messagesRequested(const QString &) const;
-  void messagesProcessed(const QString &) const;
+    void messagesReceived(BufferId bufferId, int count) const;
+    void messagesRequested(const QString &) const;
+    void messagesProcessed(const QString &) const;
+
+    void updateProgress(int, int);
 
 private:
-  bool isBuffering();
-  void stopBuffering();
+    bool isBuffering();
+    BufferIdList filterNewBufferIds(const BufferIdList &bufferIds);
 
-  void dispatchMessages(const MessageList &messages, bool sort = false);
+    void dispatchMessages(const MessageList &messages, bool sort = false);
 
-  BacklogRequester *_requester;
+    BacklogRequester *_requester{nullptr};
+    bool _initBacklogRequested{false};
+    QSet<BufferId> _buffersRequested;
 };
 
-#endif // CLIENTBACKLOGMANAGER_H
+
+// inlines
+inline void ClientBacklogManager::checkForBacklog(BufferId bufferId)
+{
+    checkForBacklog(BufferIdList() << bufferId);
+}