[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Knipptasch] 38e6e07: DatePickerPopup: Fix signal/slot connection
From:       Stefan "Böhmann" <kde () hilefoks ! org>
Date:       2010-12-01 4:03:02
Message-ID: 20101201040302.61C2EA60A6 () git ! kde ! org
[Download RAW message or body]

commit 38e6e07e4dc8e7714ab0cf00b41f6083813cba5e
branch master
Author: Stefan Böhmann <kde@hilefoks.org>
Date:   Wed Dec 1 04:42:22 2010 +0100

    DatePickerPopup: Fix signal/slot connection

diff --git a/src/compat/dateedit.cpp b/src/compat/dateedit.cpp
index c453fa0..b323acc 100644
--- a/src/compat/dateedit.cpp
+++ b/src/compat/dateedit.cpp
@@ -88,7 +88,6 @@ class DateEdit::Private
     public:
         Private(DateEdit *qq)
           : q( qq ),
-            mDate( QDate::currentDate() ),
             mReadOnly( false ),
             mDiscardNextMousePress( false )
         {
@@ -312,14 +311,15 @@ DateEdit::DateEdit(QWidget *parent)
              this, SLOT( slotTextChanged( const QString& ) ) );
 
     d->mPopup = new DatePickerPopup(
-                        DatePickerPopup::DatePicker | DatePickerPopup::Words,
+                            DatePickerPopup::NoDate
+                          | DatePickerPopup::DatePicker
+                          | DatePickerPopup::Words,
                         QDate::currentDate(), this );
 
     d->mPopup->hide();
     d->mPopup->installEventFilter( this );
 
-    connect( d->mPopup, SIGNAL( dateChanged( const QDate& ) ),
-             this, SLOT( dateSelected( const QDate& ) ) );
+    connect( d->mPopup, SIGNAL( dateChanged(const QDate&) ), this, SLOT( dateSelected(const QDate&) ) );
 
     // handle keyword entry
     d->setupKeywords();
diff --git a/src/compat/datepickerpopup.cpp b/src/compat/datepickerpopup.cpp
index f3cef4a..fbec80c 100644
--- a/src/compat/datepickerpopup.cpp
+++ b/src/compat/datepickerpopup.cpp
@@ -181,14 +181,19 @@ DatePickerPopup::DatePickerPopup(Modes modes, const QDate &date, QWidget *parent
 #if defined(HAVE_KDE)
     d->mDatePicker = new KDatePicker( this );
     d->mDatePicker->setCloseButton( false );
-#else
-    d->mDatePicker = new QCalendarWidget( this );
-#endif
 
     connect( d->mDatePicker, SIGNAL( dateEntered( const QDate& ) ),
             this, SLOT( slotDateChanged( const QDate& ) ) );
     connect( d->mDatePicker, SIGNAL( dateSelected( const QDate& ) ),
             this, SLOT( slotDateChanged( const QDate& ) ) );
+#else
+    d->mDatePicker = new QCalendarWidget( this );
+
+    connect( d->mDatePicker, SIGNAL( activated( const QDate& ) ),
+            this, SLOT( slotDateChanged( const QDate& ) ) );
+    connect( d->mDatePicker, SIGNAL( clicked( const QDate& ) ),
+            this, SLOT( slotDateChanged( const QDate& ) ) );
+#endif
 
     setDate( date );
     d->buildMenu();
[prev in list] [next in list] [prev in thread] [next in thread]