projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop Quassel from doing stupid things when a nick changes capitalization (only).
[quassel.git]
/
src
/
common
/
ircuser.h
diff --git
a/src/common/ircuser.h
b/src/common/ircuser.h
index
93ec9eb
..
e933fb6
100644
(file)
--- a/
src/common/ircuser.h
+++ b/
src/common/ircuser.h
@@
-1,11
+1,11
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005
/06 by The Quassel Team
*
+ * Copyright (C) 2005
-07 by the Quassel IRC Team
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option)
any later version.
*
+ * (at your option)
version 3.
*
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
@@
-32,7
+32,7
@@
class IrcChannel;
class IrcUser : public QObject {
Q_OBJECT
class IrcUser : public QObject {
Q_OBJECT
-
+
Q_PROPERTY(QString user READ user WRITE setUser STORED false)
Q_PROPERTY(QString host READ host WRITE setHost STORED false)
Q_PROPERTY(QString nick READ nick WRITE setNick STORED false)
Q_PROPERTY(QString user READ user WRITE setUser STORED false)
Q_PROPERTY(QString host READ host WRITE setHost STORED false)
Q_PROPERTY(QString nick READ nick WRITE setNick STORED false)
@@
-40,7
+40,7
@@
class IrcUser : public QObject {
Q_PROPERTY(QStringList channels READ channels STORED false)
// Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
Q_PROPERTY(QStringList channels READ channels STORED false)
// Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
-
+
public:
IrcUser(const QString &hostmask, NetworkInfo *networkInfo);
virtual ~IrcUser();
public:
IrcUser(const QString &hostmask, NetworkInfo *networkInfo);
virtual ~IrcUser();
@@
-55,26
+55,26
@@
public:
QString userModes() const;
QStringList channels() const;
QString userModes() const;
QStringList channels() const;
-
- void updateObjectName();
-
-public slots:
+
+public slots:
void setUser(const QString &user);
void setHost(const QString &host);
void setNick(const QString &nick);
void updateHostmask(const QString &mask);
void setUser(const QString &user);
void setHost(const QString &host);
void setNick(const QString &nick);
void updateHostmask(const QString &mask);
-
- void setUserModes(const QString &modes);
- void joinChannel(const QString &channel);
- void partChannel(const QString &channel);
+ void setUserModes(const QString &modes);
+
+ void joinChannel(IrcChannel *channel);
+ void joinChannel(const QString &channelname);
+ void partChannel(IrcChannel *channel);
+ void partChannel(const QString &channelname);
void addUserMode(const QString &mode);
void removeUserMode(const QString &mode);
// init seters
void initSetChannels(const QStringList channels);
void addUserMode(const QString &mode);
void removeUserMode(const QString &mode);
// init seters
void initSetChannels(const QStringList channels);
-
+
void setInitialized();
signals:
void setInitialized();
signals:
@@
-83,7
+83,6
@@
signals:
void nickSet(QString newnick);
void hostmaskUpdated(QString mask);
void nickSet(QString newnick);
void hostmaskUpdated(QString mask);
- void channelsSet(QStringList channels);
void userModesSet(QString modes);
void channelJoined(QString channel);
void userModesSet(QString modes);
void channelJoined(QString channel);
@@
-92,13
+91,17
@@
signals:
void userModeAdded(QString mode);
void userModeRemoved(QString mode);
void userModeAdded(QString mode);
void userModeRemoved(QString mode);
- void
objectNameSet(
);
+ void
renameObject(QString oldname, QString newname
);
// void setUsermodes(const QSet<QString> &usermodes);
// QSet<QString> usermodes() const;
void initDone();
// void setUsermodes(const QSet<QString> &usermodes);
// QSet<QString> usermodes() const;
void initDone();
+private slots:
+ void updateObjectName();
+ void channelDestroyed();
+
private:
inline bool operator==(const IrcUser &ircuser2) {
return (_nick.toLower() == ircuser2.nick().toLower());
private:
inline bool operator==(const IrcUser &ircuser2) {
return (_nick.toLower() == ircuser2.nick().toLower());
@@
-114,7
+117,8
@@
private:
QString _user;
QString _host;
QString _user;
QString _host;
- QSet<QString> _channels;
+ // QSet<QString> _channels;
+ QSet<IrcChannel *> _channels;
QString _userModes;
NetworkInfo *networkInfo;
QString _userModes;
NetworkInfo *networkInfo;