From b9c04ba54379dd414e943279ee381fa2b19694dc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:49:38 -0600 Subject: Rename KLock and KTrader to avoid conflicts with KDE4 --- tdescreensaver/tdepartsaver/tdepartsaver.cpp | 4 ++-- tdescreensaver/xsavers/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp index e857623e..3b78e7bd 100644 --- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp +++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp @@ -171,8 +171,8 @@ bool KPartSaver::openURL( KURL url ) TQString mime = KMimeType::findByURL( url )->name(); // find fitting tdeparts - KTrader::OfferList offers; - offers = KTrader::self()->query( mime, "'KParts/ReadOnlyPart' in ServiceTypes" ); + TDETrader::OfferList offers; + offers = TDETrader::self()->query( mime, "'KParts/ReadOnlyPart' in ServiceTypes" ); if( offers.count()==0 ) { kdDebug() << "Can't find proper kpart for " << mime << endl; return false; diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp index 91a88731..9ac848f9 100644 --- a/tdescreensaver/xsavers/main.cpp +++ b/tdescreensaver/xsavers/main.cpp @@ -49,7 +49,7 @@ static void crashHandler( int /*sig*/ ) int main(int argc, char *argv[]) { - TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("KLock"), description, version); + TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("TDELock"), description, version); TDECmdLineArgs::addCmdLineOptions(options); -- cgit v1.2.1