summaryrefslogtreecommitdiffstats
path: root/src/kvilib
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib')
-rw-r--r--src/kvilib/config/kvi_settings.h6
-rw-r--r--src/kvilib/config/kvi_wincfg.h3
-rw-r--r--src/kvilib/core/kvi_pointerlist.h4
-rw-r--r--src/kvilib/irc/kvi_ircserver.cpp84
-rw-r--r--src/kvilib/irc/kvi_nickserv.cpp32
-rw-r--r--src/kvilib/system/kvi_locale.cpp18
6 files changed, 69 insertions, 78 deletions
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index c9baf3a..dddfe3a 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -76,10 +76,6 @@
#define VERSION "?.?.?"
#endif
- #ifndef BUILD_DATE
- #define BUILD_DATE "?"
- #endif
-
#ifndef BUILD_FLAGS
#define BUILD_FLAGS "?"
#endif
@@ -87,8 +83,6 @@
#endif
#define KVI_VERSION VERSION
-#define KVI_VERSION_BRANCH VERSION_BRANCH
-#define KVI_BUILD_DATE BUILD_DATE
#define KVI_BUILD_FLAGS BUILD_FLAGS
#define KVI_RELEASE_NAME "Virgo"
diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h
index 062aa81..c10ad5b 100644
--- a/src/kvilib/config/kvi_wincfg.h
+++ b/src/kvilib/config/kvi_wincfg.h
@@ -85,9 +85,6 @@
/* define if you have the SIOCGIFADDR ioctl and the related headers */
/* #undef COMPILE_GET_INTERFACE_ADDRESS */
-/* this is the build date (configure date rather) */
-#define BUILD_DATE __DATE__" "__TIME__
-
/* these are the build flags */
#define BUILD_FLAGS "win32"
diff --git a/src/kvilib/core/kvi_pointerlist.h b/src/kvilib/core/kvi_pointerlist.h
index b46343c..35abaa7 100644
--- a/src/kvilib/core/kvi_pointerlist.h
+++ b/src/kvilib/core/kvi_pointerlist.h
@@ -1036,7 +1036,7 @@ public:
///
/// creates a template list
///
- KviPointerList<T>(bool bAutoDelete = true)
+ KviPointerList(bool bAutoDelete = true)
{
m_bAutoDelete = bAutoDelete;
m_pHead = NULL;
@@ -1049,7 +1049,7 @@ public:
/// destroys the list
/// if autoDelete() is set to true, all the items are deleted
///
- virtual ~KviPointerList<T>()
+ virtual ~KviPointerList()
{
clear();
};
diff --git a/src/kvilib/irc/kvi_ircserver.cpp b/src/kvilib/irc/kvi_ircserver.cpp
index 8e1898f..659241d 100644
--- a/src/kvilib/irc/kvi_ircserver.cpp
+++ b/src/kvilib/irc/kvi_ircserver.cpp
@@ -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);
}
}
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();
}
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index 6f083e8..29794ac 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -859,7 +859,8 @@ namespace KviLocale
TQString szBuffer;
- if(findCatalogue(szBuffer,name,szLocaleDir))
+ TQString catalog_name = TQString("kvirc-" + name);
+ if(findCatalogue(szBuffer,catalog_name,szLocaleDir))
{
KviMessageCatalogue * c = new KviMessageCatalogue();
if(c->load(szBuffer))
@@ -885,7 +886,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%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name);
if(KviFileUtils::fileExists(szBuffer))return true;
@@ -895,7 +896,7 @@ namespace KviLocale
// kill them
szLocale.cutFromFirst('.');
- KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr());
+ KviTQString::sprintf(szBuffer,"%Q%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name);
if(KviFileUtils::fileExists(szBuffer))return true;
}
@@ -904,7 +905,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%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name);
if(KviFileUtils::fileExists(szBuffer))return true;
}
@@ -913,13 +914,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%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name);
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%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name);
if(KviFileUtils::fileExists(szBuffer))return true;
return false;
@@ -928,11 +929,11 @@ namespace KviLocale
//
// This function attempts to determine the current locale
// and then load the corresponding translation file
- // from the KVIrc locale directory
+ // from the system locale directory
// Returns true if the locale was correctly set
// i.e. the locale is C or POSIX (no translation needed)
// or the locale is correctly defined and the
- // translation map was sucesfully loaded
+ // translation map was successfully loaded
//
void init(TQApplication * app,const TQString &localeDir)
@@ -953,7 +954,6 @@ namespace KviLocale
if(g_szLang.isEmpty())g_szLang = "en";
g_szLang.stripWhiteSpace();
- // the main catalogue is supposed to be kvirc_<language>.mo
g_pMainCatalogue = new KviMessageCatalogue();
// the catalogue dict
g_pCatalogueDict = new KviPointerHashTable<const char *,KviMessageCatalogue>;
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-07 17:13:58 +0000