author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /libkdepim/kdateedit.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | libkdepim/kdateedit.cpp | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index bf38479..28c88d4 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp | |||
@@ -29,2 +29,5 @@ | |||
29 | #include <qpushbutton.h> | 29 | #include <qpushbutton.h> |
30 | //Added by qt3to4: | ||
31 | #include <Q3Frame> | ||
32 | #include <QKeyEvent> | ||
30 | 33 | ||
@@ -38,2 +41,3 @@ | |||
38 | #include <qpalette.h> | 41 | #include <qpalette.h> |
42 | #include <QDesktopWidget> | ||
39 | 43 | ||
@@ -43,3 +47,3 @@ | |||
43 | KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) | 47 | KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) |
44 | : QHBox(parent, name) | 48 | : Q3HBox(parent, name) |
45 | { | 49 | { |
@@ -74,5 +78,5 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) | |||
74 | 78 | ||
75 | mDateFrame = new QVBox(0,0,WType_Popup); | 79 | mDateFrame = new Q3VBox(0,0,Qt::WType_Popup); |
76 | // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); | 80 | // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); |
77 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); | 81 | mDateFrame->setFrameStyle( Q3Frame::WinPanel |Q3Frame::Raised ); |
78 | mDateFrame->setLineWidth(3); | 82 | mDateFrame->setLineWidth(3); |
@@ -88,3 +92,3 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) | |||
88 | connect(nowButton,SIGNAL(clicked()),SLOT(goToNow())); | 92 | connect(nowButton,SIGNAL(clicked()),SLOT(goToNow())); |
89 | mDateButton->setFocusPolicy( QWidget::NoFocus ); | 93 | mDateButton->setFocusPolicy( Qt::NoFocus ); |
90 | mDateButton->setAutoDefault( false ); | 94 | mDateButton->setAutoDefault( false ); |
@@ -227,6 +231,6 @@ void KDateEdit::setDate( QDate date,int *cpos,const int key ,const bool dateForm | |||
227 | case 'A': | 231 | case 'A': |
228 | if(key == Key_Up) { | 232 | if(key == Qt::Key_Up) { |
229 | setDate( date.addDays( 1 ) ); | 233 | setDate( date.addDays( 1 ) ); |
230 | } | 234 | } |
231 | else if(key == Key_Down) { | 235 | else if(key == Qt::Key_Down) { |
232 | setDate( date.addDays( -1 ) ); | 236 | setDate( date.addDays( -1 ) ); |
@@ -238,3 +242,3 @@ void KDateEdit::setDate( QDate date,int *cpos,const int key ,const bool dateForm | |||
238 | case 'B': | 242 | case 'B': |
239 | if(key == Key_Up) { | 243 | if(key == Qt::Key_Up) { |
240 | int year = ((date.month()+1)>12)?date.year()+1:date.year(); | 244 | int year = ((date.month()+1)>12)?date.year()+1:date.year(); |
@@ -243,3 +247,3 @@ void KDateEdit::setDate( QDate date,int *cpos,const int key ,const bool dateForm | |||
243 | setDate( QDate( year, month, day ) ); | 247 | setDate( QDate( year, month, day ) ); |
244 | } else if(key == Key_Down) { | 248 | } else if(key == Qt::Key_Down) { |
245 | int year = ((date.month()-1)<1)?date.year()-1:date.year(); | 249 | int year = ((date.month()-1)<1)?date.year()-1:date.year(); |
@@ -252,6 +256,6 @@ void KDateEdit::setDate( QDate date,int *cpos,const int key ,const bool dateForm | |||
252 | case 'Y': | 256 | case 'Y': |
253 | if(key == Key_Up) { | 257 | if(key == Qt::Key_Up) { |
254 | setDate( QDate( date.year() + 1, date.month() , date.day()) ); | 258 | setDate( QDate( date.year() + 1, date.month() , date.day()) ); |
255 | } | 259 | } |
256 | else if(key == Key_Down) { | 260 | else if(key == Qt::Key_Down) { |
257 | setDate( QDate( date.year() - 1, date.month() , date.day()) ); | 261 | setDate( QDate( date.year() - 1, date.month() , date.day()) ); |
@@ -346,8 +350,8 @@ void KDateEdit::keyPressEvent(QKeyEvent *e) | |||
346 | { | 350 | { |
347 | case Key_Escape: | 351 | case Qt::Key_Escape: |
348 | mDateEdit->deselect(); | 352 | mDateEdit->deselect(); |
349 | case Key_Tab: | 353 | case Qt::Key_Tab: |
350 | QHBox::keyPressEvent(e); | 354 | Q3HBox::keyPressEvent(e); |
351 | break; | 355 | break; |
352 | case Key_Up: | 356 | case Qt::Key_Up: |
353 | // when date invalid then set to currend and return | 357 | // when date invalid then set to currend and return |
@@ -362,5 +366,5 @@ void KDateEdit::keyPressEvent(QKeyEvent *e) | |||
362 | } | 366 | } |
363 | setDate(date, &cpos, Key_Up, dateFormShort); | 367 | setDate(date, &cpos, Qt::Key_Up, dateFormShort); |
364 | break; | 368 | break; |
365 | case Key_Down: | 369 | case Qt::Key_Down: |
366 | // when date invalid then set to current and return | 370 | // when date invalid then set to current and return |
@@ -375,6 +379,6 @@ void KDateEdit::keyPressEvent(QKeyEvent *e) | |||
375 | } | 379 | } |
376 | setDate(date, &cpos, Key_Down, dateFormShort); | 380 | setDate(date, &cpos, Qt::Key_Down, dateFormShort); |
377 | break; | 381 | break; |
378 | default: | 382 | default: |
379 | QHBox::keyPressEvent(e); | 383 | Q3HBox::keyPressEvent(e); |
380 | break; | 384 | break; |