author | alwin <alwin> | 2004-03-02 14:00:39 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-02 14:00:39 (UTC) |
commit | 12dd57c04b42d4517061ed847b1aa041dd8af841 (patch) (unidiff) | |
tree | afbd18d5b439138256d27aecec7ef993d74a0bd7 /core/pim/todo | |
parent | ac3e7c0a1ccbb984f06917ebe6156b1681b7de7f (diff) | |
download | opie-12dd57c04b42d4517061ed847b1aa041dd8af841.zip opie-12dd57c04b42d4517061ed847b1aa041dd8af841.tar.gz opie-12dd57c04b42d4517061ed847b1aa041dd8af841.tar.bz2 |
fixed up todlist to work again. The segfault resulted due a real ugly code-style:
Never, realy never, use "using namespace <...>" inside a include file.
Ever use "Opie::<class>" or such inside include files. Think twice, before using
a "use namespace <...>" inside a c++ file. If you're using it just 3,4 times,
write "Opie::<class>::<variable>" or such. If you just simple write a using
namespace all the time it makes the idea of namespaces obsolete. Mostly: just
integrate your OWN namespace (in that case use namespace Todo;) - but try
to use all other namespaces the explicit way - so you will sure that the compiler
inherits the right methods.
ToDo: write this statement into the developer wiki
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.h | 8 | ||||
-rw-r--r-- | core/pim/todo/quickeditimpl.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index a244e58..c2f422d 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -43,49 +43,49 @@ | |||
43 | 43 | ||
44 | #include <qmenubar.h> | 44 | #include <qmenubar.h> |
45 | #include <qmessagebox.h> | 45 | #include <qmessagebox.h> |
46 | #include <qpushbutton.h> | 46 | #include <qpushbutton.h> |
47 | #include <qaction.h> | 47 | #include <qaction.h> |
48 | #include <qtimer.h> | 48 | #include <qtimer.h> |
49 | #include <qlayout.h> | 49 | #include <qlayout.h> |
50 | #include <qwhatsthis.h> | 50 | #include <qwhatsthis.h> |
51 | 51 | ||
52 | #include "quickeditimpl.h" | 52 | #include "quickeditimpl.h" |
53 | #include "todotemplatemanager.h" | 53 | #include "todotemplatemanager.h" |
54 | #include "templateeditor.h" | 54 | #include "templateeditor.h" |
55 | #include "tableview.h" | 55 | #include "tableview.h" |
56 | 56 | ||
57 | #include "textviewshow.h" | 57 | #include "textviewshow.h" |
58 | #include "todoeditor.h" | 58 | #include "todoeditor.h" |
59 | #include "mainwindow.h" | 59 | #include "mainwindow.h" |
60 | 60 | ||
61 | OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> ) | 61 | OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> ) |
62 | 62 | ||
63 | using namespace Todo; | 63 | using namespace Todo; |
64 | 64 | ||
65 | MainWindow::MainWindow( QWidget* parent, | 65 | MainWindow::MainWindow( QWidget* parent, |
66 | const char* name, WFlags ) | 66 | const char* name, WFlags ) |
67 | : OPimMainWindow( "Todolist", parent, name, WType_TopLevel | WStyle_ContextHelp ) | 67 | : Opie::OPimMainWindow( "Todolist", parent, name, WType_TopLevel | WStyle_ContextHelp ) |
68 | { | 68 | { |
69 | if (!name) | 69 | if (!name) |
70 | setName("todo window"); | 70 | setName("todo window"); |
71 | 71 | ||
72 | m_syncing = false; | 72 | m_syncing = false; |
73 | m_showing = false; | 73 | m_showing = false; |
74 | m_counter = 0; | 74 | m_counter = 0; |
75 | m_tempManager = new TemplateManager(); | 75 | m_tempManager = new TemplateManager(); |
76 | m_tempManager->load(); | 76 | m_tempManager->load(); |
77 | 77 | ||
78 | initUI(); | 78 | initUI(); |
79 | initConfig(); | 79 | initConfig(); |
80 | initViews(); | 80 | initViews(); |
81 | initActions(); | 81 | initActions(); |
82 | initEditor(); | 82 | initEditor(); |
83 | initShow(); | 83 | initShow(); |
84 | initTemplate(); | 84 | initTemplate(); |
85 | 85 | ||
86 | populateTemplates(); | 86 | populateTemplates(); |
87 | raiseCurrentView(); | 87 | raiseCurrentView(); |
88 | QTimer::singleShot(0, this, SLOT(populateCategories() ) ); | 88 | QTimer::singleShot(0, this, SLOT(populateCategories() ) ); |
89 | } | 89 | } |
90 | void MainWindow::initTemplate() { | 90 | void MainWindow::initTemplate() { |
91 | m_curTempEd = new TemplateEditor( this, templateManager() ); | 91 | m_curTempEd = new TemplateEditor( this, templateManager() ); |
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h index 6a7296b..b35a42b 100644 --- a/core/pim/todo/mainwindow.h +++ b/core/pim/todo/mainwindow.h | |||
@@ -28,59 +28,57 @@ | |||
28 | 28 | ||
29 | #ifndef TODO_MAIN_WINDOW_H | 29 | #ifndef TODO_MAIN_WINDOW_H |
30 | #define TODO_MAIN_WINDOW_H | 30 | #define TODO_MAIN_WINDOW_H |
31 | 31 | ||
32 | #include <qlist.h> | 32 | #include <qlist.h> |
33 | 33 | ||
34 | #include <opie2/otodoaccess.h> | 34 | #include <opie2/otodoaccess.h> |
35 | #include <opie2/opimtodo.h> | 35 | #include <opie2/opimtodo.h> |
36 | #include <opie2/opimmainwindow.h> | 36 | #include <opie2/opimmainwindow.h> |
37 | #include <opie2/owidgetstack.h> | 37 | #include <opie2/owidgetstack.h> |
38 | 38 | ||
39 | #include "smalltodo.h" | 39 | #include "smalltodo.h" |
40 | #include "todoview.h" | 40 | #include "todoview.h" |
41 | #include "quickedit.h" | 41 | #include "quickedit.h" |
42 | #include "todomanager.h" | 42 | #include "todomanager.h" |
43 | 43 | ||
44 | class QPopupMenu; | 44 | class QPopupMenu; |
45 | class QMenuBar; | 45 | class QMenuBar; |
46 | class QToolBar; | 46 | class QToolBar; |
47 | class QAction; | 47 | class QAction; |
48 | class Ir; | 48 | class Ir; |
49 | class QVBox; | 49 | class QVBox; |
50 | class QLineEdit; | 50 | class QLineEdit; |
51 | 51 | ||
52 | using namespace Opie; | ||
53 | |||
54 | namespace Todo { | 52 | namespace Todo { |
55 | typedef TodoView View; | 53 | typedef TodoView View; |
56 | class TemplateManager; | 54 | class TemplateManager; |
57 | class Editor; | 55 | class Editor; |
58 | class TodoShow; | 56 | class TodoShow; |
59 | class TemplateEditor; | 57 | class TemplateEditor; |
60 | struct QuickEditBase; | 58 | struct QuickEditBase; |
61 | 59 | ||
62 | class MainWindow : public OPimMainWindow { | 60 | class MainWindow : public Opie::OPimMainWindow { |
63 | Q_OBJECT | 61 | Q_OBJECT |
64 | friend class TodoView; // avoid QObject here.... | 62 | friend class TodoView; // avoid QObject here.... |
65 | friend class TodoShow; // avoid QObject | 63 | friend class TodoShow; // avoid QObject |
66 | public: | 64 | public: |
67 | /* OApplicationFactory application Name */ | 65 | /* OApplicationFactory application Name */ |
68 | static QString appName() { return QString::fromLatin1("todolist"); } | 66 | static QString appName() { return QString::fromLatin1("todolist"); } |
69 | 67 | ||
70 | MainWindow( QWidget *parent = 0, | 68 | MainWindow( QWidget *parent = 0, |
71 | const char* name = 0, WFlags fl = 0 ); | 69 | const char* name = 0, WFlags fl = 0 ); |
72 | ~MainWindow(); | 70 | ~MainWindow(); |
73 | 71 | ||
74 | /** return a context menu for an OPimTodo */ | 72 | /** return a context menu for an OPimTodo */ |
75 | QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); | 73 | QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); |
76 | QPopupMenu* options(); | 74 | QPopupMenu* options(); |
77 | QPopupMenu* edit(); | 75 | QPopupMenu* edit(); |
78 | QToolBar* toolbar(); | 76 | QToolBar* toolbar(); |
79 | 77 | ||
80 | 78 | ||
81 | void updateList(); | 79 | void updateList(); |
82 | OPimTodoAccess::List list()const; | 80 | OPimTodoAccess::List list()const; |
83 | OPimTodoAccess::List sorted( bool asc, int sortOrder ); | 81 | OPimTodoAccess::List sorted( bool asc, int sortOrder ); |
84 | OPimTodoAccess::List sorted( bool asc, int sortOrder, int addFilter ); | 82 | OPimTodoAccess::List sorted( bool asc, int sortOrder, int addFilter ); |
85 | 83 | ||
86 | OPimTodo event(int uid ); | 84 | OPimTodo event(int uid ); |
@@ -123,49 +121,49 @@ private slots: | |||
123 | void raiseCurrentView(); | 121 | void raiseCurrentView(); |
124 | ViewBase* currentView(); | 122 | ViewBase* currentView(); |
125 | ViewBase* m_curView; | 123 | ViewBase* m_curView; |
126 | bool m_showing : 1; // used to see if we show a todo in the cases we shouldn't change the table | 124 | bool m_showing : 1; // used to see if we show a todo in the cases we shouldn't change the table |
127 | QuickEditBase* m_curQuick; | 125 | QuickEditBase* m_curQuick; |
128 | Editor* m_curEdit; | 126 | Editor* m_curEdit; |
129 | TodoShow* currentShow(); | 127 | TodoShow* currentShow(); |
130 | TodoShow* m_curShow; | 128 | TodoShow* m_curShow; |
131 | TemplateEditor* currentTemplateEditor(); | 129 | TemplateEditor* currentTemplateEditor(); |
132 | TemplateEditor* m_curTempEd; | 130 | TemplateEditor* m_curTempEd; |
133 | 131 | ||
134 | QMenuBar* m_bar; | 132 | QMenuBar* m_bar; |
135 | QToolBar* m_tool; | 133 | QToolBar* m_tool; |
136 | QAction* m_editAction, | 134 | QAction* m_editAction, |
137 | *m_deleteAction, | 135 | *m_deleteAction, |
138 | *m_findAction, | 136 | *m_findAction, |
139 | *m_completedAction, | 137 | *m_completedAction, |
140 | *m_showDeadLineAction, | 138 | *m_showDeadLineAction, |
141 | *m_deleteAllAction, | 139 | *m_deleteAllAction, |
142 | *m_deleteCompleteAction, | 140 | *m_deleteCompleteAction, |
143 | *m_duplicateAction, | 141 | *m_duplicateAction, |
144 | *m_showOverDueAction, | 142 | *m_showOverDueAction, |
145 | *m_showQuickTaskAction, | 143 | *m_showQuickTaskAction, |
146 | *m_effectiveAction; | 144 | *m_effectiveAction; |
147 | OWidgetStack *m_stack; | 145 | Opie::OWidgetStack *m_stack; |
148 | QPopupMenu* m_catMenu, | 146 | QPopupMenu* m_catMenu, |
149 | *m_edit, | 147 | *m_edit, |
150 | *m_options, | 148 | *m_options, |
151 | *m_template; | 149 | *m_template; |
152 | 150 | ||
153 | bool m_syncing:1; | 151 | bool m_syncing:1; |
154 | bool m_deadline:1; | 152 | bool m_deadline:1; |
155 | bool m_completed:1; | 153 | bool m_completed:1; |
156 | bool m_overdue:1; | 154 | bool m_overdue:1; |
157 | bool m_quicktask:1; | 155 | bool m_quicktask:1; |
158 | TodoManager m_todoMgr; | 156 | TodoManager m_todoMgr; |
159 | QString m_curCat; | 157 | QString m_curCat; |
160 | QList<ViewBase> m_views; | 158 | QList<ViewBase> m_views; |
161 | uint m_counter; | 159 | uint m_counter; |
162 | TemplateManager* m_tempManager; | 160 | TemplateManager* m_tempManager; |
163 | 161 | ||
164 | 162 | ||
165 | private slots: | 163 | private slots: |
166 | void slotShow(int); | 164 | void slotShow(int); |
167 | void slotEdit(int); | 165 | void slotEdit(int); |
168 | void slotUpdate3( QWidget* ); | 166 | void slotUpdate3( QWidget* ); |
169 | void slotComplete( int uid ); | 167 | void slotComplete( int uid ); |
170 | void slotComplete( const OPimTodo& ev ); | 168 | void slotComplete( const OPimTodo& ev ); |
171 | void slotNewFromTemplate(int id ); | 169 | void slotNewFromTemplate(int id ); |
@@ -184,30 +182,30 @@ private slots: | |||
184 | 182 | ||
185 | void slotShowDeadLine( bool ); | 183 | void slotShowDeadLine( bool ); |
186 | void slotShowCompleted( bool ); | 184 | void slotShowCompleted( bool ); |
187 | void slotShowQuickTask( bool ); | 185 | void slotShowQuickTask( bool ); |
188 | 186 | ||
189 | void setDocument( const QString& ); | 187 | void setDocument( const QString& ); |
190 | 188 | ||
191 | 189 | ||
192 | void slotBeam(); | 190 | void slotBeam(); |
193 | void beamDone( Ir* ); | 191 | void beamDone( Ir* ); |
194 | void slotShowDetails(); | 192 | void slotShowDetails(); |
195 | void slotShowNext(); | 193 | void slotShowNext(); |
196 | void slotShowPrev(); | 194 | void slotShowPrev(); |
197 | void slotShowDue( bool ); | 195 | void slotShowDue( bool ); |
198 | void slotReturnFromView(); // for TodoShow... | 196 | void slotReturnFromView(); // for TodoShow... |
199 | /* reimplementation from opimmainwindow */ | 197 | /* reimplementation from opimmainwindow */ |
200 | protected slots: | 198 | protected slots: |
201 | void flush(); | 199 | void flush(); |
202 | void reload(); | 200 | void reload(); |
203 | int create(); | 201 | int create(); |
204 | bool remove( int uid ); | 202 | bool remove( int uid ); |
205 | void beam(int uid); | 203 | void beam(int uid); |
206 | void show( int uid ); | 204 | void show( int uid ); |
207 | void edit( int uid ); | 205 | void edit( int uid ); |
208 | void add( const OPimRecord& ); | 206 | void add( const Opie::OPimRecord& ); |
209 | void doAlarm( const QDateTime& dt, int uid ); | 207 | void doAlarm( const QDateTime& dt, int uid ); |
210 | }; | 208 | }; |
211 | } | 209 | } |
212 | 210 | ||
213 | #endif | 211 | #endif |
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp index cd0684f..94ae97e 100644 --- a/core/pim/todo/quickeditimpl.cpp +++ b/core/pim/todo/quickeditimpl.cpp | |||
@@ -1,48 +1,48 @@ | |||
1 | #include <qaction.h> | 1 | #include <qaction.h> |
2 | #include <qlineedit.h> | 2 | #include <qlineedit.h> |
3 | #include <qwhatsthis.h> | 3 | #include <qwhatsthis.h> |
4 | 4 | ||
5 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
6 | 6 | ||
7 | #include <opie2/oclickablelabel.h> | 7 | #include <opie2/oclickablelabel.h> |
8 | 8 | ||
9 | #include "mainwindow.h" | 9 | #include "mainwindow.h" |
10 | #include "quickeditimpl.h" | 10 | #include "quickeditimpl.h" |
11 | 11 | ||
12 | 12 | ||
13 | QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | 13 | QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) |
14 | : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { | 14 | : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { |
15 | setHorizontalStretchable( TRUE ); | 15 | setHorizontalStretchable( TRUE ); |
16 | 16 | ||
17 | // Load priority icons | 17 | // Load priority icons |
18 | // TODO - probably should be done globally somewhere else, | 18 | // TODO - probably should be done globally somewhere else, |
19 | // see also tableview.cpp/h, taskeditoroverview.cpp/h | 19 | // see also tableview.cpp/h, taskeditoroverview.cpp/h |
20 | priority1 = Resource::loadPixmap( "todo/priority1" ); | 20 | priority1 = Resource::loadPixmap( "todo/priority1" ); |
21 | priority3 = Resource::loadPixmap( "todo/priority3" ); | 21 | priority3 = Resource::loadPixmap( "todo/priority3" ); |
22 | priority5 = Resource::loadPixmap( "todo/priority5" ); | 22 | priority5 = Resource::loadPixmap( "todo/priority5" ); |
23 | 23 | ||
24 | m_lbl = new OClickableLabel( this ); | 24 | m_lbl = new Opie::OClickableLabel( this ); |
25 | m_lbl->setMinimumWidth( 15 ); | 25 | m_lbl->setMinimumWidth( 15 ); |
26 | m_lbl->setPixmap( priority3 ); | 26 | m_lbl->setPixmap( priority3 ); |
27 | connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) ); | 27 | connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) ); |
28 | QWhatsThis::add( m_lbl, QWidget::tr( "Click here to set the priority of new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | 28 | QWhatsThis::add( m_lbl, QWidget::tr( "Click here to set the priority of new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); |
29 | 29 | ||
30 | m_edit = new QLineEdit( this ); | 30 | m_edit = new QLineEdit( this ); |
31 | setStretchableWidget( m_edit ); | 31 | setStretchableWidget( m_edit ); |
32 | QWhatsThis::add( m_edit, QWidget::tr( "Enter description of new task here.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | 32 | QWhatsThis::add( m_edit, QWidget::tr( "Enter description of new task here.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); |
33 | 33 | ||
34 | /* | 34 | /* |
35 | * it's not implemented and won't be implemented for 1.0 | 35 | * it's not implemented and won't be implemented for 1.0 |
36 | */ | 36 | */ |
37 | #if 0 | 37 | #if 0 |
38 | QAction *a = new QAction( QWidget::tr( "More" ), Resource::loadPixmap( "todo/more" ), QString::null, 0, this, 0 ); | 38 | QAction *a = new QAction( QWidget::tr( "More" ), Resource::loadPixmap( "todo/more" ), QString::null, 0, this, 0 ); |
39 | connect( a, SIGNAL( activated() ), this, SLOT( slotMore() ) ); | 39 | connect( a, SIGNAL( activated() ), this, SLOT( slotMore() ) ); |
40 | a->addTo( this ); | 40 | a->addTo( this ); |
41 | a->setWhatsThis( QWidget::tr( "Click here to enter additional information for new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | 41 | a->setWhatsThis( QWidget::tr( "Click here to enter additional information for new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | QAction *a = new QAction( QWidget::tr( "Enter" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 ); | 44 | QAction *a = new QAction( QWidget::tr( "Enter" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 ); |
45 | connect( a, SIGNAL( activated() ), this, SLOT( slotEnter() ) ); | 45 | connect( a, SIGNAL( activated() ), this, SLOT( slotEnter() ) ); |
46 | a->addTo( this ); | 46 | a->addTo( this ); |
47 | a->setWhatsThis( QWidget::tr( "Click here to add new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | 47 | a->setWhatsThis( QWidget::tr( "Click here to add new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); |
48 | 48 | ||