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/interfaces | |
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/interfaces/korganizer/baseview.h | 8 | ||||
-rw-r--r-- | korganizer/interfaces/korganizer/calendarviewbase.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index 2ac9de1..c828573 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h | |||
@@ -21,14 +21,14 @@ | |||
21 | #ifndef KORG_BASEVIEW_H | 21 | #ifndef KORG_BASEVIEW_H |
22 | #define KORG_BASEVIEW_H | 22 | #define KORG_BASEVIEW_H |
23 | // $Id$ | 23 | // $Id$ |
24 | // KOBaseView is the abstract base class of all calendar views. | 24 | // KOBaseView is the abstract base class of all calendar views. |
25 | 25 | ||
26 | #include <qwidget.h> | 26 | #include <qwidget.h> |
27 | #include <qptrlist.h> | 27 | #include <q3ptrlist.h> |
28 | #include <qvaluelist.h> | 28 | #include <q3valuelist.h> |
29 | 29 | ||
30 | #include <klocale.h> | 30 | #include <klocale.h> |
31 | #include <kdebug.h> | 31 | #include <kdebug.h> |
32 | #include <kmessagebox.h> | 32 | #include <kmessagebox.h> |
33 | 33 | ||
34 | #include <libkcal/event.h> | 34 | #include <libkcal/event.h> |
@@ -85,13 +85,13 @@ class BaseView : public QWidget | |||
85 | 85 | ||
86 | /** | 86 | /** |
87 | @return a list of selected events. Most views can probably only | 87 | @return a list of selected events. Most views can probably only |
88 | select a single event at a time, but some may be able to select | 88 | select a single event at a time, but some may be able to select |
89 | more than one. | 89 | more than one. |
90 | */ | 90 | */ |
91 | virtual QPtrList<Incidence> selectedIncidences() = 0; | 91 | virtual Q3PtrList<Incidence> selectedIncidences() = 0; |
92 | 92 | ||
93 | /** | 93 | /** |
94 | @return a list of the dates of selected events. Most views can probably only | 94 | @return a list of the dates of selected events. Most views can probably only |
95 | select a single event at a time, but some may be able to select | 95 | select a single event at a time, but some may be able to select |
96 | more than one. | 96 | more than one. |
97 | */ | 97 | */ |
@@ -150,13 +150,13 @@ class BaseView : public QWidget | |||
150 | /** | 150 | /** |
151 | Show given events. Depending on the actual view it might not be possible to | 151 | Show given events. Depending on the actual view it might not be possible to |
152 | show all given events. | 152 | show all given events. |
153 | 153 | ||
154 | @param eventList a list of events to show. | 154 | @param eventList a list of events to show. |
155 | */ | 155 | */ |
156 | virtual void showEvents(QPtrList<Event> eventList) = 0; | 156 | virtual void showEvents(Q3PtrList<Event> eventList) = 0; |
157 | 157 | ||
158 | /** | 158 | /** |
159 | Updates the current display to reflect changes that may have happened | 159 | Updates the current display to reflect changes that may have happened |
160 | in the calendar since the last display refresh. | 160 | in the calendar since the last display refresh. |
161 | */ | 161 | */ |
162 | virtual void updateView() = 0; | 162 | virtual void updateView() = 0; |
diff --git a/korganizer/interfaces/korganizer/calendarviewbase.h b/korganizer/interfaces/korganizer/calendarviewbase.h index 3c715b1..1f49357 100644 --- a/korganizer/interfaces/korganizer/calendarviewbase.h +++ b/korganizer/interfaces/korganizer/calendarviewbase.h | |||
@@ -20,12 +20,14 @@ | |||
20 | #ifndef KORG_CALENDARVIEWBASE_H | 20 | #ifndef KORG_CALENDARVIEWBASE_H |
21 | #define KORG_CALENDARVIEWBASE_H | 21 | #define KORG_CALENDARVIEWBASE_H |
22 | // $Id$ | 22 | // $Id$ |
23 | 23 | ||
24 | #include <qwidget.h> | 24 | #include <qwidget.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | //Added by qt3to4: | ||
27 | #include <Q3VBoxLayout> | ||
26 | 28 | ||
27 | 29 | ||
28 | #include <libkcal/calendar.h> | 30 | #include <libkcal/calendar.h> |
29 | 31 | ||
30 | #include <korganizer/baseview.h> | 32 | #include <korganizer/baseview.h> |
31 | 33 | ||
@@ -37,13 +39,13 @@ namespace KOrg { | |||
37 | */ | 39 | */ |
38 | class CalendarViewBase : public QWidget | 40 | class CalendarViewBase : public QWidget |
39 | { | 41 | { |
40 | Q_OBJECT | 42 | Q_OBJECT |
41 | public: | 43 | public: |
42 | CalendarViewBase(QWidget *parent, const char *name) : | 44 | CalendarViewBase(QWidget *parent, const char *name) : |
43 | QWidget(parent,name) {new QVBoxLayout(this);} | 45 | QWidget(parent,name) {new Q3VBoxLayout(this);} |
44 | virtual ~CalendarViewBase() {}; | 46 | virtual ~CalendarViewBase() {}; |
45 | 47 | ||
46 | virtual KCal::Calendar *calendar() = 0; | 48 | virtual KCal::Calendar *calendar() = 0; |
47 | 49 | ||
48 | virtual QDate startDate() = 0; | 50 | virtual QDate startDate() = 0; |
49 | virtual QDate endDate() = 0; | 51 | virtual QDate endDate() = 0; |