From e5b670cbaceda728b0e0a92e9783aafe263da96e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:22:01 -0600 Subject: [PATCH] Rename additional global TQt functions --- src/kvilib/config/kvi_settings.h | 2 +- src/kvilib/tal/kvi_tal_listview.cpp | 28 ++++++++++++------------ src/kvirc/sparser/kvi_sp_ctcp.cpp | 2 +- src/modules/dcc/chat.cpp | 2 +- src/modules/help/index.cpp | 6 ++--- src/modules/objects/class_dockwindow.cpp | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index 5c8d8c1..770379d 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -133,7 +133,7 @@ #define KVI_DEPRECATED #ifdef COMPILE_USE_QT4 - #define debug qDebug + #define debug tqDebug #endif diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp index d090fda..997eda3 100644 --- a/src/kvilib/tal/kvi_tal_listview.cpp +++ b/src/kvilib/tal/kvi_tal_listview.cpp @@ -218,7 +218,7 @@ init(); if (myType == RadioButton) { if (parent->type() != RadioButtonController) - qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a controller"); else d->exclusive = parent; @@ -233,7 +233,7 @@ init(); if (myType == RadioButton) { if (parent->type() != RadioButtonController) - qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a controller"); else d->exclusive = parent; @@ -246,7 +246,7 @@ { myType = tt; if (myType == RadioButton) { - qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem"); } init(); @@ -258,7 +258,7 @@ { myType = tt; if (myType == RadioButton) { - qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem"); } init(); @@ -270,7 +270,7 @@ { myType = tt; if (tt == RadioButton) - qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem"); init(); } @@ -281,7 +281,7 @@ { myType = tt; if (tt == RadioButton) - qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem"); init(); } @@ -332,7 +332,7 @@ void KviTalCheckListItem::setTristate(bool b) { if ((myType != CheckBoxController) && (myType != CheckBox)) { - qWarning("KviTalCheckListItem::setTristate(), has no effect on RadioButton " + tqWarning("KviTalCheckListItem::setTristate(), has no effect on RadioButton " "or RadioButtonController."); return; } @@ -943,7 +943,7 @@ init(); if ( myType == RadioButton ) { if ( parent->type() != RadioButtonController ) - qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a controller" ); else d->exclusive = parent; @@ -958,7 +958,7 @@ init(); if ( myType == RadioButton ) { if ( parent->type() != RadioButtonController ) - qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a controller" ); else d->exclusive = parent; @@ -971,7 +971,7 @@ { myType = tt; if ( myType == RadioButton ) { - qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem" ); } init(); @@ -983,7 +983,7 @@ { myType = tt; if ( myType == RadioButton ) { - qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem" ); } init(); @@ -995,7 +995,7 @@ { myType = tt; if ( tt == RadioButton ) - qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem" ); init(); } @@ -1006,7 +1006,7 @@ { myType = tt; if ( tt == RadioButton ) - qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " + tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " "child of a KviTalCheckListItem" ); init(); } @@ -1066,7 +1066,7 @@ void KviTalCheckListItem::setTristate( bool b ) { if ( ( myType != CheckBoxController ) && ( myType != CheckBox ) ) { - qWarning( "KviTalCheckListItem::setTristate(), has no effect on RadioButton " + tqWarning( "KviTalCheckListItem::setTristate(), has no effect on RadioButton " "or RadioButtonController." ); return; } diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 3a28909..df42662 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -1161,7 +1161,7 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE " - " KVI_BUILD_FLAGS; szVersion.append(TQString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release())); #endif - //szVersion.append(TQString(" - QT Version: %1 - %2").arg(qVersion()).arg(__tr2qs("http://www.kvirc.net/"))); + //szVersion.append(TQString(" - QT Version: %1 - %2").arg(tqVersion()).arg(__tr2qs("http://www.kvirc.net/"))); if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty()) { TQString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix); diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index a917171..38d2ab1 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -233,7 +233,7 @@ void KviDccChat::connectionInProgress() m_pDescriptor->console()->connection()->sendData(m_pDescriptor->console()->connection()->encodeText(szReq).data()); output(KVI_OUT_DCCMSG,__tr2qs_ctx("Sent DCC %Q request to %Q, waiting for the remote client to connect...","dcc"), &(m_pDescriptor->szType),&(m_pDescriptor->szNick)); - //qDebug(m_pDescriptor->szNick); + //tqDebug(m_pDescriptor->szNick); } else output(KVI_OUT_DCCMSG,__tr2qs_ctx("DCC %Q request not sent, awaiting manual connection","dcc"),&(m_pDescriptor->szType)); } KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatConnectionInProgress,this,m_pDescriptor->idString()); diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index d77e6fe..3aa8d40 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -156,7 +156,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) { KviFile file( filename ); if ( !file.openForReading() ) { - qWarning( "can not open file " + filename ); + tqWarning( "can not open file " + filename ); return; } TQTextStream s( &file ); @@ -452,7 +452,7 @@ TQString Index::getDocumentTitle( const TQString &fileName ) if ( !file.openForReading() ) { - qWarning( "cannot open file " + fileName ); + tqWarning( "cannot open file " + fileName ); return fileName; @@ -701,7 +701,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & if ( !file.openForReading() ) { - qWarning( "cannot open file " + fileName ); + tqWarning( "cannot open file " + fileName ); return FALSE; diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index c0942a6..5e2beb1 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -258,7 +258,7 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c) else if(szDock.find('r',false) != -1)g_pFrame->addDockWidget(TQt::RightDockWidgetArea,_pDockWindow); else if(szDock.find('b',false) != -1)g_pFrame->addDockWidget(TQt::BottomDockWidgetArea,_pDockWindow); else if(szDock.find('f',false) != -1)_pDockWindow->setFloating(true); - else if(szDock.find('m',false) != -1)qDebug("Sorry: no support for minimized dock widgets in TQt4"); + else if(szDock.find('m',false) != -1)tqDebug("Sorry: no support for minimized dock widgets in TQt4"); else c->warning(__tr2qs("Invalid dock area specified")); #else //!COMPILE_USE_QT4