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
@@ -21,20 +21,27 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
-#include <qlistview.h>
-#include <qwhatsthis.h>
+#include <q3listview.h>
+#include <q3whatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
-#include <qhbuttongroup.h>
+//#include <qhbuttongroup.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #include <libkdepim/kdateedit.h>
 
 #include "koglobals.h"
@@ -43,21 +50,21 @@
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
 
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
-    : QVBox( 0  )
+    : Q3VBox( 0  )
 
 {
     mCalendar = calendar;
-    QFrame *topFrame = new QFrame( this ) ;//plainPage();
-    QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
+    Q3Frame *topFrame = new Q3Frame( this ) ;//plainPage();
+    Q3VBoxLayout *layout = new Q3VBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
 
     // Search expression
-    QHBoxLayout *subLayout = new QHBoxLayout();
+    Q3HBoxLayout *subLayout = new Q3HBoxLayout();
     layout->addLayout(subLayout);
     /*
     searchLabel = new QLabel(topFrame);
     searchLabel->setText(i18n("Search for:"));
     subLayout->addWidget(searchLabel);
     */
@@ -95,50 +102,50 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
     connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
     // Subjects to search
     // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
     //                                        topFrame);
 
-    incidenceGroup = new QHBox( topFrame );
+    incidenceGroup = new Q3HBox( topFrame );
     layout->addWidget(incidenceGroup);
 
     mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
     //mSearchEvent->setChecked(true);
     mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
     mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
 
-    subjectGroup = new QHBox( topFrame );
+    subjectGroup = new Q3HBox( topFrame );
     layout->addWidget(subjectGroup);
 
     mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
     mSummaryCheck->setChecked(true);
     mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
     mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
 
-    attendeeGroup = new QHBox( topFrame );
+    attendeeGroup = new Q3HBox( topFrame );
     layout->addWidget(attendeeGroup );
     new QLabel( i18n("Attendee:"),attendeeGroup );
     mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup  );
     mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
     // Date range
     // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
     //                                    topFrame);
     // layout->addWidget(rangeGroup);
 
     QWidget *rangeWidget = new QWidget(topFrame);
     int space = KDialog::spacingHint();
     if ( QApplication::desktop()->width() <= 240 ) space = 1;
-    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,space);
+    Q3HBoxLayout *rangeLayout = new Q3HBoxLayout(rangeWidget,0,space);
     rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
     mStartDate = new KDateEdit(rangeWidget);
     rangeLayout->addWidget(mStartDate);
     rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
     mEndDate = new KDateEdit(rangeWidget);
     mEndDate->setDate(QDate::currentDate().addDays(365));
     rangeLayout->addWidget(mEndDate);
-    QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
+    QToolButton *wt = Q3WhatsThis::whatsThisButton (  rangeWidget );
     rangeLayout->addWidget( (QWidget*)wt );
     layout->addWidget(rangeWidget);
     // Results list view
     listView = new KOListView(mCalendar,topFrame);
     layout->addWidget(listView);
     listView->showCompletedTodos();
@@ -338,13 +345,13 @@ void SearchDialog::updateView()
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
 }
 
 void SearchDialog::search(const QRegExp &re)
 {
-    QPtrList<Event> events;
+    Q3PtrList<Event> events;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) events = mMatchedEvents;
         mMatchedEvents.clear();
     } 
     if ( mSearchEvent->isChecked() ) {
         if ( !mRefineItems->isChecked() )
@@ -416,13 +423,13 @@ void SearchDialog::search(const QRegExp &re)
                                     mMatchedEvents.append(ev);
                             }
                             continue;
                         }
             }
             if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
-                QPtrList<Attendee> tmpAList = ev->attendees();
+                Q3PtrList<Attendee> tmpAList = ev->attendees();
                 Attendee *a;
                 for (a = tmpAList.first(); a; a = tmpAList.next()) {
                     if (mSearchAName->isChecked()) {
 #if QT_VERSION >= 0x030000
                         if (re.search(a->name()) != -1) 
 #else
@@ -455,13 +462,13 @@ void SearchDialog::search(const QRegExp &re)
                                 }
                     }
                 }
             }
         }
     }
-    QPtrList<Todo> todos;
+    Q3PtrList<Todo> todos;
 
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) todos = mMatchedTodos ;
         mMatchedTodos.clear();
     } 
 
@@ -509,13 +516,13 @@ void SearchDialog::search(const QRegExp &re)
                             else if (!mMatchedTodos.contains( tod )) 
                                 mMatchedTodos.append(tod);                              
                             continue;
                         }
             }
             if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
-                QPtrList<Attendee> tmpAList = tod->attendees();
+                Q3PtrList<Attendee> tmpAList = tod->attendees();
                 Attendee *a;
                 for (a = tmpAList.first(); a; a = tmpAList.next()) {
                     if (mSearchAName->isChecked()) {
 #if QT_VERSION >= 0x030000
                         if (re.search(a->name()) != -1) 
 #else
@@ -545,13 +552,13 @@ void SearchDialog::search(const QRegExp &re)
                     }
                 }
             }
         }
     }
 
-    QPtrList<Journal> journals;
+    Q3PtrList<Journal> journals;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) journals = mMatchedJournals ;
         mMatchedJournals.clear();
     } 
     if (mSearchJournal->isChecked() ) {
         if ( ! mRefineItems->isChecked() ) journals = mCalendar->journals();