less qt3_support

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=634693

diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp
index d69487b963b755013cbe3061e2f86b61b0b37077..e0d2b493b816f89a3496dd699775d101d859c210 100644 (file)
--- a/extdate/extdatetbl.cpp
+++ b/extdate/extdatetbl.cpp
@@ -45,11 +45,10 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
+#include <kmenu.h>
 #include <knotification.h>
-#include "k3popupmenu.h"
 #include <QPainter>
 #include <Q3Dict>
-//Added by qt3to4:
 #include <QWheelEvent>
 #include <QFocusEvent>
 #include <QKeyEvent>
@@ -139,7 +138,9 @@ ExtDateTable::ExtDateTable(QWidget *parent, ExtDate date_, const char* name, Qt:
   setNumCols(7); // 7 days a week
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
-  viewport()->setEraseColor(KGlobalSettings::baseColor());
+  QPalette pal = viewport()->palette();
+  pal.setColor(viewport()->backgroundRole(), KGlobalSettings::baseColor());
+  viewport()->setPalette(pal);
   setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
 }
 
@@ -227,8 +228,8 @@ ExtDateTable::paintCell(QPainter *painter, int row, int col)
           painter->drawRect(0, 0, w, h);
           painter->setPen(textColor);
         }
-      painter->drawText(0, 0, w, h-1, Qt::AlignCenter,
-                        d->calendar->weekDayName(daynum, true), -1, &rect);
+      painter->drawText(QRect(0, 0, w, h-1), Qt::AlignCenter,
+                        d->calendar->weekDayName(daynum, true), &rect);
       painter->setPen(palette().color(QPalette::Text));
       //      painter->moveTo(0, h-1);
       //      painter->lineTo(w-1, h-1);
@@ -303,7 +304,7 @@ ExtDateTable::paintCell(QPainter *painter, int row, int col)
 
       if ( paintRect ) painter->drawRect(0, 0, w, h);
       painter->setPen(pen);
-      painter->drawText(0, 0, w, h, Qt::AlignCenter, text, -1, &rect);
+      painter->drawText(QRect(0, 0, w, h), Qt::AlignCenter, text, &rect);
     }
   if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width());
   if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height());
@@ -460,12 +461,12 @@ ExtDateTable::contentsMousePressEvent(QMouseEvent *e)
 
   if (  e->button() == Qt::RightButton && d->popupMenuEnabled )
   {
-        K3PopupMenu *menu = new K3PopupMenu();
+        KMenu *menu = new KMenu();
 
 //FIXME: Uncomment the following line (and remove the one after it)
 //       if ExtDate is added to kdelibs
-//        menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) );
-        menu->insertTitle( clickedDate.toString() );
+//        menu->addTitle( KGlobal::locale()->formatDate(clickedDate) );
+        menu->addTitle( clickedDate.toString() );
 
         emit aboutToShowContextMenu( menu, clickedDate );
         menu->popup(e->globalPos());
@@ -671,7 +672,9 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker
   setNumRows( (d->calendar->monthsInYear(date) + 2) / 3);
   // enable to find drawing failures:
   // setTableFlags(Tbl_clipCellPainting);
-  viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker
+  QPalette pal = viewport()->palette();
+  pal.setColor(viewport()->backgroundRole(), KGlobalSettings::baseColor());  // for consistency with the datepicker
+  viewport()->setPalette(pal);
   // ----- find the preferred size
   //       (this is slow, possibly, but unfortunately it is needed here):
   QFontMetrics metrics(font);
@@ -757,7 +760,7 @@ ExtDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 void
 ExtDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-  if (e->state() & Qt::LeftButton)
+  if (e->buttons() & Qt::LeftButton)
     {
       int row, col;
       QPoint mouseCoord;

diff --git a/extdate/extdatetbl.h b/extdate/extdatetbl.h
index 84697c59e16b9a53c58841f9918db9c29398d2d4..94a543e59596f175129119b4821dd7b2c9087e6a 100644 (file)
--- a/extdate/extdatetbl.h
+++ b/extdate/extdatetbl.h
@@ -37,7 +37,7 @@
 #include <klineedit.h>
 #include "extcalendarsystemgregorian.h"
 
-class K3PopupMenu;
+class QMenu;
 class QPainter;
 
 /** Week selection widget.
@@ -423,7 +423,7 @@ signals:
      * right clicks on that date and the popup menu is enabled). Connect
      * the slot where you fill the menu to this signal.
      */
-    void aboutToShowContextMenu( K3PopupMenu * menu, const ExtDate &date);
+    void aboutToShowContextMenu( QMenu * menu, const ExtDate &date);
 
 protected:
   virtual void virtual_hook( int id, void* data );

diff --git a/extdate/extdatetimeedit.cpp b/extdate/extdatetimeedit.cpp
index 504634570e6e7c17fdf1783ec1f5e0d1aac3f812..5558977e0cc20a671e935bbeec96eced88cb0bdf 100644 (file)
--- a/extdate/extdatetimeedit.cpp
+++ b/extdate/extdatetimeedit.cpp
@@ -200,9 +200,8 @@ bool ExtDateEdit::focusNextPrevChild( bool next ) {
 }
 
 void ExtDateEdit::invokeKey( Qt::Key k ) {
-       QKeyEvent *e = new QKeyEvent( QEvent::KeyPress, k, 0, 0 );
-       keyPressEvent( e );
-       delete e;
+       QKeyEvent e( QEvent::KeyPress, k, Qt::NoModifier );
+       keyPressEvent( &e );
 }
 
 void ExtDateEdit::focusInEvent( QFocusEvent *e ) {