TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro 1 year ago
parent 641ffc9497
commit 1e6b97e1b1
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
15 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
src/kvilib/ext/kvi_dcophelper.cpp
Unescape View File

@ -131,7 +131,7 @@ bool KviDCOPHelper::stringRetVoidDCOPCall(const KviTQCString &szObj,const KviTQC
if(!g_pApp->dcopClient()->call(m_szAppId,szObj,szFunc,data,replyType,replyData)) if(!g_pApp->dcopClient()->call(m_szAppId,szObj,szFunc,data,replyType,replyData))
return false; return false;
TQDataStream reply( replyData, IO_ReadOnly ); TQDataStream reply( replyData, IO_ReadOnly );
if(replyType == TQSTRING_OBJECT_NAME_STRING) if(replyType == "TQString")
{ {
reply >> szRet; reply >> szRet;
return true; return true;
@ -152,7 +152,7 @@ bool KviDCOPHelper::stringRetIntDCOPCall(const KviTQCString &szObj,const KviTQCS
return false; return false;
TQDataStream reply( replyData, IO_ReadOnly ); TQDataStream reply( replyData, IO_ReadOnly );
if(replyType == TQSTRING_OBJECT_NAME_STRING) if(replyType == "TQString")
{ {
reply >> szRet; reply >> szRet;
return true; return true;

2
src/kvirc/kernel/kvi_action.cpp
Unescape View File

@ -178,7 +178,7 @@ void KviAction::reloadImages()
TQPixmap * p = bigIcon(); TQPixmap * p = bigIcon();
for(TQWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next()) for(TQWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next())
{ {
if(b->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING)) if(b->inherits("TQToolButton"))
((TQToolButton *)b)->setIconSet(p ? *p : TQPixmap()); ((TQToolButton *)b)->setIconSet(p ? *p : TQPixmap());
} }
} }

2
src/kvirc/kernel/kvi_iconmanager.cpp
Unescape View File

@ -413,7 +413,7 @@ bool KviIconWidget::eventFilter(TQObject * o,TQEvent *e)
{ {
if(e->type() == TQEvent::MouseButtonPress) if(e->type() == TQEvent::MouseButtonPress)
{ {
if(o->inherits(TQLABEL_OBJECT_NAME_STRING)) if(o->inherits("TQLabel"))
{ {
KviStr szName = ((TQLabel *)o)->name(); KviStr szName = ((TQLabel *)o)->name();
bool bOk; bool bOk;

6
src/kvirc/kernel/kvi_ipc.cpp
Unescape View File

@ -38,11 +38,11 @@
static HWND kvi_win_findIpcSentinel() static HWND kvi_win_findIpcSentinel()
{ {
HWND hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"[Non-Commercial] - kvirc_ipc_sentinel"); HWND hWnd = ::FindWindow("TQWidget","[Non-Commercial] - kvirc_ipc_sentinel");
if(hWnd)return hWnd; if(hWnd)return hWnd;
hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"[Freeware] - kvirc_ipc_sentinel"); hWnd = ::FindWindow("TQWidget","[Freeware] - kvirc_ipc_sentinel");
if(hWnd)return hWnd; if(hWnd)return hWnd;
hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"kvirc_ipc_sentinel"); hWnd = ::FindWindow("TQWidget","kvirc_ipc_sentinel");
return hWnd; return hWnd;
} }

2
src/kvirc/ui/kvi_channel.cpp
Unescape View File

@ -417,7 +417,7 @@ void KviChannel::toggleModeEditor()
connect(m_pModeEditor,TQT_SIGNAL(setMode(const char *)),this,TQT_SLOT(setMode(const char *))); connect(m_pModeEditor,TQT_SIGNAL(setMode(const char *)),this,TQT_SLOT(setMode(const char *)));
connect(m_pModeEditor,TQT_SIGNAL(done()),this,TQT_SLOT(modeSelectorDone())); connect(m_pModeEditor,TQT_SIGNAL(done()),this,TQT_SLOT(modeSelectorDone()));
m_pModeEditor->show(); m_pModeEditor->show();
//setFocusHandlerNoClass(m_pInput,m_pModeEditor,TQLINEEDIT_OBJECT_NAME_STRING); //setFocusHandlerNoClass(m_pInput,m_pModeEditor,"TQLineEdit");
if(!m_pModeEditorButton->isOn())m_pModeEditorButton->setOn(true); if(!m_pModeEditorButton->isOn())m_pModeEditorButton->setOn(true);
} }
} }

2
src/kvirc/ui/kvi_customtoolbar.cpp
Unescape View File

@ -544,7 +544,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e)
if(!( if(!(
o->inherits("KviTalPopupMenu") || o->inherits("KviTalPopupMenu") ||
o->inherits("TQToolBarHandle") || o->inherits("TQToolBarHandle") ||
o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) || o->inherits("TQDockWindowHandle") ||
o->inherits("TQDockWindowResizeHandle") || o->inherits("TQDockWindowResizeHandle") ||
o->inherits("TQToolBarExtensionWidget") o->inherits("TQToolBarExtensionWidget")
)) ))

