8 files changed, 8 insertions, 6 deletions

diff --git a/core/pim/today/config.in b/core/pim/today/config.in
index cdebdcb..5166d15 100644
--- a/core/pim/today/config.in
+++ b/core/pim/today/config.in
@@ -1,4 +1,4 @@
   config TODAY
     boolean "opie-today (today gives an overview of appointments and todos)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIEPIM2
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp
index 974c050..d63bc30 100644
--- a/core/pim/today/main.cpp
+++ b/core/pim/today/main.cpp
@@ -16,9 +16,10 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "today.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Today> )
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 812f8b5..ebcd2dd 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -23,16 +23,17 @@
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/contact.h>
 
 #include <qdir.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
+using namespace Opie::Ui;
 struct TodayPlugin {
     TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
     QLibrary *library;
     QInterfacePtr<TodayPluginInterface> iface;
     TodayPluginObject *guiPart;
     QWidget *guiBox;
     QString name;
     bool active;
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 972731c..89170e1 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -23,17 +23,16 @@
 #include <opie2/todayplugininterface.h>
 #include <opie2/oclickablelabel.h>
 
 #include <qpe/qlibrary.h>
 
 #include <qscrollview.h>
 #include <qvbox.h>
 
-using namespace Opie; 
  
 class QVBoxLayout;
 
 class Today : public TodayBase {
 
     Q_OBJECT
 
   public:
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 7f1915c..cb809d3 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -16,16 +16,17 @@
 
 #include "todaybase.h"
 
 #include <qpe/resource.h>
 
 #include <qvbox.h>
 #include <qwhatsthis.h>
 
+using namespace Opie::Ui;
 TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags )
     : QWidget( parent, name, WStyle_ContextHelp ) {
 
   QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
   QImage  opiezillaimage = QImage( Resource::loadImage("logo/opielogo" ) );
   opiezillaimage = opiezillaimage.smoothScale( 45, 45 );
   QPixmap opiezilla; //the opiezilla
   opiezilla.convertFromImage( opiezillaimage );
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index b737351..6ee9bb2 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -24,33 +24,32 @@
 class QVBox;
 class QGridLayout;
 class QFrame;
 class QLabel;
 class QPushButton;
 class QBoxLayout;
 
 
-using namespace Opie;
 
 
 class TodayBase : public QWidget
 {
     Q_OBJECT
 
 public:
     TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 );
     ~TodayBase();
 
     QFrame* Frame4;
     QPushButton* DatesButton;
     QVBoxLayout* layout;
-    Opie::OClickableLabel* OwnerField;
+    Opie::Ui::OClickableLabel* OwnerField;
     QLabel* Frame;
     QLabel* DateLabel;
     QFrame* Frame15;
     QLabel* Opiezilla;
     QLabel* TodayLabel;
-    OClickableLabel* ConfigButton;
+    Opie::Ui::OClickableLabel* ConfigButton;
 
 };
 
 #endif
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index a6f53e1..4f0877c 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -25,16 +25,17 @@
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
+using namespace Opie::Ui;
 class ToolButton : public QToolButton {
 
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
         : QToolButton( parent, name ) {
         setPixmap( Resource::loadPixmap( icon ) );
         setAutoRaise( TRUE );
         setFocusPolicy( QWidget::NoFocus );
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 3b585c9..2b6c507 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -33,17 +33,17 @@ class QTabWidget;
 class TodayConfig : public QDialog {
 
     Q_OBJECT
 
 public:
     TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE );
     ~TodayConfig();
 
-    OTabWidget* TabWidget3;
+    Opie::Ui::OTabWidget* TabWidget3;
 
     void writeConfig();
     void pluginManagement( QString libName, QString name, QPixmap icon );
 
 
 protected slots:
     void appletChanged();
     void moveSelectedUp();