1 files changed, 16 insertions, 13 deletions

diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f6a1a6a..59c3e45 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -26,10 +26,13 @@
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -53,11 +56,11 @@
 NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3HBoxLayout( this );
 
   // Set up the control buttons and date label
-  mCtrlFrame = new QFrame( this );
-  mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
+  mCtrlFrame = new Q3Frame( this );
+  mCtrlFrame->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised);
   mCtrlFrame->setLineWidth(1);
 
   topLayout->addWidget( mCtrlFrame );
@@ -129,7 +132,7 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
 
   
   // set up control frame layout
-  QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
+  Q3BoxLayout *ctrlLayout = new Q3HBoxLayout( mCtrlFrame, 1 );
   ctrlLayout->addWidget( mPrevYear, 3 );
   ctrlLayout->addWidget( mPrevMonth, 3 );
   ctrlLayout->addWidget( mPrevWeek, 3 );
@@ -150,13 +153,13 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) );
   connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) );
   connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) );
-  mPrevYear->setFocusPolicy(NoFocus);
-  mPrevMonth->setFocusPolicy(NoFocus);
-  mNextMonth->setFocusPolicy(NoFocus);
-  mPrevWeek->setFocusPolicy(NoFocus);
-  mNextWeek->setFocusPolicy(NoFocus);
-  mNextYear->setFocusPolicy(NoFocus);
-  mSelectMonth->setFocusPolicy(NoFocus);
+  mPrevYear->setFocusPolicy(Qt::NoFocus);
+  mPrevMonth->setFocusPolicy(Qt::NoFocus);
+  mNextMonth->setFocusPolicy(Qt::NoFocus);
+  mPrevWeek->setFocusPolicy(Qt::NoFocus);
+  mNextWeek->setFocusPolicy(Qt::NoFocus);
+  mNextYear->setFocusPolicy(Qt::NoFocus);
+  mSelectMonth->setFocusPolicy(Qt::NoFocus);
   setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
    
 }