summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp4
-rw-r--r--core/pim/todo/mainwindow.h4
-rw-r--r--core/pim/todo/otaskeditor.cpp1
-rw-r--r--core/pim/todo/otaskeditor.h2
-rw-r--r--core/pim/todo/quickeditimpl.cpp3
-rw-r--r--core/pim/todo/taskeditoralarms.cpp1
6 files changed, 10 insertions, 5 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index c2f422d..f0642c4 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -58,8 +58,10 @@
58#include "todoeditor.h" 58#include "todoeditor.h"
59#include "mainwindow.h" 59#include "mainwindow.h"
60 60
61using namespace Opie::Core;
61OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> ) 62OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> )
62 63
64 using namespace Opie;
63using namespace Todo; 65using namespace Todo;
64 66
65MainWindow::MainWindow( QWidget* parent, 67MainWindow::MainWindow( QWidget* parent,
@@ -220,7 +222,7 @@ void MainWindow::initConfig() {
220} 222}
221void MainWindow::initUI() { 223void MainWindow::initUI() {
222 224
223 m_stack = new OWidgetStack(this, "main stack"); 225 m_stack = new Opie::Ui::OWidgetStack(this, "main stack");
224 226
225 setCentralWidget( m_stack ); 227 setCentralWidget( m_stack );
226 228
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index b35a42b..f0d6a42 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -62,7 +62,7 @@ namespace Todo {
62 friend class TodoView; // avoid QObject here.... 62 friend class TodoView; // avoid QObject here....
63 friend class TodoShow; // avoid QObject 63 friend class TodoShow; // avoid QObject
64 public: 64 public:
65 /* OApplicationFactory application Name */ 65 /* Opie::Core::OApplicationFactory application Name */
66 static QString appName() { return QString::fromLatin1("todolist"); } 66 static QString appName() { return QString::fromLatin1("todolist"); }
67 67
68 MainWindow( QWidget *parent = 0, 68 MainWindow( QWidget *parent = 0,
@@ -142,7 +142,7 @@ private slots:
142 *m_showOverDueAction, 142 *m_showOverDueAction,
143 *m_showQuickTaskAction, 143 *m_showQuickTaskAction,
144 *m_effectiveAction; 144 *m_effectiveAction;
145 Opie::OWidgetStack *m_stack; 145 Opie::Ui::OWidgetStack *m_stack;
146 QPopupMenu* m_catMenu, 146 QPopupMenu* m_catMenu,
147 *m_edit, 147 *m_edit,
148 *m_options, 148 *m_options,
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index d1e50f7..f0128bc 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -6,6 +6,7 @@
6 6
7#include "otaskeditor.h" 7#include "otaskeditor.h"
8 8
9using namespace Opie::Ui;
9OTaskEditor::OTaskEditor(int cur) 10OTaskEditor::OTaskEditor(int cur)
10 : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) { 11 : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
11 init(); 12 init();
diff --git a/core/pim/todo/otaskeditor.h b/core/pim/todo/otaskeditor.h
index 7068df8..4a00018 100644
--- a/core/pim/todo/otaskeditor.h
+++ b/core/pim/todo/otaskeditor.h
@@ -31,7 +31,7 @@ private:
31 void load( const OPimTodo& ); 31 void load( const OPimTodo& );
32 void init(); 32 void init();
33 33
34 OTabWidget *m_tab; 34 Opie::Ui::OTabWidget *m_tab;
35 TaskEditorOverView *m_overView; 35 TaskEditorOverView *m_overView;
36 TaskEditorStatus *m_stat; 36 TaskEditorStatus *m_stat;
37 TaskEditorAlarms *m_alarm; 37 TaskEditorAlarms *m_alarm;
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp
index 94ae97e..90ad19e 100644
--- a/core/pim/todo/quickeditimpl.cpp
+++ b/core/pim/todo/quickeditimpl.cpp
@@ -10,6 +10,7 @@
10#include "quickeditimpl.h" 10#include "quickeditimpl.h"
11 11
12 12
13
13QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) 14QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
14 : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { 15 : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) {
15 setHorizontalStretchable( TRUE ); 16 setHorizontalStretchable( TRUE );
@@ -21,7 +22,7 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
21 priority3 = Resource::loadPixmap( "todo/priority3" ); 22 priority3 = Resource::loadPixmap( "todo/priority3" );
22 priority5 = Resource::loadPixmap( "todo/priority5" ); 23 priority5 = Resource::loadPixmap( "todo/priority5" );
23 24
24 m_lbl = new Opie::OClickableLabel( this ); 25 m_lbl = new Opie::Ui::OClickableLabel( this );
25 m_lbl->setMinimumWidth( 15 ); 26 m_lbl->setMinimumWidth( 15 );
26 m_lbl->setPixmap( priority3 ); 27 m_lbl->setPixmap( priority3 );
27 connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) ); 28 connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) );
diff --git a/core/pim/todo/taskeditoralarms.cpp b/core/pim/todo/taskeditoralarms.cpp
index a512fb0..62fc600 100644
--- a/core/pim/todo/taskeditoralarms.cpp
+++ b/core/pim/todo/taskeditoralarms.cpp
@@ -38,6 +38,7 @@
38#include <qlayout.h> 38#include <qlayout.h>
39 39
40 40
41using namespace Opie::Ui;
41class AlarmItem : public QListViewItem { 42class AlarmItem : public QListViewItem {
42public: 43public:
43 AlarmItem( QListView*, const OPimAlarm& ); 44 AlarmItem( QListView*, const OPimAlarm& );