summaryrefslogtreecommitdiffstats
path: root/tdecore/kapplication.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:28:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:28:26 -0600
commitd3afa6baf98ef5ac191996cc9b909ff9074c168c (patch)
treea1e1247371cd17715f83036a3664755206ab9ba2 /tdecore/kapplication.cpp
parent12f3d421cd2991c0e3f96994efb836ce244172ff (diff)
downloadtdelibs-d3afa6baf98ef5ac191996cc9b909ff9074c168c.tar.gz
tdelibs-d3afa6baf98ef5ac191996cc9b909ff9074c168c.zip
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'tdecore/kapplication.cpp')
-rw-r--r--tdecore/kapplication.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index bd17e972a..fb8dfcf6d 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -1013,7 +1013,7 @@ void TDEApplication::init(bool GUIenabled)
setReverseLayout( !rtl );
// install appdata resource type
- TDEGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data")
+ TDEGlobal::dirs()->addResourceType("appdata", TDEStandardDirs::kde_default("data")
+ TQString::fromLatin1(name()) + '/');
pSessionConfig = 0L;
bSessionManagement = true;
@@ -1346,7 +1346,7 @@ static void checkRestartVersion( TQSessionManager& sm )
}
}
}
- TQString wrapper = KStandardDirs::findExe( "trinity" );
+ TQString wrapper = TDEStandardDirs::findExe( "trinity" );
TQStringList restartCommand = sm.restartCommand();
restartCommand.prepend( wrapper );
sm.setRestartCommand( restartCommand );
@@ -1451,9 +1451,9 @@ void TDEApplication::startKdeinit()
return; // whoever held the lock has already started dcopserver
}
// Try to launch tdeinit.
- TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"));
+ TQString srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"));
if (srv.isEmpty())
- srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir());
+ srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir());
if (srv.isEmpty())
return;
if (kapp && (Tty != kapp->type()))