From cbb87c7c24dfe46462602c73b10bd76ce81a3baf Mon Sep 17 00:00:00 2001 From: zecke Date: Sun, 14 Mar 2004 19:20:59 +0000 Subject: Make use of ODP namespace --- 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 @@ #include "todoeditor.h" #include "mainwindow.h" +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory ) + using namespace Opie; using namespace Todo; MainWindow::MainWindow( QWidget* parent, @@ -220,7 +222,7 @@ void MainWindow::initConfig() { } void MainWindow::initUI() { - m_stack = new OWidgetStack(this, "main stack"); + m_stack = new Opie::Ui::OWidgetStack(this, "main stack"); setCentralWidget( m_stack ); 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 { friend class TodoView; // avoid QObject here.... friend class TodoShow; // avoid QObject public: - /* OApplicationFactory application Name */ + /* Opie::Core::OApplicationFactory application Name */ static QString appName() { return QString::fromLatin1("todolist"); } MainWindow( QWidget *parent = 0, @@ -142,7 +142,7 @@ private slots: *m_showOverDueAction, *m_showQuickTaskAction, *m_effectiveAction; - Opie::OWidgetStack *m_stack; + Opie::Ui::OWidgetStack *m_stack; QPopupMenu* m_catMenu, *m_edit, *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 @@ #include "otaskeditor.h" +using namespace Opie::Ui; OTaskEditor::OTaskEditor(int cur) : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) { 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: void load( const OPimTodo& ); void init(); - OTabWidget *m_tab; + Opie::Ui::OTabWidget *m_tab; TaskEditorOverView *m_overView; TaskEditorStatus *m_stat; 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 @@ #include "quickeditimpl.h" + QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { setHorizontalStretchable( TRUE ); @@ -21,7 +22,7 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) priority3 = Resource::loadPixmap( "todo/priority3" ); priority5 = Resource::loadPixmap( "todo/priority5" ); - m_lbl = new Opie::OClickableLabel( this ); + m_lbl = new Opie::Ui::OClickableLabel( this ); m_lbl->setMinimumWidth( 15 ); m_lbl->setPixmap( priority3 ); 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 @@ #include +using namespace Opie::Ui; class AlarmItem : public QListViewItem { public: AlarmItem( QListView*, const OPimAlarm& ); -- cgit v0.9.0.2