From f0d0dabf77ba63a31a571ba73c9374be5f262c21 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 12 Jul 2023 11:29:02 +0900 Subject: Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3. Signed-off-by: Michele Calgaro (cherry picked from commit 75b9f40221399ae82b0169494af7db6d35d0a070) --- kopete/kopete/chatwindow/emoticonselector.cpp | 2 +- kopete/kopete/chatwindow/kopeteemoticonaction.cpp | 4 +- kopete/libkopete/kautoconfig.cpp | 46 +++++++++++------------ kopete/plugins/nowlistening/nlamarok.cpp | 6 +-- kopete/plugins/nowlistening/nljuk.cpp | 6 +-- kopete/plugins/nowlistening/nlkaffeine.cpp | 6 +-- kopete/plugins/nowlistening/nlkscd.cpp | 6 +-- kopete/plugins/nowlistening/nlnoatun.cpp | 4 +- 8 files changed, 40 insertions(+), 40 deletions(-) (limited to 'kopete') diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp index 21a24c3e..fac6fc40 100644 --- a/kopete/kopete/chatwindow/emoticonselector.cpp +++ b/kopete/kopete/chatwindow/emoticonselector.cpp @@ -109,7 +109,7 @@ void EmoticonSelector::emoticonClicked(const TQString &str) // KDE4/TQt TODO: use qobject_cast instead. emit ItemSelected ( str ); if ( isVisible() && parentWidget() && - parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + parentWidget()->inherits("TQPopupMenu") ) { parentWidget()->close(); } diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index 8f9447f9..e53d27e4 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -136,7 +136,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) // kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl; // KDE4/TQt TODO: Use qobject_cast instead. - if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( widget->inherits("TQPopupMenu") ) { TQPopupMenu* menu = static_cast( widget ); int id; @@ -202,7 +202,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) return containerCount() - 1; } // KDE4/TQt TODO: Use qobject_cast instead. - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) ) { TQMenuBar *bar = static_cast( widget ); diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index 9570f15c..23215008 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -86,11 +86,11 @@ public: TQAsciiDict ignoreTheseWidgets; void init(){ - ignoreTheseWidgets.insert(TQLABEL_OBJECT_NAME_STRING, new int(1)); - ignoreTheseWidgets.insert(TQFRAME_OBJECT_NAME_STRING, new int(2)); - ignoreTheseWidgets.insert(TQGROUPBOX_OBJECT_NAME_STRING, new int(3)); - ignoreTheseWidgets.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, new int(4)); - ignoreTheseWidgets.insert(TQWIDGET_OBJECT_NAME_STRING, new int(5)); + ignoreTheseWidgets.insert("TQLabel", new int(1)); + ignoreTheseWidgets.insert("TQFrame", new int(2)); + ignoreTheseWidgets.insert("TQGroupBox", new int(3)); + ignoreTheseWidgets.insert("TQButtonGroup", new int(4)); + ignoreTheseWidgets.insert("TQWidget", new int(5)); ignoreTheseWidgets.setAutoDelete(true); static bool defaultKDEPropertyMapInstalled = false; @@ -141,25 +141,25 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){ if(trackChanges){ // QT - changedMap.insert(TQString::fromLatin1(TQBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1(TQPUSHBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(activated (int))); + changedMap.insert(TQString::fromLatin1("TQButton"), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQCheckBox"), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQPushButton"), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQRadioButton"), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1(TQDATEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQString::fromLatin1(TQDATETIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1(TQTIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1(TQTEXTBROWSER_OBJECT_NAME_STRING), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1(TQMULTILINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1(TQLISTBOX_OBJECT_NAME_STRING), TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQString::fromLatin1(TQTABWIDGET_OBJECT_NAME_STRING), TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1("TQDateEdit"), TQT_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert(TQString::fromLatin1("TQDateTimeEdit"), TQT_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert(TQString::fromLatin1("TQDial"), TQT_SIGNAL(valueChanged (int))); + changedMap.insert(TQString::fromLatin1("TQLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1("TQSlider"), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::fromLatin1("TQSpinBox"), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::fromLatin1("TQTimeEdit"), TQT_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert(TQString::fromLatin1("TQTextEdit"), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::fromLatin1("TQTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1("TQMultiLineEdit"), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::fromLatin1("TQListBox"), TQT_SIGNAL(selectionChanged())); + changedMap.insert(TQString::fromLatin1("TQTabWidget"), TQT_SIGNAL(currentChanged(TQWidget *))); // KDE changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); diff --git a/kopete/plugins/nowlistening/nlamarok.cpp b/kopete/plugins/nowlistening/nlamarok.cpp index 348217bc..9101758c 100644 --- a/kopete/plugins/nowlistening/nlamarok.cpp +++ b/kopete/plugins/nowlistening/nlamarok.cpp @@ -91,7 +91,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> newTrack; } } @@ -107,7 +107,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> m_album; } } @@ -117,7 +117,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> m_artist; } } diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp index 78d6914b..422e0db9 100644 --- a/kopete/plugins/nowlistening/nljuk.cpp +++ b/kopete/plugins/nowlistening/nljuk.cpp @@ -64,7 +64,7 @@ void NLJuk::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> m_album; } } @@ -78,7 +78,7 @@ void NLJuk::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> m_artist; } } @@ -92,7 +92,7 @@ void NLJuk::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> newTrack; } } diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp index 77dd84cb..20ba1a79 100644 --- a/kopete/plugins/nowlistening/nlkaffeine.cpp +++ b/kopete/plugins/nowlistening/nlkaffeine.cpp @@ -85,7 +85,7 @@ void NLKaffeine::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> newTrack; } } @@ -105,7 +105,7 @@ void NLKaffeine::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> m_album; } } @@ -115,7 +115,7 @@ void NLKaffeine::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> m_artist; } } diff --git a/kopete/plugins/nowlistening/nlkscd.cpp b/kopete/plugins/nowlistening/nlkscd.cpp index 92fb1f38..d2b43f16 100644 --- a/kopete/plugins/nowlistening/nlkscd.cpp +++ b/kopete/plugins/nowlistening/nlkscd.cpp @@ -69,7 +69,7 @@ void NLKscd::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) + if ( replyType == "TQString" ) reply >> m_artist; else kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl; @@ -82,7 +82,7 @@ void NLKscd::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) + if ( replyType == "TQString" ) reply >> m_album; else kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl; @@ -94,7 +94,7 @@ void NLKscd::update() kdDebug( 14307 ) << "NLKscd::update() - there was some error using DCOP." << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> newTrack; //kdDebug( 14307 ) << "the result is: " << newTrack.latin1() // << endl; diff --git a/kopete/plugins/nowlistening/nlnoatun.cpp b/kopete/plugins/nowlistening/nlnoatun.cpp index 84c1d051..44e012ae 100644 --- a/kopete/plugins/nowlistening/nlnoatun.cpp +++ b/kopete/plugins/nowlistening/nlnoatun.cpp @@ -76,7 +76,7 @@ void NLNoatun::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType == "TQString" ) { reply >> newTrack; } else kdDebug( 14307 ) << "NLNoatun::update(), title() returned unexpected reply type!" << endl; @@ -137,7 +137,7 @@ TQString NLNoatun::currentProperty( TQCString appname, TQString property ) const else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) + if ( replyType == "TQString" ) { reply >> result; } -- cgit v1.2.1