Fix TQString formatting in 'KviTQString::sprintf'.r14.1.x

This was causing translation catalouges not to be found and eventually the program to always display in English.

The problem was introduced by an automated Q --> TQ renaming done sometime in the past. 'KviTQString::sprintf' uses '%Q' as a marker for a TQString* argument, so using '%TQ' was resulting in garbage bytes being fed and the catalouges not being found.

This resolves issue #44.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1c8f24439baf33fc22649b31043f147b7c83594b)

1 files changed, 16 insertions, 16 deletions

diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp
index 240ac51..45d11b7 100644
--- a/src/kvilib/irc/kvi_nickserv.cpp
+++ b/src/kvilib/irc/kvi_nickserv.cpp
@@ -92,15 +92,15 @@ void KviNickServRuleSet::save(KviConfig * cfg,const TQString &prefix)
 	TQString tmp;
 	if(m_bEnabled)
 	{
-		KviTQString::sprintf(tmp,"%TQNSEnabled",&prefix);
+		KviTQString::sprintf(tmp,"%QNSEnabled",&prefix);
 		cfg->writeEntry(tmp,m_bEnabled);
 	}
-	KviTQString::sprintf(tmp,"%TQNSRules",&prefix);
+	KviTQString::sprintf(tmp,"%QNSRules",&prefix);
 	cfg->writeEntry(tmp,m_pRules->count());
 	int idx = 0;
 	for(KviNickServRule * r = m_pRules->first();r;r = m_pRules->next())
 	{
-		KviTQString::sprintf(tmp,"%TQNSRule%d_",&prefix,idx);
+		KviTQString::sprintf(tmp,"%QNSRule%d_",&prefix,idx);
 		r->save(cfg,tmp);
 		idx++;
 	}
@@ -109,7 +109,7 @@ void KviNickServRuleSet::save(KviConfig * cfg,const TQString &prefix)
 KviNickServRuleSet * KviNickServRuleSet::load(KviConfig * cfg,const TQString &prefix)
 {
 	TQString tmp;
-	KviTQString::sprintf(tmp,"%TQNSRules",&prefix);
+	KviTQString::sprintf(tmp,"%QNSRules",&prefix);
 	unsigned int cnt = cfg->readUIntEntry(tmp,0);
 	if(cnt == 0)return 0;
 	KviNickServRuleSet * s = new KviNickServRuleSet();
@@ -148,11 +148,11 @@ bool KviNickServRuleSet::loadPrivate(KviConfig * cfg,const TQString &prefix,unsi
 	if(nEntries != 0)
 	{
 		TQString tmp;
-		KviTQString::sprintf(tmp,"%TQNSEnabled",&prefix);
+		KviTQString::sprintf(tmp,"%QNSEnabled",&prefix);
 		m_bEnabled = cfg->readBoolEntry(tmp,false);
 		for(unsigned int u=0;u<nEntries;u++)
 		{
-			KviTQString::sprintf(tmp,"%TQNSRule%u_",&prefix,u);
+			KviTQString::sprintf(tmp,"%QNSRule%u_",&prefix,u);
 			KviNickServRule * r = new KviNickServRule();
 			if(!r->load(cfg,tmp))delete r;
 			else m_pRules->append(r);
@@ -259,33 +259,33 @@ void KviNickServRule::copyFrom(const KviNickServRule &src)
 void KviNickServRule::save(KviConfig * cfg,const TQString &prefix)
 {
 	TQString tmp;
-	KviTQString::sprintf(tmp,"%TQRegisteredNick",&prefix);
+	KviTQString::sprintf(tmp,"%QRegisteredNick",&prefix);
 	cfg->writeEntry(tmp,m_szRegisteredNick);
-	KviTQString::sprintf(tmp,"%TQNickServMask",&prefix);
+	KviTQString::sprintf(tmp,"%QNickServMask",&prefix);
 	cfg->writeEntry(tmp,m_szNickServMask);
-	KviTQString::sprintf(tmp,"%TQMessageRegexp",&prefix);
+	KviTQString::sprintf(tmp,"%QMessageRegexp",&prefix);
 	cfg->writeEntry(tmp,m_szMessageRegexp);
-	KviTQString::sprintf(tmp,"%TQIdentifyCommand",&prefix);
+	KviTQString::sprintf(tmp,"%QIdentifyCommand",&prefix);
 	cfg->writeEntry(tmp,m_szIdentifyCommand);
-	KviTQString::sprintf(tmp,"%TQServerMask",&prefix);
+	KviTQString::sprintf(tmp,"%QServerMask",&prefix);
 	cfg->writeEntry(tmp,m_szServerMask);
 }
 
 bool KviNickServRule::load(KviConfig * cfg,const TQString &prefix)
 {
 	TQString tmp;
-	KviTQString::sprintf(tmp,"%TQRegisteredNick",&prefix);
+	KviTQString::sprintf(tmp,"%QRegisteredNick",&prefix);
 	m_szRegisteredNick = KviTQString::trimmed(cfg->readTQStringEntry(tmp));
 	if(m_szRegisteredNick.isEmpty())return false;
-	KviTQString::sprintf(tmp,"%TQNickServMask",&prefix);
+	KviTQString::sprintf(tmp,"%QNickServMask",&prefix);
 	m_szNickServMask = cfg->readTQStringEntry(tmp);
 	if(m_szNickServMask.isEmpty())return false;
-	KviTQString::sprintf(tmp,"%TQServerMask",&prefix);
+	KviTQString::sprintf(tmp,"%QServerMask",&prefix);
 	m_szServerMask = cfg->readTQStringEntry(tmp,TQString());
-	KviTQString::sprintf(tmp,"%TQMessageRegexp",&prefix);
+	KviTQString::sprintf(tmp,"%QMessageRegexp",&prefix);
 	m_szMessageRegexp = cfg->readTQStringEntry(tmp);
 	if(m_szMessageRegexp.isEmpty())return false;
-	KviTQString::sprintf(tmp,"%TQIdentifyCommand",&prefix);
+	KviTQString::sprintf(tmp,"%QIdentifyCommand",&prefix);
 	m_szIdentifyCommand = cfg->readTQStringEntry(tmp);
 	return !m_szIdentifyCommand.isEmpty();
 }