Fix build with a clean TQt namespace.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7cc4356bc2)
r14.0.x
Slávek Banko 6 years ago
parent 351c95fe16
commit eb6ac02bb5
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -36,15 +36,15 @@
//============================================================================= //=============================================================================
#ifdef _KVI_DEBUG_CHECK_RANGE_ #ifdef _KVI_DEBUG_CHECK_RANGE_
#define __range_valid(_expr) if(!(_expr))debug("[kvirc]: ASSERT FAILED: \"%s\" is false in %s (%d)",#_expr,__FILE__,__LINE__) #define __range_valid(_expr) if(!(_expr))tqDebug("[kvirc]: ASSERT FAILED: \"%s\" is false in %s (%d)",#_expr,__FILE__,__LINE__)
#define __range_invalid(_expr) if(_expr)debug("[kvirc]: ASSERT FAILED: \"%s\" is true in %s (%d)",#_expr,__FILE__,__LINE__) #define __range_invalid(_expr) if(_expr)tqDebug("[kvirc]: ASSERT FAILED: \"%s\" is true in %s (%d)",#_expr,__FILE__,__LINE__)
#else #else
#define __range_valid(_expr) #define __range_valid(_expr)
#define __range_invalid(_expr) #define __range_invalid(_expr)
#endif #endif
#if defined(_KVI_DEBUG_) || defined(__KVI_DEBUG__) #if defined(_KVI_DEBUG_) || defined(__KVI_DEBUG__)
#define __ASSERT(_expr) if(!(_expr))debug("[kvirc]: ASSERT FAILED: \"%s\" is false in %s (%d)",#_expr,__FILE__,__LINE__) #define __ASSERT(_expr) if(!(_expr))tqDebug("[kvirc]: ASSERT FAILED: \"%s\" is false in %s (%d)",#_expr,__FILE__,__LINE__)
#else #else
#define __ASSERT(_expr) #define __ASSERT(_expr)
#endif #endif

@ -650,7 +650,7 @@ KviValueList<int> KviConfig::readIntListEntry(const TQString & szKey,const KviVa
TQString * p_str = p_group->find(szKey); TQString * p_str = p_group->find(szKey);
if(!p_str) 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; return list;
} }
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
@ -660,7 +660,7 @@ KviValueList<int> KviConfig::readIntListEntry(const TQString & szKey,const KviVa
#endif #endif
KviValueList<int> ret; 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) 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(','); if(szData.hasData())szData.append(',');
szData.append(KviStr::Format,"%d",*it); 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())); p_group->replace(szKey,new TQString(szData.ptr()));
} }

@ -176,13 +176,13 @@
KviCryptEngine::EncryptResult KviCryptEngine::encrypt(const char *,KviStr &) KviCryptEngine::EncryptResult KviCryptEngine::encrypt(const char *,KviStr &)
{ {
// debug("Pure virtual KviCryptEngine::encrypt() called"); // tqDebug("Pure virtual KviCryptEngine::encrypt() called");
return EncryptError; return EncryptError;
} }
KviCryptEngine::DecryptResult KviCryptEngine::decrypt(const char *,KviStr &) KviCryptEngine::DecryptResult KviCryptEngine::decrypt(const char *,KviStr &)
{ {
// debug("Pure virtual KviCryptEngine::decrypt() called"); // tqDebug("Pure virtual KviCryptEngine::decrypt() called");
return DecryptError; return DecryptError;
} }

@ -48,9 +48,9 @@ void KviGarbageCollector::collect(TQObject * g)
m_pGarbageList = new KviPointerList<TQObject>; m_pGarbageList = new KviPointerList<TQObject>;
m_pGarbageList->setAutoDelete(true); m_pGarbageList->setAutoDelete(true);
} }
//debug("COLLECTING GARBAGE %s",g->className()); //tqDebug("COLLECTING GARBAGE %s",g->className());
m_pGarbageList->append(g); 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())); connect(g,TQT_SIGNAL(destroyed()),this,TQT_SLOT(garbageSuicide()));
triggerCleanup(0); triggerCleanup(0);
} }
@ -59,13 +59,13 @@ void KviGarbageCollector::garbageSuicide()
{ {
if(!m_pGarbageList) if(!m_pGarbageList)
{ {
debug("Ops... garbage suicide while no garbage list"); tqDebug("Ops... garbage suicide while no garbage list");
return; return;
} }
int idx = m_pGarbageList->findRef(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) if(idx == -1)
{ {
debug("Ops... unregistered garbage suicide"); tqDebug("Ops... unregistered garbage suicide");
return; return;
} }
m_pGarbageList->removeRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); m_pGarbageList->removeRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
@ -77,7 +77,7 @@ void KviGarbageCollector::garbageSuicide()
void KviGarbageCollector::triggerCleanup(int iTimeout) void KviGarbageCollector::triggerCleanup(int iTimeout)
{ {
//debug("TRIGGERING CLEANUP AFTER %d msecs",iTimeout); //tqDebug("TRIGGERING CLEANUP AFTER %d msecs",iTimeout);
if(m_pCleanupTimer) if(m_pCleanupTimer)
{ {
m_pCleanupTimer->stop(); m_pCleanupTimer->stop();
@ -90,26 +90,26 @@ void KviGarbageCollector::triggerCleanup(int iTimeout)
void KviGarbageCollector::cleanup() void KviGarbageCollector::cleanup()
{ {
//debug("CLEANUP CALLED !"); //tqDebug("CLEANUP CALLED !");
if(m_pGarbageList) if(m_pGarbageList)
{ {
//debug("SOME GARBAGE TO DELETE"); //tqDebug("SOME GARBAGE TO DELETE");
KviPointerList<TQObject> dying; KviPointerList<TQObject> dying;
dying.setAutoDelete(false); dying.setAutoDelete(false);
for(TQObject * o = m_pGarbageList->first();o;o = m_pGarbageList->next()) 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; bool bDeleteIt = m_bForceCleanupNow;
if(!bDeleteIt) if(!bDeleteIt)
{ {
//debug("CLEANUP NOT FORCED"); //tqDebug("CLEANUP NOT FORCED");
TQVariant v = o->property("blockingDelete"); TQVariant v = o->property("blockingDelete");
if(v.isValid()) if(v.isValid())
{ {
//debug("HAS A VALID VARIANT!"); //tqDebug("HAS A VALID VARIANT!");
// debug("[Garbage collector]: garbage has a blockingDelete property"); // tqDebug("[Garbage collector]: garbage has a blockingDelete property");
bDeleteIt = !(v.toBool()); 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 } else bDeleteIt = true; // must be deleted
} }
if(bDeleteIt)dying.append(o); if(bDeleteIt)dying.append(o);
@ -117,7 +117,7 @@ void KviGarbageCollector::cleanup()
for(TQObject * o2 = dying.first();o2;o2 = dying.next()) 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())); disconnect(o2,TQT_SIGNAL(destroyed()),this,TQT_SLOT(garbageSuicide()));
m_pGarbageList->removeRef(o2); m_pGarbageList->removeRef(o2);
} }
@ -131,12 +131,12 @@ void KviGarbageCollector::cleanup()
if(m_pGarbageList) 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 // 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 triggerCleanup(5000); // retry in 5 sec
} else { } else {
// debug("[Garbage collector cleanup]: Completed"); // tqDebug("[Garbage collector cleanup]: Completed");
// nothing left to delete // nothing left to delete
if(m_pCleanupTimer) if(m_pCleanupTimer)
{ {

@ -86,7 +86,7 @@ bool KviImageLibrary::loadLibrary(const TQString &path)
{ {
delete m_pLibrary; delete m_pLibrary;
m_pLibrary=0; 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); return (m_pLibrary != 0);
} }

@ -263,7 +263,7 @@ KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckM
if(lstat(szFullPath.ptr(),&st) != 0) if(lstat(szFullPath.ptr(),&st) != 0)
#endif #endif
{ {
//debug("Problems while stating file %s",szFullPath.ptr()); //tqDebug("Problems while stating file %s",szFullPath.ptr());
// We do just the pattern matching // We do just the pattern matching
// it's better to avoid magic checks // it's better to avoid magic checks
// if the file is a device , we would be blocked while attempting to read data // 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) 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 // Same as above
return findMediaTypeForRegularFile(szFullPath.ptr(),szFile.ptr(),false); return findMediaTypeForRegularFile(szFullPath.ptr(),szFile.ptr(),false);
} }

@ -417,7 +417,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
l->setAutoDelete(true); l->setAutoDelete(true);
if(!u->addMask(mask)) if(!u->addMask(mask))
{ {
debug(" Ops...got an incoherent regusers action...recovered ?"); tqDebug(" Ops...got an incoherent regusers action...recovered ?");
delete l; delete l;
l = 0; l = 0;
} else { } else {
@ -430,7 +430,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
// Ok...add it // Ok...add it
if(!u->addMask(mask)) 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 ? return 0; // ops...already there ?
} }
append_mask_to_list(l,u,mask); append_mask_to_list(l,u,mask);
@ -491,7 +491,7 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name)
while(KviIrcMask * mask = u->maskList()->first()) while(KviIrcMask * mask = u->maskList()->first())
{ {
if(!removeMaskByPointer(mask)) if(!removeMaskByPointer(mask))
debug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data()); tqDebug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
} }
emit(userRemoved(name)); emit(userRemoved(name));
m_pUserDict->remove(name); m_pUserDict->remove(name);

@ -270,7 +270,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
return o; return o;
} else { } 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; return 0;
} }
} }

