1 files changed, 21 insertions, 15 deletions

diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 406df5a..51594ff 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -27,5 +27,5 @@
 #include <qlayout.h>
-#include <qscrollview.h>
-#include <qpopupmenu.h>
-#include <qhbox.h>
+#include <q3scrollview.h>
+#include <q3popupmenu.h>
+#include <q3hbox.h>
 #include <qpushbutton.h>
@@ -34,2 +34,8 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 
@@ -53,3 +59,3 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
     mCalendar = calendar;
-    QHBox * vb = new QHBox ( this );
+    Q3HBox * vb = new Q3HBox ( this );
     QPushButton * newJournal = new QPushButton( vb );
@@ -65,5 +71,5 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
     mDateLabel->setMargin(1);
-    mDateLabel->setAlignment(AlignCenter);
-    QScrollView * sv = new QScrollView( this );
-    QVBoxLayout * hbl = new QVBoxLayout( this );
+    mDateLabel->setAlignment(Qt::AlignCenter);
+    Q3ScrollView * sv = new Q3ScrollView( this );
+    Q3VBoxLayout * hbl = new Q3VBoxLayout( this );
     hbl->addWidget( vb );
@@ -72,4 +78,4 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
     sv->addChild(parWid);
-    sv->setResizePolicy( QScrollView:: AutoOneFit );
-    mTopLayout = new QVBoxLayout(parWid);
+    sv->setResizePolicy( Q3ScrollView:: AutoOneFit );
+    mTopLayout = new Q3VBoxLayout(parWid);
     connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) );
@@ -98,5 +104,5 @@ JournalEntry* KOJournalView::getNewEntry()
 
-QPtrList<Incidence> KOJournalView::selectedIncidences()
+Q3PtrList<Incidence> KOJournalView::selectedIncidences()
 {
-  QPtrList<Incidence> eventList;
+  Q3PtrList<Incidence> eventList;
 
@@ -164,3 +170,3 @@ void KOJournalView::showOnly ( Journal* j )
     }
-    QPtrList<Journal> jl;
+    Q3PtrList<Journal> jl;
     jl.append ( j );
@@ -170,3 +176,3 @@ void KOJournalView::showOnly ( Journal* j )
 }
-void KOJournalView::showList(QPtrList<Journal> jl)
+void KOJournalView::showList(Q3PtrList<Journal> jl)
 { 
@@ -227,3 +233,3 @@ void KOJournalView::showDates(const QDate &start, const QDate &)
     mDateLabel->setText(KGlobal::locale()->formatDate(mDate));
-    QPtrList<Journal> jl = calendar()->journals4Date( start );
+    Q3PtrList<Journal> jl = calendar()->journals4Date( start );
     showList( jl );
@@ -231,3 +237,3 @@ void KOJournalView::showDates(const QDate &start, const QDate &)
 
-void KOJournalView::showEvents(QPtrList<Event>)
+void KOJournalView::showEvents(Q3PtrList<Event>)
 {