-rw-r--r-- | korganizer/kdatenavigator.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 780ebb8..2cbca76 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h | |||
@@ -14,40 +14,43 @@ | |||
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | #ifndef KDATENAVIGATOR_H | 23 | #ifndef KDATENAVIGATOR_H |
24 | #define KDATENAVIGATOR_H | 24 | #define KDATENAVIGATOR_H |
25 | 25 | ||
26 | #include <qframe.h> | 26 | #include <q3frame.h> |
27 | #include <qdatetime.h> | 27 | #include <qdatetime.h> |
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | //Added by qt3to4: | ||
30 | #include <QWheelEvent> | ||
31 | #include <QEvent> | ||
29 | 32 | ||
30 | #include <libkcal/calendar.h> | 33 | #include <libkcal/calendar.h> |
31 | 34 | ||
32 | #include "kodaymatrix.h" | 35 | #include "kodaymatrix.h" |
33 | 36 | ||
34 | class QPushButton; | 37 | class QPushButton; |
35 | class QTimer; | 38 | class QTimer; |
36 | 39 | ||
37 | class KCalendarSystem; | 40 | class KCalendarSystem; |
38 | 41 | ||
39 | class NavigatorBar; | 42 | class NavigatorBar; |
40 | 43 | ||
41 | class KDateNavigator: public QFrame | 44 | class KDateNavigator: public Q3Frame |
42 | { | 45 | { |
43 | Q_OBJECT | 46 | Q_OBJECT |
44 | public: | 47 | public: |
45 | KDateNavigator( QWidget *parent = 0,const char *name = 0 ); | 48 | KDateNavigator( QWidget *parent = 0,const char *name = 0 ); |
46 | ~KDateNavigator(); | 49 | ~KDateNavigator(); |
47 | 50 | ||
48 | /** The DateNavigator automatically checks for | 51 | /** The DateNavigator automatically checks for |
49 | * the passage of midnight. If rollover type is | 52 | * the passage of midnight. If rollover type is |
50 | * set to None, no signals are emitted and no | 53 | * set to None, no signals are emitted and no |
51 | * processing is done. With rollover set to | 54 | * processing is done. With rollover set to |
52 | * FollowDay, the day highlighter changes at | 55 | * FollowDay, the day highlighter changes at |
53 | * midnight and dayPassed() is emitted. | 56 | * midnight and dayPassed() is emitted. |
@@ -124,26 +127,26 @@ class KDateNavigator: public QFrame | |||
124 | 127 | ||
125 | void wheelEvent (QWheelEvent *); | 128 | void wheelEvent (QWheelEvent *); |
126 | 129 | ||
127 | bool eventFilter (QObject *,QEvent *); | 130 | bool eventFilter (QObject *,QEvent *); |
128 | 131 | ||
129 | private: | 132 | private: |
130 | QSize mySizeHint; | 133 | QSize mySizeHint; |
131 | QSize myFullSizeHint; | 134 | QSize myFullSizeHint; |
132 | bool mFontChanged; | 135 | bool mFontChanged; |
133 | int mMonthSignalOffset; | 136 | int mMonthSignalOffset; |
134 | NavigatorBar *mNavigatorBar; | 137 | NavigatorBar *mNavigatorBar; |
135 | 138 | ||
136 | QFrame *headingSep; | 139 | Q3Frame *headingSep; |
137 | QFrame *weeknumSep; | 140 | Q3Frame *weeknumSep; |
138 | QLabel *headings[7]; | 141 | QLabel *headings[7]; |
139 | QLabel *weeknos[7]; | 142 | QLabel *weeknos[7]; |
140 | KODayMatrix *daymatrix; | 143 | KODayMatrix *daymatrix; |
141 | 144 | ||
142 | KCal::DateList mSelectedDates; | 145 | KCal::DateList mSelectedDates; |
143 | QDate m_MthYr; | 146 | QDate m_MthYr; |
144 | int m_fstDayOfWk; | 147 | int m_fstDayOfWk; |
145 | bool m_bShowWeekNums; | 148 | bool m_bShowWeekNums; |
146 | 149 | ||
147 | int dayNum(int row, int col); | 150 | int dayNum(int row, int col); |
148 | int dayToIndex(int dayNum); | 151 | int dayToIndex(int dayNum); |
149 | 152 | ||