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, 18 insertions, 18 deletions

diff --git a/src/kvilib/irc/kvi_ircserverdb.h b/src/kvilib/irc/kvi_ircserverdb.h
index b5d55231..ad3b9529 100644
--- a/src/kvilib/irc/kvi_ircserverdb.h
+++ b/src/kvilib/irc/kvi_ircserverdb.h
@@ -32,15 +32,15 @@
 
 typedef struct _KviIrcServerDefinition
 {
-	QString            szServer;
+	TQString            szServer;
 	kvi_u32_t	   uPort;
 	bool               bPortIsValid;
 	bool               bIpV6;
 	bool               bSSL;
-	QString            szLinkFilter;
-	QString            szPass;
-	QString            szNick;
-	QString            szInitUMode;
+	TQString            szLinkFilter;
+	TQString            szPass;
+	TQString            szNick;
+	TQString            szInitUMode;
 } KviIrcServerDefinition;
 
 
@@ -75,8 +75,8 @@ public:
 	KviIrcServerDataBase();
 	~KviIrcServerDataBase();
 private:
-	KviPointerHashTable<QString,KviIrcServerDataBaseRecord> * m_pRecords;
-	QString                             m_szCurrentNetwork;
+	KviPointerHashTable<TQString,KviIrcServerDataBaseRecord> * m_pRecords;
+	TQString                             m_szCurrentNetwork;
 	// This list is computed when the data are loaded from disk
 	// during the startup and is used by KviApp to
 	// start the connections.
@@ -89,23 +89,23 @@ private:
 	KviPointerList<KviIrcServerDataBaseRecord>  * m_pAutoConnectOnStartupNetworks;
 public:
 	void clear();
-	KviPointerHashTable<QString,KviIrcServerDataBaseRecord> * recordDict(){ return m_pRecords; };
+	KviPointerHashTable<TQString,KviIrcServerDataBaseRecord> * recordDict(){ return m_pRecords; };
 	KviPointerList<KviIrcServer> * autoConnectOnStartupServers(){ return m_pAutoConnectOnStartupServers; };
 	KviPointerList<KviIrcServerDataBaseRecord> * autoConnectOnStartupNetworks(){ return m_pAutoConnectOnStartupNetworks; };
 	void clearAutoConnectOnStartupServers();
 	void clearAutoConnectOnStartupNetworks();
-	void setCurrentNetwork(const QString &szNetName){ m_szCurrentNetwork = szNetName; };
-	const QString & currentNetworkName(){ return m_szCurrentNetwork; };
+	void setCurrentNetwork(const TQString &szNetName){ m_szCurrentNetwork = szNetName; };
+	const TQString & currentNetworkName(){ return m_szCurrentNetwork; };
 	KviIrcServerDataBaseRecord * currentRecord();
-	KviIrcServerDataBaseRecord * findRecord(const QString &szNetName);
-	KviIrcNetwork * findNetwork(const QString &name);
-	void loadFromMircIni(const QString & filename, const QString & szMircIni, QStringList& recentServers);
-	void load(const QString & filename);
-	void save(const QString & filename);
+	KviIrcServerDataBaseRecord * findRecord(const TQString &szNetName);
+	KviIrcNetwork * findNetwork(const TQString &name);
+	void loadFromMircIni(const TQString & filename, const TQString & szMircIni, TQStringList& recentServers);
+	void load(const TQString & filename);
+	void save(const TQString & filename);
 	KviIrcServerDataBaseRecord * insertNetwork(KviIrcNetwork * n);
-	void updateServerIp(KviIrcServer * pServer,const QString &ip);
-	bool makeCurrentServer(KviIrcServerDefinition * d,QString &szError);
-	bool makeCurrentBestServerInNetwork(const QString &szNetName,KviIrcServerDataBaseRecord * d,QString &szError);
+	void updateServerIp(KviIrcServer * pServer,const TQString &ip);
+	bool makeCurrentServer(KviIrcServerDefinition * d,TQString &szError);
+	bool makeCurrentBestServerInNetwork(const TQString &szNetName,KviIrcServerDataBaseRecord * d,TQString &szError);
 };