projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
As preparation for revamping the whole networking stuff, I did two renames:
[quassel.git]
/
src
/
common
/
ircchannel.cpp
diff --git
a/src/common/ircchannel.cpp
b/src/common/ircchannel.cpp
index
ffba36d
..
12f70c2
100644
(file)
--- a/
src/common/ircchannel.cpp
+++ b/
src/common/ircchannel.cpp
@@
-20,7
+20,7
@@
#include "ircchannel.h"
#include "ircchannel.h"
-#include "network
info
.h"
+#include "network.h"
//#include "nicktreemodel.h"
#include "signalproxy.h"
#include "ircuser.h"
//#include "nicktreemodel.h"
#include "signalproxy.h"
#include "ircuser.h"
@@
-33,14
+33,14
@@
#include <QDebug>
#include <QDebug>
-IrcChannel::IrcChannel(const QString &channelname, Network
Info *networkinfo
)
- : SyncableObject(network
info
),
+IrcChannel::IrcChannel(const QString &channelname, Network
*network
)
+ : SyncableObject(network),
_initialized(false),
_name(channelname),
_topic(QString()),
_initialized(false),
_name(channelname),
_topic(QString()),
- network
Info(networkinfo
)
+ network
(network
)
{
{
- setObjectName(QString::number(network
Info
->networkId()) + "/" + channelname);
+ setObjectName(QString::number(network->networkId()) + "/" + channelname);
}
IrcChannel::~IrcChannel() {
}
IrcChannel::~IrcChannel() {
@@
-97,7
+97,7
@@
QString IrcChannel::userModes(IrcUser *ircuser) const {
}
QString IrcChannel::userModes(const QString &nick) const {
}
QString IrcChannel::userModes(const QString &nick) const {
- return userModes(network
Info
->ircUser(nick));
+ return userModes(network->ircUser(nick));
}
QTextCodec *IrcChannel::codecForEncoding() const {
}
QTextCodec *IrcChannel::codecForEncoding() const {
@@
-125,7
+125,7
@@
void IrcChannel::setCodecForDecoding(QTextCodec *codec) {
}
QString IrcChannel::decodeString(const QByteArray &text) const {
}
QString IrcChannel::decodeString(const QByteArray &text) const {
- if(!codecForDecoding()) return network
Info
->decodeString(text);
+ if(!codecForDecoding()) return network->decodeString(text);
return ::decodeString(text, _codecForDecoding);
}
return ::decodeString(text, _codecForDecoding);
}
@@
-133,7
+133,7
@@
QByteArray IrcChannel::encodeString(const QString string) const {
if(codecForEncoding()) {
return _codecForEncoding->fromUnicode(string);
}
if(codecForEncoding()) {
return _codecForEncoding->fromUnicode(string);
}
- return network
Info
->encodeString(string);
+ return network->encodeString(string);
}
// ====================
}
// ====================
@@
-158,7
+158,7
@@
void IrcChannel::join(IrcUser *ircuser) {
}
void IrcChannel::join(const QString &nick) {
}
void IrcChannel::join(const QString &nick) {
- join(network
Info
->ircUser(nick));
+ join(network->ircUser(nick));
}
void IrcChannel::part(IrcUser *ircuser) {
}
void IrcChannel::part(IrcUser *ircuser) {
@@
-173,7
+173,7
@@
void IrcChannel::part(IrcUser *ircuser) {
}
void IrcChannel::part(const QString &nick) {
}
void IrcChannel::part(const QString &nick) {
- part(network
Info
->ircUser(nick));
+ part(network->ircUser(nick));
}
// SET USER MODE
}
// SET USER MODE
@@
-186,7
+186,7
@@
void IrcChannel::setUserModes(IrcUser *ircuser, const QString &modes) {
}
void IrcChannel::setUserModes(const QString &nick, const QString &modes) {
}
void IrcChannel::setUserModes(const QString &nick, const QString &modes) {
- setUserModes(network
Info
->ircUser(nick), modes);
+ setUserModes(network->ircUser(nick), modes);
}
// ADD USER MODE
}
// ADD USER MODE
@@
-203,7
+203,7
@@
void IrcChannel::addUserMode(IrcUser *ircuser, const QString &mode) {
}
void IrcChannel::addUserMode(const QString &nick, const QString &mode) {
}
void IrcChannel::addUserMode(const QString &nick, const QString &mode) {
- addUserMode(network
Info
->ircUser(nick), mode);
+ addUserMode(network->ircUser(nick), mode);
}
// REMOVE USER MODE
}
// REMOVE USER MODE
@@
-220,7
+220,7
@@
void IrcChannel::removeUserMode(IrcUser *ircuser, const QString &mode) {
}
void IrcChannel::removeUserMode(const QString &nick, const QString &mode) {
}
void IrcChannel::removeUserMode(const QString &nick, const QString &mode) {
- removeUserMode(network
Info
->ircUser(nick), mode);
+ removeUserMode(network->ircUser(nick), mode);
}
// INIT SET USER MODES
}
// INIT SET USER MODES