Rename additional global TQt functions

pull/1/head
Timothy Pearson 12 years ago
parent df86ea75da
commit e5b670cbac

@ -133,7 +133,7 @@
#define KVI_DEPRECATED #define KVI_DEPRECATED
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
#define debug qDebug #define debug tqDebug
#endif #endif

@ -218,7 +218,7 @@
init(); init();
if (myType == RadioButton) { if (myType == RadioButton) {
if (parent->type() != RadioButtonController) if (parent->type() != RadioButtonController)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller"); "child of a controller");
else else
d->exclusive = parent; d->exclusive = parent;
@ -233,7 +233,7 @@
init(); init();
if (myType == RadioButton) { if (myType == RadioButton) {
if (parent->type() != RadioButtonController) if (parent->type() != RadioButtonController)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller"); "child of a controller");
else else
d->exclusive = parent; d->exclusive = parent;
@ -246,7 +246,7 @@
{ {
myType = tt; myType = tt;
if (myType == RadioButton) { if (myType == RadioButton) {
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem"); "child of a KviTalCheckListItem");
} }
init(); init();
@ -258,7 +258,7 @@
{ {
myType = tt; myType = tt;
if (myType == RadioButton) { if (myType == RadioButton) {
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem"); "child of a KviTalCheckListItem");
} }
init(); init();
@ -270,7 +270,7 @@
{ {
myType = tt; myType = tt;
if (tt == RadioButton) if (tt == RadioButton)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem"); "child of a KviTalCheckListItem");
init(); init();
} }
@ -281,7 +281,7 @@
{ {
myType = tt; myType = tt;
if (tt == RadioButton) if (tt == RadioButton)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem"); "child of a KviTalCheckListItem");
init(); init();
} }
@ -332,7 +332,7 @@
void KviTalCheckListItem::setTristate(bool b) void KviTalCheckListItem::setTristate(bool b)
{ {
if ((myType != CheckBoxController) && (myType != CheckBox)) { if ((myType != CheckBoxController) && (myType != CheckBox)) {
qWarning("KviTalCheckListItem::setTristate(), has no effect on RadioButton " tqWarning("KviTalCheckListItem::setTristate(), has no effect on RadioButton "
"or RadioButtonController."); "or RadioButtonController.");
return; return;
} }
@ -943,7 +943,7 @@
init(); init();
if ( myType == RadioButton ) { if ( myType == RadioButton ) {
if ( parent->type() != RadioButtonController ) if ( parent->type() != RadioButtonController )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller" ); "child of a controller" );
else else
d->exclusive = parent; d->exclusive = parent;
@ -958,7 +958,7 @@
init(); init();
if ( myType == RadioButton ) { if ( myType == RadioButton ) {
if ( parent->type() != RadioButtonController ) if ( parent->type() != RadioButtonController )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller" ); "child of a controller" );
else else
d->exclusive = parent; d->exclusive = parent;
@ -971,7 +971,7 @@
{ {
myType = tt; myType = tt;
if ( myType == RadioButton ) { if ( myType == RadioButton ) {
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem" ); "child of a KviTalCheckListItem" );
} }
init(); init();
@ -983,7 +983,7 @@
{ {
myType = tt; myType = tt;
if ( myType == RadioButton ) { if ( myType == RadioButton ) {
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem" ); "child of a KviTalCheckListItem" );
} }
init(); init();
@ -995,7 +995,7 @@
{ {
myType = tt; myType = tt;
if ( tt == RadioButton ) if ( tt == RadioButton )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem" ); "child of a KviTalCheckListItem" );
init(); init();
} }
@ -1006,7 +1006,7 @@
{ {
myType = tt; myType = tt;
if ( tt == RadioButton ) if ( tt == RadioButton )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be " tqWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a KviTalCheckListItem" ); "child of a KviTalCheckListItem" );
init(); init();
} }
@ -1066,7 +1066,7 @@
void KviTalCheckListItem::setTristate( bool b ) void KviTalCheckListItem::setTristate( bool b )
{ {
if ( ( myType != CheckBoxController ) && ( myType != CheckBox ) ) { if ( ( myType != CheckBoxController ) && ( myType != CheckBox ) ) {
qWarning( "KviTalCheckListItem::setTristate(), has no effect on RadioButton " tqWarning( "KviTalCheckListItem::setTristate(), has no effect on RadioButton "
"or RadioButtonController." ); "or RadioButtonController." );
return; return;
} }

@ -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 = "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())); szVersion.append(TQString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release()));
#endif #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()) if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty())
{ {
TQString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix); TQString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix);

@ -233,7 +233,7 @@ void KviDccChat::connectionInProgress()
m_pDescriptor->console()->connection()->sendData(m_pDescriptor->console()->connection()->encodeText(szReq).data()); 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"), 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)); &(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)); } 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()); KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatConnectionInProgress,this,m_pDescriptor->idString());

@ -156,7 +156,7 @@ void Index::parseDocument( const TQString &filename, int docNum )
{ {
KviFile file( filename ); KviFile file( filename );
if ( !file.openForReading() ) { if ( !file.openForReading() ) {
qWarning( "can not open file " + filename ); tqWarning( "can not open file " + filename );
return; return;
} }
TQTextStream s( &file ); TQTextStream s( &file );
@ -452,7 +452,7 @@ TQString Index::getDocumentTitle( const TQString &fileName )
if ( !file.openForReading() ) { if ( !file.openForReading() ) {
qWarning( "cannot open file " + fileName ); tqWarning( "cannot open file " + fileName );
return fileName; return fileName;
@ -701,7 +701,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList &
if ( !file.openForReading() ) { if ( !file.openForReading() ) {
qWarning( "cannot open file " + fileName ); tqWarning( "cannot open file " + fileName );
return FALSE; return FALSE;

@ -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('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('b',false) != -1)g_pFrame->addDockWidget(TQt::BottomDockWidgetArea,_pDockWindow);
else if(szDock.find('f',false) != -1)_pDockWindow->setFloating(true); 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 c->warning(__tr2qs("Invalid dock area specified"));
#else //!COMPILE_USE_QT4 #else //!COMPILE_USE_QT4

Loading…
Cancel
Save