2
src/kvirc/ui/kvi_ipeditor.cpp
Unescape View File

@ -250,7 +250,7 @@ void KviIpEditor::recreateChildren()
bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e) bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e)
{ {
if(o->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) if(o->inherits("TQLineEdit"))
{ {
if(e->type() == TQEvent::KeyPress) if(e->type() == TQEvent::KeyPress)
{ {

2
src/kvirc/ui/kvi_mdichild.cpp
Unescape View File

@ -272,7 +272,7 @@ void KviMdiChild::moveEvent(TQMoveEvent *e)
void KviMdiChild::systemPopupSlot() void KviMdiChild::systemPopupSlot()
{ {
if(sender()->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING)) if(sender()->inherits("TQToolButton"))
{ {
emit systemPopupRequest(((TQToolButton *)sender())->mapToGlobal(TQPoint(0,((TQToolButton *)sender())->height()))); emit systemPopupRequest(((TQToolButton *)sender())->mapToGlobal(TQPoint(0,((TQToolButton *)sender())->height())));
} else { } else {

2
src/kvirc/ui/kvi_statusbar.cpp
Unescape View File

@ -251,7 +251,7 @@ void KviStatusBar::recalcMinimumHeight()
setMinimumHeight(s); setMinimumHeight(s);
TQLayout * l = layout(); TQLayout * l = layout();
if(l) if(l)
if(l->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING)) if(l->inherits("TQBoxLayout"))
((TQBoxLayout *)l)->addStrut(s); ((TQBoxLayout *)l)->addStrut(s);
// FIXME: do TQMainWindow need setUpLayout() here ? // FIXME: do TQMainWindow need setUpLayout() here ?
} }

8
src/kvirc/ui/kvi_texticonwin.cpp
Unescape View File

@ -169,7 +169,7 @@ void KviTextIconWindow::keyPressEvent(TQKeyEvent *e)
((KviInputEditor *)m_pOwner)->insertText(szItem); ((KviInputEditor *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits("KviInput")) else if(m_pOwner->inherits("KviInput"))
((KviInput *)m_pOwner)->insertText(szItem); ((KviInput *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) else if(m_pOwner->inherits("TQLineEdit"))
{ {
TQString tmp = ((TQLineEdit *)m_pOwner)->text(); TQString tmp = ((TQLineEdit *)m_pOwner)->text();
tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem);
@ -192,7 +192,7 @@ void KviTextIconWindow::keyPressEvent(TQKeyEvent *e)
((KviInputEditor *)m_pOwner)->insertText(szItem); ((KviInputEditor *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits("KviInput")) else if(m_pOwner->inherits("KviInput"))
((KviInput *)m_pOwner)->insertText(szItem); ((KviInput *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) else if(m_pOwner->inherits("TQLineEdit"))
{ {
TQString tmp = ((TQLineEdit *)m_pOwner)->text(); TQString tmp = ((TQLineEdit *)m_pOwner)->text();
tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem);
@ -246,7 +246,7 @@ void KviTextIconWindow::itemSelected(KviTalIconViewItem * item)
{ {
if(item) if(item)
{ {
// tqDebug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING),m_pOwner->className()); // tqDebug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits("TQLineEdit"),m_pOwner->className());
doHide(); doHide();
TQString szItem = item->text(); TQString szItem = item->text();
szItem.append(' '); szItem.append(' ');
@ -255,7 +255,7 @@ void KviTextIconWindow::itemSelected(KviTalIconViewItem * item)
((KviInputEditor *)m_pOwner)->insertText(szItem); ((KviInputEditor *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits("KviInput")) else if(m_pOwner->inherits("KviInput"))
((KviInput *)m_pOwner)->insertText(szItem); ((KviInput *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) else if(m_pOwner->inherits("TQLineEdit"))
{ {
TQString tmp = ((TQLineEdit *)m_pOwner)->text(); TQString tmp = ((TQLineEdit *)m_pOwner)->text();
tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem);

2
src/kvirc/ui/kvi_topicw.cpp
Unescape View File

@ -745,7 +745,7 @@ void KviTopicWidget::deactivate()
w = parent(); w = parent();
if(w) if(w)
{ {
if(w->inherits(TQWIDGET_OBJECT_NAME_STRING)) if(w->inherits("TQWidget"))
((TQWidget *)w)->setFocus(); ((TQWidget *)w)->setFocus();
} }
} }

4
src/kvirc/ui/kvi_window.cpp
Unescape View File

@ -228,7 +228,7 @@ bool KviWindow::hasAttention()
// Handle the special case of the dialogs then // Handle the special case of the dialogs then
TQWidget * w = TQT_TQWIDGET(((TQApplication *)g_pApp)->activeWindow()); TQWidget * w = TQT_TQWIDGET(((TQApplication *)g_pApp)->activeWindow());
if(w->inherits(TQDIALOG_OBJECT_NAME_STRING)) if(w->inherits("TQDialog"))
{ {
// but make sure that the frame is visible at all! // but make sure that the frame is visible at all!
if(!frame()->isVisible())return false; if(!frame()->isVisible())return false;
@ -508,7 +508,7 @@ void KviWindow::toggleCryptController()
{ {
m_pCryptController = new KviCryptController(m_pSplitter,m_pCryptControllerButton,"crypt_controller",this,m_pCryptSessionInfo); m_pCryptController = new KviCryptController(m_pSplitter,m_pCryptControllerButton,"crypt_controller",this,m_pCryptSessionInfo);
connect(m_pCryptController,TQT_SIGNAL(done()),this,TQT_SLOT(cryptControllerFinished())); connect(m_pCryptController,TQT_SIGNAL(done()),this,TQT_SLOT(cryptControllerFinished()));
//setFocusHandlerNoClass(m_pInput,m_pCryptController,TQLINEEDIT_OBJECT_NAME_STRING); //link it! //setFocusHandlerNoClass(m_pInput,m_pCryptController,"TQLineEdit"); //link it!
m_pCryptController->show(); m_pCryptController->show();
if(!m_pCryptControllerButton) if(!m_pCryptControllerButton)
return; return;

2
src/modules/mediaplayer/mp_dcopinterface.cpp
Unescape View File

@ -103,7 +103,7 @@ bool KviMediaPlayerDCOPInterface::stringRetDCOPCall(const KviTQCString &szObj,co
if(!g_pApp->dcopClient()->call(m_szAppId,szObj,szFunc,data,replyType,replyData)) if(!g_pApp->dcopClient()->call(m_szAppId,szObj,szFunc,data,replyType,replyData))
return false; return false;
TQDataStream reply( replyData, IO_ReadOnly ); TQDataStream reply( replyData, IO_ReadOnly );
if(replyType == TQSTRING_OBJECT_NAME_STRING) if(replyType == "TQString")
{ {
reply >> ret; reply >> ret;
return true; return true;

10
src/modules/options/dialog.cpp
Unescape View File

@ -339,11 +339,11 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
{ {
#endif #endif
TQString szText; TQString szText;
if(o->inherits(TQLABEL_OBJECT_NAME_STRING))szText = ((TQLabel *)o)->text(); if(o->inherits("TQLabel"))szText = ((TQLabel *)o)->text();
else if(o->inherits(TQCHECKBOX_OBJECT_NAME_STRING))szText = ((TQCheckBox *)o)->text(); else if(o->inherits("TQCheckBox"))szText = ((TQCheckBox *)o)->text();
else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title(); else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
#ifdef COMPILE_INFO_TIPS #ifdef COMPILE_INFO_TIPS
if(o->inherits(TQWIDGET_OBJECT_NAME_STRING)) if(o->inherits("TQWidget"))
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
szText.append(((TQWidget *)o)->toolTip()); szText.append(((TQWidget *)o)->toolTip());
#else #else
@ -370,7 +370,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
bFoundSomethingHere = true; bFoundSomethingHere = true;
} }
if(o->inherits(TQWIDGET_OBJECT_NAME_STRING)) if(o->inherits("TQWidget"))
{ {
TQWidget* pWidget=(TQWidget*)o; TQWidget* pWidget=(TQWidget*)o;
TQFont font = pWidget->font(); TQFont font = pWidget->font();
@ -382,7 +382,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
TQObject * pParent = pWidget->parent(); TQObject * pParent = pWidget->parent();
while(pParent) while(pParent)
{ {
if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) if(pParent->inherits("TQTabWidget"))
{ {
pTabWidgetToMark = (TQTabWidget *)pParent; pTabWidgetToMark = (TQTabWidget *)pParent;
break; break;

6
src/modules/system/libkvisystem.cpp
Unescape View File

@ -496,7 +496,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
return false; return false;
} }
ds << iii; ds << iii;
} else if(kvi_strEqualCI(TQSTRING_OBJECT_NAME_STRING,szType.ptr())) } else if(kvi_strEqualCI("TQString",szType.ptr()))
{ {
TQString ddd = tmp.ptr(); TQString ddd = tmp.ptr();
ds << ddd; ds << ddd;
@ -543,7 +543,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
bool bqw; bool bqw;
ret >> bqw; ret >> bqw;
c->returnValue()->setInteger(bqw ? 1 : 0); c->returnValue()->setInteger(bqw ? 1 : 0);
} else if(szRetType == TQSTRING_OBJECT_NAME_STRING) } else if(szRetType == "TQString")
{ {
TQString szz; TQString szz;
ret >> szz; ret >> szz;
@ -577,7 +577,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
} }
c->returnValue()->setArray(arry); c->returnValue()->setArray(arry);
#endif #endif
} else if(szRetType == TQSTRINGLIST_OBJECT_NAME_STRING) } else if(szRetType == "TQStringList")
{ {
TQStringList csl; TQStringList csl;
ret >> csl; ret >> csl;

Write Preview
Loading…
Cancel
Save