/***************************************************************************
- * Copyright (C) 2005/06 by The Quassel Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* 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 *
Q_OBJECT
public:
- Server(UserId uid, uint networkId, QString network);
+ Server(UserId uid, NetworkId networkId, QString network, const QVariant &previousState = QVariant());
~Server();
UserId userId() const { return _userId; }
// serverState state();
bool isConnected() const { return socket.state() == QAbstractSocket::ConnectedState; }
- uint networkId() const;
- QString networkName(); // hasbeen getNetwork()
+ NetworkId networkId() const;
+ QString networkName() const; // hasbeen getNetwork()
+
+ NetworkInfo *networkInfo() const { return _networkInfo; }
+ IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
+ UserInputHandler *userInputHandler() const { return _userInputHandler; }
+ CtcpHandler *ctcpHandler() const { return _ctcpHandler; }
+
+ QVariant state(); ///< Return data necessary to restore the server's state upon core restart
+
+ //! Decode a string using the server (network) decoding.
+ QString serverDecode(const QByteArray &string) const;
+
+ //! Decode a string using a buffer-specific encoding if one is set (and use the server encoding else).
+ QString bufferDecode(const QString &bufferName, const QByteArray &string) const;
+
+ //! Decode a string using a IrcUser specific encoding, if one exists (using the server encoding else).
+ QString userDecode(const QString &userNick, const QByteArray &string) const;
+
+ //! Encode a string using the server (network) encoding.
+ QByteArray serverEncode(const QString &string) const;
+
+ //! Encode a string using the buffer-specific encoding, if set, and use the server encoding else.
+ QByteArray bufferEncode(const QString &bufferName, const QString &string) const;
+
+ //! Encode a string using the user-specific encoding, if set, and use the server encoding else.
+ QByteArray userEncode(const QString &userNick, const QString &string) const;
- NetworkInfo *networkInfo() { return _networkInfo; }
- IrcServerHandler *ircServerHandler() {return _ircServerHandler; }
- UserInputHandler *userInputHandler() {return _userInputHandler; }
- CtcpHandler *ctcpHandler() {return _ctcpHandler; }
-
public slots:
// void setServerOptions();
void connectToIrc(QString net);
void putRawLine(QString input);
void putCmd(QString cmd, QStringList params, QString prefix = 0);
- //void exitThread();
+
+private slots:
+ void threadFinished();
+ void sendPerform();
signals:
void serverState(QString net, QVariantMap data);
void connected(uint networkId);
void disconnected(uint networkId);
+ void connectionInitialized(); ///< Emitted after receipt of 001 to indicate that we can now send data to the IRC server
+
void synchronizeClients();
void queryRequested(QString network, QString nick);
void socketHasData();
void socketError(QAbstractSocket::SocketError);
void socketConnected();
- void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
private:
UserId _userId;
- uint _networkId;
+ NetworkId _networkId;
QTcpSocket socket;
QVariantMap networkSettings;
QVariantMap identity;
+ QVariant _previousState;
+
CoreSession *coreSession() const;
class ParseError : public Exception {