summaryrefslogtreecommitdiffstats
path: root/src/kvilib/ext
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2018-10-29 18:21:41 +0100
committerSlávek Banko <[email protected]>2018-10-29 18:21:41 +0100
commit7cc4356bc2eceb5a66c2263bff44aa472d2ca290 (patch)
tree08047b60c477dc7026c7623e25770825b5ce7e5c /src/kvilib/ext
parent3b217bbf505473102331a7e2ed274fe63a4c3457 (diff)
downloadkvirc-7cc4356bc2eceb5a66c2263bff44aa472d2ca290.tar.gz
kvirc-7cc4356bc2eceb5a66c2263bff44aa472d2ca290.zip
Fix build with a clean TQt namespace.
Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'src/kvilib/ext')
-rw-r--r--src/kvilib/ext/kvi_config.cpp6
-rw-r--r--src/kvilib/ext/kvi_crypt.cpp4
-rw-r--r--src/kvilib/ext/kvi_garbage.cpp32
-rw-r--r--src/kvilib/ext/kvi_imagelib.cpp2
-rw-r--r--src/kvilib/ext/kvi_mediatype.cpp4
-rw-r--r--src/kvilib/ext/kvi_regusersdb.cpp6
-rw-r--r--src/kvilib/ext/kvi_sharedfiles.cpp2
7 files changed, 28 insertions, 28 deletions
diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp
index fc14dfaf..bd6f8a7a 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/kvi_config.cpp
@@ -650,7 +650,7 @@ KviValueList<int> KviConfig::readIntListEntry(const TQString & szKey,const KviVa
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());
+ //tqDebug("Returning default list for group %s and key %s",m_szGroup.latin1(),szKey.latin1());
return list;
}
#ifdef COMPILE_USE_QT4
@@ -660,7 +660,7 @@ KviValueList<int> KviConfig::readIntListEntry(const TQString & szKey,const KviVa
#endif
KviValueList<int> ret;
- //debug("Got option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),p_str->latin1());
+ //tqDebug("Got option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),p_str->latin1());
for(TQStringList::Iterator it = sl.begin();it != sl.end();++it)
{
@@ -683,7 +683,7 @@ void KviConfig::writeEntry(const TQString & szKey,const KviValueList<int> &list)
if(szData.hasData())szData.append(',');
szData.append(KviStr::Format,"%d",*it);
}
- //debug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr());
+ //tqDebug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr());
p_group->replace(szKey,new TQString(szData.ptr()));
}
diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp
index 959fe510..bbeffa22 100644
--- a/src/kvilib/ext/kvi_crypt.cpp
+++ b/src/kvilib/ext/kvi_crypt.cpp
@@ -176,13 +176,13 @@
KviCryptEngine::EncryptResult KviCryptEngine::encrypt(const char *,KviStr &)
{
-// debug("Pure virtual KviCryptEngine::encrypt() called");
+// tqDebug("Pure virtual KviCryptEngine::encrypt() called");
return EncryptError;
}
KviCryptEngine::DecryptResult KviCryptEngine::decrypt(const char *,KviStr &)
{
-// debug("Pure virtual KviCryptEngine::decrypt() called");
+// tqDebug("Pure virtual KviCryptEngine::decrypt() called");
return DecryptError;
}
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
index fc4493a4..6f13aa97 100644
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ b/src/kvilib/ext/kvi_garbage.cpp
@@ -48,9 +48,9 @@ void KviGarbageCollector::collect(TQObject * g)
m_pGarbageList = new KviPointerList<TQObject>;
m_pGarbageList->setAutoDelete(true);
}
- //debug("COLLECTING GARBAGE %s",g->className());
+ //tqDebug("COLLECTING GARBAGE %s",g->className());
m_pGarbageList->append(g);
-// debug("Registering garbage object %d (%s:%s)",g,g->className(),g->name());
+// tqDebug("Registering garbage object %d (%s:%s)",g,g->className(),g->name());
connect(g,TQT_SIGNAL(destroyed()),this,TQT_SLOT(garbageSuicide()));
triggerCleanup(0);
}
@@ -59,13 +59,13 @@ void KviGarbageCollector::garbageSuicide()
{
if(!m_pGarbageList)
{
- debug("Ops... garbage suicide while no garbage list");
+ tqDebug("Ops... garbage suicide while no garbage list");
return;
}
int idx = m_pGarbageList->findRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
if(idx == -1)
{
- debug("Ops... unregistered garbage suicide");
+ tqDebug("Ops... unregistered garbage suicide");
return;
}
m_pGarbageList->removeRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
@@ -77,7 +77,7 @@ void KviGarbageCollector::garbageSuicide()
void KviGarbageCollector::triggerCleanup(int iTimeout)
{
- //debug("TRIGGERING CLEANUP AFTER %d msecs",iTimeout);
+ //tqDebug("TRIGGERING CLEANUP AFTER %d msecs",iTimeout);
if(m_pCleanupTimer)
{
m_pCleanupTimer->stop();
@@ -90,26 +90,26 @@ void KviGarbageCollector::triggerCleanup(int iTimeout)
void KviGarbageCollector::cleanup()
{
- //debug("CLEANUP CALLED !");
+ //tqDebug("CLEANUP CALLED !");
if(m_pGarbageList)
{
- //debug("SOME GARBAGE TO DELETE");
+ //tqDebug("SOME GARBAGE TO DELETE");
KviPointerList<TQObject> dying;
dying.setAutoDelete(false);
for(TQObject * o = m_pGarbageList->first();o;o = m_pGarbageList->next())
{
- //debug("CHECKING GARBAGE CLASS %s",o->className());
+ //tqDebug("CHECKING GARBAGE CLASS %s",o->className());
bool bDeleteIt = m_bForceCleanupNow;
if(!bDeleteIt)
{
- //debug("CLEANUP NOT FORCED");
+ //tqDebug("CLEANUP NOT FORCED");
TQVariant v = o->property("blockingDelete");
if(v.isValid())
{
- //debug("HAS A VALID VARIANT!");
-// debug("[Garbage collector]: garbage has a blockingDelete property");
+ //tqDebug("HAS A VALID VARIANT!");
+// tqDebug("[Garbage collector]: garbage has a blockingDelete property");
bDeleteIt = !(v.toBool());
-// if(!bDeleteIt)debug("And doesn't want to be delete now!");
+// if(!bDeleteIt)tqDebug("And doesn't want to be delete now!");
} else bDeleteIt = true; // must be deleted
}
if(bDeleteIt)dying.append(o);
@@ -117,7 +117,7 @@ void KviGarbageCollector::cleanup()
for(TQObject * o2 = dying.first();o2;o2 = dying.next())
{
- //debug("KILLING GARBAGE CLASS %s",o2->className());
+ //tqDebug("KILLING GARBAGE CLASS %s",o2->className());
disconnect(o2,TQT_SIGNAL(destroyed()),this,TQT_SLOT(garbageSuicide()));
m_pGarbageList->removeRef(o2);
}
@@ -131,12 +131,12 @@ void KviGarbageCollector::cleanup()
if(m_pGarbageList)
{
-// debug("[Garbage collector cleanup]: Some stuff left to be deleted, will retry in a while");
+// tqDebug("[Garbage collector cleanup]: Some stuff left to be deleted, will retry in a while");
// something left to be destroyed
- if(m_bForceCleanupNow)debug("[Garbage collector]: Ops...I've left some undeleted stuff!");
+ if(m_bForceCleanupNow)tqDebug("[Garbage collector]: Ops...I've left some undeleted stuff!");
triggerCleanup(5000); // retry in 5 sec
} else {
-// debug("[Garbage collector cleanup]: Completed");
+// tqDebug("[Garbage collector cleanup]: Completed");
// nothing left to delete
if(m_pCleanupTimer)
{
diff --git a/src/kvilib/ext/kvi_imagelib.cpp b/src/kvilib/ext/kvi_imagelib.cpp
index 90b21af6..104c69d4 100644
--- a/src/kvilib/ext/kvi_imagelib.cpp
+++ b/src/kvilib/ext/kvi_imagelib.cpp
@@ -86,7 +86,7 @@ bool KviImageLibrary::loadLibrary(const TQString &path)
{
delete m_pLibrary;
m_pLibrary=0;
- debug("WARNING : Can not load image library %s",KviTQString::toUtf8(path).data());
+ tqDebug("WARNING : Can not load image library %s",KviTQString::toUtf8(path).data());
}
return (m_pLibrary != 0);
}
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index e961359d..2bc60850 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -263,7 +263,7 @@ KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckM
if(lstat(szFullPath.ptr(),&st) != 0)
#endif
{
- //debug("Problems while stating file %s",szFullPath.ptr());
+ //tqDebug("Problems while stating file %s",szFullPath.ptr());
// We do just the pattern matching
// it's better to avoid magic checks
// if the file is a device , we would be blocked while attempting to read data
@@ -275,7 +275,7 @@ KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckM
{
if(stat(szFullPath.ptr(),&st) != 0)
{
- debug("Problems while stating() target for link %s",szFullPath.ptr());
+ tqDebug("Problems while stating() target for link %s",szFullPath.ptr());
// Same as above
return findMediaTypeForRegularFile(szFullPath.ptr(),szFile.ptr(),false);
}
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index dcbd58a2..d34fde15 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -417,7 +417,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
l->setAutoDelete(true);
if(!u->addMask(mask))
{
- debug(" Ops...got an incoherent regusers action...recovered ?");
+ tqDebug(" Ops...got an incoherent regusers action...recovered ?");
delete l;
l = 0;
} else {
@@ -430,7 +430,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
// Ok...add it
if(!u->addMask(mask))
{
- debug("ops...got an incoherent regusers action...recovered ?");
+ tqDebug("ops...got an incoherent regusers action...recovered ?");
return 0; // ops...already there ?
}
append_mask_to_list(l,u,mask);
@@ -491,7 +491,7 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name)
while(KviIrcMask * mask = u->maskList()->first())
{
if(!removeMaskByPointer(mask))
- debug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
+ tqDebug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
}
emit(userRemoved(name));
m_pUserDict->remove(name);
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index a0d52a77..d38bd680 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -270,7 +270,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
return o;
} else {
- debug("File %s unreadable: can't add offer",KviTQString::toUtf8(szAbsPath).data());
+ tqDebug("File %s unreadable: can't add offer",KviTQString::toUtf8(szAbsPath).data());
return 0;
}
}