summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 20:40:33 (UTC)
committer zecke <zecke>2004-03-14 20:40:33 (UTC)
commitb7362708c9d5a1765aa22fdcc87a9b3009cda6b9 (patch) (unidiff)
treef6dc914fbc7bf86f4fc311bd80aeb1cfb03218de
parentfb19e9dc49a8ed0f1b85fa88ed97d357000955e1 (diff)
downloadopie-b7362708c9d5a1765aa22fdcc87a9b3009cda6b9.zip
opie-b7362708c9d5a1765aa22fdcc87a9b3009cda6b9.tar.gz
opie-b7362708c9d5a1765aa22fdcc87a9b3009cda6b9.tar.bz2
No using namespace in a public header
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
@@ -1,21 +1,23 @@
1#include <qapplication.h> 1#include <qapplication.h>
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
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 {
13QString strDayTemplate; 15QString strDayTemplate;
14QString strYearTemplate; 16QString strYearTemplate;
15QString strMonthDateTemplate; 17QString strMonthDateTemplate;
16QString strMonthDayTemplate; 18QString strMonthDayTemplate;
17QString strWeekTemplate; 19QString strWeekTemplate;
18QString dayLabel[7]; 20QString dayLabel[7];
19} 21}
20 22
21/* 23/*
@@ -74,25 +76,25 @@ OPimRecurrenceWidget::OPimRecurrenceWidget( bool startOnMonday,
74 76
75/** 77/**
76 * Different constructor 78 * Different constructor
77 * @param startOnMonday Does the week start on monday? 79 * @param startOnMonday Does the week start on monday?
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 */
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 ),
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() )
95 fillStrings(); 97 fillStrings();
96 // do some stuff with the repeat pattern 98 // do some stuff with the repeat pattern
97 init(); 99 init();
98 setRecurrence( rp ); 100 setRecurrence( rp );
@@ -103,34 +105,34 @@ OPimRecurrenceWidget::~OPimRecurrenceWidget() {
103 105
104/** 106/**
105 * set the start date 107 * set the start date
106 * @param date the new start date 108 * @param date the new start date
107 */ 109 */
108void OPimRecurrenceWidget::setStartDate( const QDate& date ) { 110void 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 */
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
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 */
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() ) {
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;
133 case OPimRecurrence::Daily: 135 case OPimRecurrence::Daily:
134 currInterval = Day; 136 currInterval = Day;
135 setupDaily(); 137 setupDaily();
136 break; 138 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
@@ -8,64 +8,62 @@
8#include <opie2/opimrecurrence.h> 8#include <opie2/opimrecurrence.h>
9 9
10#include <qpe/datebookmonth.h> 10#include <qpe/datebookmonth.h>
11 11
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
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
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
30 * @version 0.9 28 * @version 0.9
31 */ 29 */
32class OPimRecurrenceWidget : public OPimRecurrenceBase { 30class OPimRecurrenceWidget : public OPimRecurrenceBase {
33 Q_OBJECT 31 Q_OBJECT
34public: 32public:
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
47public slots: 45public 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
61private slots: 59private 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
68private: 66private:
69 void setupNone(); 67 void setupNone();
70 void setupDaily(); 68 void setupDaily();
71 void setupWeekly(); 69 void setupWeekly();