summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/kpimglobalprefs.cpp5
-rw-r--r--pwmanager/pwmanager/pwminit.cpp5
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
@@ -38,2 +38,3 @@ $Id$
#include <qfile.h>
+#include <stdlib.h>
#include <qtextstream.h>
@@ -113,5 +114,5 @@ void KPimGlobalPrefs::setGlobalConfig()
#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
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
@@ -57,3 +57,7 @@
static PwMInit *sig_init_pointer;
+#ifdef _WIN32_
+static void sig_handler(int signum)
+#else
static NOREGPARM void sig_handler(int signum)
+#endif
{
@@ -72,3 +76,2 @@ static NOREGPARM void sig_handler(int signum)
-
PwMInit::PwMInit(PwMApplication *_app)