summaryrefslogtreecommitdiff
authoralwin <alwin>2004-03-02 14:00:39 (UTC)
committer alwin <alwin>2004-03-02 14:00:39 (UTC)
commit12dd57c04b42d4517061ed847b1aa041dd8af841 (patch) (unidiff)
treeafbd18d5b439138256d27aecec7ef993d74a0bd7
parentac3e7c0a1ccbb984f06917ebe6156b1681b7de7f (diff)
downloadopie-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
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp2
-rw-r--r--core/pim/todo/mainwindow.h8
-rw-r--r--core/pim/todo/quickeditimpl.cpp2
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
@@ -64,7 +64,7 @@ using namespace Todo;
64 64
65MainWindow::MainWindow( QWidget* parent, 65MainWindow::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");
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
@@ -49,8 +49,6 @@ class Ir;
49class QVBox; 49class QVBox;
50class QLineEdit; 50class QLineEdit;
51 51
52using namespace Opie;
53
54namespace Todo { 52namespace Todo {
55 typedef TodoView View; 53 typedef TodoView View;
56 class TemplateManager; 54 class TemplateManager;
@@ -59,7 +57,7 @@ namespace Todo {
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
@@ -144,7 +142,7 @@ private slots:
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,
@@ -205,7 +203,7 @@ private slots:
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}
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
@@ -21,7 +21,7 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
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()) );