TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix TQString formatting in 'KviTQString::sprintf'.

Browse Source 
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>
pull/45/head
Michele Calgaro 3 months ago
parent 30b47cc3f6
commit 1c8f24439b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File

84
src/kvilib/irc/kvi_ircserver.cpp
Unescape Escape View File

@ -162,50 +162,50 @@ void KviIrcServer::setAutoJoinChannelList(TQStringList * pNewChannelList)
bool KviIrcServer::load(KviConfig * cfg,const TQString &prefix)
{
TQString tmp;
KviTQString::sprintf(tmp,"%TQHostname",&prefix);
KviTQString::sprintf(tmp,"%QHostname",&prefix);
m_szHostname = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQIp",&prefix);
KviTQString::sprintf(tmp,"%QIp",&prefix);
m_szIp = cfg->readTQStringEntry(tmp);
if(m_szHostname.isEmpty() && m_szIp.isEmpty())return false;
KviTQString::sprintf(tmp,"%TQDescription",&prefix);
KviTQString::sprintf(tmp,"%QDescription",&prefix);
m_szDescription = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQUser",&prefix);
KviTQString::sprintf(tmp,"%QUser",&prefix);
m_szUser = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQPass",&prefix);
KviTQString::sprintf(tmp,"%QPass",&prefix);
m_szPass = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQNick",&prefix);
KviTQString::sprintf(tmp,"%QNick",&prefix);
m_szNick = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQRealName",&prefix);
KviTQString::sprintf(tmp,"%QRealName",&prefix);
m_szRealName = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQInitUmode",&prefix);
KviTQString::sprintf(tmp,"%QInitUmode",&prefix);
m_szInitUMode = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQAutoJoinChannels",&prefix);
KviTQString::sprintf(tmp,"%QAutoJoinChannels",&prefix);
TQStringList l = cfg->readStringListEntry(tmp,TQStringList());
if(l.count() > 0)setAutoJoinChannelList(new TQStringList(l));
KviTQString::sprintf(tmp,"%TQAutoConnect",&prefix);
KviTQString::sprintf(tmp,"%QAutoConnect",&prefix);
m_bAutoConnect = cfg->readBoolEntry(tmp,false);
KviTQString::sprintf(tmp,"%TQEncoding",&prefix);
KviTQString::sprintf(tmp,"%QEncoding",&prefix);
m_szEncoding = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQOnConnectCommand",&prefix);
KviTQString::sprintf(tmp,"%QOnConnectCommand",&prefix);
m_szOnConnectCommand = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQOnLoginCommand",&prefix);
KviTQString::sprintf(tmp,"%QOnLoginCommand",&prefix);
m_szOnLoginCommand = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQLinkFilter",&prefix);
KviTQString::sprintf(tmp,"%QLinkFilter",&prefix);
m_szLinkFilter = cfg->readTQStringEntry(tmp);
KviTQString::sprintf(tmp,"%TQPort",&prefix);
KviTQString::sprintf(tmp,"%QPort",&prefix);
m_uPort = cfg->readUIntEntry(tmp,6667);
KviTQString::sprintf(tmp,"%TQId",&prefix);
KviTQString::sprintf(tmp,"%QId",&prefix);
m_szId = cfg->readTQStringEntry(tmp);
if(m_szId.isEmpty())generateUniqueId();
KviTQString::sprintf(tmp,"%TQIpV6",&prefix);
KviTQString::sprintf(tmp,"%QIpV6",&prefix);
setIpV6(cfg->readBoolEntry(tmp,false));
KviTQString::sprintf(tmp,"%TQCacheIp",&prefix);
KviTQString::sprintf(tmp,"%QCacheIp",&prefix);
setCacheIp(cfg->readBoolEntry(tmp,false)); // true ?
KviTQString::sprintf(tmp,"%TQSSL",&prefix);
KviTQString::sprintf(tmp,"%QSSL",&prefix);
setUseSSL(cfg->readBoolEntry(tmp,false));
KviTQString::sprintf(tmp,"%TQProxy",&prefix);
KviTQString::sprintf(tmp,"%QProxy",&prefix);
setProxy(cfg->readIntEntry(tmp,-2));
KviTQString::sprintf(tmp,"%TQUserIdentityId",&prefix);
KviTQString::sprintf(tmp,"%QUserIdentityId",&prefix);
m_szUserIdentityId = cfg->readTQStringEntry(tmp);
return true;
}
@ -213,103 +213,103 @@ bool KviIrcServer::load(KviConfig * cfg,const TQString &prefix)
void KviIrcServer::save(KviConfig * cfg,const TQString &prefix)
{
TQString tmp;
KviTQString::sprintf(tmp,"%TQHostname",&prefix);
KviTQString::sprintf(tmp,"%QHostname",&prefix);
cfg->writeEntry(tmp,m_szHostname);
KviTQString::sprintf(tmp,"%TQId",&prefix);
KviTQString::sprintf(tmp,"%QId",&prefix);
cfg->writeEntry(tmp,m_szId);
if(!m_szIp.isEmpty())
{
KviTQString::sprintf(tmp,"%TQIp",&prefix);
KviTQString::sprintf(tmp,"%QIp",&prefix);
cfg->writeEntry(tmp,m_szIp);
}
if(!m_szDescription.isEmpty())
{
KviTQString::sprintf(tmp,"%TQDescription",&prefix);
KviTQString::sprintf(tmp,"%QDescription",&prefix);
cfg->writeEntry(tmp,m_szDescription);
}
if(!m_szUser.isEmpty())
{
KviTQString::sprintf(tmp,"%TQUser",&prefix);
KviTQString::sprintf(tmp,"%QUser",&prefix);
cfg->writeEntry(tmp,m_szUser);
}
if(!m_szPass.isEmpty())
{
KviTQString::sprintf(tmp,"%TQPass",&prefix);
KviTQString::sprintf(tmp,"%QPass",&prefix);
cfg->writeEntry(tmp,m_szPass);
}
if(!m_szNick.isEmpty())
{
KviTQString::sprintf(tmp,"%TQNick",&prefix);
KviTQString::sprintf(tmp,"%QNick",&prefix);
cfg->writeEntry(tmp,m_szNick);
}
if(!m_szRealName.isEmpty())
{
KviTQString::sprintf(tmp,"%TQRealName",&prefix);
KviTQString::sprintf(tmp,"%QRealName",&prefix);
cfg->writeEntry(tmp,m_szRealName);
}
if(!m_szInitUMode.isEmpty())
{
KviTQString::sprintf(tmp,"%TQInitUMode",&prefix);
KviTQString::sprintf(tmp,"%QInitUMode",&prefix);
cfg->writeEntry(tmp,m_szInitUMode);
}
if(autoJoinChannelList())
{
KviTQString::sprintf(tmp,"%TQAutoJoinChannels",&prefix);
KviTQString::sprintf(tmp,"%QAutoJoinChannels",&prefix);
cfg->writeEntry(tmp,*(autoJoinChannelList()));
}
if(autoConnect()) // otherwise it defaults to false anyway
{
KviTQString::sprintf(tmp,"%TQAutoConnect",&prefix);
KviTQString::sprintf(tmp,"%QAutoConnect",&prefix);
cfg->writeEntry(tmp,autoConnect());
}
if(!m_szEncoding.isEmpty())
{
KviTQString::sprintf(tmp,"%TQEncoding",&prefix);
KviTQString::sprintf(tmp,"%QEncoding",&prefix);
cfg->writeEntry(tmp,m_szEncoding);
}
if(!m_szOnConnectCommand.isEmpty())
{
KviTQString::sprintf(tmp,"%TQOnConnectCommand",&prefix);
KviTQString::sprintf(tmp,"%QOnConnectCommand",&prefix);
cfg->writeEntry(tmp,m_szOnConnectCommand);
}
if(!m_szOnLoginCommand.isEmpty())
{
KviTQString::sprintf(tmp,"%TQOnLoginCommand",&prefix);
KviTQString::sprintf(tmp,"%QOnLoginCommand",&prefix);
cfg->writeEntry(tmp,m_szOnLoginCommand);
}
if(!m_szLinkFilter.isEmpty())
{
KviTQString::sprintf(tmp,"%TQLinkFilter",&prefix);
KviTQString::sprintf(tmp,"%QLinkFilter",&prefix);
cfg->writeEntry(tmp,m_szLinkFilter);
}
if(m_uPort != 6667)
{
KviTQString::sprintf(tmp,"%TQPort",&prefix);
KviTQString::sprintf(tmp,"%QPort",&prefix);
cfg->writeEntry(tmp,m_uPort);
}
if(isIpV6())
{
KviTQString::sprintf(tmp,"%TQIpV6",&prefix);
KviTQString::sprintf(tmp,"%QIpV6",&prefix);
cfg->writeEntry(tmp,isIpV6());
}
if(cacheIp())
{
KviTQString::sprintf(tmp,"%TQCacheIp",&prefix);
KviTQString::sprintf(tmp,"%QCacheIp",&prefix);
cfg->writeEntry(tmp,cacheIp());
}
if(useSSL())
{
KviTQString::sprintf(tmp,"%TQSSL",&prefix);
KviTQString::sprintf(tmp,"%QSSL",&prefix);
cfg->writeEntry(tmp,useSSL());
}
if(proxy()!=-2)
{
KviTQString::sprintf(tmp,"%TQProxy",&prefix);
KviTQString::sprintf(tmp,"%QProxy",&prefix);
cfg->writeEntry(tmp,proxy());
}
if(!m_szUserIdentityId.isEmpty())
{
KviTQString::sprintf(tmp,"%TQUserIdentityId",&prefix);
KviTQString::sprintf(tmp,"%QUserIdentityId",&prefix);
cfg->writeEntry(tmp,m_szUserIdentityId);
}
}

