summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-07-02 15:35:34 (UTC)
committer ulf69 <ulf69>2004-07-02 15:35:34 (UTC)
commitb21b6754c93e5aaa53638a060e26f4efea755d37 (patch) (unidiff)
tree2a78ca54cda74c2bff11c1244741d1bc48994ad6
parentbb7ad945c1541684a02e853fdaabd0e3ba74f8df (diff)
downloadkdepimpi-b21b6754c93e5aaa53638a060e26f4efea755d37.zip
kdepimpi-b21b6754c93e5aaa53638a060e26f4efea755d37.tar.gz
kdepimpi-b21b6754c93e5aaa53638a060e26f4efea755d37.tar.bz2
removed references to Global::applicationFileName because this call creates the appdir
in ~/Applications/ which is not correct for MicroKDE
Diffstat (more/less context) (ignore 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
@@ -20,30 +20,17 @@
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28/*US
29#include <stdlib.h>
30
31#include <kapplication.h>
32#include <kcrash.h>
33#include <ksimpleconfig.h>
34*/
35
36#ifndef DESKTOP_VERSION
37#include <qpe/global.h>
38#else
39#include <qdir.h> 28#include <qdir.h>
40#endif
41
42#include "resource.h" 29#include "resource.h"
43#include <kresources/manager.h> 30#include <kresources/manager.h>
44#include <kdebug.h> 31#include <kdebug.h>
45#include <klocale.h> 32#include <klocale.h>
46#include <kstaticdeleter.h> 33#include <kstaticdeleter.h>
47#include <kstandarddirs.h> 34#include <kstandarddirs.h>
48 35
49#include "stdaddressbook.h" 36#include "stdaddressbook.h"
@@ -96,17 +83,19 @@ QString StdAddressBook::setTempAppDir()
96#ifdef DESKTOP_VERSION 83#ifdef DESKTOP_VERSION
97 QString appdir = QDir::homeDirPath(); 84 QString appdir = QDir::homeDirPath();
98 if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) 85 if ( appdir.right(1) == "\\" || appdir.right(1) == "/" )
99 appdir += "kaddressbook/"; 86 appdir += "kaddressbook/";
100 else 87 else
101 appdir += "/kaddressbook/"; 88 appdir += "/kaddressbook/";
102 KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); 89 KStandardDirs::setAppDir( QDir::convertSeparators( appdir ));
103#else 90#else
104 KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) ); 91 QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook";
92
93 KStandardDirs::setAppDir( appdir );
105#endif 94#endif
106 95
107 return appDIR; 96 return appDIR;
108} 97}
109StdAddressBook *StdAddressBook::self( bool onlyFastResources ) 98StdAddressBook *StdAddressBook::self( bool onlyFastResources )
110{ 99{
111 100
112 if ( !mSelf ) 101 if ( !mSelf )
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 3f6f69d..47b5484 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -35,17 +35,19 @@ int main( int argc, char **argv )
35 printf(" KA/E is exiting now. Bye!\n"); 35 printf(" KA/E is exiting now. Bye!\n");
36 exitHelp = true; 36 exitHelp = true;
37 } 37 }
38 } 38 }
39 if ( ! exitHelp ) { 39 if ( ! exitHelp ) {
40 40
41 KGlobal::setAppName( "kaddressbook" ); 41 KGlobal::setAppName( "kaddressbook" );
42#ifndef DESKTOP_VERSION 42#ifndef DESKTOP_VERSION
43 KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) ); 43 QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName();
44
45 KStandardDirs::setAppDir( appdir );
44 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); 46 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
45#else 47#else
46 QString fileName ; 48 QString fileName ;
47#ifndef _WIN32_ 49#ifndef _WIN32_
48 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons16/"; 50 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons16/";
49#else 51#else
50 fileName = qApp->applicationDirPath () + "\\kdepim\\kaddressbook\\icons16\\"; 52 fileName = qApp->applicationDirPath () + "\\kdepim\\kaddressbook\\icons16\\";
51#endif 53#endif
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 6843595..a357988 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -52,17 +52,19 @@ int main( int argc, char **argv )
52 } 52 }
53 } 53 }
54 if ( ! exitHelp ) { 54 if ( ! exitHelp ) {
55 KGlobal::setAppName( "korganizer" ); 55 KGlobal::setAppName( "korganizer" );
56 56
57 57
58 QString fileName ; 58 QString fileName ;
59#ifndef DESKTOP_VERSION 59#ifndef DESKTOP_VERSION
60 KStandardDirs::setAppDir( Global::applicationFileName( "korganizer", "" ) ); 60 QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName();
61 KStandardDirs::setAppDir( appdir );
62
61 fileName = getenv("QPEDIR"); 63 fileName = getenv("QPEDIR");
62 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/"); 64 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/");
63#else 65#else
64 66
65#ifndef _WIN32_ 67#ifndef _WIN32_
66 fileName = qApp->applicationDirPath () + "/kdepim/korganizer/"; 68 fileName = qApp->applicationDirPath () + "/kdepim/korganizer/";
67#else 69#else
68 fileName = qApp->applicationDirPath () + "\\kdepim\\korganizer\\"; 70 fileName = qApp->applicationDirPath () + "\\kdepim\\korganizer\\";