1 files changed, 13 insertions, 7 deletions

diff --git a/microkde/kdatetbl.h b/microkde/kdatetbl.h
index 87808df..2d3d2cf 100644
--- a/microkde/kdatetbl.h
+++ b/microkde/kdatetbl.h
@@ -1,358 +1,364 @@
 /*  -*- C++ -*-
     This file is part of the KDE libraries
     Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org)
               (C) 1998-2001 Mirko Boehm (mirko@kde.org)
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef KDATETBL_H
 #define KDATETBL_H
 
 #include <qvalidator.h>
-#include <qgridview.h>
+#include <q3gridview.h>
 #include <qlineedit.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <Q3Frame>
+#include <QKeyEvent>
+#include <QFocusEvent>
 
 /**
 * A table containing month names. It is used to pick a month directly.
 * @internal
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDateInternalMonthPicker : public QGridView
+class KDateInternalMonthPicker : public Q3GridView
 {
   Q_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
    */
   int result;
   /**
    * the cell under mouse cursor when LBM is pressed
    */
   short int activeCol;
   short int activeRow;
   /**
    * Contains the largest rectangle needed by the month names.
    */
   QRect max;
 signals:
   /**
    * This is send from the mouse click event handler.
    */
   void closeMe(int);
 public:
   /**
    * The constructor.
    */
   KDateInternalMonthPicker(QWidget* parent, const char* name=0);
   /**
    * The size hint.
    */
   QSize sizeHint() const;
   /**
    * Return the result. 0 means no selection (reject()), 1..12 are the
    * months.
    */
   int getResult() const;
 protected:
   /**
    * Set up the painter.
    */
   void setupPainter(QPainter *p);
   /**
    * The resize event.
    */
   void viewportResizeEvent(QResizeEvent*);
   /**
    * Paint a cell. This simply draws the month names in it.
    */
   virtual void paintCell(QPainter* painter, int row, int col);
   /**
    * Catch mouse click and move events to paint a rectangle around the item.
    */
   void contentsMousePressEvent(QMouseEvent *e);
   void contentsMouseMoveEvent(QMouseEvent *e);
   /**
    * Emit monthSelected(int) when a cell has been released.
    */
   void contentsMouseReleaseEvent(QMouseEvent *e);
 
 private:
   class KDateInternalMonthPrivate;
   KDateInternalMonthPrivate *d;
 };
 
 /** Year selection widget.
 * @internal
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
 class KDateInternalYearSelector : public QLineEdit
 {
   Q_OBJECT
 protected:
   QIntValidator *val;
   int result;
 public slots:
   void yearEnteredSlot();
 signals:
   void closeMe(int);
 public:
   KDateInternalYearSelector(int fontsize,
                             QWidget* parent=0,
                             const char* name=0);
   int getYear();
   void setYear(int year);
 
 private:
   class KDateInternalYearPrivate;
   KDateInternalYearPrivate *d;
 };
 
 /**
  * Frame with popup menu behaviour.
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class KPopupFrame : public QFrame
+class KPopupFrame : public Q3Frame
 {
   Q_OBJECT
 protected:
   /**
    * The result. It is returned from exec() when the popup window closes.
    */
   int result;
   /**
    * Catch key press events.
    */
   void keyPressEvent(QKeyEvent* e);
   /**
    * The only subwidget that uses the whole dialog window.
    */
   QWidget *main;
 public slots:
   /**
    * Close the popup window. This is called from the main widget, usually.
    * @p r is the result returned from exec().
    */
   void close(int r);
 public:
   /**
    * The contructor. Creates a dialog without buttons.
    */
   KPopupFrame(QWidget* parent=0, const char*  name=0);
   /**
    * Set the main widget. You cannot set the main widget from the constructor,
    * since it must be a child of the frame itselfes.
    * Be careful: the size is set to the main widgets size. It is up to you to
    * set the main widgets correct size before setting it as the main
    * widget.
    */
   void setMainWidget(QWidget* m);
   /**
    * The resize event. Simply resizes the main widget to the whole
    * widgets client size.
    */
   void resizeEvent(QResizeEvent*);
   /**
    * Open the popup window at position pos.
    */
   void popup(const QPoint &pos);
   /**
    * Execute the popup window.
    */
   int exec(QPoint p);
   /**
    * Dito.
    */
   int exec(int x, int y);
 
 private:
 
