From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kfind/kdatecombo.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kfind/kdatecombo.cpp') diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index 9f62b0eb5..95e4045ac 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -18,7 +18,7 @@ KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(FALSE, parent,name) { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); initObject(date, parent, name); } @@ -33,7 +33,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) popupFrame = new KPopupFrame(this, "popupFrame"); popupFrame->installEventFilter(this); datePicker = new KDatePicker(popupFrame, date, "datePicker"); - datePicker->setMinimumSize(datePicker->tqsizeHint()); + datePicker->setMinimumSize(datePicker->sizeHint()); datePicker->installEventFilter(this); popupFrame->setMainWidget(datePicker); setDate(date); @@ -57,9 +57,9 @@ TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd) return *qd = KGlobal::locale()->readDate(str); } -TQDate & KDateCombo::getDate(TQDate *tqcurrentDate) +TQDate & KDateCombo::getDate(TQDate *currentDate) { - return string2Date(currentText(), tqcurrentDate); + return string2Date(currentText(), currentDate); } bool KDateCombo::setDate(const TQDate & newDate) @@ -86,7 +86,7 @@ void KDateCombo::mousePressEvent (TQMouseEvent * e) { if (e->button() & TQMouseEvent::LeftButton) { - if (rect().tqcontains( e->pos())) + if (rect().contains( e->pos())) { TQDate tempDate; getDate(& tempDate); @@ -103,7 +103,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e) { TQMouseEvent *me = (TQMouseEvent *)e; TQPoint p = mapFromGlobal( me->globalPos() ); - if (rect().tqcontains( p ) ) + if (rect().contains( p ) ) { TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent())); return true; -- cgit v1.2.1