author | zautrix <zautrix> | 2004-09-12 10:30:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-12 10:30:29 (UTC) |
commit | a3a24948c51aa2983e415c990eaf0db9ac3c0005 (patch) (unidiff) | |
tree | 558fee47ff2cacbb591c72b9ab16c830cc2f857a /kaddressbook | |
parent | 31fab1d7e531b492d1075964ddcbebe7a563a41a (diff) | |
download | kdepimpi-a3a24948c51aa2983e415c990eaf0db9ac3c0005.zip kdepimpi-a3a24948c51aa2983e415c990eaf0db9ac3c0005.tar.gz kdepimpi-a3a24948c51aa2983e415c990eaf0db9ac3c0005.tar.bz2 |
Desktop compile fixes
-rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 1 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 1 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 49c0691..8d0fca1 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp | |||
@@ -5,48 +5,49 @@ | |||
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 | #include <qdragobject.h> | 24 | #include <qdragobject.h> |
25 | #include <qevent.h> | 25 | #include <qevent.h> |
26 | #include <qiconview.h> | 26 | #include <qiconview.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <qregexp.h> | ||
29 | 30 | ||
30 | #include <kabc/addressbook.h> | 31 | #include <kabc/addressbook.h> |
31 | #include <kabc/addressee.h> | 32 | #include <kabc/addressee.h> |
32 | #include <kconfig.h> | 33 | #include <kconfig.h> |
33 | #include <kdebug.h> | 34 | #include <kdebug.h> |
34 | #include <klocale.h> | 35 | #include <klocale.h> |
35 | 36 | ||
36 | #include "kabprefs.h" | 37 | #include "kabprefs.h" |
37 | #include "viewmanager.h" | 38 | #include "viewmanager.h" |
38 | 39 | ||
39 | #include "kaddressbookcardview.h" | 40 | #include "kaddressbookcardview.h" |
40 | 41 | ||
41 | #ifndef KAB_EMBEDDED | 42 | #ifndef KAB_EMBEDDED |
42 | extern "C" { | 43 | extern "C" { |
43 | void *init_libkaddrbk_cardview() | 44 | void *init_libkaddrbk_cardview() |
44 | { | 45 | { |
45 | return ( new CardViewFactory ); | 46 | return ( new CardViewFactory ); |
46 | } | 47 | } |
47 | } | 48 | } |
48 | #endif //KAB_EMBEDDED | 49 | #endif //KAB_EMBEDDED |
49 | 50 | ||
50 | //////////////////////////////// | 51 | //////////////////////////////// |
51 | // AddresseeCardViewItem (internal class) | 52 | // AddresseeCardViewItem (internal class) |
52 | class AddresseeCardViewItem : public CardViewItem | 53 | class AddresseeCardViewItem : public CardViewItem |
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 78d63b0..0ffc674 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp | |||
@@ -19,48 +19,49 @@ | |||
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 | #ifndef KAB_EMBEDDED | 24 | #ifndef KAB_EMBEDDED |
25 | #include <qiconview.h> | 25 | #include <qiconview.h> |
26 | #include <qstringlist.h> | 26 | #include <qstringlist.h> |
27 | 27 | ||
28 | #include <kabc/addressee.h> | 28 | #include <kabc/addressee.h> |
29 | #include <kconfig.h> | 29 | #include <kconfig.h> |
30 | #include <kdebug.h> | 30 | #include <kdebug.h> |
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kiconloader.h> | 32 | #include <kiconloader.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | 34 | ||
35 | #else //KAB_EMBEDDED | 35 | #else //KAB_EMBEDDED |
36 | #endif //KAB_EMBEDDED | 36 | #endif //KAB_EMBEDDED |
37 | 37 | ||
38 | #include <kabc/addressbook.h> | 38 | #include <kabc/addressbook.h> |
39 | #include "kabprefs.h" | 39 | #include "kabprefs.h" |
40 | #include "viewmanager.h" | 40 | #include "viewmanager.h" |
41 | #include "kaddressbookiconview.h" | 41 | #include "kaddressbookiconview.h" |
42 | #include <qlayout.h> | 42 | #include <qlayout.h> |
43 | #include <qregexp.h> | ||
43 | #include <kglobal.h> | 44 | #include <kglobal.h> |
44 | /*US transfered to the headerfile | 45 | /*US transfered to the headerfile |
45 | class IconViewFactory : public ViewFactory | 46 | class IconViewFactory : public ViewFactory |
46 | { | 47 | { |
47 | public: | 48 | public: |
48 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) | 49 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) |
49 | { | 50 | { |
50 | return new KAddressBookIconView( ab, parent, name ); | 51 | return new KAddressBookIconView( ab, parent, name ); |
51 | } | 52 | } |
52 | 53 | ||
53 | QString type() const { return "Icon"; } | 54 | QString type() const { return "Icon"; } |
54 | 55 | ||
55 | QString description() const { return i18n( "Icons represent contacts. Very simple view." ); } | 56 | QString description() const { return i18n( "Icons represent contacts. Very simple view." ); } |
56 | }; | 57 | }; |
57 | 58 | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | extern "C" { | 61 | extern "C" { |
61 | void *init_libkaddrbk_iconview() | 62 | void *init_libkaddrbk_iconview() |
62 | { | 63 | { |
63 | return ( new IconViewFactory ); | 64 | return ( new IconViewFactory ); |
64 | } | 65 | } |
65 | } | 66 | } |
66 | 67 | ||
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 63ad0ed..1dc9198 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -12,48 +12,49 @@ | |||
12 | #include <qurl.h> | 12 | #include <qurl.h> |
13 | #include <qpixmap.h> | 13 | #include <qpixmap.h> |
14 | 14 | ||
15 | #include <kabc/addressbook.h> | 15 | #include <kabc/addressbook.h> |
16 | #include <kapplication.h> | 16 | #include <kapplication.h> |
17 | #include <kconfig.h> | 17 | #include <kconfig.h> |
18 | #include <kcolorbutton.h> | 18 | #include <kcolorbutton.h> |
19 | #include <kdebug.h> | 19 | #include <kdebug.h> |
20 | #include <kglobal.h> | 20 | #include <kglobal.h> |
21 | #include <kiconloader.h> | 21 | #include <kiconloader.h> |
22 | #include <klineedit.h> | 22 | #include <klineedit.h> |
23 | #include <klocale.h> | 23 | #include <klocale.h> |
24 | #include <kmessagebox.h> | 24 | #include <kmessagebox.h> |
25 | #include <kurl.h> | 25 | #include <kurl.h> |
26 | #include <kurlrequester.h> | 26 | #include <kurlrequester.h> |
27 | 27 | ||
28 | //US#include "configuretableviewdialog.h" | 28 | //US#include "configuretableviewdialog.h" |
29 | #include "contactlistview.h" | 29 | #include "contactlistview.h" |
30 | #include "kabprefs.h" | 30 | #include "kabprefs.h" |
31 | #include "undocmds.h" | 31 | #include "undocmds.h" |
32 | #include "viewmanager.h" | 32 | #include "viewmanager.h" |
33 | 33 | ||
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | #include <qheader.h> | 35 | #include <qheader.h> |
36 | #include <qregexp.h> | ||
36 | 37 | ||
37 | #include "kaddressbooktableview.h" | 38 | #include "kaddressbooktableview.h" |
38 | 39 | ||
39 | 40 | ||
40 | KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, | 41 | KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, |
41 | QWidget *parent, const char *name ) | 42 | QWidget *parent, const char *name ) |
42 | : KAddressBookView( ab, parent, name ) | 43 | : KAddressBookView( ab, parent, name ) |
43 | { | 44 | { |
44 | mainLayout = new QVBoxLayout( viewWidget(), 2 ); | 45 | mainLayout = new QVBoxLayout( viewWidget(), 2 ); |
45 | 46 | ||
46 | // The list view will be created when the config is read. | 47 | // The list view will be created when the config is read. |
47 | mListView = 0; | 48 | mListView = 0; |
48 | } | 49 | } |
49 | 50 | ||
50 | KAddressBookTableView::~KAddressBookTableView() | 51 | KAddressBookTableView::~KAddressBookTableView() |
51 | { | 52 | { |
52 | } | 53 | } |
53 | 54 | ||
54 | void KAddressBookTableView::reconstructListView() | 55 | void KAddressBookTableView::reconstructListView() |
55 | { | 56 | { |
56 | if (mListView) | 57 | if (mListView) |
57 | { | 58 | { |
58 | disconnect(mListView, SIGNAL(selectionChanged()), | 59 | disconnect(mListView, SIGNAL(selectionChanged()), |
59 | this, SLOT(addresseeSelected())); | 60 | this, SLOT(addresseeSelected())); |