From 3167de0d74f1b28dda1946e6fde4eeab4fe6926a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 1 Oct 2005 21:51:00 +0000 Subject: [PATCH] Some Qt3 compatibility less: * Q3Frame => QFrame (in ExtDatePicker) * removed almost all the const char* name parameters as they are obsolete with Qt4. setObjectName() does the job. CCMAIL: kstars@30doradus.org svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=466198 --- extdate/extdatepicker.cpp | 18 ++++++------------ extdate/extdatepicker.h | 18 ++++-------------- extdate/extdatetbl.cpp | 20 ++++++++++---------- extdate/extdatetbl.h | 12 ++++++------ extdate/extdatewidget.cpp | 9 ++++----- extdate/extdatewidget.h | 4 ++-- 6 files changed, 32 insertions(+), 49 deletions(-) diff --git a/extdate/extdatepicker.cpp b/extdate/extdatepicker.cpp index c6d303b..2f83377 100644 --- a/extdate/extdatepicker.cpp +++ b/extdate/extdatepicker.cpp @@ -28,7 +28,7 @@ //Added by qt3to4: #include #include -#include +#include #include #include #include @@ -91,24 +91,18 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date) } } -ExtDatePicker::ExtDatePicker(QWidget *parent, ExtDate dt, const char *name) - : Q3Frame(parent,name) +ExtDatePicker::ExtDatePicker(QWidget *parent, ExtDate dt) + : QFrame(parent) { init( dt ); } -ExtDatePicker::ExtDatePicker(QWidget *parent, ExtDate dt, const char *name, Qt::WFlags f) - : Q3Frame(parent,name, f) +ExtDatePicker::ExtDatePicker(QWidget *parent, ExtDate dt, Qt::WFlags f) + : QFrame(parent, f) { init( dt ); } -ExtDatePicker::ExtDatePicker( QWidget *parent, const char *name ) - : Q3Frame(parent,name) -{ - init( ExtDate::currentDate() ); -} - void ExtDatePicker::init( const ExtDate &dt ) { d = new ExtDatePickerPrivate(); @@ -230,7 +224,7 @@ ExtDatePicker::eventFilter(QObject *o, QEvent *e ) return true; // eat event } } - return Q3Frame::eventFilter( o, e ); + return QFrame::eventFilter( o, e ); } void diff --git a/extdate/extdatepicker.h b/extdate/extdatepicker.h index a1a176a..7e0c3fa 100644 --- a/extdate/extdatepicker.h +++ b/extdate/extdatepicker.h @@ -24,8 +24,7 @@ #include "extdatetime.h" -//Added by qt3to4: -#include +#include #include #include @@ -53,7 +52,7 @@ class ExtDateTable; * * @short A date selection widget. **/ -class KDE_EXPORT ExtDatePicker: public Q3Frame +class KDE_EXPORT ExtDatePicker: public QFrame { Q_OBJECT // Q_PROPERTY( ExtDate date READ date WRITE setDate) @@ -65,8 +64,7 @@ public: * initially. **/ ExtDatePicker(QWidget *parent=0, - ExtDate=ExtDate::currentDate(), - const char *name=0); + ExtDate=ExtDate::currentDate()); /** The usual constructor. The given date will be displayed * initially. @@ -74,16 +72,8 @@ public: **/ ExtDatePicker(QWidget *parent, ExtDate, - const char *name, Qt::WFlags f); // ### KDE 4.0: Merge - /** - * Standard qt widget constructor. The initial date will be the - * current date. - * @since 3.1 - */ - ExtDatePicker( QWidget *parent, const char *name ); - /** * The destructor. **/ @@ -95,7 +85,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - QSize sizeHint() const; + virtual QSize sizeHint() const; /** * Sets the date. diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp index 2f95cd5..23f880d 100644 --- a/extdate/extdatetbl.cpp +++ b/extdate/extdatetbl.cpp @@ -90,8 +90,8 @@ public: }; -ExtDateValidator::ExtDateValidator(QWidget* parent, const char* name) - : QValidator(parent, name) +ExtDateValidator::ExtDateValidator(QWidget* parent) + : QValidator(parent) { } @@ -574,8 +574,8 @@ void ExtDateTable::unsetCustomDatePainting( const ExtDate &date ) } ExtDateInternalWeekSelector::ExtDateInternalWeekSelector -(QWidget* parent, const char* name) - : KLineEdit(parent, name), +(QWidget* parent) + : KLineEdit(parent), val(new QIntValidator(this)), result(0) { @@ -647,8 +647,8 @@ ExtDateInternalMonthPicker::~ExtDateInternalMonthPicker() { } ExtDateInternalMonthPicker::ExtDateInternalMonthPicker -(const ExtDate & date, QWidget* parent, const char* name) - : Q3GridView(parent, name), +(const ExtDate & date, QWidget* parent) + : Q3GridView(parent), result(0) // invalid { //FIXME: Can't uncomment the following unless ExtDate is moved to kdelibs @@ -820,8 +820,8 @@ ExtDateInternalMonthPicker::contentsMouseReleaseEvent(QMouseEvent *e) ExtDateInternalYearSelector::ExtDateInternalYearSelector -(QWidget* parent, const char* name) - : QLineEdit(parent, name), +(QWidget* parent) + : QLineEdit(parent), val(new QIntValidator(this)), result(0), d(new ExtDateInternalYearPrivate()) @@ -882,8 +882,8 @@ ExtDateInternalYearSelector::setYear(int year) setText(temp); } -KPopupFrame::KPopupFrame(QWidget* parent, const char* name) - : QFrame(parent, name, Qt::WType_Popup), +KPopupFrame::KPopupFrame(QWidget* parent) + : QFrame(parent, Qt::WType_Popup), result(0), // rejected main(0) { diff --git a/extdate/extdatetbl.h b/extdate/extdatetbl.h index 9d71932..2ddd0c0 100644 --- a/extdate/extdatetbl.h +++ b/extdate/extdatetbl.h @@ -58,7 +58,7 @@ public slots: signals: void closeMe(int); public: - ExtDateInternalWeekSelector( QWidget* parent=0, const char* name=0); + ExtDateInternalWeekSelector( QWidget* parent=0); int getWeek(); void setWeek(int week); @@ -99,7 +99,7 @@ public: /** * The constructor. */ - ExtDateInternalMonthPicker(const ExtDate& date, QWidget* parent, const char* name=0); + ExtDateInternalMonthPicker(const ExtDate& date, QWidget* parent); /** * The destructor. */ @@ -107,7 +107,7 @@ public: /** * The size hint. */ - QSize sizeHint() const; + virtual QSize sizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -157,7 +157,7 @@ public slots: signals: void closeMe(int); public: - ExtDateInternalYearSelector( QWidget* parent=0, const char* name=0); + ExtDateInternalYearSelector( QWidget* parent=0 ); ~ExtDateInternalYearSelector(); int getYear(); void setYear(int year); @@ -208,7 +208,7 @@ public: /** * The contructor. Creates a dialog without buttons. */ - KPopupFrame(QWidget* parent=0, const char* name=0); + KPopupFrame(QWidget* parent=0); /** * Set the main widget. You cannot set the main widget from the constructor, * since it must be a child of the frame itselfes. @@ -251,7 +251,7 @@ private: class ExtDateValidator : public QValidator { public: - ExtDateValidator(QWidget* parent=0, const char* name=0); + ExtDateValidator(QWidget* parent=0); virtual State validate(QString&, int&) const; virtual void fixup ( QString & input ) const; State date(const QString&, ExtDate&) const; diff --git a/extdate/extdatewidget.cpp b/extdate/extdatewidget.cpp index 238760a..aa9de54 100644 --- a/extdate/extdatewidget.cpp +++ b/extdate/extdatewidget.cpp @@ -55,16 +55,15 @@ public: }; -ExtDateWidget::ExtDateWidget( QWidget *parent, const char *name ) - : QWidget( parent, name ) +ExtDateWidget::ExtDateWidget( QWidget *parent ) + : QWidget( parent ) { init(ExtDate::currentDate()); setDate(ExtDate()); } -ExtDateWidget::ExtDateWidget( const ExtDate &date, QWidget *parent, - const char *name ) - : QWidget( parent, name ) +ExtDateWidget::ExtDateWidget( const ExtDate &date, QWidget *parent ) + : QWidget( parent ) { init(date); setDate(date); diff --git a/extdate/extdatewidget.h b/extdate/extdatewidget.h index 4e785ac..ccd0d6e 100644 --- a/extdate/extdatewidget.h +++ b/extdate/extdatewidget.h @@ -41,12 +41,12 @@ public: /** * Constructs a date selection widget, initialized to the current CPU date. */ - ExtDateWidget( QWidget *parent=0, const char *name=0 ); + ExtDateWidget( QWidget *parent=0 ); /** * Constructs a date selection widget with the initial date set to @p date. */ - ExtDateWidget( const ExtDate &date, QWidget *parent=0, const char *name=0 ); + ExtDateWidget( const ExtDate &date, QWidget *parent=0 ); /** * Destructs the date selection widget. -- 2.47.3