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 /korganizer/searchdialog.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/searchdialog.cpp | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 9cfdc35..105b844 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -26,10 +26,17 @@ | |||
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qgroupbox.h> | 27 | #include <q3groupbox.h> |
28 | #include <qapplication.h> | 28 | #include <qapplication.h> |
29 | #include <QDesktopWidget> | ||
29 | #include <qlabel.h> | 30 | #include <qlabel.h> |
30 | #include <qlistview.h> | 31 | #include <q3listview.h> |
31 | #include <qwhatsthis.h> | 32 | #include <q3whatsthis.h> |
32 | #include <qlineedit.h> | 33 | #include <qlineedit.h> |
33 | #include <qpushbutton.h> | 34 | #include <qpushbutton.h> |
34 | #include <qhbuttongroup.h> | 35 | //#include <qhbuttongroup.h> |
36 | //Added by qt3to4: | ||
37 | #include <Q3HBoxLayout> | ||
38 | #include <Q3Frame> | ||
39 | #include <Q3PtrList> | ||
40 | #include <QKeyEvent> | ||
41 | #include <Q3VBoxLayout> | ||
35 | #include <klocale.h> | 42 | #include <klocale.h> |
@@ -48,3 +55,3 @@ | |||
48 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | 55 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) |
49 | : QVBox( 0 ) | 56 | : Q3VBox( 0 ) |
50 | 57 | ||
@@ -52,7 +59,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
52 | mCalendar = calendar; | 59 | mCalendar = calendar; |
53 | QFrame *topFrame = new QFrame( this ) ;//plainPage(); | 60 | Q3Frame *topFrame = new Q3Frame( this ) ;//plainPage(); |
54 | QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); | 61 | Q3VBoxLayout *layout = new Q3VBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); |
55 | 62 | ||
56 | // Search expression | 63 | // Search expression |
57 | QHBoxLayout *subLayout = new QHBoxLayout(); | 64 | Q3HBoxLayout *subLayout = new Q3HBoxLayout(); |
58 | layout->addLayout(subLayout); | 65 | layout->addLayout(subLayout); |
@@ -100,3 +107,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
100 | 107 | ||
101 | incidenceGroup = new QHBox( topFrame ); | 108 | incidenceGroup = new Q3HBox( topFrame ); |
102 | layout->addWidget(incidenceGroup); | 109 | layout->addWidget(incidenceGroup); |
@@ -108,3 +115,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
108 | 115 | ||
109 | subjectGroup = new QHBox( topFrame ); | 116 | subjectGroup = new Q3HBox( topFrame ); |
110 | layout->addWidget(subjectGroup); | 117 | layout->addWidget(subjectGroup); |
@@ -116,3 +123,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
116 | 123 | ||
117 | attendeeGroup = new QHBox( topFrame ); | 124 | attendeeGroup = new Q3HBox( topFrame ); |
118 | layout->addWidget(attendeeGroup ); | 125 | layout->addWidget(attendeeGroup ); |
@@ -129,3 +136,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
129 | if ( QApplication::desktop()->width() <= 240 ) space = 1; | 136 | if ( QApplication::desktop()->width() <= 240 ) space = 1; |
130 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,space); | 137 | Q3HBoxLayout *rangeLayout = new Q3HBoxLayout(rangeWidget,0,space); |
131 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); | 138 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |
@@ -137,3 +144,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
137 | rangeLayout->addWidget(mEndDate); | 144 | rangeLayout->addWidget(mEndDate); |
138 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); | 145 | QToolButton *wt = Q3WhatsThis::whatsThisButton ( rangeWidget ); |
139 | rangeLayout->addWidget( (QWidget*)wt ); | 146 | rangeLayout->addWidget( (QWidget*)wt ); |
@@ -343,3 +350,3 @@ void SearchDialog::search(const QRegExp &re) | |||
343 | { | 350 | { |
344 | QPtrList<Event> events; | 351 | Q3PtrList<Event> events; |
345 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { | 352 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { |
@@ -421,3 +428,3 @@ void SearchDialog::search(const QRegExp &re) | |||
421 | if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) { | 428 | if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) { |
422 | QPtrList<Attendee> tmpAList = ev->attendees(); | 429 | Q3PtrList<Attendee> tmpAList = ev->attendees(); |
423 | Attendee *a; | 430 | Attendee *a; |
@@ -460,3 +467,3 @@ void SearchDialog::search(const QRegExp &re) | |||
460 | } | 467 | } |
461 | QPtrList<Todo> todos; | 468 | Q3PtrList<Todo> todos; |
462 | 469 | ||
@@ -514,3 +521,3 @@ void SearchDialog::search(const QRegExp &re) | |||
514 | if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) { | 521 | if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) { |
515 | QPtrList<Attendee> tmpAList = tod->attendees(); | 522 | Q3PtrList<Attendee> tmpAList = tod->attendees(); |
516 | Attendee *a; | 523 | Attendee *a; |
@@ -550,3 +557,3 @@ void SearchDialog::search(const QRegExp &re) | |||
550 | 557 | ||
551 | QPtrList<Journal> journals; | 558 | Q3PtrList<Journal> journals; |
552 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { | 559 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { |