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/kdatenavigator.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
Diffstat (limited to 'korganizer/kdatenavigator.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -22,12 +22,16 @@ | |||
22 | */ | 22 | */ |
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> |
33 | #include <klocale.h> | 37 | #include <klocale.h> |
@@ -46,12 +50,12 @@ | |||
46 | #include "kdatenavigator.h" | 50 | #include "kdatenavigator.h" |
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()) { |
57 | qDebug("KDateNavigator::invalid startdate "); | 61 | qDebug("KDateNavigator::invalid startdate "); |
@@ -81,7 +85,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
81 | for( i = 0; i < 7; i++ ) { | 85 | for( i = 0; i < 7; i++ ) { |
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 | ||
87 | topLayout->addWidget(headings[i],1,i+1); | 91 | topLayout->addWidget(headings[i],1,i+1); |
@@ -90,7 +94,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
90 | // Create the weeknumber labels | 94 | // Create the weeknumber labels |
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) { |
96 | weeknos[i]->hide(); | 100 | weeknos[i]->hide(); |
@@ -101,7 +105,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
101 | } | 105 | } |
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 | ||
107 | connect( daymatrix, SIGNAL( selected( const KCal::DateList & ) ), | 111 | connect( daymatrix, SIGNAL( selected( const KCal::DateList & ) ), |