summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-15 09:04:40 (UTC)
committer zautrix <zautrix>2004-09-15 09:04:40 (UTC)
commit8889ffd6f6958c3a1d07bafedcc8af5d786a1660 (patch) (unidiff)
tree50c8335d792e9142d8d864de04c0f9acdf82c820
parent3dc613bf5ba5a2c7bc7aef50fc00c2146206fefb (diff)
downloadkdepimpi-8889ffd6f6958c3a1d07bafedcc8af5d786a1660.zip
kdepimpi-8889ffd6f6958c3a1d07bafedcc8af5d786a1660.tar.gz
kdepimpi-8889ffd6f6958c3a1d07bafedcc8af5d786a1660.tar.bz2
desktop compiling fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/LICENCE.TXT59
-rw-r--r--gammu/emb/gammu/gammu.pro16
-rw-r--r--kaddressbook/mainembedded.cpp1
3 files changed, 14 insertions, 62 deletions
diff --git a/bin/kdepim/LICENCE.TXT b/bin/kdepim/LICENCE.TXT
index 4d564f3..10e09f7 100644
--- a/bin/kdepim/LICENCE.TXT
+++ b/bin/kdepim/LICENCE.TXT
@@ -269,73 +269,14 @@
269 269
270 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 270 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 271 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 272 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 273 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 274 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 275 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 276 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 277 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278 POSSIBILITY OF SUCH DAMAGES. 278 POSSIBILITY OF SUCH DAMAGES.
279 279
280 END OF TERMS AND CONDITIONS 280 END OF TERMS AND CONDITIONS
281
282 How to Apply These Terms to Your New Programs
283
284 If you develop a new program, and you want it to be of the greatest
285 possible use to the public, the best way to achieve this is to make it
286 free software which everyone can redistribute and change under these terms.
287
288 To do so, attach the following notices to the program. It is safest
289 to attach them to the start of each source file to most effectively
290 convey the exclusion of warranty; and each file should have at least
291 the "copyright" line and a pointer to where the full notice is found.
292
293 <one line to give the program's name and a brief idea of what it does.>
294 Copyright (C) <year> <name of author>
295
296 This program is free software; you can redistribute it and/or modify
297 it under the terms of the GNU General Public License as published by
298 the Free Software Foundation; either version 2 of the License, or
299 (at your option) any later version.
300
301 This program is distributed in the hope that it will be useful,
302 but WITHOUT ANY WARRANTY; without even the implied warranty of
303 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304 GNU General Public License for more details.
305
306 You should have received a copy of the GNU General Public License
307 along with this program; if not, write to the Free Software
308 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
309
310
311 Also add information on how to contact you by electronic and paper mail.
312
313 If the program is interactive, make it output a short notice like this
314 when it starts in an interactive mode:
315
316 Gnomovision version 69, Copyright (C) year name of author
317 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
318 This is free software, and you are welcome to redistribute it
319 under certain conditions; type `show c' for details.
320
321 The hypothetical commands `show w' and `show c' should show the appropriate
322 parts of the General Public License. Of course, the commands you use may
323 be called something other than `show w' and `show c'; they could even be
324 mouse-clicks or menu items--whatever suits your program.
325
326 You should also get your employer (if you work as a programmer) or your
327 school, if any, to sign a "copyright disclaimer" for the program, if
328 necessary. Here is a sample; alter the names:
329
330 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
331 `Gnomovision' (which makes passes at compilers) written by James Hacker.
332
333 <signature of Ty Coon>, 1 April 1989
334 Ty Coon, President of Vice
335 281
336 This General Public License does not permit incorporating your program into
337 proprietary programs. If your program is a subroutine library, you may
338 consider it more useful to permit linking proprietary applications with the
339 library. If this is what you want to do, use the GNU Library General
340 Public License instead of this License.
341 \ No newline at end of file 282 \ No newline at end of file
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index 299de7f..22476a1 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -36,17 +36,27 @@ SOURCES += gammu.c \
36 sniff.c \ 36 sniff.c \
37 smsd/s_files.c \ 37 smsd/s_files.c \
38 smsd/smsdcore.c \ 38 smsd/smsdcore.c \
39 depend/nokia/dct3.c \ 39 depend/nokia/dct3.c \
40 depend/nokia/dct4.c \ 40 depend/nokia/dct4.c \
41 depend/siemens/chiffre.c \ 41 depend/siemens/chiffre.c \
42 depend/siemens/dsiemens.c \ 42 depend/siemens/dsiemens.c \
43 depend/nokia/dct3trac/wmx-gsm.c \ 43 depend/nokia/dct3trac/wmx-gsm.c \
44 depend/nokia/dct3trac/wmx-list.c \ 44 depend/nokia/dct3trac/wmx-list.c \
45 depend/nokia/dct3trac/wmx-sim.c \ 45 depend/nokia/dct3trac/wmx-sim.c \
46 depend/nokia/dct3trac/wmx-util.c \ 46 depend/nokia/dct3trac/wmx-util.c \
47 depend/nokia/dct3trac/wmx.c 47 depend/nokia/dct3trac/wmx.c
48 48unix : {
49LIBS += ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so /usr/lib/libsdp.so /usr/lib/libpthread.so 49LIBS += ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so /usr/lib/libsdp.so /usr/lib/libpthread.so
50DESTDIR = ../../../bin
51OBJECTS_DIR = obj/unix 50OBJECTS_DIR = obj/unix
52TARGET = kammu \ No newline at end of file 51}
52win32 : {
53 CONFIG = qt warn_on
54#LIBS += mfc71u.lib
55LIBS += libc.lib
56#LIBS += msvcrt.lib
57QMAKE_LINK += /NODEFAULTLIB:msvcrt
58LIBS += ../../../bin/microgammu.lib
59OBJECTS_DIR = obj/win
60}
61DESTDIR = ../../../bin
62TARGET = kammu
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 4230c07..4f48850 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,23 +1,24 @@
1#ifndef DESKTOP_VERSION 1#ifndef DESKTOP_VERSION
2#include <qpe/qpeapplication.h> 2#include <qpe/qpeapplication.h>
3#include <stdlib.h> 3#include <stdlib.h>
4#else 4#else
5#include <qapplication.h> 5#include <qapplication.h>
6#include <qwindowsstyle.h> 6#include <qwindowsstyle.h>
7#include <qplatinumstyle.h> 7#include <qplatinumstyle.h>
8#include <qmainwindow.h> 8#include <qmainwindow.h>
9#endif 9#endif
10 10
11#include <kstandarddirs.h> 11#include <kstandarddirs.h>
12#include <qregexp.h>
12#include <kglobal.h> 13#include <kglobal.h>
13#include <stdio.h> 14#include <stdio.h>
14#include <qdir.h> 15#include <qdir.h>
15#include "kaddressbookmain.h" 16#include "kaddressbookmain.h"
16#include "externalapphandler.h" 17#include "externalapphandler.h"
17 18
18int main( int argc, char **argv ) 19int main( int argc, char **argv )
19{ 20{
20#ifndef DESKTOP_VERSION 21#ifndef DESKTOP_VERSION
21 QPEApplication a( argc, argv ); 22 QPEApplication a( argc, argv );
22 a.setKeepRunning (); 23 a.setKeepRunning ();
23#else 24#else