author | zautrix <zautrix> | 2004-10-23 15:37:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 15:37:38 (UTC) |
commit | 5415db4a06862b57539de051e2e82c8d8f3a5b48 (patch) (unidiff) | |
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 | 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 | |||
@@ -35,8 +35,9 @@ $Id$ | |||
35 | #include <kstaticdeleter.h> | 35 | #include <kstaticdeleter.h> |
36 | 36 | ||
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> |
41 | #include "kpimglobalprefs.h" | 42 | #include "kpimglobalprefs.h" |
42 | 43 | ||
@@ -110,11 +111,11 @@ void KPimGlobalPrefs::setGlobalConfig() | |||
110 | if ( mLocaleDict == 0 ) { | 111 | if ( mLocaleDict == 0 ) { |
111 | QString fileName ; | 112 | QString fileName ; |
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; |
119 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) { | 120 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) { |
120 | 121 | ||
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 | |||
@@ -54,9 +54,13 @@ | |||
54 | 54 | ||
55 | #include <signal.h> | 55 | #include <signal.h> |
56 | 56 | ||
57 | static PwMInit *sig_init_pointer; | 57 | static PwMInit *sig_init_pointer; |
58 | #ifdef _WIN32_ | ||
59 | static void sig_handler(int signum) | ||
60 | #else | ||
58 | static NOREGPARM void sig_handler(int signum) | 61 | static NOREGPARM void sig_handler(int signum) |
62 | #endif | ||
59 | { | 63 | { |
60 | switch (signum) { | 64 | switch (signum) { |
61 | case SIGINT: | 65 | case SIGINT: |
62 | case SIGTERM: | 66 | case SIGTERM: |
@@ -69,9 +73,8 @@ static NOREGPARM void sig_handler(int signum) | |||
69 | } | 73 | } |
70 | 74 | ||
71 | 75 | ||
72 | 76 | ||
73 | |||
74 | PwMInit::PwMInit(PwMApplication *_app) | 77 | PwMInit::PwMInit(PwMApplication *_app) |
75 | : runStatus (unknown) | 78 | : runStatus (unknown) |
76 | , _curWidget (0) | 79 | , _curWidget (0) |
77 | , _dcopClient (0) | 80 | , _dcopClient (0) |