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/koagenda.h | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/koagenda.h | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h index 380ce62..0708341 100644 --- a/korganizer/koagenda.h +++ b/korganizer/koagenda.h | |||
@@ -25,8 +25,17 @@ | |||
25 | 25 | ||
26 | #include <qscrollview.h> | 26 | #include <q3scrollview.h> |
27 | #include <qtimer.h> | 27 | #include <qtimer.h> |
28 | #include <qmemarray.h> | 28 | #include <q3memarray.h> |
29 | #include <qpainter.h> | 29 | #include <qpainter.h> |
30 | #include <qpixmap.h> | 30 | #include <qpixmap.h> |
31 | #include <qguardedptr.h> | 31 | #include <qpointer.h> |
32 | //Added by qt3to4: | ||
33 | #include <QResizeEvent> | ||
34 | #include <Q3Frame> | ||
35 | #include <QLabel> | ||
36 | #include <QMouseEvent> | ||
37 | #include <Q3PtrList> | ||
38 | #include <Q3PopupMenu> | ||
39 | #include <QKeyEvent> | ||
40 | #include <QEvent> | ||
32 | 41 | ||
@@ -35,6 +44,6 @@ | |||
35 | 44 | ||
36 | class QPopupMenu; | 45 | class Q3PopupMenu; |
37 | class QTime; | 46 | class QTime; |
38 | class KConfig; | 47 | class KConfig; |
39 | class QFrame; | 48 | class Q3Frame; |
40 | class KOAgenda; | 49 | class KOAgenda; |
@@ -45,3 +54,3 @@ using namespace KCal; | |||
45 | 54 | ||
46 | class MarcusBains : public QFrame { | 55 | class MarcusBains : public Q3Frame { |
47 | Q_OBJECT | 56 | Q_OBJECT |
@@ -65,3 +74,3 @@ class MarcusBains : public QFrame { | |||
65 | 74 | ||
66 | class KOAgenda : public QScrollView | 75 | class KOAgenda : public Q3ScrollView |
67 | { | 76 | { |
@@ -73,5 +82,5 @@ class KOAgenda : public QScrollView | |||
73 | KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0, | 82 | KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0, |
74 | const char * name=0, WFlags f=0 ); | 83 | const char * name=0, Qt::WFlags f=0 ); |
75 | KOAgenda ( int columns, QWidget * parent=0, | 84 | KOAgenda ( int columns, QWidget * parent=0, |
76 | const char * name=0, WFlags f=0 ); | 85 | const char * name=0, Qt::WFlags f=0 ); |
77 | virtual ~KOAgenda(); | 86 | virtual ~KOAgenda(); |
@@ -119,3 +128,3 @@ class KOAgenda : public QScrollView | |||
119 | 128 | ||
120 | void setHolidayMask(QMemArray<bool> *); | 129 | void setHolidayMask(Q3MemArray<bool> *); |
121 | void setDateList(const DateList &selectedDates); | 130 | void setDateList(const DateList &selectedDates); |
@@ -279,6 +288,6 @@ class KOAgenda : public QScrollView | |||
279 | // The KOAgendaItem, which is being moved/resized | 288 | // The KOAgendaItem, which is being moved/resized |
280 | QGuardedPtr<KOAgendaItem> mActionItem; | 289 | QPointer<KOAgendaItem> mActionItem; |
281 | 290 | ||
282 | // Currently selected item | 291 | // Currently selected item |
283 | QGuardedPtr<KOAgendaItem> mSelectedItem; | 292 | QPointer<KOAgendaItem> mSelectedItem; |
284 | 293 | ||
@@ -293,7 +302,7 @@ class KOAgenda : public QScrollView | |||
293 | // List of all Items contained in agenda | 302 | // List of all Items contained in agenda |
294 | QPtrList<KOAgendaItem> mItems; | 303 | Q3PtrList<KOAgendaItem> mItems; |
295 | QPtrList<KOAgendaItem> mUnusedItems; | 304 | Q3PtrList<KOAgendaItem> mUnusedItems; |
296 | KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport); | 305 | KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport); |
297 | QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems | 306 | Q3PopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems |
298 | QPopupMenu *mNewItemPopup; | 307 | Q3PopupMenu *mNewItemPopup; |
299 | 308 | ||
@@ -302,3 +311,3 @@ class KOAgenda : public QScrollView | |||
302 | KOAgendaItem * getItemForTodo ( Todo * todo ); | 311 | KOAgendaItem * getItemForTodo ( Todo * todo ); |
303 | QMemArray<bool> *mHolidayMask; | 312 | Q3MemArray<bool> *mHolidayMask; |
304 | int mCurPixWid; | 313 | int mCurPixWid; |