Diffstat (limited to 'core/pim/addressbook/configdlg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/configdlg.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index dee0f11..6c98b5d 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp | |||
@@ -2,2 +2,7 @@ | |||
2 | 2 | ||
3 | #include <opie2/opimcontact.h> | ||
4 | #include "opie2/opimcontactfields.h" | ||
5 | |||
6 | #include <qpe/resource.h> | ||
7 | |||
3 | #include <qcheckbox.h> | 8 | #include <qcheckbox.h> |
@@ -7,7 +12,2 @@ | |||
7 | 12 | ||
8 | #include <qpe/resource.h> | ||
9 | |||
10 | #include <opie/ocontact.h> | ||
11 | #include "opie/ocontactfields.h" | ||
12 | |||
13 | ConfigDlg::ConfigDlg( QWidget *parent, const char *name): | 13 | ConfigDlg::ConfigDlg( QWidget *parent, const char *name): |
@@ -15,3 +15,3 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): | |||
15 | { | 15 | { |
16 | contFields = OContactFields::trfields(); | 16 | contFields = Opie::OPimContactFields::trfields(); |
17 | 17 | ||
@@ -23,3 +23,3 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): | |||
23 | // Reset Widget Flags: This was not changeable by designer :( | 23 | // Reset Widget Flags: This was not changeable by designer :( |
24 | setWFlags ( WStyle_ContextHelp ); | 24 | setWFlags ( WStyle_ContextHelp ); |
25 | 25 | ||
@@ -30,7 +30,7 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): | |||
30 | m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) ); | 30 | m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) ); |
31 | 31 | ||
32 | 32 | ||
33 | // Get the translation maps between Field ID and translated strings | 33 | // Get the translation maps between Field ID and translated strings |
34 | m_mapStrToID = OContactFields::trFieldsToId(); | 34 | m_mapStrToID = Opie::OPimContactFields::trFieldsToId(); |
35 | m_mapIDToStr = OContactFields::idToTrFields(); | 35 | m_mapIDToStr = Opie::OPimContactFields::idToTrFields(); |
36 | 36 | ||
@@ -78,3 +78,3 @@ void ConfigDlg::slotItemAdd() | |||
78 | fieldListBox->insertItem( item ); | 78 | fieldListBox->insertItem( item ); |
79 | } | 79 | } |
80 | } | 80 | } |
@@ -88,8 +88,8 @@ void ConfigDlg::slotItemRemove() | |||
88 | fieldListBox->removeItem( i ); | 88 | fieldListBox->removeItem( i ); |
89 | } | 89 | } |
90 | } | 90 | } |
91 | 91 | ||
92 | void ConfigDlg::setConfig( const AbConfig& cnf ) | 92 | void ConfigDlg::setConfig( const AbConfig& cnf ) |
93 | { | 93 | { |
94 | m_config = cnf; | 94 | m_config = cnf; |
95 | 95 | ||
@@ -107,3 +107,3 @@ void ConfigDlg::setConfig( const AbConfig& cnf ) | |||
107 | break; | 107 | break; |
108 | case 1: | 108 | case 1: |
109 | m_smallFont->setChecked( false ); | 109 | m_smallFont->setChecked( false ); |
@@ -112,3 +112,3 @@ void ConfigDlg::setConfig( const AbConfig& cnf ) | |||
112 | break; | 112 | break; |
113 | case 2: | 113 | case 2: |
114 | m_smallFont->setChecked( false ); | 114 | m_smallFont->setChecked( false ); |
@@ -126,5 +126,5 @@ void ConfigDlg::setConfig( const AbConfig& cnf ) | |||
126 | } | 126 | } |
127 | 127 | ||
128 | AbConfig ConfigDlg::getConfig() | 128 | AbConfig ConfigDlg::getConfig() |
129 | { | 129 | { |
130 | m_config.setUseRegExp( m_useRegExp->isOn() ); | 130 | m_config.setUseRegExp( m_useRegExp->isOn() ); |