32
src/kvilib/irc/kvi_nickserv.cpp
Unescape Escape View File

@ -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();
}

10
src/kvilib/system/kvi_locale.cpp
Unescape Escape View File

@ -885,7 +885,7 @@ namespace KviLocale
TQString szLocDir = szLocaleDir;
KviTQString::ensureLastCharIs(szLocDir,KVI_PATH_SEPARATOR_CHAR);
KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr());
KviTQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
if(KviFileUtils::fileExists(szBuffer))return true;
@ -895,7 +895,7 @@ namespace KviLocale
// kill them
szLocale.cutFromFirst('.');
KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr());
KviTQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
if(KviFileUtils::fileExists(szBuffer))return true;
}
@ -904,7 +904,7 @@ namespace KviLocale
// things like @euro ?
// kill them
szLocale.cutFromFirst('@');
KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr());
KviTQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
if(KviFileUtils::fileExists(szBuffer))return true;
}
@ -913,13 +913,13 @@ namespace KviLocale
// things like en_GB
// kill them
szLocale.cutFromFirst('_');
KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr());
KviTQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
if(KviFileUtils::fileExists(szBuffer))return true;
}
// try the lower case version too
szLocale.toLower();
KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr());
KviTQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
if(KviFileUtils::fileExists(szBuffer))return true;
return false;

