diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-11 21:03:51 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-11 21:03:51 +0900 |
| commit | 1e6b97e1b1d29b0a895643eb9ce7ffe08d6fed75 (patch) | |
| tree | 46b09379b11042db5eabc22c961163f2135b12a3 /src/modules | |
| parent | 641ffc9497f5a0e756aa13cb6b4fcf32046a43b6 (diff) | |
| download | kvirc-1e6b97e1b1d29b0a895643eb9ce7ffe08d6fed75.tar.gz kvirc-1e6b97e1b1d29b0a895643eb9ce7ffe08d6fed75.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>
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/mediaplayer/mp_dcopinterface.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/dialog.cpp | 10 | ||||
| -rw-r--r-- | src/modules/system/libkvisystem.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
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; |