@ -69,7 +69,7 @@ namespace KviFileUtils
} }
if(ch == 0) if(ch == 0)
{ {
debug("Warning : %s is not an ascii file",f->name().latin1()); tqDebug("Warning : %s is not an ascii file",f->name().latin1());
} }
if(cur_len > 0) if(cur_len > 0)
{ {
@ -126,7 +126,7 @@ namespace KviFileUtils
{ {
if(!d.mkdir(createdDir)) if(!d.mkdir(createdDir))
{ {
debug("Can't create directory %s",KviTQString::toUtf8(createdDir).data()); tqDebug("Can't create directory %s",KviTQString::toUtf8(createdDir).data());
return false; return false;
} }
} }
@ -196,7 +196,7 @@ namespace KviFileUtils
{ {
TQByteArray ba = f.readAll(); TQByteArray ba = f.readAll();
szBuffer = TQString::fromUtf8(ba.data(),ba.size()); szBuffer = TQString::fromUtf8(ba.data(),ba.size());
//debug("BUFFERLEN: %d",szBuffer.length()); //tqDebug("BUFFERLEN: %d",szBuffer.length());
} else { } else {
szBuffer = TQString(f.readAll()); szBuffer = TQString(f.readAll());
} }

@ -897,7 +897,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile,const TQString &szUnpackPath)
return writeError(); return writeError();
} }
} /* else { THIS HAPPENS FOR ZERO SIZE FILES } /* else { THIS HAPPENS FOR ZERO SIZE FILES
debug("hum.... internal, rEWq (ret = %d) (avail_out = %d)",ret,zstr.avail_out); tqDebug("hum.... internal, rEWq (ret = %d) (avail_out = %d)",ret,zstr.avail_out);
inflateEnd(&zstr); inflateEnd(&zstr);
setLastError(__tr2qs("Compression library internal error")); setLastError(__tr2qs("Compression library internal error"));

@ -44,7 +44,7 @@ void KviAvatarCache::init()
{ {
if(m_pAvatarCacheInstance) if(m_pAvatarCacheInstance)
{ {
debug("WARNING: trying to initialize the avatar cache twice"); tqDebug("WARNING: trying to initialize the avatar cache twice");
return; return;
} }
@ -55,7 +55,7 @@ void KviAvatarCache::done()
{ {
if(!m_pAvatarCacheInstance) if(!m_pAvatarCacheInstance)
{ {
debug("WARNING: trying to destroy an uninitialized avatar cache"); tqDebug("WARNING: trying to destroy an uninitialized avatar cache");
return; return;
} }

@ -150,7 +150,7 @@ KviRegisteredUser* KviIrcUserDataBase::registeredUser(const TQString & nick,cons
if(u->m_bNotFoundRegUserLoockup && u->m_szLastRegisteredMatchNick==nick) if(u->m_bNotFoundRegUserLoockup && u->m_szLastRegisteredMatchNick==nick)
{ {
//cacheHit++; //cacheHit++;
//debug("cache hits/miss = %i/%i",cacheHit,cacheMiss); //tqDebug("cache hits/miss = %i/%i",cacheHit,cacheMiss);
return 0; return 0;
} }
@ -182,7 +182,7 @@ KviRegisteredUser* KviIrcUserDataBase::registeredUser(const TQString & nick,cons
} }
} }
// debug("cache hits/miss = %i/%i",cacheHit,cacheMiss); // tqDebug("cache hits/miss = %i/%i",cacheHit,cacheMiss);
return pUser; return pUser;
} }

@ -363,7 +363,7 @@ KviDns::~KviDns()
if(m_pSlaveThread)delete m_pSlaveThread; // will eventually terminate it (but it will also block us!!!) if(m_pSlaveThread)delete m_pSlaveThread; // will eventually terminate it (but it will also block us!!!)
KviThreadManager::killPendingEvents(this); KviThreadManager::killPendingEvents(this);
if(m_pDnsResult)delete m_pDnsResult; if(m_pDnsResult)delete m_pDnsResult;
if(m_pAuxData)debug("You're leaking memory man! m_pAuxData is non 0!"); if(m_pAuxData)tqDebug("You're leaking memory man! m_pAuxData is non 0!");
} }

@ -532,7 +532,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
s->cutLeft(idx + 1); s->cutLeft(idx + 1);
s->stripWhiteSpace(); s->stripWhiteSpace();
hdr.replace(szName.ptr(),new KviStr(*s)); hdr.replace(szName.ptr(),new KviStr(*s));
//debug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr()); //tqDebug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr());
} }
} }
@ -914,7 +914,7 @@ bool KviHttpRequestThread::processInternalEvents()
} }
break; break;
default: default:
debug("Unrecognized event in http thread"); tqDebug("Unrecognized event in http thread");
delete e; delete e;
return false; return false;
break; break;
@ -1425,7 +1425,7 @@ void KviHttpRequestThread::runInternal()
szRequest += "\r\n"; szRequest += "\r\n";
} }
//debug("SENDING REQUEST:\n%s",szRequest.ptr()); //tqDebug("SENDING REQUEST:\n%s",szRequest.ptr());
if(!sendBuffer(szRequest.ptr(),szRequest.len(),60))return; if(!sendBuffer(szRequest.ptr(),szRequest.len(),60))return;

@ -1206,7 +1206,7 @@ bool kvi_getInterfaceAddress(const char * ifname,TQString &buffer)
{ {
debug("kvi_getInterfaceAddress is deprecated: use KviNetUtils::getInterfaceAddress"); tqDebug("kvi_getInterfaceAddress is deprecated: use KviNetUtils::getInterfaceAddress");
TQString szRet; TQString szRet;

@ -199,7 +199,7 @@ static DH * my_get_dh(int keylength)
break; break;
default: default:
// What the hell do you want from me ? // What the hell do you want from me ?
debug("OpenSSL is asking for a DH param with keylen %d: no way :D",keylength); tqDebug("OpenSSL is asking for a DH param with keylen %d: no way :D",keylength);
break; break;
} }
@ -332,7 +332,7 @@ static int cb(char *buf, int size, int rwflag, void *u)
int len = p->len(); int len = p->len();
if(len >= size)return 0; if(len >= size)return 0;
kvi_memmove(buf,p->ptr(),len + 1); kvi_memmove(buf,p->ptr(),len + 1);
// debug("PASS REQUESTED: %s",p->ptr()); // tqDebug("PASS REQUESTED: %s",p->ptr());
return len; return len;
} }
@ -346,7 +346,7 @@ KviSSL::Result KviSSL::useCertificateFile(const char * cert,const char * pass)
FILE * f = fopen(cert,"r"); FILE * f = fopen(cert,"r");
if(!f)return FileIoError; if(!f)return FileIoError;
// debug("READING CERTIFICATE %s",cert); // tqDebug("READING CERTIFICATE %s",cert);
if(PEM_read_X509(f,&x509,cb,&m_szPass)) if(PEM_read_X509(f,&x509,cb,&m_szPass))
{ {
if(!SSL_CTX_use_certificate(m_pSSLCtx,x509)) if(!SSL_CTX_use_certificate(m_pSSLCtx,x509))
@ -372,7 +372,7 @@ KviSSL::Result KviSSL::usePrivateKeyFile(const char * key,const char * pass)
FILE * f = fopen(key,"r"); FILE * f = fopen(key,"r");
if(!f)return FileIoError; if(!f)return FileIoError;
// debug("READING KEY %s",key); // tqDebug("READING KEY %s",key);
if(PEM_read_PrivateKey(f,&k,cb,&m_szPass)) if(PEM_read_PrivateKey(f,&k,cb,&m_szPass))
{ {
if(!SSL_CTX_use_PrivateKey(m_pSSLCtx,k)) if(!SSL_CTX_use_PrivateKey(m_pSSLCtx,k))

@ -33,7 +33,7 @@
#define _KVI_LOCALE_CPP_ #define _KVI_LOCALE_CPP_
#include "kvi_locale.h" #include "kvi_locale.h"
#include <tqglobal.h> //for debug() #include <tqglobal.h> //for tqDebug()
#include <tqtextcodec.h> #include <tqtextcodec.h>
#include <tqdir.h> #include <tqdir.h>
@ -287,14 +287,14 @@ public:
g_pUtf8TextCodec = TQTextCodec::codecForName("UTF-8"); g_pUtf8TextCodec = TQTextCodec::codecForName("UTF-8");
if(!g_pUtf8TextCodec) if(!g_pUtf8TextCodec)
{ {
debug("Can't find the global utf8 text codec!"); tqDebug("Can't find the global utf8 text codec!");
g_pUtf8TextCodec = TQTextCodec::codecForLocale(); // try anything else... g_pUtf8TextCodec = TQTextCodec::codecForLocale(); // try anything else...
} }
} }
m_pRecvCodec = TQTextCodec::codecForName(szChildCodecName); m_pRecvCodec = TQTextCodec::codecForName(szChildCodecName);
if(!m_pRecvCodec) if(!m_pRecvCodec)
{ {
debug("Can't find the codec for name %s (composite codec creation)",szName); tqDebug("Can't find the codec for name %s (composite codec creation)",szName);
m_pRecvCodec = g_pUtf8TextCodec; m_pRecvCodec = g_pUtf8TextCodec;
} }
if(bSendInUtf8) if(bSendInUtf8)
@ -495,7 +495,7 @@ bool KviMessageCatalogue::load(const TQString& name)
KviFile f(szCatalogueFile); KviFile f(szCatalogueFile);
if(!f.openForReading()) if(!f.openForReading())
{ {
debug("[KviLocale]: Failed to open the messages file %s: probably doesn't exist",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("[KviLocale]: Failed to open the messages file %s: probably doesn't exist",KviTQString::toUtf8(szCatalogueFile).data());
return false; return false;
} }
@ -503,7 +503,7 @@ bool KviMessageCatalogue::load(const TQString& name)
if(f.readBlock((char *)&hdr,sizeof(GnuMoFileHeader)) < (int)sizeof(GnuMoFileHeader)) if(f.readBlock((char *)&hdr,sizeof(GnuMoFileHeader)) < (int)sizeof(GnuMoFileHeader))
{ {
debug("KviLocale: Failed to read header of %s",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: Failed to read header of %s",KviTQString::toUtf8(szCatalogueFile).data());
f.close(); f.close();
return false; return false;
} }
@ -514,10 +514,10 @@ bool KviMessageCatalogue::load(const TQString& name)
{ {
if(hdr.magic == KVI_LOCALE_MAGIC_SWAPPED) if(hdr.magic == KVI_LOCALE_MAGIC_SWAPPED)
{ {
debug("KviLocale: Swapped magic for file %s: swapping data too",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: Swapped magic for file %s: swapping data too",KviTQString::toUtf8(szCatalogueFile).data());
bMustSwap = true; bMustSwap = true;
} else { } else {
debug("KviLocale: Bad locale magic for file %s: not a *.mo file ?",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: Bad locale magic for file %s: not a *.mo file ?",KviTQString::toUtf8(szCatalogueFile).data());
f.close(); f.close();
return false; return false;
} }
@ -525,7 +525,7 @@ bool KviMessageCatalogue::load(const TQString& name)
if(KVI_SWAP_IF_NEEDED(bMustSwap,hdr.revision) != MO_REVISION_NUMBER) if(KVI_SWAP_IF_NEEDED(bMustSwap,hdr.revision) != MO_REVISION_NUMBER)
{ {
debug("KviLocale: Invalid *.mo file revision number for file %s",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: Invalid *.mo file revision number for file %s",KviTQString::toUtf8(szCatalogueFile).data());
f.close(); f.close();
return false; return false;
} }
@ -534,14 +534,14 @@ bool KviMessageCatalogue::load(const TQString& name)
if(numberOfStrings <= 0) if(numberOfStrings <= 0)
{ {
debug("KviLocale: No translated messages found in file %s",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: No translated messages found in file %s",KviTQString::toUtf8(szCatalogueFile).data());
f.close(); f.close();
return false; return false;
} }
if(numberOfStrings >= 9972) if(numberOfStrings >= 9972)
{ {
debug("Number of strings too big...sure that it is a KVIrc catalog file ?"); tqDebug("Number of strings too big...sure that it is a KVIrc catalog file ?");
numberOfStrings = 9972; numberOfStrings = 9972;
} }
@ -554,7 +554,7 @@ bool KviMessageCatalogue::load(const TQString& name)
// FIXME: maybe read it in blocks eh ? // FIXME: maybe read it in blocks eh ?
if(f.readBlock(buffer,fSize) < (int)fSize) if(f.readBlock(buffer,fSize) < (int)fSize)
{ {
debug("KviLocale: Error while reading the translation file %s",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: Error while reading the translation file %s",KviTQString::toUtf8(szCatalogueFile).data());
kvi_free(buffer); kvi_free(buffer);
f.close(); f.close();
return false; return false;
@ -563,7 +563,7 @@ bool KviMessageCatalogue::load(const TQString& name)
// Check for broken *.mo files // Check for broken *.mo files
if(fSize < (24 + (sizeof(GnuMoStringDescriptor) * numberOfStrings))) if(fSize < (24 + (sizeof(GnuMoStringDescriptor) * numberOfStrings)))
{ {
debug("KviLocale: Broken translation file %s (too small for all descriptors)",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: Broken translation file %s (too small for all descriptors)",KviTQString::toUtf8(szCatalogueFile).data());
kvi_free(buffer); kvi_free(buffer);
f.close(); f.close();
return false; return false;
@ -578,7 +578,7 @@ bool KviMessageCatalogue::load(const TQString& name)
if(fSize < (unsigned int)expectedFileSize) if(fSize < (unsigned int)expectedFileSize)
{ {
debug("KviLocale: Broken translation file %s (too small for all the message strings)",KviTQString::toUtf8(szCatalogueFile).data()); tqDebug("KviLocale: Broken translation file %s (too small for all the message strings)",KviTQString::toUtf8(szCatalogueFile).data());
kvi_free(buffer); kvi_free(buffer);
f.close(); f.close();
return false; return false;
@ -597,9 +597,9 @@ bool KviMessageCatalogue::load(const TQString& name)
for(int i=0;i < numberOfStrings;i++) for(int i=0;i < numberOfStrings;i++)
{ {
// FIXME: "Check for NULL inside strings here ?" // FIXME: "Check for NULL inside strings here ?"
//debug("original seems to be at %u and %u byttes long",KVI_SWAP_IF_NEEDED(bMustSwap,origDescriptor[i].offset), //tqDebug("original seems to be at %u and %u byttes long",KVI_SWAP_IF_NEEDED(bMustSwap,origDescriptor[i].offset),
// KVI_SWAP_IF_NEEDED(bMustSwap,origDescriptor[i].length)); // KVI_SWAP_IF_NEEDED(bMustSwap,origDescriptor[i].length));
//debug("translated seems to be at %u and %u byttes long",KVI_SWAP_IF_NEEDED(bMustSwap,transDescriptor[i].offset), //tqDebug("translated seems to be at %u and %u byttes long",KVI_SWAP_IF_NEEDED(bMustSwap,transDescriptor[i].offset),
// KVI_SWAP_IF_NEEDED(bMustSwap,transDescriptor[i].length)); // KVI_SWAP_IF_NEEDED(bMustSwap,transDescriptor[i].length));
KviTranslationEntry * e = new KviTranslationEntry( KviTranslationEntry * e = new KviTranslationEntry(
@ -639,8 +639,8 @@ bool KviMessageCatalogue::load(const TQString& name)
m_pTextCodec = KviLocale::codecForName(szHeader.ptr()); m_pTextCodec = KviLocale::codecForName(szHeader.ptr());
if(!m_pTextCodec) if(!m_pTextCodec)
{ {
debug("Can't find the codec for charset=%s",szHeader.ptr()); tqDebug("Can't find the codec for charset=%s",szHeader.ptr());
debug("Falling back to codecForLocale()"); tqDebug("Falling back to codecForLocale()");
m_pTextCodec = TQTextCodec::codecForLocale(); m_pTextCodec = TQTextCodec::codecForLocale();
} }
} }
@ -648,8 +648,8 @@ bool KviMessageCatalogue::load(const TQString& name)
if(!m_pTextCodec) if(!m_pTextCodec)
{ {
debug("The message catalogue does not have a \"charset\" header"); tqDebug("The message catalogue does not have a \"charset\" header");
debug("Assuming utf8"); // FIXME: or codecForLocale() ? tqDebug("Assuming utf8"); // FIXME: or codecForLocale() ?
m_pTextCodec = TQTextCodec::codecForName("UTF-8"); m_pTextCodec = TQTextCodec::codecForName("UTF-8");
} }
@ -871,7 +871,7 @@ namespace KviLocale
bool loadCatalogue(const TQString &name,const TQString &szLocaleDir) bool loadCatalogue(const TQString &name,const TQString &szLocaleDir)
{ {
//debug("Looking up catalogue %s",name); //tqDebug("Looking up catalogue %s",name);
if(g_pCatalogueDict->find(KviTQString::toUtf8(name).data()))return true; // already loaded if(g_pCatalogueDict->find(KviTQString::toUtf8(name).data()))return true; // already loaded
TQString szBuffer; TQString szBuffer;
@ -881,7 +881,7 @@ namespace KviLocale
KviMessageCatalogue * c = new KviMessageCatalogue(); KviMessageCatalogue * c = new KviMessageCatalogue();
if(c->load(szBuffer)) if(c->load(szBuffer))
{ {
//debug("KviLocale: loaded catalogue %s",name); //tqDebug("KviLocale: loaded catalogue %s",name);
g_pCatalogueDict->insert(KviTQString::toUtf8(name).data(),c); g_pCatalogueDict->insert(KviTQString::toUtf8(name).data(),c);
return true; return true;
} }
@ -891,7 +891,7 @@ namespace KviLocale
bool unloadCatalogue(const TQString &name) bool unloadCatalogue(const TQString &name)
{ {
//debug("Unloading catalogue : %s",name); //tqDebug("Unloading catalogue : %s",name);
return g_pCatalogueDict->remove(KviTQString::toUtf8(name).data()); return g_pCatalogueDict->remove(KviTQString::toUtf8(name).data());
} }
@ -1011,10 +1011,10 @@ namespace KviLocale
kvi_strEqualCI(szTmp.ptr(),"posix"))) kvi_strEqualCI(szTmp.ptr(),"posix")))
{ {
// FIXME: THIS IS NO LONGER VALID!!! // FIXME: THIS IS NO LONGER VALID!!!
debug("Can't find the catalogue for locale \"%s\" (%s)",g_szLang.ptr(),szTmp.ptr()); tqDebug("Can't find the catalogue for locale \"%s\" (%s)",g_szLang.ptr(),szTmp.ptr());
debug("There is no such translation or the $LANG variable was incorrectly set"); tqDebug("There is no such translation or the $LANG variable was incorrectly set");
debug("You can use $KVIRC_LANG to override the catalogue name"); tqDebug("You can use $KVIRC_LANG to override the catalogue name");
debug("For example you can set KVIRC_LANG to it_IT to force usage of the it.mo catalogue"); tqDebug("For example you can set KVIRC_LANG to it_IT to force usage of the it.mo catalogue");
} }
} }
} }

@ -99,7 +99,7 @@ static void kvi_threadIgnoreSigalarm()
ignr_act.sa_flags |= SA_RESTART; ignr_act.sa_flags |= SA_RESTART;
#endif #endif
if(sigaction(SIGALRM,&ignr_act,0) == -1)debug("Failed to set SIG_IGN for SIGALRM."); if(sigaction(SIGALRM,&ignr_act,0) == -1)tqDebug("Failed to set SIG_IGN for SIGALRM.");
#endif #endif
#endif #endif
} }
@ -108,7 +108,7 @@ static void kvi_threadIgnoreSigalarm()
static void kvi_threadSigpipeHandler(int) static void kvi_threadSigpipeHandler(int)
{ {
debug("Thread ????: Caught SIGPIPE: ignoring."); tqDebug("Thread ????: Caught SIGPIPE: ignoring.");
} }
#endif #endif
@ -133,7 +133,7 @@ static void kvi_threadCatchSigpipe()
act.sa_flags |= SA_RESTART; act.sa_flags |= SA_RESTART;
#endif #endif
if(sigaction(SIGPIPE,&act,0L) == -1)debug("Failed to set the handler for SIGPIPE."); if(sigaction(SIGPIPE,&act,0L) == -1)tqDebug("Failed to set the handler for SIGPIPE.");
#endif #endif
} }
@ -171,7 +171,7 @@ void KviThreadManager::globalDestroy()
KviThreadManager::KviThreadManager() KviThreadManager::KviThreadManager()
: TQObject() : TQObject()
{ {
if(g_pThreadManager)debug("Hey...what are ya doing ?"); if(g_pThreadManager)tqDebug("Hey...what are ya doing ?");
m_pMutex = new KviMutex(); m_pMutex = new KviMutex();
@ -189,17 +189,17 @@ KviThreadManager::KviThreadManager()
if(pipe(m_fd) != 0) if(pipe(m_fd) != 0)
{ {
debug("Ops...thread manager pipe creation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); tqDebug("Ops...thread manager pipe creation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data());
} }
if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_SLAVE],F_SETFL,O_NONBLOCK) == -1) if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_SLAVE],F_SETFL,O_NONBLOCK) == -1)
{ {
debug("Ops...thread manager slave pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); tqDebug("Ops...thread manager slave pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data());
} }
if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],F_SETFL,O_NONBLOCK) == -1) if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],F_SETFL,O_NONBLOCK) == -1)
{ {
debug("Ops...thread manager master pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); tqDebug("Ops...thread manager master pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data());
} }
m_pSn = new TQSocketNotifier(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],TQSocketNotifier::Read); m_pSn = new TQSocketNotifier(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],TQSocketNotifier::Read);
@ -349,7 +349,7 @@ void KviThreadManager::postSlaveEvent(TQObject *o,TQEvent *e)
{ {
// ops.. failed to write down the event.. // ops.. failed to write down the event..
// this is quite irritating now... // this is quite irritating now...
debug("Ops.. failed to write down the trigger"); tqDebug("Ops.. failed to write down the trigger");
// FIXME: maybe a single shot timer ? // FIXME: maybe a single shot timer ?
} else { } else {
m_iTriggerCount++; m_iTriggerCount++;
@ -421,7 +421,7 @@ void KviThreadManager::threadLeftWaitState()
m_iWaitingThreads--; m_iWaitingThreads--;
if(m_iWaitingThreads < 0) if(m_iWaitingThreads < 0)
{ {
debug("Ops.. got a negative number of waiting threads ?"); tqDebug("Ops.. got a negative number of waiting threads ?");
m_iWaitingThreads = 0; m_iWaitingThreads = 0;
} }
m_pMutex->unlock(); m_pMutex->unlock();
@ -462,11 +462,11 @@ KviThread::KviThread()
KviThread::~KviThread() KviThread::~KviThread()
{ {
// debug(">> KviThread::~KviThread() : (this = %d)",this); // tqDebug(">> KviThread::~KviThread() : (this = %d)",this);
wait(); wait();
delete m_pRunningMutex; delete m_pRunningMutex;
g_pThreadManager->unregisterSlaveThread(this); g_pThreadManager->unregisterSlaveThread(this);
// debug("<< KviThread::~KviThread() : (this = %d)",this); // tqDebug("<< KviThread::~KviThread() : (this = %d)",this);
} }
void KviThread::setRunning(bool bRunning) void KviThread::setRunning(bool bRunning)
@ -512,16 +512,16 @@ bool KviThread::start()
void KviThread::wait() void KviThread::wait()
{ {
// We're on the master side here...and we're waiting the slave to exit // We're on the master side here...and we're waiting the slave to exit
// debug(">> KviThread::wait() (this=%d)",this); // tqDebug(">> KviThread::wait() (this=%d)",this);
while(isStartingUp())usleep(500); // sleep 500 microseconds while(isStartingUp())usleep(500); // sleep 500 microseconds
// debug("!! KviThread::wait() (this=%d)",this); // tqDebug("!! KviThread::wait() (this=%d)",this);
g_pThreadManager->threadEnteredWaitState(); g_pThreadManager->threadEnteredWaitState();
while(isRunning()) while(isRunning())
{ {
usleep(500); // sleep 500 microseconds usleep(500); // sleep 500 microseconds
} }
g_pThreadManager->threadLeftWaitState(); g_pThreadManager->threadLeftWaitState();
// debug("<< KviThread::wait() (this=%d)",this); // tqDebug("<< KviThread::wait() (this=%d)",this);
} }
void KviThread::exit() void KviThread::exit()
@ -534,13 +534,13 @@ void KviThread::exit()
void KviThread::internalThreadRun_doNotTouchThis() void KviThread::internalThreadRun_doNotTouchThis()
{ {
// we're on the slave thread here! // we're on the slave thread here!
// debug(">> KviThread::internalRun (this=%d)",this); // tqDebug(">> KviThread::internalRun (this=%d)",this);
setRunning(true); setRunning(true);
setStartingUp(false); setStartingUp(false);
kvi_threadInitialize(); kvi_threadInitialize();
run(); run();
setRunning(false); setRunning(false);
// debug("<< KviThread::internalRun (this=%d",this); // tqDebug("<< KviThread::internalRun (this=%d",this);
} }
void KviThread::usleep(unsigned long usec) void KviThread::usleep(unsigned long usec)
@ -592,9 +592,9 @@ KviSensitiveThread::KviSensitiveThread()
KviSensitiveThread::~KviSensitiveThread() KviSensitiveThread::~KviSensitiveThread()
{ {
// debug("Entering KviSensitiveThread::~KviSensitiveThread (this=%d)",this); // tqDebug("Entering KviSensitiveThread::~KviSensitiveThread (this=%d)",this);
terminate(); terminate();
// debug("KviSensitiveThread::~KviSensitiveThread : terminate called (This=%d)",this); // tqDebug("KviSensitiveThread::~KviSensitiveThread : terminate called (This=%d)",this);
m_pLocalEventQueueMutex->lock(); m_pLocalEventQueueMutex->lock();
m_pLocalEventQueue->setAutoDelete(true); m_pLocalEventQueue->setAutoDelete(true);
delete m_pLocalEventQueue; delete m_pLocalEventQueue;
@ -602,12 +602,12 @@ KviSensitiveThread::~KviSensitiveThread()
m_pLocalEventQueueMutex->unlock(); m_pLocalEventQueueMutex->unlock();
delete m_pLocalEventQueueMutex; delete m_pLocalEventQueueMutex;
m_pLocalEventQueueMutex = 0; m_pLocalEventQueueMutex = 0;
// debug("Exiting KviSensitiveThread::~KviSensitiveThread (this=%d)",this); // tqDebug("Exiting KviSensitiveThread::~KviSensitiveThread (this=%d)",this);
} }
void KviSensitiveThread::enqueueEvent(KviThreadEvent *e) void KviSensitiveThread::enqueueEvent(KviThreadEvent *e)
{ {
// debug(">>> KviSensitiveThread::enqueueEvent() (this=%d)",this); // tqDebug(">>> KviSensitiveThread::enqueueEvent() (this=%d)",this);
m_pLocalEventQueueMutex->lock(); m_pLocalEventQueueMutex->lock();
if(!m_pLocalEventQueue) if(!m_pLocalEventQueue)
{ {
@ -618,27 +618,27 @@ void KviSensitiveThread::enqueueEvent(KviThreadEvent *e)
} }
m_pLocalEventQueue->append(e); m_pLocalEventQueue->append(e);
m_pLocalEventQueueMutex->unlock(); m_pLocalEventQueueMutex->unlock();
// debug("<<< KviSensitiveThread::enqueueEvent() (this=%d)",this); // tqDebug("<<< KviSensitiveThread::enqueueEvent() (this=%d)",this);
} }
KviThreadEvent * KviSensitiveThread::dequeueEvent() KviThreadEvent * KviSensitiveThread::dequeueEvent()
{ {
// debug(">>> KviSensitiveThread::dequeueEvent() (this=%d)",this); // tqDebug(">>> KviSensitiveThread::dequeueEvent() (this=%d)",this);
KviThreadEvent * ret; KviThreadEvent * ret;
m_pLocalEventQueueMutex->lock(); m_pLocalEventQueueMutex->lock();
ret = m_pLocalEventQueue->first(); ret = m_pLocalEventQueue->first();
if(ret)m_pLocalEventQueue->removeFirst(); if(ret)m_pLocalEventQueue->removeFirst();
m_pLocalEventQueueMutex->unlock(); m_pLocalEventQueueMutex->unlock();
// debug("<<< KviSensitiveThread::dequeueEvent() (this=%d)",this); // tqDebug("<<< KviSensitiveThread::dequeueEvent() (this=%d)",this);
return ret; return ret;
} }
void KviSensitiveThread::terminate() void KviSensitiveThread::terminate()
{ {
// debug("Entering KviSensitiveThread::terminate (this=%d)",this); // tqDebug("Entering KviSensitiveThread::terminate (this=%d)",this);
enqueueEvent(new KviThreadEvent(KVI_THREAD_EVENT_TERMINATE)); enqueueEvent(new KviThreadEvent(KVI_THREAD_EVENT_TERMINATE));
// debug("KviSensitiveThread::terminate() : event enqueued waiting (this=%d)",this); // tqDebug("KviSensitiveThread::terminate() : event enqueued waiting (this=%d)",this);
wait(); wait();
// debug("Exiting KviSensitiveThread::terminate (this=%d)",this); // tqDebug("Exiting KviSensitiveThread::terminate (this=%d)",this);
} }

@ -59,7 +59,7 @@ bool KviTalToolTipHelper::eventFilter(TQObject * pObject,TQEvent * pEvent)
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
if((pEvent->type() == TQEvent::ToolTip) && m_pToolTip) if((pEvent->type() == TQEvent::ToolTip) && m_pToolTip)
{ {
debug("TOOL TIP EVENT WITH POSITION %d,%d",((TQHelpEvent *)pEvent)->pos().x(),((TQHelpEvent *)pEvent)->pos().y()); tqDebug("TOOL TIP EVENT WITH POSITION %d,%d",((TQHelpEvent *)pEvent)->pos().x(),((TQHelpEvent *)pEvent)->pos().y());
m_pToolTip->maybeTip(((TQHelpEvent *)pEvent)->pos()); m_pToolTip->maybeTip(((TQHelpEvent *)pEvent)->pos());
return true; return true;
} }
@ -110,7 +110,7 @@ void KviTalToolTip::remove(TQWidget * widget)
void KviTalToolTip::tip(const TQRect & rect,const TQString & text) void KviTalToolTip::tip(const TQRect & rect,const TQString & text)
{ {
debug("TOOL TIP AT %d,%d",rect.topLeft().x(),rect.topLeft().y()); tqDebug("TOOL TIP AT %d,%d",rect.topLeft().x(),rect.topLeft().y());
TQToolTip::showText(m_pParent->mapToGlobal(rect.topLeft()),text); TQToolTip::showText(m_pParent->mapToGlobal(rect.topLeft()),text);
} }
#endif #endif

@ -230,7 +230,7 @@ void KviApp::setup()
getGlobalKvircDirectory(szPluginsDir,None,"qt-plugins/"); getGlobalKvircDirectory(szPluginsDir,None,"qt-plugins/");
setLibraryPaths(TQStringList(szPluginsDir)); setLibraryPaths(TQStringList(szPluginsDir));
//KviMessageBox::information(libraryPaths().join(";")); //KviMessageBox::information(libraryPaths().join(";"));
//debug("%1",loader.isLoaded()); //tqDebug("%1",loader.isLoaded());
#endif #endif
#endif #endif
@ -686,7 +686,7 @@ TQTextCodec * KviApp::defaultTextCodec()
c = TQTextCodec::codecForLocale(); c = TQTextCodec::codecForLocale();
if(c)return c; if(c)return c;
c = KviLocale::codecForName("UTF-8"); c = KviLocale::codecForName("UTF-8");
if(!c)debug("KviApp::defaultTextCodec(): cannot find a suitable text codec for locale :/"); if(!c)tqDebug("KviApp::defaultTextCodec(): cannot find a suitable text codec for locale :/");
return c; return c;
} }
@ -715,14 +715,14 @@ void KviApp::contextSensitiveHelp()
} }
// no way // no way
// FIXME: just show up simple plain online help // FIXME: just show up simple plain online help
//debug("No way: found no focus widget for that..."); //tqDebug("No way: found no focus widget for that...");
#endif #endif
} }
void KviApp::collectGarbage(TQObject * garbage) void KviApp::collectGarbage(TQObject * garbage)
{ {
// if(!g_pGarbageCollector)debug("Ops... no garbage collector ?"); // if(!g_pGarbageCollector)tqDebug("Ops... no garbage collector ?");
g_pGarbageCollector->collect(garbage); g_pGarbageCollector->collect(garbage);
} }
@ -951,7 +951,7 @@ void KviApp::setClipboardText(const TQString &str)
void KviApp::setClipboardText(const KviStr &str) void KviApp::setClipboardText(const KviStr &str)
{ {
debug("WARNING : KviApp::setClipboardText(const KviStr &) is deprecated!"); tqDebug("WARNING : KviApp::setClipboardText(const KviStr &) is deprecated!");
setClipboardText(TQString(str.ptr())); setClipboardText(TQString(str.ptr()));
} }
@ -1143,11 +1143,11 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
if(!g_pKdeDesktopBackground->loadFromShared(TQString("DESKTOP%1").arg(rinfo.currentDesktop()))) if(!g_pKdeDesktopBackground->loadFromShared(TQString("DESKTOP%1").arg(rinfo.currentDesktop())))
{ {
debug("Can't load the KDE root background image..."); tqDebug("Can't load the KDE root background image...");
delete g_pKdeDesktopBackground; delete g_pKdeDesktopBackground;
g_pKdeDesktopBackground = 0; g_pKdeDesktopBackground = 0;
} //else { } //else {
// debug("Root pixmap downalod initiated"); // tqDebug("Root pixmap downalod initiated");
//} //}
} }
@ -1303,7 +1303,7 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess)
#ifdef COMPILE_TDE_SUPPORT #ifdef COMPILE_TDE_SUPPORT
if(!bSuccess) if(!bSuccess)
{ {
debug("Failed to download the KDE root background image..."); tqDebug("Failed to download the KDE root background image...");
} else { } else {
// downloaded! // downloaded!
// create shaded copies... // create shaded copies...
@ -1582,7 +1582,7 @@ void KviApp::autoConnectToServers()
void KviApp::createFrame() void KviApp::createFrame()
{ {
if(g_pFrame)debug("WARNING: Creating the main frame twice!"); if(g_pFrame)tqDebug("WARNING: Creating the main frame twice!");
g_pFrame = new KviFrame(); g_pFrame = new KviFrame();
g_pFrame->createNewConsole(true); g_pFrame->createNewConsole(true);

@ -78,9 +78,9 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
break; break;
case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break; case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break;
case HelpNoIntl : szData.append("help"); break; case HelpNoIntl : szData.append("help"); break;
case Log : debug("WARNING Global log directory requested!"); break; case Log : tqDebug("WARNING Global log directory requested!"); break;
case Incoming : debug("WARNING Global incoming directory requested!"); break; case Incoming : tqDebug("WARNING Global incoming directory requested!"); break;
case Trash : debug("WARNING Global trash directory requested!"); break; case Trash : tqDebug("WARNING Global trash directory requested!"); break;
case Config : szData.append("config"); break; case Config : szData.append("config"); break;
case Audio : szData.append("audio"); break; case Audio : szData.append("audio"); break;
case Scripts : szData.append("scripts"); break; case Scripts : szData.append("scripts"); break;
@ -91,7 +91,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
case License : szData.append("license"); break; case License : szData.append("license"); break;
case Filters : szData.append("filters"); break; case Filters : szData.append("filters"); break;
case Locale : szData.append("locale"); break; case Locale : szData.append("locale"); break;
case Tmp : debug("WARNING Global tmp directory requested!"); break; case Tmp : tqDebug("WARNING Global tmp directory requested!"); break;
case Themes : szData.append("themes"); break; case Themes : szData.append("themes"); break;
case Classes : szData.append("classes"); break; case Classes : szData.append("classes"); break;
case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break;
@ -438,7 +438,7 @@ bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const char * filename)
szRetPath = *it; szRetPath = *it;
szRetPath.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); szRetPath.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR);
szRetPath.append(filename); szRetPath.append(filename);
//debug("LOOK FOR %s",szRetPath.ptr()); //tqDebug("LOOK FOR %s",szRetPath.ptr());
if(KviFileUtils::fileExists(szRetPath.ptr()))return true; if(KviFileUtils::fileExists(szRetPath.ptr()))return true;
} }
@ -454,7 +454,7 @@ bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const char * filenam
szRetPath = *it; szRetPath = *it;
KviTQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); KviTQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR);
szRetPath.append(filename); szRetPath.append(filename);
//debug("LOOK FOR %s",szRetPath.ptr()); //tqDebug("LOOK FOR %s",szRetPath.ptr());
if(KviFileUtils::fileExists(szRetPath))return true; if(KviFileUtils::fileExists(szRetPath))return true;
} }
@ -513,7 +513,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename)
for(i=0;i<2;i++) for(i=0;i<2;i++)
{ {
getGlobalKvircDirectory(szBuffer,pics_globalsubdirs[i],szRetPath); getGlobalKvircDirectory(szBuffer,pics_globalsubdirs[i],szRetPath);
//debug("CHECK %s",szBuffer.ptr()); //tqDebug("CHECK %s",szBuffer.ptr());
if(KviFileUtils::fileExists(szBuffer.ptr())) if(KviFileUtils::fileExists(szBuffer.ptr()))
{ {
TQFileInfo fi2(TQString::fromUtf8(szBuffer.ptr())); TQFileInfo fi2(TQString::fromUtf8(szBuffer.ptr()));
@ -711,7 +711,7 @@ bool KviApp::getReadOnlyConfigPath(TQString &buffer,const char *config_name,Kvir
{ {
// Take a look in the local directory.... // Take a look in the local directory....
getLocalKvircDirectory(buffer,sbd,config_name); getLocalKvircDirectory(buffer,sbd,config_name);
//debug("%s %s %i |%s| %i",__FILE__,__FUNCTION__,__LINE__,buffer.ptr(),KviFileUtils::fileExists(buffer.ptr())); //tqDebug("%s %s %i |%s| %i",__FILE__,__FUNCTION__,__LINE__,buffer.ptr(),KviFileUtils::fileExists(buffer.ptr()));
if(!KviFileUtils::fileExists(buffer)) if(!KviFileUtils::fileExists(buffer))
{ {
// No saved config yet... check for defaults // No saved config yet... check for defaults

@ -792,7 +792,7 @@ void KviApp::setupFinish()
{ {
if(!g_hSetupLibrary) if(!g_hSetupLibrary)
{ {
debug("Oops... lost the setup library ?"); tqDebug("Oops... lost the setup library ?");
return; return;
} }

@ -118,7 +118,7 @@ void KviFileTransferManager::unregisterTransfer(KviFileTransfer * t)
{ {
if(!m_pTransferList) if(!m_pTransferList)
{ {
debug("Ops: unregistering transfer with no transfer list!"); tqDebug("Ops: unregistering transfer with no transfer list!");
return; return;
} }

@ -505,11 +505,11 @@ KviIconManager::KviIconManager()
nnn += ".png"; nnn += ".png";
if(tmp->isNull()) if(tmp->isNull())
{ {
debug("OPS, %s is NULL",nnn.latin1()); tqDebug("OPS, %s is NULL",nnn.latin1());
} }
if(!tmp->save(nnn,"PNG",90)) if(!tmp->save(nnn,"PNG",90))
{ {
debug("FAILED TO SAVE %s",nnn.latin1()); tqDebug("FAILED TO SAVE %s",nnn.latin1());
} }
} }
*/ */

@ -144,7 +144,7 @@
cpd.dwData = KVI_WINDOWS_IPC_MESSAGE; cpd.dwData = KVI_WINDOWS_IPC_MESSAGE;
cpd.lpData = (void *)message; cpd.lpData = (void *)message;
DWORD dwResult; DWORD dwResult;
debug(message); tqDebug(message);
::SendMessageTimeout(hSentinel,WM_COPYDATA,(WPARAM)NULL,(LPARAM)&cpd,SMTO_BLOCK,1000,&dwResult); ::SendMessageTimeout(hSentinel,WM_COPYDATA,(WPARAM)NULL,(LPARAM)&cpd,SMTO_BLOCK,1000,&dwResult);
return true; return true;
} }
@ -222,7 +222,7 @@
{ {
if(cpd->dwData == KVI_WINDOWS_IPC_MESSAGE) if(cpd->dwData == KVI_WINDOWS_IPC_MESSAGE)
{ {
debug((char *)(cpd->lpData)); tqDebug((char *)(cpd->lpData));
if(g_pApp)g_pApp->ipcMessage((char *)(cpd->lpData)); if(g_pApp)g_pApp->ipcMessage((char *)(cpd->lpData));
return true; return true;
} }

@ -186,7 +186,7 @@ void KviIrcConnection::setupTextCodec()
if(!m_pTarget->server()->encoding().isEmpty()) if(!m_pTarget->server()->encoding().isEmpty())
{ {
m_pTextCodec = KviLocale::codecForName(m_pTarget->server()->encoding().latin1()); m_pTextCodec = KviLocale::codecForName(m_pTarget->server()->encoding().latin1());
if(!m_pTextCodec)debug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data()); if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data());
} }
if(!m_pTextCodec) if(!m_pTextCodec)
{ {
@ -194,7 +194,7 @@ void KviIrcConnection::setupTextCodec()
if(!m_pTarget->network()->encoding().isEmpty()) if(!m_pTarget->network()->encoding().isEmpty())
{ {
m_pTextCodec = KviLocale::codecForName(m_pTarget->network()->encoding().latin1()); m_pTextCodec = KviLocale::codecForName(m_pTarget->network()->encoding().latin1());
if(!m_pTextCodec)debug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data()); if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data());
} }
} }
if(!m_pTextCodec) if(!m_pTextCodec)
@ -832,7 +832,7 @@ void KviIrcConnection::hostNameLookupTerminated(KviDns *pDns)
// //
if(!m_pLocalhostDns) if(!m_pLocalhostDns)
{ {
debug("Something weird is happening: pDns != 0 but m_pLocalhostDns == 0 :/"); tqDebug("Something weird is happening: pDns != 0 but m_pLocalhostDns == 0 :/");
return; return;
} }

@ -222,7 +222,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
if(m_pProxyDns) if(m_pProxyDns)
{ {
debug("Something weird is happening, m_pProxyDns is non-zero in lookupProxyHostname()"); tqDebug("Something weird is happening, m_pProxyDns is non-zero in lookupProxyHostname()");
delete m_pProxyDns; delete m_pProxyDns;
m_pProxyDns = 0; m_pProxyDns = 0;
} }
@ -340,7 +340,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname()
} else { } else {
if(m_pServerDns) if(m_pServerDns)
{ {
debug("Something weird is happening, m_pServerDns is non-zero in lookupServerHostname()"); tqDebug("Something weird is happening, m_pServerDns is non-zero in lookupServerHostname()");
delete m_pServerDns; delete m_pServerDns;
m_pServerDns = 0; m_pServerDns = 0;
} }

@ -175,7 +175,7 @@ void KviIrcLink::resolverTerminated()
{ {
if(!m_pResolver) if(!m_pResolver)
{ {
debug("Oops... resoverTerminated() triggered without a resolver ?"); tqDebug("Oops... resoverTerminated() triggered without a resolver ?");
return; return;
} }
@ -312,7 +312,7 @@ void KviIrcLink::processData(char * buffer,int len)
//The m_pReadBuffer contains at max 1 irc message... //The m_pReadBuffer contains at max 1 irc message...
//that can not be longer than 510 bytes (the message is not CRLF terminated) //that can not be longer than 510 bytes (the message is not CRLF terminated)
// FIXME: Is this limit *really* valid on all servers ? // FIXME: Is this limit *really* valid on all servers ?
if(m_uReadBufferLen > 510)debug("WARNING : Receiving an invalid irc message from server."); if(m_uReadBufferLen > 510)tqDebug("WARNING : Receiving an invalid irc message from server.");
} }
kvi_free(messageBuffer); kvi_free(messageBuffer);
} }
@ -359,7 +359,7 @@ void KviIrcLink::socketStateChange()
m_pConnection->linkTerminated(); m_pConnection->linkTerminated();
break; break;
default: // currently can be only Idle default: // currently can be only Idle
debug("Ooops... got a KviIrcSocket::Idle state change when KviIrcLink::m_eState was Idle"); tqDebug("Ooops... got a KviIrcSocket::Idle state change when KviIrcLink::m_eState was Idle");
break; break;
} }
} }

@ -442,7 +442,7 @@ void KviIrcSocket::connectionEstabilished()
void KviIrcSocket::connectedToProxy() void KviIrcSocket::connectedToProxy()
{ {
if(!m_pProxy)debug("WARNING: connectedToProxy() without a m_pProxy!"); if(!m_pProxy)tqDebug("WARNING: connectedToProxy() without a m_pProxy!");
// FIXME: Do we want to support SSL proxies ? // FIXME: Do we want to support SSL proxies ?
// it would be just a matter of SSL handshaking // it would be just a matter of SSL handshaking
@ -647,7 +647,7 @@ void KviIrcSocket::proxyLoginHttp()
} else { } else {
tmp.append("\r\n"); tmp.append("\r\n");
} }
// debug(tmp.ptr()); // tqDebug(tmp.ptr());
sendRawData(tmp.ptr(),tmp.len()); sendRawData(tmp.ptr(),tmp.len());
} }
@ -702,7 +702,7 @@ void KviIrcSocket::proxyLoginV4()
struct in_addr ircInAddr; struct in_addr ircInAddr;
if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr)) if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))
debug("SOCKET INTERNAL ERROR IN IPV4 (SOCKS4) ADDR CONVERSION"); tqDebug("SOCKET INTERNAL ERROR IN IPV4 (SOCKS4) ADDR CONVERSION");
TQ_UINT32 host=(TQ_UINT32)ircInAddr.s_addr; TQ_UINT32 host=(TQ_UINT32)ircInAddr.s_addr;
kvi_memmove((void *)(bufToSend+4),(void *)&host,4); kvi_memmove((void *)(bufToSend+4),(void *)&host,4);
@ -914,7 +914,7 @@ void KviIrcSocket::proxySendTargetDataV5()
#ifdef COMPILE_IPV6_SUPPORT #ifdef COMPILE_IPV6_SUPPORT
struct in6_addr ircInAddr; struct in6_addr ircInAddr;
if(!kvi_stringIpToBinaryIp_V6(m_pIrcServer->ip(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV6 ADDR CONVERSION"); if(!kvi_stringIpToBinaryIp_V6(m_pIrcServer->ip(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV6 ADDR CONVERSION");
kvi_memmove((void *)(bufToSend + 4),(void *)(&ircInAddr),4); kvi_memmove((void *)(bufToSend + 4),(void *)(&ircInAddr),4);
TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port());
kvi_memmove((void *)(bufToSend + 20),(void *)&port,2); kvi_memmove((void *)(bufToSend + 20),(void *)&port,2);
@ -922,7 +922,7 @@ void KviIrcSocket::proxySendTargetDataV5()
} else { } else {
struct in_addr ircInAddr; struct in_addr ircInAddr;
if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION"); if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION");
TQ_UINT32 host = (TQ_UINT32)ircInAddr.s_addr; TQ_UINT32 host = (TQ_UINT32)ircInAddr.s_addr;
kvi_memmove((void *)(bufToSend + 4),(void *)&host,4); kvi_memmove((void *)(bufToSend + 4),(void *)&host,4);
TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port());
@ -1254,7 +1254,7 @@ void KviIrcSocket::doSSLHandshake(int)
if(!m_pSSL) if(!m_pSSL)
{ {
debug("Ops... I've lost the SSL class ?"); tqDebug("Ops... I've lost the SSL class ?");
reset(); reset();
return; // ops ? return; // ops ?
} }
@ -1311,7 +1311,7 @@ void KviIrcSocket::doSSLHandshake(int)
} }
#else //!COMPILE_SSL_SUPPORT #else //!COMPILE_SSL_SUPPORT
debug("Ops.. ssl handshake without ssl support!...aborting!"); tqDebug("Ops.. ssl handshake without ssl support!...aborting!");
exit(-1); exit(-1);
#endif //!COMPILE_SSL_SUPPORT #endif //!COMPILE_SSL_SUPPORT
} }
@ -1541,7 +1541,7 @@ void KviIrcSocket::processData(char * buffer,int)
//The m_pReadBuffer contains at max 1 irc message... //The m_pReadBuffer contains at max 1 irc message...
//that can not be longer than 510 bytes (the message is not CRLF terminated) //that can not be longer than 510 bytes (the message is not CRLF terminated)
// FIXME: Is this limit *really* valid on all servers ? // FIXME: Is this limit *really* valid on all servers ?
if(m_uReadBufferLen > 510)debug("WARNING : Receiving an invalid irc message from server."); if(m_uReadBufferLen > 510)tqDebug("WARNING : Receiving an invalid irc message from server.");
} }
kvi_free(messageBuffer); kvi_free(messageBuffer);

