summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:38 -0600
commitb9c04ba54379dd414e943279ee381fa2b19694dc (patch)
treebc003a64e89141be4944e78f1a10bd7e4767f609
parent92069edc82697c57790ceed98e2d87d240f62033 (diff)
downloadtdeartwork-b9c04ba54379dd414e943279ee381fa2b19694dc.tar.gz
tdeartwork-b9c04ba54379dd414e943279ee381fa2b19694dc.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--tdescreensaver/tdepartsaver/tdepartsaver.cpp4
-rw-r--r--tdescreensaver/xsavers/main.cpp2
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);