projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Since we're going for one grand unified model to store all the stuff
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
e78fc17
..
f42e2a4
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-118,8
+118,8
@@
BufferInfo Client::statusBufferInfo(QString net) {
return bufferInfo(net, "");
}
return bufferInfo(net, "");
}
-
BufferTreeModel *Client::buffer
Model() {
- return instance()->_
buffer
Model;
+
NetworkModel *Client::network
Model() {
+ return instance()->_
network
Model;
}
SignalProxy *Client::signalProxy() {
}
SignalProxy *Client::signalProxy() {
@@
-134,7
+134,7
@@
Client::Client(QObject *parent)
socket(0),
_signalProxy(new SignalProxy(SignalProxy::Client, this)),
mainUi(0),
socket(0),
_signalProxy(new SignalProxy(SignalProxy::Client, this)),
mainUi(0),
- _
buffer
Model(0),
+ _
network
Model(0),
connectedToCore(false)
{
}
connectedToCore(false)
{
}
@@
-146,14
+146,14
@@
Client::~Client() {
void Client::init() {
blockSize = 0;
void Client::init() {
blockSize = 0;
- _
bufferModel = new BufferTree
Model(this);
+ _
networkModel = new Network
Model(this);
connect(this, SIGNAL(bufferSelected(Buffer *)),
connect(this, SIGNAL(bufferSelected(Buffer *)),
- _
buffer
Model, SLOT(selectBuffer(Buffer *)));
+ _
network
Model, SLOT(selectBuffer(Buffer *)));
connect(this, SIGNAL(bufferUpdated(Buffer *)),
connect(this, SIGNAL(bufferUpdated(Buffer *)),
- _
buffer
Model, SLOT(bufferUpdated(Buffer *)));
+ _
network
Model, SLOT(bufferUpdated(Buffer *)));
connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
- _
buffer
Model, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+ _
network
Model, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
SignalProxy *p = signalProxy();
p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
SignalProxy *p = signalProxy();
p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
@@
-263,7
+263,7
@@
void Client::coreSocketDisconnected() {
blockSize = 0;
/* Clear internal data. Hopefully nothing relies on it at this point. */
blockSize = 0;
/* Clear internal data. Hopefully nothing relies on it at this point. */
- _
buffer
Model->clear();
+ _
network
Model->clear();
QHash<uint, Buffer *>::iterator bufferIter = _buffers.begin();
while(bufferIter != _buffers.end()) {
QHash<uint, Buffer *>::iterator bufferIter = _buffers.begin();
while(bufferIter != _buffers.end()) {
@@
-444,7
+444,7
@@
void Client::networkConnected(uint netid) {
NetworkInfo *netinfo = new NetworkInfo(netid, this);
netinfo->setProxy(signalProxy());
NetworkInfo *netinfo = new NetworkInfo(netid, this);
netinfo->setProxy(signalProxy());
-
buffer
Model()->attachNetworkInfo(netinfo);
+
network
Model()->attachNetworkInfo(netinfo);
if(!isConnected()) {
connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
if(!isConnected()) {
connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));