diff options
| -rw-r--r-- | kate/filetemplates/plugin/filetemplates.h | 2 | ||||
| -rw-r--r-- | kate/tabbarextension/plugin_katetabbarextension.h | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/amarokInterface.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/jukInterface.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/kscdInterface.cpp | 6 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/noatunInterface.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index 6335fbe..621d5ff 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -45,7 +45,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static TDEInstance* s_instance; diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index 0d16d69..8cbd944 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -68,7 +68,7 @@ class KatePluginFactory : public KLibFactory virtual ~KatePluginFactory() { delete s_instance; } virtual TQObject* createObject(TQObject *parent = 0, const char *pname = 0, - const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + const char *name = "TQObject", const TQStringList &args = TQStringList()); private: static TDEInstance* s_instance; diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index e2265a7..f52ae4b 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -242,7 +242,7 @@ const TQString AmarokInterface::getTrackTitle() const else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { reply >> title; return title; diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index e19ef3f..ce9de9f 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -265,7 +265,7 @@ const TQString JuKInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { reply >> title; return title; diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index 710674d..5b846c9 100644 --- a/kicker-applets/mediacontrol/kscdInterface.cpp +++ b/kicker-applets/mediacontrol/kscdInterface.cpp @@ -213,7 +213,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { reply >> title; } @@ -224,7 +224,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { reply >> album; } @@ -235,7 +235,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { reply >> artist; } diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index 409ead8..61b7b14 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -259,7 +259,7 @@ const TQString NoatunInterface::getTrackTitle() const replyData, false, 200)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") reply >> title; } return title; diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 89e6e52..0a3c271 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -215,7 +215,7 @@ TQString MetabarWidget::getCurrentURL() if (reply.isValid()) { TQString url; - reply.get(url, TQSTRING_OBJECT_NAME_STRING); + reply.get(url, "TQString"); if(!url.isNull() && !url.isEmpty()){ return url; diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index b9f56a0..b83e759 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -229,7 +229,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url ) bool enabled = false; - if ( replyType == TQSTRING_OBJECT_NAME_STRING ) + if ( replyType == "TQString" ) { TQString advice; TQDataStream s( reply, IO_ReadOnly ); |