| author | zautrix <zautrix> | 2004-10-23 15:37:38 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-23 15:37:38 (UTC) |
| commit | 5415db4a06862b57539de051e2e82c8d8f3a5b48 (patch) (side-by-side diff) | |
| tree | a0a5719246aba7d2a5e36b8d8601193ba9e907b3 | |
| parent | 54c77b2331f9afe90643c6d1343a7f5543577b71 (diff) | |
| download | kdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.zip kdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.tar.gz kdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.tar.bz2 | |
compile fixes
| -rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 3 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwminit.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 0fdc3e4..e8fd2d1 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp @@ -33,12 +33,13 @@ $Id$ #include <klocale.h> #include <kdebug.h> #include <kstaticdeleter.h> #include <qregexp.h> #include <qfile.h> +#include <stdlib.h> #include <qtextstream.h> #include <qapplication.h> #include "kpimglobalprefs.h" KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP; @@ -108,13 +109,13 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) void KPimGlobalPrefs::setGlobalConfig() { if ( mLocaleDict == 0 ) { QString fileName ; 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; #endif mLocaleDict = 0; if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) { 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 @@ -52,13 +52,17 @@ #include <kapplication.h> #include <kiconloader.h> #include <signal.h> static PwMInit *sig_init_pointer; +#ifdef _WIN32_ +static void sig_handler(int signum) +#else static NOREGPARM void sig_handler(int signum) +#endif { switch (signum) { case SIGINT: case SIGTERM: sig_init_pointer->shutdownApp(20 + signum); break; @@ -67,13 +71,12 @@ static NOREGPARM void sig_handler(int signum) + tostr(signum)); } } - PwMInit::PwMInit(PwMApplication *_app) : runStatus (unknown) , _curWidget (0) , _dcopClient (0) , _kwalletEmu (0) , _keycard (0) |