From 6efceb1cf68e8a942d28bba4be8fa65b2e8f3c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:34:45 -0600 Subject: Rename additional global TQt functions --- ksirc/KSPrefs/page_servchan.cpp | 4 ++-- ksirc/baserules.cpp | 2 +- ksirc/chanparser.cpp | 6 +++--- ksirc/iocontroller.cpp | 4 ++-- ksirc/ksircprocess.cpp | 4 ++-- ksirc/kstextview.cpp | 18 +++++++++--------- ksirc/objFinder.cpp | 2 +- ksirc/puke/controller.cpp | 8 ++++---- ksirc/puke/playout.cpp | 4 ++-- ksirc/puke/pobject.cpp | 2 +- ksirc/puke/pobjfinder.cpp | 4 ++-- ksirc/puke/ppopmenu.cpp | 2 +- ksirc/puke/pprogress.cpp | 2 +- ksirc/puke/ptabdialog.cpp | 2 +- ksirc/puke/ptablevw.cpp | 2 +- ksirc/puke/pwidget.cpp | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) (limited to 'ksirc') diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp index f7587947..b3a87284 100644 --- a/ksirc/KSPrefs/page_servchan.cpp +++ b/ksirc/KSPrefs/page_servchan.cpp @@ -83,7 +83,7 @@ void PageServChan::addPressedSL() { for(i = 0; i < serverLB->count(); i++){ if(txt == serverLB->text(i)){ - qWarning("Server already in the list!"); + tqWarning("Server already in the list!"); return; } } @@ -115,7 +115,7 @@ void PageServChan::addPressedCL() { for(i = 0; i < channelLB->count(); i++){ if(txt == channelLB->text(i)){ - qWarning("Server already in the list!"); + tqWarning("Server already in the list!"); return; } } diff --git a/ksirc/baserules.cpp b/ksirc/baserules.cpp index 9ea568f3..e6b1f896 100644 --- a/ksirc/baserules.cpp +++ b/ksirc/baserules.cpp @@ -85,7 +85,7 @@ filterRuleList *KSMBaseRules::defaultRules() TQString nick = ksircProcess()->getNick(); if ( !nick.isEmpty() ) { if(nick.length() > 83){ - qDebug("Nick too long"); + tqDebug("Nick too long"); nick.truncate( 83 ); } /* diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index 32f2d670..aafaf395 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -866,7 +866,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) top->channelButtons->setButtonsEnabled(mi->op()); if(mi->arg().length() == 0){ - qWarning("Invalid nick in +/- o mode change"); + tqWarning("Invalid nick in +/- o mode change"); continue; } @@ -910,7 +910,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) voice = FALSE; if(mi->arg().length() == 0){ - qWarning("Invalid nick in +-v mode change"); + tqWarning("Invalid nick in +-v mode change"); continue; } @@ -934,7 +934,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) else if(mi->mode() == 'k'){ if(mi->op()){ if(mi->arg().length() == 0){ - qWarning("Invalid +k mode set, no argument!"); + tqWarning("Invalid +k mode set, no argument!"); continue; } top->m_channelInfo.setKey(mi->arg()); diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index d16f798a..9835a960 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -247,7 +247,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) TQTextCodec *qtc = KGlobal::charsets()->codecForName( enc ); TQString qsname = qtc->toUnicode(name); /* - char *b = qstrdup(line); + char *b = tqstrdup(line); kdDebug(5008) << "----------------------------------------" << endl; kdDebug(5008) << "Line: " << b << endl; fprintf(stderr, "My_print: " ); my_print(b); @@ -318,7 +318,7 @@ void KSircIOController::stdin_write(TQCString s) if(proc_CTS == TRUE){ int len = buffer.length(); if(send_buf != 0x0){ - qWarning("KProcess barfed in all clear signal again"); + tqWarning("KProcess barfed in all clear signal again"); delete[] send_buf; } send_buf = new char[len]; diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 26dbc8c7..8d2a0f0c 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -128,7 +128,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa proc->setRunPrivileged(true); /* make ksirc run under gdb as a user */ #endif - //server = qstrdup(kss.server()); + //server = tqstrdup(kss.server()); TQDict nTopList(17, FALSE); TopList = nTopList; @@ -470,7 +470,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) void KSircProcess::clean_toplevel(TQObject *clean){ if(!clean){ - qWarning("Passed null to cleaner!!"); + tqWarning("Passed null to cleaner!!"); return; } bool cont = FALSE; diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 7189a23a..1817c4e8 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -54,7 +54,7 @@ TQPixmap ksTextViewLoadPixmap( const TQString &icon ) { ksTextViewPixmapDict = new TQDict; ksTextViewPixmapDict->setAutoDelete( true ); - qAddPostRoutine( cleanupKSTextViewPixmapDict ); + tqAddPostRoutine( cleanupKSTextViewPixmapDict ); } TQPixmap *pix = ksTextViewPixmapDict->find( icon ); @@ -536,14 +536,14 @@ Tokenizer::Tokenizer( PString &text ) : m_text( text.data ), m_tags( text.tags ), m_textBeforeFirstTagProcessed( false ), m_done( false ) { - //qDebug( "Tokenizer::Tokenizer( %s )", m_text.ascii() ); + //tqDebug( "Tokenizer::Tokenizer( %s )", m_text.ascii() ); m_lastTag = m_tags.begin(); if ( !m_tags.isEmpty() ) { if ( ( *m_tags.begin() ).type != TagIndex::Open ) { - qDebug( "something went awfully wrong! bailing out with an assertion" ); - qDebug( "text input was: %s", text.data.ascii() ); + tqDebug( "something went awfully wrong! bailing out with an assertion" ); + tqDebug( "text input was: %s", text.data.ascii() ); } assert( ( *m_tags.begin() ).type == TagIndex::Open ); } @@ -620,7 +620,7 @@ bool Tokenizer::parseNextToken( Token &tok ) { if ( m_done ) { - //qDebug( "Tokenizer: premature end" ); + //tqDebug( "Tokenizer: premature end" ); return false; } @@ -706,7 +706,7 @@ bool Tokenizer::parseNextToken( Token &tok ) return true; } else { - qDebug( "EEK, this should never happen. input text was: %s", m_text.ascii() ); + tqDebug( "EEK, this should never happen. input text was: %s", m_text.ascii() ); assert( false ); } @@ -851,14 +851,14 @@ void Tokenizer::parseTag( const StringPtr &text, { if ( ch == '=' ) // eh? { - qDebug( "EH?" ); + tqDebug( "EH?" ); ++p; continue; } if ( key.isNull() ) { - qDebug( "Tokenizer: Error, attribute value without key." ); + tqDebug( "Tokenizer: Error, attribute value without key." ); // reset state = ScanForName; ++p; @@ -884,7 +884,7 @@ void Tokenizer::parseTag( const StringPtr &text, if(start == 0x0) { state = ScanForName; - qDebug( "Never found start \" in tag." ); + tqDebug( "Never found start \" in tag." ); ++p; continue; } diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index bb4fe5dc..4c986e49 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -29,7 +29,7 @@ void objFinder::insert(TQObject *obj, const char *key){ TQString name; if(obj == 0x0){ - qWarning("objFinder: Passed Null Object"); + tqWarning("objFinder: Passed Null Object"); return; } diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index 5a646973..a7c95091 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -310,7 +310,7 @@ void PukeController::Traffic(int fd) } #endif /* DEBUG */ if(pm.iHeader != iPukeHeader){ - qWarning("Invalid packet received, discarding!"); + tqWarning("Invalid packet received, discarding!"); return; } if(pm.iTextSize > 0){ @@ -527,7 +527,7 @@ void PukeController::hdlrPukeSetup(int fd, PukeMessage *pm) pmOut.iArg = 1; if((strlen(pm->cArg) > 0) && (this->qidConnectFd[fd] != NULL)){ - this->qidConnectFd[fd]->server = qstrdup(pm->cArg); + this->qidConnectFd[fd]->server = tqstrdup(pm->cArg); pmOut.iWinId = pm->iWinId; pmOut.iArg = sizeof(PukeMessage) - sizeof(char *); } @@ -651,13 +651,13 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm) pmRet.iCommand = PUKE_WIDGET_DELETE_ACK; } else { - qWarning("WidgetRunner: no such widget: %d", wI.iWinId); + tqWarning("WidgetRunner: no such widget: %d", wI.iWinId); throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET)); } */ if(checkWidgetId(&wI) == FALSE){ - qWarning("WidgetRunner: no such widget: %d", wI.iWinId); + tqWarning("WidgetRunner: no such widget: %d", wI.iWinId); throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET)); } diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp index a2b6fbae..f57bacc9 100644 --- a/ksirc/puke/playout.cpp +++ b/ksirc/puke/playout.cpp @@ -55,7 +55,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm) if(pm->iCommand == PUKE_LAYOUT_ADDWIDGET){ if(pm->iTextSize != 2*sizeof(char)){ - qWarning("PLayout/addwidget: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); + tqWarning("PLayout/addwidget: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); pmRet.iCommand = PUKE_LAYOUT_ADDWIDGET_ACK; // ack the add widget pmRet.iWinId = pm->iWinId; pmRet.iArg = 1; @@ -78,7 +78,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm) } else if(pm->iCommand == PUKE_LAYOUT_ADDLAYOUT){ if(pm->iTextSize != sizeof(char)){ - qWarning("PLayout: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); + tqWarning("PLayout: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); pmRet.iCommand = PUKE_LAYOUT_ADDLAYOUT_ACK; // ack the add widget pmRet.iWinId = pm->iWinId; pmRet.iArg = 1; diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp index 9e46e042..99be1274 100644 --- a/ksirc/puke/pobject.cpp +++ b/ksirc/puke/pobject.cpp @@ -69,7 +69,7 @@ void PObject::messageHandler(int fd, PukeMessage *pm) delete this; } else { - qWarning("PObject: Unkown Command: %d", pm->iCommand); + tqWarning("PObject: Unkown Command: %d", pm->iCommand); pmRet.iCommand = PUKE_INVALID; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp index 6870e142..2931ec77 100644 --- a/ksirc/puke/pobjfinder.cpp +++ b/ksirc/puke/pobjfinder.cpp @@ -43,7 +43,7 @@ void PObjFinder::messageHandler(int fd, PukeMessage *pm) pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; - pmRet.cArg = qstrdup(qscArg); + pmRet.cArg = tqstrdup(qscArg); pmRet.iTextSize = qscArg.length(); emit outputMessage(fd, &pmRet); delete pmRet.cArg; @@ -77,7 +77,7 @@ void PObjFinder::newObject(TQObject *name){ pmRet.iCommand = - PUKE_OBJFINDER_NEWOBJECT_ACK; pmRet.iWinId = widgetIden().iWinId; pmRet.iArg = 0; - pmRet.cArg = qstrdup(info); + pmRet.cArg = tqstrdup(info); pmRet.iTextSize = info.length(); emit outputMessage(widgetIden().fd, &pmRet); delete pmRet.cArg; diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp index 3ed66aa3..02687c2a 100644 --- a/ksirc/puke/ppopmenu.cpp +++ b/ksirc/puke/ppopmenu.cpp @@ -102,7 +102,7 @@ TQPopupMenu *PPopupMenu::widget() } void PPopupMenu::got_activated(int itemId){ - qWarning("Item got activated: %d", itemId); + tqWarning("Item got activated: %d", itemId); widgetId wI; PukeMessage pmRet; diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp index 09ed39d2..e1a6203c 100644 --- a/ksirc/puke/pprogress.cpp +++ b/ksirc/puke/pprogress.cpp @@ -42,7 +42,7 @@ void PProgress::messageHandler(int fd, PukeMessage *pm) // kdDebug(5008) << "PProgress handler called" << endl; PukeMessage pmRet; if(widget() == 0){ - qWarning("Null widget"); + tqWarning("Null widget"); return; } switch(pm->iCommand){ diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp index 30bc3e0a..e4fc8dea 100644 --- a/ksirc/puke/ptabdialog.cpp +++ b/ksirc/puke/ptabdialog.cpp @@ -49,7 +49,7 @@ void PTabDialog::messageHandler(int fd, PukeMessage *pm) if(pm->iCommand == PUKE_TABDIALOG_ADDTAB){ if(!(pm->iTextSize > 0)){ - qWarning("TQTabDialog/addtab: incorrent cArg size, bailing out. Needed: >0 got: %d\n", pm->iTextSize); + tqWarning("TQTabDialog/addtab: incorrent cArg size, bailing out. Needed: >0 got: %d\n", pm->iTextSize); pmRet.iCommand = PUKE_TABDIALOG_ADDTAB_ACK; // ack the add widget pmRet.iWinId = pm->iWinId; pmRet.iArg = 1; diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp index 64c8fa2e..918b0676 100644 --- a/ksirc/puke/ptablevw.cpp +++ b/ksirc/puke/ptablevw.cpp @@ -4,7 +4,7 @@ PObject * PTableView::createWidget(CreateArgs &ca) { - qWarning("Table View is abstract class, cannot create an object from it!!!"); + tqWarning("Table View is abstract class, cannot create an object from it!!!"); PTableView *pt = new PTableView(ca.parent); pt->setWidget(0); pt->setWidgetId(ca.pwI); diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp index b62f64c1..7bf30cda 100644 --- a/ksirc/puke/pwidget.cpp +++ b/ksirc/puke/pwidget.cpp @@ -248,7 +248,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) } int *point_show = (int *) pm->cArg; - qWarning("Recreate: %d %d %d", point_show[0], point_show[1], point_show[3]); + tqWarning("Recreate: %d %d %d", point_show[0], point_show[1], point_show[3]); widget()->reparent(nparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]); -- cgit v1.2.3