summaryrefslogtreecommitdiffstats
path: root/src/kvilib/ext
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib/ext')
-rw-r--r--src/kvilib/ext/kvi_config.cpp82
-rw-r--r--src/kvilib/ext/kvi_crypt.cpp4
-rw-r--r--src/kvilib/ext/kvi_databuffer.cpp4
-rw-r--r--src/kvilib/ext/kvi_databuffer.h4
-rw-r--r--src/kvilib/ext/kvi_garbage.cpp2
-rw-r--r--src/kvilib/ext/kvi_imagelib.h2
-rw-r--r--src/kvilib/ext/kvi_mediatype.cpp6
-rw-r--r--src/kvilib/ext/kvi_regchan.cpp10
-rw-r--r--src/kvilib/ext/kvi_regchan.h6
-rw-r--r--src/kvilib/ext/kvi_regusersdb.cpp36
-rw-r--r--src/kvilib/ext/kvi_regusersdb.h2
-rw-r--r--src/kvilib/ext/kvi_sharedfiles.cpp18
-rw-r--r--src/kvilib/ext/kvi_stringconversion.cpp18
13 files changed, 97 insertions, 97 deletions
diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp
index c0eb124e..fc14dfaf 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/kvi_config.cpp
@@ -80,7 +80,7 @@ void KviConfig::clearGroup(const TQString & szGroup)
{
m_bDirty = true;
m_pDict->remove(szGroup);
- if(!m_pDict->tqfind(m_szGroup))m_szGroup = KVI_CONFIG_DEFAULT_GROUP; //removed the current one
+ if(!m_pDict->find(m_szGroup))m_szGroup = KVI_CONFIG_DEFAULT_GROUP; //removed the current one
}
void KviConfig::clearKey(const TQString & szKey)
@@ -282,7 +282,7 @@ bool KviConfig::load()
TQString szGroup = m_bLocal8Bit ?
TQString::fromLocal8Bit(tmp.ptr(),tmp.len()) :
TQString::fromUtf8(tmp.ptr(),tmp.len());
- p_group = m_pDict->tqfind(szGroup);
+ p_group = m_pDict->find(szGroup);
if(!p_group)
{
p_group = new KviConfigGroup(17,false);
@@ -324,13 +324,13 @@ bool KviConfig::load()
p_group->setAutoDelete(true);
m_pDict->insert(KVI_CONFIG_DEFAULT_GROUP,p_group);
}
- p_group->tqreplace(szKey,pVal);
+ p_group->replace(szKey,pVal);
} else {
// we in fact need this (mercy :D)
// otherwise the empty options will be treated as non-existing ones
// and will get the defaults (which is bad)
TQString * pVal = new TQString(TQString());
- p_group->tqreplace(szKey,pVal);
+ p_group->replace(szKey,pVal);
}
}
}
@@ -390,7 +390,7 @@ bool KviConfig::load()
if(dataLine.hasData())
{
TQString szUtf8 = TQString::fromUtf8(dataLine.ptr());
- p_group = m_pDict->tqfind(szUtf8);
+ p_group = m_pDict->find(szUtf8);
if(!p_group)
{
@@ -422,7 +422,7 @@ bool KviConfig::load()
m_pDict->insert(KVI_CONFIG_DEFAULT_GROUP,p_group);
}
TQString szName = TQString::fromUtf8(name.ptr());
- p_group->tqreplace(szName,p_data);
+ p_group->replace(szName,p_data);
}
}
break;
@@ -550,18 +550,18 @@ void KviConfig::setGroup(const TQString & szGroup)
bool KviConfig::hasKey(const TQString & szKey)
{
KviConfigGroup * p_group = getCurrentGroup();
- return (p_group->tqfind(szKey) != 0);
+ return (p_group->find(szKey) != 0);
}
bool KviConfig::hasGroup(const TQString & szGroup)
{
- return (m_pDict->tqfind(szGroup) != 0);
+ return (m_pDict->find(szGroup) != 0);
}
KviConfigGroup * KviConfig::getCurrentGroup()
{
if(m_szGroup.isEmpty())m_szGroup = KVI_CONFIG_DEFAULT_GROUP;
- KviConfigGroup * p_group = m_pDict->tqfind(m_szGroup);
+ KviConfigGroup * p_group = m_pDict->find(m_szGroup);
if(!p_group)
{
//create the group
@@ -579,7 +579,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQString & szValue)
m_bDirty = true;
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data=new TQString(szValue);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
// FIXME: #warning "We have probs here ?"
@@ -587,7 +587,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQString & szValue)
TQString KviConfig::readEntry(const TQString & szKey,const TQString & szDefault)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)
{
m_szStrBuffer = szDefault;
@@ -603,7 +603,7 @@ TQString KviConfig::readEntry(const TQString & szKey,const TQString & szDefault)
TQString KviConfig::readTQStringEntry(const char *szKey,const TQString &szDefault)
{
KviStrDict * p_group = getCurrentGroup();
- KviStr * p_str = p_group->tqfind(szKey);
+ KviStr * p_str = p_group->find(szKey);
if(!p_str)return szDefault;
return TQString::fromUtf8(p_str->ptr());
}
@@ -614,7 +614,7 @@ void KviConfig::writeEntry(const char *szKey,const TQString &szValue)
{
m_bDirty = true;
KviStrDict * p_group = getCurrentGroup();
- p_group->tqreplace(szKey,new KviStr(szValue.utf8().data()));
+ p_group->replace(szKey,new KviStr(szValue.utf8().data()));
}
*/
@@ -625,7 +625,7 @@ static TQString g_szConfigStringListSeparator(",\\[ITEM],");
TQStringList KviConfig::readStringListEntry(const TQString & szKey,const TQStringList &list)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return list;
#ifdef COMPILE_USE_QT4
return p_str->split(g_szConfigStringListSeparator);
@@ -639,7 +639,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQStringList &list)
m_bDirty = true;
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data=new TQString(list.join(g_szConfigStringListSeparator));
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
////////////////////////////////// KviValueList<int>
@@ -647,7 +647,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQStringList &list)
KviValueList<int> KviConfig::readIntListEntry(const TQString & szKey,const KviValueList<int> &list)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)
{
//debug("Returning default list for group %s and key %s",m_szGroup.latin1(),szKey.latin1());
@@ -685,7 +685,7 @@ void KviConfig::writeEntry(const TQString & szKey,const KviValueList<int> &list)
}
//debug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr());
- p_group->tqreplace(szKey,new TQString(szData.ptr()));
+ p_group->replace(szKey,new TQString(szData.ptr()));
}
////////////////////////////////// KviPixmap
@@ -698,13 +698,13 @@ void KviConfig::writeEntry(const TQString & szKey,const KviPixmap &pixmap)
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data=new TQString();
KviStringConversion::toString(pixmap,*p_data);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
KviPixmap KviConfig::readPixmapEntry(const TQString & szKey,const KviPixmap &pixDef)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(p_str)
{
KviPixmap ret("");
@@ -722,13 +722,13 @@ void KviConfig::writeEntry(const TQString & szKey,const KviMsgType &msg)
KviConfigGroup * p_group = getCurrentGroup();
TQString szData;
KviStringConversion::toString(msg,szData);
- p_group->tqreplace(szKey,new TQString(szData));
+ p_group->replace(szKey,new TQString(szData));
}
KviMsgType KviConfig::readMsgTypeEntry(const TQString & szKey,const KviMsgType &msgDef)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return msgDef;
KviMsgType ret = msgDef;
KviStringConversion::fromString(*p_str,ret);
@@ -742,14 +742,14 @@ void KviConfig::writeEntry(const TQString & szKey,const TQColor &clr)
m_bDirty = true;
KviConfigGroup * p_group = getCurrentGroup();
KviStr szData(KviStr::Format,"%d,%d,%d",clr.red(),clr.green(),clr.blue());
- p_group->tqreplace(szKey,new TQString(szData.ptr()));
+ p_group->replace(szKey,new TQString(szData.ptr()));
}
TQColor KviConfig::readColorEntry(const TQString & szKey,const TQColor &clr)
{
KviConfigGroup * p_group = getCurrentGroup();
TQColor color(clr);
- TQString * pointer_that_IS_initialized = p_group->tqfind(szKey);
+ TQString * pointer_that_IS_initialized = p_group->find(szKey);
if(pointer_that_IS_initialized)
@@ -793,7 +793,7 @@ void KviConfig::writeEntry(const TQString & szKey,TQFont &fnt)
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data = new TQString();
KviStringConversion::toString(fnt,*p_data);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
@@ -806,7 +806,7 @@ TQFont KviConfig::readFontEntry(const TQString & szKey,const TQFont &fnt)
{
TQFont font(fnt);
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(p_str)
{
//FontEntry=Arial,12,9,0,100,italic,underline,strikeout,
@@ -824,13 +824,13 @@ void KviConfig::writeEntry(const TQString & szKey,bool bTrue)
m_bDirty = true;
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data = new TQString(bTrue ? "true" : "false");
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
bool KviConfig::readBoolEntry(const TQString & szKey,bool bTrue)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return bTrue;
static TQString szTrue = "true";
return (KviTQString::toLower(*p_str) == szTrue);
@@ -844,13 +844,13 @@ void KviConfig::writeEntry(const TQString & szKey,const TQRect &rct)
KviConfigGroup * p_group = getCurrentGroup();
TQString szBuf;
KviStringConversion::toString(rct,szBuf);
- p_group->tqreplace(szKey,new TQString(szBuf));
+ p_group->replace(szKey,new TQString(szBuf));
}
TQRect KviConfig::readRectEntry(const TQString & szKey,const TQRect &rct)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * str = p_group->tqfind(szKey);
+ TQString * str = p_group->find(szKey);
if(!str)return rct;
TQRect ret;
return KviStringConversion::fromString(*str,ret) ? ret : rct;
@@ -864,13 +864,13 @@ void KviConfig::writeEntry(const TQString & szKey,unsigned short usValue)
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data = new TQString();
p_data->setNum(usValue);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
unsigned short int KviConfig::readUShortEntry(const TQString & szKey,unsigned short int usDefault)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return usDefault;
bool bOk;
unsigned short int usVal=p_str->toUShort(&bOk);
@@ -887,13 +887,13 @@ void KviConfig::writeEntry(const char *szKey,unsigned long lValue)
KviStrDict * p_group = getCurrentGroup();
KviStr *p_data = new KviStr();
p_data->setNum(lValue);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
unsigned long KviConfig::readULongEntry(const char *szKey,unsigned long lDefault)
{
KviStrDict * p_group = getCurrentGroup();
- KviStr * p_str = p_group->tqfind(szKey);
+ KviStr * p_str = p_group->find(szKey);
if(!p_str)return lDefault;
bool bOk;
unsigned long lVal=p_str->toULong(&bOk);
@@ -909,13 +909,13 @@ void KviConfig::writeEntry(const TQString & szKey,int iValue)
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data = new TQString();
p_data->setNum(iValue);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
int KviConfig::readIntEntry(const TQString & szKey,int iDefault)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return iDefault;
bool bOk;
int iVal=p_str->toInt(&bOk);
@@ -930,13 +930,13 @@ void KviConfig::writeEntry(const TQString & szKey,unsigned int iValue)
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data = new TQString();
p_data->setNum(iValue);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
unsigned int KviConfig::readUIntEntry(const TQString & szKey,unsigned int iDefault)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return iDefault;
bool bOk;
unsigned int iVal=p_str->toUInt(&bOk);
@@ -951,13 +951,13 @@ void KviConfig::writeEntry(const TQString & szKey,char iValue)
KviConfigGroup * p_group = getCurrentGroup();
TQString * p_data = new TQString();
p_data->setNum(iValue);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
char KviConfig::readCharEntry(const TQString & szKey,char iDefault)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return iDefault;
bool bOk;
char iVal=(char)p_str->toInt(&bOk);
@@ -972,13 +972,13 @@ void KviConfig::writeEntry(const TQString & szKey,unsigned char iValue)
KviConfigGroup * p_group = getCurrentGroup();
TQString *p_data = new TQString();
p_data->setNum(iValue);
- p_group->tqreplace(szKey,p_data);
+ p_group->replace(szKey,p_data);
}
unsigned char KviConfig::readUCharEntry(const TQString & szKey,unsigned char iDefault)
{
KviConfigGroup * p_group = getCurrentGroup();
- TQString * p_str = p_group->tqfind(szKey);
+ TQString * p_str = p_group->find(szKey);
if(!p_str)return iDefault;
bool bOk;
unsigned char iVal=(unsigned char)p_str->toUInt(&bOk);
diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp
index 52a747ae..959fe510 100644
--- a/src/kvilib/ext/kvi_crypt.cpp
+++ b/src/kvilib/ext/kvi_crypt.cpp
@@ -200,7 +200,7 @@
void KviCryptEngineManager::registerEngine(KviCryptEngineDescription * d)
{
- m_pEngineDict->tqreplace(d->szName,d);
+ m_pEngineDict->replace(d->szName,d);
}
void KviCryptEngineManager::unregisterEngine(const TQString &szName)
@@ -222,7 +222,7 @@
KviCryptEngine * KviCryptEngineManager::allocateEngine(const TQString &szName)
{
- KviCryptEngineDescription * d = m_pEngineDict->tqfind(szName);
+ KviCryptEngineDescription * d = m_pEngineDict->find(szName);
if(!d)return 0;
KviCryptEngine * e = d->allocFunc();
if(!e)return 0;
diff --git a/src/kvilib/ext/kvi_databuffer.cpp b/src/kvilib/ext/kvi_databuffer.cpp
index b0ca288c..7cad39c4 100644
--- a/src/kvilib/ext/kvi_databuffer.cpp
+++ b/src/kvilib/ext/kvi_databuffer.cpp
@@ -56,7 +56,7 @@ KviDataBuffer::~KviDataBuffer()
}
}
-int KviDataBuffer::tqfind(const unsigned char * block,int uSize)
+int KviDataBuffer::find(const unsigned char * block,int uSize)
{
if(uSize < 1)return -1;
if(uSize > m_uSize)return -1;
@@ -85,7 +85,7 @@ int KviDataBuffer::tqfind(const unsigned char * block,int uSize)
return -1;
}
-int KviDataBuffer::tqfind(unsigned char c)
+int KviDataBuffer::find(unsigned char c)
{
const unsigned char * p = m_pData;
const unsigned char * e = p + m_uSize;
diff --git a/src/kvilib/ext/kvi_databuffer.h b/src/kvilib/ext/kvi_databuffer.h
index 9fa7487b..62e09b06 100644
--- a/src/kvilib/ext/kvi_databuffer.h
+++ b/src/kvilib/ext/kvi_databuffer.h
@@ -49,8 +49,8 @@ public:
void addSize(int uSize){ resize(m_uSize + uSize); };
void append(const unsigned char * data,int uSize);
void append(const KviDataBuffer &b){ append(b.data(),b.size()); };
- int tqfind(unsigned char c);
- int tqfind(const unsigned char * block,int uSize);
+ int find(unsigned char c);
+ int find(const unsigned char * block,int uSize);
};
#endif //_KVI_DATABUFFER_H_
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
index 10aacd26..fc4493a4 100644
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ b/src/kvilib/ext/kvi_garbage.cpp
@@ -62,7 +62,7 @@ void KviGarbageCollector::garbageSuicide()
debug("Ops... garbage suicide while no garbage list");
return;
}
- int idx = m_pGarbageList->tqfindRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
+ int idx = m_pGarbageList->findRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
if(idx == -1)
{
debug("Ops... unregistered garbage suicide");
diff --git a/src/kvilib/ext/kvi_imagelib.h b/src/kvilib/ext/kvi_imagelib.h
index 1bbccb1b..539e5a9a 100644
--- a/src/kvilib/ext/kvi_imagelib.h
+++ b/src/kvilib/ext/kvi_imagelib.h
@@ -25,7 +25,7 @@
//
// A class to manage multiple image libraries.
-// The library is in fact a big image that tqcontains
+// The library is in fact a big image that contains
// several rows of other smaller images of the same size.
// The images inside the 'library' are indexed in the following way:
//
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index 4601e6bd..d7adeb2e 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -165,7 +165,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
} // else the current has no wildcards...skip
} else {
// the new tqmask has no wildcards....
- if(mt->szFileMask.tqcontains('*'))
+ if(mt->szFileMask.contains('*'))
{
// current one has wildcards...insert
m_pMediaTypeList->insert(index,m);
@@ -188,7 +188,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
// the masks with no wildcards go first
// longer masks go first
- bool bHasWildcards = m->szFileMask.tqcontains('*');
+ bool bHasWildcards = m->szFileMask.contains('*');
int index = 0;
for(KviMediaType * mt = m_pMediaTypeList->first();mt;mt = m_pMediaTypeList->next())
{
@@ -207,7 +207,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
}
}
} else {
- if(mt->szFileMask.tqcontains('*'))
+ if(mt->szFileMask.contains('*'))
{
m_pMediaTypeList->insert(index,m);
return;
diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp
index d5eff0a3..434ebd9f 100644
--- a/src/kvilib/ext/kvi_regchan.cpp
+++ b/src/kvilib/ext/kvi_regchan.cpp
@@ -99,9 +99,9 @@ void KviRegisteredChannelDataBase::save(const char * filename)
}
}
-KviRegisteredChannel * KviRegisteredChannelDataBase::tqfind(const char * name,const char * net)
+KviRegisteredChannel * KviRegisteredChannelDataBase::find(const char * name,const char * net)
{
- KviRegisteredChannelList * l = m_pChannelDict->tqfind(name);
+ KviRegisteredChannelList * l = m_pChannelDict->find(name);
if(!l)return 0;
for(KviRegisteredChannel * c = l->first();c;c = l->next())
{
@@ -113,7 +113,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::tqfind(const char * name,co
KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * nettqmask)
{
- KviRegisteredChannelList * l = m_pChannelDict->tqfind(name);
+ KviRegisteredChannelList * l = m_pChannelDict->find(name);
if(!l)return 0;
for(KviRegisteredChannel * c = l->first();c;c = l->next())
{
@@ -124,7 +124,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name
void KviRegisteredChannelDataBase::remove(KviRegisteredChannel * c)
{
- KviRegisteredChannelList * l = m_pChannelDict->tqfind(c->name().ptr());
+ KviRegisteredChannelList * l = m_pChannelDict->find(c->name().ptr());
if(!l)return;
for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
{
@@ -156,7 +156,7 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c)
}
remove(old);
}
- KviRegisteredChannelList * l = m_pChannelDict->tqfind(c->name().ptr());
+ KviRegisteredChannelList * l = m_pChannelDict->find(c->name().ptr());
if(!l)
{
l = new KviRegisteredChannelList;
diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h
index 65393918..5cdad198 100644
--- a/src/kvilib/ext/kvi_regchan.h
+++ b/src/kvilib/ext/kvi_regchan.h
@@ -45,9 +45,9 @@ public:
KviPointerHashTable<const char *,KviStr> * propertyDict(){ return m_pPropertyDict; };
const KviStr & name(){ return m_szName; };
const KviStr & netMask(){ return m_szNetMask; };
- KviStr * property(const char * name){ return m_pPropertyDict->tqfind(name); };
+ KviStr * property(const char * name){ return m_pPropertyDict->find(name); };
// val must be allocated with NEW!
- void setProperty(const char * name,KviStr * val){ m_pPropertyDict->tqreplace(name,val); };
+ void setProperty(const char * name,KviStr * val){ m_pPropertyDict->replace(name,val); };
void removeProperty(const char * name){ m_pPropertyDict->remove(name); };
};
@@ -62,7 +62,7 @@ protected:
KviPointerHashTable<const char *,KviRegisteredChannelList> * m_pChannelDict;
public:
KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; };
- KviRegisteredChannel * tqfind(const char * name,const char * net);
+ KviRegisteredChannel * find(const char * name,const char * net);
KviRegisteredChannel * findExact(const char * name,const char * nettqmask);
void remove(KviRegisteredChannel * c);
void add(KviRegisteredChannel * c);
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index 0a0c632a..6145d0ba 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -237,7 +237,7 @@ void KviRegisteredUser::setProperty(const TQString & name,const TQString & value
#endif
if(!val->isEmpty())
{
- m_pPropertyDict->tqreplace(name,val);
+ m_pPropertyDict->replace(name,val);
} else {
delete val;
val = 0;
@@ -251,7 +251,7 @@ bool KviRegisteredUser::getProperty(const TQString & name,TQString &value)
{
if(!m_pPropertyDict)return false;
if(name.isEmpty()) return false;
- TQString * pValue = m_pPropertyDict->tqfind(name);
+ TQString * pValue = m_pPropertyDict->find(name);
if(pValue)value = *pValue;
else return false;
return true;
@@ -261,7 +261,7 @@ const TQString & KviRegisteredUser::getProperty(const TQString & name)
{
if(!m_pPropertyDict)return KviTQString::empty;
if(name.isEmpty())return KviTQString::empty;
- TQString * pValue = m_pPropertyDict->tqfind(name);
+ TQString * pValue = m_pPropertyDict->find(name);
if(pValue)return *pValue;
return KviTQString::empty;
}
@@ -270,7 +270,7 @@ bool KviRegisteredUser::getBoolProperty(const TQString & name,bool def)
{
if(!m_pPropertyDict)return def;
if(name.isEmpty()) return def;
- TQString * pValue = m_pPropertyDict->tqfind(name);
+ TQString * pValue = m_pPropertyDict->find(name);
if(pValue)
{
// be flexible , allow more "true" values (pragma)
@@ -331,9 +331,9 @@ KviRegisteredUserDataBase::~KviRegisteredUserDataBase()
KviRegisteredUser * KviRegisteredUserDataBase::addUser(const TQString & name)
{
if(name.isEmpty()) return false;
- if(m_pUserDict->tqfind(name))return 0;
+ if(m_pUserDict->find(name))return 0;
KviRegisteredUser * u = new KviRegisteredUser(name);
- m_pUserDict->tqreplace(u->name(),u); //u->name() because we're NOT copying keys!
+ m_pUserDict->replace(u->name(),u); //u->name() because we're NOT copying keys!
emit(userAdded(name));
return u;
}
@@ -341,20 +341,20 @@ KviRegisteredUser * KviRegisteredUserDataBase::addUser(const TQString & name)
KviRegisteredUserGroup * KviRegisteredUserDataBase::addGroup(const TQString & name)
{
if(name.isEmpty()) return false;
- if(m_pGroupDict->tqfind(name))return 0;
+ if(m_pGroupDict->find(name))return 0;
KviRegisteredUserGroup * pGroup = new KviRegisteredUserGroup(name);
- m_pGroupDict->tqreplace(pGroup->name(),pGroup); //u->name() because we're NOT copying keys!
+ m_pGroupDict->replace(pGroup->name(),pGroup); //u->name() because we're NOT copying keys!
return pGroup;
}
KviRegisteredUser * KviRegisteredUserDataBase::getUser(const TQString & name)
{
if(name.isEmpty()) return 0;
- KviRegisteredUser * u = m_pUserDict->tqfind(name);
+ KviRegisteredUser * u = m_pUserDict->find(name);
if(!u)
{
u = new KviRegisteredUser(name);
- m_pUserDict->tqreplace(u->name(),u); //u->name() because we're NOT copying keys!
+ m_pUserDict->replace(u->name(),u); //u->name() because we're NOT copying keys!
}
return u;
}
@@ -378,7 +378,7 @@ static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,Kv
KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * tqmask)
{
if(!u || !tqmask) return 0;
- __range_valid(u == m_pUserDict->tqfind(u->name()));
+ __range_valid(u == m_pUserDict->find(u->name()));
KviRegisteredMaskList * l;
if(tqmask->hasWildNick())
@@ -396,7 +396,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
// masks with more info go first in the list
l = m_pWildMaskList;
} else {
- l = m_pMaskDict->tqfind(tqmask->nick());
+ l = m_pMaskDict->find(tqmask->nick());
if(l)
{
// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
@@ -486,7 +486,7 @@ void KviRegisteredUserDataBase::copyFrom(KviRegisteredUserDataBase * db)
bool KviRegisteredUserDataBase::removeUser(const TQString & name)
{
if(name.isEmpty()) return false;
- KviRegisteredUser * u = m_pUserDict->tqfind(name);
+ KviRegisteredUser * u = m_pUserDict->find(name);
if(!u)return false;
while(KviIrcMask * tqmask = u->maskList()->first())
{
@@ -537,7 +537,7 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
}
// not found ...opz :)
} else {
- KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask->nick());
+ KviRegisteredMaskList * l = m_pMaskDict->find(tqmask->nick());
if(l)
{
// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
@@ -566,7 +566,7 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &tqmask)
{
// first lookup the nickname in the maskDict
- KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask.nick());
+ KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
if(l)
{
for(KviRegisteredMask *m = l->first();m;m = l->next())
@@ -593,7 +593,7 @@ KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString &
{
// first lookup the nickname in the maskDict
if(nick.isEmpty()) return false;
- KviRegisteredMaskList * l = m_pMaskDict->tqfind(nick);
+ KviRegisteredMaskList * l = m_pMaskDict->find(nick);
if(l)
{
for(KviRegisteredMask *m = l->first();m;m = l->next())
@@ -620,7 +620,7 @@ KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &t
{
// first lookup the nickname in the maskDict
if(tqmask.nick()=="") return 0;
- KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask.nick());
+ KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
if(l)
{
for(KviRegisteredMask *m = l->first();m;m = l->next())
@@ -686,7 +686,7 @@ void KviRegisteredUserDataBase::load(const TQString & filename)
}
++it;
}
- if(!m_pGroupDict->tqfind(__tr("Default")))
+ if(!m_pGroupDict->find(__tr("Default")))
addGroup(__tr("Default"));
}
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h
index 78e193de..797ae101 100644
--- a/src/kvilib/ext/kvi_regusersdb.h
+++ b/src/kvilib/ext/kvi_regusersdb.h
@@ -172,7 +172,7 @@ public:
KviRegisteredUser * getUser(const TQString &name); // returns existing or adds
bool removeUser(const TQString &name);
bool removeGroup(const TQString &name);
- KviRegisteredUser * findUserByName(const TQString &name){ return m_pUserDict->tqfind(name); };
+ KviRegisteredUser * findUserByName(const TQString &name){ return m_pUserDict->find(name); };
// tqmask must be allocated on the heap and the ownership is transferred!
// returns non zero if there is already an user with this tqmask (returns the pointer to it!)
KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * tqmask);
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index 9383f695..0e793a34 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -87,10 +87,10 @@ KviSharedFile::KviSharedFile(const TQString &szName,const TQString &szAbsPath,co
m_expireTime = expireTime;
m_uFileSize = uFileSize;
#ifdef COMPILE_USE_QT4
- // QT4ROX: Because they have finally moved the functionality of TQString::tqcontains() to TQString::count(), and TQString::tqcontains() now does the right job
+ // QT4ROX: Because they have finally moved the functionality of TQString::contains() to TQString::count(), and TQString::contains() now does the right job
m_uWildCount = m_szUserMask.count('*');
#else
- m_uWildCount = m_szUserMask.tqcontains('*');
+ m_uWildCount = m_szUserMask.contains('*');
#endif
m_uNonWildCount = m_szUserMask.length() - m_uWildCount;
}
@@ -224,12 +224,12 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
void KviSharedFilesManager::addSharedFile(KviSharedFile * f)
{
// First find the list
- KviSharedFileList * l = m_pSharedListDict->tqfind(f->name());
+ KviSharedFileList * l = m_pSharedListDict->find(f->name());
if(!l)
{
l = new KviSharedFileList;
l->setAutoDelete(true);
- m_pSharedListDict->tqreplace(f->name(),l);
+ m_pSharedListDict->replace(f->name(),l);
}
doInsert(l,f);
@@ -248,12 +248,12 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
if(inf.exists() && inf.isFile() && inf.isReadable() && (inf.size() > 0))
{
// First find the list
- KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+ KviSharedFileList * l = m_pSharedListDict->find(szName);
if(!l)
{
l = new KviSharedFileList;
l->setAutoDelete(true);
- m_pSharedListDict->tqreplace(szName,l);
+ m_pSharedListDict->replace(szName,l);
}
// Now insert
@@ -277,7 +277,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize)
{
- KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+ KviSharedFileList * l = m_pSharedListDict->find(szName);
if(!l)return 0;
for(KviSharedFile * o = l->first();o;o = l->next())
@@ -301,7 +301,7 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,K
}
bool KviSharedFilesManager::removeSharedFile(const TQString &szName,const TQString &szMask,unsigned int uFileSize)
{
- KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+ KviSharedFileList * l = m_pSharedListDict->find(szName);
if(!l)return false;
for(KviSharedFile * o = l->first();o;o = l->next())
{
@@ -323,7 +323,7 @@ bool KviSharedFilesManager::removeSharedFile(const TQString &szName,const TQStri
bool KviSharedFilesManager::removeSharedFile(const TQString &szName,KviSharedFile * off)
{
- KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+ KviSharedFileList * l = m_pSharedListDict->find(szName);
if(!l)return false;
for(KviSharedFile * o = l->first();o;o = l->next())
{
diff --git a/src/kvilib/ext/kvi_stringconversion.cpp b/src/kvilib/ext/kvi_stringconversion.cpp
index accba786..2836628c 100644
--- a/src/kvilib/ext/kvi_stringconversion.cpp
+++ b/src/kvilib/ext/kvi_stringconversion.cpp
@@ -49,7 +49,7 @@ namespace KviStringConversion
{
if(!g_szLocalDir.isEmpty())
{
- if(KviTQString::tqfind(buffer,g_szLocalDir)==0)
+ if(KviTQString::find(buffer,g_szLocalDir)==0)
{
buffer.remove(0,g_szLocalDir.length());
buffer.prepend("local://");
@@ -57,7 +57,7 @@ namespace KviStringConversion
}
if(!g_szGlobalDir.isEmpty())
{
- if(KviTQString::tqfind(buffer,g_szGlobalDir)==0)
+ if(KviTQString::find(buffer,g_szGlobalDir)==0)
{
buffer.remove(0,g_szGlobalDir.length());
buffer.prepend("global://");
@@ -72,7 +72,7 @@ namespace KviStringConversion
{
if(!g_szLocalDir.isEmpty())
{
- if(KviTQString::tqfind(buffer,"local://")==0)
+ if(KviTQString::find(buffer,"local://")==0)
{
buffer.remove(0,8);
buffer.prepend(g_szLocalDir);
@@ -80,7 +80,7 @@ namespace KviStringConversion
}
if(!g_szGlobalDir.isEmpty())
{
- if(KviTQString::tqfind(buffer,"global://")==0)
+ if(KviTQString::find(buffer,"global://")==0)
{
buffer.remove(0,9);
buffer.prepend(g_szGlobalDir);
@@ -250,11 +250,11 @@ namespace KviStringConversion
if(bOk && (i >= 0))buffer.setWeight(i);
if(!str.isEmpty())
{
- buffer.setBold(str.tqcontains("b"));
- buffer.setItalic(str.tqcontains("i"));
- buffer.setUnderline(str.tqcontains("u"));
- buffer.setStrikeOut(str.tqcontains("s"));
- buffer.setFixedPitch(str.tqcontains("f"));
+ buffer.setBold(str.contains("b"));
+ buffer.setItalic(str.contains("i"));
+ buffer.setUnderline(str.contains("u"));
+ buffer.setStrikeOut(str.contains("s"));
+ buffer.setFixedPitch(str.contains("f"));
}
return true;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 04:17:25 +0000