1 files changed, 26 insertions, 17 deletions

diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 380ce62..0708341 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -14,75 +14,84 @@
 
     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.
 */
 #ifndef KOAGENDA_H
 #define KOAGENDA_H
 
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qtimer.h>
-#include <qmemarray.h>
+#include <q3memarray.h>
 #include <qpainter.h>
 #include <qpixmap.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QLabel>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
+#include <QEvent>
 
 #include "koagendaitem.h"
 #include "koeventview.h"
 
-class QPopupMenu;
+class Q3PopupMenu;
 class QTime;
 class KConfig;
-class QFrame;
+class Q3Frame;
 class KOAgenda;
 class KCal::Event;
 class KCal::Todo;
 
 using namespace KCal;
 
-class MarcusBains : public QFrame {
+class MarcusBains : public Q3Frame {
     Q_OBJECT
   public:
     MarcusBains(KOAgenda *agenda=0,const char *name=0);
     virtual ~MarcusBains();
     void hideMe();
   public slots:
     void updateLocation(bool recalculate=false);
     void updateLoc();
 
   private:
     int todayColumn();
     QTimer *minutes;
     QLabel *mTimeBox;
     KOAgenda *agenda;
     QTime oldTime;
     int oldToday;
 };
 
 
-class KOAgenda : public QScrollView
+class KOAgenda : public Q3ScrollView
 {
     Q_OBJECT
   public:
     enum MouseActionType { NOP, MOVE, SELECT,
                            RESIZETOP, RESIZEBOTTOM, RESIZELEFT, RESIZERIGHT };
 
     KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0,
-               const char * name=0, WFlags f=0 );
+               const char * name=0, Qt::WFlags f=0 );
     KOAgenda ( int columns, QWidget * parent=0,
-               const char * name=0, WFlags f=0 );
+               const char * name=0, Qt::WFlags f=0 );
     virtual ~KOAgenda();
     bool mInvalidPixmap;
 
     Incidence *selectedIncidence() const;
     QDate selectedIncidenceDate() const;
 
     virtual bool eventFilter ( QObject *, QEvent * );
 
     void contentsToGrid (int x, int y, int& gx, int& gy);
     void gridToContents (int gx, int gy, int& x, int& y);
 
     int timeToY (const QTime &time);
@@ -108,25 +117,25 @@ class KOAgenda : public QScrollView
     void clear();
     
     void clearSelection();
     void hideUnused();
 
     /** Calculates the minimum width */
     virtual int minimumWidth() const;
     /** Update configuration from preference settings */
     void updateConfig();
 
     void checkScrollBoundaries();
 
-    void setHolidayMask(QMemArray<bool> *);
+    void setHolidayMask(Q3MemArray<bool> *);
     void setDateList(const DateList &selectedDates);
     DateList dateList() const;
     void drawContentsToPainter( QPainter* paint = 0, bool backgroundOnly = false);
     void finishUpdate();
     void printSelection();
     void storePosition();
     void restorePosition();
     void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; }
     void shrinkPixmap();
     QTime getEndTime();
     bool invalidPixmap();
 
@@ -268,41 +277,41 @@ class KOAgenda : public QScrollView
     // Selection
     int mSelectionCellX;
     int mSelectionYTop;
     int mSelectionHeight;
 
     // List of dates to be displayed
     DateList mSelectedDates;
 
     // The KOAgendaItem, which has been right-clicked last
     KOAgendaItem *mClickedItem;
 
     // The KOAgendaItem, which is being moved/resized
-    QGuardedPtr<KOAgendaItem> mActionItem;
+    QPointer<KOAgendaItem> mActionItem;
 
     // Currently selected item
-    QGuardedPtr<KOAgendaItem> mSelectedItem;
+    QPointer<KOAgendaItem> mSelectedItem;
 
     // The Marcus Bains Line widget.
     MarcusBains *mMarcusBains;
     void computeSizes();
   
     MouseActionType mActionType;
 
     bool mItemMoved;
 
     // List of all Items contained in agenda
-    QPtrList<KOAgendaItem> mItems;
-    QPtrList<KOAgendaItem> mUnusedItems;
+    Q3PtrList<KOAgendaItem> mItems;
+    Q3PtrList<KOAgendaItem> mUnusedItems;
     KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport);
-    QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
-    QPopupMenu *mNewItemPopup;
+    Q3PopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
+    Q3PopupMenu *mNewItemPopup;
 
     int mOldLowerScrollValue;
     int mOldUpperScrollValue;
     KOAgendaItem * getItemForTodo ( Todo * todo );
-    QMemArray<bool> *mHolidayMask;
+    Q3MemArray<bool> *mHolidayMask;
     int mCurPixWid;
     int mCurPixHei;
 };
 
 #endif // KOAGENDA_H