82
src/kvirc/kvs/kvi_kvs_popupmenu.cpp
Unescape Escape View File

@ -921,52 +921,52 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg)
{
for(idx = 0;idx < cnt;idx++)
{
KviTQString::sprintf(tmp,"%TQ_Prologue%d",&(prefix),idx);
KviTQString::sprintf(tmp,"%Q_Prologue%d",&(prefix),idx);
TQString pr = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx);
KviTQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx);
TQString itemName = cfg->readTQStringEntry(tmp,"");
if(!pr.isEmpty())addPrologue(itemName,pr);
}
} else {
// Might be old version!
KviTQString::sprintf(tmp,"%TQ_Prologue",&(prefix));
KviTQString::sprintf(tmp,"%Q_Prologue",&(prefix));
TQString pr = cfg->readTQStringEntry(tmp,"");
if(!pr.isEmpty())addPrologue(TQString(),pr);
}
KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix);
KviTQString::sprintf(tmp,"%Q_EpilogueCount",&prefix);
cnt = cfg->readIntEntry(tmp,0);
if(cnt > 0)
{
for(idx = 0;idx < cnt;idx++)
{
KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx);
KviTQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx);
TQString ep = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx);
KviTQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx);
TQString itemName = cfg->readTQStringEntry(tmp,"");
if(!ep.isEmpty())addEpilogue(itemName,ep);
}
} else {
// Might be old version!
KviTQString::sprintf(tmp,"%TQ_Epilogue",&prefix);
KviTQString::sprintf(tmp,"%Q_Epilogue",&prefix);
TQString ep = cfg->readTQStringEntry(tmp,"");
if(!ep.isEmpty())addEpilogue(TQString(),ep);
}
KviTQString::sprintf(tmp,"%TQ_Count",&prefix);
KviTQString::sprintf(tmp,"%Q_Count",&prefix);
cnt = cfg->readIntEntry(tmp,0);
for(idx = 0;idx < cnt;idx++)
{
TQString pre;
KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx);
KviTQString::sprintf(pre,"%Q_%d",&prefix,idx);
KviTQString::sprintf(tmp,"%TQ_Id",&pre);
KviTQString::sprintf(tmp,"%Q_Id",&pre);
TQString itemName = cfg->readTQStringEntry(tmp,TQString());
KviTQString::sprintf(tmp,"%TQ_Type",&pre);
KviTQString::sprintf(tmp,"%Q_Type",&pre);
int type = cfg->readIntEntry(tmp,3);
switch(type)
@ -974,7 +974,7 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg)
case 0: // separator
{
TQString expr;
KviTQString::sprintf(tmp,"%TQ_Expr",&pre);
KviTQString::sprintf(tmp,"%Q_Expr",&pre);
expr = cfg->readTQStringEntry(tmp,"");
addSeparator(itemName,expr);
}
@ -982,13 +982,13 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg)
case 1: // item
{
TQString text,icon,code,expr;
KviTQString::sprintf(tmp,"%TQ_Text",&pre);
KviTQString::sprintf(tmp,"%Q_Text",&pre);
text = cfg->readTQStringEntry(tmp,"Unnamed");
KviTQString::sprintf(tmp,"%TQ_Icon",&pre);
KviTQString::sprintf(tmp,"%Q_Icon",&pre);
icon = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_Code",&pre);
KviTQString::sprintf(tmp,"%Q_Code",&pre);
code = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_Expr",&pre);
KviTQString::sprintf(tmp,"%Q_Expr",&pre);
expr = cfg->readTQStringEntry(tmp,"");
addItem(itemName,code,text,icon,expr);
}
@ -996,11 +996,11 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg)
case 2: // menu
{
TQString text,icon,expr;
KviTQString::sprintf(tmp,"%TQ_Text",&pre);
KviTQString::sprintf(tmp,"%Q_Text",&pre);
text = cfg->readTQStringEntry(tmp,"Unnamed");
KviTQString::sprintf(tmp,"%TQ_Icon",&pre);
KviTQString::sprintf(tmp,"%Q_Icon",&pre);
icon = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_Expr",&pre);
KviTQString::sprintf(tmp,"%Q_Expr",&pre);
expr = cfg->readTQStringEntry(tmp,"");
KviKvsPopupMenu * pop = addPopup(itemName,text,icon,expr);
pop->load(pre,cfg);
@ -1009,11 +1009,11 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg)
case 3: // label
{
TQString text,icon,expr;
KviTQString::sprintf(tmp,"%TQ_Text",&pre);
KviTQString::sprintf(tmp,"%Q_Text",&pre);
text = cfg->readTQStringEntry(tmp,"Unnamed");
KviTQString::sprintf(tmp,"%TQ_Icon",&pre);
KviTQString::sprintf(tmp,"%Q_Icon",&pre);
icon = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_Expr",&pre);
KviTQString::sprintf(tmp,"%Q_Expr",&pre);
expr = cfg->readTQStringEntry(tmp,"");
addLabel(itemName,text,icon,expr);
}
@ -1021,13 +1021,13 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg)
case 4: // extmenu
{
TQString text,icon,code,expr;
KviTQString::sprintf(tmp,"%TQ_Text",&pre);
KviTQString::sprintf(tmp,"%Q_Text",&pre);
text = cfg->readTQStringEntry(tmp,"Unnamed");
KviTQString::sprintf(tmp,"%TQ_Icon",&pre);
KviTQString::sprintf(tmp,"%Q_Icon",&pre);
icon = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_ExtName",&pre);
KviTQString::sprintf(tmp,"%Q_ExtName",&pre);
code = cfg->readTQStringEntry(tmp,"");
KviTQString::sprintf(tmp,"%TQ_Expr",&pre);
KviTQString::sprintf(tmp,"%Q_Expr",&pre);
expr = cfg->readTQStringEntry(tmp,"");
addExtPopup(itemName,code,text,icon,expr);
}
@ -1048,33 +1048,33 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg)
KviKvsScript * s;
TQString tmp;
KviTQString::sprintf(tmp,"%TQ_PrologueCount",&prefix);
KviTQString::sprintf(tmp,"%Q_PrologueCount",&prefix);
cfg->writeEntry(tmp,m_pPrologues->count());
idx = 0;
for(s = m_pPrologues->first();s;s = m_pPrologues->next())
{
KviTQString::sprintf(tmp,"%TQ_Prologue%d",&prefix,idx);
KviTQString::sprintf(tmp,"%Q_Prologue%d",&prefix,idx);
cfg->writeEntry(tmp,s->code());
KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&prefix,idx);
KviTQString::sprintf(tmp,"%Q_PrologueId%d",&prefix,idx);
cfg->writeEntry(tmp,s->name());
idx++;
}
KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix);
KviTQString::sprintf(tmp,"%Q_EpilogueCount",&prefix);
cfg->writeEntry(tmp,m_pEpilogues->count());
idx = 0;
for(s = m_pEpilogues->first();s;s = m_pEpilogues->next())
{
KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx);
KviTQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx);
cfg->writeEntry(tmp,s->code());
KviTQString::sprintf(tmp,"%TQ_EpilogueId%d",&prefix,idx);
KviTQString::sprintf(tmp,"%Q_EpilogueId%d",&prefix,idx);
cfg->writeEntry(tmp,s->name());
idx++;
}
KviTQString::sprintf(tmp,"%TQ_Count",&prefix);
KviTQString::sprintf(tmp,"%Q_Count",&prefix);
cfg->writeEntry(tmp,m_pItemList->count());
idx = 0;
@ -1082,8 +1082,8 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg)
for(KviKvsPopupMenuItem * it = m_pItemList->first();it;it = m_pItemList->next())
{
TQString pre;
KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx);
KviTQString::sprintf(tmp,"%TQ_Type",&pre);
KviTQString::sprintf(pre,"%Q_%d",&prefix,idx);
KviTQString::sprintf(tmp,"%Q_Type",&pre);
int typeCode = 0;
switch(it->type())
{
@ -1096,34 +1096,34 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg)
cfg->writeEntry(tmp,typeCode);
KviTQString::sprintf(tmp,"%TQ_Id",&pre);
KviTQString::sprintf(tmp,"%Q_Id",&pre);
cfg->writeEntry(tmp,it->name());
s = it->kvsCondition();
if(s)
{
KviTQString::sprintf(tmp,"%TQ_Expr",&pre);
KviTQString::sprintf(tmp,"%Q_Expr",&pre);
cfg->writeEntry(tmp,s->code());
}
s = it->kvsIcon();
if(s)
{
KviTQString::sprintf(tmp,"%TQ_Icon",&pre);
KviTQString::sprintf(tmp,"%Q_Icon",&pre);
cfg->writeEntry(tmp,s->code());
}
s = it->kvsText();
if(s)
{
KviTQString::sprintf(tmp,"%TQ_Text",&pre);
KviTQString::sprintf(tmp,"%Q_Text",&pre);
cfg->writeEntry(tmp,s->code());
}
s = it->kvsCode();
if(s)
{
KviTQString::sprintf(tmp,"%TQ_Code",&pre);
KviTQString::sprintf(tmp,"%Q_Code",&pre);
cfg->writeEntry(tmp,s->code());
}
@ -1132,7 +1132,7 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg)
((KviKvsPopupMenuItemMenu *)it)->menu()->save(pre,cfg);
} else if(it->isExtMenu())
{
KviTQString::sprintf(tmp,"%TQ_ExtName",&pre);
KviTQString::sprintf(tmp,"%Q_ExtName",&pre);
cfg->writeEntry(tmp,((KviKvsPopupMenuItemExtMenu *)it)->extName());
}

2
src/modules/eventeditor/eventeditor.cpp
Unescape Escape View File

@ -193,7 +193,7 @@ void KviEventEditor::getUniqueHandlerName(KviEventListViewItem *it,TQString &buf
if(KviTQString::equalCI(newName,ch->m_szName))
{
bFound = true;
KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx);
KviTQString::sprintf(newName,"%Q_%d",&buffer,idx);
idx++;
break;
}

2
src/modules/raweditor/raweditor.cpp
Unescape Escape View File

@ -196,7 +196,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawListViewItem *it,TQString &buffer)
if(KviTQString::equalCI(newName,ch->m_szName))
{
bFound = true;
KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx);
KviTQString::sprintf(newName,"%Q_%d",&buffer,idx);
idx++;
break;
}

Write Preview
Loading…
Cancel
Save