projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make UTF-8 the default encoding for QString and tr()
[quassel.git]
/
src
/
common
/
internalpeer.cpp
diff --git
a/src/common/internalpeer.cpp
b/src/common/internalpeer.cpp
index
15e67ed
..
1400839
100644
(file)
--- a/
src/common/internalpeer.cpp
+++ b/
src/common/internalpeer.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-37,7
+37,7
@@
public:
InternalPeer::InternalPeer(QObject *parent)
InternalPeer::InternalPeer(QObject *parent)
- :
SignalProxy::AbstractPeer(
parent),
+ :
Peer(0,
parent),
_proxy(0),
_peer(0),
_isOpen(true)
_proxy(0),
_peer(0),
_isOpen(true)
@@
-91,6
+91,12
@@
int InternalPeer::lag() const
}
}
+::SignalProxy *InternalPeer::signalProxy() const
+{
+ return _proxy;
+}
+
+
void InternalPeer::setSignalProxy(::SignalProxy *proxy)
{
if (!proxy && _proxy) {
void InternalPeer::setSignalProxy(::SignalProxy *proxy)
{
if (!proxy && _proxy) {
@@
-172,18
+178,6
@@
void InternalPeer::dispatch(EventType eventType, const T &msg)
}
}
-template<class T>
-void InternalPeer::handle(const T &msg)
-{
- if (!_proxy) {
- qWarning() << Q_FUNC_INFO << "Cannot handle a message without having a signal proxy set!";
- return;
- }
-
- _proxy->handle(this, msg);
-}
-
-
void InternalPeer::customEvent(QEvent *event)
{
switch ((int)event->type()) {
void InternalPeer::customEvent(QEvent *event)
{
switch ((int)event->type()) {