summaryrefslogtreecommitdiffabout
path: root/korganizer/cellitem.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/cellitem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/cellitem.cpp14
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
@@ -14,52 +14,54 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
*/
#include "cellitem.h"
#include <klocale.h>
#include <kdebug.h>
-#include <qintdict.h>
+#include <q3intdict.h>
+//Added by qt3to4:
+#include <Q3PtrList>
using namespace KOrg;
QString CellItem::label() const
{
return i18n("<undefined>");
}
-QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells,
+Q3PtrList<CellItem> CellItem::placeItem( Q3PtrList<CellItem> cells,
CellItem *placeItem )
{
kdDebug(5855) << "Placing " << placeItem->label() << endl;
- QPtrList<KOrg::CellItem> conflictItems;
+ Q3PtrList<KOrg::CellItem> conflictItems;
int maxSubCells = 0;
- QIntDict<KOrg::CellItem> subCellDict;
+ Q3IntDict<KOrg::CellItem> subCellDict;
// Find all items which are in same cell
- QPtrListIterator<KOrg::CellItem> it2( cells );
+ Q3PtrListIterator<KOrg::CellItem> it2( cells );
for( it2.toFirst(); it2.current(); ++it2 ) {
KOrg::CellItem *item = it2.current();
if ( item == placeItem ) continue;
if ( item->overlaps( placeItem ) ) {
kdDebug(5855) << " Overlaps: " << item->label() << endl;
conflictItems.append( item );
if ( item->subCells() > maxSubCells ) maxSubCells = item->subCells();
subCellDict.insert( item->subCell(), item );
}
}
if ( conflictItems.count() > 0 ) {
// Look for unused sub cell and insert item
int i;
@@ -70,29 +72,29 @@ QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells,
placeItem->setSubCell( i );
break;
}
}
if ( i == maxSubCells ) {
kdDebug(5855) << " New subcell " << i << endl;
placeItem->setSubCell( maxSubCells );
maxSubCells++; // add new item to number of sub cells
}
kdDebug(5855) << " Sub cells: " << maxSubCells << endl;
// Write results to item to be placed
conflictItems.append( placeItem );
placeItem->setSubCells( maxSubCells );
- QPtrListIterator<KOrg::CellItem> it3( conflictItems );
+ Q3PtrListIterator<KOrg::CellItem> it3( conflictItems );
for( it3.toFirst(); it3.current(); ++it3 ) {
(*it3)->setSubCells( maxSubCells );
}
// Todo: Adapt subCells of items conflicting with conflicting items
} else {
kdDebug(5855) << " no conflicts" << endl;
placeItem->setSubCell( 0 );
placeItem->setSubCells( 1 );
}
return conflictItems;
}