Qt3support--

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

diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp
index 021e9d7578d9b2eb57111b8d97ba9928ebda6dd2..2735553a49531c07f6f49d6b87cf15df415c7318 100644 (file)
--- a/extdate/extdatetbl.cpp
+++ b/extdate/extdatetbl.cpp
@@ -887,7 +887,7 @@ ExtDateInternalYearSelector::setYear(int year)
 }
 
 KPopupFrame::KPopupFrame(QWidget* parent)
-  : QFrame(parent, Qt::WType_Popup),
+  : QFrame(parent, Qt::Popup),
     result(0), // rejected
     main(0)
 {

diff --git a/extdate/extdatetime.cpp b/extdate/extdatetime.cpp
index cb5d6598c7967a3422b10349b69ba52ab38ac600..9bd194dd94669d396680b9075c04c01a1721d47a 100644 (file)
--- a/extdate/extdatetime.cpp
+++ b/extdate/extdatetime.cpp
@@ -1128,12 +1128,12 @@ ExtDateTime ExtDateTime::fromString( const QString& s, Qt::DateFormat f )
 #ifndef QT_NO_DATASTREAM
 KDE_EXPORT QDataStream &operator<<( QDataStream & ostream, const ExtDate & date)
 {
-       return ostream << (Q_UINT32)(date.jd());
+       return ostream << (quint32)(date.jd());
 }
 
 KDE_EXPORT QDataStream &operator>>( QDataStream & ostream, ExtDate & date)
 {
-       Q_UINT32 julday;
+       quint32 julday;
        ostream >> julday;
        date.setJD( julday );
        return ostream;