| author | zautrix <zautrix> | 2004-07-03 16:12:29 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-07-03 16:12:29 (UTC) |
| commit | a95f7085c5dd7234c254750e32e44941599f3390 (patch) (side-by-side diff) | |
| tree | 1631703e01dbf2033394e4b71bc753b562528a67 | |
| parent | 9172a6c3325e2de04c72c53cdd760bd1efa46611 (diff) | |
| download | kdepimpi-a95f7085c5dd7234c254750e32e44941599f3390.zip kdepimpi-a95f7085c5dd7234c254750e32e44941599f3390.tar.gz kdepimpi-a95f7085c5dd7234c254750e32e44941599f3390.tar.bz2 | |
Mainembedded cleaned up
| -rw-r--r-- | kaddressbook/mainembedded.cpp | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 47b5484..b7d6b2b 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -2,3 +2,2 @@ #include <qpe/qpeapplication.h> -#include <qpe/global.h> #include <stdlib.h> @@ -42,5 +41,2 @@ int main( int argc, char **argv ) #ifndef DESKTOP_VERSION - QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName(); - - KStandardDirs::setAppDir( appdir ); KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); @@ -48,20 +44,7 @@ int main( int argc, char **argv ) QString fileName ; -#ifndef _WIN32_ - fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons16/"; -#else - fileName = qApp->applicationDirPath () + "\\kdepim\\kaddressbook\\icons16\\"; -#endif - KGlobal::iconLoader()->setIconPath(fileName); - QString appdir = QDir::homeDirPath(); - if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) - appdir += "kaddressbook"; - else - appdir += "/kaddressbook"; - KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); - // qDebug(" %s ",KStandardDirs::appDir().latin1() ); -#endif // desktop - QDir app_dir; - if ( !app_dir.exists(KStandardDirs::appDir()) ) - app_dir.mkdir (KStandardDirs::appDir()); + fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/"; + KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); +#endif + KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); KAddressBookMain* m = new KAddressBookMain(); @@ -73,3 +56,2 @@ int main( int argc, char **argv ) m->showMaximized(); - #else |