-rw-r--r-- | korganizer/koagendaview.h | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 5e68146..3b871d9 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h | |||
@@ -23,21 +23,31 @@ | |||
23 | #ifndef KOAGENDAVIEW_H | 23 | #ifndef KOAGENDAVIEW_H |
24 | #define KOAGENDAVIEW_H | 24 | #define KOAGENDAVIEW_H |
25 | 25 | ||
26 | #include <qscrollview.h> | 26 | #include <q3scrollview.h> |
27 | #include <qdatetime.h> | 27 | #include <qdatetime.h> |
28 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | #include <Q3BoxLayout> | ||
30 | #ifndef DESKTOP_VERSION | 31 | #ifndef DESKTOP_VERSION |
31 | #include <qksplitter.h> | 32 | #include <qksplitter.h> |
32 | #else | 33 | #else |
33 | #include <qsplitter.h> | 34 | #include <qsplitter.h> |
34 | #endif | 35 | #endif |
35 | #include <qmemarray.h> | 36 | #include <q3memarray.h> |
37 | //Added by qt3to4: | ||
38 | #include <QPaintEvent> | ||
39 | #include <QResizeEvent> | ||
40 | #include <Q3Frame> | ||
41 | #include <QPixmap> | ||
42 | #include <QLabel> | ||
43 | #include <QMouseEvent> | ||
44 | #include <Q3PtrList> | ||
45 | #include <QKeyEvent> | ||
36 | 46 | ||
37 | #include "koeventview.h" | 47 | #include "koeventview.h" |
38 | 48 | ||
39 | class QHBox; | 49 | class Q3HBox; |
40 | class QFrame; | 50 | class Q3Frame; |
41 | class QLabel; | 51 | class QLabel; |
42 | class QPushButton; | 52 | class QPushButton; |
43 | class CalendarView; | 53 | class CalendarView; |
@@ -55,7 +65,7 @@ class KOAgendaButton : public QPushButton | |||
55 | { | 65 | { |
56 | mNum = -3; | 66 | mNum = -3; |
57 | setFlat( true ); | 67 | setFlat( true ); |
58 | setFocusPolicy(NoFocus); | 68 | setFocusPolicy(Qt::NoFocus); |
59 | setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); | 69 | setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); |
60 | connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) ); | 70 | connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) ); |
61 | }; | 71 | }; |
@@ -70,10 +80,10 @@ private: | |||
70 | int mNum; | 80 | int mNum; |
71 | }; | 81 | }; |
72 | 82 | ||
73 | class TimeLabels : public QScrollView { | 83 | class TimeLabels : public Q3ScrollView { |
74 | Q_OBJECT | 84 | Q_OBJECT |
75 | public: | 85 | public: |
76 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); | 86 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,Qt::WFlags f=0); |
77 | 87 | ||
78 | void setCellHeight(int height); | 88 | void setCellHeight(int height); |
79 | 89 | ||
@@ -113,7 +123,7 @@ class TimeLabels : public QScrollView { | |||
113 | KOAgenda* mAgenda; | 123 | KOAgenda* mAgenda; |
114 | }; | 124 | }; |
115 | 125 | ||
116 | class EventIndicator : public QFrame { | 126 | class EventIndicator : public Q3Frame { |
117 | Q_OBJECT | 127 | Q_OBJECT |
118 | public: | 128 | public: |
119 | enum Location { Top, Bottom }; | 129 | enum Location { Top, Bottom }; |
@@ -132,11 +142,11 @@ class EventIndicator : public QFrame { | |||
132 | int mXOffset; | 142 | int mXOffset; |
133 | KDGanttMinimizeSplitter* mPaintWidget; | 143 | KDGanttMinimizeSplitter* mPaintWidget; |
134 | int mColumns; | 144 | int mColumns; |
135 | QHBox *mTopBox; | 145 | Q3HBox *mTopBox; |
136 | QBoxLayout *mTopLayout; | 146 | Q3BoxLayout *mTopLayout; |
137 | Location mLocation; | 147 | Location mLocation; |
138 | QPixmap mPixmap; | 148 | QPixmap mPixmap; |
139 | QMemArray<bool> mEnabled; | 149 | Q3MemArray<bool> mEnabled; |
140 | }; | 150 | }; |
141 | 151 | ||
142 | /** | 152 | /** |
@@ -159,7 +169,7 @@ class KOAgendaView : public KOEventView { | |||
159 | virtual int currentDateCount(); | 169 | virtual int currentDateCount(); |
160 | 170 | ||
161 | /** returns the currently selected events */ | 171 | /** returns the currently selected events */ |
162 | virtual QPtrList<Incidence> selectedIncidences(); | 172 | virtual Q3PtrList<Incidence> selectedIncidences(); |
163 | 173 | ||
164 | /** returns the currently selected events */ | 174 | /** returns the currently selected events */ |
165 | virtual DateList selectedDates(); | 175 | virtual DateList selectedDates(); |
@@ -185,7 +195,7 @@ class KOAgendaView : public KOEventView { | |||
185 | virtual void updateView(); | 195 | virtual void updateView(); |
186 | virtual void updateConfig(); | 196 | virtual void updateConfig(); |
187 | virtual void showDates(const QDate &start, const QDate &end); | 197 | virtual void showDates(const QDate &start, const QDate &end); |
188 | virtual void showEvents(QPtrList<Event> eventList); | 198 | virtual void showEvents(Q3PtrList<Event> eventList); |
189 | 199 | ||
190 | void updateTodo( Todo *, int ); | 200 | void updateTodo( Todo *, int ); |
191 | void changeEventDisplay(Event *, int); | 201 | void changeEventDisplay(Event *, int); |
@@ -260,10 +270,10 @@ class KOAgendaView : public KOEventView { | |||
260 | QTimer* mIdleTimer; | 270 | QTimer* mIdleTimer; |
261 | QDateTime mIdleStart; | 271 | QDateTime mIdleStart; |
262 | // view widgets | 272 | // view widgets |
263 | QFrame *mDayLabels; | 273 | Q3Frame *mDayLabels; |
264 | QHBox *mDayLabelsFrame; | 274 | Q3HBox *mDayLabelsFrame; |
265 | QBoxLayout *mLayoutDayLabels; | 275 | Q3BoxLayout *mLayoutDayLabels; |
266 | QFrame *mAllDayFrame; | 276 | Q3Frame *mAllDayFrame; |
267 | KOAgenda *mAllDayAgenda; | 277 | KOAgenda *mAllDayAgenda; |
268 | KOAgenda *mAgenda; | 278 | KOAgenda *mAgenda; |
269 | TimeLabels *mTimeLabels; | 279 | TimeLabels *mTimeLabels; |
@@ -284,12 +294,12 @@ class KOAgendaView : public KOEventView { | |||
284 | EventIndicator *mEventIndicatorTop; | 294 | EventIndicator *mEventIndicatorTop; |
285 | EventIndicator *mEventIndicatorBottom; | 295 | EventIndicator *mEventIndicatorBottom; |
286 | 296 | ||
287 | QMemArray<int> mMinY; | 297 | Q3MemArray<int> mMinY; |
288 | QMemArray<int> mMaxY; | 298 | Q3MemArray<int> mMaxY; |
289 | 299 | ||
290 | QMemArray<bool> mHolidayMask; | 300 | Q3MemArray<bool> mHolidayMask; |
291 | 301 | ||
292 | QPtrList<KOAgendaButton> mDayLabelsList; | 302 | Q3PtrList<KOAgendaButton> mDayLabelsList; |
293 | QDateTime mTimeSpanBegin; | 303 | QDateTime mTimeSpanBegin; |
294 | QDateTime mTimeSpanEnd; | 304 | QDateTime mTimeSpanEnd; |
295 | bool mTimeSpanInAllDay; | 305 | bool mTimeSpanInAllDay; |