-rw-r--r-- | korganizer/calendarview.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 60b1276..b4eada7 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -24,13 +24,15 @@ | |||
24 | #ifndef CALENDARVIEW_H | 24 | #ifndef CALENDARVIEW_H |
25 | #define CALENDARVIEW_H | 25 | #define CALENDARVIEW_H |
26 | 26 | ||
27 | #include <qframe.h> | 27 | #include <q3frame.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qwidget.h> | 29 | #include <qwidget.h> |
30 | #include <qptrlist.h> | 30 | #include <q3ptrlist.h> |
31 | #include <qvbox.h> | 31 | #include <q3vbox.h> |
32 | #include <qmap.h> | 32 | #include <qmap.h> |
33 | #include <qscrollbar.h> | 33 | #include <qscrollbar.h> |
34 | //Added by qt3to4: | ||
35 | #include <QKeyEvent> | ||
34 | #ifndef DESKTOP_VERSION | 36 | #ifndef DESKTOP_VERSION |
35 | #include <qtopia/ir.h> | 37 | #include <qtopia/ir.h> |
36 | #else | 38 | #else |
@@ -47,7 +49,7 @@ | |||
47 | #include <ksyncmanager.h> | 49 | #include <ksyncmanager.h> |
48 | //#include <koprefs.h> | 50 | //#include <koprefs.h> |
49 | 51 | ||
50 | class QWidgetStack; | 52 | class Q3WidgetStack; |
51 | class QSplitter; | 53 | class QSplitter; |
52 | class KopiCalendarFile; | 54 | class KopiCalendarFile; |
53 | class CalPrinter; | 55 | class CalPrinter; |
@@ -84,19 +86,19 @@ using namespace KCal; | |||
84 | @author Cornelius Schumacher | 86 | @author Cornelius Schumacher |
85 | */ | 87 | */ |
86 | 88 | ||
87 | #include <qtextbrowser.h> | 89 | #include <q3textbrowser.h> |
88 | #include <qtextcodec.h> | 90 | #include <qtextcodec.h> |
89 | 91 | ||
90 | class MissedAlarmTextBrowser : public QTextBrowser { | 92 | class MissedAlarmTextBrowser : public Q3TextBrowser { |
91 | Q_OBJECT | 93 | Q_OBJECT |
92 | public: | 94 | public: |
93 | MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); | 95 | MissedAlarmTextBrowser(QWidget *parent, Q3PtrList<Incidence> alarms ,QDateTime start); |
94 | ~MissedAlarmTextBrowser(); | 96 | ~MissedAlarmTextBrowser(); |
95 | void setSource(const QString & n); | 97 | void setSource(const QString & n); |
96 | 98 | ||
97 | private: | 99 | private: |
98 | Incidence * getNextInc(QDateTime start ); | 100 | Incidence * getNextInc(QDateTime start ); |
99 | QPtrList<Incidence> mAlarms; | 101 | Q3PtrList<Incidence> mAlarms; |
100 | signals: | 102 | signals: |
101 | void showIncidence( QString uid); | 103 | void showIncidence( QString uid); |
102 | }; | 104 | }; |
@@ -127,7 +129,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
127 | QDate startDate(); | 129 | QDate startDate(); |
128 | QDate endDate(); | 130 | QDate endDate(); |
129 | 131 | ||
130 | QWidgetStack *viewStack(); | 132 | Q3WidgetStack *viewStack(); |
131 | QWidget *leftFrame(); | 133 | QWidget *leftFrame(); |
132 | 134 | ||
133 | DateNavigator *dateNavigator(); | 135 | DateNavigator *dateNavigator(); |
@@ -441,7 +443,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
441 | 443 | ||
442 | void editFilters(); | 444 | void editFilters(); |
443 | void toggleFilerEnabled(); | 445 | void toggleFilerEnabled(); |
444 | QPtrList<CalFilter> filters(); | 446 | Q3PtrList<CalFilter> filters(); |
445 | void toggleFilter(); | 447 | void toggleFilter(); |
446 | void showFilter(bool visible); | 448 | void showFilter(bool visible); |
447 | void updateFilter(); | 449 | void updateFilter(); |
@@ -495,7 +497,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
495 | void beamIncidence(Incidence *) ; | 497 | void beamIncidence(Incidence *) ; |
496 | void beamCalendar() ; | 498 | void beamCalendar() ; |
497 | void beamFilteredCalendar() ; | 499 | void beamFilteredCalendar() ; |
498 | void beamIncidenceList(QPtrList<Incidence>) ; | 500 | void beamIncidenceList(Q3PtrList<Incidence>) ; |
499 | void manageCategories(); | 501 | void manageCategories(); |
500 | void editCategories(); | 502 | void editCategories(); |
501 | int addCategories(); | 503 | int addCategories(); |
@@ -575,7 +577,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
575 | void setSyncEventsReadOnly(); | 577 | void setSyncEventsReadOnly(); |
576 | 578 | ||
577 | QDateTime loadedFileVersion; | 579 | QDateTime loadedFileVersion; |
578 | void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); | 580 | void checkExternSyncEvent( Q3PtrList<Event> lastSync , Incidence* toDelete ); |
579 | void checkExternalId( Incidence * inc ); | 581 | void checkExternalId( Incidence * inc ); |
580 | int mGlobalSyncMode; | 582 | int mGlobalSyncMode; |
581 | QString mCurrentSyncDevice; | 583 | QString mCurrentSyncDevice; |
@@ -593,10 +595,10 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
593 | QSplitter *mPanner; | 595 | QSplitter *mPanner; |
594 | QSplitter *mLeftSplitter; | 596 | QSplitter *mLeftSplitter; |
595 | KDGanttMinimizeSplitter *mLeftFrame, *mMainFrame; | 597 | KDGanttMinimizeSplitter *mLeftFrame, *mMainFrame; |
596 | QWidgetStack *mRightFrame; | 598 | Q3WidgetStack *mRightFrame; |
597 | 599 | ||
598 | KDatePicker* mDatePicker; | 600 | KDatePicker* mDatePicker; |
599 | QVBox* mDateFrame; | 601 | Q3VBox* mDateFrame; |
600 | 602 | ||
601 | DateNavigatorContainer *mDateNavigator; // widget showing small month view. | 603 | DateNavigatorContainer *mDateNavigator; // widget showing small month view. |
602 | 604 | ||
@@ -618,7 +620,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
618 | KODialogManager *mDialogManager; | 620 | KODialogManager *mDialogManager; |
619 | 621 | ||
620 | // Calendar filters | 622 | // Calendar filters |
621 | QPtrList<CalFilter> mFilters; | 623 | Q3PtrList<CalFilter> mFilters; |
622 | 624 | ||
623 | // various housekeeping variables. | 625 | // various housekeeping variables. |
624 | bool mModified; // flag indicating if calendar is modified | 626 | bool mModified; // flag indicating if calendar is modified |