-rw-r--r-- | kabc/addresseelist.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp index 097e162..e1ba1ce 100644 --- a/kabc/addresseelist.cpp +++ b/kabc/addresseelist.cpp | |||
@@ -19,25 +19,27 @@ | |||
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* | 22 | /* |
23 | Enhanced Version of the file for platform independent KDE tools. | 23 | Enhanced Version of the file for platform independent KDE tools. |
24 | Copyright (c) 2004 Ulf Schenk | 24 | Copyright (c) 2004 Ulf Schenk |
25 | 25 | ||
26 | $Id$ | 26 | $Id$ |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <kdebug.h> | 29 | #include <kdebug.h> |
30 | //US | 30 | //US |
31 | #include <qtl.h> | 31 | #include <q3tl.h> |
32 | //Added by qt3to4: | ||
33 | #include <Q3ValueList> | ||
32 | 34 | ||
33 | 35 | ||
34 | #include "addresseelist.h" | 36 | #include "addresseelist.h" |
35 | #include "field.h" | 37 | #include "field.h" |
36 | 38 | ||
37 | using namespace KABC; | 39 | using namespace KABC; |
38 | 40 | ||
39 | // | 41 | // |
40 | // | 42 | // |
41 | // Traits | 43 | // Traits |
42 | // | 44 | // |
43 | // | 45 | // |
@@ -112,44 +114,44 @@ bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 ) | |||
112 | } else { | 114 | } else { |
113 | return given < 0; | 115 | return given < 0; |
114 | } | 116 | } |
115 | } | 117 | } |
116 | 118 | ||
117 | // | 119 | // |
118 | // | 120 | // |
119 | // AddresseeList | 121 | // AddresseeList |
120 | // | 122 | // |
121 | // | 123 | // |
122 | 124 | ||
123 | AddresseeList::AddresseeList() | 125 | AddresseeList::AddresseeList() |
124 | : QValueList<Addressee>() | 126 | : Q3ValueList<Addressee>() |
125 | { | 127 | { |
126 | mReverseSorting = false; | 128 | mReverseSorting = false; |
127 | mActiveSortingCriterion = FormattedName; | 129 | mActiveSortingCriterion = FormattedName; |
128 | mActiveSortingField = 0; | 130 | mActiveSortingField = 0; |
129 | } | 131 | } |
130 | 132 | ||
131 | AddresseeList::~AddresseeList() | 133 | AddresseeList::~AddresseeList() |
132 | { | 134 | { |
133 | } | 135 | } |
134 | 136 | ||
135 | AddresseeList::AddresseeList( const AddresseeList &l ) | 137 | AddresseeList::AddresseeList( const AddresseeList &l ) |
136 | : QValueList<Addressee>( l ) | 138 | : Q3ValueList<Addressee>( l ) |
137 | { | 139 | { |
138 | mReverseSorting = l.reverseSorting(); | 140 | mReverseSorting = l.reverseSorting(); |
139 | mActiveSortingCriterion = l.sortingCriterion(); | 141 | mActiveSortingCriterion = l.sortingCriterion(); |
140 | } | 142 | } |
141 | 143 | ||
142 | AddresseeList::AddresseeList( const QValueList<Addressee> &l ) | 144 | AddresseeList::AddresseeList( const Q3ValueList<Addressee> &l ) |
143 | : QValueList<Addressee>( l ) | 145 | : Q3ValueList<Addressee>( l ) |
144 | { | 146 | { |
145 | mReverseSorting = false; | 147 | mReverseSorting = false; |
146 | } | 148 | } |
147 | 149 | ||
148 | void AddresseeList::dump() const | 150 | void AddresseeList::dump() const |
149 | { | 151 | { |
150 | kdDebug(5700) << "AddresseeList {" << endl; | 152 | kdDebug(5700) << "AddresseeList {" << endl; |
151 | kdDebug(5700) << "reverse order: " << ( mReverseSorting ? "true" : "false" ) << endl; | 153 | kdDebug(5700) << "reverse order: " << ( mReverseSorting ? "true" : "false" ) << endl; |
152 | 154 | ||
153 | QString crit; | 155 | QString crit; |
154 | if ( Uid == mActiveSortingCriterion ) { | 156 | if ( Uid == mActiveSortingCriterion ) { |
155 | crit = "Uid"; | 157 | crit = "Uid"; |