-rw-r--r-- | libopie2/opiepim/ui/opimrecurrencewidget.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiepim/ui/opimrecurrencewidget.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libopie2/opiepim/ui/opimrecurrencewidget.cpp b/libopie2/opiepim/ui/opimrecurrencewidget.cpp index 90c1a5f..ee7f3a3 100644 --- a/libopie2/opiepim/ui/opimrecurrencewidget.cpp +++ b/libopie2/opiepim/ui/opimrecurrencewidget.cpp | |||
@@ -6,8 +6,10 @@ | |||
6 | #include <qpe/timestring.h> | 6 | #include <qpe/timestring.h> |
7 | 7 | ||
8 | #include "opimrecurrencewidget.h" | 8 | #include "opimrecurrencewidget.h" |
9 | 9 | ||
10 | |||
11 | using namespace Opie; | ||
10 | // Global Templates for use in setting up the repeat label... | 12 | // Global Templates for use in setting up the repeat label... |
11 | // the problem is these strings get initialized before QPEApplication can install the translator -zecke | 13 | // the problem is these strings get initialized before QPEApplication can install the translator -zecke |
12 | namespace { | 14 | namespace { |
13 | QString strDayTemplate; | 15 | QString strDayTemplate; |
@@ -82,9 +84,9 @@ OPimRecurrenceWidget::OPimRecurrenceWidget( bool startOnMonday, | |||
82 | * @param modal | 84 | * @param modal |
83 | * @param fl The flags for window | 85 | * @param fl The flags for window |
84 | */ | 86 | */ |
85 | OPimRecurrenceWidget::OPimRecurrenceWidget( bool startOnMonday, | 87 | OPimRecurrenceWidget::OPimRecurrenceWidget( bool startOnMonday, |
86 | const OPimRecurrence& rp, const QDate& startDate, | 88 | const Opie::OPimRecurrence& rp, const QDate& startDate, |
87 | QWidget* parent, const char* name, | 89 | QWidget* parent, const char* name, |
88 | bool modal, WFlags fl) | 90 | bool modal, WFlags fl) |
89 | : OPimRecurrenceBase( parent, name, modal, fl ), | 91 | : OPimRecurrenceBase( parent, name, modal, fl ), |
90 | start( startDate ), | 92 | start( startDate ), |
@@ -111,18 +113,18 @@ void OPimRecurrenceWidget::setStartDate( const QDate& date ) { | |||
111 | /** | 113 | /** |
112 | * set the recurrence | 114 | * set the recurrence |
113 | * @param rp The OPimRecurrence object with the new recurrence rules | 115 | * @param rp The OPimRecurrence object with the new recurrence rules |
114 | */ | 116 | */ |
115 | void OPimRecurrenceWidget::setRecurrence( const OPimRecurrence& rp ) { | 117 | void OPimRecurrenceWidget::setRecurrence( const Opie::OPimRecurrence& rp ) { |
116 | setRecurrence( rp, start ); | 118 | setRecurrence( rp, start ); |
117 | } | 119 | } |
118 | 120 | ||
119 | /** | 121 | /** |
120 | * overloaded method taking OPimRecurrence and a new start date | 122 | * overloaded method taking OPimRecurrence and a new start date |
121 | * @param rp Recurrence rule | 123 | * @param rp Recurrence rule |
122 | * @param date The new start date | 124 | * @param date The new start date |
123 | */ | 125 | */ |
124 | void OPimRecurrenceWidget::setRecurrence( const OPimRecurrence& rp, const QDate& date ) { | 126 | void OPimRecurrenceWidget::setRecurrence( const Opie::OPimRecurrence& rp, const QDate& date ) { |
125 | start = date; | 127 | start = date; |
126 | end = rp.endDate(); | 128 | end = rp.endDate(); |
127 | switch ( rp.type() ) { | 129 | switch ( rp.type() ) { |
128 | default: | 130 | default: |
diff --git a/libopie2/opiepim/ui/opimrecurrencewidget.h b/libopie2/opiepim/ui/opimrecurrencewidget.h index 3f28565..2c315b3 100644 --- a/libopie2/opiepim/ui/opimrecurrencewidget.h +++ b/libopie2/opiepim/ui/opimrecurrencewidget.h | |||
@@ -16,10 +16,8 @@ | |||
16 | #include <qbuttongroup.h> | 16 | #include <qbuttongroup.h> |
17 | 17 | ||
18 | #include "opimrecurrencebase.h" | 18 | #include "opimrecurrencebase.h" |
19 | 19 | ||
20 | using namespace Opie; | ||
21 | |||
22 | /** | 20 | /** |
23 | * A widget to let the user select rules for recurrences. | 21 | * A widget to let the user select rules for recurrences. |
24 | * This widget can take care of weekly, monthly, daily and yearly recurrence | 22 | * This widget can take care of weekly, monthly, daily and yearly recurrence |
25 | * It is used inside todolist and datebook. | 23 | * It is used inside todolist and datebook. |
@@ -36,13 +34,13 @@ public: | |||
36 | const QDate& start, QWidget* parent = 0, | 34 | const QDate& start, QWidget* parent = 0, |
37 | const char* name = 0, bool modal = TRUE, | 35 | const char* name = 0, bool modal = TRUE, |
38 | WFlags fl = 0 ); | 36 | WFlags fl = 0 ); |
39 | OPimRecurrenceWidget( bool startOnMonday, | 37 | OPimRecurrenceWidget( bool startOnMonday, |
40 | const OPimRecurrence& rp, const QDate& start, | 38 | const Opie::OPimRecurrence& rp, const QDate& start, |
41 | QWidget* parent = 0, const char* name =0, | 39 | QWidget* parent = 0, const char* name =0, |
42 | bool modal = TRUE, WFlags = 0 ); | 40 | bool modal = TRUE, WFlags = 0 ); |
43 | ~OPimRecurrenceWidget(); | 41 | ~OPimRecurrenceWidget(); |
44 | OPimRecurrence recurrence()const; | 42 | Opie::OPimRecurrence recurrence()const; |
45 | QDate endDate()const; | 43 | QDate endDate()const; |
46 | 44 | ||
47 | public slots: | 45 | public slots: |
48 | void slotSetRType( int ); | 46 | void slotSetRType( int ); |
@@ -54,10 +52,10 @@ public slots: | |||
54 | * enable/disable end date | 52 | * enable/disable end date |
55 | */ | 53 | */ |
56 | void slotNoEnd( bool unused ); | 54 | void slotNoEnd( bool unused ); |
57 | void setStartDate( const QDate& ); | 55 | void setStartDate( const QDate& ); |
58 | void setRecurrence( const OPimRecurrence& recur, const QDate& start ); | 56 | void setRecurrence( const Opie::OPimRecurrence& recur, const QDate& start ); |
59 | void setRecurrence( const OPimRecurrence& recur ); | 57 | void setRecurrence( const Opie::OPimRecurrence& recur ); |
60 | 58 | ||
61 | private slots: | 59 | private slots: |
62 | void setupRepeatLabel( const QString& ); | 60 | void setupRepeatLabel( const QString& ); |
63 | void setupRepeatLabel( int ); | 61 | void setupRepeatLabel( int ); |