1 files changed, 53 insertions, 46 deletions

diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 353f78d..10dc449 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -46,2 +46,10 @@
 #include <qdialog.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <Q3Frame>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
 #include <assert.h>
@@ -71,3 +79,3 @@ KDateValidator::date(const QString& text, QDate& d) const
         } else
-        return Valid;
+        return QValidator::Intermediate;
 }
@@ -80,4 +88,4 @@ KDateValidator::fixup( QString& ) const
 
-KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
-    : QGridView(parent, name, f)
+KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, Qt::WFlags f)
+    : Q3GridView(parent, name, f)
 {
@@ -88,3 +96,3 @@ KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
         }
-    setFocusPolicy( QWidget::StrongFocus );
+    setFocusPolicy( Qt::StrongFocus );
     setNumRows(7); // 6 weeks max + headline
@@ -95,3 +103,3 @@ KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
 #if 0
-    viewport()->setEraseColor(lightGray);
+    viewport()->setEraseColor(Qt::lightGray);
 #endif
@@ -110,3 +118,3 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
     int pos;
-    QBrush brushBlue(blue);
+    QBrush brushBlue(Qt::blue);
     QBrush brushLightblue(QColor(220,245,255));
@@ -135,14 +143,13 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                     painter->drawRect(0, 0, w, h);
-                    painter->setPen(blue);
+                    painter->setPen(Qt::blue);
                 } else {
-                painter->setPen(blue);
+                painter->setPen(Qt::blue);
                 painter->setBrush(brushBlue);
                 painter->drawRect(0, 0, w, h);
-                painter->setPen(white);
+                painter->setPen(Qt::white);
             }
-            painter->drawText(0, 0, w, h-1, AlignCenter,
+            painter->drawText(0, 0, w, h-1, Qt::AlignCenter,
                               daystr, -1, &rect);
-            painter->setPen(black);
-            painter->moveTo(0, h-1);
-            painter->lineTo(w-1, h-1);
+            painter->setPen(Qt::black);
+            painter->drawLine(0, h-1, w-1, h-1);
             // ----- draw the weekday:
@@ -163,6 +170,6 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                 }
-                painter->setPen(gray);
+                painter->setPen(Qt::gray);
             } else { // paint a day of the current month
             text.setNum(pos-firstday+1);
-            painter->setPen(black);
+            painter->setPen(Qt::black);
         }
@@ -173,12 +180,12 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                 if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
-                    painter->setPen(green);
+                    painter->setPen(Qt::green);
                 else
-                    painter->setPen(red);
+                    painter->setPen(Qt::red);
                 if(hasFocus())
                     {  
-                        painter->setBrush(darkRed);
-                        pen=white;
+                        painter->setBrush(Qt::darkRed);
+                        pen=QColor(Qt::white);
                     } else {
-                    painter->setBrush(darkGray);
-                    pen=white;
+                    painter->setBrush(Qt::darkGray);
+                    pen=QColor(Qt::white);
                 }
@@ -187,5 +194,5 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                 {
-                    painter->setPen(green);
-                    painter->setBrush(darkGreen);
-                    pen=white;
+                    painter->setPen(Qt::green);
+                    painter->setBrush(Qt::darkGreen);
+                    pen=QColor(Qt::white);
                 } else {
@@ -197,3 +204,3 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
         painter->setPen(pen);
-        painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
+        painter->drawText(0, 0, w, h, Qt::AlignCenter, text, -1, &rect);
     }
@@ -276,3 +283,3 @@ KDateTable::viewportResizeEvent(QResizeEvent * e)
 {
-    QGridView::viewportResizeEvent(e);
+    Q3GridView::viewportResizeEvent(e);
 
@@ -411,3 +418,3 @@ void KDateTable::focusInEvent( QFocusEvent *e )
     repaintContents(false);
-    QGridView::focusInEvent( e );
+    Q3GridView::focusInEvent( e );
 }
@@ -417,3 +424,3 @@ void KDateTable::focusOutEvent( QFocusEvent *e )
     repaintContents(false);
-    QGridView::focusOutEvent( e );
+    Q3GridView::focusOutEvent( e );
 }
@@ -434,3 +441,3 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
       result(0) // invalid
@@ -453,3 +460,3 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
     setVScrollBarMode(AlwaysOff);
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
     setNumRows(4);
@@ -459,3 +466,3 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
 #if 0
-    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
+    viewport()->setEraseColor(Qt::lightGray); // for consistency with the datepicker
 #endif
@@ -489,3 +496,3 @@ KDateInternalMonthPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
@@ -507,3 +514,3 @@ KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
     text=KGlobal::locale()->monthName(index, false);
-    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
+    painter->drawText(0, 0, cellWidth(), cellHeight(), Qt::AlignCenter, text);
     if ( activeCol == col && activeRow == row )
@@ -515,3 +522,3 @@ KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
         {
@@ -542,3 +549,3 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
         {
@@ -616,3 +623,3 @@ KDateInternalYearSelector::KDateInternalYearSelector
 #if 0
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
 #endif
@@ -663,3 +670,3 @@ KDateInternalYearSelector::setYear(int year)
 KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
-    : QFrame(parent, name, WType_Popup),
+    : Q3Frame(parent, name, Qt::WType_Popup),
       result(0), // rejected
@@ -667,3 +674,3 @@ KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
 {
-    setFrameStyle(QFrame::Box|QFrame::Raised);
+    setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
     setMidLineWidth(2);
@@ -674,3 +681,3 @@ KPopupFrame::keyPressEvent(QKeyEvent* e)
 {
-    if(e->key()==Key_Escape)
+    if(e->key()==Qt::Key_Escape)
         {
@@ -758,3 +765,3 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
       result(0) // invalid
@@ -775,3 +782,3 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
     setVScrollBarMode(AlwaysOff);
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
     if ( QApplication::desktop()->height() > 240 ) {
@@ -786,3 +793,3 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
 #if 0
-    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
+    viewport()->setEraseColor(Qt::lightGray); // for consistency with the datepicker
 #endif
@@ -820,3 +827,3 @@ KDateInternalWeekPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
@@ -838,3 +845,3 @@ KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
     text=QString::number( index );
-    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
+    painter->drawText(0, 0, cellWidth(), cellHeight(), Qt::AlignCenter, text);
     if ( activeCol == col && activeRow == row )
@@ -846,3 +853,3 @@ KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
         {
@@ -873,3 +880,3 @@ KDateInternalWeekPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
         {