Backing out unintentional merge from TT branch.

2 files changed, 0 insertions, 255 deletions

diff --git a/core/pim/datebook/layoutmanager.cpp b/core/pim/datebook/layoutmanager.cpp
deleted file mode 100644
index 23058ed..0000000
--- a/core/pim/datebook/layoutmanager.cpp
+++ b/dev/null
@@ -1,177 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include "layoutmanager.h"
-
-static const int min_height = 15;
-
-LayoutItem::LayoutItem( const EffectiveEvent e ) : eevent(e) { }
-
-LayoutManager::LayoutManager(int w, int h) : width(w), height(h), maxWidth(w) { }
-
-LayoutManager::~LayoutManager() { }
-
-void LayoutManager::setSize(int w, int h) 
-{
-    height = h;
-    maxWidth = width = w;
-    // with changed, re-init, re-layout items.
-    for (uint i = 0; i < mItems.count(); i++)
-	initializeGeometry(mItems.at(i));
-}
-
-void LayoutManager::setOccurances(QValueList<EffectiveEvent> &events)
-{
-    mItems.clear();
-
-    QValueListIterator<EffectiveEvent> it;
-    for ( it = events.begin(); it != events.end(); ++it ) {
-	addOccurance(*it);
-    }
-    layoutItems(TRUE);
-}
-
-void LayoutManager::addOccurance(EffectiveEvent &event)
-{
-    LayoutItem *i = new LayoutItem(event);
-    initializeGeometry(i);
-    addItem(i);
-}
-
-void LayoutManager::addItem(LayoutItem *i)
-{
-    mItems.resize(mItems.size() + 1);
-    mItems.insert(mItems.size() - 1, i);
-}
-
-void LayoutManager::layoutItems(bool resetMaxWidth)
-{
-    if (resetMaxWidth)
-	maxWidth = width;
-
-    int iCount = mItems.count();
-    int itemWidth = QMIN(width, maxWidth);
-    int n = 1;
-
-    if (width < 1)
-	return;
-    if (iCount < (width/4)) {
-	int i = 0;
-	while (i < iCount) {
-	    LayoutItem *item = mItems.at(i);
-	    int x = 0;
-	    int xp = 0;
-	    QRect geom = item->geometry();
-	    geom.setX( x );
-	    geom.setWidth(itemWidth);
-	    while ( xp < n && intersects(item, geom)) {
-		x += itemWidth;
-		xp++;
-		geom.moveBy(itemWidth, 0);
-	    }
-	    if (xp >= n) {
-		n++;
-		itemWidth = QMIN(width / n, maxWidth);
-		i = 0; // Start again.
-	    } else {
-		item->setGeometry( geom );
-		i++;
-	    }
-	}
-    } else {
-	// alturnate algorithm. // same as above, but just overlap
-	// if fail.
-	itemWidth = 4;
-	n = width / itemWidth;
-	int i = 0;
-	int rovingXp = 0;
-	while (i < iCount) {
-	    LayoutItem *item = mItems.at(i);
-	    int x = 0;
-	    int xp = 0;
-	    QRect geom = item->geometry();
-	    geom.setX( x );
-	    geom.setWidth(itemWidth);
-	    while ( xp < n && intersects(item, geom)) {
-		x += itemWidth;
-		xp++;
-		geom.moveBy(itemWidth, 0);
-	    }
-	    if (xp >= n) {
-		geom.setX(rovingXp * itemWidth);
-		geom.setWidth(itemWidth);
-		rovingXp++;
-		item->setGeometry( geom );
-	    } else {
-		item->setGeometry( geom );
-	    }
-	    i++;
-	}
-    }
-    if (itemWidth < maxWidth)
-	maxWidth = itemWidth;
-}
-
-int LayoutManager::timeToHeight( const QTime &time ) const
-{
-    int y = time.hour() * 60 + time.minute();
-    if (y)
-	y = (y * (height / 24)) / 60;
-    return y;
-}
-
-QTime LayoutManager::heightToTime( int h ) const
-{
-    // broken
-    return QTime(0,0,0);
-}
-
-LayoutItem *LayoutManager::intersects(LayoutItem *item, QRect geom) const
-{
-    int i = 0;
-    // allow overlapping
-    geom.moveBy(1,1);
-    geom.setSize( geom.size() - QSize(2,2) );
-
-    LayoutItem *it = mItems.at(i);
-    int count = mItems.count();
-    while (i < count && it != item) {
-	if (it->geometry().intersects( geom ) )
-	    return it;
-	it = mItems.at(++i);
-    }
-    return 0;
-}
-
-void LayoutManager::initializeGeometry(LayoutItem *item)
-{
-    int y = timeToHeight(item->occurance().start());
-    int yend = timeToHeight(item->occurance().end());
-
-    int h = yend - y;
-    if (h < min_height)
-	h = min_height;
-    if (y + min_height > height) {
-	y = height - min_height;
-	h = min_height;
-    }
-
-    item->setGeometry(QRect(0, y, width, h));
-}
diff --git a/core/pim/datebook/layoutmanager.h b/core/pim/datebook/layoutmanager.h
deleted file mode 100644
index 128f927..0000000
--- a/core/pim/datebook/layoutmanager.h
+++ b/dev/null
@@ -1,78 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include <qvector.h>
-#include <qvaluelist.h>
-#include <qrect.h>
-#include <qdatetime.h>
-#include <qpe/event.h>
-
-class LayoutItem
-{
-public:
-    LayoutItem( const EffectiveEvent e );
-
-    void setGeometry(const QRect &rect) { r = rect; }
-    void setGeometry(int x, int y, int w, int h) 
-    { setGeometry(QRect(x,y,w,h)); }
-    QRect geometry() const { return r; }
-
-    EffectiveEvent occurance() const { return eevent; }
-    Event event() const { return eevent.event(); }
-
-private:
-    EffectiveEvent eevent;
-    QRect r;
-};
-
-class LayoutManager
-{
-public:
-    LayoutManager(int w, int h);
-    virtual ~LayoutManager();
-
-    void setSize(int w, int h);
-    void setMaximumColumnWidth(int x) { maxWidth = x; };
-    int maximumColumnWidth() const { return maxWidth; };
-    void setOccurances(QValueList<EffectiveEvent> &events);
-    virtual void addOccurance(EffectiveEvent &event);
-
-    void clear() { mItems.clear(); }
-
-    QVector<LayoutItem> items() const { return mItems; }
-    QSize size() const { return QSize(width, height); }
-    int count() const { return mItems.count(); }
-
-    virtual void layoutItems(bool resetMaxWidth = FALSE);
-
-    virtual int timeToHeight(const QTime &) const;
-    virtual QTime heightToTime(int) const;
-
-protected:
-    void initializeGeometry(LayoutItem *);
-    LayoutItem *intersects(LayoutItem *, QRect) const;
-    void addItem(LayoutItem *);
-
-private:
-    QVector<LayoutItem> mItems;
-    int width;
-    int height;
-    int maxWidth;
-};