TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 85 insertions, 85 deletions

diff --git a/src/kvilib/irc/kvi_ircserver.h b/src/kvilib/irc/kvi_ircserver.h
index 4c0ca54d..13876b3e 100644
--- a/src/kvilib/irc/kvi_ircserver.h
+++ b/src/kvilib/irc/kvi_ircserver.h
@@ -30,7 +30,7 @@
 #include "kvi_qstring.h"
 #include "kvi_pointerlist.h"
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 class KviConfig;
 class KviNickServRuleSet;
@@ -44,10 +44,10 @@ class KviIrcServer;
 
 class KVILIB_API KviIrcServerReconnectInfo {
 public:
-	QString               m_szNick;
-	QString               m_szAwayReason;
-	QString               m_szJoinChannels;
-	QStringList           m_szOpenQueryes;
+	TQString               m_szNick;
+	TQString               m_szAwayReason;
+	TQString               m_szJoinChannels;
+	TQStringList           m_szOpenQueryes;
 	bool                  m_bIsAway;
 };
 
@@ -59,73 +59,73 @@ public:
 	~KviIrcServer();
 public:
 	KviIrcServerReconnectInfo *m_pReconnectInfo;
-	QString            m_szHostname;          // the server hostname (or ip eventually)
-	QString            m_szIp;                // the server's cached ip (if we're caching)
-	QString            m_szDescription;       // the server description
+	TQString            m_szHostname;          // the server hostname (or ip eventually)
+	TQString            m_szIp;                // the server's cached ip (if we're caching)
+	TQString            m_szDescription;       // the server description
 	kvi_u32_t          m_uPort;               // the server's port
 	unsigned short int m_uFlags;              // flags
 
 	// Extended data
-	QString            m_szUserIdentityId;    // The user identity to use for this server: if empty
+	TQString            m_szUserIdentityId;    // The user identity to use for this server: if empty
 	                                          // Then use the network identity instead
 	
-	QString            m_szUser;              // special username
-	QString            m_szPass;              // special password
-	QString            m_szNick;              // special nickname
-	QString            m_szRealName;          // special real name
-	QString            m_szInitUMode;         // special user mode
-	QString            m_szOnConnectCommand;  // the command to run on connect
-	QString            m_szOnLoginCommand;    // the command to run after login
-	QString            m_szLinkFilter;        // the link filter object
-	QString            m_szEncoding;          // if empty, use network encoding
-	QStringList      * m_pChannelList;        // Channels to auto join
+	TQString            m_szUser;              // special username
+	TQString            m_szPass;              // special password
+	TQString            m_szNick;              // special nickname
+	TQString            m_szRealName;          // special real name
+	TQString            m_szInitUMode;         // special user mode
+	TQString            m_szOnConnectCommand;  // the command to run on connect
+	TQString            m_szOnLoginCommand;    // the command to run after login
+	TQString            m_szLinkFilter;        // the link filter object
+	TQString            m_szEncoding;          // if empty, use network encoding
+	TQStringList      * m_pChannelList;        // Channels to auto join
 	bool               m_bAutoConnect;        // autoconnect
-	QString            m_szId;                // the server's may-be-unique id, may be auto-generated
+	TQString            m_szId;                // the server's may-be-unique id, may be auto-generated
 	int                m_iProxy;              // proxy server's id
 public:
 	int proxy() { return m_iProxy; };
 	KviProxy* proxyServer(KviProxyDataBase * pDb);
 	
 	kvi_u32_t port() const { return m_uPort; };
-	const QString & ipAddress() const { return m_szIp; };
-	const QString & password() const { return m_szPass; };
-	const QString & nickName() const { return m_szNick; };
-    const QString & initUMode() const { return m_szInitUMode; };
-	const QString & hostName() const { return m_szHostname; };
-	const QString & ip() const { return m_szIp; };
-	const QString & onLoginCommand() const { return m_szOnLoginCommand; };
-	const QString & onConnectCommand() const { return m_szOnConnectCommand; };
-	const QString & userName() const { return m_szUser; };
-	const QString & realName() const { return m_szRealName; };
-	const QString & linkFilter() const { return m_szLinkFilter; };
-	const QString & description() const { return m_szDescription; };
-	const QString & encoding() const { return m_szEncoding; };
-	const QString & id() const { return m_szId; };
-	const QString & userIdentityId() const { return m_szUserIdentityId; };
+	const TQString & ipAddress() const { return m_szIp; };
+	const TQString & password() const { return m_szPass; };
+	const TQString & nickName() const { return m_szNick; };
+    const TQString & initUMode() const { return m_szInitUMode; };
+	const TQString & hostName() const { return m_szHostname; };
+	const TQString & ip() const { return m_szIp; };
+	const TQString & onLoginCommand() const { return m_szOnLoginCommand; };
+	const TQString & onConnectCommand() const { return m_szOnConnectCommand; };
+	const TQString & userName() const { return m_szUser; };
+	const TQString & realName() const { return m_szRealName; };
+	const TQString & linkFilter() const { return m_szLinkFilter; };
+	const TQString & description() const { return m_szDescription; };
+	const TQString & encoding() const { return m_szEncoding; };
+	const TQString & id() const { return m_szId; };
+	const TQString & userIdentityId() const { return m_szUserIdentityId; };
 	bool autoConnect() const { return m_bAutoConnect; };
