less qt3_support

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

diff --git a/extdate/extdatepicker.cpp b/extdate/extdatepicker.cpp
index bd42049ced67c128236f2a86fd0deb74a4f20883..0894807ae503cca9eef81f4eea68c17aef1bd91a 100644 (file)
--- a/extdate/extdatepicker.cpp
+++ b/extdate/extdatepicker.cpp
@@ -125,7 +125,7 @@ void ExtDatePicker::init( const ExtDate &dt )
   selectMonth ->setAutoRaise(true);
   d->navigationLayout->addWidget(selectMonth);
   selectYear = new QToolButton(this);
-  selectYear->setToggleButton(true);
+  selectYear->setCheckable(true);
   selectYear->setAutoRaise(true);
   d->navigationLayout->addWidget(selectYear);
   d->navigationLayout->addSpacing(KDialog::spacingHint());
@@ -147,9 +147,10 @@ void ExtDatePicker::init( const ExtDate &dt )
 
   fontsize++; // Make a little bigger
 
-  d->selectWeek = new QComboBox(false, this);  // read only week selection
+  d->selectWeek = new QComboBox(this);
+  d->selectWeek->setEditable(false);  // read only week selection
   d->todayButton = new QToolButton(this);
-  d->todayButton->setIconSet(SmallIconSet("today"));
+  d->todayButton->setIcon(SmallIconSet("today"));
 
   yearForward->setToolTip(i18n("Next year"));
   yearBackward->setToolTip(i18n("Previous year"));
@@ -166,17 +167,17 @@ void ExtDatePicker::init( const ExtDate &dt )
   line->installEventFilter( this );
   if (  QApplication::isRightToLeft() )
   {
-      yearForward->setIconSet(BarIconSet(QLatin1String("2leftarrow")));
-      yearBackward->setIconSet(BarIconSet(QLatin1String("2rightarrow")));
-      monthForward->setIconSet(BarIconSet(QLatin1String("1leftarrow")));
-      monthBackward->setIconSet(BarIconSet(QLatin1String("1rightarrow")));
+      yearForward->setIcon(BarIconSet(QLatin1String("2leftarrow")));
+      yearBackward->setIcon(BarIconSet(QLatin1String("2rightarrow")));
+      monthForward->setIcon(BarIconSet(QLatin1String("1leftarrow")));
+      monthBackward->setIcon(BarIconSet(QLatin1String("1rightarrow")));
   }
   else
   {
-      yearForward->setIconSet(BarIconSet(QLatin1String("2rightarrow")));
-      yearBackward->setIconSet(BarIconSet(QLatin1String("2leftarrow")));
-      monthForward->setIconSet(BarIconSet(QLatin1String("1rightarrow")));
-      monthBackward->setIconSet(BarIconSet(QLatin1String("1leftarrow")));
+      yearForward->setIcon(BarIconSet(QLatin1String("2rightarrow")));
+      yearBackward->setIcon(BarIconSet(QLatin1String("2leftarrow")));
+      monthForward->setIcon(BarIconSet(QLatin1String("1rightarrow")));
+      monthBackward->setIcon(BarIconSet(QLatin1String("1leftarrow")));
   }
   connect(table, SIGNAL(dateChanged(const ExtDate&)), SLOT(dateChangedSlot(const ExtDate&)));
   connect(table, SIGNAL(tableClicked()), SLOT(tableClickedSlot()));
@@ -249,7 +250,7 @@ ExtDatePicker::dateChangedSlot(const ExtDate &date)
 
     // calculate the item num in the week combo box; normalize selected day so as if 1.1. is the first day of the week
     ExtDate firstDay(date.year(), 1, 1);
-    d->selectWeek->setCurrentItem((d->calendar->dayOfYear(date) + d->calendar->dayOfWeek(firstDay) - 2) / 7/*calendar->daysInWeek()*/);
+    d->selectWeek->setCurrentIndex((d->calendar->dayOfYear(date) + d->calendar->dayOfWeek(firstDay) - 2) / 7/*calendar->daysInWeek()*/);
 
     selectYear->setText(d->calendar->yearString(date, false));
 

diff --git a/extdate/extdatewidget.cpp b/extdate/extdatewidget.cpp
index 282563e1247dca0c292837dcdd9acdca85aade4a..e204d1fac616f884246740a42d77e43d77ee86c8 100644 (file)
--- a/extdate/extdatewidget.cpp
+++ b/extdate/extdatewidget.cpp
@@ -36,8 +36,11 @@ class ExtDateWidgetSpinBox : public QSpinBox
 {
 public:
   ExtDateWidgetSpinBox(int min, int max, QWidget *parent)
-    : QSpinBox(min, max, 1, parent)
+    : QSpinBox(parent)
   {
+     setMinimum(min);
+     setMaximum(max);
+     setSingleStep(1);
      setAlignment(Qt::AlignRight);
   }
 };
@@ -99,10 +102,13 @@ void ExtDateWidget::init(const ExtDate& date)
 {
   d = new ExtDateWidgetPrivate;
   //KLocale *locale = KGlobal::locale();
-  QHBoxLayout *layout = new QHBoxLayout(this, 0, KDialog::spacingHint());
+  QHBoxLayout *layout = new QHBoxLayout(this);
+  layout->setMargin(0);
+  layout->setSpacing(KDialog::spacingHint());
   layout->setAutoAdd(true);
   d->m_day = new ExtDateWidgetSpinBox(1, 1, this);
-  d->m_month = new QComboBox(false, this);
+  d->m_month = new QComboBox(this);
+  d->m_month->setEditable(false);
   for (int i = 1; ; ++i)
   {
     QString str = d->calendar->monthName(i,
@@ -134,7 +140,7 @@ void ExtDateWidget::setDate( const ExtDate &date )
 
   d->m_day->setMaximum(d->calendar->daysInMonth(date));
   d->m_day->setValue(d->calendar->day(date));
-  d->m_month->setCurrentItem(d->calendar->month(date)-1);
+  d->m_month->setCurrentIndex(d->calendar->month(date)-1);
   d->m_year->setValue(d->calendar->year(date));
 
   d->m_day->blockSignals(false);