Diffstat (limited to 'core/pim/addressbook/abtable.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/addressbook/abtable.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h index b9ebe27..927a5a9 100644 --- a/core/pim/addressbook/abtable.h +++ b/core/pim/addressbook/abtable.h | |||
@@ -22,9 +22,10 @@ | |||
22 | #ifndef ABTABLE_H | 22 | #ifndef ABTABLE_H |
23 | #define ABTABLE_H | 23 | #define ABTABLE_H |
24 | 24 | ||
25 | #include <opie2/opimcontact.h> | ||
26 | #include <opie2/ocontactaccess.h> | ||
27 | |||
25 | #include <qpe/categories.h> | 28 | #include <qpe/categories.h> |
26 | #include <opie/ocontact.h> | ||
27 | #include <opie/ocontactaccess.h> | ||
28 | 29 | ||
29 | #include <qmap.h> | 30 | #include <qmap.h> |
30 | #include <qtable.h> | 31 | #include <qtable.h> |
@@ -83,7 +84,7 @@ public: | |||
83 | ~AbTable(); | 84 | ~AbTable(); |
84 | 85 | ||
85 | // Set the contacts shown in the table | 86 | // Set the contacts shown in the table |
86 | void setContacts( const OContactAccess::List& viewList ); | 87 | void setContacts( const Opie::OPimContactAccess::List& viewList ); |
87 | 88 | ||
88 | // Set the list for primary contacts | 89 | // Set the list for primary contacts |
89 | void setOrderedList( const QValueList<int> ordered ); | 90 | void setOrderedList( const QValueList<int> ordered ); |
@@ -92,12 +93,12 @@ public: | |||
92 | bool selectContact( int UID ); | 93 | bool selectContact( int UID ); |
93 | 94 | ||
94 | // Get the current selected entry | 95 | // Get the current selected entry |
95 | OContact currentEntry(); | 96 | Opie::OPimContact currentEntry(); |
96 | 97 | ||
97 | // Get the UID of the current selected Entry | 98 | // Get the UID of the current selected Entry |
98 | int currentEntry_UID(); | 99 | int currentEntry_UID(); |
99 | 100 | ||
100 | // QString findContactName( const OContact &entry ); | 101 | // QString findContactName( const Opie::OPimContact &entry ); |
101 | 102 | ||
102 | void init(); | 103 | void init(); |
103 | void clear(); | 104 | void clear(); |
@@ -135,8 +136,8 @@ protected slots: | |||
135 | void rowHeightChanged( int row ); | 136 | void rowHeightChanged( int row ); |
136 | 137 | ||
137 | private: | 138 | private: |
138 | // void insertIntoTable( const OContact &cnt, int row ); | 139 | // void insertIntoTable( const Opie::OPimContact &cnt, int row ); |
139 | ContactItem findContactContact( const OContact &entry, int row ); | 140 | ContactItem findContactContact( const Opie::OPimContact &entry, int row ); |
140 | void fitColumns(); | 141 | void fitColumns(); |
141 | void resizeRows(); | 142 | void resizeRows(); |
142 | void realignTable(); | 143 | void realignTable(); |
@@ -145,14 +146,14 @@ private: | |||
145 | 146 | ||
146 | int lastSortCol; | 147 | int lastSortCol; |
147 | bool asc; | 148 | bool asc; |
148 | // QMap<AbTableItem*, OContact> contactList; | 149 | // QMap<AbTableItem*, Opie::OPimContact> contactList; |
149 | QValueList<int> intFields; | 150 | QValueList<int> intFields; |
150 | QStringList choicenames; | 151 | QStringList choicenames; |
151 | bool enablePainting; | 152 | bool enablePainting; |
152 | bool columnVisible; | 153 | bool columnVisible; |
153 | int countNested; | 154 | int countNested; |
154 | 155 | ||
155 | OContactAccess::List m_viewList; | 156 | Opie::OPimContactAccess::List m_viewList; |
156 | 157 | ||
157 | }; | 158 | }; |
158 | #endif // ABTABLE_H | 159 | #endif // ABTABLE_H |