diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
| commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
| tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /konqueror/client | |
| parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
| download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/client')
| -rw-r--r-- | konqueror/client/kfmclient.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 899d27f84..f5586af62 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -165,7 +165,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) is configured to reuse always, or it's not configured to never reuse, and the URL to-be-opened is "safe". The URL is safe, if the view used to view it is listed in the allowed KPart's. - In order to find out the part, mimetype is needed, and KTrader is needed. + In order to find out the part, mimetype is needed, and TDETrader is needed. If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote URLs, but oh well). Since this function may be running without a TDEApplication instance, I'm actually quite surprised it works, and it may sooner or later break. @@ -222,7 +222,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& } if( mimetype.isEmpty()) mimetype = KMimeType::findByURL( KURL( url ) )->name(); - KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), + TDETrader::OfferList offers = TDETrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), TQString::null, TQString::null ); KService::Ptr serv; if( offers.count() > 0 ) @@ -529,7 +529,7 @@ bool clientApp::doIt() { KURL::List urls; urls.append( args->url(1) ); - const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); + const TDETrader::OfferList offers = TDETrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); if (offers.isEmpty()) return 1; KService::Ptr serv = offers.first(); return KRun::run( *serv, urls ); |