@ -36,7 +36,7 @@
extern bool kvi_sendIpcMessage(const char * message); // kvi_ipc.cpp extern bool kvi_sendIpcMessage(const char * message); // kvi_ipc.cpp
#endif #endif
#include <tqglobal.h> //for debug() #include <tqglobal.h> //for tqDebug()
#include <tqmessagebox.h> #include <tqmessagebox.h>
@ -83,7 +83,7 @@ int parseArgs(ParseArgs * a)
#ifdef COMPILE_ON_WINDOWS #ifdef COMPILE_ON_WINDOWS
MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0); MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0);
#else #else
debug("%s", szMessage.ascii()); tqDebug("%s", szMessage.ascii());
#endif #endif
return KVI_ARGS_RETCODE_STOP; return KVI_ARGS_RETCODE_STOP;
@ -131,7 +131,7 @@ int parseArgs(ParseArgs * a)
#ifdef COMPILE_ON_WINDOWS #ifdef COMPILE_ON_WINDOWS
MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0); MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0);
#else #else
debug("%s", szMessage.ascii()); tqDebug("%s", szMessage.ascii());
#endif #endif
return KVI_ARGS_RETCODE_STOP; return KVI_ARGS_RETCODE_STOP;
} }
@ -141,12 +141,12 @@ int parseArgs(ParseArgs * a)
idx++; idx++;
if(idx >= a->argc) if(idx >= a->argc)
{ {
debug("Option -c requires a config file name"); tqDebug("Option -c requires a config file name");
return KVI_ARGS_RETCODE_ERROR; return KVI_ARGS_RETCODE_ERROR;
} }
p = a->argv[idx]; p = a->argv[idx];
a->configFile = p; a->configFile = p;
debug("Using file %s as config",p); tqDebug("Using file %s as config",p);
continue; continue;
} }
@ -155,7 +155,7 @@ int parseArgs(ParseArgs * a)
idx++; idx++;
if(idx >= a->argc) if(idx >= a->argc)
{ {
debug("Option -e requires a command"); tqDebug("Option -e requires a command");
return KVI_ARGS_RETCODE_ERROR; return KVI_ARGS_RETCODE_ERROR;
} }
p = a->argv[idx]; p = a->argv[idx];
@ -169,7 +169,7 @@ int parseArgs(ParseArgs * a)
idx++; idx++;
if(idx >= a->argc) if(idx >= a->argc)
{ {
debug("Option -x requires a command"); tqDebug("Option -x requires a command");
return KVI_ARGS_RETCODE_ERROR; return KVI_ARGS_RETCODE_ERROR;
} }
p = a->argv[idx]; p = a->argv[idx];
@ -184,7 +184,7 @@ int parseArgs(ParseArgs * a)
idx++; idx++;
if(idx >= a->argc) if(idx >= a->argc)
{ {
debug("Option -r requires a command"); tqDebug("Option -r requires a command");
return KVI_ARGS_RETCODE_ERROR; return KVI_ARGS_RETCODE_ERROR;
} }
p = a->argv[idx]; p = a->argv[idx];
@ -204,13 +204,13 @@ int parseArgs(ParseArgs * a)
idx++; idx++;
if(idx >= a->argc) if(idx >= a->argc)
{ {
debug("Option -n requires a config file name"); tqDebug("Option -n requires a config file name");
return KVI_ARGS_RETCODE_ERROR; return KVI_ARGS_RETCODE_ERROR;
} }
p = a->argv[idx]; p = a->argv[idx];
a->configFile = p; a->configFile = p;
a->createFile=true; a->createFile=true;
debug("Using file %s as config",p); tqDebug("Using file %s as config",p);
continue; continue;
} }
@ -385,7 +385,7 @@ int main(int argc,char ** argv)
if(a.bShowPopup) if(a.bShowPopup)
TQMessageBox::information(0,"Session - KVIrc",tmp.ptr(),TQMessageBox::Ok); TQMessageBox::information(0,"Session - KVIrc",tmp.ptr(),TQMessageBox::Ok);
else else
debug("%s", tmp.ptr()); tqDebug("%s", tmp.ptr());
} }
delete theApp; delete theApp;
return 0; return 0;