-  virtual bool close(bool alsoDelete) { return QFrame::close(alsoDelete); }
+  virtual bool close(bool alsoDelete) { return Q3Frame::close(alsoDelete); }
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
   class KPopupFramePrivate;
   KPopupFramePrivate *d;
 };
 
 /**
 * Validates user-entered dates.
 */
 class KDateValidator : public QValidator
 {
 public:
     KDateValidator(QWidget* parent=0, const char* name=0);
     virtual State validate(QString&, int&) const;
     virtual void fixup ( QString & input ) const;
     State date(const QString&, QDate&) const;
 };
 
 /**
  * Date selection table.
  * This is a support class for the KDatePicker class.  It just
  * draws the calender table without titles, but could theoretically
  * be used as a standalone.
  *
  * When a date is selected by the user, it emits a signal:
  * dateSelected(QDate)
  *
  * @internal
  * @version $Id$
  * @author Tim Gilman, Mirko Boehm
  */
-class KDateTable : public QGridView
+class KDateTable : public Q3GridView
 {
     Q_OBJECT
 public:
     /**
      * The constructor.
      */
     KDateTable(QWidget *parent=0,
                QDate date=QDate::currentDate(),
-               const char* name=0, WFlags f=0);
+               const char* name=0, Qt::WFlags f=0);
     /**
      * Returns a recommended size for the widget.
      * To save some time, the size of the largest used cell content is
      * calculated in each paintCell() call, since all calculations have
      * to be done there anyway. The size is stored in maxCell. The
      * sizeHint() simply returns a multiple of maxCell.
      */
     virtual QSize sizeHint() const;
     /**
      * Set the font size of the date table.
      */
     void setFontSize(int size);
     /**
      * Select and display this date.
      */
     bool setDate(const QDate&);
     const QDate& getDate() const;
 
 
 protected:
     bool mMarkCurrent;
     /**
      * Paint a cell.
      */
     virtual void paintCell(QPainter*, int, int);
     /**
      * Handle the resize events.
      */
     virtual void viewportResizeEvent(QResizeEvent *);
     /**
      * React on mouse clicks that select a date.
      */
     virtual void contentsMousePressEvent(QMouseEvent *);
     virtual void keyPressEvent( QKeyEvent *e );
     virtual void focusInEvent( QFocusEvent *e );
     virtual void focusOutEvent( QFocusEvent *e );
     /**
      * The font size of the displayed text.
      */
     int fontsize;
     /**
      * The currently selected date.
      */
     QDate date;
     /**
      * The day of the first day in the month [1..7].
      */
     int firstday;
     /**
      * The number of days in the current month.
      */
     int numdays;
     /**
      * The number of days in the previous month.
      */
     int numDaysPrevMonth;
     /**
      * unused
      */
     bool unused_hasSelection;
     /**
      * Save the size of the largest used cell content.
      */
     QRect maxCell;
 signals:
     /**
      * The selected date changed.
      */
     void dateChanged(QDate);
     /**
      * A date has been selected by clicking on the table.
      */
     void tableClicked();
 
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
     class KDateTablePrivate;
     KDateTablePrivate *d;
 };
 
 #endif // KDATETBL_H
-class KDateInternalWeekPicker : public QGridView
+class KDateInternalWeekPicker : public Q3GridView
 {
   Q_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
    */
   int result;
   /**
    * the cell under mouse cursor when LBM is pressed
    */
   short int activeCol;
   short int activeRow;
   /**
    * Contains the largest rectangle needed by the month names.
    */
   QRect max;
 signals:
   /**
    * This is send from the mouse click event handler.
    */
   void closeMe(int);
 public:
   /**
    * The constructor.
    */
   KDateInternalWeekPicker(QWidget* parent, const char* name=0);
   /**
    * The size hint.
    */
   QSize sizeHint() const;
   /**
    * Return the result. 0 means no selection (reject()), 1..12 are the
    * months.
    */
   int getResult() const;
 protected:
   /**
    * Set up the painter.
    */
   void setupPainter(QPainter *p);
   /**
    * The resize event.
    */
   void viewportResizeEvent(QResizeEvent*);
   /**
    * Paint a cell. This simply draws the month names in it.
    */
   virtual void paintCell(QPainter* painter, int row, int col);