-rw-r--r-- | core/pim/addressbook/ablabel.cpp | 3 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 9 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 16 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg.cpp | 1 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 11 | ||||
-rw-r--r-- | core/pim/addressbook/main.cpp | 1 | ||||
-rw-r--r-- | core/pim/addressbook/picker.cpp | 2 |
7 files changed, 0 insertions, 43 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp index 1914f71..076e2e0 100644 --- a/core/pim/addressbook/ablabel.cpp +++ b/core/pim/addressbook/ablabel.cpp | |||
@@ -1,50 +1,47 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qt Palmtop Environment. | 4 | ** This file is part of Qt Palmtop Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "ablabel.h" | 21 | #include "ablabel.h" |
22 | 22 | ||
23 | #include <qpe/stringutil.h> | ||
24 | 23 | ||
25 | #include <qregexp.h> | ||
26 | #include <qstylesheet.h> | ||
27 | 24 | ||
28 | AbLabel::AbLabel( QWidget *parent, const char *name ): | 25 | AbLabel::AbLabel( QWidget *parent, const char *name ): |
29 | QTextView( parent, name ), | 26 | QTextView( parent, name ), |
30 | m_empty( false ) | 27 | m_empty( false ) |
31 | { | 28 | { |
32 | } | 29 | } |
33 | 30 | ||
34 | AbLabel::~AbLabel() | 31 | AbLabel::~AbLabel() |
35 | { | 32 | { |
36 | } | 33 | } |
37 | 34 | ||
38 | void AbLabel::setContacts( const OContactAccess::List& viewList ) | 35 | void AbLabel::setContacts( const OContactAccess::List& viewList ) |
39 | { | 36 | { |
40 | m_viewList = viewList; | 37 | m_viewList = viewList; |
41 | if (m_viewList.count() != 0){ | 38 | if (m_viewList.count() != 0){ |
42 | m_empty = false; | 39 | m_empty = false; |
43 | m_itCurContact = m_viewList.begin(); | 40 | m_itCurContact = m_viewList.begin(); |
44 | sync(); | 41 | sync(); |
45 | }else{ | 42 | }else{ |
46 | // m_itCurContact.clear(); | 43 | // m_itCurContact.clear(); |
47 | m_empty = true; | 44 | m_empty = true; |
48 | setText( "" ); | 45 | setText( "" ); |
49 | } | 46 | } |
50 | } | 47 | } |
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 70330c7..f7bff58 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp | |||
@@ -1,60 +1,51 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** Copyright (c) 2002 Stefan Eilers (eilers.stefan@epost.de) | 3 | ** Copyright (c) 2002 Stefan Eilers (eilers.stefan@epost.de) |
4 | ** | 4 | ** |
5 | ** This file is part of Qt Palmtop Environment. | 5 | ** This file is part of Qt Palmtop Environment. |
6 | ** | 6 | ** |
7 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
8 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
9 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
10 | ** packaging of this file. | 10 | ** packaging of this file. |
11 | ** | 11 | ** |
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
16 | ** | 16 | ** |
17 | ** Contact info@trolltech.com if any conditions of this licensing are | 17 | ** Contact info@trolltech.com if any conditions of this licensing are |
18 | ** not clear to you. | 18 | ** not clear to you. |
19 | ** | 19 | ** |
20 | **********************************************************************/ | 20 | **********************************************************************/ |
21 | 21 | ||
22 | 22 | ||
23 | #include <qpe/categoryselect.h> | ||
24 | #include <qpe/config.h> | ||
25 | #include <qpe/stringutil.h> | ||
26 | #include <qpe/qcopenvelope_qws.h> | ||
27 | #include <qpe/timestring.h> | 23 | #include <qpe/timestring.h> |
28 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
29 | 25 | ||
30 | #include <opie/orecordlist.h> | 26 | #include <opie/orecordlist.h> |
31 | 27 | ||
32 | #include <qasciidict.h> | ||
33 | #include <qdatetime.h> | ||
34 | #include <qfile.h> | ||
35 | #include <qregexp.h> | ||
36 | #include <qmessagebox.h> | ||
37 | 28 | ||
38 | #include "abtable.h" | 29 | #include "abtable.h" |
39 | 30 | ||
40 | #include <errno.h> | 31 | #include <errno.h> |
41 | #include <fcntl.h> | 32 | #include <fcntl.h> |
42 | #include <unistd.h> | 33 | #include <unistd.h> |
43 | #include <stdlib.h> | 34 | #include <stdlib.h> |
44 | 35 | ||
45 | #include <ctype.h> //toupper() for key hack | 36 | #include <ctype.h> //toupper() for key hack |
46 | 37 | ||
47 | #if 0 | 38 | #if 0 |
48 | 39 | ||
49 | /*! | 40 | /*! |
50 | \class AbTableItem abtable.h | 41 | \class AbTableItem abtable.h |
51 | 42 | ||
52 | \brief QTableItem based class for showing a field of an entry | 43 | \brief QTableItem based class for showing a field of an entry |
53 | */ | 44 | */ |
54 | 45 | ||
55 | AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s, | 46 | AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s, |
56 | const QString &secondSortKey) | 47 | const QString &secondSortKey) |
57 | : QTableItem( t, et, s ) | 48 | : QTableItem( t, et, s ) |
58 | { | 49 | { |
59 | // sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower(); | 50 | // sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower(); |
60 | sortKey = Qtopia::buildSortKey( s, secondSortKey ); | 51 | sortKey = Qtopia::buildSortKey( s, secondSortKey ); |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 1c7ddd4..9cf55b3 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -1,82 +1,66 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de) | 3 | ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de) |
4 | ** | 4 | ** |
5 | ** This file is part of the Open Palmtop Environment (see www.opie.info). | 5 | ** This file is part of the Open Palmtop Environment (see www.opie.info). |
6 | ** | 6 | ** |
7 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
8 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
9 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
10 | ** packaging of this file. | 10 | ** packaging of this file. |
11 | ** | 11 | ** |
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
16 | ** | 16 | ** |
17 | ** | 17 | ** |
18 | **********************************************************************/ | 18 | **********************************************************************/ |
19 | 19 | ||
20 | #define QTOPIA_INTERNAL_FD | 20 | #define QTOPIA_INTERNAL_FD |
21 | 21 | ||
22 | #include "contacteditor.h" | ||
23 | #include "ablabel.h" | ||
24 | #include "abview.h" | ||
25 | #include "abtable.h" | ||
26 | // #include "addresssettings.h" | 22 | // #include "addresssettings.h" |
27 | #include "addressbook.h" | 23 | #include "addressbook.h" |
28 | 24 | ||
29 | 25 | ||
30 | #include <opie/ofileselector.h> | 26 | #include <opie/ofileselector.h> |
31 | #include <opie/ofiledialog.h> | 27 | #include <opie/ofiledialog.h> |
32 | #include <opie/ocontact.h> | 28 | #include <opie/ocontact.h> |
33 | #include <opie/ocontactaccessbackend_vcard.h> | 29 | #include <opie/ocontactaccessbackend_vcard.h> |
34 | 30 | ||
35 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
36 | #include <qpe/ir.h> | 32 | #include <qpe/ir.h> |
37 | #include <qpe/qpemessagebox.h> | 33 | #include <qpe/qpemessagebox.h> |
38 | #include <qpe/qcopenvelope_qws.h> | ||
39 | #include <qtoolbar.h> | ||
40 | #include <qmenubar.h> | 34 | #include <qmenubar.h> |
41 | // #include <qtoolbar.h> | 35 | // #include <qtoolbar.h> |
42 | // #include <qmenubar.h> | 36 | // #include <qmenubar.h> |
43 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
44 | #include <qpe/config.h> | ||
45 | 38 | ||
46 | #include <qaction.h> | 39 | #include <qaction.h> |
47 | #include <qdialog.h> | ||
48 | #include <qdir.h> | ||
49 | #include <qfile.h> | ||
50 | #include <qimage.h> | ||
51 | #include <qlayout.h> | 40 | #include <qlayout.h> |
52 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
53 | #include <qpixmap.h> | ||
54 | #include <qpopupmenu.h> | ||
55 | #include <qstringlist.h> | ||
56 | #include <qtoolbutton.h> | 42 | #include <qtoolbutton.h> |
57 | #include <qwhatsthis.h> | ||
58 | #include <qdatetime.h> | ||
59 | 43 | ||
60 | #include <stdlib.h> | 44 | #include <stdlib.h> |
61 | #include <sys/stat.h> | 45 | #include <sys/stat.h> |
62 | #include <sys/types.h> | 46 | #include <sys/types.h> |
63 | #include <fcntl.h> | 47 | #include <fcntl.h> |
64 | #include <unistd.h> | 48 | #include <unistd.h> |
65 | 49 | ||
66 | 50 | ||
67 | #include "picker.h" | 51 | #include "picker.h" |
68 | #include "configdlg.h" | 52 | #include "configdlg.h" |
69 | 53 | ||
70 | extern QString addressbookPersonalVCardName(); | 54 | extern QString addressbookPersonalVCardName(); |
71 | 55 | ||
72 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | 56 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, |
73 | WFlags f ) | 57 | WFlags f ) |
74 | : QMainWindow( parent, name, f ), | 58 | : QMainWindow( parent, name, f ), |
75 | catMenu (0l), | 59 | catMenu (0l), |
76 | abEditor(0l), | 60 | abEditor(0l), |
77 | syncing(FALSE), | 61 | syncing(FALSE), |
78 | m_tableViewButton(0l), | 62 | m_tableViewButton(0l), |
79 | m_cardViewButton(0l) | 63 | m_cardViewButton(0l) |
80 | { | 64 | { |
81 | isLoading = true; | 65 | isLoading = true; |
82 | 66 | ||
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index 981f5e0..dee0f11 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp | |||
@@ -1,31 +1,30 @@ | |||
1 | #include "configdlg.h" | 1 | #include "configdlg.h" |
2 | 2 | ||
3 | #include <qcheckbox.h> | 3 | #include <qcheckbox.h> |
4 | #include <qradiobutton.h> | 4 | #include <qradiobutton.h> |
5 | #include <qlistbox.h> | 5 | #include <qlistbox.h> |
6 | #include <qpushbutton.h> | 6 | #include <qpushbutton.h> |
7 | #include <qiconset.h> | ||
8 | 7 | ||
9 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
10 | 9 | ||
11 | #include <opie/ocontact.h> | 10 | #include <opie/ocontact.h> |
12 | #include "opie/ocontactfields.h" | 11 | #include "opie/ocontactfields.h" |
13 | 12 | ||
14 | ConfigDlg::ConfigDlg( QWidget *parent, const char *name): | 13 | ConfigDlg::ConfigDlg( QWidget *parent, const char *name): |
15 | ConfigDlg_Base(parent, name, true ) | 14 | ConfigDlg_Base(parent, name, true ) |
16 | { | 15 | { |
17 | contFields = OContactFields::trfields(); | 16 | contFields = OContactFields::trfields(); |
18 | 17 | ||
19 | // We add all Fields into the Listbox | 18 | // We add all Fields into the Listbox |
20 | for (uint i=0; i < contFields.count(); i++) { | 19 | for (uint i=0; i < contFields.count(); i++) { |
21 | allFieldListBox->insertItem( contFields[i] ); | 20 | allFieldListBox->insertItem( contFields[i] ); |
22 | } | 21 | } |
23 | 22 | ||
24 | // Reset Widget Flags: This was not changeable by designer :( | 23 | // Reset Widget Flags: This was not changeable by designer :( |
25 | setWFlags ( WStyle_ContextHelp ); | 24 | setWFlags ( WStyle_ContextHelp ); |
26 | 25 | ||
27 | // Set Pics to Buttons and Tabs | 26 | // Set Pics to Buttons and Tabs |
28 | m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) ); | 27 | m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) ); |
29 | m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) ); | 28 | m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) ); |
30 | m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) ); | 29 | m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) ); |
31 | m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) ); | 30 | m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) ); |
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 7932781..b1eb042 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -1,71 +1,60 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org> | 2 | * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org> |
3 | * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de) | 3 | * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de) |
4 | * | 4 | * |
5 | * This file is an add-on for the OPIE Palmtop Environment | 5 | * This file is an add-on for the OPIE Palmtop Environment |
6 | * | 6 | * |
7 | * This file may be distributed and/or modified under the terms of the | 7 | * This file may be distributed and/or modified under the terms of the |
8 | * GNU General Public License version 2 as published by the Free Software | 8 | * GNU General Public License version 2 as published by the Free Software |
9 | * Foundation and appearing in the file LICENSE.GPL included in the pacakaging | 9 | * Foundation and appearing in the file LICENSE.GPL included in the pacakaging |
10 | * of this file. | 10 | * of this file. |
11 | * | 11 | * |
12 | * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | * | 14 | * |
15 | * | 15 | * |
16 | * This is a rewrite of the abeditor.h file, modified to provide a more | 16 | * This is a rewrite of the abeditor.h file, modified to provide a more |
17 | * intuitive interface to TrollTech's original Address Book editor. This | 17 | * intuitive interface to TrollTech's original Address Book editor. This |
18 | * is made to operate exactly in interface with the exception of name. | 18 | * is made to operate exactly in interface with the exception of name. |
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include "contacteditor.h" | 22 | #include "contacteditor.h" |
23 | #include "addresspicker.h" | ||
24 | 23 | ||
25 | #include <qpe/categoryselect.h> | 24 | #include <qpe/categoryselect.h> |
26 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
27 | #include <qpe/qpedialog.h> | 26 | #include <qpe/qpedialog.h> |
28 | #include <qpe/timeconversion.h> | ||
29 | #include <opie/ocontact.h> | 27 | #include <opie/ocontact.h> |
30 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
31 | 29 | ||
32 | #include <qcombobox.h> | ||
33 | #include <qlabel.h> | 30 | #include <qlabel.h> |
34 | #include <qtabwidget.h> | 31 | #include <qtabwidget.h> |
35 | #include <qlayout.h> | 32 | #include <qlayout.h> |
36 | #include <qlineedit.h> | 33 | #include <qlineedit.h> |
37 | #include <qmultilineedit.h> | 34 | #include <qmultilineedit.h> |
38 | #include <qscrollview.h> | ||
39 | #include <qtoolbutton.h> | 35 | #include <qtoolbutton.h> |
40 | #include <qpushbutton.h> | ||
41 | #include <qmainwindow.h> | ||
42 | #include <qvaluelist.h> | ||
43 | #include <qpopupmenu.h> | ||
44 | #include <qlistbox.h> | 36 | #include <qlistbox.h> |
45 | #include <qhbox.h> | ||
46 | #include <qaction.h> | ||
47 | #include <qiconset.h> | ||
48 | #include <qmessagebox.h> | 37 | #include <qmessagebox.h> |
49 | #include <qwhatsthis.h> | 38 | #include <qwhatsthis.h> |
50 | 39 | ||
51 | #include <assert.h> | 40 | #include <assert.h> |
52 | 41 | ||
53 | static inline bool containsAlphaNum( const QString &str ); | 42 | static inline bool containsAlphaNum( const QString &str ); |
54 | static inline bool constainsWhiteSpace( const QString &str ); | 43 | static inline bool constainsWhiteSpace( const QString &str ); |
55 | 44 | ||
56 | // helper functions, convert our comma delimited list to proper | 45 | // helper functions, convert our comma delimited list to proper |
57 | // file format... | 46 | // file format... |
58 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | 47 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, |
59 | QString &strAll ); | 48 | QString &strAll ); |
60 | 49 | ||
61 | // helper convert from file format to comma delimited... | 50 | // helper convert from file format to comma delimited... |
62 | void parseEmailTo( const QString &strDefaultEmail, | 51 | void parseEmailTo( const QString &strDefaultEmail, |
63 | const QString &strOtherEmail, QString &strBack ); | 52 | const QString &strOtherEmail, QString &strBack ); |
64 | 53 | ||
65 | ContactEditor::ContactEditor(const OContact &entry, | 54 | ContactEditor::ContactEditor(const OContact &entry, |
66 | QWidget *parent, | 55 | QWidget *parent, |
67 | const char *name, | 56 | const char *name, |
68 | WFlags ) | 57 | WFlags ) |
69 | : QDialog( parent, name, TRUE, WStyle_ContextHelp ), | 58 | : QDialog( parent, name, TRUE, WStyle_ContextHelp ), |
70 | defaultEmailChooserPosition( -1 ), | 59 | defaultEmailChooserPosition( -1 ), |
71 | m_personalView ( false ), | 60 | m_personalView ( false ), |
diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp index 97bfa6d..47d370a 100644 --- a/core/pim/addressbook/main.cpp +++ b/core/pim/addressbook/main.cpp | |||
@@ -1,28 +1,27 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qt Palmtop Environment. | 4 | ** This file is part of Qt Palmtop Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "addressbook.h" | 21 | #include "addressbook.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | ||
24 | 23 | ||
25 | #include <opie/oapplicationfactory.h> | 24 | #include <opie/oapplicationfactory.h> |
26 | 25 | ||
27 | OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) |
28 | 27 | ||
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp index 9e0c78a..7a20591 100644 --- a/core/pim/addressbook/picker.cpp +++ b/core/pim/addressbook/picker.cpp | |||
@@ -1,28 +1,26 @@ | |||
1 | #include "picker.h" | 1 | #include "picker.h" |
2 | 2 | ||
3 | #include <qfont.h> | ||
4 | #include <qstring.h> | ||
5 | #include <qtimer.h> | 3 | #include <qtimer.h> |
6 | #include <qlayout.h> | 4 | #include <qlayout.h> |
7 | 5 | ||
8 | char PickerLabel::lastLetter = '\0'; | 6 | char PickerLabel::lastLetter = '\0'; |
9 | 7 | ||
10 | PickerLabel::PickerLabel( QWidget *parent, const char *name ) | 8 | PickerLabel::PickerLabel( QWidget *parent, const char *name ) |
11 | : QLabel ( parent, name ) | 9 | : QLabel ( parent, name ) |
12 | { | 10 | { |
13 | currentLetter = 0; | 11 | currentLetter = 0; |
14 | //lastLetter = 0; | 12 | //lastLetter = 0; |
15 | 13 | ||
16 | letter1 = '\0'; | 14 | letter1 = '\0'; |
17 | letter2 = '\0'; | 15 | letter2 = '\0'; |
18 | letter3 = '\0'; | 16 | letter3 = '\0'; |
19 | 17 | ||
20 | // setFont( QFont( "smallsmooth", 9 ) ); | 18 | // setFont( QFont( "smallsmooth", 9 ) ); |
21 | setFont( QFont::defaultFont() ); | 19 | setFont( QFont::defaultFont() ); |
22 | setTextFormat( Qt::RichText ); | 20 | setTextFormat( Qt::RichText ); |
23 | 21 | ||
24 | } | 22 | } |
25 | 23 | ||
26 | PickerLabel::~PickerLabel() | 24 | PickerLabel::~PickerLabel() |
27 | { | 25 | { |
28 | 26 | ||