author | zecke <zecke> | 2004-03-14 20:40:33 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 20:40:33 (UTC) |
commit | b7362708c9d5a1765aa22fdcc87a9b3009cda6b9 (patch) (unidiff) | |
tree | f6dc914fbc7bf86f4fc311bd80aeb1cfb03218de /libopie2 | |
parent | fb19e9dc49a8ed0f1b85fa88ed97d357000955e1 (diff) | |
download | opie-b7362708c9d5a1765aa22fdcc87a9b3009cda6b9.zip opie-b7362708c9d5a1765aa22fdcc87a9b3009cda6b9.tar.gz opie-b7362708c9d5a1765aa22fdcc87a9b3009cda6b9.tar.bz2 |
No using namespace in a public header
-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 | |||
@@ -2,16 +2,18 @@ | |||
2 | #include <qlabel.h> | 2 | #include <qlabel.h> |
3 | #include <qpopupmenu.h> | 3 | #include <qpopupmenu.h> |
4 | #include <qspinbox.h> | 4 | #include <qspinbox.h> |
5 | 5 | ||
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; |
14 | QString strYearTemplate; | 16 | QString strYearTemplate; |
15 | QString strMonthDateTemplate; | 17 | QString strMonthDateTemplate; |
16 | QString strMonthDayTemplate; | 18 | QString strMonthDayTemplate; |
17 | QString strWeekTemplate; | 19 | QString strWeekTemplate; |
@@ -78,17 +80,17 @@ OPimRecurrenceWidget::OPimRecurrenceWidget( bool startOnMonday, | |||
78 | * @param rp Already set OPimRecurrence object | 80 | * @param rp Already set OPimRecurrence object |
79 | * @param startDate The start date | 81 | * @param startDate The start date |
80 | * @param parent The parent widget | 82 | * @param parent The parent widget |
81 | * @param name The name of the object | 83 | * @param name The name of the object |
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 ), |
91 | end( rp.endDate() ), | 93 | end( rp.endDate() ), |
92 | startWeekOnMonday( startOnMonday ) | 94 | startWeekOnMonday( startOnMonday ) |
93 | { | 95 | { |
94 | if (strDayTemplate.isEmpty() ) | 96 | if (strDayTemplate.isEmpty() ) |
@@ -107,26 +109,26 @@ OPimRecurrenceWidget::~OPimRecurrenceWidget() { | |||
107 | */ | 109 | */ |
108 | void OPimRecurrenceWidget::setStartDate( const QDate& date ) { | 110 | void OPimRecurrenceWidget::setStartDate( const QDate& date ) { |
109 | setRecurrence( recurrence(), date ); | 111 | setRecurrence( recurrence(), date ); |
110 | } | 112 | } |
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: |
129 | case OPimRecurrence::NoRepeat: | 131 | case OPimRecurrence::NoRepeat: |
130 | currInterval = None; | 132 | currInterval = None; |
131 | setupNone(); | 133 | setupNone(); |
132 | break; | 134 | break; |
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 | |||
@@ -12,18 +12,16 @@ | |||
12 | #include <qlist.h> | 12 | #include <qlist.h> |
13 | #include <qtoolbutton.h> | 13 | #include <qtoolbutton.h> |
14 | #include <qcheckbox.h> | 14 | #include <qcheckbox.h> |
15 | #include <qdatetime.h> | 15 | #include <qdatetime.h> |
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. |
26 | * | 24 | * |
27 | * | 25 | * |
28 | * @short Widget of selecting Recurrance | 26 | * @short Widget of selecting Recurrance |
29 | * @author Trolltech, Holger Freyther | 27 | * @author Trolltech, Holger Freyther |
@@ -32,36 +30,36 @@ using namespace Opie; | |||
32 | class OPimRecurrenceWidget : public OPimRecurrenceBase { | 30 | class OPimRecurrenceWidget : public OPimRecurrenceBase { |
33 | Q_OBJECT | 31 | Q_OBJECT |
34 | public: | 32 | public: |
35 | OPimRecurrenceWidget( bool startOnMonday, | 33 | OPimRecurrenceWidget( bool startOnMonday, |
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 ); |
49 | /** | 47 | /** |
50 | * set the new end date | 48 | * set the new end date |
51 | */ | 49 | */ |
52 | void endDateChanged( int, int, int ); | 50 | void endDateChanged( int, int, int ); |
53 | /** | 51 | /** |
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 ); |
64 | void slotWeekLabel(); | 62 | void slotWeekLabel(); |
65 | void slotMonthLabel( int ); | 63 | void slotMonthLabel( int ); |
66 | void slotChangeStartOfWeek( bool onMonday ); | 64 | void slotChangeStartOfWeek( bool onMonday ); |
67 | 65 | ||