summaryrefslogtreecommitdiffabout
path: root/korganizer/koagenda.h
Side-by-side diff
Diffstat (limited to 'korganizer/koagenda.h') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagenda.h43
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
@@ -23,27 +23,36 @@
#ifndef KOAGENDA_H
#define KOAGENDA_H
-#include <qscrollview.h>
+#include <q3scrollview.h>
#include <qtimer.h>
-#include <qmemarray.h>
+#include <q3memarray.h>
#include <qpainter.h>
#include <qpixmap.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QLabel>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
+#include <QEvent>
#include "koagendaitem.h"
#include "koeventview.h"
-class QPopupMenu;
+class Q3PopupMenu;
class QTime;
class KConfig;
-class QFrame;
+class Q3Frame;
class KOAgenda;
class KCal::Event;
class KCal::Todo;
using namespace KCal;
-class MarcusBains : public QFrame {
+class MarcusBains : public Q3Frame {
Q_OBJECT
public:
MarcusBains(KOAgenda *agenda=0,const char *name=0);
@@ -63,7 +72,7 @@ class MarcusBains : public QFrame {
};
-class KOAgenda : public QScrollView
+class KOAgenda : public Q3ScrollView
{
Q_OBJECT
public:
@@ -71,9 +80,9 @@ class KOAgenda : public QScrollView
RESIZETOP, RESIZEBOTTOM, RESIZELEFT, RESIZERIGHT };
KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0,
- const char * name=0, WFlags f=0 );
+ const char * name=0, Qt::WFlags f=0 );
KOAgenda ( int columns, QWidget * parent=0,
- const char * name=0, WFlags f=0 );
+ const char * name=0, Qt::WFlags f=0 );
virtual ~KOAgenda();
bool mInvalidPixmap;
@@ -117,7 +126,7 @@ class KOAgenda : public QScrollView
void checkScrollBoundaries();
- void setHolidayMask(QMemArray<bool> *);
+ void setHolidayMask(Q3MemArray<bool> *);
void setDateList(const DateList &selectedDates);
DateList dateList() const;
void drawContentsToPainter( QPainter* paint = 0, bool backgroundOnly = false);
@@ -277,10 +286,10 @@ class KOAgenda : public QScrollView
KOAgendaItem *mClickedItem;
// The KOAgendaItem, which is being moved/resized
- QGuardedPtr<KOAgendaItem> mActionItem;
+ QPointer<KOAgendaItem> mActionItem;
// Currently selected item
- QGuardedPtr<KOAgendaItem> mSelectedItem;
+ QPointer<KOAgendaItem> mSelectedItem;
// The Marcus Bains Line widget.
MarcusBains *mMarcusBains;
@@ -291,16 +300,16 @@ class KOAgenda : public QScrollView
bool mItemMoved;
// List of all Items contained in agenda
- QPtrList<KOAgendaItem> mItems;
- QPtrList<KOAgendaItem> mUnusedItems;
+ Q3PtrList<KOAgendaItem> mItems;
+ Q3PtrList<KOAgendaItem> mUnusedItems;
KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport);
- QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
- QPopupMenu *mNewItemPopup;
+ Q3PopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
+ Q3PopupMenu *mNewItemPopup;
int mOldLowerScrollValue;
int mOldUpperScrollValue;
KOAgendaItem * getItemForTodo ( Todo * todo );
- QMemArray<bool> *mHolidayMask;
+ Q3MemArray<bool> *mHolidayMask;
int mCurPixWid;
int mCurPixHei;
};