From 7cc4356bc2eceb5a66c2263bff44aa472d2ca290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 29 Oct 2018 18:21:41 +0100 Subject: Fix build with a clean TQt namespace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- src/modules/action/libkviaction.cpp | 2 +- src/modules/actioneditor/actioneditor.cpp | 4 ++-- src/modules/aliaseditor/aliaseditor.cpp | 6 ++--- src/modules/codetester/codetester.cpp | 4 ++-- src/modules/dcc/broker.cpp | 10 ++++----- src/modules/dcc/canvaswidget.cpp | 4 ++-- src/modules/dcc/chat.cpp | 6 ++--- src/modules/dcc/descriptor.cpp | 2 +- src/modules/dcc/marshal.cpp | 20 ++++++++--------- src/modules/dcc/send.cpp | 6 ++--- src/modules/dcc/thread.cpp | 2 +- src/modules/dcc/voice.cpp | 26 +++++++++++----------- src/modules/dockwidget/libkvidockwidget_qt3.cpp | 2 +- src/modules/dockwidget/libkvidockwidget_qt4.cpp | 2 +- src/modules/editor/libkvieditor.cpp | 6 ++--- src/modules/editor/scripteditor.cpp | 18 +++++++-------- src/modules/eventeditor/eventeditor.cpp | 4 ++-- src/modules/help/index.cpp | 2 +- src/modules/help/libkvihelp.cpp | 2 +- src/modules/http/httpfiletransfer.cpp | 2 +- src/modules/ident/libkviident.cpp | 22 +++++++++---------- src/modules/iograph/libkviiograph.cpp | 2 +- src/modules/list/listwindow.cpp | 2 +- src/modules/logview/logviewmdiwindow.cpp | 4 ++-- src/modules/notifier/notifierwindow.cpp | 22 +++++++++---------- src/modules/notifier/notifierwindowborder.h | 2 +- src/modules/objects/class_pixmap.cpp | 2 +- src/modules/objects/class_socket.cpp | 28 ++++++++++++------------ src/modules/objects/class_wrapper.cpp | 8 +++---- src/modules/objects/class_xmlreader.cpp | 2 +- src/modules/objects/libkviobjects.cpp | 16 +++++++------- src/modules/options/dialog.cpp | 2 +- src/modules/options/instances.cpp | 8 +++---- src/modules/options/mkcreateinstanceproc.sh | 8 +++---- src/modules/options/optw_messages.cpp | 14 ++++++------ src/modules/options/optw_texticons.cpp | 2 +- src/modules/popupeditor/popupeditor.cpp | 4 ++-- src/modules/raweditor/raweditor.cpp | 4 ++-- src/modules/reguser/dialog.cpp | 4 ++-- src/modules/reguser/edituser.cpp | 2 +- src/modules/reguser/wizard.cpp | 2 +- src/modules/rijndael/libkvirijndael.cpp | 2 +- src/modules/snd/libkvisnd.cpp | 28 ++++++++++++------------ src/modules/term/libkviterm.cpp | 4 ++-- src/modules/term/termwidget.cpp | 12 +++++----- src/modules/tip/libkvitip.cpp | 2 +- src/modules/torrent/libkvitorrent.cpp | 2 +- src/modules/torrent/tc_ktorrentdcopinterface.cpp | 12 +++++----- src/modules/torrent/tc_statusbarapplet.cpp | 2 +- 49 files changed, 177 insertions(+), 177 deletions(-) (limited to 'src/modules') diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index 9404b8bc..da7487bc 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -433,7 +433,7 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c) int iOldFlags = iFlags; iFlags = KviAction::validateFlags(iFlags); 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(), szName,szCmd,szVisibleText, diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index c0c24323..b35959d9 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -416,7 +416,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d) unsigned int uOldFlags = d->m_uFlags; d->m_uFlags = KviAction::validateFlags(d->m_uFlags); 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->setEnabled(true); @@ -608,7 +608,7 @@ void KviSingleActionEditor::commit() unsigned int uOldFlags = m_pActionData->m_uFlags; m_pActionData->m_uFlags = KviAction::validateFlags(m_pActionData->m_uFlags); 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); } diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index ce95e2c3..92b872a9 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -580,7 +580,7 @@ void KviAliasEditor::exportSelected() void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList *l) { 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()) { g_pAliasEditorModule->lock(); @@ -596,7 +596,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerListisAlias()) { TQString szName = buildFullItemName(it); - //debug("ADDING %s",szName.latin1()); + //tqDebug("ADDING %s",szName.latin1()); // WARNING: On MSVC operator new here is valid ONLY because // KviKvsScript has a non virtual detructor! KviKvsScript * a = new KviKvsScript(szName,((KviAliasListViewItem *)it)->buffer()); diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index a4728959..3cc9d851 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -136,7 +136,7 @@ void KviCodeTesterWindow::saveProperties(KviConfig *cfg) #ifdef COMPILE_SCRIPTTOOLBAR cfg->writeEntry("Sizes",m_pEditor->sizes()); 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 */ } @@ -151,7 +151,7 @@ void KviCodeTesterWindow::loadProperties(KviConfig *cfg) m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); KviStr tmp = cfg->readEntry("LastRaw",""); m_pEditor->editRaw(tmp); - //debug("LAST EDITED WAS %s",tmp.ptr()); + //tqDebug("LAST EDITED WAS %s",tmp.ptr()); #endif // COMPILE_SCRIPTTOOLBAR */ } diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 976b6383..cfbc01ba 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -120,7 +120,7 @@ void KviDccBroker::unregisterDccWindow(KviWindow *wnd) void KviDccBroker::unregisterDccBox(KviDccBox * box) { - //debug("Forgetting box %d",box); + //tqDebug("Forgetting box %d",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) { - //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 if(kvi_strEqualCI("0",port) && szZeroPortTag) { @@ -862,11 +862,11 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename KviDccZeroPortTag * t = findZeroPortTag(TQString(szZeroPortTag)); if(t) { - //debug("FOUND"); + //tqDebug("FOUND"); // valid zero port resume request if(filePos < t->m_uFileSize) { - //debug("VALID"); + //tqDebug("VALID"); // ok! 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); } diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 06f5d2f8..8eadbaf9 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -823,7 +823,7 @@ void KviCanvasView::beginDragPolygon(KviCanvasPolygon * it,const TQPoint &p,bool { m_dragMode = Rotate; m_dragPointArray = it->internalPoints(); -// debug("Here"); +// tqDebug("Here"); setCursor(sizeHorCursor); 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())); 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(); for(unsigned int i=0;i * e = new KviThreadDataEvent(KVI_DCC_THREAD_EVENT_DATA); // The left part is len chars long 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)" KviStr * s = new KviStr(data->buffer,len); if(s->lastCharIs('\r'))s->cutRight(1); @@ -698,7 +698,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b ++aux; // so len += 1; --> new data->iLen -= len; data->iLen -= (len + 1); -// debug("iLen now = %d",data->iLen); +// tqDebug("iLen now = %d",data->iLen); __range_valid(data->iLen >= 0); if(data->iLen > 0) { @@ -716,7 +716,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b } postEvent(parent(),e); } else aux++; -// debug("PASSING CHAR %c",*aux); +// tqDebug("PASSING CHAR %c",*aux); } // now aux == end if(bCritical) diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp index b21b0561..62814529 100644 --- a/src/modules/dcc/descriptor.cpp +++ b/src/modules/dcc/descriptor.cpp @@ -135,7 +135,7 @@ void KviDccDescriptor::triggerCreationEvent() { if(m_bCreationEventTriggered) { - debug("Ops.. trying to trigger OnDccSessionCreated twice"); + tqDebug("Ops.. trying to trigger OnDccSessionCreated twice"); return; } m_bCreationEventTriggered = true; diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 6d69dccf..0a386eec 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -88,10 +88,10 @@ void KviDccMarshal::reset() m_fd = KVI_INVALID_SOCKET; } #ifdef COMPILE_SSL_SUPPORT -// debug("MARSHAL RESETTING (SSL=%d)",m_pSSL); +// tqDebug("MARSHAL RESETTING (SSL=%d)",m_pSSL); if(m_pSSL) { -// debug("MARSHAL CLEARING THE SSL"); +// tqDebug("MARSHAL CLEARING THE SSL"); KviSSLMaster::freeSSL(m_pSSL); m_pSSL = 0; } @@ -267,12 +267,12 @@ void KviDccMarshal::doListen() if(kvi_socket_getsockname(m_fd,sareal.socketAddress(),&size)) { -// debug("GETSOCKNAMEOK"); +// tqDebug("GETSOCKNAMEOK"); m_szPort.setNum(sareal.port()); m_uPort = sareal.port(); -// debug("REALPORT %u",m_uPort); +// tqDebug("REALPORT %u",m_uPort); } else { -// debug("GETSOCKNAMEFAILED"); +// tqDebug("GETSOCKNAMEFAILED"); } // and setup the READ notifier... @@ -560,7 +560,7 @@ void KviDccMarshal::snActivated(int) void KviDccMarshal::doSSLHandshake(int) { #ifdef COMPILE_SSL_SUPPORT -// debug("DO SSL HANDSHAKE"); +// tqDebug("DO SSL HANDSHAKE"); if(m_pSn) { delete m_pSn; @@ -569,7 +569,7 @@ void KviDccMarshal::doSSLHandshake(int) if(!m_pSSL) { - debug("Ops... I've lost the SSL class ?"); + tqDebug("Ops... I've lost the SSL class ?"); reset(); emit error(KviError_internalError); return; // ops ? @@ -581,9 +581,9 @@ void KviDccMarshal::doSSLHandshake(int) { case KviSSL::Success: // done! -// debug("EMITTING CONNECTED"); +// tqDebug("EMITTING CONNECTED"); emit connected(); -// debug("CONNECTED EMITTED"); +// tqDebug("CONNECTED EMITTED"); break; case KviSSL::WantRead: m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Read); @@ -627,7 +627,7 @@ void KviDccMarshal::doSSLHandshake(int) break; } #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 } diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 74dbf161..385bd695 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -377,7 +377,7 @@ void KviDccRecvThread::run() // include the artificial delay if needed if(m_pOpt->iIdleStepLengthInMSec > 0) { - debug("LOOP: artificial delay"); + tqDebug("LOOP: artificial delay"); msleep(m_pOpt->iIdleStepLengthInMSec); } } else { @@ -1665,12 +1665,12 @@ bool KviDccFileTransfer::event(TQEvent *e) } break; default: - debug("Invalid event type %d received",((KviThreadEvent *)e)->id()); + tqDebug("Invalid event type %d received",((KviThreadEvent *)e)->id()); break; } } //#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); } diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp index d985f473..6a3b2415 100644 --- a/src/modules/dcc/thread.cpp +++ b/src/modules/dcc/thread.cpp @@ -40,7 +40,7 @@ KviDccThread::KviDccThread(TQObject * par,kvi_socket_t fd) m_fd = fd; m_pMutex = new KviMutex(); #ifdef COMPILE_SSL_SUPPORT -// debug("CLEARING SSL IN KviDccThread constructor"); +// tqDebug("CLEARING SSL IN KviDccThread constructor"); m_pSSL = 0; #endif } diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index deec4452..54fd433a 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -376,7 +376,7 @@ bool KviDccVoiceThread::soundStep() 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.fragments = 1; info.fragsize = KVI_FRAGMENT_SIZE_IN_BYTES; @@ -384,7 +384,7 @@ bool KviDccVoiceThread::soundStep() if(info.fragments > 0) { 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(); int written = write(m_soundFd,m_inSignalBuffer.data(),toWrite); if(written > 0)m_inSignalBuffer.remove(written); @@ -467,12 +467,12 @@ bool KviDccVoiceThread::soundStep() audio_buf_info info; if(ioctl(m_soundFd,SNDCTL_DSP_GETISPACE,&info) < 0) { - debug("Ispace failed"); + tqDebug("Ispace failed"); info.fragments = 0; // dummy... 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) { @@ -502,14 +502,14 @@ bool KviDccVoiceThread::soundStep() } } /* - debug("Signal buffer:"); + tqDebug("Signal buffer:"); for(int i=0;i<200;i+=2) { if(i >= m_outSignalBuffer.size())break; printf("%04x ",*(((unsigned short *)(m_outSignalBuffer.data() + i)))); if((i % 6) == 0)printf("\n"); } - debug("END\n"); + tqDebug("END\n"); */ m_pOpt->pCodec->encode(&m_outSignalBuffer,&m_outFrameBuffer); } @@ -526,11 +526,11 @@ bool KviDccVoiceThread::soundStep() void KviDccVoiceThread::startRecording() { #ifndef COMPILE_DISABLE_DCC_VOICE - //debug("Start recording"); + //tqDebug("Start recording"); if(m_bRecording)return; // already started if(openSoundcardForReading()) { -// debug("Posting event"); +// tqDebug("Posting event"); KviThreadDataEvent * e = new KviThreadDataEvent(KVI_DCC_THREAD_EVENT_ACTION); e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING)); postEvent(parent(),e); @@ -546,7 +546,7 @@ void KviDccVoiceThread::startRecording() void KviDccVoiceThread::stopRecording() { #ifndef COMPILE_DISABLE_DCC_VOICE - //debug("Stop recording"); + //tqDebug("Stop recording"); m_bRecordingRequestPending = false; if(!m_bRecording)return; // already stopped @@ -562,7 +562,7 @@ void KviDccVoiceThread::stopRecording() void KviDccVoiceThread::startPlaying() { #ifndef COMPILE_DISABLE_DCC_VOICE - //debug("Start playing"); + //tqDebug("Start playing"); if(m_bPlaying)return; if(openSoundcardForWriting()) @@ -578,7 +578,7 @@ void KviDccVoiceThread::startPlaying() void KviDccVoiceThread::stopPlaying() { #ifndef COMPILE_DISABLE_DCC_VOICE - //debug("Stop playing"); + //tqDebug("Stop playing"); if(!m_bPlaying)return; KviThreadDataEvent * e = new KviThreadDataEvent(KVI_DCC_THREAD_EVENT_ACTION); @@ -860,7 +860,7 @@ bool KviDccVoice::event(TQEvent *e) } break; default: - debug("Invalid event type %d received",((KviThreadEvent *)e)->id()); + tqDebug("Invalid event type %d received",((KviThreadEvent *)e)->id()); 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 */ void KviDccVoice::focusInEvent(TQFocusEvent *e) { -// debug("focusInEvent()"); +// tqDebug("focusInEvent()"); m_pVolumeSlider->setValue(getMixerVolume()); setMixerVolume(m_pVolumeSlider->value()); diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 7a160fce..08bae43f 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -372,7 +372,7 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt) //int KviDockWidget::message(int,void *) //{ -// debug("Message"); +// tqDebug("Message"); // update(); // return 0; //} diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp index d9b6ab9c..a860d479 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp @@ -203,7 +203,7 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt) //int KviDockWidget::message(int,void *) //{ -// debug("Message"); +// tqDebug("Message"); // update(); // return 0; //} diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp index 8d087476..e265a8ff 100644 --- a/src/modules/editor/libkvieditor.cpp +++ b/src/modules/editor/libkvieditor.cpp @@ -46,12 +46,12 @@ static bool editor_module_cleanup(KviModule *m) TQObject * w = g_pScriptEditorWindowList->first()->parent();; 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")) { - // debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); + // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); ((KviWindow *)w)->close(); - // debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); + // tqDebug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); break; } w = w->parent(); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 9d704ec7..5e6e3c65 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -119,7 +119,7 @@ void KviCompletionBox::updateContents(TQString buffer) if(szModule.isEmpty()) KviKvsKernel::instance()->completeFunction(buffer,&list); else - debug("we need a module completion!"); + tqDebug("we need a module completion!"); for ( TQString* szCurrent = list.first(); szCurrent; szCurrent = list.next() ) { szCurrent->prepend('$'); @@ -133,19 +133,19 @@ void KviCompletionBox::updateContents(TQString buffer) if(szModule.isEmpty()) KviKvsKernel::instance()->completeCommand(buffer,&list); else - debug("we need a module completion!"); + tqDebug("we need a module completion!"); for ( TQString* szCurrent = list.first(); szCurrent; szCurrent = list.next() ) { szCurrent->append(' '); 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) { -// debug("%s %s %i %x",__FILE__,__FUNCTION__,__LINE__,e->key()); +// tqDebug("%s %s %i %x",__FILE__,__FUNCTION__,__LINE__,e->key()); switch(e->key()) { case TQt::Key_Escape: @@ -384,7 +384,7 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e) insertAt(szCur,para,0); setCursorPosition(para,szCur.length()+pos); } -// debug("|%i|",pos); +// tqDebug("|%i|",pos); } return; default: @@ -423,7 +423,7 @@ void KviScriptEditorWidget::contentsMousePressEvent(TQMouseEvent *e) if (l.count() != 1) buffer=""; else buffer=*(l.at(0)); } - //debug (buffer); + //tqDebug (buffer); m_szHelp=buffer; } KviTalTextEdit::contentsMousePressEvent(e); @@ -468,7 +468,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const TQString parse; 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()); return true; @@ -478,7 +478,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const { 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 end = buffer.find(re,index); @@ -491,7 +491,7 @@ void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const tmp = buffer.mid(start,end-start); } buffer = tmp; - //debug("BUFFER NOW IS %s",buffer.utf8().data()); + //tqDebug("BUFFER NOW IS %s",buffer.utf8().data()); } void KviScriptEditorWidget::completition(bool bCanComplete) diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index 8c13eac4..ec9511b5 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -515,7 +515,7 @@ void KviEventEditorWindow::saveProperties(KviConfig *cfg) #ifdef COMPILE_SCRIPTTOOLBAR cfg->writeEntry("Sizes",m_pEditor->sizes()); 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 */ } @@ -530,7 +530,7 @@ void KviEventEditorWindow::loadProperties(KviConfig *cfg) m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); KviStr tmp = cfg->readEntry("LastEvent",""); m_pEditor->editEvent(tmp); - //debug("LAST EDITED WAS %s",tmp.ptr()); + //tqDebug("LAST EDITED WAS %s",tmp.ptr()); #endif // COMPILE_SCRIPTTOOLBAR */ } diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index b72989c1..f63ca0a2 100644 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -310,7 +310,7 @@ void Index::readDocumentList() return; TQTextStream s1( &f1 ); titleList = TQStringList::split("[#item#]",s1.read()); -// debug(titleList); +// tqDebug(titleList); } diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index 9fcb36ec..e6d4e821 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -176,7 +176,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) c->window()->frame(),true); w->textBrowser()->setSource(doc); w->show(); - //debug ("mostro"); + //tqDebug ("mostro"); } return true; } diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 8ad7c8f9..48a8ee37 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -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); 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; if(!bIsTerminated && (uTotal >= uRecvd)) { diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 3c260678..d9d3a9bf 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -47,7 +47,7 @@ extern KVIRC_API int g_iIdentDaemonRunningUsers; void startIdentService() { -// debug("Stargin"); +// tqDebug("Stargin"); if(!g_pIdentDaemon)g_pIdentDaemon = new KviIdentDaemon(); if(!g_pIdentDaemon->isRunning())g_pIdentDaemon->start(); while(g_pIdentDaemon->isStartingUp()) @@ -58,15 +58,15 @@ void startIdentService() usleep(100); #endif } -// debug("Service started"); +// tqDebug("Service started"); } void stopIdentService() { -// debug("Stopping"); +// tqDebug("Stopping"); if(g_pIdentDaemon)delete g_pIdentDaemon; g_pIdentDaemon = 0; -// debug("Stopped"); +// tqDebug("Stopped"); } KviIdentSentinel::KviIdentSentinel() @@ -149,7 +149,7 @@ KviIdentRequest::~KviIdentRequest() KviIdentDaemon::KviIdentDaemon() : KviSensitiveThread() { -// debug("Thread constructor"); +// tqDebug("Thread constructor"); m_szUser = KVI_OPTION_STRING(KviOption_stringIdentdUser); if(m_szUser.isEmpty())m_szUser = "kvirc"; m_uPort = KVI_OPTION_UINT(KviOption_uintIdentdPort); @@ -159,17 +159,17 @@ KviIdentDaemon::KviIdentDaemon() m_bEnableIpV6 = false; #endif m_bIpV6ContainsIpV4 = KVI_OPTION_BOOL(KviOption_boolIdentdIpV6ContainsIpV4); -// debug("Thread constructor done"); +// tqDebug("Thread constructor done"); } KviIdentDaemon::~KviIdentDaemon() { -// debug("Thread destructor"); +// tqDebug("Thread destructor"); terminate(); g_iIdentDaemonRunningUsers = 0; g_pIdentDaemon = 0; -// debug("Destructor gone"); +// tqDebug("Destructor gone"); } 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() { -// debug("RUN STARTED"); +// tqDebug("RUN STARTED"); m_sock = KVI_INVALID_SOCKET; m_sock6 = KVI_INVALID_SOCKET; bool bEventPosted = false; @@ -479,7 +479,7 @@ ipv6_failure: } } else { - // debug("Data is : (%s)",r->m_szData.ptr()); + // tqDebug("Data is : (%s)",r->m_szData.ptr()); if(r->m_szData.len() > 1024) { // request too long...kill it @@ -527,7 +527,7 @@ exit_thread: delete m_pRequestList; m_pRequestList = 0; -// debug("RUN EXITING"); +// tqDebug("RUN EXITING"); } diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 745937fc..1b5b04a5 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -83,7 +83,7 @@ void KviIOGraphDisplay::timerEvent(TQTimerEvent *e) unsigned int rB = console()->socket()->readBytes(); int sDiff = (sB - m_uLastSentBytes) / 8; 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; else if(sDiff > 30)sDiff = 30; if(rDiff < 0)rDiff = 0; diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index c5ed5eac..ec6663a1 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -92,7 +92,7 @@ int KviChannelListViewItem::width ( const TQFontMetrics & fm, const KviTalListVi int KviChannelListViewItem::width ( const TQFontMetrics & fm, const TQListView * lv, int column ) const #endif { - debug("width request"); + tqDebug("width request"); TQString szText; switch(column) diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index a3fac9fb..2e045d84 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -429,7 +429,7 @@ KviLogFile::KviLogFile(const TQString& name) int iDay = szDate.section('.',2,2).toInt(); 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){ @@ -456,7 +456,7 @@ void KviLogFile::getText(TQString & text,const TQString& logDir){ gzclose(file); text = TQString::fromUtf8(data); } else { - debug("Cannot open compressed file %s",logName.local8Bit().data()); + tqDebug("Cannot open compressed file %s",logName.local8Bit().data()); } } else { #endif diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 06bfbd23..290daaef 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -171,8 +171,8 @@ KviNotifierWindow::KviNotifierWindow() TQDesktopWidget * w = TQApplication::desktop(); TQRect r = w->availableGeometry(w->primaryScreen()); //w->screenGeometry(w->primaryScreen()); - /*debug("r.x(),r.y(): %d,%d",r.x(),r.y()); - debug("r.width(),r.height(): %d,%d",r.width(),r.height());*/ + /*tqDebug("r.x(),r.y(): %d,%d",r.x(),r.y()); + 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 ); @@ -451,7 +451,7 @@ void KviNotifierWindow::heartbeat() targetOpacity/=100; bIncreasing = targetOpacity>m_dOpacity; 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) ) || (!bIncreasing && (m_dOpacity <= targetOpacity) ) ) @@ -519,13 +519,13 @@ void KviNotifierWindow::doHide(bool bDoAnimate) 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 window has been moved and the animation would suck anyway // just hide quickly hideNow(); } 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(); connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); m_dOpacity = 1.0 - OPACITY_STEP; @@ -779,7 +779,7 @@ void KviNotifierWindow::redrawText() 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) { @@ -874,9 +874,9 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e) } 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())) { - //debug ("\tClicked on m_pWndBorder->closeRect()"); + //tqDebug ("\tClicked on m_pWndBorder->closeRect()"); m_bCloseDown = true; m_pWndBorder->setCloseIcon(WDG_ICON_CLICKED); 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_pWndTabs->currentTab()) { - //debug ("Clicked on m_pWndBody->textRect()"); + //tqDebug ("Clicked on m_pWndBody->textRect()"); if(m_pWndBody->rctWriteIcon().contains(e->pos())) { 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->closeRect().contains(e->pos())) { - //debug ("hide now from release event"); + //tqDebug ("hide now from release event"); hideNow(); } else { update(); diff --git a/src/modules/notifier/notifierwindowborder.h b/src/modules/notifier/notifierwindowborder.h index 9bbd68fd..5483996e 100644 --- a/src/modules/notifier/notifierwindowborder.h +++ b/src/modules/notifier/notifierwindowborder.h @@ -117,7 +117,7 @@ public: void setHeight(int h); void resize(int w, int h) { setWidth(w); setHeight(h); }; 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 setPoint(int x, int y) { m_pnt.setX(x); m_pnt.setY(y); m_rct.setX(x); m_rct.setY(y); }; diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 30018f8a..47523e63 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -306,7 +306,7 @@ TQImage * KviKvsObject_pixmap::getImage() { if (bPixmapModified) { *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; } diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 5b52ad4c..841a1f0f 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -583,7 +583,7 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("remote_ip",KVS_PT_STRING,0,m_szRemoteIp) KVSO_PARAMETER("remote_port",KVS_PT_UNSIGNEDINTEGER,0,m_uRemotePort) KVSO_PARAMETERS_END(c) - debug ("Function connect"); + tqDebug ("Function connect"); if (m_uRemotePort>65535) @@ -605,13 +605,13 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) if(kvi_isValidStringIp(m_szRemoteIp)) #endif { - debug ("ok connecting"); - debug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); - debug ("non so ip"); + tqDebug ("ok connecting"); + tqDebug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); + tqDebug ("non so ip"); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; delayedConnect(); } 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; delayedLookupRemoteIp(); } @@ -863,7 +863,7 @@ void KviKvsObject_socket::delayedConnect() void KviKvsObject_socket::doConnect() { - debug ("doConnect function"); + tqDebug ("doConnect function"); if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = 0; @@ -888,7 +888,7 @@ void KviKvsObject_socket::doConnect() // else it has already been called! return; } -debug ("Socket created"); +tqDebug ("Socket created"); // create the socket #ifdef COMPILE_IPV6_SUPPORT @@ -908,7 +908,7 @@ debug ("Socket created"); // else it has already been called! return; } - debug ("Valid socket"); + tqDebug ("Valid socket"); if(!kvi_socket_setNonBlocking(m_sock)) { @@ -949,7 +949,7 @@ debug ("Socket created"); return; } } - debug ("Socket connected"); + tqDebug ("Socket connected"); m_pDelayTimer = new TQTimer(); connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectTimeout())); m_pDelayTimer->start(m_uConnectTimeout,true); @@ -979,7 +979,7 @@ void KviKvsObject_socket::delayedLookupRemoteIp() void KviKvsObject_socket::lookupRemoteIp() { - debug ("Resolve dns"); + tqDebug ("Resolve dns"); if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = 0; if(m_pDns)delete m_pDns; @@ -1011,7 +1011,7 @@ void KviKvsObject_socket::lookupDone(KviDns *pDns) return; } m_szRemoteIp = pDns->firstIpAddress(); - debug ("Dns resolved in %s",m_szRemoteIp.latin1()); + tqDebug ("Dns resolved in %s",m_szRemoteIp.latin1()); delete m_pDns; m_pDns = 0; @@ -1020,7 +1020,7 @@ void KviKvsObject_socket::lookupDone(KviDns *pDns) void KviKvsObject_socket::writeNotifierFired(int) { - debug ("Here in the writeNotifierFired"); + tqDebug ("Here in the writeNotifierFired"); if(m_pSn) { delete m_pSn; @@ -1039,7 +1039,7 @@ void KviKvsObject_socket::writeNotifierFired(int) //sockError = 0; if(sockError != 0) { - //debug("Failed here %d",sockError); + //tqDebug("Failed here %d",sockError); //failed if(sockError > 0)sockError = KviError::translateSystemError(sockError); else sockError = KviError_unknownError; //Error 0 ? @@ -1077,7 +1077,7 @@ void KviKvsObject_socket::writeNotifierFired(int) void KviKvsObject_socket::readNotifierFired(int) { - debug ("here in the readNotifierFired"); + tqDebug ("here in the readNotifierFired"); //read data if((m_uInBufferLen - m_uInDataLen) < KVI_READ_CHUNK) { diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 38901ed1..57a2ef59 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -121,7 +121,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis { if( !pParams ) return false; - debug ("ci sono i parametri"); + tqDebug ("ci sono i parametri"); TQWidget *pWidget = 0; int i=0; while(i!=pParams->count()) @@ -140,9 +140,9 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis szClass = s; szName = ""; } - debug ("szClass %s",szClass.latin1()); - debug ("szName %s",szName.latin1()); - debug ("s %s",s.latin1()); + tqDebug ("szClass %s",szClass.latin1()); + tqDebug ("szName %s",szName.latin1()); + tqDebug ("s %s",s.latin1()); if(KviTQString::equalCI(szClass,"WinId")) { diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index 243a0b79..dfeea0c5 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -325,7 +325,7 @@ bool KviKvsObject_xmlreader::function_parse(KviKvsObjectFunctionCall *c) TQByteArray data = utf8data; data.truncate(utf8data.length()); // don't include the null terminator in 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; reader.setContentHandler(&handler); reader.setErrorHandler(&handler); diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 2a4dc9de..7276dd5c 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -853,9 +853,9 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) KviKvsVariant v; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); - debug ("class %s",szClass.latin1()); - debug ("Obj %s",szObj.latin1()); + tqDebug ("string %s",szTemp.latin1()); + tqDebug ("class %s",szClass.latin1()); + tqDebug ("Obj %s",szObj.latin1()); idx++; @@ -892,9 +892,9 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) KviKvsVariant v; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); - debug ("class %s",szClass.latin1()); - debug ("Obj %s",szObj.latin1()); + tqDebug ("string %s",szTemp.latin1()); + tqDebug ("class %s",szClass.latin1()); + tqDebug ("Obj %s",szObj.latin1()); idx++; @@ -935,7 +935,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spac KviKvsVariant v; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); + tqDebug ("string %s",szTemp.latin1()); 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; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); + tqDebug ("string %s",szTemp.latin1()); idx++; dumpChildObjects(pWnd, it.current(), sp, bFlag, n, idx ); } diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 7eab5800..6a9912ae 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -308,7 +308,7 @@ void KviOptionsDialog::searchLineEditTextChanged(const TQString &) bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQStringList &lKeywords) { - //debug("recursive search:"); + //tqDebug("recursive search:"); if(!pItem)return false; if(!pItem->m_pOptionsWidget) diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index 7e1e8968..5a4eba38 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -650,7 +650,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager() : TQObject(0) { - //debug("Instantiating"); + //tqDebug("Instantiating"); // Create the global widget dict : case sensitive , do not copy keys m_pInstanceTree = new KviPointerList; m_pInstanceTree->setAutoDelete(true); @@ -3466,9 +3466,9 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerListpWidget->parent(); e->pWidget = 0; } 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); } delete l; @@ -3478,7 +3478,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList; m_pInstanceTree->setAutoDelete(true); @@ -314,9 +314,9 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerListpWidget->parent(); e->pWidget = 0; } 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); } delete l; @@ -326,7 +326,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerListcurrentItem(); if(curIt != -1) { - //debug("Setting fore %d",curIt); + //tqDebug("Setting fore %d",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); } curIt = m_pBackListBox->currentItem(); @@ -506,7 +506,7 @@ void KviMessageColorsOptionsWidget::saveLastItem() if(back)m_pLastItem->msgType()->setBack(back->m_iClrIdx); } m_pLastItem->msgType()->enableLogging(m_pEnableLogging->isChecked()); - //debug("Updating","options"); + //tqDebug("Updating","options"); curIt = m_pLevelListBox->currentItem(); if(curIt < 0 || curIt > 5)curIt = 1; m_pLastItem->msgType()->setLevel(curIt); @@ -515,7 +515,7 @@ void KviMessageColorsOptionsWidget::saveLastItem() void KviMessageColorsOptionsWidget::itemChanged(KviTalListViewItem * it) { - //debug("Item changed","options"); + //tqDebug("Item changed","options"); if(m_pLastItem)saveLastItem(); m_pLastItem = 0; // do NOT save in this routine @@ -632,9 +632,9 @@ void KviMessageColorsOptionsWidget::load() //KviStr szLocal; TQString szLocal; g_pApp->getLocalKvircDirectory(szLocal,KviApp::MsgColors,"presets"); - //debug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); - //debug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr())); - //debug("ERRNO (%d)",errno); + //tqDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); + //tqDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr())); + //tqDebug("ERRNO (%d)",errno); symlink(szGlobal,szLocal); // FIXME: Do it also on windows... #endif diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index bbd2290f..01a0290f 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -79,7 +79,7 @@ void KviTextIconEditor::chooseFromFile() if(g_pIconManager->getPixmap(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(); } } diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index 34026814..ab4d801a 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -1412,7 +1412,7 @@ void KviPopupEditorWindow::saveProperties(KviConfig *cfg) #ifdef COMPILE_SCRIPTTOOLBAR cfg->writeEntry("Sizes",m_pEditor->sizes()); 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 */ } @@ -1427,7 +1427,7 @@ void KviPopupEditorWindow::loadProperties(KviConfig *cfg) m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); KviStr tmp = cfg->readEntry("LastPopup",""); m_pEditor->editPopup(tmp); - //debug("LAST EDITED WAS %s",tmp.ptr()); + //tqDebug("LAST EDITED WAS %s",tmp.ptr()); #endif // COMPILE_SCRIPTTOOLBAR */ } diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index 49787263..98d0a042 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -542,7 +542,7 @@ void KviRawEditorWindow::saveProperties(KviConfig *cfg) #ifdef COMPILE_SCRIPTTOOLBAR cfg->writeEntry("Sizes",m_pEditor->sizes()); 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 */ } @@ -557,7 +557,7 @@ void KviRawEditorWindow::loadProperties(KviConfig *cfg) m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def)); KviStr tmp = cfg->readEntry("LastRaw",""); m_pEditor->editRaw(tmp); - //debug("LAST EDITED WAS %s",tmp.ptr()); + //tqDebug("LAST EDITED WAS %s",tmp.ptr()); #endif // COMPILE_SCRIPTTOOLBAR */ } diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 254c5fe3..199f87af 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -862,7 +862,7 @@ void KviRegisteredUsersDialog::importClicked() img = io.image(); #endif - if(img.isNull())debug("Ops.. readed a null image ?"); + if(img.isNull())tqDebug("Ops.. readed a null image ?"); KviStr fName = u->name(); kvi_encodeFileName(fName); @@ -878,7 +878,7 @@ void KviRegisteredUsersDialog::importClicked() if(!img.save(fPath.ptr(),"PNG")) { - debug("Can't save image %s",fPath.ptr()); + tqDebug("Can't save image %s",fPath.ptr()); } else { u->setProperty("avatar",fPath.ptr()); } diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 115cf4be..956b277e 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -597,7 +597,7 @@ void KviRegisteredUserEntryDialog::okClicked() { // ops... no way // FIXME: spit an error message ? - debug("Ops.. something wrong with the regusers db"); + tqDebug("Ops.. something wrong with the regusers db"); accept(); return; } diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index d93fcf61..32034358 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -321,7 +321,7 @@ void KviRegistrationWizard::accept() { // ops... no way // FIXME: spit an error message ? - debug("Ops.. something wrong with the regusers db"); + tqDebug("Ops.. something wrong with the regusers db"); //delete this; return; } diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index e9c70516..b39edcb7 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -659,7 +659,7 @@ { 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); } encoded.cutLeft(1); diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index fcd00a58..2449b5b0 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -369,8 +369,8 @@ void KviSoundThread::run() if(audiofd_c < 0) { - debug("Could not open audio devive /dev/dsp! [OSS]"); - debug("(the device is probably busy)"); + tqDebug("Could not open audio devive /dev/dsp! [OSS]"); + tqDebug("(the device is probably busy)"); goto exit_thread; } @@ -379,20 +379,20 @@ void KviSoundThread::run() 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; } 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; } freq = (int) afGetRate(file, AF_DEFAULT_TRACK); 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; } @@ -434,7 +434,7 @@ void KviSoundThread::run() 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; } @@ -442,13 +442,13 @@ void KviSoundThread::run() 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; } 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; } @@ -457,8 +457,8 @@ void KviSoundThread::run() fd = open("/dev/audio", O_WRONLY | O_EXCL | O_NDELAY); if(fd < 0) { - debug("Could not open device file /dev/audio!"); - debug("Maybe other program is using the device? Hint: fuser -uv /dev/audio"); + tqDebug("Could not open device file /dev/audio!"); + tqDebug("Maybe other program is using the device? Hint: fuser -uv /dev/audio"); goto exit_thread; } @@ -472,7 +472,7 @@ void KviSoundThread::run() int iReaded = f.readBlock(buf + iDataLen,iToRead); 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; } iSize -= iReaded; @@ -485,7 +485,7 @@ void KviSoundThread::run() { 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; } } @@ -519,7 +519,7 @@ void KviSoundThread::run() { // ESD has a really nice API 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 @@ -542,7 +542,7 @@ void KviSoundThread::run() Arts::SimpleSoundServer *server = new Arts::SimpleSoundServer(Arts::Reference("global:Arts_SimpleSoundServer")); 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 { server->play(m_szFileName); } diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp index a79dcc22..33bd710c 100644 --- a/src/modules/term/libkviterm.cpp +++ b/src/modules/term/libkviterm.cpp @@ -119,7 +119,7 @@ static bool term_module_init(KviModule * m) // KviStr tmp = (*it)->name(); // KviStr tmp2 = (*it)->type(); // 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; // } // } @@ -130,7 +130,7 @@ static bool term_module_init(KviModule * m) if(pKonsoleService) { g_szKonsoleLibraryName = pKonsoleService->library(); -// debug("KONSOLE LIB %s",g_szKonsoleLibraryName.ptr()); +// tqDebug("KONSOLE LIB %s",g_szKonsoleLibraryName.ptr()); } // delete pKonsoleService; #endif diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index b5e0eb14..67879833 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -76,16 +76,16 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) if(pKonsoleFactory) { -// debug("FACTORY %d",pKonsoleFactory); +// tqDebug("FACTORY %d",pKonsoleFactory); m_pKonsolePart = static_cast(pKonsoleFactory->createPart( this,"terminal emulator",this,"the konsole part")); if(m_pKonsolePart) { -// debug("PART %d",m_pKonsolePart); +// tqDebug("PART %d",m_pKonsolePart); m_pKonsoleWidget = m_pKonsolePart->widget(); connect(m_pKonsoleWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(konsoleDestroyed())); -// debug("Widget %d",m_pKonsoleWidget); +// tqDebug("Widget %d",m_pKonsoleWidget); } else { m_pKonsoleWidget = new TQLabel(this, __tr2qs("Can't create the terminal emulation part")); @@ -105,11 +105,11 @@ KviTermWidget::~KviTermWidget() if(m_bIsStandalone)g_pTermWidgetList->removeRef(this); 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 -// debug("DELETING KONSOLE PART"); +// tqDebug("DELETING KONSOLE PART"); // 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) diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index bcf2403f..a1cf6316 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -215,7 +215,7 @@ void KviTipWindow::nextTip() KviStr tmp(KviStr::Format,"%u",uNextTip); TQString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("Can't find any tip... :(")); - //debug("REDECODED=%s",szTip.utf8().data()); + //tqDebug("REDECODED=%s",szTip.utf8().data()); uNextTip++; if(uNextTip >= uNumTips)uNextTip = 0; diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp index 78702290..2d4ab30e 100644 --- a/src/modules/torrent/libkvitorrent.cpp +++ b/src/modules/torrent/libkvitorrent.cpp @@ -870,7 +870,7 @@ static bool torrent_module_can_unload( KviModule * m ) 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")) { // we expect param to be a pointer to TQStringList diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index be2dea52..b679c782 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -55,11 +55,11 @@ TORR_IMPLEMENT_DESCRIPTOR( else \ msg = "Something's wrong here! KTorrent's DCOP interface has probably changed."; \ 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) \ 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 \ { \ @@ -194,7 +194,7 @@ bool KviKTorrentDCOPInterface::start(int i) { 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)) ERROR_RET_BOOL @@ -205,7 +205,7 @@ bool KviKTorrentDCOPInterface::stop(int i) { 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)) ERROR_RET_BOOL @@ -216,7 +216,7 @@ bool KviKTorrentDCOPInterface::announce(int i) { 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)) ERROR_RET_BOOL return true; @@ -270,7 +270,7 @@ TQString KviKTorrentDCOPInterface::filePriority(int i, int file) CHECK_RANGE_STRING(file, ret.size()) - debug("prio: %d", ret[file]); + tqDebug("prio: %d", ret[file]); switch (ret[file]) { case 1: return "low"; diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp index e8b6528b..78a41e67 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -21,7 +21,7 @@ KviTorrentStatusBarApplet::~KviTorrentStatusBarApplet() static KviStatusBarApplet *CreateTorrentClientApplet(KviStatusBar *bar, KviStatusBarAppletDescriptor *desc) { - debug("CreateTorrentClientApplet"); + tqDebug("CreateTorrentClientApplet"); return new KviTorrentStatusBarApplet(bar, desc); } -- cgit v1.2.1