From: Pino Toscano <pino@kde.org>
Date: Sun, 16 Jul 2006 09:48:35 +0000 (+0000)
Subject: less qt3/kde3 support
X-Git-Tag: v3.80.2~63
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=fb1fe3a2421c0764557fb17383e17be627ca9977;p=libqmvoc.git

less qt3/kde3 support

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

diff --git a/extdate/extdatewidget.cpp b/extdate/extdatewidget.cpp
index e204d1f..da7fa9f 100644
--- 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 2770468..9b4ce02 100644
--- 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 cd9c5b6..79e6f54 100644
--- 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 fae1560..ede2e13 100644
--- 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 a0790dd..8d7d7b0 100644
--- 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 e54eafd..ff322f9 100644
--- 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 5711b7d..e07650f 100644
--- 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 33a712f..3a62d89 100644
--- 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;