@ -1019,7 +1019,7 @@ namespace KviTheme
cfg.writeEntry(g_pixmapOptionsTable[i].name,szPixName); cfg.writeEntry(g_pixmapOptionsTable[i].name,szPixName);
} else { } else {
// we ignore this error for now // we ignore this error for now
debug("failed to save %s",szPixPath.utf8().data()); tqDebug("failed to save %s",szPixPath.utf8().data());
cfg.writeEntry(g_pixmapOptionsTable[i].name,""); cfg.writeEntry(g_pixmapOptionsTable[i].name,"");
} }
} else { } else {

@ -193,7 +193,7 @@ int KviTextIconManager::load(const TQString &filename,bool bMerge)
int id = cfg.readIntEntry(*s,-1); int id = cfg.readIntEntry(*s,-1);
TQString szTmp; TQString szTmp;
TQPixmap * pix=0; TQPixmap * pix=0;
// debug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,id); // tqDebug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,id);
if(id!=-1) if(id!=-1)
pix = g_pIconManager->getSmallIcon(id); pix = g_pIconManager->getSmallIcon(id);
else { else {

@ -45,7 +45,7 @@ void KviKvsAliasManager::init()
{ {
if(KviKvsAliasManager::instance()) if(KviKvsAliasManager::instance())
{ {
debug("WARNING: Trying to create the KviKvsAliasManager twice!"); tqDebug("WARNING: Trying to create the KviKvsAliasManager twice!");
return; return;
} }
(void)new KviKvsAliasManager(); (void)new KviKvsAliasManager();
@ -55,7 +55,7 @@ void KviKvsAliasManager::done()
{ {
if(!KviKvsAliasManager::instance()) if(!KviKvsAliasManager::instance())
{ {
debug("WARNING: Trying to destroy the KviKvsAliasManager twice!"); tqDebug("WARNING: Trying to destroy the KviKvsAliasManager twice!");
return; return;
} }
delete KviKvsAliasManager::instance(); delete KviKvsAliasManager::instance();

@ -469,7 +469,7 @@ namespace KviKvsCoreFunctions
wnd = KVSCF_pContext->window(); wnd = KVSCF_pContext->window();
} }
//debug("CALLING $target on window %s",wnd->name()); //tqDebug("CALLING $target on window %s",wnd->name());
TQString szTa = wnd->target(); TQString szTa = wnd->target();

@ -78,7 +78,7 @@ void KviKvsDnsManager::init()
{ {
if(KviKvsDnsManager::m_pInstance) if(KviKvsDnsManager::m_pInstance)
{ {
debug("Trying to double init() the dns manager!"); tqDebug("Trying to double init() the dns manager!");
return; return;
} }
KviKvsDnsManager::m_pInstance = new KviKvsDnsManager(); KviKvsDnsManager::m_pInstance = new KviKvsDnsManager();
@ -88,7 +88,7 @@ void KviKvsDnsManager::done()
{ {
if(!KviKvsDnsManager::m_pInstance) if(!KviKvsDnsManager::m_pInstance)
{ {
debug("Trying to call done() on a non existing dns manager!"); tqDebug("Trying to call done() on a non existing dns manager!");
return; return;
} }
delete KviKvsDnsManager::m_pInstance; delete KviKvsDnsManager::m_pInstance;
@ -111,7 +111,7 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
KviKvsDnsObject * o = m_pDnsObjects->find(pDns); KviKvsDnsObject * o = m_pDnsObjects->find(pDns);
if(!o) if(!o)
{ {
debug("KviKvsDnsManager::dnsLookupTerminated(): can't find the KviKvsDnsObject structure"); tqDebug("KviKvsDnsManager::dnsLookupTerminated(): can't find the KviKvsDnsObject structure");
return; return;
} }

@ -107,7 +107,7 @@ void KviKvsEventManager::init()
{ {
if(KviKvsEventManager::instance()) if(KviKvsEventManager::instance())
{ {
debug("WARNING: Trying to create KviKvsEventManager twice!"); tqDebug("WARNING: Trying to create KviKvsEventManager twice!");
return; return;
} }
(void) new KviKvsEventManager(); (void) new KviKvsEventManager();
@ -117,7 +117,7 @@ void KviKvsEventManager::done()
{ {
if(!KviKvsEventManager::instance()) if(!KviKvsEventManager::instance())
{ {
debug("WARNING: Trying to destroy the KviKvsEventManager twice!"); tqDebug("WARNING: Trying to destroy the KviKvsEventManager twice!");
return; return;
} }
delete KviKvsEventManager::instance(); delete KviKvsEventManager::instance();

@ -616,7 +616,7 @@ KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,con
KviKvsKernel::instance()->objectController()->registerObject(this); KviKvsKernel::instance()->objectController()->registerObject(this);
// debug("Hello world!"); // tqDebug("Hello world!");
// [root@localhost cvs3]# kvirc // [root@localhost cvs3]# kvirc
// Hello world! // Hello world!
// [root@localhost cvs3]# date // [root@localhost cvs3]# date

@ -171,7 +171,7 @@ void KviKvsObjectController::flushUserClasses()
if(c->save(szPath)) if(c->save(szPath))
c->clearDirtyFlag(); c->clearDirtyFlag();
else else
debug("Oops.. failed to save the object class %s",c->name().latin1()); tqDebug("Oops.. failed to save the object class %s",c->name().latin1());
} }
} }
++it; ++it;
@ -187,7 +187,7 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass,
KviModule * pModule = g_pModuleManager->getModule("objects"); KviModule * pModule = g_pModuleManager->getModule("objects");
if(!pModule) if(!pModule)
{ {
debug("ops...something wrong with the libkviobjects module!"); tqDebug("ops...something wrong with the libkviobjects module!");
return 0; return 0;
} else pC = m_pClassDict->find(szClass); } else pC = m_pClassDict->find(szClass);
if(!pC) if(!pC)

@ -93,7 +93,7 @@ namespace KviKvsParameterProcessor
// ignore :) // ignore :)
break; break;
default: default:
debug("Internal error in KviKvsParameterProcessor::setDefaultValue(): unknown parameter type %d",pFmtArray->uType); tqDebug("Internal error in KviKvsParameterProcessor::setDefaultValue(): unknown parameter type %d",pFmtArray->uType);
break; break;
} }
#endif #endif
@ -358,7 +358,7 @@ namespace KviKvsParameterProcessor
// ignore // ignore
break; break;
default: default:
debug("Internal error in KviKvsParameterProcessor::processAsParameters(): unknown parameter type %d",pFmtArray->uType); tqDebug("Internal error in KviKvsParameterProcessor::processAsParameters(): unknown parameter type %d",pFmtArray->uType);
return false; return false;
break; break;
} }

@ -110,7 +110,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
TQString szNum1(pBegin,KVSP_curCharPointer - pBegin); TQString szNum1(pBegin,KVSP_curCharPointer - pBegin);
bool bOk; bool bOk;
int iNum1 = szNum1.toInt(&bOk); int iNum1 = szNum1.toInt(&bOk);
if(!bOk)debug("Ops... a non-number made by numbers ?"); if(!bOk)tqDebug("Ops... a non-number made by numbers ?");
if(KVSP_curCharUnicode != '-') if(KVSP_curCharUnicode != '-')
{ {
@ -140,7 +140,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
TQString szNum2(pBegin,KVSP_curCharPointer - pBegin); TQString szNum2(pBegin,KVSP_curCharPointer - pBegin);
int iNum2 = szNum2.toInt(&bOk); int iNum2 = szNum2.toInt(&bOk);
if(!bOk)debug("Ops... a non-number made by numbers (2) ?"); if(!bOk)tqDebug("Ops... a non-number made by numbers (2) ?");
if(iNum1 < iNum2)return new KviKvsTreeNodeMultipleParameterIdentifier(pDollarBegin,iNum1,iNum2); if(iNum1 < iNum2)return new KviKvsTreeNodeMultipleParameterIdentifier(pDollarBegin,iNum1,iNum2);
else { else {

@ -41,7 +41,7 @@
#define KVSP_setCurCharPointer(_ptr) m_ptr = _ptr #define KVSP_setCurCharPointer(_ptr) m_ptr = _ptr
#define KVSP_ASSERT(_x) if(!(_x))debug("WARNING : ASSERT FAILED: (%s) IS FALSE AT %s:%d",#_x,__FILE__,__LINE__); #define KVSP_ASSERT(_x) if(!(_x))tqDebug("WARNING : ASSERT FAILED: (%s) IS FALSE AT %s:%d",#_x,__FILE__,__LINE__);
#endif //!_KVI_KVS_PARSER_MACROS_H_ #endif //!_KVI_KVS_PARSER_MACROS_H_

@ -46,7 +46,7 @@ void KviKvsPopupManager::init()
{ {
if(KviKvsPopupManager::instance()) if(KviKvsPopupManager::instance())
{ {
debug("WARNING: Trying to create the KviKvsPopupManager twice!"); tqDebug("WARNING: Trying to create the KviKvsPopupManager twice!");
return; return;
} }
(void)new KviKvsPopupManager(); (void)new KviKvsPopupManager();
@ -56,7 +56,7 @@ void KviKvsPopupManager::done()
{ {
if(!KviKvsPopupManager::instance()) if(!KviKvsPopupManager::instance())
{ {
debug("WARNING: Trying to destroy the KviKvsPopupManager twice!"); tqDebug("WARNING: Trying to destroy the KviKvsPopupManager twice!");
return; return;
} }
delete KviKvsPopupManager::instance(); delete KviKvsPopupManager::instance();

@ -713,7 +713,7 @@ void KviKvsPopupMenu::addExtPopup(const TQString &szItemName,const TQString &szP
void KviKvsPopupMenu::addItemInternal(KviKvsPopupMenuItem * it) void KviKvsPopupMenu::addItemInternal(KviKvsPopupMenuItem * it)
{ {
if(isLocked())debug("Ooops... KviKvsPopupMenu is locked in ::addItem()"); if(isLocked())tqDebug("Ooops... KviKvsPopupMenu is locked in ::addItem()");
m_pItemList->append(it); m_pItemList->append(it);
} }
@ -794,7 +794,7 @@ void KviKvsPopupMenu::setupMenuContents()
if(m_bSetupDone)return; if(m_bSetupDone)return;
// we have been called by doPopup // we have been called by doPopup
// the menu contents have been already cleared // the menu contents have been already cleared
if(m_pTopLevelData)debug("Ops.. something got messed in KviKvsPopupMenu activation system"); if(m_pTopLevelData)tqDebug("Ops.. something got messed in KviKvsPopupMenu activation system");
// Swap the top level data from temporary to the permanent // Swap the top level data from temporary to the permanent
m_pTopLevelData = m_pTempTopLevelData; m_pTopLevelData = m_pTempTopLevelData;
m_pTempTopLevelData = 0; m_pTempTopLevelData = 0;
@ -812,7 +812,7 @@ void KviKvsPopupMenu::setupMenuContents()
KviKvsPopupMenuTopLevelData * d = topLevelData(); KviKvsPopupMenuTopLevelData * d = topLevelData();
if(!d) if(!d)
{ {
debug("Ops...menu contents changed behind my back!"); tqDebug("Ops...menu contents changed behind my back!");
return; return;
} }
@ -898,9 +898,9 @@ void KviKvsPopupMenu::itemClicked(int itemId)
// FIXME: should we print somethng if run() returns false ? // FIXME: should we print somethng if run() returns false ?
lock(false); lock(false);
} }
} else debug("oops....clicked something that is not an item at position %d",param); } else tqDebug("oops....clicked something that is not an item at position %d",param);
// FIXME: #warning "Maybe tell that the window has changed" // FIXME: #warning "Maybe tell that the window has changed"
} else debug("oops....no menu item at position %d",param); } else tqDebug("oops....no menu item at position %d",param);
// UGLY TQt 3.0.0.... we can't clear menu contents here :( // UGLY TQt 3.0.0.... we can't clear menu contents here :(
//#if [[[TQT_VERSION IS DEPRECATED]]] < 300 //#if [[[TQT_VERSION IS DEPRECATED]]] < 300
// topLevelPopup()->clearMenuContents(); // topLevelPopup()->clearMenuContents();

@ -209,7 +209,7 @@ bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const TQString &szData
params.append(new KviKvsVariant(TQString("ping"))); params.append(new KviKvsVariant(TQString("ping")));
break; break;
default: default:
debug("Ops... unknown trigger() CallbackEvent parameter in KviProcessDescriptor::trigger()"); tqDebug("Ops... unknown trigger() CallbackEvent parameter in KviProcessDescriptor::trigger()");
return false; return false;
break; break;
} }

@ -94,7 +94,7 @@ KviKvsScript::~KviKvsScript()
{ {
if(m_pData->m_uRefs < 2) if(m_pData->m_uRefs < 2)
{ {
if(m_pData->m_uLock)debug("WARNING: Destroying a locked KviKvsScript"); if(m_pData->m_uLock)tqDebug("WARNING: Destroying a locked KviKvsScript");
if(m_pData->m_pTree)delete m_pData->m_pTree; if(m_pData->m_pTree)delete m_pData->m_pTree;
delete m_pData; delete m_pData;
} else { } else {
@ -126,7 +126,7 @@ bool KviKvsScript::locked() const
void KviKvsScript::dump(const char * prefix) void KviKvsScript::dump(const char * prefix)
{ {
if(m_pData->m_pTree)m_pData->m_pTree->dump(prefix); if(m_pData->m_pTree)m_pData->m_pTree->dump(prefix);
else debug("%s KviKvsScript : no tree to dump",prefix); else tqDebug("%s KviKvsScript : no tree to dump",prefix);
} }
void KviKvsScript::detach() void KviKvsScript::detach()
@ -190,8 +190,8 @@ int KviKvsScript::run(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVariant
if(!m_pData->m_pTree) if(!m_pData->m_pTree)
{ {
//g_iTreeCacheMisses++; //g_iTreeCacheMisses++;
//debug("CREATING TREE FOR SCRIPT %s",name().latin1()); //tqDebug("CREATING TREE FOR SCRIPT %s",name().latin1());
//debug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses); //tqDebug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses);
if(!parse(pWnd,iRunFlags)) if(!parse(pWnd,iRunFlags))
{ {
if(pParams && !(iRunFlags & PreserveParams))delete pParams; if(pParams && !(iRunFlags & PreserveParams))delete pParams;
@ -199,8 +199,8 @@ int KviKvsScript::run(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVariant
} }
} else { } else {
//g_iTreeCacheHits++; //g_iTreeCacheHits++;
//debug("USING A CACHED TREE FOR SCRIPT %s",name().latin1()); //tqDebug("USING A CACHED TREE FOR SCRIPT %s",name().latin1());
//debug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses); //tqDebug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses);
} }
return execute(pWnd,pParams,pRetVal,iRunFlags,pExtData); return execute(pWnd,pParams,pRetVal,iRunFlags,pExtData);
@ -211,14 +211,14 @@ int KviKvsScript::run(KviKvsRunTimeContext * pContext,int iRunFlags)
if(!m_pData->m_pTree) if(!m_pData->m_pTree)
{ {
//g_iTreeCacheMisses++; //g_iTreeCacheMisses++;
//debug("CREATING TREE FOR SCRIPT %s",name().latin1()); //tqDebug("CREATING TREE FOR SCRIPT %s",name().latin1());
//debug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses); //tqDebug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses);
if(!parse(pContext->window(),iRunFlags)) if(!parse(pContext->window(),iRunFlags))
return Error; return Error;
} else { } else {
//g_iTreeCacheHits++; //g_iTreeCacheHits++;
//debug("USING A CACHED TREE FOR SCRIPT %s",name().latin1()); //tqDebug("USING A CACHED TREE FOR SCRIPT %s",name().latin1());
//debug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses); //tqDebug("TREE CACHE STATS: HITS=%d, MISSES=%d",g_iTreeCacheHits,g_iTreeCacheMisses);
} }
int iRet; int iRet;
@ -252,7 +252,7 @@ bool KviKvsScript::parse(KviWindow * pOutput,int iRunFlags)
if(m_pData->m_uLock) if(m_pData->m_uLock)
{ {
// ops... someone is locked in THIS script object // ops... someone is locked in THIS script object
debug("WARNING: Trying to reparse a locked KviKvsScript!"); tqDebug("WARNING: Trying to reparse a locked KviKvsScript!");
return false; return false;
} }
if(m_pData->m_pTree)delete m_pData->m_pTree; if(m_pData->m_pTree)delete m_pData->m_pTree;
@ -280,9 +280,9 @@ bool KviKvsScript::parse(KviWindow * pOutput,int iRunFlags)
break; break;
} }
//debug("\n\nDUMPING SCRIPT"); //tqDebug("\n\nDUMPING SCRIPT");
//dump(""); //dump("");
//debug("END OF SCRIPT DUMP\n\n"); //tqDebug("END OF SCRIPT DUMP\n\n");
return !p.error(); return !p.error();
} }

@ -256,7 +256,7 @@ void KviKvsScriptAddonManager::init()
{ {
if(KviKvsScriptAddonManager::instance()) if(KviKvsScriptAddonManager::instance())
{ {
debug("WARNING: Trying to create the KviKvsScriptAddonManager twice!"); tqDebug("WARNING: Trying to create the KviKvsScriptAddonManager twice!");
return; return;
} }
(void)new KviKvsScriptAddonManager(); (void)new KviKvsScriptAddonManager();
@ -266,7 +266,7 @@ void KviKvsScriptAddonManager::done()
{ {
if(!KviKvsScriptAddonManager::instance()) if(!KviKvsScriptAddonManager::instance())
{ {
debug("WARNING: Trying to destroy the KviKvsScriptAddonManager twice!"); tqDebug("WARNING: Trying to destroy the KviKvsScriptAddonManager twice!");
return; return;
} }
delete KviKvsScriptAddonManager::instance(); delete KviKvsScriptAddonManager::instance();

@ -91,7 +91,7 @@ void KviKvsTimerManager::init()
{ {
if(KviKvsTimerManager::m_pInstance) if(KviKvsTimerManager::m_pInstance)
{ {
debug("Trying to double init() the timer manager!"); tqDebug("Trying to double init() the timer manager!");
return; return;
} }
KviKvsTimerManager::m_pInstance = new KviKvsTimerManager(); KviKvsTimerManager::m_pInstance = new KviKvsTimerManager();
@ -101,7 +101,7 @@ void KviKvsTimerManager::done()
{ {
if(!KviKvsTimerManager::m_pInstance) if(!KviKvsTimerManager::m_pInstance)
{ {
debug("Trying to call done() on a non existing timer manager!"); tqDebug("Trying to call done() on a non existing timer manager!");
return; return;
} }
delete KviKvsTimerManager::m_pInstance; delete KviKvsTimerManager::m_pInstance;
@ -197,7 +197,7 @@ void KviKvsTimerManager::timerEvent(TQTimerEvent *e)
{ {
if(!m_pKilledTimerList) if(!m_pKilledTimerList)
{ {
debug("ops.. assassing timer with no victims ?"); tqDebug("ops.. assassing timer with no victims ?");
} else { } else {
m_pKilledTimerList->clear(); m_pKilledTimerList->clear();
} }
@ -209,7 +209,7 @@ void KviKvsTimerManager::timerEvent(TQTimerEvent *e)
KviKvsTimer * t = m_pTimerDictById->find(iId); KviKvsTimer * t = m_pTimerDictById->find(iId);
if(!t) if(!t)
{ {
debug("Internal error: got an nonexistant timer event"); tqDebug("Internal error: got an nonexistant timer event");
return; // HUH ? return; // HUH ?
} }

@ -50,7 +50,7 @@ void KviKvsTreeNodeAliasFunctionCall::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeAliasFunctionCall::dump(const char * prefix) void KviKvsTreeNodeAliasFunctionCall::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s AliasFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); tqDebug("%s AliasFunctionCall(%s)",prefix,m_szFunctionName.utf8().data());
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pParams->dump(tmp.utf8().data()); m_pParams->dump(tmp.utf8().data());

@ -54,7 +54,7 @@ void KviKvsTreeNodeAliasSimpleCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeAliasSimpleCommand::dump(const char * prefix) void KviKvsTreeNodeAliasSimpleCommand::dump(const char * prefix)
{ {
debug("%s AliasSimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s AliasSimpleCommand(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
} }

@ -48,7 +48,7 @@ void KviKvsTreeNodeArrayCount::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeArrayCount::dump(const char * prefix) void KviKvsTreeNodeArrayCount::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ArrayCount",prefix); tqDebug("%s ArrayCount",prefix);
#endif #endif
} }

@ -55,7 +55,7 @@ void KviKvsTreeNodeArrayElement::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeArrayElement::dump(const char * prefix) void KviKvsTreeNodeArrayElement::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ArrayElement",prefix); tqDebug("%s ArrayElement",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pSource->dump(tmp.utf8().data()); m_pSource->dump(tmp.utf8().data());

@ -54,7 +54,7 @@ void KviKvsTreeNodeArrayReferenceAssert::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeArrayReferenceAssert::dump(const char * prefix) void KviKvsTreeNodeArrayReferenceAssert::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ArrayReferenceAssert",prefix); tqDebug("%s ArrayReferenceAssert",prefix);
#endif #endif
} }

@ -49,7 +49,7 @@ void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(TQString &szBuffer
void KviKvsTreeNodeBaseObjectFunctionCall::dump(const char * prefix) void KviKvsTreeNodeBaseObjectFunctionCall::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s BaseObjectFunctionCall(%s::%s)",prefix,m_szBaseClass.utf8().data(),m_szFunctionName.utf8().data()); tqDebug("%s BaseObjectFunctionCall(%s::%s)",prefix,m_szBaseClass.utf8().data(),m_szFunctionName.utf8().data());
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pParams->dump(tmp.utf8().data()); m_pParams->dump(tmp.utf8().data());

@ -55,7 +55,7 @@ void KviKvsTreeNodeCallbackCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeCallbackCommand::dump(const char * prefix) void KviKvsTreeNodeCallbackCommand::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s CallbackCommand(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s CallbackCommand(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
dumpCallback(prefix); dumpCallback(prefix);

@ -55,7 +55,7 @@ void KviKvsTreeNodeCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeCommand::dump(const char * prefix) void KviKvsTreeNodeCommand::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s Command(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s Command(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
#endif #endif
} }

@ -50,7 +50,7 @@ void KviKvsTreeNodeCommandWithParameters::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeCommandWithParameters::dump(const char * prefix) void KviKvsTreeNodeCommandWithParameters::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s CommandWithParameters(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s CommandWithParameters(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
#endif #endif

@ -34,7 +34,7 @@ KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const TQChar * pLocatio
: KviKvsTreeNodeData(pLocation) : KviKvsTreeNodeData(pLocation)
{ {
#ifdef DEBUGME #ifdef DEBUGME
if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two children!"); if(pSubData->count() < 2)tqDebug("KviKvsTreeNodeCompositeData constructor called with less than two children!");
#endif #endif
m_pSubData = pSubData; m_pSubData = pSubData;
m_pSubData->setAutoDelete(true); m_pSubData->setAutoDelete(true);
@ -75,7 +75,7 @@ void KviKvsTreeNodeCompositeData::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeCompositeData::dump(const char * prefix) void KviKvsTreeNodeCompositeData::dump(const char * prefix)
{ {
debug("%s CompositeData",prefix); tqDebug("%s CompositeData",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
for(KviKvsTreeNodeData * p = m_pSubData->first();p;p = m_pSubData->next()) for(KviKvsTreeNodeData * p = m_pSubData->first();p;p = m_pSubData->next())

@ -67,7 +67,7 @@ bool KviKvsTreeNodeConstantData::convertStringConstantToNumeric()
void KviKvsTreeNodeConstantData::dump(const char * prefix) void KviKvsTreeNodeConstantData::dump(const char * prefix)
{ {
debug("%s ConstantData",prefix); tqDebug("%s ConstantData",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.prepend(" "); tmp.prepend(" ");
m_pValue->dump(tmp.utf8().data()); m_pValue->dump(tmp.utf8().data());

@ -48,7 +48,7 @@ void KviKvsTreeNodeCoreCallbackCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeCoreCallbackCommand::dump(const char * prefix) void KviKvsTreeNodeCoreCallbackCommand::dump(const char * prefix)
{ {
debug("%s CoreCallbackCommand(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s CoreCallbackCommand(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
dumpCallback(prefix); dumpCallback(prefix);

@ -45,7 +45,7 @@ void KviKvsTreeNodeCoreFunctionCall::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeCoreFunctionCall::dump(const char * prefix) void KviKvsTreeNodeCoreFunctionCall::dump(const char * prefix)
{ {
debug("%s CoreFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); tqDebug("%s CoreFunctionCall(%s)",prefix,m_szFunctionName.utf8().data());
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pParams->dump(tmp.utf8().data()); m_pParams->dump(tmp.utf8().data());

@ -47,7 +47,7 @@ void KviKvsTreeNodeCoreSimpleCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeCoreSimpleCommand::dump(const char * prefix) void KviKvsTreeNodeCoreSimpleCommand::dump(const char * prefix)
{ {
debug("%s CoreSimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s CoreSimpleCommand(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
} }

@ -45,7 +45,7 @@ void KviKvsTreeNodeData::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeData::dump(const char * prefix) void KviKvsTreeNodeData::dump(const char * prefix)
{ {
debug("%s Data",prefix); tqDebug("%s Data",prefix);
} }
bool KviKvsTreeNodeData::isReadOnly() bool KviKvsTreeNodeData::isReadOnly()

@ -67,7 +67,7 @@ void KviKvsTreeNodeDataList::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeDataList::dump(const char * prefix) void KviKvsTreeNodeDataList::dump(const char * prefix)
{ {
debug("%s DataList",prefix); tqDebug("%s DataList",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
for(KviKvsTreeNodeData * t = m_pDataList->first();t;t = m_pDataList->next()) for(KviKvsTreeNodeData * t = m_pDataList->first();t;t = m_pDataList->next())

@ -47,7 +47,7 @@ void KviKvsTreeNodeExpression::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeExpression::dump(const char * prefix) void KviKvsTreeNodeExpression::dump(const char * prefix)
{ {
debug("%s Expression",prefix); tqDebug("%s Expression",prefix);
} }
int KviKvsTreeNodeExpression::precedence() int KviKvsTreeNodeExpression::precedence()
@ -57,24 +57,24 @@ int KviKvsTreeNodeExpression::precedence()
KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::left() KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::left()
{ {
debug("KviKvsTreeNodeExpression::left() : should never end up here!"); tqDebug("KviKvsTreeNodeExpression::left() : should never end up here!");
return 0; return 0;
} }
KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::right() KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::right()
{ {
debug("KviKvsTreeNodeExpression::right() : should never end up here!"); tqDebug("KviKvsTreeNodeExpression::right() : should never end up here!");
return 0; return 0;
} }
void KviKvsTreeNodeExpression::setLeft(KviKvsTreeNodeExpression *) void KviKvsTreeNodeExpression::setLeft(KviKvsTreeNodeExpression *)
{ {
debug("KviKvsTreeNodeExpression::setLeft() : should never end up here!"); tqDebug("KviKvsTreeNodeExpression::setLeft() : should never end up here!");
} }
void KviKvsTreeNodeExpression::setRight(KviKvsTreeNodeExpression *) void KviKvsTreeNodeExpression::setRight(KviKvsTreeNodeExpression *)
{ {
debug("KviKvsTreeNodeExpression::setRight() : should never end up here!"); tqDebug("KviKvsTreeNodeExpression::setRight() : should never end up here!");
} }
KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::parentWithPrecedenceLowerThan(int iPrec) KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::parentWithPrecedenceLowerThan(int iPrec)
@ -112,7 +112,7 @@ void KviKvsTreeNodeExpressionVariableOperand::contextDescription(TQString &szBuf
void KviKvsTreeNodeExpressionVariableOperand::dump(const char * prefix) void KviKvsTreeNodeExpressionVariableOperand::dump(const char * prefix)
{ {
debug("%s ExpressionVariableOperand",prefix); tqDebug("%s ExpressionVariableOperand",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pData->dump(tmp.utf8().data()); m_pData->dump(tmp.utf8().data());
@ -152,7 +152,7 @@ void KviKvsTreeNodeExpressionConstantOperand::contextDescription(TQString &szBuf
void KviKvsTreeNodeExpressionConstantOperand::dump(const char * prefix) void KviKvsTreeNodeExpressionConstantOperand::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ExpressionConstantOperand",prefix); tqDebug("%s ExpressionConstantOperand",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pConstant->dump(tmp.utf8().data()); m_pConstant->dump(tmp.utf8().data());
@ -190,7 +190,7 @@ void KviKvsTreeNodeExpressionOperator::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeExpressionOperator::dump(const char * prefix) void KviKvsTreeNodeExpressionOperator::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ExpressionOperator",prefix); tqDebug("%s ExpressionOperator",prefix);
#endif #endif
} }
@ -229,7 +229,7 @@ void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(TQString &szBuffe
void KviKvsTreeNodeExpressionUnaryOperator::dump(const char * prefix) void KviKvsTreeNodeExpressionUnaryOperator::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ExpressionUnaryOperator",prefix); tqDebug("%s ExpressionUnaryOperator",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pData->dump(tmp.utf8().data()); m_pData->dump(tmp.utf8().data());
@ -275,7 +275,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(TQString &s
void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const char * prefix) void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ExpressionUnaryOperatorNegate",prefix); tqDebug("%s ExpressionUnaryOperatorNegate",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pData->dump(tmp.utf8().data()); m_pData->dump(tmp.utf8().data());
@ -320,7 +320,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(TQStrin
void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const char * prefix) void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ExpressionUnaryOperatorBitwiseNot",prefix); tqDebug("%s ExpressionUnaryOperatorBitwiseNot",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pData->dump(tmp.utf8().data()); m_pData->dump(tmp.utf8().data());
@ -365,7 +365,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(TQStrin
void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const char * prefix) void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ExpressionUnaryOperatorLogicalNot",prefix); tqDebug("%s ExpressionUnaryOperatorLogicalNot",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pData->dump(tmp.utf8().data()); m_pData->dump(tmp.utf8().data());
@ -470,7 +470,7 @@ void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuff
void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix) void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix)
{ {
debug("%s ExpressionBinaryOperator",prefix); tqDebug("%s ExpressionBinaryOperator",prefix);
dumpOperands(prefix); dumpOperands(prefix);
} }
@ -481,7 +481,7 @@ void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix)
__name::__name(const TQChar * pLocation) \ __name::__name(const TQChar * pLocation) \
: KviKvsTreeNodeExpressionBinaryOperator(pLocation){} \ : KviKvsTreeNodeExpressionBinaryOperator(pLocation){} \
__name::~__name(){} \ __name::~__name(){} \
void __name::dump(const char * prefix){ debug("%s " __stringname,prefix); dumpOperands(prefix); } \ void __name::dump(const char * prefix){ tqDebug("%s " __stringname,prefix); dumpOperands(prefix); } \
void __name::contextDescription(TQString &szBuffer){ szBuffer = __contextdescription; } \ void __name::contextDescription(TQString &szBuffer){ szBuffer = __contextdescription; } \
int __name::precedence(){ return __precedence; }; int __name::precedence(){ return __precedence; };

@ -55,7 +55,7 @@ void KviKvsTreeNodeExpressionReturn::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeExpressionReturn::dump(const char * prefix) void KviKvsTreeNodeExpressionReturn::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ExpressionReturn",prefix); tqDebug("%s ExpressionReturn",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp += " "; tmp += " ";
m_pExpression->dump(tmp.utf8().data()); m_pExpression->dump(tmp.utf8().data());

@ -46,7 +46,7 @@ void KviKvsTreeNodeExtendedScopeVariable::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeExtendedScopeVariable::dump(const char * prefix) void KviKvsTreeNodeExtendedScopeVariable::dump(const char * prefix)
{ {
debug("%s ExtendedScopeVariable(%s)",prefix,m_szIdentifier.utf8().data()); tqDebug("%s ExtendedScopeVariable(%s)",prefix,m_szIdentifier.utf8().data());
} }
bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)

@ -47,7 +47,7 @@ void KviKvsTreeNodeFunctionCall::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeFunctionCall::dump(const char * prefix) void KviKvsTreeNodeFunctionCall::dump(const char * prefix)
{ {
debug("%s FunctionCall",prefix); tqDebug("%s FunctionCall",prefix);
} }
bool KviKvsTreeNodeFunctionCall::canEvaluateToObjectReference() bool KviKvsTreeNodeFunctionCall::canEvaluateToObjectReference()

@ -45,7 +45,7 @@ void KviKvsTreeNodeGlobalVariable::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeGlobalVariable::dump(const char * prefix) void KviKvsTreeNodeGlobalVariable::dump(const char * prefix)
{ {
debug("%s GlobalVariable(%s)",prefix,m_szIdentifier.utf8().data()); tqDebug("%s GlobalVariable(%s)",prefix,m_szIdentifier.utf8().data());
} }

@ -50,7 +50,7 @@ void KviKvsTreeNodeHashCount::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeHashCount::dump(const char * prefix) void KviKvsTreeNodeHashCount::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s HashCount",prefix); tqDebug("%s HashCount",prefix);
#endif #endif
} }

@ -57,7 +57,7 @@ void KviKvsTreeNodeHashElement::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeHashElement::dump(const char * prefix) void KviKvsTreeNodeHashElement::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s HashElement",prefix); tqDebug("%s HashElement",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pSource->dump(tmp.utf8().data()); m_pSource->dump(tmp.utf8().data());

@ -54,7 +54,7 @@ void KviKvsTreeNodeHashReferenceAssert::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeHashReferenceAssert::dump(const char * prefix) void KviKvsTreeNodeHashReferenceAssert::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s HashReferenceAssert",prefix); tqDebug("%s HashReferenceAssert",prefix);
#endif #endif
} }

@ -36,7 +36,7 @@ void KviKvsTreeNodeInstruction::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeInstruction::dump(const char * prefix) void KviKvsTreeNodeInstruction::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s Instruction",prefix); tqDebug("%s Instruction",prefix);
#endif #endif
} }

@ -47,7 +47,7 @@ void KviKvsTreeNodeInstructionBlock::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeInstructionBlock::dump(const char * prefix) void KviKvsTreeNodeInstructionBlock::dump(const char * prefix)
{ {
debug("%s InstructionBlock",prefix); tqDebug("%s InstructionBlock",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
for(KviKvsTreeNodeInstruction * i = m_pInstructionList->first();i;i = m_pInstructionList->next()) for(KviKvsTreeNodeInstruction * i = m_pInstructionList->first();i;i = m_pInstructionList->next())

@ -48,7 +48,7 @@ void KviKvsTreeNodeLocalVariable::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeLocalVariable::dump(const char * prefix) void KviKvsTreeNodeLocalVariable::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s LocalVariable(%s)",prefix,m_szIdentifier.utf8().data()); tqDebug("%s LocalVariable(%s)",prefix,m_szIdentifier.utf8().data());
#endif #endif
} }

@ -55,7 +55,7 @@ void KviKvsTreeNodeModuleCallbackCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeModuleCallbackCommand::dump(const char * prefix) void KviKvsTreeNodeModuleCallbackCommand::dump(const char * prefix)
{ {
debug("%s ModuleCallbackCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data()); tqDebug("%s ModuleCallbackCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
dumpCallback(prefix); dumpCallback(prefix);

@ -54,7 +54,7 @@ void KviKvsTreeNodeModuleFunctionCall::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeModuleFunctionCall::dump(const char * prefix) void KviKvsTreeNodeModuleFunctionCall::dump(const char * prefix)
{ {
debug("%s ModuleFunctionCall(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szFunctionName.utf8().data()); tqDebug("%s ModuleFunctionCall(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szFunctionName.utf8().data());
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pParams->dump(tmp.utf8().data()); m_pParams->dump(tmp.utf8().data());

@ -55,7 +55,7 @@ void KviKvsTreeNodeModuleSimpleCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeModuleSimpleCommand::dump(const char * prefix) void KviKvsTreeNodeModuleSimpleCommand::dump(const char * prefix)
{ {
debug("%s ModuleSimpleCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data()); tqDebug("%s ModuleSimpleCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
} }

@ -50,8 +50,8 @@ void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(TQString &szB
void KviKvsTreeNodeMultipleParameterIdentifier::dump(const char * prefix) void KviKvsTreeNodeMultipleParameterIdentifier::dump(const char * prefix)
{ {
if(m_iEnd < m_iStart)debug("%s MultipleParameterIdentifier(%d-)",prefix,m_iStart); if(m_iEnd < m_iStart)tqDebug("%s MultipleParameterIdentifier(%d-)",prefix,m_iStart);
else debug("%s MultipleParameterIdentifier(%d-%d)",prefix,m_iStart,m_iEnd); else tqDebug("%s MultipleParameterIdentifier(%d-%d)",prefix,m_iStart,m_iEnd);
} }
bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)

@ -50,7 +50,7 @@ void KviKvsTreeNodeObjectField::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeObjectField::dump(const char * prefix) void KviKvsTreeNodeObjectField::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ObjectField(%s)",prefix,m_szIdentifier.utf8().data()); tqDebug("%s ObjectField(%s)",prefix,m_szIdentifier.utf8().data());
#endif #endif
} }

@ -47,7 +47,7 @@ void KviKvsTreeNodeObjectFunctionCall::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeObjectFunctionCall::dump(const char * prefix) void KviKvsTreeNodeObjectFunctionCall::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); tqDebug("%s ObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data());
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pParams->dump(tmp.utf8().data()); m_pParams->dump(tmp.utf8().data());

@ -58,7 +58,7 @@ void KviKvsTreeNodeOperation::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperation::dump(const char * prefix) void KviKvsTreeNodeOperation::dump(const char * prefix)
{ {
debug("%s Operation",prefix); tqDebug("%s Operation",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -88,7 +88,7 @@ void KviKvsTreeNodeOperationAssignment::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationAssignment::dump(const char * prefix) void KviKvsTreeNodeOperationAssignment::dump(const char * prefix)
{ {
debug("%s OperationAssignment",prefix); tqDebug("%s OperationAssignment",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -133,7 +133,7 @@ void KviKvsTreeNodeOperationDecrement::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationDecrement::dump(const char * prefix) void KviKvsTreeNodeOperationDecrement::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationDecrement",prefix); tqDebug("%s OperationDecrement",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -196,7 +196,7 @@ void KviKvsTreeNodeOperationIncrement::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationIncrement::dump(const char * prefix) void KviKvsTreeNodeOperationIncrement::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationIncrement",prefix); tqDebug("%s OperationIncrement",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -262,7 +262,7 @@ void KviKvsTreeNodeOperationSelfAnd::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfAnd::dump(const char * prefix) void KviKvsTreeNodeOperationSelfAnd::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfAnd",prefix); tqDebug("%s OperationSelfAnd",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -332,7 +332,7 @@ void KviKvsTreeNodeOperationSelfDivision::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfDivision::dump(const char * prefix) void KviKvsTreeNodeOperationSelfDivision::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfDivision",prefix); tqDebug("%s OperationSelfDivision",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -426,7 +426,7 @@ void KviKvsTreeNodeOperationSelfModulus::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfModulus::dump(const char * prefix) void KviKvsTreeNodeOperationSelfModulus::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfModulus",prefix); tqDebug("%s OperationSelfModulus",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -521,7 +521,7 @@ void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(TQString &szB
void KviKvsTreeNodeOperationSelfMultiplication::dump(const char * prefix) void KviKvsTreeNodeOperationSelfMultiplication::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfMultiplication",prefix); tqDebug("%s OperationSelfMultiplication",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -600,7 +600,7 @@ void KviKvsTreeNodeOperationSelfOr::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfOr::dump(const char * prefix) void KviKvsTreeNodeOperationSelfOr::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfOr",prefix); tqDebug("%s OperationSelfOr",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -670,7 +670,7 @@ void KviKvsTreeNodeOperationSelfShl::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfShl::dump(const char * prefix) void KviKvsTreeNodeOperationSelfShl::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfShl",prefix); tqDebug("%s OperationSelfShl",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -742,7 +742,7 @@ void KviKvsTreeNodeOperationSelfShr::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfShr::dump(const char * prefix) void KviKvsTreeNodeOperationSelfShr::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfShr",prefix); tqDebug("%s OperationSelfShr",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -820,7 +820,7 @@ void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(TQString &szBuff
void KviKvsTreeNodeOperationSelfSubtraction::dump(const char * prefix) void KviKvsTreeNodeOperationSelfSubtraction::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfSubtraction",prefix); tqDebug("%s OperationSelfSubtraction",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -903,7 +903,7 @@ void KviKvsTreeNodeOperationSelfSum::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfSum::dump(const char * prefix) void KviKvsTreeNodeOperationSelfSum::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfSum",prefix); tqDebug("%s OperationSelfSum",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -988,7 +988,7 @@ void KviKvsTreeNodeOperationSelfXor::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationSelfXor::dump(const char * prefix) void KviKvsTreeNodeOperationSelfXor::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationSelfXor",prefix); tqDebug("%s OperationSelfXor",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -1055,7 +1055,7 @@ void KviKvsTreeNodeOperationStringAppend::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationStringAppend::dump(const char * prefix) void KviKvsTreeNodeOperationStringAppend::dump(const char * prefix)
{ {
debug("%s OperationStringAppend",prefix); tqDebug("%s OperationStringAppend",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -1102,7 +1102,7 @@ void KviKvsTreeNodeOperationArrayAppend::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeOperationArrayAppend::dump(const char * prefix) void KviKvsTreeNodeOperationArrayAppend::dump(const char * prefix)
{ {
debug("%s OperationArrayAppend",prefix); tqDebug("%s OperationArrayAppend",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -1192,7 +1192,7 @@ void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(TQString &
void KviKvsTreeNodeOperationStringAppendWithComma::dump(const char * prefix) void KviKvsTreeNodeOperationStringAppendWithComma::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationStringAppendWithComma",prefix); tqDebug("%s OperationStringAppendWithComma",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -1257,7 +1257,7 @@ void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(TQString &
void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const char * prefix) void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationStringAppendWithSpace",prefix); tqDebug("%s OperationStringAppendWithSpace",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pTargetData->dump(tmp.utf8().data()); m_pTargetData->dump(tmp.utf8().data());
@ -1332,7 +1332,7 @@ void KviKvsTreeNodeOperationStringTransliteration::contextDescription(TQString &
void KviKvsTreeNodeOperationStringTransliteration::dump(const char * prefix) void KviKvsTreeNodeOperationStringTransliteration::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationStringTransliteration",prefix); tqDebug("%s OperationStringTransliteration",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pLeft->dump(tmp.utf8().data()); m_pLeft->dump(tmp.utf8().data());
@ -1413,7 +1413,7 @@ void KviKvsTreeNodeOperationStringSubstitution::contextDescription(TQString &szB
void KviKvsTreeNodeOperationStringSubstitution::dump(const char * prefix) void KviKvsTreeNodeOperationStringSubstitution::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s OperationStringSubstitution",prefix); tqDebug("%s OperationStringSubstitution",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pLeft->dump(tmp.utf8().data()); m_pLeft->dump(tmp.utf8().data());

@ -56,7 +56,7 @@ void KviKvsTreeNodeParameterReturn::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeParameterReturn::dump(const char * prefix) void KviKvsTreeNodeParameterReturn::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ParameterReturn",prefix); tqDebug("%s ParameterReturn",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp += " "; tmp += " ";
m_pDataList->dump(tmp.utf8().data()); m_pDataList->dump(tmp.utf8().data());

@ -54,7 +54,7 @@ void KviKvsTreeNodeRebindingSwitch::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeRebindingSwitch::dump(const char * prefix) void KviKvsTreeNodeRebindingSwitch::dump(const char * prefix)
{ {
debug("%sRebindingSwitch",prefix); tqDebug("%sRebindingSwitch",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp += " "; tmp += " ";
m_pTargetWindow->dump(tmp.utf8().data()); m_pTargetWindow->dump(tmp.utf8().data());

@ -59,7 +59,7 @@ void KviKvsTreeNodeScopeOperator::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeScopeOperator::dump(const char * prefix) void KviKvsTreeNodeScopeOperator::dump(const char * prefix)
{ {
debug("%s ScopeOperator",prefix); tqDebug("%s ScopeOperator",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pObjectReference->dump(tmp.utf8().data()); m_pObjectReference->dump(tmp.utf8().data());

@ -49,7 +49,7 @@ void KviKvsTreeNodeSimpleCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSimpleCommand::dump(const char * prefix) void KviKvsTreeNodeSimpleCommand::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s SimpleCommand(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
dumpParameterList(prefix); dumpParameterList(prefix);
#endif #endif

@ -53,7 +53,7 @@ void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(TQString &szBuf
void KviKvsTreeNodeSingleParameterIdentifier::dump(const char * prefix) void KviKvsTreeNodeSingleParameterIdentifier::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SingleParameterIdentifier(%d)",prefix,m_iStart); tqDebug("%s SingleParameterIdentifier(%d)",prefix,m_iStart);
#endif #endif
} }

@ -48,7 +48,7 @@ void KviKvsTreeNodeSpecialCommand::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommand::dump(const char * prefix) void KviKvsTreeNodeSpecialCommand::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommand(%s)",prefix,m_szCmdName.utf8().data()); tqDebug("%s SpecialCommand(%s)",prefix,m_szCmdName.utf8().data());
dumpSwitchList(prefix); dumpSwitchList(prefix);
#endif #endif
} }

@ -45,7 +45,7 @@ void KviKvsTreeNodeSpecialCommandBreak::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandBreak::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandBreak::dump(const char * prefix)
{ {
debug("%s SpecialCommandBreak",prefix); tqDebug("%s SpecialCommandBreak",prefix);
} }
bool KviKvsTreeNodeSpecialCommandBreak::execute(KviKvsRunTimeContext * c) bool KviKvsTreeNodeSpecialCommandBreak::execute(KviKvsRunTimeContext * c)

@ -41,8 +41,8 @@ KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialComman
void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const char * prefix)
{ {
debug("%s SpecialCommandClassFunctionDefinition(%s)",prefix,m_szName.utf8().data()); tqDebug("%s SpecialCommandClassFunctionDefinition(%s)",prefix,m_szName.utf8().data());
debug("%s (command buffer with %d characters)",prefix,m_szBuffer.length()); tqDebug("%s (command buffer with %d characters)",prefix,m_szBuffer.length());
} }
void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(TQString &szBuffer) void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(TQString &szBuffer)
@ -79,7 +79,7 @@ void KviKvsTreeNodeSpecialCommandClass::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandClass::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandClass::dump(const char * prefix)
{ {
debug("%s SpecialCommandClass",prefix); tqDebug("%s SpecialCommandClass",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pParams->dump(tmp.utf8().data()); m_pParams->dump(tmp.utf8().data());

@ -43,25 +43,25 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(TQStr
void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopupLabelExtpopup",prefix); tqDebug("%s SpecialCommandDefpopupLabelExtpopup",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
TQString x = tmp; TQString x = tmp;
x += "CONDITION: "; x += "CONDITION: ";
x += m_szCondition; x += m_szCondition;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "TEXT: "; x += "TEXT: ";
x += m_szText; x += m_szText;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "NAME: "; x += "NAME: ";
x += m_szName; x += m_szName;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "ICON: "; x += "ICON: ";
x += m_szIcon; x += m_szIcon;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
#endif #endif
} }
@ -85,25 +85,25 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(TQString
void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopupLabelItem",prefix); tqDebug("%s SpecialCommandDefpopupLabelItem",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
TQString x = tmp; TQString x = tmp;
x += "CONDITION: "; x += "CONDITION: ";
x += m_szCondition; x += m_szCondition;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "TEXT: "; x += "TEXT: ";
x += m_szText; x += m_szText;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "ICON: "; x += "ICON: ";
x += m_szIcon; x += m_szIcon;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "INSTRUCTION: "; x += "INSTRUCTION: ";
x += m_szInstruction; x += m_szInstruction;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
#endif #endif
} }
@ -126,21 +126,21 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(TQString
void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopupLabelLabel",prefix); tqDebug("%s SpecialCommandDefpopupLabelLabel",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
TQString x = tmp; TQString x = tmp;
x += "CONDITION: "; x += "CONDITION: ";
x += m_szCondition; x += m_szCondition;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "TEXT: "; x += "TEXT: ";
x += m_szText; x += m_szText;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "ICON: "; x += "ICON: ";
x += m_szIcon; x += m_szIcon;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
#endif #endif
} }
@ -166,11 +166,11 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(TQSt
void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopupLabelSeparator",prefix); tqDebug("%s SpecialCommandDefpopupLabelSeparator",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" CONDITION:"); tmp.append(" CONDITION:");
tmp.append(m_szCondition); tmp.append(m_szCondition);
debug("%s",tmp.utf8().data()); tqDebug("%s",tmp.utf8().data());
#endif #endif
} }
@ -195,11 +195,11 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(TQStr
void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopupLabelEpilogue",prefix); tqDebug("%s SpecialCommandDefpopupLabelEpilogue",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" INSTRUCTION: "); tmp.append(" INSTRUCTION: ");
tmp += m_szInstruction; tmp += m_szInstruction;
debug("%s",tmp.utf8().data()); tqDebug("%s",tmp.utf8().data());
#endif #endif
} }
@ -224,11 +224,11 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(TQStr
void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopupLabelPrologue",prefix); tqDebug("%s SpecialCommandDefpopupLabelPrologue",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" INSTRUCTION: "); tmp.append(" INSTRUCTION: ");
tmp += m_szInstruction; tmp += m_szInstruction;
debug("%s",tmp.utf8().data()); tqDebug("%s",tmp.utf8().data());
#endif #endif
} }
@ -275,21 +275,21 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(TQString
void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopupLabelPopup",prefix); tqDebug("%s SpecialCommandDefpopupLabelPopup",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
TQString x = tmp; TQString x = tmp;
x += "CONDITION: "; x += "CONDITION: ";
x += m_szCondition; x += m_szCondition;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "TEXT: "; x += "TEXT: ";
x += m_szText; x += m_szText;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
x = tmp; x = tmp;
x += "ICON: "; x += "ICON: ";
x += m_szIcon; x += m_szIcon;
debug("%s",x.utf8().data()); tqDebug("%s",x.utf8().data());
for(KviKvsTreeNodeSpecialCommandDefpopupLabel * l = m_pLabels->first();l;l = m_pLabels->next()) for(KviKvsTreeNodeSpecialCommandDefpopupLabel * l = m_pLabels->first();l;l = m_pLabels->next())
l->dump(tmp.utf8().data()); l->dump(tmp.utf8().data());
#endif #endif
@ -362,7 +362,7 @@ void KviKvsTreeNodeSpecialCommandDefpopup::contextDescription(TQString &szBuffer
void KviKvsTreeNodeSpecialCommandDefpopup::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDefpopup::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandDefpopup",prefix); tqDebug("%s SpecialCommandDefpopup",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pPopupName->dump(tmp.utf8().data()); m_pPopupName->dump(tmp.utf8().data());

@ -53,7 +53,7 @@ void KviKvsTreeNodeSpecialCommandDo::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandDo::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandDo::dump(const char * prefix)
{ {
debug("%s SpecialCommandDo",prefix); tqDebug("%s SpecialCommandDo",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pExpression->dump(tmp); m_pExpression->dump(tmp);

@ -58,7 +58,7 @@ void KviKvsTreeNodeSpecialCommandFor::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandFor::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandFor::dump(const char * prefix)
{ {
debug("%s SpecialCommandFor",prefix); tqDebug("%s SpecialCommandFor",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
if(m_pInitialization)m_pInitialization->dump(tmp.utf8().data()); if(m_pInitialization)m_pInitialization->dump(tmp.utf8().data());

@ -57,7 +57,7 @@ void KviKvsTreeNodeSpecialCommandForeach::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandForeach::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandForeach::dump(const char * prefix)
{ {
debug("%s SpecialCommandForeach",prefix); tqDebug("%s SpecialCommandForeach",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pIterationVariable->dump(tmp.utf8().data()); m_pIterationVariable->dump(tmp.utf8().data());

@ -62,7 +62,7 @@ void KviKvsTreeNodeSpecialCommandIf::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandIf::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandIf::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandIf",prefix); tqDebug("%s SpecialCommandIf",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pExpression->dump(tmp); m_pExpression->dump(tmp);

@ -80,7 +80,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(TQString &s
void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix)
{ {
debug("%s SpecialCommandSwitchLabelCase",prefix); tqDebug("%s SpecialCommandSwitchLabelCase",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pParameter)m_pParameter->dump(tmp.utf8().data());
@ -156,7 +156,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(TQString &
void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix)
{ {
debug("%s SpecialCommandSwitchLabelMatch",prefix); tqDebug("%s SpecialCommandSwitchLabelMatch",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pParameter)m_pParameter->dump(tmp.utf8().data());
@ -210,7 +210,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(TQString
void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix)
{ {
debug("%s SpecialCommandSwitchLabelRegexp",prefix); tqDebug("%s SpecialCommandSwitchLabelRegexp",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pParameter)m_pParameter->dump(tmp.utf8().data());
@ -266,7 +266,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(TQString
void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix)
{ {
debug("%s SpecialCommandSwitchLabelDefault",prefix); tqDebug("%s SpecialCommandSwitchLabelDefault",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data());
@ -318,7 +318,7 @@ void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandSwitch::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandSwitch::dump(const char * prefix)
{ {
debug("%s SpecialCommandSwitch",prefix); tqDebug("%s SpecialCommandSwitch",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pExpression->dump(tmp.utf8().data()); m_pExpression->dump(tmp.utf8().data());

@ -51,7 +51,7 @@ void KviKvsTreeNodeSpecialCommandUnset::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandUnset::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandUnset::dump(const char * prefix)
{ {
debug("%s SpecialCommandUnset",prefix); tqDebug("%s SpecialCommandUnset",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
for(KviKvsTreeNodeVariable * pVar = m_pVariableList->first();pVar;pVar = m_pVariableList->next()) for(KviKvsTreeNodeVariable * pVar = m_pVariableList->first();pVar;pVar = m_pVariableList->next())

@ -59,7 +59,7 @@ void KviKvsTreeNodeSpecialCommandWhile::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSpecialCommandWhile::dump(const char * prefix) void KviKvsTreeNodeSpecialCommandWhile::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s SpecialCommandWhile",prefix); tqDebug("%s SpecialCommandWhile",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pExpression->dump(tmp); m_pExpression->dump(tmp);

@ -59,7 +59,7 @@ void KviKvsTreeNodeStringCast::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeStringCast::dump(const char * prefix) void KviKvsTreeNodeStringCast::dump(const char * prefix)
{ {
debug("%s StringCast",prefix); tqDebug("%s StringCast",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pChildData->dump(tmp.utf8().data()); m_pChildData->dump(tmp.utf8().data());

@ -48,7 +48,7 @@ void KviKvsTreeNodeSwitchList::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeSwitchList::dump(const char * prefix) void KviKvsTreeNodeSwitchList::dump(const char * prefix)
{ {
debug("%s SwitchList",prefix); tqDebug("%s SwitchList",prefix);
if(m_pShortSwitchDict) if(m_pShortSwitchDict)
{ {
KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict); KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict);

@ -49,7 +49,7 @@ void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(TQString &szBuffer
void KviKvsTreeNodeThisObjectFunctionCall::dump(const char * prefix) void KviKvsTreeNodeThisObjectFunctionCall::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s ThisObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); tqDebug("%s ThisObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data());
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pParams->dump(tmp.utf8().data()); m_pParams->dump(tmp.utf8().data());

@ -52,7 +52,7 @@ void KviKvsTreeNodeVoidFunctionCall::contextDescription(TQString &szBuffer)
void KviKvsTreeNodeVoidFunctionCall::dump(const char * prefix) void KviKvsTreeNodeVoidFunctionCall::dump(const char * prefix)
{ {
#ifdef COMPILE_NEW_KVS #ifdef COMPILE_NEW_KVS
debug("%s VoidFunctionCall",prefix); tqDebug("%s VoidFunctionCall",prefix);
TQString tmp = prefix; TQString tmp = prefix;
tmp.append(" "); tmp.append(" ");
m_pFunctionCall->dump(tmp.utf8().data()); m_pFunctionCall->dump(tmp.utf8().data());

@ -287,7 +287,7 @@ bool KviKvsVariant::asBoolean() const
case KviKvsVariantData::HObject: return m_pData->m_u.hObject; break; case KviKvsVariantData::HObject: return m_pData->m_u.hObject; break;
default: /* make gcc happy */ break; default: /* make gcc happy */ break;
} }
debug("WARNING: invalid variant type %d in KviKvsVariant::asBoolean()",m_pData->m_eType); tqDebug("WARNING: invalid variant type %d in KviKvsVariant::asBoolean()",m_pData->m_eType);
return false; return false;
} }
@ -626,18 +626,18 @@ void KviKvsVariant::dump(const char * prefix) const
{ {
if(!m_pData) if(!m_pData)
{ {
debug("%s Nothing [this=0x%lx]",prefix,this); tqDebug("%s Nothing [this=0x%lx]",prefix,this);
return; return;
} }
switch(m_pData->m_eType) switch(m_pData->m_eType)
{ {
case KviKvsVariantData::String: debug("%s String(%s) [this=0x%lx]",prefix,m_pData->m_u.pString->utf8().data(),this); break; case KviKvsVariantData::String: tqDebug("%s String(%s) [this=0x%lx]",prefix,m_pData->m_u.pString->utf8().data(),this); break;
case KviKvsVariantData::Array: debug("%s Array(ptr=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pArray,this); break; case KviKvsVariantData::Array: tqDebug("%s Array(ptr=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pArray,this); break;
case KviKvsVariantData::Hash: debug("%s Hash(ptr=0x%lx,dict=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break; case KviKvsVariantData::Hash: tqDebug("%s Hash(ptr=0x%lx,dict=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break;
case KviKvsVariantData::Integer: debug("%s Integer(%d) [this=0x%lx]",prefix,m_pData->m_u.iInteger,this); break; case KviKvsVariantData::Integer: tqDebug("%s Integer(%d) [this=0x%lx]",prefix,m_pData->m_u.iInteger,this); break;
case KviKvsVariantData::Real: debug("%s Real(%f) [this=0x%lx]",prefix,*(m_pData->m_u.pReal),this); break; case KviKvsVariantData::Real: tqDebug("%s Real(%f) [this=0x%lx]",prefix,*(m_pData->m_u.pReal),this); break;
case KviKvsVariantData::Boolean: debug("%s Boolean(%s) [this=0x%lx]",prefix,m_pData->m_u.bBoolean ? "true" : "false",this); break; case KviKvsVariantData::Boolean: tqDebug("%s Boolean(%s) [this=0x%lx]",prefix,m_pData->m_u.bBoolean ? "true" : "false",this); break;
case KviKvsVariantData::HObject: debug("%s HObject(%lx) [this=0x%lx]",prefix,m_pData->m_u.hObject,this); break; case KviKvsVariantData::HObject: tqDebug("%s HObject(%lx) [this=0x%lx]",prefix,m_pData->m_u.hObject,this); break;
default: /* make gcc happy */ break; default: /* make gcc happy */ break;
} }
} }

@ -158,7 +158,7 @@ bool KviModuleManager::loadModule(const char * modName)
{ {
if(findModule(modName)) if(findModule(modName))
{ {
//debug("MODULE %s ALREADY IN CORE MEMORY",modName); //tqDebug("MODULE %s ALREADY IN CORE MEMORY",modName);
return true; return true;
} }
TQString tmp; TQString tmp;
@ -181,7 +181,7 @@ bool KviModuleManager::loadModule(const char * modName)
if(!handle) if(!handle)
{ {
m_szLastError = kvi_library_error(); m_szLastError = kvi_library_error();
//debug("ERROR IN LOADING MODULE %s (%s): %s",modName,szName.ptr(),kvi_library_error()); //tqDebug("ERROR IN LOADING MODULE %s (%s): %s",modName,szName.ptr(),kvi_library_error());
return false; return false;
} }
KviModuleInfo * info = (KviModuleInfo *)kvi_library_symbol(handle,KVIRC_MODULE_STRUCTURE_SYMBOL); KviModuleInfo * info = (KviModuleInfo *)kvi_library_symbol(handle,KVIRC_MODULE_STRUCTURE_SYMBOL);
@ -230,7 +230,7 @@ bool KviModuleManager::loadModule(const char * modName)
if(!((info->init_routine)(module))) if(!((info->init_routine)(module)))
{ {
m_szLastError = __tr2qs("Failed to execute the init routine"); m_szLastError = __tr2qs("Failed to execute the init routine");
//debug("ERROR IN LOADING MODULE %s (%s): failed to execute the init routine",modName,szName.ptr()); //tqDebug("ERROR IN LOADING MODULE %s (%s): failed to execute the init routine",modName,szName.ptr());
kvi_library_close(handle); kvi_library_close(handle);
delete module; delete module;
// kill the message catalogue too then // kill the message catalogue too then
@ -287,7 +287,7 @@ bool KviModuleManager::unloadModule(KviModule * module)
} }
KviStr szModName = module->name(); KviStr szModName = module->name();
kvi_library_close(module->handle()); kvi_library_close(module->handle());
//debug("Closing module %s, dlclose returns %d",szModName.ptr(),dlclose(module->handle())); //tqDebug("Closing module %s, dlclose returns %d",szModName.ptr(),dlclose(module->handle()));
m_pModuleDict->remove(szModName.ptr()); m_pModuleDict->remove(szModName.ptr());
delete module; delete module;

@ -1452,7 +1452,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
#else #else
szMsg += TQStyleSheet::escape(szData); szMsg += TQStyleSheet::escape(szData);
#endif #endif
//debug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data()); //tqDebug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data());
g_pApp->notifierMessage(pOut,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,90); g_pApp->notifierMessage(pOut,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,90);
} }
} }

@ -921,7 +921,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
#else #else
TQString szMsg = TQStyleSheet::escape(szMsgText); TQString szMsg = TQStyleSheet::escape(szMsgText);
#endif #endif
//debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data()); //tqDebug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data());
g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,1800); g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,1800);
} }
} }
@ -1279,7 +1279,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
#else #else
TQString szMsg = TQStyleSheet::escape(szMsgText); TQString szMsg = TQStyleSheet::escape(szMsgText);
#endif #endif
//debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data()); //tqDebug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data());
g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,1800); g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,1800);
} }
} }
@ -1507,7 +1507,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
{ {
// the target SHOULD have changed his nick here // the target SHOULD have changed his nick here
if(!q->nickChange(szNick,szNewNick)) if(!q->nickChange(szNick,szNewNick))
debug("Internal error: query %s failed to change nick from %s to s",szNick.utf8().data(),szNick.utf8().data(),szNewNick.utf8().data()); tqDebug("Internal error: query %s failed to change nick from %s to s",szNick.utf8().data(),szNick.utf8().data(),szNewNick.utf8().data());
if(!msg->haltOutput()) if(!msg->haltOutput())
q->output(KVI_OUT_NICK,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"), q->output(KVI_OUT_NICK,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"),
&szNick,&szUser,&szHost,&szNewNick); &szNick,&szUser,&szHost,&szNewNick);

@ -329,7 +329,7 @@ void KviChannel::loadProperties(KviConfig *cfg)
def.append((w * 82) / 100); def.append((w * 82) / 100);
def.append((w * 18) / 100); def.append((w * 18) / 100);
m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def));
//debug("SETTING DEFAULT SIZES"); //tqDebug("SETTING DEFAULT SIZES");
def.clear(); def.clear();
def.append((w * 60) / 100); def.append((w * 60) / 100);

@ -772,7 +772,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
#else #else
szMsg += TQStyleSheet::escape(szDecodedMessage); szMsg += TQStyleSheet::escape(szDecodedMessage);
#endif #endif
//debug("kvi_console.cpp:629 debug: %s",szMsg.data()); //tqDebug("kvi_console.cpp:629 debug: %s",szMsg.data());
g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,90); g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,90);
} }
} }

@ -473,12 +473,12 @@ void KviCustomToolBar::drag(TQWidget * child,const TQPoint &pnt)
{ {
int me = -1; int me = -1;
int idx = dropIndexAt(pnt,child,&me); int idx = dropIndexAt(pnt,child,&me);
debug("DROP INDEX IS %d, ME IS %d",idx,me); tqDebug("DROP INDEX IS %d, ME IS %d",idx,me);
if(idx == me) if(idx == me)
return; // would move over itself return; // would move over itself
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
TQWidget * pWidgetToMove = widgetAt(idx > me ? idx-1 : idx); TQWidget * pWidgetToMove = widgetAt(idx > me ? idx-1 : idx);
debug("SEARCHING FOR WIDGET TO MOVE AT %d AND FOUND %x (ME=%x)",idx > me ? idx-1 : idx,pWidgetToMove,child); tqDebug("SEARCHING FOR WIDGET TO MOVE AT %d AND FOUND %x (ME=%x)",idx > me ? idx-1 : idx,pWidgetToMove,child);
if(pWidgetToMove == child) if(pWidgetToMove == child)
return; // hmmm return; // hmmm
bool bDone = false; bool bDone = false;
@ -492,7 +492,7 @@ void KviCustomToolBar::drag(TQWidget * child,const TQPoint &pnt)
a = actionForWidget(pWidgetToMove); a = actionForWidget(pWidgetToMove);
if(a) if(a)
{ {
debug("AND GOT ACTION FOR THAT WIDGET"); tqDebug("AND GOT ACTION FOR THAT WIDGET");
bDone = true; bDone = true;
a = insertWidget(a,child); a = insertWidget(a,child);

@ -267,7 +267,7 @@ void KviFrame::saveModuleExtensionToolBars()
s += ":"; s += ":";
s += t->descriptor()->name().ptr(); s += t->descriptor()->name().ptr();
//debug("FOUND TOOLBAR %s",t->descriptor()->name().ptr()); //tqDebug("FOUND TOOLBAR %s",t->descriptor()->name().ptr());
KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).append(s); KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).append(s);
} }
@ -421,7 +421,7 @@ void KviFrame::accelActivated(int id)
int keys = (int)(acc->key(id)); int keys = (int)(acc->key(id));
KviTaskBarItem *item = 0; KviTaskBarItem *item = 0;
debug("accel"); tqDebug("accel");
switch(keys) switch(keys)
{ {
case (TQt::Key_Left+TQt::ALT): switchToPrevWindow(); break; case (TQt::Key_Left+TQt::ALT): switchToPrevWindow(); break;
@ -533,7 +533,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection)
} }
if(minKey.hasData())g_pWinPropertiesConfig->clearGroup(minKey.ptr()); if(minKey.hasData())g_pWinPropertiesConfig->clearGroup(minKey.ptr());
else debug("Oops...no minimum key found!"); else tqDebug("Oops...no minimum key found!");
} }
// The following line should NOT be needed...but just to be sure... // The following line should NOT be needed...but just to be sure...
@ -1164,7 +1164,7 @@ void KviFrame::toolbarsPopupSelected(int id)
bool KviFrame::focusNextPrevChild(bool next) bool KviFrame::focusNextPrevChild(bool next)
{ {
//debug("FOCUS NEXT PREV CHILD"); //tqDebug("FOCUS NEXT PREV CHILD");
TQWidget * w = focusWidget(); TQWidget * w = focusWidget();
if(w) if(w)
{ {
@ -1227,7 +1227,7 @@ void KviFrame::restoreToolBarPositions()
{ {
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
if(!restoreState(f.readAll(),1)) if(!restoreState(f.readAll(),1))
debug("Error while restoring toolbars position"); tqDebug("Error while restoring toolbars position");
#else //!COMPILE_USE_QT4 #else //!COMPILE_USE_QT4
TQTextStream ts(&f); TQTextStream ts(&f);
ts >> *this; ts >> *this;

@ -274,10 +274,10 @@ void KviInputEditor::dropEvent(TQDropEvent *e)
TQStringList list; TQStringList list;
if(KviUriDrag::decodeLocalFiles(e,list)) if(KviUriDrag::decodeLocalFiles(e,list))
{ {
//debug("Local files decoded"); //tqDebug("Local files decoded");
if(!list.isEmpty()) if(!list.isEmpty())
{ {
//debug("List not empty"); //tqDebug("List not empty");
TQStringList::ConstIterator it = list.begin(); //kewl ! :) TQStringList::ConstIterator it = list.begin(); //kewl ! :)
for( ; it != list.end(); ++it ) for( ; it != list.end(); ++it )
{ {
@ -704,7 +704,7 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int
} }
break; break;
default: default:
debug("Ops.."); tqDebug("Ops..");
exit(0); exit(0);
break; break;
} }
@ -755,7 +755,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar()
} }
break; break;
case 0: case 0:
debug("KviInputEditor::Encountered invisible end of the string!"); tqDebug("KviInputEditor::Encountered invisible end of the string!");
exit(0); exit(0);
break; break;
} }
@ -1581,7 +1581,7 @@ void KviInputEditor::keyPressEvent(TQKeyEvent *e)
return; return;
} }
//debug("%c",e->ascii()); //tqDebug("%c",e->ascii());
if(!m_bReadOnly) { if(!m_bReadOnly) {
insertText(e->text()); insertText(e->text());
} }
@ -1759,7 +1759,7 @@ void KviInputEditor::keyReleaseEvent(TQKeyEvent *e)
unsigned short ch = m_szAltKeyCode.toUShort(&bOk); unsigned short ch = m_szAltKeyCode.toUShort(&bOk);
if(bOk && ch != 0) if(bOk && ch != 0)
{ {
//debug("INSERTING CHAR %d",ch); //tqDebug("INSERTING CHAR %d",ch);
insertChar(TQChar(ch)); insertChar(TQChar(ch));
e->accept(); e->accept();
} }
@ -2164,7 +2164,7 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords)
// FIXME: this could use fm.width(m_szTextBuffer,chIdx) // FIXME: this could use fm.width(m_szTextBuffer,chIdx)
int curXPos = bContentsCoords ? KVI_INPUT_MARGIN : frameWidth()+KVI_INPUT_MARGIN; int curXPos = bContentsCoords ? KVI_INPUT_MARGIN : frameWidth()+KVI_INPUT_MARGIN;
int curChar = m_iFirstVisibleChar; int curChar = m_iFirstVisibleChar;
//debug("%i",g_pLastFontMetrics); //tqDebug("%i",g_pLastFontMetrics);
if(!g_pLastFontMetrics) g_pLastFontMetrics = new TQFontMetrics(KVI_OPTION_FONT(KviOption_fontInput)); if(!g_pLastFontMetrics) g_pLastFontMetrics = new TQFontMetrics(KVI_OPTION_FONT(KviOption_fontInput));
while(curChar < chIdx) while(curChar < chIdx)
{ {
@ -2451,7 +2451,7 @@ void KviInput::inputEditorEnterPressed()
void KviInput::keyPressEvent(TQKeyEvent *e) void KviInput::keyPressEvent(TQKeyEvent *e)
{ {
//debug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().utf8().data()); //tqDebug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().utf8().data());
if((e->state() & TQt::ControlButton) || (e->state() & TQt::AltButton) || (e->state() & TQt::MetaButton)) if((e->state() & TQt::ControlButton) || (e->state() & TQt::AltButton) || (e->state() & TQt::MetaButton))
{ {

@ -553,7 +553,7 @@ void KviIrcView::stopLogging()
gzclose(file); gzclose(file);
m_pLogFile->remove(); m_pLogFile->remove();
} else { } else {
debug("Cannot open compressed stream"); tqDebug("Cannot open compressed stream");
} }
} }
} }
@ -606,7 +606,7 @@ void KviIrcView::flushLog()
gzclose(file); gzclose(file);
m_pLogFile->remove(); m_pLogFile->remove();
} else { } else {
debug("Cannot open compressed stream"); tqDebug("Cannot open compressed stream");
} }
} }
m_pLogFile->open(IO_Append|IO_WriteOnly); m_pLogFile->open(IO_Append|IO_WriteOnly);
@ -725,7 +725,7 @@ void KviIrcView::add2Log(const TQString &szBuffer,int iMsgType)
{ {
TQString szToWrite=TQString("%1 %2\n").arg(iMsgType).arg(szBuffer); TQString szToWrite=TQString("%1 %2\n").arg(iMsgType).arg(szBuffer);
KviTQCString szTmp = KviTQString::toUtf8(szToWrite); KviTQCString szTmp = KviTQString::toUtf8(szToWrite);
if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file."); if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) tqDebug("WARNING : Can not write to the log file.");
} }
//============================================================================= //=============================================================================
@ -870,10 +870,10 @@ void KviIrcView::setTimestamp(bool bTimestamp)
// nAttributes += (l->uChunkCount); // nAttributes += (l->uChunkCount);
// l = l->pNext; // l = l->pNext;
// } // }
// debug("\n\nLines = %u (%u bytes - %u KB) (avg %u bytes per line)",nLines,nAlloc,nAlloc / 1024,nLines ? (nAlloc / nLines) : 0); // tqDebug("\n\nLines = %u (%u bytes - %u KB) (avg %u bytes per line)",nLines,nAlloc,nAlloc / 1024,nLines ? (nAlloc / nLines) : 0);
// debug("string bytes = %u (%u KB)",nStringBytes,nStringBytes / 1024); // tqDebug("string bytes = %u (%u KB)",nStringBytes,nStringBytes / 1024);
// debug("attributes = %u (%u bytes - %u KB)",nAttributes,nAttrBytes,nAttrBytes / 1024); // tqDebug("attributes = %u (%u bytes - %u KB)",nAttributes,nAttrBytes,nAttrBytes / 1024);
// debug("blocks = %u (%u bytes - %u KB)\n",nBlocks,nBlockBytes,nBlockBytes / 1024); // tqDebug("blocks = %u (%u bytes - %u KB)\n",nBlocks,nBlockBytes,nBlockBytes / 1024);
} }
*/ */
@ -3059,7 +3059,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p)
//case KVI_TEXT_ICON: //case KVI_TEXT_ICON:
//case KVI_TEXT_UNICON: //case KVI_TEXT_UNICON:
// does nothing // does nothing
//debug("Have a block with ICON/UNICON attr"); //tqDebug("Have a block with ICON/UNICON attr");
//break; //break;
} }
@ -3288,7 +3288,7 @@ no_selection_paint:
moredown += ((m_iFontLineSpacing - daIcon->height()) / 2); moredown += ((m_iFontLineSpacing - daIcon->height()) / 2);
pa.drawPixmap(curLeftCoord + m_iIconSideSpacing,imageYPos + moredown,*(daIcon)); pa.drawPixmap(curLeftCoord + m_iIconSideSpacing,imageYPos + moredown,*(daIcon));
//debug("SHifting by %d",block->block_width); //tqDebug("SHifting by %d",block->block_width);
curLeftCoord += block->block_width; curLeftCoord += block->block_width;
} else { } else {
@ -3502,7 +3502,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
if(curLineWidth < maxWidth) if(curLineWidth < maxWidth)
{ {
//debug("Block of %d pix and len %d with type %d",ptr->pBlocks[ptr->iBlockCount].block_width,ptr->pBlocks[ptr->iBlockCount].block_len,ptr->pChunks[curAttrBlock].type); //tqDebug("Block of %d pix and len %d with type %d",ptr->pBlocks[ptr->iBlockCount].block_width,ptr->pBlocks[ptr->iBlockCount].block_len,ptr->pChunks[curAttrBlock].type);
//Ok....proceed to next block //Ok....proceed to next block
ptr->pBlocks[ptr->iBlockCount].block_len = curBlockLen; ptr->pBlocks[ptr->iBlockCount].block_len = curBlockLen;
ptr->pBlocks[ptr->iBlockCount].block_width = curBlockWidth; ptr->pBlocks[ptr->iBlockCount].block_width = curBlockWidth;
@ -3719,7 +3719,7 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i
} }
m_pWrappedBlockSelectionInfo->part_2_length = line->pBlocks[bufIndex].block_len-m_pWrappedBlockSelectionInfo->part_1_length; m_pWrappedBlockSelectionInfo->part_2_length = line->pBlocks[bufIndex].block_len-m_pWrappedBlockSelectionInfo->part_1_length;
m_pWrappedBlockSelectionInfo->part_2_width = line->pBlocks[bufIndex].block_width-m_pWrappedBlockSelectionInfo->part_1_width; m_pWrappedBlockSelectionInfo->part_2_width = line->pBlocks[bufIndex].block_width-m_pWrappedBlockSelectionInfo->part_1_width;
//debug("%d",m_pWrappedBlockSelectionInfo->part_2_width); //tqDebug("%d",m_pWrappedBlockSelectionInfo->part_2_width);
return true; return true;
} }
//Selection begins in THIS BLOCK! //Selection begins in THIS BLOCK!
@ -4810,7 +4810,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *)
void KviIrcView::mouseMoveEvent(TQMouseEvent *e) void KviIrcView::mouseMoveEvent(TQMouseEvent *e)
{ {
// debug("Pos : %d,%d",e->pos().x(),e->pos().y()); // tqDebug("Pos : %d,%d",e->pos().x(),e->pos().y());
if(m_bMouseIsDown && (e->state() & Qt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?) if(m_bMouseIsDown && (e->state() & Qt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?)
{ {

@ -305,7 +305,7 @@ void KviMaskEditor::addClicked()
void KviMaskEditor::addMask(KviMaskEntry *e) void KviMaskEditor::addMask(KviMaskEntry *e)
{ {
// debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
KviMaskItem *it; KviMaskItem *it;
it = new KviMaskItem(m_pMaskBox,e); it = new KviMaskItem(m_pMaskBox,e);
it->setPixmap(0,*(g_pIconManager->getSmallIcon(m_iIconId))); it->setPixmap(0,*(g_pIconManager->getSmallIcon(m_iIconId)));

@ -126,7 +126,7 @@ bool KviMdiManager::focusNextPrevChild(bool bNext)
void KviMdiManager::drawContents(TQPainter *p,int x,int y,int w,int h) void KviMdiManager::drawContents(TQPainter *p,int x,int y,int w,int h)
{ {
//debug("MY DRAW CONTENTS (%d,%d,%d,%d)",x,y,w,h); //tqDebug("MY DRAW CONTENTS (%d,%d,%d,%d)",x,y,w,h);
TQRect r(x,y,w,h); TQRect r(x,y,w,h);
#ifdef COMPILE_PSEUDO_TRANSPARENCY #ifdef COMPILE_PSEUDO_TRANSPARENCY
@ -430,7 +430,7 @@ void KviMdiManager::focusTopChild()
if(!lpC)return; if(!lpC)return;
if(!lpC->isVisible())return; if(!lpC->isVisible())return;
// if(lpC->state()==KviMdiChild::Minimized)return; // if(lpC->state()==KviMdiChild::Minimized)return;
// debug("Focusing top child %s",lpC->name()); // tqDebug("Focusing top child %s",lpC->name());
//disable the labels of all the other children //disable the labels of all the other children
for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next())
{ {
@ -1008,13 +1008,13 @@ void KviMdiManager::tileAllInternal(int maxWnds,bool bHorizontal)
int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible); int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible);
int xQuantum=viewport()->width()/pColstable[numToHandle-1]; int xQuantum=viewport()->width()/pColstable[numToHandle-1];
if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){
if(pColrecall[numToHandle-1]==0)debug("Tile : Not enouh space"); if(pColrecall[numToHandle-1]==0)tqDebug("Tile : Not enouh space");
else tileAllInternal(pColrecall[numToHandle-1],bHorizontal); else tileAllInternal(pColrecall[numToHandle-1],bHorizontal);
return; return;
} }
int yQuantum=viewport()->height()/pRowstable[numToHandle-1]; int yQuantum=viewport()->height()/pRowstable[numToHandle-1];
if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){
if(pRowrecall[numToHandle-1]==0)debug("Tile : Not enough space"); if(pRowrecall[numToHandle-1]==0)tqDebug("Tile : Not enough space");
else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal); else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal);
return; return;
} }

@ -96,7 +96,7 @@ KviMenuBar::~KviMenuBar()
void KviMenuBar::showEvent(TQShowEvent *e) void KviMenuBar::showEvent(TQShowEvent *e)
{ {
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
debug("menubar show"); tqDebug("menubar show");
// force a re-layout of the menubar in TQt4 (see the note in enterSDIMode()) // force a re-layout of the menubar in TQt4 (see the note in enterSDIMode())
// by resetting the corner widget // by resetting the corner widget
m_pFrm->mdiManager()->relayoutMenuButtons(); m_pFrm->mdiManager()->relayoutMenuButtons();

@ -67,7 +67,7 @@ protected slots:
extern KVIRC_API KviSplashScreen * g_pSplashScreen; extern KVIRC_API KviSplashScreen * g_pSplashScreen;
#define KVI_SPLASH_SET_PROGRESS(__val) if(g_pSplashScreen)g_pSplashScreen->setProgress(__val); #define KVI_SPLASH_SET_PROGRESS(__val) if(g_pSplashScreen)g_pSplashScreen->setProgress(__val);
//#define KVI_SPLASH_SET_TEXT(__txt) if(g_pSplashScreen){ g_pSplashScreen->message(__txt); debug(__txt.latin1()); } //#define KVI_SPLASH_SET_TEXT(__txt) if(g_pSplashScreen){ g_pSplashScreen->message(__txt); tqDebug(__txt.latin1()); }
#endif //_KVI_SPLASH_H_ #endif //_KVI_SPLASH_H_

@ -166,7 +166,7 @@ void KviStatusBar::load()
if (a) if (a)
a->loadState(prefix.ptr(),&cfg); a->loadState(prefix.ptr(),&cfg);
else else
debug("warning: failed to create applet %s (preload: %s)!", tqDebug("warning: failed to create applet %s (preload: %s)!",
szInternalName.utf8().data(), szPreloadModule.utf8().data()); szInternalName.utf8().data(), szPreloadModule.utf8().data());
} }
} }

@ -66,8 +66,8 @@ bool KviStyledControlInternal::eventFilter( TQObject *obj, TQEvent *ev )
void KviStyledControlInternal::paintTimerShot () void KviStyledControlInternal::paintTimerShot ()
{ {
// debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
// debug("%s %i",__FUNCTION__,m_pControl->m_iStepNumber); // tqDebug("%s %i",__FUNCTION__,m_pControl->m_iStepNumber);
if(m_pControl->m_bMouseEnter) if(m_pControl->m_bMouseEnter)
{ {
m_pControl->m_iStepNumber++; m_pControl->m_iStepNumber++;
@ -105,7 +105,7 @@ KviStyledControl::~KviStyledControl()
void KviStyledControl::enterEvent ( TQEvent * ) void KviStyledControl::enterEvent ( TQEvent * )
{ {
// debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects))
{ {
if(m_iStepNumber<KVI_STYLE_NUM_STEPS) if(m_iStepNumber<KVI_STYLE_NUM_STEPS)
@ -124,7 +124,7 @@ void KviStyledControl::enterEvent ( TQEvent * )
void KviStyledControl::leaveEvent ( TQEvent * ) void KviStyledControl::leaveEvent ( TQEvent * )
{ {
// debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects))
{ {
if(m_iStepNumber>0) if(m_iStepNumber>0)
@ -163,7 +163,7 @@ KviStyledCheckBox::~KviStyledCheckBox()
void KviStyledCheckBox::paintEvent ( TQPaintEvent * event) void KviStyledCheckBox::paintEvent ( TQPaintEvent * event)
{ {
//debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); //tqDebug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber);
if(KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) if(KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects))
{ {
KviDoubleBuffer doublebuffer(event->rect().width(),event->rect().height()); KviDoubleBuffer doublebuffer(event->rect().width(),event->rect().height());
@ -181,10 +181,10 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event)
pStoredPix=g_pIconManager->getBigIcon("kvi_checkbox_selected.png"); pStoredPix=g_pIconManager->getBigIcon("kvi_checkbox_selected.png");
else else
pStoredPix=g_pIconManager->getBigIcon("kvi_checkbox_unselected.png"); pStoredPix=g_pIconManager->getBigIcon("kvi_checkbox_unselected.png");
//debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); //tqDebug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber);
if(pStoredPix) if(pStoredPix)
{ {
//debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); //tqDebug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber);
TQPixmap pix=*pStoredPix; TQPixmap pix=*pStoredPix;
if(m_iStepNumber && isEnabled()) if(m_iStepNumber && isEnabled())
{ {
@ -221,12 +221,12 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event)
} else { } else {
p.drawPixmap(0,0,pix); p.drawPixmap(0,0,pix);
} }
//debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); //tqDebug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber);
TQString szText=text(); TQString szText=text();
szText=szText.remove("&"); szText=szText.remove("&");
p.drawText(pix.width()+3,0,width(),height(),0,szText); p.drawText(pix.width()+3,0,width(),height(),0,szText);
bitBlt(this, rect.x(), rect.y(), pDoubleBufferPixmap, 0, 0, rect.width(), rect.height()); bitBlt(this, rect.x(), rect.y(), pDoubleBufferPixmap, 0, 0, rect.width(), rect.height());
//debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); //tqDebug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber);
} else { } else {
TQCheckBox::paintEvent(event); TQCheckBox::paintEvent(event);
} }

@ -746,7 +746,7 @@ void KviClassicTaskBar::resizeEvent(TQResizeEvent *e)
{ {
int iRows = height()/m_iButtonHeight; int iRows = height()/m_iButtonHeight;
if(!iRows) iRows=1; if(!iRows) iRows=1;
debug("%i %i",height(),iRows); tqDebug("%i %i",height(),iRows);
resize(width(),iRows*m_iButtonHeight); resize(width(),iRows*m_iButtonHeight);
} }
#endif #endif
@ -920,7 +920,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int
{ {
TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
//p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y()); //p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y());
// debug("%i %i",pnt.x(),pnt.y()); // tqDebug("%i %i",pnt.x(),pnt.y());
p.translate(-pnt.x(),-pnt.y()); p.translate(-pnt.x(),-pnt.y());
KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),TQRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height()); KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),TQRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height());
p.translate(pnt.x(),pnt.y()); p.translate(pnt.x(),pnt.y());

@ -246,7 +246,7 @@ void KviTextIconWindow::itemSelected(KviTalIconViewItem * item)
{ {
if(item) if(item)
{ {
// debug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING),m_pOwner->className()); // tqDebug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING),m_pOwner->className());
doHide(); doHide();
TQString szItem = item->text(); TQString szItem = item->text();
szItem.append(' '); szItem.append(' ');

@ -1412,7 +1412,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
TQRect r = ev->rect(); TQRect r = ev->rect();
if(r.right() > wdth)r.setRight(wdth); if(r.right() > wdth)r.setRight(wdth);
//debug("PAINT EVENT %d,%d,%d,%d",r.left(),r.top(),r.width(),r.height()); //tqDebug("PAINT EVENT %d,%d,%d,%d",r.left(),r.top(),r.width(),r.height());
KviDoubleBuffer db(width(),height()); KviDoubleBuffer db(width(),height());
TQPixmap * pMemBuffer = db.pixmap(); TQPixmap * pMemBuffer = db.pixmap();
@ -1829,7 +1829,7 @@ void KviUserListViewArea::keyPressEvent( TQKeyEvent * e )
KviUserListEntry * aux = m_pListView->m_pHeadItem; KviUserListEntry * aux = m_pListView->m_pHeadItem;
while(aux) while(aux)
{ {
//debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0)); //tqDebug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0));
if(aux->nick().find(szKey,0,0)==0) if(aux->nick().find(szKey,0,0)==0)
{ {
nick=aux; nick=aux;

@ -1034,7 +1034,7 @@ void KviWindow::focusInEvent(TQFocusEvent *)
if(m_pFocusHandler)m_pFocusHandler->setFocus(); if(m_pFocusHandler)m_pFocusHandler->setFocus();
else { else {
// else too bad :/ // else too bad :/
debug("No widget able to handle focus for window %s",name()); tqDebug("No widget able to handle focus for window %s",name());
return; return;
} }
} else { } else {
@ -1047,7 +1047,7 @@ void KviWindow::focusInEvent(TQFocusEvent *)
// we should be already the active window at this point. // we should be already the active window at this point.
// If we're not, then run activateSelf() to fix this. // If we're not, then run activateSelf() to fix this.
if(g_pActiveWindow != this)activateSelf(); if(g_pActiveWindow != this)activateSelf();
//else debug("ACTIVE WINDOW IS ALREADY THIS"); //else tqDebug("ACTIVE WINDOW IS ALREADY THIS");
updateCaption(); updateCaption();
} }
@ -1154,7 +1154,7 @@ void KviWindow::childDestroyed()
void KviWindow::childRemoved(TQWidget * o) void KviWindow::childRemoved(TQWidget * o)
{ {
//debug("CHILD REMOVED %d",o); //tqDebug("CHILD REMOVED %d",o);
o->removeEventFilter(this); o->removeEventFilter(this);
if(o == m_pFocusHandler) if(o == m_pFocusHandler)
m_pFocusHandler = 0; m_pFocusHandler = 0;
@ -1180,7 +1180,7 @@ void KviWindow::childRemoved(TQWidget * o)
if(c->isWidgetType()) if(c->isWidgetType())
childRemoved((TQWidget *)c); childRemoved((TQWidget *)c);
} }
} //else debug("The removed object has no children"); } //else tqDebug("The removed object has no children");
#endif #endif
} }

@ -433,7 +433,7 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c)
int iOldFlags = iFlags; int iOldFlags = iFlags;
iFlags = KviAction::validateFlags(iFlags); iFlags = KviAction::validateFlags(iFlags);
if(iFlags != iOldFlags) if(iFlags != iOldFlags)
debug("action.validate has provided invalid flags: %d fixed to %d",iOldFlags,iFlags); tqDebug("action.validate has provided invalid flags: %d fixed to %d",iOldFlags,iFlags);
KviKvsUserAction * a = KviKvsUserAction::createInstance(KviActionManager::instance(), KviKvsUserAction * a = KviKvsUserAction::createInstance(KviActionManager::instance(),
szName,szCmd,szVisibleText, szName,szCmd,szVisibleText,

@ -416,7 +416,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d)
unsigned int uOldFlags = d->m_uFlags; unsigned int uOldFlags = d->m_uFlags;
d->m_uFlags = KviAction::validateFlags(d->m_uFlags); d->m_uFlags = KviAction::validateFlags(d->m_uFlags);
if(d->m_uFlags != uOldFlags) if(d->m_uFlags != uOldFlags)
debug("invalid action flags in KviSingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags); tqDebug("invalid action flags in KviSingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags);
m_pNameEdit->setText(d->m_szName); m_pNameEdit->setText(d->m_szName);
m_pNameEdit->setEnabled(true); m_pNameEdit->setEnabled(true);
@ -608,7 +608,7 @@ void KviSingleActionEditor::commit()
unsigned int uOldFlags = m_pActionData->m_uFlags; unsigned int uOldFlags = m_pActionData->m_uFlags;
m_pActionData->m_uFlags = KviAction::validateFlags(m_pActionData->m_uFlags); m_pActionData->m_uFlags = KviAction::validateFlags(m_pActionData->m_uFlags);
if(m_pActionData->m_uFlags != uOldFlags) if(m_pActionData->m_uFlags != uOldFlags)
debug("invalid action flags in KviSingleActionEditor::commit(): %d fixed to %d",uOldFlags,m_pActionData->m_uFlags); tqDebug("invalid action flags in KviSingleActionEditor::commit(): %d fixed to %d",uOldFlags,m_pActionData->m_uFlags);
} }

@ -580,7 +580,7 @@ void KviAliasEditor::exportSelected()
void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListViewItem> *l) void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListViewItem> *l)
{ {
if(!m_szDir.endsWith(TQString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR; if(!m_szDir.endsWith(TQString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR;
debug ("dir %s",m_szDir.latin1()); tqDebug ("dir %s",m_szDir.latin1());
if (!l->first()) if (!l->first())
{ {
g_pAliasEditorModule->lock(); g_pAliasEditorModule->lock();
@ -596,7 +596,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListVi
} }
if(!m_szDir.endsWith(TQString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR; if(!m_szDir.endsWith(TQString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR;
debug ("dir changed in %s",m_szDir.latin1()); tqDebug ("dir changed in %s",m_szDir.latin1());
bool bReplaceAll=false; bool bReplaceAll=false;
@ -1252,7 +1252,7 @@ void KviAliasEditor::recursiveCommit(KviAliasEditorListViewItem * it)
if(it->isAlias()) if(it->isAlias())
{ {
TQString szName = buildFullItemName(it); TQString szName = buildFullItemName(it);
//debug("ADDING %s",szName.latin1()); //tqDebug("ADDING %s",szName.latin1());
// WARNING: On MSVC operator new here is valid ONLY because // WARNING: On MSVC operator new here is valid ONLY because
// KviKvsScript has a non virtual detructor! // KviKvsScript has a non virtual detructor!
KviKvsScript * a = new KviKvsScript(szName,((KviAliasListViewItem *)it)->buffer()); KviKvsScript * a = new KviKvsScript(szName,((KviAliasListViewItem *)it)->buffer());

@ -136,7 +136,7 @@ void KviCodeTesterWindow::saveProperties(KviConfig *cfg)
#ifdef COMPILE_SCRIPTTOOLBAR #ifdef COMPILE_SCRIPTTOOLBAR
cfg->writeEntry("Sizes",m_pEditor->sizes()); cfg->writeEntry("Sizes",m_pEditor->sizes());
cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr()); cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr());
//debug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr()); //tqDebug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }
@ -151,7 +151,7 @@ void KviCodeTesterWindow::loadProperties(KviConfig *cfg)
m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
KviStr tmp = cfg->readEntry("LastRaw",""); KviStr tmp = cfg->readEntry("LastRaw","");
m_pEditor->editRaw(tmp); m_pEditor->editRaw(tmp);
//debug("LAST EDITED WAS %s",tmp.ptr()); //tqDebug("LAST EDITED WAS %s",tmp.ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }

@ -120,7 +120,7 @@ void KviDccBroker::unregisterDccWindow(KviWindow *wnd)
void KviDccBroker::unregisterDccBox(KviDccBox * box) void KviDccBroker::unregisterDccBox(KviDccBox * box)
{ {
//debug("Forgetting box %d",box); //tqDebug("Forgetting box %d",box);
m_pBoxList->removeRef(box); m_pBoxList->removeRef(box);
} }
@ -854,7 +854,7 @@ bool KviDccBroker::handleResumeAccepted(const char * filename,const char * port,
bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename,const char * port,unsigned int filePos,const char * szZeroPortTag) bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename,const char * port,unsigned int filePos,const char * szZeroPortTag)
{ {
//debug("HANDLE %s %s %u %s",filename,port,filePos,szZeroPortTag); //tqDebug("HANDLE %s %s %u %s",filename,port,filePos,szZeroPortTag);
// the zeroPOrtTag is nonempty here only if port == 0 // the zeroPOrtTag is nonempty here only if port == 0
if(kvi_strEqualCI("0",port) && szZeroPortTag) if(kvi_strEqualCI("0",port) && szZeroPortTag)
{ {
@ -862,11 +862,11 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
KviDccZeroPortTag * t = findZeroPortTag(TQString(szZeroPortTag)); KviDccZeroPortTag * t = findZeroPortTag(TQString(szZeroPortTag));
if(t) if(t)
{ {
//debug("FOUND"); //tqDebug("FOUND");
// valid zero port resume request // valid zero port resume request
if(filePos < t->m_uFileSize) if(filePos < t->m_uFileSize)
{ {
//debug("VALID"); //tqDebug("VALID");
// ok! // ok!
t->m_uResumePosition = filePos; t->m_uResumePosition = filePos;
@ -889,7 +889,7 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
} }
} }
} }
//debug("NOT A ZeRO PORT"); //tqDebug("NOT A ZeRO PORT");
return KviDccFileTransfer::handleResumeRequest(filename,port,filePos); return KviDccFileTransfer::handleResumeRequest(filename,port,filePos);
} }

@ -823,7 +823,7 @@ void KviCanvasView::beginDragPolygon(KviCanvasPolygon * it,const TQPoint &p,bool
{ {
m_dragMode = Rotate; m_dragMode = Rotate;
m_dragPointArray = it->internalPoints(); m_dragPointArray = it->internalPoints();
// debug("Here"); // tqDebug("Here");
setCursor(sizeHorCursor); setCursor(sizeHorCursor);
return; return;
} }
@ -859,7 +859,7 @@ void KviCanvasView::dragPolygon(KviCanvasPolygon * it,const TQPoint &p)
{ {
TQPoint act((int)(p.x() - it->x()),(int)(p.y() - it->y())); TQPoint act((int)(p.x() - it->x()),(int)(p.y() - it->y()));
double dAngle = ssm_2d_rotationAngle(m_dragBegin.x(),m_dragBegin.y(),act.x(),act.y()); double dAngle = ssm_2d_rotationAngle(m_dragBegin.x(),m_dragBegin.y(),act.x(),act.y());
// debug("%d,%d %d,%d %f",m_dragBegin.x(),m_dragBegin.y(),act.x(),act.y(),dAngle); // tqDebug("%d,%d %d,%d %f",m_dragBegin.x(),m_dragBegin.y(),act.x(),act.y(),dAngle);
TQPointArray thePoints = m_dragPointArray.copy(); TQPointArray thePoints = m_dragPointArray.copy();
for(unsigned int i=0;i<thePoints.size();i++) for(unsigned int i=0;i<thePoints.size();i++)
{ {

@ -689,7 +689,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA); KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
// The left part is len chars long // The left part is len chars long
int len = aux - data->buffer; int len = aux - data->buffer;
// debug("LEN = %d, iLen = %d",len,data->iLen); // tqDebug("LEN = %d, iLen = %d",len,data->iLen);
//#warning "DO IT BETTER (the \r cutting)" //#warning "DO IT BETTER (the \r cutting)"
KviStr * s = new KviStr(data->buffer,len); KviStr * s = new KviStr(data->buffer,len);
if(s->lastCharIs('\r'))s->cutRight(1); if(s->lastCharIs('\r'))s->cutRight(1);
@ -698,7 +698,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
++aux; ++aux;
// so len += 1; --> new data->iLen -= len; // so len += 1; --> new data->iLen -= len;
data->iLen -= (len + 1); data->iLen -= (len + 1);
// debug("iLen now = %d",data->iLen); // tqDebug("iLen now = %d",data->iLen);
__range_valid(data->iLen >= 0); __range_valid(data->iLen >= 0);
if(data->iLen > 0) if(data->iLen > 0)
{ {
@ -716,7 +716,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
} }
postEvent(parent(),e); postEvent(parent(),e);
} else aux++; } else aux++;
// debug("PASSING CHAR %c",*aux); // tqDebug("PASSING CHAR %c",*aux);
} }
// now aux == end // now aux == end
if(bCritical) if(bCritical)

@ -135,7 +135,7 @@ void KviDccDescriptor::triggerCreationEvent()
{ {
if(m_bCreationEventTriggered) if(m_bCreationEventTriggered)
{ {
debug("Ops.. trying to trigger OnDccSessionCreated twice"); tqDebug("Ops.. trying to trigger OnDccSessionCreated twice");
return; return;
} }
m_bCreationEventTriggered = true; m_bCreationEventTriggered = true;

@ -88,10 +88,10 @@ void KviDccMarshal::reset()
m_fd = KVI_INVALID_SOCKET; m_fd = KVI_INVALID_SOCKET;
} }
#ifdef COMPILE_SSL_SUPPORT #ifdef COMPILE_SSL_SUPPORT
// debug("MARSHAL RESETTING (SSL=%d)",m_pSSL); // tqDebug("MARSHAL RESETTING (SSL=%d)",m_pSSL);
if(m_pSSL) if(m_pSSL)
{ {
// debug("MARSHAL CLEARING THE SSL"); // tqDebug("MARSHAL CLEARING THE SSL");
KviSSLMaster::freeSSL(m_pSSL); KviSSLMaster::freeSSL(m_pSSL);
m_pSSL = 0; m_pSSL = 0;
} }
@ -267,12 +267,12 @@ void KviDccMarshal::doListen()
if(kvi_socket_getsockname(m_fd,sareal.socketAddress(),&size)) if(kvi_socket_getsockname(m_fd,sareal.socketAddress(),&size))
{ {
// debug("GETSOCKNAMEOK"); // tqDebug("GETSOCKNAMEOK");
m_szPort.setNum(sareal.port()); m_szPort.setNum(sareal.port());
m_uPort = sareal.port(); m_uPort = sareal.port();
// debug("REALPORT %u",m_uPort); // tqDebug("REALPORT %u",m_uPort);
} else { } else {
// debug("GETSOCKNAMEFAILED"); // tqDebug("GETSOCKNAMEFAILED");
} }
// and setup the READ notifier... // and setup the READ notifier...
@ -560,7 +560,7 @@ void KviDccMarshal::snActivated(int)
void KviDccMarshal::doSSLHandshake(int) void KviDccMarshal::doSSLHandshake(int)
{ {
#ifdef COMPILE_SSL_SUPPORT #ifdef COMPILE_SSL_SUPPORT
// debug("DO SSL HANDSHAKE"); // tqDebug("DO SSL HANDSHAKE");
if(m_pSn) if(m_pSn)
{ {
delete m_pSn; delete m_pSn;
@ -569,7 +569,7 @@ void KviDccMarshal::doSSLHandshake(int)
if(!m_pSSL) if(!m_pSSL)
{ {
debug("Ops... I've lost the SSL class ?"); tqDebug("Ops... I've lost the SSL class ?");
reset(); reset();
emit error(KviError_internalError); emit error(KviError_internalError);
return; // ops ? return; // ops ?
@ -581,9 +581,9 @@ void KviDccMarshal::doSSLHandshake(int)
{ {
case KviSSL::Success: case KviSSL::Success:
// done! // done!
// debug("EMITTING CONNECTED"); // tqDebug("EMITTING CONNECTED");
emit connected(); emit connected();
// debug("CONNECTED EMITTED"); // tqDebug("CONNECTED EMITTED");
break; break;
case KviSSL::WantRead: case KviSSL::WantRead:
m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Read); m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Read);
@ -627,7 +627,7 @@ void KviDccMarshal::doSSLHandshake(int)
break; break;
} }
#else //!COMPILE_SSL_SUPPORT #else //!COMPILE_SSL_SUPPORT
debug("Ops.. ssl handshake without ssl support!...aborting!"); tqDebug("Ops.. ssl handshake without ssl support!...aborting!");
exit(-1); exit(-1);
#endif //!COMPILE_SSL_SUPPORT #endif //!COMPILE_SSL_SUPPORT
} }

@ -377,7 +377,7 @@ void KviDccRecvThread::run()
// include the artificial delay if needed // include the artificial delay if needed
if(m_pOpt->iIdleStepLengthInMSec > 0) if(m_pOpt->iIdleStepLengthInMSec > 0)
{ {
debug("LOOP: artificial delay"); tqDebug("LOOP: artificial delay");
msleep(m_pOpt->iIdleStepLengthInMSec); msleep(m_pOpt->iIdleStepLengthInMSec);
} }
} else { } else {
@ -1665,12 +1665,12 @@ bool KviDccFileTransfer::event(TQEvent *e)
} }
break; break;
default: default:
debug("Invalid event type %d received",((KviThreadEvent *)e)->id()); tqDebug("Invalid event type %d received",((KviThreadEvent *)e)->id());
break; break;
} }
} }
//#warning "Remove this!" //#warning "Remove this!"
// if(e->type() == TQEvent::Close)debug("Close event received"); // if(e->type() == TQEvent::Close)tqDebug("Close event received");
return KviFileTransfer::event(e); return KviFileTransfer::event(e);
} }

@ -40,7 +40,7 @@ KviDccThread::KviDccThread(TQObject * par,kvi_socket_t fd)
m_fd = fd; m_fd = fd;
m_pMutex = new KviMutex(); m_pMutex = new KviMutex();
#ifdef COMPILE_SSL_SUPPORT #ifdef COMPILE_SSL_SUPPORT
// debug("CLEARING SSL IN KviDccThread constructor"); // tqDebug("CLEARING SSL IN KviDccThread constructor");
m_pSSL = 0; m_pSSL = 0;
#endif #endif
} }

@ -376,7 +376,7 @@ bool KviDccVoiceThread::soundStep()
if(ioctl(m_soundFd,SNDCTL_DSP_GETOSPACE,&info) < 0) if(ioctl(m_soundFd,SNDCTL_DSP_GETOSPACE,&info) < 0)
{ {
debug("get o space failed"); tqDebug("get o space failed");
info.bytes = KVI_FRAGMENT_SIZE_IN_BYTES; // dummy... if this is not correct...well...we will block for 1024/16000 of a sec info.bytes = KVI_FRAGMENT_SIZE_IN_BYTES; // dummy... if this is not correct...well...we will block for 1024/16000 of a sec
info.fragments = 1; info.fragments = 1;
info.fragsize = KVI_FRAGMENT_SIZE_IN_BYTES; info.fragsize = KVI_FRAGMENT_SIZE_IN_BYTES;
@ -384,7 +384,7 @@ bool KviDccVoiceThread::soundStep()
if(info.fragments > 0) if(info.fragments > 0)
{ {
int toWrite = info.fragments * info.fragsize; int toWrite = info.fragments * info.fragsize;
//debug("Can write %d bytes",toWrite); //tqDebug("Can write %d bytes",toWrite);
if(m_inSignalBuffer.size() < toWrite)toWrite = m_inSignalBuffer.size(); if(m_inSignalBuffer.size() < toWrite)toWrite = m_inSignalBuffer.size();
int written = write(m_soundFd,m_inSignalBuffer.data(),toWrite); int written = write(m_soundFd,m_inSignalBuffer.data(),toWrite);
if(written > 0)m_inSignalBuffer.remove(written); if(written > 0)m_inSignalBuffer.remove(written);
@ -467,12 +467,12 @@ bool KviDccVoiceThread::soundStep()
audio_buf_info info; audio_buf_info info;
if(ioctl(m_soundFd,SNDCTL_DSP_GETISPACE,&info) < 0) if(ioctl(m_soundFd,SNDCTL_DSP_GETISPACE,&info) < 0)
{ {
debug("Ispace failed"); tqDebug("Ispace failed");
info.fragments = 0; // dummy... info.fragments = 0; // dummy...
info.bytes = 0; info.bytes = 0;
} }
//debug("INFO: fragments: %d, fragstotal: %d, fragsize: %d, bytes: %d",info.fragments,info.fragstotal,info.fragsize,info.bytes); //tqDebug("INFO: fragments: %d, fragstotal: %d, fragsize: %d, bytes: %d",info.fragments,info.fragstotal,info.fragsize,info.bytes);
if(info.fragments == 0 && info.bytes == 0) if(info.fragments == 0 && info.bytes == 0)
{ {
@ -502,14 +502,14 @@ bool KviDccVoiceThread::soundStep()
} }
} }
/* /*
debug("Signal buffer:"); tqDebug("Signal buffer:");
for(int i=0;i<200;i+=2) for(int i=0;i<200;i+=2)
{ {
if(i >= m_outSignalBuffer.size())break; if(i >= m_outSignalBuffer.size())break;
printf("%04x ",*(((unsigned short *)(m_outSignalBuffer.data() + i)))); printf("%04x ",*(((unsigned short *)(m_outSignalBuffer.data() + i))));
if((i % 6) == 0)printf("\n"); if((i % 6) == 0)printf("\n");
} }
debug("END\n"); tqDebug("END\n");
*/ */
m_pOpt->pCodec->encode(&m_outSignalBuffer,&m_outFrameBuffer); m_pOpt->pCodec->encode(&m_outSignalBuffer,&m_outFrameBuffer);
} }
@ -526,11 +526,11 @@ bool KviDccVoiceThread::soundStep()
void KviDccVoiceThread::startRecording() void KviDccVoiceThread::startRecording()
{ {
#ifndef COMPILE_DISABLE_DCC_VOICE #ifndef COMPILE_DISABLE_DCC_VOICE
//debug("Start recording"); //tqDebug("Start recording");
if(m_bRecording)return; // already started if(m_bRecording)return; // already started
if(openSoundcardForReading()) if(openSoundcardForReading())
{ {
// debug("Posting event"); // tqDebug("Posting event");
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION); KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING)); e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING));
postEvent(parent(),e); postEvent(parent(),e);
@ -546,7 +546,7 @@ void KviDccVoiceThread::startRecording()
void KviDccVoiceThread::stopRecording() void KviDccVoiceThread::stopRecording()
{ {
#ifndef COMPILE_DISABLE_DCC_VOICE #ifndef COMPILE_DISABLE_DCC_VOICE
//debug("Stop recording"); //tqDebug("Stop recording");
m_bRecordingRequestPending = false; m_bRecordingRequestPending = false;
if(!m_bRecording)return; // already stopped if(!m_bRecording)return; // already stopped
@ -562,7 +562,7 @@ void KviDccVoiceThread::stopRecording()
void KviDccVoiceThread::startPlaying() void KviDccVoiceThread::startPlaying()
{ {
#ifndef COMPILE_DISABLE_DCC_VOICE #ifndef COMPILE_DISABLE_DCC_VOICE
//debug("Start playing"); //tqDebug("Start playing");
if(m_bPlaying)return; if(m_bPlaying)return;
if(openSoundcardForWriting()) if(openSoundcardForWriting())
@ -578,7 +578,7 @@ void KviDccVoiceThread::startPlaying()
void KviDccVoiceThread::stopPlaying() void KviDccVoiceThread::stopPlaying()
{ {
#ifndef COMPILE_DISABLE_DCC_VOICE #ifndef COMPILE_DISABLE_DCC_VOICE
//debug("Stop playing"); //tqDebug("Stop playing");
if(!m_bPlaying)return; if(!m_bPlaying)return;
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION); KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
@ -860,7 +860,7 @@ bool KviDccVoice::event(TQEvent *e)
} }
break; break;
default: default:
debug("Invalid event type %d received",((KviThreadEvent *)e)->id()); tqDebug("Invalid event type %d received",((KviThreadEvent *)e)->id());
break; break;
} }
@ -1026,7 +1026,7 @@ void KviDccVoice::setMixerVolume(int vol)
* another KVirc window, fired up xmms, changed the volume, and returned to our dcc voice window */ * another KVirc window, fired up xmms, changed the volume, and returned to our dcc voice window */
void KviDccVoice::focusInEvent(TQFocusEvent *e) void KviDccVoice::focusInEvent(TQFocusEvent *e)
{ {
// debug("focusInEvent()"); // tqDebug("focusInEvent()");
m_pVolumeSlider->setValue(getMixerVolume()); m_pVolumeSlider->setValue(getMixerVolume());
setMixerVolume(m_pVolumeSlider->value()); setMixerVolume(m_pVolumeSlider->value());

@ -372,7 +372,7 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt)
//int KviDockWidget::message(int,void *) //int KviDockWidget::message(int,void *)
//{ //{
// debug("Message"); // tqDebug("Message");
// update(); // update();
// return 0; // return 0;
//} //}

@ -203,7 +203,7 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt)
//int KviDockWidget::message(int,void *) //int KviDockWidget::message(int,void *)
//{ //{
// debug("Message"); // tqDebug("Message");
// update(); // update();
// return 0; // return 0;
//} //}

@ -46,12 +46,12 @@ static bool editor_module_cleanup(KviModule *m)
TQObject * w = g_pScriptEditorWindowList->first()->parent();; TQObject * w = g_pScriptEditorWindowList->first()->parent();;
while(w) while(w)
{ {
//debug("%s %s %i %s",__FILE__,__FUNCTION__,__LINE__,w->className()); //tqDebug("%s %s %i %s",__FILE__,__FUNCTION__,__LINE__,w->className());
if(w->inherits("KviWindow")) if(w->inherits("KviWindow"))
{ {
// debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
((KviWindow *)w)->close(); ((KviWindow *)w)->close();
// debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
break; break;
} }
w = w->parent(); w = w->parent();

@ -119,7 +119,7 @@ void KviCompletionBox::updateContents(TQString buffer)
if(szModule.isEmpty()) if(szModule.isEmpty())
KviKvsKernel::instance()->completeFunction(buffer,&list); KviKvsKernel::instance()->completeFunction(buffer,&list);
else else
debug("we need a module completion!"); tqDebug("we need a module completion!");
for ( TQString* szCurrent = list.first(); szCurrent; szCurrent = list.next() ) for ( TQString* szCurrent = list.first(); szCurrent; szCurrent = list.next() )
{ {
szCurrent->prepend('$'); szCurrent->prepend('$');
@ -133,19 +133,19 @@ void KviCompletionBox::updateContents(TQString buffer)
if(szModule.isEmpty()) if(szModule.isEmpty())
KviKvsKernel::instance()->completeCommand(buffer,&list); KviKvsKernel::instance()->completeCommand(buffer,&list);
else else
debug("we need a module completion!"); tqDebug("we need a module completion!");
for ( TQString* szCurrent = list.first(); szCurrent; szCurrent = list.next() ) for ( TQString* szCurrent = list.first(); szCurrent; szCurrent = list.next() )
{ {
szCurrent->append(' '); szCurrent->append(' ');
insertItem(*szCurrent); insertItem(*szCurrent);
} }
} }
// debug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,count()); // tqDebug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,count());
} }
void KviCompletionBox::keyPressEvent(TQKeyEvent * e) void KviCompletionBox::keyPressEvent(TQKeyEvent * e)
{ {
// debug("%s %s %i %x",__FILE__,__FUNCTION__,__LINE__,e->key()); // tqDebug("%s %s %i %x",__FILE__,__FUNCTION__,__LINE__,e->key());
switch(e->key()) switch(e->key())
{ {
case TQt::Key_Escape: case TQt::Key_Escape:
@ -384,7 +384,7 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e)
insertAt(szCur,para,0); insertAt(szCur,para,0);
setCursorPosition(para,szCur.length()+pos); setCursorPosition(para,szCur.length()+pos);
} }
// debug("|%i|",pos); // tqDebug("|%i|",pos);
} }
return; return;
default: default:
@ -423,7 +423,7 @@ void KviScriptEditorWidget::contentsMousePressEvent(TQMouseEvent *e)
if (l.count() != 1) buffer=""; if (l.count() != 1) buffer="";
else buffer=*(l.at(0)); else buffer=*(l.at(0));
} }
//debug (buffer); //tqDebug (buffer);
m_szHelp=buffer; m_szHelp=buffer;
} }
KviTalTextEdit::contentsMousePressEvent(e); KviTalTextEdit::contentsMousePressEvent(e);
@ -468,7 +468,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const
TQString parse; TQString parse;
KviTQString::sprintf(parse,"timer -s (help,0){ help -s %Q; }",&buffer); KviTQString::sprintf(parse,"timer -s (help,0){ help -s %Q; }",&buffer);
debug ("parsing %s",parse.latin1()); tqDebug ("parsing %s",parse.latin1());
KviKvsScript::run(parse,(KviWindow*)g_pApp->activeConsole()); KviKvsScript::run(parse,(KviWindow*)g_pApp->activeConsole());
return true; return true;
@ -478,7 +478,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const
void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const
{ {
TQRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]"); TQRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]");
//debug("BUFFER IS %s",buffer.utf8().data()); //tqDebug("BUFFER IS %s",buffer.utf8().data());
int start = buffer.findRev(re,index); int start = buffer.findRev(re,index);
int end = buffer.find(re,index); int end = buffer.find(re,index);
@ -491,7 +491,7 @@ void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const
tmp = buffer.mid(start,end-start); tmp = buffer.mid(start,end-start);
} }
buffer = tmp; buffer = tmp;
//debug("BUFFER NOW IS %s",buffer.utf8().data()); //tqDebug("BUFFER NOW IS %s",buffer.utf8().data());
} }
void KviScriptEditorWidget::completition(bool bCanComplete) void KviScriptEditorWidget::completition(bool bCanComplete)

@ -515,7 +515,7 @@ void KviEventEditorWindow::saveProperties(KviConfig *cfg)
#ifdef COMPILE_SCRIPTTOOLBAR #ifdef COMPILE_SCRIPTTOOLBAR
cfg->writeEntry("Sizes",m_pEditor->sizes()); cfg->writeEntry("Sizes",m_pEditor->sizes());
cfg->writeEntry("LastEvent",m_pEditor->lastEditedEvent().ptr()); cfg->writeEntry("LastEvent",m_pEditor->lastEditedEvent().ptr());
//debug("LAST EDITED=%s",m_pEditor->lastEditedEvent().ptr()); //tqDebug("LAST EDITED=%s",m_pEditor->lastEditedEvent().ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }
@ -530,7 +530,7 @@ void KviEventEditorWindow::loadProperties(KviConfig *cfg)
m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
KviStr tmp = cfg->readEntry("LastEvent",""); KviStr tmp = cfg->readEntry("LastEvent","");
m_pEditor->editEvent(tmp); m_pEditor->editEvent(tmp);
//debug("LAST EDITED WAS %s",tmp.ptr()); //tqDebug("LAST EDITED WAS %s",tmp.ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }

@ -310,7 +310,7 @@ void Index::readDocumentList()
return; return;
TQTextStream s1( &f1 ); TQTextStream s1( &f1 );
titleList = TQStringList::split("[#item#]",s1.read()); titleList = TQStringList::split("[#item#]",s1.read());
// debug(titleList); // tqDebug(titleList);
} }

@ -176,7 +176,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
c->window()->frame(),true); c->window()->frame(),true);
w->textBrowser()->setSource(doc); w->textBrowser()->setSource(doc);
w->show(); w->show();
//debug ("mostro"); //tqDebug ("mostro");
} }
return true; return true;
} }

@ -193,7 +193,7 @@ void KviHttpFileTransfer::displayPaint(TQPainter * p,int column,int width,int he
int tSpan = kvi_timeSpan(m_tTransferEndTime > 0 ? m_tTransferEndTime : kvi_unixTime(),m_tTransferStartTime); int tSpan = kvi_timeSpan(m_tTransferEndTime > 0 ? m_tTransferEndTime : kvi_unixTime(),m_tTransferStartTime);
if(tSpan > 0) if(tSpan > 0)
{ {
//debug("SPAN: %d (%d - %d)",tSpan,m_tTransferEndTime > 0 ? m_tTransferEndTime : kvi_unixTime(),m_tTransferStartTime); //tqDebug("SPAN: %d (%d - %d)",tSpan,m_tTransferEndTime > 0 ? m_tTransferEndTime : kvi_unixTime(),m_tTransferStartTime);
iAvgSpeed = uRecvd / tSpan; iAvgSpeed = uRecvd / tSpan;
if(!bIsTerminated && (uTotal >= uRecvd)) if(!bIsTerminated && (uTotal >= uRecvd))
{ {

@ -47,7 +47,7 @@ extern KVIRC_API int g_iIdentDaemonRunningUsers;
void startIdentService() void startIdentService()
{ {
// debug("Stargin"); // tqDebug("Stargin");
if(!g_pIdentDaemon)g_pIdentDaemon = new KviIdentDaemon(); if(!g_pIdentDaemon)g_pIdentDaemon = new KviIdentDaemon();
if(!g_pIdentDaemon->isRunning())g_pIdentDaemon->start(); if(!g_pIdentDaemon->isRunning())g_pIdentDaemon->start();
while(g_pIdentDaemon->isStartingUp()) while(g_pIdentDaemon->isStartingUp())
@ -58,15 +58,15 @@ void startIdentService()
usleep(100); usleep(100);
#endif #endif
} }
// debug("Service started"); // tqDebug("Service started");
} }
void stopIdentService() void stopIdentService()
{ {
// debug("Stopping"); // tqDebug("Stopping");
if(g_pIdentDaemon)delete g_pIdentDaemon; if(g_pIdentDaemon)delete g_pIdentDaemon;
g_pIdentDaemon = 0; g_pIdentDaemon = 0;
// debug("Stopped"); // tqDebug("Stopped");
} }
KviIdentSentinel::KviIdentSentinel() KviIdentSentinel::KviIdentSentinel()
@ -149,7 +149,7 @@ KviIdentRequest::~KviIdentRequest()
KviIdentDaemon::KviIdentDaemon() KviIdentDaemon::KviIdentDaemon()
: KviSensitiveThread() : KviSensitiveThread()
{ {
// debug("Thread constructor"); // tqDebug("Thread constructor");
m_szUser = KVI_OPTION_STRING(KviOption_stringIdentdUser); m_szUser = KVI_OPTION_STRING(KviOption_stringIdentdUser);
if(m_szUser.isEmpty())m_szUser = "kvirc"; if(m_szUser.isEmpty())m_szUser = "kvirc";
m_uPort = KVI_OPTION_UINT(KviOption_uintIdentdPort); m_uPort = KVI_OPTION_UINT(KviOption_uintIdentdPort);
@ -159,17 +159,17 @@ KviIdentDaemon::KviIdentDaemon()
m_bEnableIpV6 = false; m_bEnableIpV6 = false;
#endif #endif
m_bIpV6ContainsIpV4 = KVI_OPTION_BOOL(KviOption_boolIdentdIpV6ContainsIpV4); m_bIpV6ContainsIpV4 = KVI_OPTION_BOOL(KviOption_boolIdentdIpV6ContainsIpV4);
// debug("Thread constructor done"); // tqDebug("Thread constructor done");
} }
KviIdentDaemon::~KviIdentDaemon() KviIdentDaemon::~KviIdentDaemon()
{ {
// debug("Thread destructor"); // tqDebug("Thread destructor");
terminate(); terminate();
g_iIdentDaemonRunningUsers = 0; g_iIdentDaemonRunningUsers = 0;
g_pIdentDaemon = 0; g_pIdentDaemon = 0;
// debug("Destructor gone"); // tqDebug("Destructor gone");
} }
void KviIdentDaemon::postMessage(const char * message,KviIdentRequest * r,const char * szAux) void KviIdentDaemon::postMessage(const char * message,KviIdentRequest * r,const char * szAux)
@ -193,7 +193,7 @@ void KviIdentDaemon::postMessage(const char * message,KviIdentRequest * r,const
void KviIdentDaemon::run() void KviIdentDaemon::run()
{ {
// debug("RUN STARTED"); // tqDebug("RUN STARTED");
m_sock = KVI_INVALID_SOCKET; m_sock = KVI_INVALID_SOCKET;
m_sock6 = KVI_INVALID_SOCKET; m_sock6 = KVI_INVALID_SOCKET;
bool bEventPosted = false; bool bEventPosted = false;
@ -479,7 +479,7 @@ ipv6_failure:
} }
} else { } else {
// debug("Data is : (%s)",r->m_szData.ptr()); // tqDebug("Data is : (%s)",r->m_szData.ptr());
if(r->m_szData.len() > 1024) if(r->m_szData.len() > 1024)
{ {
// request too long...kill it // request too long...kill it
@ -527,7 +527,7 @@ exit_thread:
delete m_pRequestList; delete m_pRequestList;
m_pRequestList = 0; m_pRequestList = 0;
// debug("RUN EXITING"); // tqDebug("RUN EXITING");
} }

@ -83,7 +83,7 @@ void KviIOGraphDisplay::timerEvent(TQTimerEvent *e)
unsigned int rB = console()->socket()->readBytes(); unsigned int rB = console()->socket()->readBytes();
int sDiff = (sB - m_uLastSentBytes) / 8; int sDiff = (sB - m_uLastSentBytes) / 8;
int rDiff = (rB - m_uLastRecvBytes) / 32; int rDiff = (rB - m_uLastRecvBytes) / 32;
// debug("s:%d,r:%d",sDiff,rDiff); // tqDebug("s:%d,r:%d",sDiff,rDiff);
if(sDiff < 0)sDiff = 0; if(sDiff < 0)sDiff = 0;
else if(sDiff > 30)sDiff = 30; else if(sDiff > 30)sDiff = 30;
if(rDiff < 0)rDiff = 0; if(rDiff < 0)rDiff = 0;

@ -92,7 +92,7 @@ int KviChannelListViewItem::width ( const TQFontMetrics & fm, const KviTalListVi
int KviChannelListViewItem::width ( const TQFontMetrics & fm, const TQListView * lv, int column ) const int KviChannelListViewItem::width ( const TQFontMetrics & fm, const TQListView * lv, int column ) const
#endif #endif
{ {
debug("width request"); tqDebug("width request");
TQString szText; TQString szText;
switch(column) switch(column)

@ -429,7 +429,7 @@ KviLogFile::KviLogFile(const TQString& name)
int iDay = szDate.section('.',2,2).toInt(); int iDay = szDate.section('.',2,2).toInt();
m_date.setYMD(iYear,iMonth,iDay); m_date.setYMD(iYear,iMonth,iDay);
//debug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay); //tqDebug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay);
} }
void KviLogFile::getText(TQString & text,const TQString& logDir){ void KviLogFile::getText(TQString & text,const TQString& logDir){
@ -456,7 +456,7 @@ void KviLogFile::getText(TQString & text,const TQString& logDir){
gzclose(file); gzclose(file);
text = TQString::fromUtf8(data); text = TQString::fromUtf8(data);
} else { } else {
debug("Cannot open compressed file %s",logName.local8Bit().data()); tqDebug("Cannot open compressed file %s",logName.local8Bit().data());
} }
} else { } else {
#endif #endif

@ -171,8 +171,8 @@ KviNotifierWindow::KviNotifierWindow()
TQDesktopWidget * w = TQApplication::desktop(); TQDesktopWidget * w = TQApplication::desktop();
TQRect r = w->availableGeometry(w->primaryScreen()); //w->screenGeometry(w->primaryScreen()); TQRect r = w->availableGeometry(w->primaryScreen()); //w->screenGeometry(w->primaryScreen());
/*debug("r.x(),r.y(): %d,%d",r.x(),r.y()); /*tqDebug("r.x(),r.y(): %d,%d",r.x(),r.y());
debug("r.width(),r.height(): %d,%d",r.width(),r.height());*/ tqDebug("r.width(),r.height(): %d,%d",r.width(),r.height());*/
m_wndRect.setRect( r.x() + r.width() - (iWidth + SPACING), r.y() + r.height() - (iHeight + SPACING), iWidth, iHeight ); m_wndRect.setRect( r.x() + r.width() - (iWidth + SPACING), r.y() + r.height() - (iHeight + SPACING), iWidth, iHeight );
@ -451,7 +451,7 @@ void KviNotifierWindow::heartbeat()
targetOpacity/=100; targetOpacity/=100;
bIncreasing = targetOpacity>m_dOpacity; bIncreasing = targetOpacity>m_dOpacity;
m_dOpacity += bIncreasing ? OPACITY_STEP : -(OPACITY_STEP); m_dOpacity += bIncreasing ? OPACITY_STEP : -(OPACITY_STEP);
//debug("%f %f %i %i",m_dOpacity,targetOpacity,bIncreasing,(m_dOpacity >= targetOpacity)); //tqDebug("%f %f %i %i",m_dOpacity,targetOpacity,bIncreasing,(m_dOpacity >= targetOpacity));
if( (bIncreasing && (m_dOpacity >= targetOpacity) ) || if( (bIncreasing && (m_dOpacity >= targetOpacity) ) ||
(!bIncreasing && (m_dOpacity <= targetOpacity) ) (!bIncreasing && (m_dOpacity <= targetOpacity) )
) )
@ -519,13 +519,13 @@ void KviNotifierWindow::doHide(bool bDoAnimate)
if((!bDoAnimate) || (x() != m_pWndBorder->x()) || (y() != m_pWndBorder->y())) if((!bDoAnimate) || (x() != m_pWndBorder->x()) || (y() != m_pWndBorder->y()))
{ {
//debug ("just hide quickly with notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate); //tqDebug ("just hide quickly with notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate);
// the user asked to not animate or // the user asked to not animate or
// the window has been moved and the animation would suck anyway // the window has been moved and the animation would suck anyway
// just hide quickly // just hide quickly
hideNow(); hideNow();
} else { } else {
//debug ("starting hide animation notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate); //tqDebug ("starting hide animation notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate);
m_pShowHideTimer = new TQTimer(); m_pShowHideTimer = new TQTimer();
connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat()));
m_dOpacity = 1.0 - OPACITY_STEP; m_dOpacity = 1.0 - OPACITY_STEP;
@ -779,7 +779,7 @@ void KviNotifierWindow::redrawText()
void KviNotifierWindow::mouseMoveEvent(TQMouseEvent * e) void KviNotifierWindow::mouseMoveEvent(TQMouseEvent * e)
{ {
//debug ("move on x,y: %d,%d", e->pos().x(), e->pos().y()); //tqDebug ("move on x,y: %d,%d", e->pos().x(), e->pos().y());
if (!m_bLeftButtonIsPressed) { if (!m_bLeftButtonIsPressed) {
@ -874,9 +874,9 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e)
} }
if(m_pWndBorder->captionRect().contains(e->pos())) { if(m_pWndBorder->captionRect().contains(e->pos())) {
//debug ("Clicked on m_pWndBorder->rect()"); //tqDebug ("Clicked on m_pWndBorder->rect()");
if(m_pWndBorder->closeRect().contains(e->pos())) { if(m_pWndBorder->closeRect().contains(e->pos())) {
//debug ("\tClicked on m_pWndBorder->closeRect()"); //tqDebug ("\tClicked on m_pWndBorder->closeRect()");
m_bCloseDown = true; m_bCloseDown = true;
m_pWndBorder->setCloseIcon(WDG_ICON_CLICKED); m_pWndBorder->setCloseIcon(WDG_ICON_CLICKED);
goto sartelo; goto sartelo;
@ -890,12 +890,12 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e)
} }
} }
//debug ("x,y: %d,%d - width,height: %d,%d", m_pWndBorder->rect().x(),m_pWndBorder->rect().y(),m_pWndBorder->rect().width(),m_pWndBorder->rect().height()); //tqDebug ("x,y: %d,%d - width,height: %d,%d", m_pWndBorder->rect().x(),m_pWndBorder->rect().y(),m_pWndBorder->rect().width(),m_pWndBorder->rect().height());
if (m_pWndBorder->rect().contains(e->pos())) { if (m_pWndBorder->rect().contains(e->pos())) {
if(m_pWndTabs->currentTab()) if(m_pWndTabs->currentTab())
{ {
//debug ("Clicked on m_pWndBody->textRect()"); //tqDebug ("Clicked on m_pWndBody->textRect()");
if(m_pWndBody->rctWriteIcon().contains(e->pos())) if(m_pWndBody->rctWriteIcon().contains(e->pos()))
{ {
m_pWndBody->setWriteIcon(WDG_ICON_CLICKED); m_pWndBody->setWriteIcon(WDG_ICON_CLICKED);
@ -950,7 +950,7 @@ void KviNotifierWindow::mouseReleaseEvent(TQMouseEvent * e)
if(m_pWndBorder->captionRect().contains(e->pos())) { if(m_pWndBorder->captionRect().contains(e->pos())) {
if(m_pWndBorder->closeRect().contains(e->pos())) { if(m_pWndBorder->closeRect().contains(e->pos())) {
//debug ("hide now from release event"); //tqDebug ("hide now from release event");
hideNow(); hideNow();
} else { } else {
update(); update();

@ -117,7 +117,7 @@ public:
void setHeight(int h); void setHeight(int h);
void resize(int w, int h) { setWidth(w); setHeight(h); }; void resize(int w, int h) { setWidth(w); setHeight(h); };
void resize(TQSize r) { setWidth(r.width()); setHeight(r.height()); }; void resize(TQSize r) { setWidth(r.width()); setHeight(r.height()); };
void setGeometry(TQRect r) { r.topLeft(); r.size(); /*debug("x,y: %d,%d", r.x(), r.y()); debug("w,h: %d,%d", r.width(), r.height());*/ }; void setGeometry(TQRect r) { r.topLeft(); r.size(); /*tqDebug("x,y: %d,%d", r.x(), r.y()); tqDebug("w,h: %d,%d", r.width(), r.height());*/ };
void setGeometry(TQPoint p, TQSize s) { setPoint (p.x(), p.y()); setWidth (s.width()); setHeight (s.height()); }; void setGeometry(TQPoint p, TQSize s) { setPoint (p.x(), p.y()); setWidth (s.width()); setHeight (s.height()); };
void setPoint(int x, int y) { m_pnt.setX(x); m_pnt.setY(y); m_rct.setX(x); m_rct.setY(y); }; void setPoint(int x, int y) { m_pnt.setX(x); m_pnt.setY(y); m_rct.setX(x); m_rct.setY(y); };

@ -306,7 +306,7 @@ TQImage * KviKvsObject_pixmap::getImage()
{ {
if (bPixmapModified) { if (bPixmapModified) {
*m_pImage=m_pPixmap->convertToImage(); *m_pImage=m_pPixmap->convertToImage();
//debug ("image info2 %d and %d",test.width(),test.height()); //tqDebug ("image info2 %d and %d",test.width(),test.height());
bPixmapModified=false; bPixmapModified=false;
} }

@ -583,7 +583,7 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("remote_ip",KVS_PT_STRING,0,m_szRemoteIp) KVSO_PARAMETER("remote_ip",KVS_PT_STRING,0,m_szRemoteIp)
KVSO_PARAMETER("remote_port",KVS_PT_UNSIGNEDINTEGER,0,m_uRemotePort) KVSO_PARAMETER("remote_port",KVS_PT_UNSIGNEDINTEGER,0,m_uRemotePort)
KVSO_PARAMETERS_END(c) KVSO_PARAMETERS_END(c)
debug ("Function connect"); tqDebug ("Function connect");
if (m_uRemotePort>65535) if (m_uRemotePort>65535)
@ -605,13 +605,13 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
if(kvi_isValidStringIp(m_szRemoteIp)) if(kvi_isValidStringIp(m_szRemoteIp))
#endif #endif
{ {
debug ("ok connecting"); tqDebug ("ok connecting");
debug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); tqDebug ("connectinhg on ip %s ",m_szRemoteIp.latin1());
debug ("non so ip"); tqDebug ("non so ip");
m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING;
delayedConnect(); delayedConnect();
} else { } else {
debug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort); tqDebug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort);
m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS;
delayedLookupRemoteIp(); delayedLookupRemoteIp();
} }
@ -863,7 +863,7 @@ void KviKvsObject_socket::delayedConnect()
void KviKvsObject_socket::doConnect() void KviKvsObject_socket::doConnect()
{ {
debug ("doConnect function"); tqDebug ("doConnect function");
if(m_pDelayTimer)delete m_pDelayTimer; if(m_pDelayTimer)delete m_pDelayTimer;
m_pDelayTimer = 0; m_pDelayTimer = 0;
@ -888,7 +888,7 @@ void KviKvsObject_socket::doConnect()
// else it has already been called! // else it has already been called!
return; return;
} }
debug ("Socket created"); tqDebug ("Socket created");
// create the socket // create the socket
#ifdef COMPILE_IPV6_SUPPORT #ifdef COMPILE_IPV6_SUPPORT
@ -908,7 +908,7 @@ debug ("Socket created");
// else it has already been called! // else it has already been called!
return; return;
} }
debug ("Valid socket"); tqDebug ("Valid socket");
if(!kvi_socket_setNonBlocking(m_sock)) if(!kvi_socket_setNonBlocking(m_sock))
{ {
@ -949,7 +949,7 @@ debug ("Socket created");
return; return;
} }
} }
debug ("Socket connected"); tqDebug ("Socket connected");
m_pDelayTimer = new TQTimer(); m_pDelayTimer = new TQTimer();
connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectTimeout())); connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectTimeout()));
m_pDelayTimer->start(m_uConnectTimeout,true); m_pDelayTimer->start(m_uConnectTimeout,true);
@ -979,7 +979,7 @@ void KviKvsObject_socket::delayedLookupRemoteIp()
void KviKvsObject_socket::lookupRemoteIp() void KviKvsObject_socket::lookupRemoteIp()
{ {
debug ("Resolve dns"); tqDebug ("Resolve dns");
if(m_pDelayTimer)delete m_pDelayTimer; if(m_pDelayTimer)delete m_pDelayTimer;
m_pDelayTimer = 0; m_pDelayTimer = 0;
if(m_pDns)delete m_pDns; if(m_pDns)delete m_pDns;
@ -1011,7 +1011,7 @@ void KviKvsObject_socket::lookupDone(KviDns *pDns)
return; return;
} }
m_szRemoteIp = pDns->firstIpAddress(); m_szRemoteIp = pDns->firstIpAddress();
debug ("Dns resolved in %s",m_szRemoteIp.latin1()); tqDebug ("Dns resolved in %s",m_szRemoteIp.latin1());
delete m_pDns; delete m_pDns;
m_pDns = 0; m_pDns = 0;
@ -1020,7 +1020,7 @@ void KviKvsObject_socket::lookupDone(KviDns *pDns)
void KviKvsObject_socket::writeNotifierFired(int) void KviKvsObject_socket::writeNotifierFired(int)
{ {
debug ("Here in the writeNotifierFired"); tqDebug ("Here in the writeNotifierFired");
if(m_pSn) if(m_pSn)
{ {
delete m_pSn; delete m_pSn;
@ -1039,7 +1039,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
//sockError = 0; //sockError = 0;
if(sockError != 0) if(sockError != 0)
{ {
//debug("Failed here %d",sockError); //tqDebug("Failed here %d",sockError);
//failed //failed
if(sockError > 0)sockError = KviError::translateSystemError(sockError); if(sockError > 0)sockError = KviError::translateSystemError(sockError);
else sockError = KviError_unknownError; //Error 0 ? else sockError = KviError_unknownError; //Error 0 ?
@ -1077,7 +1077,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
void KviKvsObject_socket::readNotifierFired(int) void KviKvsObject_socket::readNotifierFired(int)
{ {
debug ("here in the readNotifierFired"); tqDebug ("here in the readNotifierFired");
//read data //read data
if((m_uInBufferLen - m_uInDataLen) < KVI_READ_CHUNK) if((m_uInBufferLen - m_uInDataLen) < KVI_READ_CHUNK)
{ {

@ -121,7 +121,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
{ {
if( !pParams ) return false; if( !pParams ) return false;
debug ("ci sono i parametri"); tqDebug ("ci sono i parametri");
TQWidget *pWidget = 0; TQWidget *pWidget = 0;
int i=0; int i=0;
while(i!=pParams->count()) while(i!=pParams->count())
@ -140,9 +140,9 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
szClass = s; szClass = s;
szName = ""; szName = "";
} }
debug ("szClass %s",szClass.latin1()); tqDebug ("szClass %s",szClass.latin1());
debug ("szName %s",szName.latin1()); tqDebug ("szName %s",szName.latin1());
debug ("s %s",s.latin1()); tqDebug ("s %s",s.latin1());
if(KviTQString::equalCI(szClass,"WinId")) if(KviTQString::equalCI(szClass,"WinId"))
{ {

@ -325,7 +325,7 @@ bool KviKvsObject_xmlreader::function_parse(KviKvsObjectFunctionCall *c)
TQByteArray data = utf8data; TQByteArray data = utf8data;
data.truncate(utf8data.length()); // don't include the null terminator in data data.truncate(utf8data.length()); // don't include the null terminator in data
source.setData(data); source.setData(data);
//debug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length()); //tqDebug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length());
TQXmlSimpleReader reader; TQXmlSimpleReader reader;
reader.setContentHandler(&handler); reader.setContentHandler(&handler);
reader.setErrorHandler(&handler); reader.setErrorHandler(&handler);

@ -853,9 +853,9 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
KviKvsVariant v; KviKvsVariant v;
v.setString(szTemp); v.setString(szTemp);
n->set(idx,new KviKvsVariant(v)); n->set(idx,new KviKvsVariant(v));
debug ("string %s",szTemp.latin1()); tqDebug ("string %s",szTemp.latin1());
debug ("class %s",szClass.latin1()); tqDebug ("class %s",szClass.latin1());
debug ("Obj %s",szObj.latin1()); tqDebug ("Obj %s",szObj.latin1());
idx++; idx++;
@ -892,9 +892,9 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
KviKvsVariant v; KviKvsVariant v;
v.setString(szTemp); v.setString(szTemp);
n->set(idx,new KviKvsVariant(v)); n->set(idx,new KviKvsVariant(v));
debug ("string %s",szTemp.latin1()); tqDebug ("string %s",szTemp.latin1());
debug ("class %s",szClass.latin1()); tqDebug ("class %s",szClass.latin1());
debug ("Obj %s",szObj.latin1()); tqDebug ("Obj %s",szObj.latin1());
idx++; idx++;
@ -935,7 +935,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spac
KviKvsVariant v; KviKvsVariant v;
v.setString(szTemp); v.setString(szTemp);
n->set(idx,new KviKvsVariant(v)); n->set(idx,new KviKvsVariant(v));
debug ("string %s",szTemp.latin1()); tqDebug ("string %s",szTemp.latin1());
idx++; idx++;
dumpChildObjects(pWnd, list.at(i), sp, bFlag, n, idx ); dumpChildObjects(pWnd, list.at(i), sp, bFlag, n, idx );
} }
@ -965,7 +965,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spac
KviKvsVariant v; KviKvsVariant v;
v.setString(szTemp); v.setString(szTemp);
n->set(idx,new KviKvsVariant(v)); n->set(idx,new KviKvsVariant(v));
debug ("string %s",szTemp.latin1()); tqDebug ("string %s",szTemp.latin1());
idx++; idx++;
dumpChildObjects(pWnd, it.current(), sp, bFlag, n, idx ); dumpChildObjects(pWnd, it.current(), sp, bFlag, n, idx );
} }

@ -308,7 +308,7 @@ void KviOptionsDialog::searchLineEditTextChanged(const TQString &)
bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQStringList &lKeywords) bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQStringList &lKeywords)
{ {
//debug("recursive search:"); //tqDebug("recursive search:");
if(!pItem)return false; if(!pItem)return false;
if(!pItem->m_pOptionsWidget) if(!pItem->m_pOptionsWidget)

@ -650,7 +650,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
: TQObject(0) : TQObject(0)
{ {
//debug("Instantiating"); //tqDebug("Instantiating");
// Create the global widget dict : case sensitive , do not copy keys // Create the global widget dict : case sensitive , do not copy keys
m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>; m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
m_pInstanceTree->setAutoDelete(true); m_pInstanceTree->setAutoDelete(true);
@ -3466,9 +3466,9 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
delete e->pWidget->parent(); delete e->pWidget->parent();
e->pWidget = 0; e->pWidget = 0;
} else { } else {
debug("Ops...i have deleted the options dialog ?"); tqDebug("Ops...i have deleted the options dialog ?");
} }
} //else debug("Clas %s has no widget",e->szName); } //else tqDebug("Clas %s has no widget",e->szName);
if(e->pChildList)deleteInstanceTree(e->pChildList); if(e->pChildList)deleteInstanceTree(e->pChildList);
} }
delete l; delete l;
@ -3478,7 +3478,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
KviOptionsInstanceManager::~KviOptionsInstanceManager() KviOptionsInstanceManager::~KviOptionsInstanceManager()
{ {
if(m_pInstanceTree)debug("Ops...KviOptionsInstanceManager::cleanup() not called ?"); if(m_pInstanceTree)tqDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
} }
void KviOptionsInstanceManager::cleanup(KviModule * m) void KviOptionsInstanceManager::cleanup(KviModule * m)

@ -186,7 +186,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
: QObject(0) : QObject(0)
{ {
//debug("Instantiating"); //tqDebug("Instantiating");
// Create the global widget dict : case sensitive , do not copy keys // Create the global widget dict : case sensitive , do not copy keys
m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>; m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
m_pInstanceTree->setAutoDelete(true); m_pInstanceTree->setAutoDelete(true);
@ -314,9 +314,9 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
delete e->pWidget->parent(); delete e->pWidget->parent();
e->pWidget = 0; e->pWidget = 0;
} else { } else {
debug("Ops...i have deleted the options dialog ?"); tqDebug("Ops...i have deleted the options dialog ?");
} }
} //else debug("Clas %s has no widget",e->szName); } //else tqDebug("Clas %s has no widget",e->szName);
if(e->pChildList)deleteInstanceTree(e->pChildList); if(e->pChildList)deleteInstanceTree(e->pChildList);
} }
delete l; delete l;
@ -326,7 +326,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
KviOptionsInstanceManager::~KviOptionsInstanceManager() KviOptionsInstanceManager::~KviOptionsInstanceManager()
{ {
if(m_pInstanceTree)debug("Ops...KviOptionsInstanceManager::cleanup() not called ?"); if(m_pInstanceTree)tqDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
} }
void KviOptionsInstanceManager::cleanup(KviModule * m) void KviOptionsInstanceManager::cleanup(KviModule * m)

@ -494,9 +494,9 @@ void KviMessageColorsOptionsWidget::saveLastItem()
int curIt = m_pForeListBox->currentItem(); int curIt = m_pForeListBox->currentItem();
if(curIt != -1) if(curIt != -1)
{ {
//debug("Setting fore %d",curIt); //tqDebug("Setting fore %d",curIt);
KviMessageColorListBoxItem * fore = (KviMessageColorListBoxItem *)m_pForeListBox->item(curIt); KviMessageColorListBoxItem * fore = (KviMessageColorListBoxItem *)m_pForeListBox->item(curIt);
//debug("And is %d",fore); //tqDebug("And is %d",fore);
if(fore)m_pLastItem->msgType()->setFore(fore->m_iClrIdx); if(fore)m_pLastItem->msgType()->setFore(fore->m_iClrIdx);
} }
curIt = m_pBackListBox->currentItem(); curIt = m_pBackListBox->currentItem();
@ -506,7 +506,7 @@ void KviMessageColorsOptionsWidget::saveLastItem()
if(back)m_pLastItem->msgType()->setBack(back->m_iClrIdx); if(back)m_pLastItem->msgType()->setBack(back->m_iClrIdx);
} }
m_pLastItem->msgType()->enableLogging(m_pEnableLogging->isChecked()); m_pLastItem->msgType()->enableLogging(m_pEnableLogging->isChecked());
//debug("Updating","options"); //tqDebug("Updating","options");
curIt = m_pLevelListBox->currentItem(); curIt = m_pLevelListBox->currentItem();
if(curIt < 0 || curIt > 5)curIt = 1; if(curIt < 0 || curIt > 5)curIt = 1;
m_pLastItem->msgType()->setLevel(curIt); m_pLastItem->msgType()->setLevel(curIt);
@ -515,7 +515,7 @@ void KviMessageColorsOptionsWidget::saveLastItem()
void KviMessageColorsOptionsWidget::itemChanged(KviTalListViewItem * it) void KviMessageColorsOptionsWidget::itemChanged(KviTalListViewItem * it)
{ {
//debug("Item changed","options"); //tqDebug("Item changed","options");
if(m_pLastItem)saveLastItem(); if(m_pLastItem)saveLastItem();
m_pLastItem = 0; // do NOT save in this routine m_pLastItem = 0; // do NOT save in this routine
@ -632,9 +632,9 @@ void KviMessageColorsOptionsWidget::load()
//KviStr szLocal; //KviStr szLocal;
TQString szLocal; TQString szLocal;
g_pApp->getLocalKvircDirectory(szLocal,KviApp::MsgColors,"presets"); g_pApp->getLocalKvircDirectory(szLocal,KviApp::MsgColors,"presets");
//debug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); //tqDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr());
//debug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr())); //tqDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr()));
//debug("ERRNO (%d)",errno); //tqDebug("ERRNO (%d)",errno);
symlink(szGlobal,szLocal); symlink(szGlobal,szLocal);
// FIXME: Do it also on windows... // FIXME: Do it also on windows...
#endif #endif

@ -79,7 +79,7 @@ void KviTextIconEditor::chooseFromFile()
if(g_pIconManager->getPixmap(szFile)) if(g_pIconManager->getPixmap(szFile))
{ {
m_pIcon->setFilename(szFile); m_pIcon->setFilename(szFile);
// debug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().utf8().data(),m_pIcon); // tqDebug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().utf8().data(),m_pIcon);
updateIcon(); updateIcon();
} }
} }

@ -1412,7 +1412,7 @@ void KviPopupEditorWindow::saveProperties(KviConfig *cfg)
#ifdef COMPILE_SCRIPTTOOLBAR #ifdef COMPILE_SCRIPTTOOLBAR
cfg->writeEntry("Sizes",m_pEditor->sizes()); cfg->writeEntry("Sizes",m_pEditor->sizes());
cfg->writeEntry("LastPopup",m_pEditor->lastEditedPopup().ptr()); cfg->writeEntry("LastPopup",m_pEditor->lastEditedPopup().ptr());
//debug("LAST EDITED=%s",m_pEditor->lastEditedPopup().ptr()); //tqDebug("LAST EDITED=%s",m_pEditor->lastEditedPopup().ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }
@ -1427,7 +1427,7 @@ void KviPopupEditorWindow::loadProperties(KviConfig *cfg)
m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
KviStr tmp = cfg->readEntry("LastPopup",""); KviStr tmp = cfg->readEntry("LastPopup","");
m_pEditor->editPopup(tmp); m_pEditor->editPopup(tmp);
//debug("LAST EDITED WAS %s",tmp.ptr()); //tqDebug("LAST EDITED WAS %s",tmp.ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }

@ -542,7 +542,7 @@ void KviRawEditorWindow::saveProperties(KviConfig *cfg)
#ifdef COMPILE_SCRIPTTOOLBAR #ifdef COMPILE_SCRIPTTOOLBAR
cfg->writeEntry("Sizes",m_pEditor->sizes()); cfg->writeEntry("Sizes",m_pEditor->sizes());
cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr()); cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr());
//debug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr()); //tqDebug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }
@ -557,7 +557,7 @@ void KviRawEditorWindow::loadProperties(KviConfig *cfg)
m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
KviStr tmp = cfg->readEntry("LastRaw",""); KviStr tmp = cfg->readEntry("LastRaw","");
m_pEditor->editRaw(tmp); m_pEditor->editRaw(tmp);
//debug("LAST EDITED WAS %s",tmp.ptr()); //tqDebug("LAST EDITED WAS %s",tmp.ptr());
#endif // COMPILE_SCRIPTTOOLBAR #endif // COMPILE_SCRIPTTOOLBAR
*/ */
} }

@ -862,7 +862,7 @@ void KviRegisteredUsersDialog::importClicked()
img = io.image(); img = io.image();
#endif #endif
if(img.isNull())debug("Ops.. readed a null image ?"); if(img.isNull())tqDebug("Ops.. readed a null image ?");
KviStr fName = u->name(); KviStr fName = u->name();
kvi_encodeFileName(fName); kvi_encodeFileName(fName);
@ -878,7 +878,7 @@ void KviRegisteredUsersDialog::importClicked()
if(!img.save(fPath.ptr(),"PNG")) if(!img.save(fPath.ptr(),"PNG"))
{ {
debug("Can't save image %s",fPath.ptr()); tqDebug("Can't save image %s",fPath.ptr());
} else { } else {
u->setProperty("avatar",fPath.ptr()); u->setProperty("avatar",fPath.ptr());
} }

@ -597,7 +597,7 @@ void KviRegisteredUserEntryDialog::okClicked()
{ {
// ops... no way // ops... no way
// FIXME: spit an error message ? // FIXME: spit an error message ?
debug("Ops.. something wrong with the regusers db"); tqDebug("Ops.. something wrong with the regusers db");
accept(); accept();
return; return;
} }

@ -321,7 +321,7 @@ void KviRegistrationWizard::accept()
{ {
// ops... no way // ops... no way
// FIXME: spit an error message ? // FIXME: spit an error message ?
debug("Ops.. something wrong with the regusers db"); tqDebug("Ops.. something wrong with the regusers db");
//delete this; //delete this;
return; return;
} }

@ -659,7 +659,7 @@
{ {
if(*(encoded.ptr()) != '*') if(*(encoded.ptr()) != '*')
{ {
debug("WARNING: Specified a CBC key but the incoming message doesn't seem to be a CBC one"); tqDebug("WARNING: Specified a CBC key but the incoming message doesn't seem to be a CBC one");
return doDecryptECB(encoded,plain); return doDecryptECB(encoded,plain);
} }
encoded.cutLeft(1); encoded.cutLeft(1);

@ -369,8 +369,8 @@ void KviSoundThread::run()
if(audiofd_c < 0) if(audiofd_c < 0)
{ {
debug("Could not open audio devive /dev/dsp! [OSS]"); tqDebug("Could not open audio devive /dev/dsp! [OSS]");
debug("(the device is probably busy)"); tqDebug("(the device is probably busy)");
goto exit_thread; goto exit_thread;
} }
@ -379,20 +379,20 @@ void KviSoundThread::run()
if (ioctl(audiofd.handle(),SNDCTL_DSP_SETFMT, &format) == -1) if (ioctl(audiofd.handle(),SNDCTL_DSP_SETFMT, &format) == -1)
{ {
debug("Could not set format width to DSP! [OSS]"); tqDebug("Could not set format width to DSP! [OSS]");
goto exit_thread; goto exit_thread;
} }
if (ioctl(audiofd.handle(), SNDCTL_DSP_CHANNELS, &channelCount) == -1) if (ioctl(audiofd.handle(), SNDCTL_DSP_CHANNELS, &channelCount) == -1)
{ {
debug("Could not set DSP channels! [OSS]"); tqDebug("Could not set DSP channels! [OSS]");
goto exit_thread; goto exit_thread;
} }
freq = (int) afGetRate(file, AF_DEFAULT_TRACK); freq = (int) afGetRate(file, AF_DEFAULT_TRACK);
if (ioctl(audiofd.handle(), SNDCTL_DSP_SPEED, &freq) == -1) if (ioctl(audiofd.handle(), SNDCTL_DSP_SPEED, &freq) == -1)
{ {
debug("Could not set DSP speed %d! [OSS]",freq); tqDebug("Could not set DSP speed %d! [OSS]",freq);
goto exit_thread; goto exit_thread;
} }
@ -434,7 +434,7 @@ void KviSoundThread::run()
if(!f.open(IO_ReadOnly)) if(!f.open(IO_ReadOnly))
{ {
debug("Could not open sound file %s! [OSS]",m_szFileName.utf8().data()); tqDebug("Could not open sound file %s! [OSS]",m_szFileName.utf8().data());
return; return;
} }
@ -442,13 +442,13 @@ void KviSoundThread::run()
if(iSize < 24) if(iSize < 24)
{ {
debug("Could not play sound, file %s too small! [OSS]",m_szFileName.utf8().data()); tqDebug("Could not play sound, file %s too small! [OSS]",m_szFileName.utf8().data());
goto exit_thread; goto exit_thread;
} }
if(f.readBlock(buf,24) < 24) if(f.readBlock(buf,24) < 24)
{ {
debug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.utf8().data()); tqDebug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.utf8().data());
goto exit_thread; goto exit_thread;
} }
@ -457,8 +457,8 @@ void KviSoundThread::run()
fd = open("/dev/audio", O_WRONLY | O_EXCL | O_NDELAY); fd = open("/dev/audio", O_WRONLY | O_EXCL | O_NDELAY);
if(fd < 0) if(fd < 0)
{ {
debug("Could not open device file /dev/audio!"); tqDebug("Could not open device file /dev/audio!");
debug("Maybe other program is using the device? Hint: fuser -uv /dev/audio"); tqDebug("Maybe other program is using the device? Hint: fuser -uv /dev/audio");
goto exit_thread; goto exit_thread;
} }
@ -472,7 +472,7 @@ void KviSoundThread::run()
int iReaded = f.readBlock(buf + iDataLen,iToRead); int iReaded = f.readBlock(buf + iDataLen,iToRead);
if(iReaded < 1) if(iReaded < 1)
{ {
debug("Error while reading the file data (%s)! [OSS]",m_szFileName.utf8().data()); tqDebug("Error while reading the file data (%s)! [OSS]",m_szFileName.utf8().data());
goto exit_thread; goto exit_thread;
} }
iSize -= iReaded; iSize -= iReaded;
@ -485,7 +485,7 @@ void KviSoundThread::run()
{ {
if((errno != EINTR) && (errno != EAGAIN)) if((errno != EINTR) && (errno != EAGAIN))
{ {
debug("Error while writing the audio data (%s)! [OSS]",m_szFileName.utf8().data()); tqDebug("Error while writing the audio data (%s)! [OSS]",m_szFileName.utf8().data());
goto exit_thread; goto exit_thread;
} }
} }
@ -519,7 +519,7 @@ void KviSoundThread::run()
{ {
// ESD has a really nice API // ESD has a really nice API
if(!esd_play_file(NULL,m_szFileName.utf8().data(),1)) if(!esd_play_file(NULL,m_szFileName.utf8().data(),1))
debug("Could not play sound %s! [ESD]",m_szFileName.utf8().data()); tqDebug("Could not play sound %s! [ESD]",m_szFileName.utf8().data());
} }
#endif //COMPILE_ESD_SUPPORT #endif //COMPILE_ESD_SUPPORT
@ -542,7 +542,7 @@ void KviSoundThread::run()
Arts::SimpleSoundServer *server = new Arts::SimpleSoundServer(Arts::Reference("global:Arts_SimpleSoundServer")); Arts::SimpleSoundServer *server = new Arts::SimpleSoundServer(Arts::Reference("global:Arts_SimpleSoundServer"));
if(server->isNull()) if(server->isNull())
{ {
debug("Can't connect to sound server to play file %s",m_szFileName.utf8().data()); tqDebug("Can't connect to sound server to play file %s",m_szFileName.utf8().data());
} else { } else {
server->play(m_szFileName); server->play(m_szFileName);
} }

@ -119,7 +119,7 @@ static bool term_module_init(KviModule * m)
// KviStr tmp = (*it)->name(); // KviStr tmp = (*it)->name();
// KviStr tmp2 = (*it)->type(); // KviStr tmp2 = (*it)->type();
// KviStr tmp3 = (*it)->library(); // KviStr tmp3 = (*it)->library();
// debug("Got Service name:%s type:%s library:%s",tmp.ptr(),tmp2.ptr(),tmp3.ptr()); // tqDebug("Got Service name:%s type:%s library:%s",tmp.ptr(),tmp2.ptr(),tmp3.ptr());
// ++it; // ++it;
// } // }
// } // }
@ -130,7 +130,7 @@ static bool term_module_init(KviModule * m)
if(pKonsoleService) if(pKonsoleService)
{ {
g_szKonsoleLibraryName = pKonsoleService->library(); g_szKonsoleLibraryName = pKonsoleService->library();
// debug("KONSOLE LIB %s",g_szKonsoleLibraryName.ptr()); // tqDebug("KONSOLE LIB %s",g_szKonsoleLibraryName.ptr());
} }
// delete pKonsoleService; // delete pKonsoleService;
#endif #endif

@ -76,16 +76,16 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
if(pKonsoleFactory) if(pKonsoleFactory)
{ {
// debug("FACTORY %d",pKonsoleFactory); // tqDebug("FACTORY %d",pKonsoleFactory);
m_pKonsolePart = static_cast<KParts::Part *>(pKonsoleFactory->createPart( m_pKonsolePart = static_cast<KParts::Part *>(pKonsoleFactory->createPart(
this,"terminal emulator",this,"the konsole part")); this,"terminal emulator",this,"the konsole part"));
if(m_pKonsolePart) if(m_pKonsolePart)
{ {
// debug("PART %d",m_pKonsolePart); // tqDebug("PART %d",m_pKonsolePart);
m_pKonsoleWidget = m_pKonsolePart->widget(); m_pKonsoleWidget = m_pKonsolePart->widget();
connect(m_pKonsoleWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(konsoleDestroyed())); connect(m_pKonsoleWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(konsoleDestroyed()));
// debug("Widget %d",m_pKonsoleWidget); // tqDebug("Widget %d",m_pKonsoleWidget);
} else { } else {
m_pKonsoleWidget = new TQLabel(this, m_pKonsoleWidget = new TQLabel(this,
__tr2qs("Can't create the terminal emulation part")); __tr2qs("Can't create the terminal emulation part"));
@ -105,11 +105,11 @@ KviTermWidget::~KviTermWidget()
if(m_bIsStandalone)g_pTermWidgetList->removeRef(this); if(m_bIsStandalone)g_pTermWidgetList->removeRef(this);
if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock(); if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
// debug("DELETING KONSOLE WIDGET"); // tqDebug("DELETING KONSOLE WIDGET");
// if(m_pKonsoleWidget)delete m_pKonsoleWidget; <--// TQt will delete it // if(m_pKonsoleWidget)delete m_pKonsoleWidget; <--// TQt will delete it
// debug("DELETING KONSOLE PART"); // tqDebug("DELETING KONSOLE PART");
// if(m_pKonsolePart)delete m_pKonsolePart; <--// the part will delete self when the widget will die // if(m_pKonsolePart)delete m_pKonsolePart; <--// the part will delete self when the widget will die
// debug("KONSOLE PART DELETED"); // tqDebug("KONSOLE PART DELETED");
} }
void KviTermWidget::resizeEvent(TQResizeEvent *e) void KviTermWidget::resizeEvent(TQResizeEvent *e)

@ -215,7 +215,7 @@ void KviTipWindow::nextTip()
KviStr tmp(KviStr::Format,"%u",uNextTip); KviStr tmp(KviStr::Format,"%u",uNextTip);
TQString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>")); TQString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>"));
//debug("REDECODED=%s",szTip.utf8().data()); //tqDebug("REDECODED=%s",szTip.utf8().data());
uNextTip++; uNextTip++;
if(uNextTip >= uNumTips)uNextTip = 0; if(uNextTip >= uNumTips)uNextTip = 0;

@ -870,7 +870,7 @@ static bool torrent_module_can_unload( KviModule * m )
static bool torrent_module_ctrl(KviModule * m,const char * operation,void * param) static bool torrent_module_ctrl(KviModule * m,const char * operation,void * param)
{ {
debug("torrent module ctrl"); tqDebug("torrent module ctrl");
/* if(kvi_strEqualCI(operation,"getAvailableMediaPlayers")) /* if(kvi_strEqualCI(operation,"getAvailableMediaPlayers"))
{ {
// we expect param to be a pointer to TQStringList // we expect param to be a pointer to TQStringList

@ -55,11 +55,11 @@ TORR_IMPLEMENT_DESCRIPTOR(
else \ else \
msg = "Something's wrong here! KTorrent's DCOP interface has probably changed."; \ msg = "Something's wrong here! KTorrent's DCOP interface has probably changed."; \
m_lastError = __tr2qs_ctx(TQString(msg), "torrent"); \ m_lastError = __tr2qs_ctx(TQString(msg), "torrent"); \
debug("%s (%s:%d): %s", __PRETTY_FUNCTION__, __FILE__, __LINE__, (const char*)msg); \ tqDebug("%s (%s:%d): %s", __PRETTY_FUNCTION__, __FILE__, __LINE__, (const char*)msg); \
#define ERROR_MSG_RANGE(I, SIZE) \ #define ERROR_MSG_RANGE(I, SIZE) \
KviTQString::sprintf(m_lastError, __tr2qs_ctx("Index out of range: %d [0-%d]!", "torrent"), I, (SIZE>0)?(SIZE-1):0); \ KviTQString::sprintf(m_lastError, __tr2qs_ctx("Index out of range: %d [0-%d]!", "torrent"), I, (SIZE>0)?(SIZE-1):0); \
debug("%s (%s:%d): Index out of range: %d [0-%d]!", __PRETTY_FUNCTION__ , __FILE__, __LINE__, I, (SIZE>0)?(SIZE-1):0); tqDebug("%s (%s:%d): Index out of range: %d [0-%d]!", __PRETTY_FUNCTION__ , __FILE__, __LINE__, I, (SIZE>0)?(SIZE-1):0);
#define ERROR_RET_BOOL \ #define ERROR_RET_BOOL \
{ \ { \
@ -194,7 +194,7 @@ bool KviKTorrentDCOPInterface::start(int i)
{ {
CHECK_RANGE_BOOL(i, m_ti.size()) CHECK_RANGE_BOOL(i, m_ti.size())
debug("starting %s [%d]", (const char*)m_ti[i].name, m_ti[i].num); tqDebug("starting %s [%d]", (const char*)m_ti[i].name, m_ti[i].num);
if (!voidRetIntDCOPCall("KTorrent", "start(int)", m_ti[i].num)) if (!voidRetIntDCOPCall("KTorrent", "start(int)", m_ti[i].num))
ERROR_RET_BOOL ERROR_RET_BOOL
@ -205,7 +205,7 @@ bool KviKTorrentDCOPInterface::stop(int i)
{ {
CHECK_RANGE_BOOL(i, m_ti.size()) CHECK_RANGE_BOOL(i, m_ti.size())
debug("stopping %s [%d]", (const char*)m_ti[i].name, m_ti[i].num); tqDebug("stopping %s [%d]", (const char*)m_ti[i].name, m_ti[i].num);
if (!voidRetIntBoolDCOPCall("KTorrent", "stop(int, bool)", m_ti[i].num, true)) if (!voidRetIntBoolDCOPCall("KTorrent", "stop(int, bool)", m_ti[i].num, true))
ERROR_RET_BOOL ERROR_RET_BOOL
@ -216,7 +216,7 @@ bool KviKTorrentDCOPInterface::announce(int i)
{ {
CHECK_RANGE_BOOL(i, m_ti.size()) CHECK_RANGE_BOOL(i, m_ti.size())
debug("announcing %s [%d]", (const char*)m_ti[i].name, m_ti[i].num); tqDebug("announcing %s [%d]", (const char*)m_ti[i].name, m_ti[i].num);
if (!voidRetIntDCOPCall("KTorrent", "announce(int)", m_ti[i].num)) if (!voidRetIntDCOPCall("KTorrent", "announce(int)", m_ti[i].num))
ERROR_RET_BOOL ERROR_RET_BOOL
return true; return true;
@ -270,7 +270,7 @@ TQString KviKTorrentDCOPInterface::filePriority(int i, int file)
CHECK_RANGE_STRING(file, ret.size()) CHECK_RANGE_STRING(file, ret.size())
debug("prio: %d", ret[file]); tqDebug("prio: %d", ret[file]);
switch (ret[file]) switch (ret[file])
{ {
case 1: return "low"; case 1: return "low";

@ -21,7 +21,7 @@ KviTorrentStatusBarApplet::~KviTorrentStatusBarApplet()
static KviStatusBarApplet *CreateTorrentClientApplet(KviStatusBar *bar, KviStatusBarAppletDescriptor *desc) static KviStatusBarApplet *CreateTorrentClientApplet(KviStatusBar *bar, KviStatusBarAppletDescriptor *desc)
{ {
debug("CreateTorrentClientApplet"); tqDebug("CreateTorrentClientApplet");
return new KviTorrentStatusBarApplet(bar, desc); return new KviTorrentStatusBarApplet(bar, desc);
} }

Loading…
Cancel
Save