author | zautrix <zautrix> | 2004-09-22 04:45:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-22 04:45:07 (UTC) |
commit | bbeffa56ee51d30b84bcadaf22234b8227958f31 (patch) (unidiff) | |
tree | 040ce64f3e618ef4b76ddfa80d34a245d59ef1b5 /kaddressbook | |
parent | a56783aace3496c8b40008d0dec4c42437165e54 (diff) | |
download | kdepimpi-bbeffa56ee51d30b84bcadaf22234b8227958f31.zip kdepimpi-bbeffa56ee51d30b84bcadaf22234b8227958f31.tar.gz kdepimpi-bbeffa56ee51d30b84bcadaf22234b8227958f31.tar.bz2 |
desktop compile fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1b40d71..df634d0 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1,136 +1,137 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressbook. | 2 | This file is part of KAddressbook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
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 | #include "kabcore.h" | 31 | #include "kabcore.h" |
32 | 32 | ||
33 | #include <stdaddressbook.h> | 33 | #include <stdaddressbook.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kfiledialog.h> | 35 | #include <kfiledialog.h> |
36 | #include <qtimer.h> | ||
36 | #include <qprogressbar.h> | 37 | #include <qprogressbar.h> |
37 | 38 | ||
38 | #ifndef KAB_EMBEDDED | 39 | #ifndef KAB_EMBEDDED |
39 | #include <qclipboard.h> | 40 | #include <qclipboard.h> |
40 | #include <qdir.h> | 41 | #include <qdir.h> |
41 | #include <qfile.h> | 42 | #include <qfile.h> |
42 | #include <qapplicaton.h> | 43 | #include <qapplicaton.h> |
43 | #include <qprogressbar.h> | 44 | #include <qprogressbar.h> |
44 | #include <qlayout.h> | 45 | #include <qlayout.h> |
45 | #include <qregexp.h> | 46 | #include <qregexp.h> |
46 | #include <qvbox.h> | 47 | #include <qvbox.h> |
47 | #include <kabc/addresseelist.h> | 48 | #include <kabc/addresseelist.h> |
48 | #include <kabc/errorhandler.h> | 49 | #include <kabc/errorhandler.h> |
49 | #include <kabc/resource.h> | 50 | #include <kabc/resource.h> |
50 | #include <kabc/vcardconverter.h> | 51 | #include <kabc/vcardconverter.h> |
51 | #include <kapplication.h> | 52 | #include <kapplication.h> |
52 | #include <kactionclasses.h> | 53 | #include <kactionclasses.h> |
53 | #include <kcmultidialog.h> | 54 | #include <kcmultidialog.h> |
54 | #include <kdebug.h> | 55 | #include <kdebug.h> |
55 | #include <kdeversion.h> | 56 | #include <kdeversion.h> |
56 | #include <kkeydialog.h> | 57 | #include <kkeydialog.h> |
57 | #include <kmessagebox.h> | 58 | #include <kmessagebox.h> |
58 | #include <kprinter.h> | 59 | #include <kprinter.h> |
59 | #include <kprotocolinfo.h> | 60 | #include <kprotocolinfo.h> |
60 | #include <kresources/selectdialog.h> | 61 | #include <kresources/selectdialog.h> |
61 | #include <kstandarddirs.h> | 62 | #include <kstandarddirs.h> |
62 | #include <ktempfile.h> | 63 | #include <ktempfile.h> |
63 | #include <kxmlguiclient.h> | 64 | #include <kxmlguiclient.h> |
64 | #include <kaboutdata.h> | 65 | #include <kaboutdata.h> |
65 | #include <libkdepim/categoryselectdialog.h> | 66 | #include <libkdepim/categoryselectdialog.h> |
66 | 67 | ||
67 | #include "addresseeutil.h" | 68 | #include "addresseeutil.h" |
68 | #include "addresseeeditordialog.h" | 69 | #include "addresseeeditordialog.h" |
69 | #include "extensionmanager.h" | 70 | #include "extensionmanager.h" |
70 | #include "kstdaction.h" | 71 | #include "kstdaction.h" |
71 | #include "kaddressbookservice.h" | 72 | #include "kaddressbookservice.h" |
72 | #include "ldapsearchdialog.h" | 73 | #include "ldapsearchdialog.h" |
73 | #include "printing/printingwizard.h" | 74 | #include "printing/printingwizard.h" |
74 | #else // KAB_EMBEDDED | 75 | #else // KAB_EMBEDDED |
75 | 76 | ||
76 | #include <kapplication.h> | 77 | #include <kapplication.h> |
77 | #include "KDGanttMinimizeSplitter.h" | 78 | #include "KDGanttMinimizeSplitter.h" |
78 | #include "kaddressbookmain.h" | 79 | #include "kaddressbookmain.h" |
79 | #include "kactioncollection.h" | 80 | #include "kactioncollection.h" |
80 | #include "addresseedialog.h" | 81 | #include "addresseedialog.h" |
81 | //US | 82 | //US |
82 | #include <addresseeview.h> | 83 | #include <addresseeview.h> |
83 | 84 | ||
84 | #include <qapp.h> | 85 | #include <qapp.h> |
85 | #include <qmenubar.h> | 86 | #include <qmenubar.h> |
86 | //#include <qtoolbar.h> | 87 | //#include <qtoolbar.h> |
87 | #include <qmessagebox.h> | 88 | #include <qmessagebox.h> |
88 | #include <kdebug.h> | 89 | #include <kdebug.h> |
89 | #include <kiconloader.h> // needed for SmallIcon | 90 | #include <kiconloader.h> // needed for SmallIcon |
90 | #include <kresources/kcmkresources.h> | 91 | #include <kresources/kcmkresources.h> |
91 | #include <ktoolbar.h> | 92 | #include <ktoolbar.h> |
92 | 93 | ||
93 | 94 | ||
94 | //#include <qlabel.h> | 95 | //#include <qlabel.h> |
95 | 96 | ||
96 | 97 | ||
97 | #ifndef DESKTOP_VERSION | 98 | #ifndef DESKTOP_VERSION |
98 | #include <qpe/ir.h> | 99 | #include <qpe/ir.h> |
99 | #include <qpe/qpemenubar.h> | 100 | #include <qpe/qpemenubar.h> |
100 | #include <qtopia/qcopenvelope_qws.h> | 101 | #include <qtopia/qcopenvelope_qws.h> |
101 | #else | 102 | #else |
102 | 103 | ||
103 | #include <qmenubar.h> | 104 | #include <qmenubar.h> |
104 | #endif | 105 | #endif |
105 | 106 | ||
106 | #endif // KAB_EMBEDDED | 107 | #endif // KAB_EMBEDDED |
107 | #include "kcmconfigs/kcmkabconfig.h" | 108 | #include "kcmconfigs/kcmkabconfig.h" |
108 | #include "kcmconfigs/kcmkdepimconfig.h" | 109 | #include "kcmconfigs/kcmkdepimconfig.h" |
109 | #include "kpimglobalprefs.h" | 110 | #include "kpimglobalprefs.h" |
110 | #include "externalapphandler.h" | 111 | #include "externalapphandler.h" |
111 | 112 | ||
112 | 113 | ||
113 | #include <kresources/selectdialog.h> | 114 | #include <kresources/selectdialog.h> |
114 | #include <kmessagebox.h> | 115 | #include <kmessagebox.h> |
115 | 116 | ||
116 | #include <picture.h> | 117 | #include <picture.h> |
117 | #include <resource.h> | 118 | #include <resource.h> |
118 | 119 | ||
119 | //US#include <qsplitter.h> | 120 | //US#include <qsplitter.h> |
120 | #include <qmap.h> | 121 | #include <qmap.h> |
121 | #include <qdir.h> | 122 | #include <qdir.h> |
122 | #include <qfile.h> | 123 | #include <qfile.h> |
123 | #include <qvbox.h> | 124 | #include <qvbox.h> |
124 | #include <qlayout.h> | 125 | #include <qlayout.h> |
125 | #include <qclipboard.h> | 126 | #include <qclipboard.h> |
126 | #include <qtextstream.h> | 127 | #include <qtextstream.h> |
127 | 128 | ||
128 | #include <libkdepim/categoryselectdialog.h> | 129 | #include <libkdepim/categoryselectdialog.h> |
129 | #include <kabc/vcardconverter.h> | 130 | #include <kabc/vcardconverter.h> |
130 | 131 | ||
131 | 132 | ||
132 | #include "addresseeutil.h" | 133 | #include "addresseeutil.h" |
133 | #include "undocmds.h" | 134 | #include "undocmds.h" |
134 | #include "addresseeeditordialog.h" | 135 | #include "addresseeeditordialog.h" |
135 | #include "viewmanager.h" | 136 | #include "viewmanager.h" |
136 | #include "details/detailsviewcontainer.h" | 137 | #include "details/detailsviewcontainer.h" |