From c15eeae55ad5d9f91f049349697db46e8bde6163 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 18 Feb 2007 00:25:33 +0000 Subject: [PATCH] do some TODOs, like removing deprecated stuff and improve a constructor svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=634701 --- extdate/extdatepicker.cpp | 14 ++++---------- extdate/extdatepicker.h | 13 ++----------- extdate/extdatetbl.cpp | 2 +- extdate/extdatetbl.h | 8 +------- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/extdate/extdatepicker.cpp b/extdate/extdatepicker.cpp index 8987233..39ee817 100644 --- a/extdate/extdatepicker.cpp +++ b/extdate/extdatepicker.cpp @@ -85,16 +85,16 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date) } } -ExtDatePicker::ExtDatePicker(QWidget *parent, ExtDate dt) - : QFrame(parent) +ExtDatePicker::ExtDatePicker(ExtDate dt, QWidget *parent, Qt::WindowFlags f) + : QFrame(parent, f) { init( dt ); } -ExtDatePicker::ExtDatePicker(QWidget *parent, ExtDate dt, Qt::WFlags f) +ExtDatePicker::ExtDatePicker(QWidget *parent, Qt::WindowFlags f) : QFrame(parent, f) { - init( dt ); + init( ExtDate::currentDate() ); } void ExtDatePicker::init( const ExtDate &dt ) @@ -261,12 +261,6 @@ ExtDatePicker::tableClickedSlot() emit(tableClicked()); } -const ExtDate& -ExtDatePicker::getDate() const -{ - return table->getDate(); -} - const ExtDate & ExtDatePicker::date() const { diff --git a/extdate/extdatepicker.h b/extdate/extdatepicker.h index 868a0c7..5e8ad8f 100644 --- a/extdate/extdatepicker.h +++ b/extdate/extdatepicker.h @@ -64,15 +64,12 @@ public: /** The usual constructor. The given date will be displayed * initially. **/ - ExtDatePicker(QWidget *parent=0, - ExtDate=ExtDate::currentDate()); + explicit ExtDatePicker(ExtDate, QWidget *parent=0, Qt::WindowFlags f=0); /** The usual constructor. The given date will be displayed * initially. **/ - ExtDatePicker(QWidget *parent, - ExtDate, - Qt::WFlags f); // ### KDE 4.0: Merge + explicit ExtDatePicker(QWidget *parent=0, Qt::WindowFlags f=0); /** * The destructor. @@ -95,12 +92,6 @@ public: **/ bool setDate(const ExtDate&); - /** - * Returns the selected date. - * @deprecated - **/ - const ExtDate& getDate() const KDE_DEPRECATED; - /** * @returns the selected date. */ diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp index 7bb1d4a..01cdc7c 100644 --- a/extdate/extdatetbl.cpp +++ b/extdate/extdatetbl.cpp @@ -957,7 +957,7 @@ KPopupFrame::popup(const QPoint &pos) } int -KPopupFrame::exec(QPoint pos) +KPopupFrame::exec(const QPoint& pos) { popup(pos); repaint(); diff --git a/extdate/extdatetbl.h b/extdate/extdatetbl.h index 4fa110f..9fab61a 100644 --- a/extdate/extdatetbl.h +++ b/extdate/extdatetbl.h @@ -234,9 +234,8 @@ public: * @param p The position where the window should be shown. * @return Result code of the popup. * @see popup() - * @todo Why isn't @p p a reference? */ - int exec(QPoint p); + int exec(const QPoint& p); /** * Execute the popup window. * Equivalent to exec(const QPoint &) for the given @p x and @p y. @@ -389,11 +388,6 @@ protected: * The number of days in the previous month. */ int numDaysPrevMonth; - /** - * unused - * ### remove in KDE 4.0 - */ - bool unused_hasSelection; /** * Save the size of the largest used cell content. */ -- 2.47.3