Progress toward making the extdate library compile under kde-4. Not

finished yet, but many issues fixed so far.

CCMAIL: kstars-devel@kde.org

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

diff --git a/extdate/extdatepicker.cpp b/extdate/extdatepicker.cpp
index 334b5eee5b2a57678c55ee1b57af0f38990d8773..1cd8d2779cc19ba99e1ed4b68b9ea8b45847111c 100644 (file)
--- a/extdate/extdatepicker.cpp
+++ b/extdate/extdatepicker.cpp
@@ -20,10 +20,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <qlayout.h>
-#include <qstyle.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <QApplication>
+#include <QLayout>
+#include <QStyle>
+#include <QToolButton>
+#include <QToolTip>
 #include <q3popupmenu.h>
 //Added by qt3to4:
 #include <QKeyEvent>
@@ -361,10 +362,13 @@ ExtDatePicker::selectMonthClicked()
 
   Q3PopupMenu popup(selectMonth);
 
-  for (i = 1; i <= months; i++)
-    popup.insertItem(d->calendar->monthName(i, d->calendar->year(date)), i);
-
-  popup.setActiveItem(d->calendar->month(date) - 1);
+  for (i = 1; i <= months; i++) {
+    //    popup.insertItem(d->calendar->monthName(i, d->calendar->year(date)), i);
+    QAction *a = popup.addAction( d->calendar->monthName(i, d->calendar->year(date)) );
+    
+    if ( i == d->calendar->month(date) )
+      popup.setActiveAction( a );
+  }
 
   if ( (month = popup.exec(selectMonth->mapToGlobal(QPoint(0, 0)), d->calendar->month(date) - 1)) == -1 ) return;  // canceled
 
@@ -383,7 +387,7 @@ ExtDatePicker::selectYearClicked()
 {
 //  const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
 
-  if (selectYear->state() == QCheckBox::Off)
+  if (selectYear->isChecked())
   {
     return;
   }
@@ -496,8 +500,9 @@ ExtDatePicker::setFontSize(int s)
       maxMonthRect.setHeight(QMAX(r.height(),  maxMonthRect.height()));
     }
 
