| -rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 5 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwminit.cpp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 0fdc3e4..e8fd2d1 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp @@ -37,4 +37,5 @@ $Id$ #include <qregexp.h> #include <qfile.h> +#include <stdlib.h> #include <qtextstream.h> #include <qapplication.h> @@ -112,7 +113,7 @@ void KPimGlobalPrefs::setGlobalConfig() QString name = KGlobal::getAppName() +"/"; #ifndef DESKTOP_VERSION - fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name + fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name; #else - fileName = qApp->applicationDirPath () + "/kdepim/"+ name; + fileName = qApp->applicationDirPath () + "/kdepim/"+ name; #endif mLocaleDict = 0; diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp index 9238c8c..d775aa9 100644 --- a/pwmanager/pwmanager/pwminit.cpp +++ b/pwmanager/pwmanager/pwminit.cpp @@ -56,5 +56,9 @@ static PwMInit *sig_init_pointer; +#ifdef _WIN32_ +static void sig_handler(int signum) +#else static NOREGPARM void sig_handler(int signum) +#endif { switch (signum) { @@ -71,5 +75,4 @@ static NOREGPARM void sig_handler(int signum) - PwMInit::PwMInit(PwMApplication *_app) : runStatus (unknown) |