summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-23 15:37:38 (UTC)
committer zautrix <zautrix>2004-10-23 15:37:38 (UTC)
commit5415db4a06862b57539de051e2e82c8d8f3a5b48 (patch) (unidiff)
treea0a5719246aba7d2a5e36b8d8601193ba9e907b3
parent54c77b2331f9afe90643c6d1343a7f5543577b71 (diff)
downloadkdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.zip
kdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.tar.gz
kdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.tar.bz2
compile fixes
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
@@ -37,4 +37,5 @@ $Id$
37#include <qregexp.h> 37#include <qregexp.h>
38#include <qfile.h> 38#include <qfile.h>
39#include <stdlib.h>
39#include <qtextstream.h> 40#include <qtextstream.h>
40#include <qapplication.h> 41#include <qapplication.h>
@@ -112,7 +113,7 @@ void KPimGlobalPrefs::setGlobalConfig()
112 QString name = KGlobal::getAppName() +"/"; 113 QString name = KGlobal::getAppName() +"/";
113#ifndef DESKTOP_VERSION 114#ifndef DESKTOP_VERSION
114 fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name 115 fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name;
115#else 116#else
116 fileName = qApp->applicationDirPath () + "/kdepim/"+ name; 117 fileName = qApp->applicationDirPath () + "/kdepim/"+ name;
117#endif 118#endif
118 mLocaleDict = 0; 119 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 @@
56 56
57static PwMInit *sig_init_pointer; 57static PwMInit *sig_init_pointer;
58#ifdef _WIN32_
59static void sig_handler(int signum)
60#else
58static NOREGPARM void sig_handler(int signum) 61static NOREGPARM void sig_handler(int signum)
62#endif
59{ 63{
60 switch (signum) { 64 switch (signum) {
@@ -71,5 +75,4 @@ static NOREGPARM void sig_handler(int signum)
71 75
72 76
73
74PwMInit::PwMInit(PwMApplication *_app) 77PwMInit::PwMInit(PwMApplication *_app)
75 : runStatus (unknown) 78 : runStatus (unknown)