author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/cellitem.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/cellitem.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/korganizer/cellitem.cpp b/korganizer/cellitem.cpp index 61d06ac..1fd703c 100644 --- a/korganizer/cellitem.cpp +++ b/korganizer/cellitem.cpp | |||
@@ -27,7 +27,9 @@ | |||
27 | #include <klocale.h> | 27 | #include <klocale.h> |
28 | #include <kdebug.h> | 28 | #include <kdebug.h> |
29 | 29 | ||
30 | #include <qintdict.h> | 30 | #include <q3intdict.h> |
31 | //Added by qt3to4: | ||
32 | #include <Q3PtrList> | ||
31 | 33 | ||
32 | using namespace KOrg; | 34 | using namespace KOrg; |
33 | 35 | ||
@@ -36,17 +38,17 @@ QString CellItem::label() const | |||
36 | return i18n("<undefined>"); | 38 | return i18n("<undefined>"); |
37 | } | 39 | } |
38 | 40 | ||
39 | QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells, | 41 | Q3PtrList<CellItem> CellItem::placeItem( Q3PtrList<CellItem> cells, |
40 | CellItem *placeItem ) | 42 | CellItem *placeItem ) |
41 | { | 43 | { |
42 | kdDebug(5855) << "Placing " << placeItem->label() << endl; | 44 | kdDebug(5855) << "Placing " << placeItem->label() << endl; |
43 | 45 | ||
44 | QPtrList<KOrg::CellItem> conflictItems; | 46 | Q3PtrList<KOrg::CellItem> conflictItems; |
45 | int maxSubCells = 0; | 47 | int maxSubCells = 0; |
46 | QIntDict<KOrg::CellItem> subCellDict; | 48 | Q3IntDict<KOrg::CellItem> subCellDict; |
47 | 49 | ||
48 | // Find all items which are in same cell | 50 | // Find all items which are in same cell |
49 | QPtrListIterator<KOrg::CellItem> it2( cells ); | 51 | Q3PtrListIterator<KOrg::CellItem> it2( cells ); |
50 | for( it2.toFirst(); it2.current(); ++it2 ) { | 52 | for( it2.toFirst(); it2.current(); ++it2 ) { |
51 | KOrg::CellItem *item = it2.current(); | 53 | KOrg::CellItem *item = it2.current(); |
52 | if ( item == placeItem ) continue; | 54 | if ( item == placeItem ) continue; |
@@ -83,7 +85,7 @@ QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells, | |||
83 | conflictItems.append( placeItem ); | 85 | conflictItems.append( placeItem ); |
84 | placeItem->setSubCells( maxSubCells ); | 86 | placeItem->setSubCells( maxSubCells ); |
85 | 87 | ||
86 | QPtrListIterator<KOrg::CellItem> it3( conflictItems ); | 88 | Q3PtrListIterator<KOrg::CellItem> it3( conflictItems ); |
87 | for( it3.toFirst(); it3.current(); ++it3 ) { | 89 | for( it3.toFirst(); it3.current(); ++it3 ) { |
88 | (*it3)->setSubCells( maxSubCells ); | 90 | (*it3)->setSubCells( maxSubCells ); |
89 | } | 91 | } |