summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimrecurrencewidget.cpp8
-rw-r--r--libopie2/opiepim/ui/opimrecurrencewidget.h10
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
@@ -7,6 +7,8 @@
7 7
8#include "opimrecurrencewidget.h" 8#include "opimrecurrencewidget.h"
9 9
10
11using 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
12namespace { 14namespace {
@@ -83,7 +85,7 @@ OPimRecurrenceWidget::OPimRecurrenceWidget( bool startOnMonday,
83 * @param fl The flags for window 85 * @param fl The flags for window
84 */ 86 */
85OPimRecurrenceWidget::OPimRecurrenceWidget( bool startOnMonday, 87OPimRecurrenceWidget::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 ),
@@ -112,7 +114,7 @@ void OPimRecurrenceWidget::setStartDate( const QDate& date ) {
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 */
115void OPimRecurrenceWidget::setRecurrence( const OPimRecurrence& rp ) { 117void OPimRecurrenceWidget::setRecurrence( const Opie::OPimRecurrence& rp ) {
116 setRecurrence( rp, start ); 118 setRecurrence( rp, start );
117} 119}
118 120
@@ -121,7 +123,7 @@ void OPimRecurrenceWidget::setRecurrence( const OPimRecurrence& rp ) {
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 */
124void OPimRecurrenceWidget::setRecurrence( const OPimRecurrence& rp, const QDate& date ) { 126void 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() ) {
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
@@ -17,8 +17,6 @@
17 17
18#include "opimrecurrencebase.h" 18#include "opimrecurrencebase.h"
19 19
20using 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
@@ -37,11 +35,11 @@ public:
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
47public slots: 45public slots:
@@ -55,8 +53,8 @@ public slots:
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
61private slots: 59private slots:
62 void setupRepeatLabel( const QString& ); 60 void setupRepeatLabel( const QString& );