diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:25 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:25 -0600 |
commit | da1941ccadffe5ae70ee111c53f0ec2b3d990869 (patch) | |
tree | ee683f46b49e6abdbdef78ed45ca65b47538bc23 /lib | |
parent | 054f5901ab09f6ea6235bd12fbd167922fdf0f67 (diff) | |
download | tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.tar.gz tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'lib')
-rw-r--r-- | lib/interfaces/kdevplugin.h | 4 | ||||
-rw-r--r-- | lib/interfaces/kdevplugincontroller.cpp | 6 | ||||
-rw-r--r-- | lib/interfaces/kdevplugincontroller.h | 6 | ||||
-rw-r--r-- | lib/interfaces/kdevplugininfo.cpp | 4 | ||||
-rw-r--r-- | lib/util/tdescriptactionmanager.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index b0cb3a8f..6ff5b462 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -69,7 +69,7 @@ X-TDevelop-Properties= X-TDevelop-Args= @endcode <b>Description of parameters in .desktop file:</b> -- <i>Name</i> is a non-translatable name of a plugin, it is used in KTrader queries +- <i>Name</i> is a non-translatable name of a plugin, it is used in TDETrader queries to search for a plugin (required); - <i>GenericName</i> is a translatable name of a plugin, it is used to show plugin names in GUI (required); @@ -165,7 +165,7 @@ public: is usually derived from a certain base class and not directly from KDevPlugin. @param serviceType The service type of an extension (like "TDevelop/SourceFormatter"). @param constraint The constraint which is applied when quering for the service. This - constraint is a usual KTrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'"). + constraint is a usual TDETrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'"). @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/ template <class Extension> Extension *extension(const TQString &serviceType, const TQString &constraint = "") diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index dfc326a1..02938bb6 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -24,14 +24,14 @@ KDevPluginController::KDevPluginController() { } -KTrader::OfferList KDevPluginController::query(const TQString &serviceType, +TDETrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { - return KTrader::self()->query(serviceType, + return TDETrader::self()->query(serviceType, TQString("%1 and [X-TDevelop-Version] == %2").arg(constraint).arg(TDEVELOP_PLUGIN_VERSION)); } -KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) +TDETrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) { return query("TDevelop/Plugin", constraint); } diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h index 6097e2c1..5fd75c6f 100644 --- a/lib/interfaces/kdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -68,7 +68,7 @@ public: required in .desktop file for that plugin. @param serviceType The service type of an extension (like "TDevelop/SourceFormatter") @param constraint The constraint which is applied when quering for the service. This - constraint is a usual KTrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'"). + constraint is a usual TDETrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'"). @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/ virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0; @@ -79,14 +79,14 @@ public: @param constraint A constraint for the service. Do not include plugin version number - it is done automatically. @return The list of plugin offers.*/ - static KTrader::OfferList query(const TQString &serviceType, const TQString &constraint); + static TDETrader::OfferList query(const TQString &serviceType, const TQString &constraint); /**Queries TDevelop plugins. Works like KDevPluginController::query with serviceType set to "TDevelop/Plugin". @param constraint A constraint for the service. Do not include plugin version number - it is done automatically. @return The list of plugin offers.*/ - static KTrader::OfferList queryPlugins(const TQString &constraint); + static TDETrader::OfferList queryPlugins(const TQString &constraint); /**Reimplement this function only if your shell supports plugin profiles. @return The list of URLs to the profile resources (files) with given @p extension. diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index 4af7fb8e..3216537d 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const TQVariant KDevPluginInfo::property(const TQString &name) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); + TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); return TQVariant(); @@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const TQStringList KDevPluginInfo::propertyNames( ) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); + TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); return TQStringList(); diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index 3b0aa8ac..619b974d 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -49,7 +49,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter m_scriptName = desktop.readName(); m_scriptType = desktop.readType(); TQString scriptTypeQuery = "([X-TDE-Script-Runner] == '" + m_scriptType + "')"; - KTrader::OfferList offers = KTrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); + TDETrader::OfferList offers = TDETrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { m_action = new KAction(m_scriptName, KShortcut(), this, TQT_SLOT(activate()), ac, "script"); |