diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:32 -0600 |
| commit | 0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch) | |
| tree | 4305105967fc03b06139b57871d5ab6d2360e75b /tdeutils | |
| parent | 59d153016be1e09cb31cdb18bef0a649acfc6292 (diff) | |
| download | tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tdeutils')
| -rw-r--r-- | tdeutils/Makefile.am | 2 | ||||
| -rw-r--r-- | tdeutils/kplugininfo.cpp | 2 | ||||
| -rw-r--r-- | tdeutils/ksettings/dialog.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tdeutils/Makefile.am b/tdeutils/Makefile.am index 9bc3e2e49..b8ae57de2 100644 --- a/tdeutils/Makefile.am +++ b/tdeutils/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes) lib_LTLIBRARIES = libtdeutils.la libtdeutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 -# Needs KTrader +# Needs TDETrader libtdeutils_la_LIBADD = ../tdeio/libtdeio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11) libtdeutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \ diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp index 2b4079bb8..cb93b2600 100644 --- a/tdeutils/kplugininfo.cpp +++ b/tdeutils/kplugininfo.cpp @@ -276,7 +276,7 @@ const TQValueList<KService::Ptr> & KPluginInfo::kcmServices() const { if ( !d->kcmservicesCached ) { - d->kcmservices = KTrader::self()->query( "TDECModule", "'" + d->pluginName + + d->kcmservices = TDETrader::self()->query( "TDECModule", "'" + d->pluginName + "' in [X-TDE-ParentComponents]" ); kdDebug( 703 ) << "found " << d->kcmservices.count() << " offers for " << d->pluginName << endl; diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp index e3bfa579f..77e05e245 100644 --- a/tdeutils/ksettings/dialog.cpp +++ b/tdeutils/ksettings/dialog.cpp @@ -467,7 +467,7 @@ TQValueList<KService::Ptr> Dialog::parentComponentsServices( constraint = "('" + constraint + "' in [X-TDE-ParentComponents])"; kdDebug( 700 ) << "constraint = " << constraint << endl; - return KTrader::self()->query( "TDECModule", constraint ); + return TDETrader::self()->query( "TDECModule", constraint ); } bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const |