-	QStringList* autoJoinChannelList(){ return m_pChannelList; };
+	TQStringList* autoJoinChannelList(){ return m_pChannelList; };
 	bool isIpV6() const { return (m_uFlags & KVI_IRCSERVER_FLAG_IPV6); };
 	bool useSSL() const { return (m_uFlags & KVI_IRCSERVER_FLAG_SSL); };
 	bool cacheIp() const { return (m_uFlags & KVI_IRCSERVER_FLAG_CACHEIP); };
 	
 	void setProxy(int p){ m_iProxy = p; };
-	void setIpAddress(const QString &a){ m_szIp = a; };
+	void setIpAddress(const TQString &a){ m_szIp = a; };
 	void setPort(kvi_u32_t p){ m_uPort = p; };
-	void setHostName(const QString &n){ m_szHostname = n; };
-	void setDescription(const QString &d){ m_szDescription = d; };
-	void setUserName(const QString &u){ m_szUser = u; };
-	void setPassword(const QString &p){ m_szPass = p; };
-	void setNickName(const QString &n){ m_szNick = n; };
-	void setRealName(const QString &r){ m_szRealName = r; };
-	void setEncoding(const QString &e){ m_szEncoding = e; };
-    void setInitUMode(const QString &u){ m_szInitUMode = u; };
-	void setOnConnectCommand(const QString &cmd){ m_szOnConnectCommand = cmd; };
-	void setOnLoginCommand(const QString &cmd){ m_szOnLoginCommand = cmd; };
-	void setLinkFilter(const QString &f){ m_szLinkFilter = f; };
+	void setHostName(const TQString &n){ m_szHostname = n; };
+	void setDescription(const TQString &d){ m_szDescription = d; };
+	void setUserName(const TQString &u){ m_szUser = u; };
+	void setPassword(const TQString &p){ m_szPass = p; };
+	void setNickName(const TQString &n){ m_szNick = n; };
+	void setRealName(const TQString &r){ m_szRealName = r; };
+	void setEncoding(const TQString &e){ m_szEncoding = e; };
+    void setInitUMode(const TQString &u){ m_szInitUMode = u; };
+	void setOnConnectCommand(const TQString &cmd){ m_szOnConnectCommand = cmd; };
+	void setOnLoginCommand(const TQString &cmd){ m_szOnLoginCommand = cmd; };
+	void setLinkFilter(const TQString &f){ m_szLinkFilter = f; };
 	// the channel list must be allocated with new!
-	void setAutoJoinChannelList(QStringList * pNewChannelList);
+	void setAutoJoinChannelList(TQStringList * pNewChannelList);
 	void setAutoConnect(bool autoconnect) { m_bAutoConnect = autoconnect; };
-	void setUserIdentityId(const QString &szUserIdentityId){ m_szUserIdentityId = szUserIdentityId; };
+	void setUserIdentityId(const TQString &szUserIdentityId){ m_szUserIdentityId = szUserIdentityId; };
 	void setIpV6(bool bSet)
 	{
 		if(bSet)m_uFlags |= KVI_IRCSERVER_FLAG_IPV6;
@@ -143,13 +143,13 @@ public:
 	};
 	void operator =(const KviIrcServer &s);
 
-	bool load(KviConfig * cfg,const QString &prefix);
-	void save(KviConfig * cfg,const QString &prefix);
+	bool load(KviConfig * cfg,const TQString &prefix);
+	void save(KviConfig * cfg,const TQString &prefix);
 	
 	void generateUniqueId();
-	void setId(const QString &szId){ m_szId = szId; if(m_szId.isEmpty())generateUniqueId(); };
+	void setId(const TQString &szId){ m_szId = szId; if(m_szId.isEmpty())generateUniqueId(); };
 
-	QString ircUri();
+	TQString ircUri();
 };
 
 class KVILIB_API KviIrcNetwork : public KviHeapObject
@@ -157,48 +157,48 @@ class KVILIB_API KviIrcNetwork : public KviHeapObject
 	friend class KviIrcServerDataBase;
 public:
 	KviIrcNetwork(const KviIrcNetwork &src);
