-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 @@ -22,23 +22,33 @@ */ #ifndef KOAGENDAVIEW_H #define KOAGENDAVIEW_H -#include <qscrollview.h> +#include <q3scrollview.h> #include <qdatetime.h> #include <qpushbutton.h> #include <qlayout.h> +#include <Q3BoxLayout> #ifndef DESKTOP_VERSION #include <qksplitter.h> #else #include <qsplitter.h> #endif -#include <qmemarray.h> +#include <q3memarray.h> +//Added by qt3to4: +#include <QPaintEvent> +#include <QResizeEvent> +#include <Q3Frame> +#include <QPixmap> +#include <QLabel> +#include <QMouseEvent> +#include <Q3PtrList> +#include <QKeyEvent> #include "koeventview.h" -class QHBox; -class QFrame; +class Q3HBox; +class Q3Frame; class QLabel; class QPushButton; class CalendarView; class KOAgenda; @@ -54,9 +64,9 @@ class KOAgendaButton : public QPushButton QPushButton( parent, name ) { mNum = -3; setFlat( true ); - setFocusPolicy(NoFocus); + setFocusPolicy(Qt::NoFocus); setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) ); }; @@ -69,12 +79,12 @@ signals: private: int mNum; }; -class TimeLabels : public QScrollView { +class TimeLabels : public Q3ScrollView { Q_OBJECT public: - TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); + TimeLabels(int rows,QWidget *parent=0,const char *name=0,Qt::WFlags f=0); void setCellHeight(int height); /** Calculates the minimum width */ @@ -112,9 +122,9 @@ class TimeLabels : public QScrollView { /** */ KOAgenda* mAgenda; }; -class EventIndicator : public QFrame { +class EventIndicator : public Q3Frame { Q_OBJECT public: enum Location { Top, Bottom }; EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0); @@ -131,13 +141,13 @@ class EventIndicator : public QFrame { private: int mXOffset; KDGanttMinimizeSplitter* mPaintWidget; int mColumns; - QHBox *mTopBox; - QBoxLayout *mTopLayout; + Q3HBox *mTopBox; + Q3BoxLayout *mTopLayout; Location mLocation; QPixmap mPixmap; - QMemArray<bool> mEnabled; + Q3MemArray<bool> mEnabled; }; /** KOAgendaView is the agenda-like view used to display events in an one or @@ -158,9 +168,9 @@ class KOAgendaView : public KOEventView { /** Returns number of currently shown dates. */ virtual int currentDateCount(); /** returns the currently selected events */ - virtual QPtrList<Incidence> selectedIncidences(); + virtual Q3PtrList<Incidence> selectedIncidences(); /** returns the currently selected events */ virtual DateList selectedDates(); @@ -184,9 +194,9 @@ class KOAgendaView : public KOEventView { void setInitStartHour(); virtual void updateView(); virtual void updateConfig(); virtual void showDates(const QDate &start, const QDate &end); - virtual void showEvents(QPtrList<Event> eventList); + virtual void showEvents(Q3PtrList<Event> eventList); void updateTodo( Todo *, int ); void changeEventDisplay(Event *, int); @@ -259,12 +269,12 @@ class KOAgendaView : public KOEventView { bool flag_blockfillAgenda; QTimer* mIdleTimer; QDateTime mIdleStart; // view widgets - QFrame *mDayLabels; - QHBox *mDayLabelsFrame; - QBoxLayout *mLayoutDayLabels; - QFrame *mAllDayFrame; + Q3Frame *mDayLabels; + Q3HBox *mDayLabelsFrame; + Q3BoxLayout *mLayoutDayLabels; + Q3Frame *mAllDayFrame; KOAgenda *mAllDayAgenda; KOAgenda *mAgenda; TimeLabels *mTimeLabels; QWidget *mDummyAllDayLeft; @@ -283,14 +293,14 @@ class KOAgendaView : public KOEventView { EventIndicator *mEventIndicatorTop; EventIndicator *mEventIndicatorBottom; - QMemArray<int> mMinY; - QMemArray<int> mMaxY; + Q3MemArray<int> mMinY; + Q3MemArray<int> mMaxY; - QMemArray<bool> mHolidayMask; + Q3MemArray<bool> mHolidayMask; - QPtrList<KOAgendaButton> mDayLabelsList; + Q3PtrList<KOAgendaButton> mDayLabelsList; QDateTime mTimeSpanBegin; QDateTime mTimeSpanEnd; bool mTimeSpanInAllDay; void keyPressEvent ( QKeyEvent * e ); |