summaryrefslogtreecommitdiffstats
path: root/src/gui/application/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/application/main.cpp')
-rw-r--r--src/gui/application/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 72729a2..65172d4 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -29,9 +29,9 @@
#include <dcopclient.h>
#include <tdeconfig.h>
#include <tdemessagebox.h>
-#include <kstddirs.h>
+#include <tdestandarddirs.h>
#include <ktip.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeglobalsettings.h>
#include <tqstringlist.h>
@@ -494,7 +494,7 @@ int main(int argc, char *argv[])
testInstalledVersion();
}
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup(GeneralOptionsConfigGroup);
TQString lastVersion = config->readEntry("lastversion", "");
@@ -544,7 +544,7 @@ int main(int argc, char *argv[])
config->setGroup(GeneralOptionsConfigGroup);
int install = config->readNumEntry("Install Own Theme", 1);
if (install == 2 || (install == 1 && !getenv("TDE_FULL_SESSION"))) {
- kapp->setStyle(new KlearlookStyle);
+ tdeApp->setStyle(new KlearlookStyle);
}
// Show Startup logo
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
// See if the config wants us to control JACK
//
- if (config->readBoolEntry("Logo", true) && (!kapp->isRestored() && args->isSet("splash")) ) {
+ if (config->readBoolEntry("Logo", true) && (!tdeApp->isRestored() && args->isSet("splash")) ) {
RG_DEBUG << k_funcinfo << "Showing startup logo\n";
startLogo = TDEStartupLogo::getInstance();
startLogo->setShowTip(!newVersion);
@@ -735,6 +735,6 @@ int main(int argc, char *argv[])
CurrentProgressDialog::thaw();
}
- return kapp->exec();
+ return tdeApp->exec();
}