-	KviIrcNetwork(const QString &name);
+	KviIrcNetwork(const TQString &name);
 	~KviIrcNetwork();
 protected:
-	QString              m_szName;
-	QString              m_szDescription;
-	QString              m_szEncoding;                // if empty, use system default
-	QString              m_szNickName;                // preferred nick name
-	QString              m_szUserName;                // preferred user name
-	QString              m_szRealName;                // preferred real name
-	QString              m_szOnConnectCommand;        // the command to run on connect
-	QString              m_szOnLoginCommand;          // the command to run after login
-    QStringList        * m_pChannelList;              // Channels to auto join
+	TQString              m_szName;
+	TQString              m_szDescription;
+	TQString              m_szEncoding;                // if empty, use system default
+	TQString              m_szNickName;                // preferred nick name
+	TQString              m_szUserName;                // preferred user name
+	TQString              m_szRealName;                // preferred real name
+	TQString              m_szOnConnectCommand;        // the command to run on connect
+	TQString              m_szOnLoginCommand;          // the command to run after login
+    TQStringList        * m_pChannelList;              // Channels to auto join
 	KviNickServRuleSet * m_pNickServRuleSet;          // set of nick serv rules
 	bool                 m_bAutoConnect;              // autoconnect
-	QString              m_szUserIdentityId;          // The user identity to use for this server: if empty
+	TQString              m_szUserIdentityId;          // The user identity to use for this server: if empty
 	                                                  // Then use the global primary identity
 public:
-	const QString & name() const { return m_szName; };
-	const QString & encoding() const { return m_szEncoding; };
-	const QString & description() const { return m_szDescription; };
-	const QString & nickName() const { return m_szNickName; };
-	const QString & realName() const { return m_szRealName; };
-	const QString & userName() const { return m_szUserName; };
-	const QString & onLoginCommand() const { return m_szOnLoginCommand; };
-	const QString & onConnectCommand() const { return m_szOnConnectCommand; };
-	const QString & userIdentityId() const { return m_szUserIdentityId; };
+	const TQString & name() const { return m_szName; };
+	const TQString & encoding() const { return m_szEncoding; };
+	const TQString & description() const { return m_szDescription; };
+	const TQString & nickName() const { return m_szNickName; };
+	const TQString & realName() const { return m_szRealName; };
+	const TQString & userName() const { return m_szUserName; };
+	const TQString & onLoginCommand() const { return m_szOnLoginCommand; };
+	const TQString & onConnectCommand() const { return m_szOnConnectCommand; };
+	const TQString & userIdentityId() const { return m_szUserIdentityId; };
 	bool autoConnect() const { return m_bAutoConnect; };
-	QStringList* autoJoinChannelList(){ return m_pChannelList; };
+	TQStringList* autoJoinChannelList(){ return m_pChannelList; };
 	KviNickServRuleSet * nickServRuleSet(){ return m_pNickServRuleSet; };
 	void setNickServRuleSet(KviNickServRuleSet * s);
 	void copyFrom(const KviIrcNetwork &d);
-	void setName(const QString &szName){ m_szName = szName; };
-	void setEncoding(const QString &szEncoding){ m_szEncoding = szEncoding; };
-	void setDescription(const QString &szDescription){ m_szDescription = szDescription; };
-	void setOnConnectCommand(const QString &cmd){ m_szOnConnectCommand = cmd; };
-	void setOnLoginCommand(const QString &cmd){ m_szOnLoginCommand = cmd; };
-	void setNickName(const QString &n){ m_szNickName = n; };
-	void setRealName(const QString &r){ m_szRealName = r; };
-	void setUserName(const QString &u){ m_szUserName = u; };
-	void setAutoJoinChannelList(QStringList * pNewChannelList);
+	void setName(const TQString &szName){ m_szName = szName; };
+	void setEncoding(const TQString &szEncoding){ m_szEncoding = szEncoding; };
+	void setDescription(const TQString &szDescription){ m_szDescription = szDescription; };
+	void setOnConnectCommand(const TQString &cmd){ m_szOnConnectCommand = cmd; };
+	void setOnLoginCommand(const TQString &cmd){ m_szOnLoginCommand = cmd; };
+	void setNickName(const TQString &n){ m_szNickName = n; };
+	void setRealName(const TQString &r){ m_szRealName = r; };
+	void setUserName(const TQString &u){ m_szUserName = u; };
+	void setAutoJoinChannelList(TQStringList * pNewChannelList);
 	void setAutoConnect(bool bAutoConnect){ m_bAutoConnect = bAutoConnect; };
-	void setUserIdentityId(const QString &szUserIdentityId){ m_szUserIdentityId = szUserIdentityId; };
+	void setUserIdentityId(const TQString &szUserIdentityId){ m_szUserIdentityId = szUserIdentityId; };
 };