author | zautrix <zautrix> | 2004-08-08 13:35:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-08 13:35:34 (UTC) |
commit | 957c13e21844ca75e337fc1c864554dd2240fc78 (patch) (unidiff) | |
tree | 4e2a2a42116639786d2ff00829f3ad26ab0661b3 | |
parent | 75138e84a2271f8929478853151a6ed4a73fb2cc (diff) | |
download | kdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.zip kdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.tar.gz kdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.tar.bz2 |
Fixed win compile problem
-rw-r--r-- | gammu/emb/common/common.pro | 8 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kcmkdepimconfig.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro index 7cbcb17..0c68000 100644 --- a/gammu/emb/common/common.pro +++ b/gammu/emb/common/common.pro | |||
@@ -82,98 +82,104 @@ HEADERS += config.h \ | |||
82 | device/serial/ser_w32.h \ | 82 | device/serial/ser_w32.h \ |
83 | misc/coding/coding.h \ | 83 | misc/coding/coding.h \ |
84 | misc/coding/md5.h \ | 84 | misc/coding/md5.h \ |
85 | phone/alcatel/alcatel.h \ | 85 | phone/alcatel/alcatel.h \ |
86 | phone/at/atgen.h \ | 86 | phone/at/atgen.h \ |
87 | phone/nokia/ncommon.h \ | 87 | phone/nokia/ncommon.h \ |
88 | phone/nokia/nfunc.h \ | 88 | phone/nokia/nfunc.h \ |
89 | phone/nokia/nfuncold.h \ | 89 | phone/nokia/nfuncold.h \ |
90 | phone/obex/obexgen.h \ | 90 | phone/obex/obexgen.h \ |
91 | phone/symbian/mroutgen.h \ | 91 | phone/symbian/mroutgen.h \ |
92 | protocol/alcatel/alcabus.h \ | 92 | protocol/alcatel/alcabus.h \ |
93 | protocol/at/at.h \ | 93 | protocol/at/at.h \ |
94 | protocol/nokia/fbus2.h \ | 94 | protocol/nokia/fbus2.h \ |
95 | protocol/nokia/mbus2.h \ | 95 | protocol/nokia/mbus2.h \ |
96 | protocol/nokia/phonet.h \ | 96 | protocol/nokia/phonet.h \ |
97 | protocol/obex/obex.h \ | 97 | protocol/obex/obex.h \ |
98 | protocol/symbian/mrouter.h \ | 98 | protocol/symbian/mrouter.h \ |
99 | service/backup/backgen.h \ | 99 | service/backup/backgen.h \ |
100 | service/backup/backics.h \ | 100 | service/backup/backics.h \ |
101 | service/backup/backldif.h \ | 101 | service/backup/backldif.h \ |
102 | service/backup/backlmb.h \ | 102 | service/backup/backlmb.h \ |
103 | service/backup/backtext.h \ | 103 | service/backup/backtext.h \ |
104 | service/backup/backvcf.h \ | 104 | service/backup/backvcf.h \ |
105 | service/backup/backvcs.h \ | 105 | service/backup/backvcs.h \ |
106 | service/backup/gsmback.h \ | 106 | service/backup/gsmback.h \ |
107 | service/sms/gsmems.h \ | 107 | service/sms/gsmems.h \ |
108 | service/sms/gsmmulti.h \ | 108 | service/sms/gsmmulti.h \ |
109 | service/sms/gsmsms.h \ | 109 | service/sms/gsmsms.h \ |
110 | phone/nokia/dct3/dct3comm.h \ | 110 | phone/nokia/dct3/dct3comm.h \ |
111 | phone/nokia/dct3/dct3func.h \ | 111 | phone/nokia/dct3/dct3func.h \ |
112 | phone/nokia/dct3/n6110.h \ | 112 | phone/nokia/dct3/n6110.h \ |
113 | phone/nokia/dct3/n7110.h \ | 113 | phone/nokia/dct3/n7110.h \ |
114 | phone/nokia/dct3/n9210.h \ | 114 | phone/nokia/dct3/n9210.h \ |
115 | phone/nokia/dct4/dct4func.h \ | 115 | phone/nokia/dct4/dct4func.h \ |
116 | phone/nokia/dct4/n3320.h \ | 116 | phone/nokia/dct4/n3320.h \ |
117 | phone/nokia/dct4/n3650.h \ | 117 | phone/nokia/dct4/n3650.h \ |
118 | phone/nokia/dct4/n6510.h | 118 | phone/nokia/dct4/n6510.h |
119 | SOURCES +=gsmcomon.c \ | 119 | SOURCES +=gsmcomon.c \ |
120 | gsmstate.c \ | 120 | gsmstate.c \ |
121 | misc/misc.c \ | 121 | misc/misc.c \ |
122 | misc/cfg.c \ | 122 | misc/cfg.c \ |
123 | misc/coding/coding.c \ | 123 | misc/coding/coding.c \ |
124 | misc/coding/md5.c \ | 124 | misc/coding/md5.c \ |
125 | service/sms/gsmsms.c \ | 125 | service/sms/gsmsms.c \ |
126 | service/sms/gsmems.c \ | 126 | service/sms/gsmems.c \ |
127 | service/sms/gsmmulti.c \ | 127 | service/sms/gsmmulti.c \ |
128 | service/gsmcal.c \ | 128 | service/gsmcal.c \ |
129 | service/gsmdata.c \ | 129 | service/gsmdata.c \ |
130 | service/gsmpbk.c \ | 130 | service/gsmpbk.c \ |
131 | service/gsmring.c \ | 131 | service/gsmring.c \ |
132 | service/gsmlogo.c \ | 132 | service/gsmlogo.c \ |
133 | service/gsmmisc.c \ | 133 | service/gsmmisc.c \ |
134 | service/gsmnet.c \ | 134 | service/gsmnet.c \ |
135 | service/backup/gsmback.c \ | 135 | service/backup/gsmback.c \ |
136 | service/backup/backldif.c \ | 136 | service/backup/backldif.c \ |
137 | service/backup/backlmb.c \ | 137 | service/backup/backlmb.c \ |
138 | service/backup/backtext.c \ | 138 | service/backup/backtext.c \ |
139 | service/backup/backvcs.c \ | 139 | service/backup/backvcs.c \ |
140 | service/backup/backvcf.c \ | 140 | service/backup/backvcf.c \ |
141 | service/backup/backics.c \ | 141 | service/backup/backics.c \ |
142 | device/bluetoth/affix.c \ | 142 | device/bluetoth/affix.c \ |
143 | device/bluetoth/bluez.c \ | 143 | device/bluetoth/bluez.c \ |
144 | device/bluetoth/blue_w32.c \ | 144 | device/bluetoth/blue_w32.c \ |
145 | device/bluetoth/bluetoth.c \ | 145 | device/bluetoth/bluetoth.c \ |
146 | device/serial/ser_unx.c \ | ||
147 | device/serial/ser_djg.c \ | 146 | device/serial/ser_djg.c \ |
148 | device/irda/irda.c \ | 147 | device/irda/irda.c \ |
149 | device/devfunc.c \ | 148 | device/devfunc.c \ |
150 | protocol/at/at.c \ | 149 | protocol/at/at.c \ |
151 | protocol/alcatel/alcabus.c \ | 150 | protocol/alcatel/alcabus.c \ |
152 | protocol/nokia/mbus2.c \ | 151 | protocol/nokia/mbus2.c \ |
153 | protocol/nokia/fbus2.c \ | 152 | protocol/nokia/fbus2.c \ |
154 | protocol/nokia/phonet.c \ | 153 | protocol/nokia/phonet.c \ |
155 | protocol/obex/obex.c \ | 154 | protocol/obex/obex.c \ |
156 | protocol/symbian/mrouter.c \ | 155 | protocol/symbian/mrouter.c \ |
157 | phone/pfunc.c \ | 156 | phone/pfunc.c \ |
158 | phone/at/atgen.c \ | 157 | phone/at/atgen.c \ |
159 | phone/at/siemens.c \ | 158 | phone/at/siemens.c \ |
160 | phone/at/sonyeric.c \ | 159 | phone/at/sonyeric.c \ |
161 | phone/alcatel/alcatel.c \ | 160 | phone/alcatel/alcatel.c \ |
162 | phone/nokia/dct3/n6110.c \ | 161 | phone/nokia/dct3/n6110.c \ |
163 | phone/nokia/dct3/n7110.c \ | 162 | phone/nokia/dct3/n7110.c \ |
164 | phone/nokia/dct3/n9210.c \ | 163 | phone/nokia/dct3/n9210.c \ |
165 | phone/nokia/dct3/dct3func.c \ | 164 | phone/nokia/dct3/dct3func.c \ |
166 | phone/nokia/dct4/n3320.c \ | 165 | phone/nokia/dct4/n3320.c \ |
167 | phone/nokia/dct4/n3650.c \ | 166 | phone/nokia/dct4/n3650.c \ |
168 | phone/nokia/dct4/n6510.c \ | 167 | phone/nokia/dct4/n6510.c \ |
169 | phone/nokia/dct4/dct4func.c \ | 168 | phone/nokia/dct4/dct4func.c \ |
170 | phone/nokia/nauto.c \ | 169 | phone/nokia/nauto.c \ |
171 | phone/nokia/nfunc.c \ | 170 | phone/nokia/nfunc.c \ |
172 | phone/nokia/nfuncold.c \ | 171 | phone/nokia/nfuncold.c \ |
173 | phone/obex/obexgen.c \ | 172 | phone/obex/obexgen.c \ |
174 | phone/symbian/mroutgen.c | 173 | phone/symbian/mroutgen.c |
175 | 174 | ||
176 | TARGET = microgammu | 175 | TARGET = microgammu |
177 | DESTDIR = ../../../bin | 176 | DESTDIR = ../../../bin |
178 | OBJECTS_DIR = obj/unix | 177 | OBJECTS_DIR = obj/unix |
179 | MOC_DIR = moc/unix | 178 | MOC_DIR = moc/unix |
179 | |||
180 | unix: { | ||
181 | SOURCES += device/serial/ser_unx.c | ||
182 | } | ||
183 | win32:{ | ||
184 | SOURCES += device/serial/ser_w32.c | ||
185 | } | ||
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp index 77a294a..830d5d2 100644 --- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp +++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp | |||
@@ -1,77 +1,77 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KDEPim/Pi. | 2 | This file is part of KDEPim/Pi. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | 31 | ||
32 | #include <qlayout.h> | 32 | #include <qlayout.h> |
33 | 33 | ||
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | //#include <klocale.h> | 35 | //#include <klocale.h> |
36 | //#include <stdlib.h> | 36 | //#include <stdlib.h> |
37 | 37 | ||
38 | #include "kdepimconfigwidget.h" | 38 | #include "kdepimconfigwidget.h" |
39 | 39 | ||
40 | #include "kcmkdepimconfig.h" | 40 | #include "kcmkdepimconfig.h" |
41 | #include "kprefs.h" | 41 | #include "kprefs.h" |
42 | #include "kpimprefs.h" | 42 | #include "kpimprefs.h" |
43 | 43 | #ifndef _WIN32_ | |
44 | extern "C" | 44 | extern "C" |
45 | { | 45 | { |
46 | KCModule *create_kabconfig( QWidget *parent, const char * ) { | 46 | KCModule *create_kabconfig( QWidget *parent, const char * ) { |
47 | return new KCMKdePimConfig( parent, "kcmkdepimconfig" ); | 47 | return new KCMKdePimConfig( parent, "kcmkdepimconfig" ); |
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | #endif | |
51 | KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name ) | 51 | KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name ) |
52 | : KCModule( parent, name ) | 52 | : KCModule( parent, name ) |
53 | { | 53 | { |
54 | //abort(); | 54 | //abort(); |
55 | QVBoxLayout *layout = new QVBoxLayout( this ); | 55 | QVBoxLayout *layout = new QVBoxLayout( this ); |
56 | mConfigWidget = new KDEPIMConfigWidget( this, "mConfigWidget" ); | 56 | mConfigWidget = new KDEPIMConfigWidget( this, "mConfigWidget" ); |
57 | layout->addWidget( mConfigWidget ); | 57 | layout->addWidget( mConfigWidget ); |
58 | layout->setSpacing( 0 ); | 58 | layout->setSpacing( 0 ); |
59 | layout->setMargin( 0 ); | 59 | layout->setMargin( 0 ); |
60 | 60 | ||
61 | connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); | 61 | connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); |
62 | } | 62 | } |
63 | 63 | ||
64 | void KCMKdePimConfig::load(KPrefs* prefs) | 64 | void KCMKdePimConfig::load(KPrefs* prefs) |
65 | { | 65 | { |
66 | mConfigWidget->restoreSettings((KPimPrefs*)prefs); | 66 | mConfigWidget->restoreSettings((KPimPrefs*)prefs); |
67 | } | 67 | } |
68 | 68 | ||
69 | void KCMKdePimConfig::save(KPrefs* prefs) | 69 | void KCMKdePimConfig::save(KPrefs* prefs) |
70 | { | 70 | { |
71 | mConfigWidget->saveSettings((KPimPrefs*)prefs); | 71 | mConfigWidget->saveSettings((KPimPrefs*)prefs); |
72 | } | 72 | } |
73 | 73 | ||
74 | void KCMKdePimConfig::defaults(KPrefs* prefs) | 74 | void KCMKdePimConfig::defaults(KPrefs* prefs) |
75 | { | 75 | { |
76 | mConfigWidget->defaults((KPimPrefs*)prefs); | 76 | mConfigWidget->defaults((KPimPrefs*)prefs); |
77 | } | 77 | } |