summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-07-11 21:03:51 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-07-12 17:47:51 +0900
commitef786e3a1a322e0584654503d288e3630744e998 (patch)
tree46b09379b11042db5eabc22c961163f2135b12a3
parent641ffc9497f5a0e756aa13cb6b4fcf32046a43b6 (diff)
downloadkvirc-ef786e3a1a322e0584654503d288e3630744e998.tar.gz
kvirc-ef786e3a1a322e0584654503d288e3630744e998.zip
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 1e6b97e1b1d29b0a895643eb9ce7ffe08d6fed75)
-rw-r--r--src/kvilib/ext/kvi_dcophelper.cpp4
-rw-r--r--src/kvirc/kernel/kvi_action.cpp2
-rw-r--r--src/kvirc/kernel/kvi_iconmanager.cpp2
-rw-r--r--src/kvirc/kernel/kvi_ipc.cpp6
-rw-r--r--src/kvirc/ui/kvi_channel.cpp2
-rw-r--r--src/kvirc/ui/kvi_customtoolbar.cpp2
-rw-r--r--src/kvirc/ui/kvi_ipeditor.cpp2
-rw-r--r--src/kvirc/ui/kvi_mdichild.cpp2
-rw-r--r--src/kvirc/ui/kvi_statusbar.cpp2
-rw-r--r--src/kvirc/ui/kvi_texticonwin.cpp8
-rw-r--r--src/kvirc/ui/kvi_topicw.cpp2
-rw-r--r--src/kvirc/ui/kvi_window.cpp4
-rw-r--r--src/modules/mediaplayer/mp_dcopinterface.cpp2
-rw-r--r--src/modules/options/dialog.cpp10
-rw-r--r--src/modules/system/libkvisystem.cpp6
15 files changed, 28 insertions, 28 deletions
diff --git a/src/kvilib/ext/kvi_dcophelper.cpp b/src/kvilib/ext/kvi_dcophelper.cpp
index 7992d4a4..438db496 100644
--- a/src/kvilib/ext/kvi_dcophelper.cpp
+++ b/src/kvilib/ext/kvi_dcophelper.cpp
@@ -131,7 +131,7 @@ bool KviDCOPHelper::stringRetVoidDCOPCall(const KviTQCString &szObj,const KviTQC
if(!g_pApp->dcopClient()->call(m_szAppId,szObj,szFunc,data,replyType,replyData))
return false;
TQDataStream reply( replyData, IO_ReadOnly );
- if(replyType == TQSTRING_OBJECT_NAME_STRING)
+ if(replyType == "TQString")
{
reply >> szRet;
return true;
@@ -152,7 +152,7 @@ bool KviDCOPHelper::stringRetIntDCOPCall(const KviTQCString &szObj,const KviTQCS
return false;
TQDataStream reply( replyData, IO_ReadOnly );
- if(replyType == TQSTRING_OBJECT_NAME_STRING)
+ if(replyType == "TQString")
{
reply >> szRet;
return true;
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index d27d69e6..490a1ac2 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -178,7 +178,7 @@ void KviAction::reloadImages()
TQPixmap * p = bigIcon();
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());
}
}
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index db1e4663..44d17883 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -413,7 +413,7 @@ bool KviIconWidget::eventFilter(TQObject * o,TQEvent *e)
{
if(e->type() == TQEvent::MouseButtonPress)
{
- if(o->inherits(TQLABEL_OBJECT_NAME_STRING))
+ if(o->inherits("TQLabel"))
{
KviStr szName = ((TQLabel *)o)->name();
bool bOk;
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index 9d674e3c..7e61fe9f 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -38,11 +38,11 @@
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;
- hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"[Freeware] - kvirc_ipc_sentinel");
+ hWnd = ::FindWindow("TQWidget","[Freeware] - kvirc_ipc_sentinel");
if(hWnd)return hWnd;
- hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"kvirc_ipc_sentinel");
+ hWnd = ::FindWindow("TQWidget","kvirc_ipc_sentinel");
return hWnd;
}
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 72beac30..ff06df19 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -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(done()),this,TQT_SLOT(modeSelectorDone()));
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);
}
}
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index b4201299..2a5794b4 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -544,7 +544,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e)
if(!(
o->inherits("KviTalPopupMenu") ||
o->inherits("TQToolBarHandle") ||
- o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ||
+ o->inherits("TQDockWindowHandle") ||
o->inherits("TQDockWindowResizeHandle") ||
o->inherits("TQToolBarExtensionWidget")
))
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index df15e027..fc94552f 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -250,7 +250,7 @@ void KviIpEditor::recreateChildren()
bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e)
{
- if(o->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ if(o->inherits("TQLineEdit"))
{
if(e->type() == TQEvent::KeyPress)
{
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 1a8dccc0..a043a60d 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -272,7 +272,7 @@ void KviMdiChild::moveEvent(TQMoveEvent *e)
void KviMdiChild::systemPopupSlot()
{
- if(sender()->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING))
+ if(sender()->inherits("TQToolButton"))
{
emit systemPopupRequest(((TQToolButton *)sender())->mapToGlobal(TQPoint(0,((TQToolButton *)sender())->height())));
} else {
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 296b56fb..fde4914c 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -251,7 +251,7 @@ void KviStatusBar::recalcMinimumHeight()
setMinimumHeight(s);
TQLayout * l = layout();
if(l)
- if(l->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING))
+ if(l->inherits("TQBoxLayout"))
((TQBoxLayout *)l)->addStrut(s);
// FIXME: do TQMainWindow need setUpLayout() here ?
}
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index 5be1f501..636e39d1 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -169,7 +169,7 @@ void KviTextIconWindow::keyPressEvent(TQKeyEvent *e)
((KviInputEditor *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits("KviInput"))
((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();
tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem);
@@ -192,7 +192,7 @@ void KviTextIconWindow::keyPressEvent(TQKeyEvent *e)
((KviInputEditor *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits("KviInput"))
((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();
tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem);
@@ -246,7 +246,7 @@ void KviTextIconWindow::itemSelected(KviTalIconViewItem * 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();
TQString szItem = item->text();
szItem.append(' ');
@@ -255,7 +255,7 @@ void KviTextIconWindow::itemSelected(KviTalIconViewItem * item)
((KviInputEditor *)m_pOwner)->insertText(szItem);
else if(m_pOwner->inherits("KviInput"))
((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();
tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem);
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 3267679f..ec48aa39 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -745,7 +745,7 @@ void KviTopicWidget::deactivate()
w = parent();
if(w)
{
- if(w->inherits(TQWIDGET_OBJECT_NAME_STRING))
+ if(w->inherits("TQWidget"))
((TQWidget *)w)->setFocus();
}
}
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index f37bc254..8384f8c9 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -228,7 +228,7 @@ bool KviWindow::hasAttention()
// Handle the special case of the dialogs then
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!
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);
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();
if(!m_pCryptControllerButton)
return;
diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp
index 7b7e56d8..784b0b22 100644
--- a/src/modules/mediaplayer/mp_dcopinterface.cpp
+++ b/src/modules/mediaplayer/mp_dcopinterface.cpp
@@ -103,7 +103,7 @@ bool KviMediaPlayerDCOPInterface::stringRetDCOPCall(const KviTQCString &szObj,co
if(!g_pApp->dcopClient()->call(m_szAppId,szObj,szFunc,data,replyType,replyData))
return false;
TQDataStream reply( replyData, IO_ReadOnly );
- if(replyType == TQSTRING_OBJECT_NAME_STRING)
+ if(replyType == "TQString")
{
reply >> ret;
return true;
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 6a9912ae..5f28da7d 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -339,11 +339,11 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
{
#endif
TQString szText;
- if(o->inherits(TQLABEL_OBJECT_NAME_STRING))szText = ((TQLabel *)o)->text();
- else if(o->inherits(TQCHECKBOX_OBJECT_NAME_STRING))szText = ((TQCheckBox *)o)->text();
+ if(o->inherits("TQLabel"))szText = ((TQLabel *)o)->text();
+ else if(o->inherits("TQCheckBox"))szText = ((TQCheckBox *)o)->text();
else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
#ifdef COMPILE_INFO_TIPS
- if(o->inherits(TQWIDGET_OBJECT_NAME_STRING))
+ if(o->inherits("TQWidget"))
#ifdef COMPILE_USE_QT4
szText.append(((TQWidget *)o)->toolTip());
#else
@@ -370,7 +370,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
bFoundSomethingHere = true;
}
- if(o->inherits(TQWIDGET_OBJECT_NAME_STRING))
+ if(o->inherits("TQWidget"))
{
TQWidget* pWidget=(TQWidget*)o;
TQFont font = pWidget->font();
@@ -382,7 +382,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
TQObject * pParent = pWidget->parent();
while(pParent)
{
- if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ if(pParent->inherits("TQTabWidget"))
{
pTabWidgetToMark = (TQTabWidget *)pParent;
break;
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index d8ebcfd6..2ecb47a8 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -496,7 +496,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
return false;
}
ds << iii;
- } else if(kvi_strEqualCI(TQSTRING_OBJECT_NAME_STRING,szType.ptr()))
+ } else if(kvi_strEqualCI("TQString",szType.ptr()))
{
TQString ddd = tmp.ptr();
ds << ddd;
@@ -543,7 +543,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
bool bqw;
ret >> bqw;
c->returnValue()->setInteger(bqw ? 1 : 0);
- } else if(szRetType == TQSTRING_OBJECT_NAME_STRING)
+ } else if(szRetType == "TQString")
{
TQString szz;
ret >> szz;
@@ -577,7 +577,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
}
c->returnValue()->setArray(arry);
#endif
- } else if(szRetType == TQSTRINGLIST_OBJECT_NAME_STRING)
+ } else if(szRetType == "TQStringList")
{
TQStringList csl;
ret >> csl;