diff options
Diffstat (limited to 'src/kvirc/kernel')
-rw-r--r-- | src/kvirc/kernel/kvi_app.cpp | 18 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_app_fs.cpp | 16 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_filetransfer.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_iconmanager.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_ipc.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_ircconnection.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_irclink.cpp | 6 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_ircsocket.cpp | 16 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_main.cpp | 22 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_options.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_texticonmanager.cpp | 2 |
13 files changed, 52 insertions, 52 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index f2076bc..5148136 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -230,7 +230,7 @@ void KviApp::setup() getGlobalKvircDirectory(szPluginsDir,None,"qt-plugins/"); setLibraryPaths(TQStringList(szPluginsDir)); //KviMessageBox::information(libraryPaths().join(";")); - //debug("%1",loader.isLoaded()); + //tqDebug("%1",loader.isLoaded()); #endif #endif @@ -686,7 +686,7 @@ TQTextCodec * KviApp::defaultTextCodec() c = TQTextCodec::codecForLocale(); if(c)return c; 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; } @@ -715,14 +715,14 @@ void KviApp::contextSensitiveHelp() } // no way // 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 } 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); } @@ -951,7 +951,7 @@ void KviApp::setClipboardText(const TQString &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())); } @@ -1143,11 +1143,11 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co 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; g_pKdeDesktopBackground = 0; } //else { - // debug("Root pixmap downalod initiated"); + // tqDebug("Root pixmap downalod initiated"); //} } @@ -1303,7 +1303,7 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess) #ifdef COMPILE_TDE_SUPPORT if(!bSuccess) { - debug("Failed to download the KDE root background image..."); + tqDebug("Failed to download the KDE root background image..."); } else { // downloaded! // create shaded copies... @@ -1582,7 +1582,7 @@ void KviApp::autoConnectToServers() 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->createNewConsole(true); diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index ce2208d..a07715b 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -78,9 +78,9 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt break; case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break; case HelpNoIntl : szData.append("help"); break; - case Log : debug("WARNING Global log directory requested!"); break; - case Incoming : debug("WARNING Global incoming directory requested!"); break; - case Trash : debug("WARNING Global trash directory requested!"); break; + case Log : tqDebug("WARNING Global log directory requested!"); break; + case Incoming : tqDebug("WARNING Global incoming directory requested!"); break; + case Trash : tqDebug("WARNING Global trash directory requested!"); break; case Config : szData.append("config"); break; case Audio : szData.append("audio"); 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 Filters : szData.append("filters"); 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 Classes : szData.append("classes"); 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.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); - //debug("LOOK FOR %s",szRetPath.ptr()); + //tqDebug("LOOK FOR %s",szRetPath.ptr()); if(KviFileUtils::fileExists(szRetPath.ptr()))return true; } @@ -454,7 +454,7 @@ bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const char * filenam szRetPath = *it; KviTQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); - //debug("LOOK FOR %s",szRetPath.ptr()); + //tqDebug("LOOK FOR %s",szRetPath.ptr()); if(KviFileUtils::fileExists(szRetPath))return true; } @@ -513,7 +513,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) for(i=0;i<2;i++) { getGlobalKvircDirectory(szBuffer,pics_globalsubdirs[i],szRetPath); - //debug("CHECK %s",szBuffer.ptr()); + //tqDebug("CHECK %s",szBuffer.ptr()); if(KviFileUtils::fileExists(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.... 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)) { // No saved config yet... check for defaults diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index ccbbe81..3bdc6e8 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -792,7 +792,7 @@ void KviApp::setupFinish() { if(!g_hSetupLibrary) { - debug("Oops... lost the setup library ?"); + tqDebug("Oops... lost the setup library ?"); return; } diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp index d3d4114..64411fe 100644 --- a/src/kvirc/kernel/kvi_filetransfer.cpp +++ b/src/kvirc/kernel/kvi_filetransfer.cpp @@ -118,7 +118,7 @@ void KviFileTransferManager::unregisterTransfer(KviFileTransfer * t) { if(!m_pTransferList) { - debug("Ops: unregistering transfer with no transfer list!"); + tqDebug("Ops: unregistering transfer with no transfer list!"); return; } diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index db36287..db1e466 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -505,11 +505,11 @@ KviIconManager::KviIconManager() nnn += ".png"; if(tmp->isNull()) { - debug("OPS, %s is NULL",nnn.latin1()); + tqDebug("OPS, %s is NULL",nnn.latin1()); } if(!tmp->save(nnn,"PNG",90)) { - debug("FAILED TO SAVE %s",nnn.latin1()); + tqDebug("FAILED TO SAVE %s",nnn.latin1()); } } */ diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp index edb348f..9d674e3 100644 --- a/src/kvirc/kernel/kvi_ipc.cpp +++ b/src/kvirc/kernel/kvi_ipc.cpp @@ -144,7 +144,7 @@ cpd.dwData = KVI_WINDOWS_IPC_MESSAGE; cpd.lpData = (void *)message; DWORD dwResult; - debug(message); + tqDebug(message); ::SendMessageTimeout(hSentinel,WM_COPYDATA,(WPARAM)NULL,(LPARAM)&cpd,SMTO_BLOCK,1000,&dwResult); return true; } @@ -222,7 +222,7 @@ { if(cpd->dwData == KVI_WINDOWS_IPC_MESSAGE) { - debug((char *)(cpd->lpData)); + tqDebug((char *)(cpd->lpData)); if(g_pApp)g_pApp->ipcMessage((char *)(cpd->lpData)); return true; } diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 7f61e5d..ea100f0 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -186,7 +186,7 @@ void KviIrcConnection::setupTextCodec() if(!m_pTarget->server()->encoding().isEmpty()) { 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) { @@ -194,7 +194,7 @@ void KviIrcConnection::setupTextCodec() if(!m_pTarget->network()->encoding().isEmpty()) { 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) @@ -832,7 +832,7 @@ void KviIrcConnection::hostNameLookupTerminated(KviDns *pDns) // 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; } diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 7c8e12e..c25c45a 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -222,7 +222,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname() 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; m_pProxyDns = 0; } @@ -340,7 +340,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname() } else { 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; m_pServerDns = 0; } diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 132da95..d2eeebb 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -175,7 +175,7 @@ void KviIrcLink::resolverTerminated() { if(!m_pResolver) { - debug("Oops... resoverTerminated() triggered without a resolver ?"); + tqDebug("Oops... resoverTerminated() triggered without a resolver ?"); return; } @@ -312,7 +312,7 @@ void KviIrcLink::processData(char * buffer,int len) //The m_pReadBuffer contains at max 1 irc message... //that can not be longer than 510 bytes (the message is not CRLF terminated) // 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); } @@ -359,7 +359,7 @@ void KviIrcLink::socketStateChange() m_pConnection->linkTerminated(); break; 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; } } diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index cf312b2..ee35b1a 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -442,7 +442,7 @@ void KviIrcSocket::connectionEstabilished() 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 ? // it would be just a matter of SSL handshaking @@ -647,7 +647,7 @@ void KviIrcSocket::proxyLoginHttp() } else { tmp.append("\r\n"); } -// debug(tmp.ptr()); +// tqDebug(tmp.ptr()); sendRawData(tmp.ptr(),tmp.len()); } @@ -702,7 +702,7 @@ void KviIrcSocket::proxyLoginV4() struct in_addr 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; kvi_memmove((void *)(bufToSend+4),(void *)&host,4); @@ -914,7 +914,7 @@ void KviIrcSocket::proxySendTargetDataV5() #ifdef COMPILE_IPV6_SUPPORT 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); TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); kvi_memmove((void *)(bufToSend + 20),(void *)&port,2); @@ -922,7 +922,7 @@ void KviIrcSocket::proxySendTargetDataV5() } else { 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; kvi_memmove((void *)(bufToSend + 4),(void *)&host,4); TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); @@ -1254,7 +1254,7 @@ void KviIrcSocket::doSSLHandshake(int) if(!m_pSSL) { - debug("Ops... I've lost the SSL class ?"); + tqDebug("Ops... I've lost the SSL class ?"); reset(); return; // ops ? } @@ -1311,7 +1311,7 @@ void KviIrcSocket::doSSLHandshake(int) } #else //!COMPILE_SSL_SUPPORT - debug("Ops.. ssl handshake without ssl support!...aborting!"); + tqDebug("Ops.. ssl handshake without ssl support!...aborting!"); exit(-1); #endif //!COMPILE_SSL_SUPPORT } @@ -1541,7 +1541,7 @@ void KviIrcSocket::processData(char * buffer,int) //The m_pReadBuffer contains at max 1 irc message... //that can not be longer than 510 bytes (the message is not CRLF terminated) // 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); diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index 60c884f..aade9ad 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -36,7 +36,7 @@ extern bool kvi_sendIpcMessage(const char * message); // kvi_ipc.cpp #endif -#include <tqglobal.h> //for debug() +#include <tqglobal.h> //for tqDebug() #include <tqmessagebox.h> @@ -83,7 +83,7 @@ int parseArgs(ParseArgs * a) #ifdef COMPILE_ON_WINDOWS MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0); #else - debug("%s", szMessage.ascii()); + tqDebug("%s", szMessage.ascii()); #endif return KVI_ARGS_RETCODE_STOP; @@ -131,7 +131,7 @@ int parseArgs(ParseArgs * a) #ifdef COMPILE_ON_WINDOWS MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0); #else - debug("%s", szMessage.ascii()); + tqDebug("%s", szMessage.ascii()); #endif return KVI_ARGS_RETCODE_STOP; } @@ -141,12 +141,12 @@ int parseArgs(ParseArgs * a) idx++; 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; } p = a->argv[idx]; a->configFile = p; - debug("Using file %s as config",p); + tqDebug("Using file %s as config",p); continue; } @@ -155,7 +155,7 @@ int parseArgs(ParseArgs * a) idx++; if(idx >= a->argc) { - debug("Option -e requires a command"); + tqDebug("Option -e requires a command"); return KVI_ARGS_RETCODE_ERROR; } p = a->argv[idx]; @@ -169,7 +169,7 @@ int parseArgs(ParseArgs * a) idx++; if(idx >= a->argc) { - debug("Option -x requires a command"); + tqDebug("Option -x requires a command"); return KVI_ARGS_RETCODE_ERROR; } p = a->argv[idx]; @@ -184,7 +184,7 @@ int parseArgs(ParseArgs * a) idx++; if(idx >= a->argc) { - debug("Option -r requires a command"); + tqDebug("Option -r requires a command"); return KVI_ARGS_RETCODE_ERROR; } p = a->argv[idx]; @@ -204,13 +204,13 @@ int parseArgs(ParseArgs * a) idx++; 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; } p = a->argv[idx]; a->configFile = p; a->createFile=true; - debug("Using file %s as config",p); + tqDebug("Using file %s as config",p); continue; } @@ -385,7 +385,7 @@ int main(int argc,char ** argv) if(a.bShowPopup) TQMessageBox::information(0,"Session - KVIrc",tmp.ptr(),TQMessageBox::Ok); else - debug("%s", tmp.ptr()); + tqDebug("%s", tmp.ptr()); } delete theApp; return 0; diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 6789f7e..69a0fb3 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -1019,7 +1019,7 @@ namespace KviTheme cfg.writeEntry(g_pixmapOptionsTable[i].name,szPixName); } else { // 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,""); } } else { diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp index d741bfd..2caa040 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.cpp +++ b/src/kvirc/kernel/kvi_texticonmanager.cpp @@ -193,7 +193,7 @@ int KviTextIconManager::load(const TQString &filename,bool bMerge) int id = cfg.readIntEntry(*s,-1); TQString szTmp; TQPixmap * pix=0; -// debug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,id); +// tqDebug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,id); if(id!=-1) pix = g_pIconManager->getSmallIcon(id); else { |