projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Provide join-and-switch-to methods for join/query
[quassel.git]
/
src
/
client
/
buffermodel.h
diff --git
a/src/client/buffermodel.h
b/src/client/buffermodel.h
index
d863dc9
..
dbc614d
100644
(file)
--- a/
src/client/buffermodel.h
+++ b/
src/client/buffermodel.h
@@
-23,6
+23,7
@@
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
+#include <QPair>
#include "network.h"
#include "networkmodel.h"
#include "network.h"
#include "networkmodel.h"
@@
-52,15
+53,22
@@
public slots:
void setCurrentIndex(const QModelIndex &newCurrent);
void switchToBuffer(const BufferId &bufferId);
void switchToBufferIndex(const QModelIndex &bufferIdx);
void setCurrentIndex(const QModelIndex &newCurrent);
void switchToBuffer(const BufferId &bufferId);
void switchToBufferIndex(const QModelIndex &bufferIdx);
- void switchToOrJoinBuffer(NetworkId network, const QString &bufferName);
+ void switchToOrJoinBuffer(NetworkId network, const QString &bufferName, bool isQuery = false);
+ void switchToOrStartQuery(NetworkId network, const QString &nick) {
+ switchToOrJoinBuffer(network, nick, true);
+ }
private slots:
void debug_currentChanged(QModelIndex current, QModelIndex previous);
void newNetwork(NetworkId id);
void networkConnectionChanged(Network::ConnectionState state);
private slots:
void debug_currentChanged(QModelIndex current, QModelIndex previous);
void newNetwork(NetworkId id);
void networkConnectionChanged(Network::ConnectionState state);
+ void newBuffers(const QModelIndex &parent, int start, int end);
private:
private:
+ void newBuffer(BufferId bufferId);
+
SelectionModelSynchronizer _selectionModelSynchronizer;
SelectionModelSynchronizer _selectionModelSynchronizer;
+ QPair<NetworkId, QString> _bufferToSwitchTo;
};
#endif // BUFFERMODEL_H
};
#endif // BUFFERMODEL_H