projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made the signalproxy compile with MSVC
[quassel.git]
/
src
/
common
/
ircchannel.h
diff --git
a/src/common/ircchannel.h
b/src/common/ircchannel.h
index
a499b24
..
d970814
100644
(file)
--- a/
src/common/ircchannel.h
+++ b/
src/common/ircchannel.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005/06 by the Quassel
IRC Team
*
+ * Copyright (C) 2005/06 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 *
@@
-26,25
+26,25
@@
#include <QStringList>
#include <QVariantMap>
#include <QStringList>
#include <QVariantMap>
+#include "syncableobject.h"
+
class IrcUser;
class IrcUser;
-class Network
Info
;
+class Network;
class SignalProxy;
class SignalProxy;
-class IrcChannel : public
Q
Object {
+class IrcChannel : public
Syncable
Object {
Q_OBJECT
Q_PROPERTY(QString name READ name STORED false)
Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false)
public:
Q_OBJECT
Q_PROPERTY(QString name READ name STORED false)
Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false)
public:
- IrcChannel(const QString &channelname, Network
Info *networkInfo
);
+ IrcChannel(const QString &channelname, Network
*network
);
~IrcChannel();
bool isKnownUser(IrcUser *ircuser) const;
bool isValidChannelUserMode(const QString &mode) const;
~IrcChannel();
bool isKnownUser(IrcUser *ircuser) const;
bool isValidChannelUserMode(const QString &mode) const;
- bool initialized() const;
-
QString name() const;
QString topic() const;
QString name() const;
QString topic() const;
@@
-87,8
+87,6
@@
public slots:
// init seters
void initSetUserModes(const QVariantMap &usermodes);
// init seters
void initSetUserModes(const QVariantMap &usermodes);
- void setInitialized();
-
signals:
void topicSet(QString topic);
void userModesSet(QString nick, QString modes);
signals:
void topicSet(QString topic);
void userModesSet(QString nick, QString modes);
@@
-105,8
+103,6
@@
signals:
void ircUserModeRemoved(IrcUser *ircuser, QString mode);
void ircUserModesSet(IrcUser *ircuser, QString modes);
void ircUserModeRemoved(IrcUser *ircuser, QString mode);
void ircUserModesSet(IrcUser *ircuser, QString modes);
- void initDone();
-
private slots:
void ircUserDestroyed();
void ircUserNickSet(QString nick);
private slots:
void ircUserDestroyed();
void ircUserNickSet(QString nick);
@@
-118,7
+114,7
@@
private:
QHash<IrcUser *, QString> _userModes;
QHash<IrcUser *, QString> _userModes;
- Network
Info *networkInfo
;
+ Network
*network
;
QTextCodec *_codecForEncoding;
QTextCodec *_codecForDecoding;
QTextCodec *_codecForEncoding;
QTextCodec *_codecForDecoding;