summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-08 13:35:34 (UTC)
committer zautrix <zautrix>2004-08-08 13:35:34 (UTC)
commit957c13e21844ca75e337fc1c864554dd2240fc78 (patch) (unidiff)
tree4e2a2a42116639786d2ff00829f3ad26ab0661b3
parent75138e84a2271f8929478853151a6ed4a73fb2cc (diff)
downloadkdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.zip
kdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.tar.gz
kdepimpi-957c13e21844ca75e337fc1c864554dd2240fc78.tar.bz2
Fixed win compile problem
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/common.pro8
-rw-r--r--libkdepim/kcmconfigs/kcmkdepimconfig.cpp4
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
@@ -98,82 +98,88 @@ HEADERS += config.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
119SOURCES +=gsmcomon.c \ 119SOURCES +=gsmcomon.c \
120gsmstate.c \ 120gsmstate.c \
121misc/misc.c \ 121misc/misc.c \
122misc/cfg.c \ 122misc/cfg.c \
123misc/coding/coding.c \ 123misc/coding/coding.c \
124misc/coding/md5.c \ 124misc/coding/md5.c \
125service/sms/gsmsms.c \ 125service/sms/gsmsms.c \
126service/sms/gsmems.c \ 126service/sms/gsmems.c \
127service/sms/gsmmulti.c \ 127service/sms/gsmmulti.c \
128service/gsmcal.c \ 128service/gsmcal.c \
129service/gsmdata.c \ 129service/gsmdata.c \
130service/gsmpbk.c \ 130service/gsmpbk.c \
131service/gsmring.c \ 131service/gsmring.c \
132service/gsmlogo.c \ 132service/gsmlogo.c \
133service/gsmmisc.c \ 133service/gsmmisc.c \
134service/gsmnet.c \ 134service/gsmnet.c \
135service/backup/gsmback.c \ 135service/backup/gsmback.c \
136service/backup/backldif.c \ 136service/backup/backldif.c \
137service/backup/backlmb.c \ 137service/backup/backlmb.c \
138service/backup/backtext.c \ 138service/backup/backtext.c \
139service/backup/backvcs.c \ 139service/backup/backvcs.c \
140service/backup/backvcf.c \ 140service/backup/backvcf.c \
141service/backup/backics.c \ 141service/backup/backics.c \
142device/bluetoth/affix.c \ 142device/bluetoth/affix.c \
143device/bluetoth/bluez.c \ 143device/bluetoth/bluez.c \
144device/bluetoth/blue_w32.c \ 144device/bluetoth/blue_w32.c \
145device/bluetoth/bluetoth.c \ 145device/bluetoth/bluetoth.c \
146device/serial/ser_unx.c \
147device/serial/ser_djg.c \ 146device/serial/ser_djg.c \
148device/irda/irda.c \ 147device/irda/irda.c \
149device/devfunc.c \ 148device/devfunc.c \
150protocol/at/at.c \ 149protocol/at/at.c \
151protocol/alcatel/alcabus.c \ 150protocol/alcatel/alcabus.c \
152protocol/nokia/mbus2.c \ 151protocol/nokia/mbus2.c \
153protocol/nokia/fbus2.c \ 152protocol/nokia/fbus2.c \
154protocol/nokia/phonet.c \ 153protocol/nokia/phonet.c \
155protocol/obex/obex.c \ 154protocol/obex/obex.c \
156protocol/symbian/mrouter.c \ 155protocol/symbian/mrouter.c \
157phone/pfunc.c \ 156phone/pfunc.c \
158phone/at/atgen.c \ 157phone/at/atgen.c \
159phone/at/siemens.c \ 158phone/at/siemens.c \
160phone/at/sonyeric.c \ 159phone/at/sonyeric.c \
161phone/alcatel/alcatel.c \ 160phone/alcatel/alcatel.c \
162phone/nokia/dct3/n6110.c \ 161phone/nokia/dct3/n6110.c \
163phone/nokia/dct3/n7110.c \ 162phone/nokia/dct3/n7110.c \
164phone/nokia/dct3/n9210.c \ 163phone/nokia/dct3/n9210.c \
165phone/nokia/dct3/dct3func.c \ 164phone/nokia/dct3/dct3func.c \
166phone/nokia/dct4/n3320.c \ 165phone/nokia/dct4/n3320.c \
167phone/nokia/dct4/n3650.c \ 166phone/nokia/dct4/n3650.c \
168phone/nokia/dct4/n6510.c \ 167phone/nokia/dct4/n6510.c \
169phone/nokia/dct4/dct4func.c \ 168phone/nokia/dct4/dct4func.c \
170phone/nokia/nauto.c \ 169phone/nokia/nauto.c \
171phone/nokia/nfunc.c \ 170phone/nokia/nfunc.c \
172phone/nokia/nfuncold.c \ 171phone/nokia/nfuncold.c \
173phone/obex/obexgen.c \ 172phone/obex/obexgen.c \
174phone/symbian/mroutgen.c 173phone/symbian/mroutgen.c
175 174
176TARGET = microgammu 175TARGET = microgammu
177DESTDIR = ../../../bin 176DESTDIR = ../../../bin
178OBJECTS_DIR = obj/unix 177OBJECTS_DIR = obj/unix
179MOC_DIR = moc/unix 178MOC_DIR = moc/unix
179
180unix: {
181SOURCES += device/serial/ser_unx.c
182}
183win32:{
184SOURCES += 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/*
25Enhanced Version of the file for platform independent KDE tools. 25Enhanced Version of the file for platform independent KDE tools.
26Copyright (c) 2004 Ulf Schenk 26Copyright (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_
44extern "C" 44extern "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
51KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name ) 51KCMKdePimConfig::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
64void KCMKdePimConfig::load(KPrefs* prefs) 64void KCMKdePimConfig::load(KPrefs* prefs)
65{ 65{
66 mConfigWidget->restoreSettings((KPimPrefs*)prefs); 66 mConfigWidget->restoreSettings((KPimPrefs*)prefs);
67} 67}
68 68
69void KCMKdePimConfig::save(KPrefs* prefs) 69void KCMKdePimConfig::save(KPrefs* prefs)
70{ 70{
71 mConfigWidget->saveSettings((KPimPrefs*)prefs); 71 mConfigWidget->saveSettings((KPimPrefs*)prefs);
72} 72}
73 73
74void KCMKdePimConfig::defaults(KPrefs* prefs) 74void KCMKdePimConfig::defaults(KPrefs* prefs)
75{ 75{
76 mConfigWidget->defaults((KPimPrefs*)prefs); 76 mConfigWidget->defaults((KPimPrefs*)prefs);
77} 77}