-rw-r--r-- | korganizer/kdatenavigator.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 6697602..ecc7a2f 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -23,10 +23,14 @@ | |||
23 | 23 | ||
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | #include <qkeycode.h> | 25 | #include <qnamespace.h> |
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qtimer.h> | 27 | #include <qtimer.h> |
28 | #include <qframe.h> | 28 | #include <q3frame.h> |
29 | #include <qlabel.h> | 29 | #include <qlabel.h> |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | //Added by qt3to4: | ||
32 | #include <QWheelEvent> | ||
33 | #include <Q3GridLayout> | ||
34 | #include <QEvent> | ||
31 | 35 | ||
32 | #include <kdebug.h> | 36 | #include <kdebug.h> |
@@ -47,10 +51,10 @@ | |||
47 | 51 | ||
48 | KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | 52 | KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) |
49 | : QFrame(parent, name), | 53 | : Q3Frame(parent, name), |
50 | updateTimer(0L) | 54 | updateTimer(0L) |
51 | { | 55 | { |
52 | setFrameStyle(QFrame::NoFrame); | 56 | setFrameStyle(Q3Frame::NoFrame); |
53 | QDate startDate = QDate::currentDate(); | 57 | QDate startDate = QDate::currentDate(); |
54 | QGridLayout *topLayout = new QGridLayout(this,8,8); | 58 | Q3GridLayout *topLayout = new Q3GridLayout(this,8,8); |
55 | 59 | ||
56 | if (! startDate.isValid()) { | 60 | if (! startDate.isValid()) { |
@@ -82,5 +86,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
82 | headings[i] = new QLabel("",this); | 86 | headings[i] = new QLabel("",this); |
83 | //headings[i]->setFont(QFont("Arial", 10, QFont::Bold)); | 87 | //headings[i]->setFont(QFont("Arial", 10, QFont::Bold)); |
84 | headings[i]->setAlignment(AlignCenter); | 88 | headings[i]->setAlignment(Qt::AlignCenter); |
85 | headings[i]->installEventFilter(this); | 89 | headings[i]->installEventFilter(this); |
86 | 90 | ||
@@ -91,5 +95,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
91 | for( i = 0; i < 6; i++ ) { | 95 | for( i = 0; i < 6; i++ ) { |
92 | weeknos[i] = new QLabel(this); | 96 | weeknos[i] = new QLabel(this); |
93 | weeknos[i]->setAlignment(AlignCenter ); | 97 | weeknos[i]->setAlignment(Qt::AlignCenter ); |
94 | //weeknos[i]->setFont(QFont("Arial", 10)); | 98 | //weeknos[i]->setFont(QFont("Arial", 10)); |
95 | if(!m_bShowWeekNums) { | 99 | if(!m_bShowWeekNums) { |
@@ -102,5 +106,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
102 | 106 | ||
103 | daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix"); | 107 | daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix"); |
104 | daymatrix->setFrameStyle(QFrame::Panel|QFrame::Sunken); | 108 | daymatrix->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken); |
105 | daymatrix->setLineWidth(1); | 109 | daymatrix->setLineWidth(1); |
106 | 110 | ||