summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/stdaddressbook.cpp17
-rw-r--r--kaddressbook/mainembedded.cpp4
-rw-r--r--korganizer/main.cpp4
3 files changed, 9 insertions, 16 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 144a9dc..075f12f 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -22,26 +22,13 @@
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
-/*US
-#include <stdlib.h>
-
-#include <kapplication.h>
-#include <kcrash.h>
-#include <ksimpleconfig.h>
-*/
-
-#ifndef DESKTOP_VERSION
-#include <qpe/global.h>
-#else
#include <qdir.h>
-#endif
-
#include "resource.h"
#include <kresources/manager.h>
#include <kdebug.h>
#include <klocale.h>
#include <kstaticdeleter.h>
#include <kstandarddirs.h>
@@ -98,13 +85,15 @@ QString StdAddressBook::setTempAppDir()
if ( appdir.right(1) == "\\" || appdir.right(1) == "/" )
appdir += "kaddressbook/";
else
appdir += "/kaddressbook/";
KStandardDirs::setAppDir( QDir::convertSeparators( appdir ));
#else
- KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) );
+ QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook";
+
+ KStandardDirs::setAppDir( appdir );
#endif
return appDIR;
}
StdAddressBook *StdAddressBook::self( bool onlyFastResources )
{
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 3f6f69d..47b5484 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -37,13 +37,15 @@ int main( int argc, char **argv )
}
}
if ( ! exitHelp ) {
KGlobal::setAppName( "kaddressbook" );
#ifndef DESKTOP_VERSION
- KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) );
+ QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName();
+
+ KStandardDirs::setAppDir( appdir );
KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
#else
QString fileName ;
#ifndef _WIN32_
fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons16/";
#else
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 6843595..a357988 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -54,13 +54,15 @@ int main( int argc, char **argv )
if ( ! exitHelp ) {
KGlobal::setAppName( "korganizer" );
QString fileName ;
#ifndef DESKTOP_VERSION
- KStandardDirs::setAppDir( Global::applicationFileName( "korganizer", "" ) );
+ QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName();
+ KStandardDirs::setAppDir( appdir );
+
fileName = getenv("QPEDIR");
KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/");
#else
#ifndef _WIN32_
fileName = qApp->applicationDirPath () + "/kdepim/korganizer/";