-  QSize metricBound = style().sizeFromContents(QStyle::CT_ToolButton,
-                                               selectMonth,
+  QStyleOptionToolButton qsotb;
+  QSize metricBound = style()->sizeFromContents(QStyle::CT_ToolButton,
+                                               &qsotb,
                                                maxMonthRect);
   selectMonth->setMinimumSize(metricBound);
 

diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp
index cea09fd3061ce9ceca7302d00b78ced2d6e41c82..2f95cd5e0537639720c2cd136352886a9def594b 100644 (file)
--- a/extdate/extdatetbl.cpp
+++ b/extdate/extdatetbl.cpp
@@ -47,14 +47,14 @@
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include "kpopupmenu.h"
-#include <qpainter.h>
-#include <q3dict.h>
+#include <QPainter>
+#include <Q3Dict>
 //Added by qt3to4:
 #include <QWheelEvent>
 #include <QFocusEvent>
 #include <QKeyEvent>
 #include <QEvent>
-#include <Q3Frame>
+#include <QFrame>
 #include <QResizeEvent>
 #include <QMouseEvent>
 #include <assert.h>
@@ -230,8 +230,9 @@ ExtDateTable::paintCell(QPainter *painter, int row, int col)
       painter->drawText(0, 0, w, h-1, Qt::AlignCenter,
                         d->calendar->weekDayName(daynum, true), -1, &rect);
       painter->setPen(colorGroup().text());
-      painter->moveTo(0, h-1);
-      painter->lineTo(w-1, h-1);
+      //      painter->moveTo(0, h-1);
+      //      painter->lineTo(w-1, h-1);
+      painter->drawLine( 0, h-1, w-1, h-1);
       // ----- draw the weekday:
     } else {
       bool paintRect=true;
@@ -316,45 +317,45 @@ ExtDateTable::keyPressEvent( QKeyEvent *e )
     ExtDate temp = date;
 
     switch( e->key() ) {
-    case Key_Prior:
+    case Qt::Key_Prior:
         temp = d->calendar->addMonths( date, -1 );
         setDate(temp);
         return;
-    case Key_Next:
+    case Qt::Key_Next:
         temp = d->calendar->addMonths( date, 1 );
         setDate(temp);
         return;
-    case Key_Up:
+    case Qt::Key_Up:
         if ( d->calendar->day(date) > 7 ) {
             setDate(date.addDays(-7));
             return;
         }
         break;
-    case Key_Down:
+    case Qt::Key_Down:
         if ( d->calendar->day(date) <= d->calendar->daysInMonth(date)-7 ) {
             setDate(date.addDays(7));
             return;
         }
         break;
-    case Key_Left:
+    case Qt::Key_Left:
         if ( d->calendar->day(date) > 1 ) {
             setDate(date.addDays(-1));
             return;
         }
         break;
-    case Key_Right:
+    case Qt::Key_Right:
         if ( d->calendar->day(date) < d->calendar->daysInMonth(date) ) {
             setDate(date.addDays(1));
             return;
         }
         break;
-    case Key_Minus:
+    case Qt::Key_Minus:
         setDate(date.addDays(-1));
         return;
-    case Key_Plus:
+    case Qt::Key_Plus:
         setDate(date.addDays(1));
         return;
-    case Key_N:
+    case Qt::Key_N:
         setDate(ExtDate::currentDate());
         return;
     case Qt::Key_Return:
@@ -549,7 +550,7 @@ bool ExtDateTable::popupMenuEnabled() const
    return d->popupMenuEnabled;
 }
 
-void ExtDateTable::setCustomDatePainting(const ExtDate &date, const QColor &fgColor, Qt::BackgroundMode bgMode, const QColor &bgColor)
+void ExtDateTable::setCustomDatePainting(const ExtDate &date, const QColor &fgColor, BackgroundMode bgMode, const QColor &bgColor)
 {
     if (!fgColor.isValid())
     {
@@ -582,7 +583,7 @@ ExtDateInternalWeekSelector::ExtDateInternalWeekSelector
   // -----
   font=KGlobalSettings::generalFont();
   setFont(font);
-  setFrameStyle(Q3Frame::NoFrame);
+  setFrame(false);
   setValidator(val);
   connect(this, SIGNAL(returnPressed()), SLOT(weekEnteredSlot()));
 }
@@ -662,7 +663,7 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker
   setFont(font);
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
-  setFrameStyle(Q3Frame::NoFrame);
+  setFrameShape(QFrame::NoFrame);
   setNumCols(3);
   d = new ExtDateInternalMonthPrivate(date.year(), date.month(), date.day());
   // For monthsInYear != 12
@@ -720,7 +721,7 @@ ExtDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
   text=d->calendar->monthName(index,
     d->calendar->year(ExtDate(d->year, d->month,
     d->day)), false);
-  painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
+  painter->drawText(0, 0, cellWidth(), cellHeight(), Qt::AlignCenter, text);
   if ( activeCol == col && activeRow == row )
       painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
@@ -728,7 +729,7 @@ ExtDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
 void
 ExtDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-  if(!isEnabled() || e->button() != LeftButton)
+  if(!isEnabled() || e->button() != Qt::LeftButton)
     {
       KNotifyClient::beep();
       return;
@@ -755,7 +756,7 @@ ExtDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 void
 ExtDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-  if (e->state() & LeftButton)
+  if (e->state() & Qt::LeftButton)
     {
       int row, col;
       QPoint mouseCoord;
@@ -829,7 +830,7 @@ ExtDateInternalYearSelector::ExtDateInternalYearSelector
   // -----
   font=KGlobalSettings::generalFont();
   setFont(font);
-  setFrameStyle(Q3Frame::NoFrame);
+  setFrame(false);
   // set year limits (perhaps we should get rid of limits altogether)
   //there si also a year limit in ExtCalendarSystemGregorian...
   val->setRange(-50000, 50000);
@@ -882,18 +883,18 @@ ExtDateInternalYearSelector::setYear(int year)
 }
 
 KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
-  : Q3Frame(parent, name, Qt::WType_Popup),
+  : QFrame(parent, name, Qt::WType_Popup),
     result(0), // rejected
     main(0)
 {
-  setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
+  setFrameShape(QFrame::NoFrame);
   setMidLineWidth(2);
 }
 
 void
 KPopupFrame::keyPressEvent(QKeyEvent* e)
 {
-  if(e->key()==Key_Escape)
+  if(e->key()==Qt::Key_Escape)
     {
       result=0; // rejected
       qApp->exit_loop();

diff --git a/extdate/extdatetbl.h b/extdate/extdatetbl.h
index ddb976613245d909cf2b2a4004674a22e807d691..9d719329341d09423541db4cb09355c259a69c2f 100644 (file)
--- a/extdate/extdatetbl.h
+++ b/extdate/extdatetbl.h
@@ -39,6 +39,7 @@
 #include "extcalendarsystemgregorian.h"
 
 class KPopupMenu;
+class QPainter;
 
 /** Week selection widget.
 * @internal
@@ -181,7 +182,7 @@ private:
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class KPopupFrame : public Q3Frame
+class KPopupFrame : public QFrame
 {
   Q_OBJECT
 protected:
@@ -236,7 +237,7 @@ public:
 
 private:
 
-  virtual bool close(bool alsoDelete) { return Q3Frame::close(alsoDelete); }
+  virtual bool close(bool alsoDelete) { return QFrame::close(alsoDelete); }
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
@@ -330,7 +331,7 @@ public:
      *
      * @since 3.2
      */
-    void setCustomDatePainting( const ExtDate &date, const QColor &fgColor, Qt::BackgroundMode bgMode=NoBgMode, const QColor &bgColor=QColor());
+    void setCustomDatePainting( const ExtDate &date, const QColor &fgColor, BackgroundMode bgMode=NoBgMode, const QColor &bgColor=QColor());
 
     /**
      * Unsets the custom painting of a date so that the date is painted as usual.

diff --git a/extdate/extdatetime.cpp b/extdate/extdatetime.cpp
index c07bb318ca40776e0af8004232b8cb6ad23abcfe..f5b2b177823078ebf225b418c8971568ab6b2964 100644 (file)
--- a/extdate/extdatetime.cpp
+++ b/extdate/extdatetime.cpp
@@ -19,6 +19,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
+#include <qstringlist.h>
 #include <assert.h>
 #include <time.h>
 

diff --git a/extdate/extdatetime.h b/extdate/extdatetime.h
index 8193f765df525bfaf9eabe19135313935910485f..ca49348a192c02704cdc180e68f2ed48be099f37 100644 (file)
--- a/extdate/extdatetime.h
+++ b/extdate/extdatetime.h
@@ -17,9 +17,9 @@
 #define EXTDATETIME_H
 
 #include <limits.h>
-#include "qstring.h"
-#include "qnamespace.h"
-#include "qdatetime.h"
+#include <qstring.h>
+#include <qnamespace.h>
+#include <qdatetime.h>
 #include <kdemacros.h>
 
 #define INVALID_DAY LONG_MIN
@@ -113,10 +113,10 @@ private:
        friend class ExtDateTime;
 
        #ifndef QT_NO_DATASTREAM
-       friend Q_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & );
-       friend Q_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & );
-       friend Q_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime & );
-       friend Q_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & );
+       friend KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & );
+       friend KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & );
+       friend KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime & );
+       friend KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & );
 #endif
 };
 
@@ -170,8 +170,8 @@ private:
     ExtDate  d;
     QTime  t;
 #ifndef QT_NO_DATASTREAM
-    friend Q_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime &);
-    friend Q_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & );
+    friend KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDateTime &);
+    friend KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDateTime & );
 #endif
 };
 
@@ -180,8 +180,8 @@ private:
  *****************************************************************************/
 
 #ifndef QT_NO_DATASTREAM
-Q_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & );
-Q_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & );
+KDE_EXPORT QDataStream &operator<<( QDataStream &, const ExtDate & );
+KDE_EXPORT QDataStream &operator>>( QDataStream &, ExtDate & );
 #endif // QT_NO_DATASTREAM
 
 #endif // EXTDATE_H

diff --git a/extdate/extdatetimeedit.cpp b/extdate/extdatetimeedit.cpp
index 5fa4c3abcdb248075edfee152d34d42ac1d294c0..7c5a67c266c5e853cf15a089bdcfae7308b500af 100644 (file)
--- a/extdate/extdatetimeedit.cpp
+++ b/extdate/extdatetimeedit.cpp
@@ -29,8 +29,6 @@
 
 //#include "../kernel/qinternal_p.h"
 //#include "../kernel/qrichtext_p.h"
-#include <private/qinternal_p.h>
-#include <private/qrichtext_p.h>
 #include <q3rangecontrol.h>
 #include <qapplication.h>
 #include <qpixmap.h>