projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing BR #297 and #309 improved default aliases
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
b17fa28
..
f981040
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-35,6
+35,7
@@
#include "messagemodel.h"
#include "network.h"
#include "networkmodel.h"
#include "messagemodel.h"
#include "network.h"
#include "networkmodel.h"
+#include "quassel.h"
#include "quasselui.h"
#include "signalproxy.h"
#include "util.h"
#include "quasselui.h"
#include "signalproxy.h"
#include "util.h"
@@
-76,7
+77,8
@@
Client::Client(QObject *parent)
_messageModel(0),
_messageProcessor(0),
_connectedToCore(false),
_messageModel(0),
_messageProcessor(0),
_connectedToCore(false),
- _syncedToCore(false)
+ _syncedToCore(false),
+ _debugLog(&_debugLogBuffer)
{
_signalProxy->synchronize(_ircListHelper);
}
{
_signalProxy->synchronize(_ircListHelper);
}
@@
-122,6
+124,9
@@
void Client::init() {
connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore()));
connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore()));
connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore()));
connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore()));
+ // attach backlog manager
+ p->synchronize(backlogManager());
+ connect(backlogManager(), SIGNAL(messagesReceived(BufferId, int)), _messageModel, SLOT(messagesReceived(BufferId, int)));
}
/*** public static methods ***/
}
/*** public static methods ***/
@@
-274,9
+279,6
@@
void Client::setSyncedToCore() {
connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString)));
signalProxy()->synchronize(bufferSyncer());
connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString)));
signalProxy()->synchronize(bufferSyncer());
- // attach backlog manager
- signalProxy()->synchronize(backlogManager());
-
// create a new BufferViewManager
_bufferViewManager = new BufferViewManager(signalProxy(), this);
// create a new BufferViewManager
_bufferViewManager = new BufferViewManager(signalProxy(), this);
@@
-362,9
+364,9
@@
void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
//recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
}
//recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
}
-void Client::recvMessage(const Message &msg
_
) {
- Message msg
= msg_
;
- messageProcessor()->process(msg);
+void Client::recvMessage(const Message &msg) {
+ Message msg
_ = msg
;
+ messageProcessor()->process(msg
_
);
}
void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
}
void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
@@
-402,3
+404,24
@@
void Client::bufferRenamed(BufferId bufferId, const QString &newName) {
networkModel()->setData(bufferIndex, newName, Qt::DisplayRole);
}
}
networkModel()->setData(bufferIndex, newName, Qt::DisplayRole);
}
}
+
+void Client::logMessage(QtMsgType type, const char *msg) {
+ QString prefix;
+ switch (type) {
+ case QtDebugMsg:
+ prefix = "Debug";
+ break;
+ case QtWarningMsg:
+ prefix = "Warning";
+ break;
+ case QtCriticalMsg:
+ prefix = "Critical";
+ break;
+ case QtFatalMsg:
+ Quassel::logFatalMessage(msg);
+ return;
+ }
+ instance()->_debugLog << prefix << ": " << msg << "\n";
+ emit instance()->logUpdated();
+}
+