1 files changed, 34 insertions, 34 deletions

diff --git a/src/kvilib/irc/kvi_nickserv.h b/src/kvilib/irc/kvi_nickserv.h
index 105eed1c..f259f1f5 100644
--- a/src/kvilib/irc/kvi_nickserv.h
+++ b/src/kvilib/irc/kvi_nickserv.h
@@ -35,19 +35,19 @@ class KviIrcMask;
 class KVILIB_API KviNickServRule : public KviHeapObject
 {
 protected:
-	QString m_szRegisteredNick;         // my registered nickname
-	QString m_szNickServMask;           // the NickServ service mask
-	QString m_szMessageRegexp;          // the NickServ message regexp
-	QString m_szIdentifyCommand;        // the IDENTIFY command to send to server
-	QString m_szServerMask;             // the mask that the server must match (not used in per-network rules)
+	TQString m_szRegisteredNick;         // my registered nickname
+	TQString m_szNickServMask;           // the NickServ service tqmask
+	TQString m_szMessageRegexp;          // the NickServ message regexp
+	TQString m_szIdentifyCommand;        // the IDENTIFY command to send to server
+	TQString m_szServerMask;             // the tqmask that the server must match (not used in per-network rules)
 public:
 	KviNickServRule() : KviHeapObject() {};
 	KviNickServRule(
-		const QString &szRegisteredNick,
-		const QString &szNickServMask,
-		const QString &szMessageRegexp,
-		const QString &szIdentifyCommand,
-		const QString &szServerMask = QString::null)
+		const TQString &szRegisteredNick,
+		const TQString &szNickServMask,
+		const TQString &szMessageRegexp,
+		const TQString &szIdentifyCommand,
+		const TQString &szServerMask = TQString())
 		: KviHeapObject(),
 			m_szRegisteredNick(szRegisteredNick),
 			m_szNickServMask(szNickServMask),
@@ -56,27 +56,27 @@ public:
 			m_szServerMask(szServerMask)
 		{};
 public:
-	const QString & registeredNick() const { return m_szRegisteredNick; };
-	const QString & nickServMask() const { return m_szNickServMask; };
-	const QString & messageRegexp() const { return m_szMessageRegexp; };
-	const QString & identifyCommand() const { return m_szIdentifyCommand; };
-	const QString & serverMask() const { return m_szServerMask; };
-	void setRegisteredNick(const QString &szRegisteredNick){ m_szRegisteredNick = szRegisteredNick; };
-	void setNickServMask(const QString &szNickServMask){ m_szNickServMask = szNickServMask; };
-	void setMessageRegexp(const QString &szMessageRegexp){ m_szMessageRegexp = szMessageRegexp; };
-	void setIdentifyCommand(const QString &szIdentifyCommand){ m_szIdentifyCommand = szIdentifyCommand; };
-	void setServerMask(const QString &szServerMask){ m_szServerMask = szServerMask; };
+	const TQString & registeredNick() const { return m_szRegisteredNick; };
+	const TQString & nickServMask() const { return m_szNickServMask; };
+	const TQString & messageRegexp() const { return m_szMessageRegexp; };
+	const TQString & identifyCommand() const { return m_szIdentifyCommand; };
+	const TQString & serverMask() const { return m_szServerMask; };
+	void setRegisteredNick(const TQString &szRegisteredNick){ m_szRegisteredNick = szRegisteredNick; };
+	void setNickServMask(const TQString &szNickServMask){ m_szNickServMask = szNickServMask; };
+	void setMessageRegexp(const TQString &szMessageRegexp){ m_szMessageRegexp = szMessageRegexp; };
+	void setIdentifyCommand(const TQString &szIdentifyCommand){ m_szIdentifyCommand = szIdentifyCommand; };
+	void setServerMask(const TQString &szServerMask){ m_szServerMask = szServerMask; };
 public:
 	// avoid crashes under windows
-	static KviNickServRule * createInstance(const QString &szRegisteredNick,
-		const QString &szNickServMask,
-		const QString &szMessageRegexp,
-		const QString &szIdentifyCommand,
-		const QString &szServerMask = QString::null);
+	static KviNickServRule * createInstance(const TQString &szRegisteredNick,
+		const TQString &szNickServMask,
+		const TQString &szMessageRegexp,
+		const TQString &szIdentifyCommand,
+		const TQString &szServerMask = TQString());
 
-	void save(KviConfig * cfg,const QString &prefix);
+	void save(KviConfig * cfg,const TQString &prefix);
 	// returns false if the loaded data has no sense
-	bool load(KviConfig * cfg,const QString &prefix);
+	bool load(KviConfig * cfg,const TQString &prefix);
 	void copyFrom(const KviNickServRule &src);
 };
 
@@ -87,7 +87,7 @@ public:
 	KviNickServRuleSet(const KviNickServRuleSet &s);
 	~KviNickServRuleSet();
 protected:
-	KviPointerList<KviNickServRule> * m_pRules; // FIXME: Replace with KviPointerHashTable<QString,KviPointerList>
+	KviPointerList<KviNickServRule> * m_pRules; // FIXME: Replace with KviPointerHashTable<TQString,KviPointerList>
 	bool                          m_bEnabled;
 public:
 	// avoid crashes under windows
@@ -97,15 +97,15 @@ public:
 	void setEnabled(bool bEnabled){ m_bEnabled = bEnabled; };
 	bool isEmpty(){ return m_pRules ? m_pRules->isEmpty() : true; };
 	void addRule(KviNickServRule * r);
-	KviNickServRule * matchRule(const QString &szNick,const KviIrcMask *nickServ,const QString &szMsg,const QString &szServer = QString::null);
+	KviNickServRule * matchRule(const TQString &szNick,const KviIrcMask *nickServ,const TQString &szMsg,const TQString &szServer = TQString());
 	void copyFrom(const KviNickServRuleSet &src);
-	void load(const QString &szConfigFile);
-	void save(const QString &szConfigFile);
-	void save(KviConfig * cfg,const QString &prefix);
+	void load(const TQString &szConfigFile);
+	void save(const TQString &szConfigFile);
+	void save(KviConfig * cfg,const TQString &prefix);
 	KviPointerList<KviNickServRule> * rules(){ return m_pRules; };
-	static KviNickServRuleSet * load(KviConfig * cfg,const QString &prefix);
+	static KviNickServRuleSet * load(KviConfig * cfg,const TQString &prefix);
 protected:
-	bool loadPrivate(KviConfig * cfg,const QString &prefix,unsigned int nEntries);
+	bool loadPrivate(KviConfig * cfg,const TQString &prefix,unsigned int nEntries);
 };