less qt3/kde3 support

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

diff --git a/extdate/extdatewidget.cpp b/extdate/extdatewidget.cpp
index e204d1fac616f884246740a42d77e43d77ee86c8..da7fa9fcb4d98ad13c64a9db79d9ca0fd337c7a1 100644 (file)
--- a/extdate/extdatewidget.cpp
+++ b/extdate/extdatewidget.cpp
@@ -105,9 +105,10 @@ void ExtDateWidget::init(const ExtDate& date)
   QHBoxLayout *layout = new QHBoxLayout(this);
   layout->setMargin(0);
   layout->setSpacing(KDialog::spacingHint());
-  layout->setAutoAdd(true);
   d->m_day = new ExtDateWidgetSpinBox(1, 1, this);
+  layout->addWidget(d->m_day);
   d->m_month = new QComboBox(this);
+  layout->addWidget(d->m_month);
   d->m_month->setEditable(false);
   for (int i = 1; ; ++i)
   {
@@ -119,6 +120,7 @@ void ExtDateWidget::init(const ExtDate& date)
 
   d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(),
                                     d->calendar->maxValidYear(), this);
+  layout->addWidget(d->m_year);
 
   connect(d->m_day, SIGNAL(valueChanged(int)), this, SLOT(slotDateChanged()));
   connect(d->m_month, SIGNAL(activated(int)), this, SLOT(slotDateChanged()));

diff --git a/extdate/tests/edpicker_main.cpp b/extdate/tests/edpicker_main.cpp
index 27704688e47599bacad1e7eec86c69b8996b3574..9b4ce026fc038cd10ff44497c5133238dc5e21d9 100644 (file)
--- a/extdate/tests/edpicker_main.cpp
+++ b/extdate/tests/edpicker_main.cpp
@@ -24,7 +24,7 @@ int main( int argc, char *argv[] )
        KCmdLineArgs::init( argc, argv, &aboutData );
 
        KApplication a;
-       EDPicker *edp = new EDPicker(0,0);
+       EDPicker *edp = new EDPicker(0);
        edp->show();
        QObject::connect(kapp, SIGNAL(lastWindowClosed()), kapp, SLOT(quit()));
        return a.exec();

diff --git a/extdate/tests/edpicker_widget.cpp b/extdate/tests/edpicker_widget.cpp
index cd9c5b6d09a3df10a4d22e1ffaea5b48aad77995..79e6f54929f60d4c4461d834d9f5f64d8a51320a 100644 (file)
--- a/extdate/tests/edpicker_widget.cpp
+++ b/extdate/tests/edpicker_widget.cpp
@@ -26,7 +26,7 @@
 #include "../extdatewidget.h"
 #include "edpicker_widget.h"
 
-EDPicker::EDPicker( QWidget *p=0, const char *name=0 ) : KMainWindow( p, name ) {
+EDPicker::EDPicker( QWidget *p=0 ) : KMainWindow( p ) {
        QWidget *w = new QWidget(this);
 
        glay = new QGridLayout(w);

diff --git a/extdate/tests/edpicker_widget.h b/extdate/tests/edpicker_widget.h
index fae156008f7f0ca917a32c6b630891ad96d6b945..ede2e1301bff1299c7dda7e9864d3faaf84833be 100644 (file)
--- a/extdate/tests/edpicker_widget.h
+++ b/extdate/tests/edpicker_widget.h
@@ -32,7 +32,7 @@ class ExtDateWidget;
 class EDPicker : public KMainWindow {
        Q_OBJECT
        public:
-               EDPicker( QWidget *parent, const char *name );
+               EDPicker( QWidget *parent );
                ~EDPicker() {}
 
        public slots:

diff --git a/extdate/tests/edtedit_main.cpp b/extdate/tests/edtedit_main.cpp
index a0790dd60d92c3a3f99faf7920510ef3e7a458b0..8d7d7b04e9ffb8a52c65250b8c959f52a0c6de02 100644 (file)
--- a/extdate/tests/edtedit_main.cpp
+++ b/extdate/tests/edtedit_main.cpp
@@ -24,7 +24,7 @@ int main( int argc, char *argv[] )
        KCmdLineArgs::init( argc, argv, &aboutData );
 
        KApplication a;
-       EDTEdit *edte = new EDTEdit(0,0);
+       EDTEdit *edte = new EDTEdit(0);
        edte->show();
        QObject::connect(kapp, SIGNAL(lastWindowClosed()), kapp, SLOT(quit()));
        return a.exec();

diff --git a/extdate/tests/edtedit_widget.cpp b/extdate/tests/edtedit_widget.cpp
index e54eafde378b612ce0e7448af316830333174511..ff322f9af197b223794e2c891a97df05456d9594 100644 (file)
--- a/extdate/tests/edtedit_widget.cpp
+++ b/extdate/tests/edtedit_widget.cpp
@@ -24,7 +24,7 @@
 #include "../extdatetimeedit.h"
 #include "edtedit_widget.h"
 
-EDTEdit::EDTEdit( QWidget *p=0, const char *name=0 ) : KMainWindow( p, name ) {
+EDTEdit::EDTEdit( QWidget *p=0 ) : KMainWindow( p ) {
        QWidget *w = new QWidget(this);
 
        vlay = new QVBoxLayout( w );

diff --git a/extdate/tests/edtedit_widget.h b/extdate/tests/edtedit_widget.h
index 5711b7d839c54b4d8128a9001077d945c1b9410a..e07650f0c364b0bcbe20b2fd8a6cda6fc3ddfdb5 100644 (file)
--- a/extdate/tests/edtedit_widget.h
+++ b/extdate/tests/edtedit_widget.h
@@ -28,7 +28,7 @@ class ExtDateTimeEdit;
 class EDTEdit : public KMainWindow {
        Q_OBJECT
        public:
-               EDTEdit( QWidget *parent, const char *name );
+               EDTEdit( QWidget *parent );
                ~EDTEdit();
 
 //     public slots:

diff --git a/extdate/tests/test_extdate.cc b/extdate/tests/test_extdate.cc
index 33a712f02319cbe41ff2656548d37671f243e9c2..3a62d898020e366eafacb5a050c945c5aee2aae7 100644 (file)
--- a/extdate/tests/test_extdate.cc
+++ b/extdate/tests/test_extdate.cc
@@ -6,7 +6,7 @@
 
 void test1_unit(int a_year)
 {
-       std::cout << a_year << "  (QDate|ExtDate): " << ((QDate::leapYear(a_year)) ? "yes" : "no")
+       std::cout << a_year << "  (QDate|ExtDate): " << ((QDate::isLeapYear(a_year)) ? "yes" : "no")
                        <<"|"<< ((ExtDate::leapYear(a_year)) ? "yes" : "no") << std::endl;
 }
 
@@ -278,11 +278,11 @@ void test6()
 void test7()
 {
        std::cout << "Express the current date:\n" << std::endl;
-       QDate q = QDate::currentDate(Qt::LocalTime);
+       QDate q = QDate::currentDate();
        ExtDate e = ExtDate::currentDate(Qt::TimeSpec(Qt::LocalTime));
        std::cout << "Qt::LocalTime :: ExtDate : " << e.toString().toLocal8Bit().data() << "   QDate : "
                << q.toString().toLocal8Bit().data() << std::endl;
-       q = QDate::currentDate(Qt::UTC);
+       q = QDateTime::currentDateTime().toUTC().date();
        e = ExtDate::currentDate(Qt::UTC);
        std::cout << "Qt::UTC       :: ExtDate : " << e.toString().toLocal8Bit().data() << "   QDate : "
                << q.toString().toLocal8Bit().data() << std::endl;