From 5415db4a06862b57539de051e2e82c8d8f3a5b48 Mon Sep 17 00:00:00 2001 From: zautrix Date: Sat, 23 Oct 2004 15:37:38 +0000 Subject: compile fixes --- diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 0fdc3e4..e8fd2d1 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp @@ -36,6 +36,7 @@ $Id$ #include #include +#include #include #include #include "kpimglobalprefs.h" @@ -111,9 +112,9 @@ void KPimGlobalPrefs::setGlobalConfig() 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; + 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 @@ -55,7 +55,11 @@ #include 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: @@ -70,7 +74,6 @@ static NOREGPARM void sig_handler(int signum) - PwMInit::PwMInit(PwMApplication *_app) : runStatus (unknown) , _curWidget (0) -- cgit v0.9.0.2