3 files changed, 8 insertions, 8 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d8b427d..901a61a 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -32,9 +32,9 @@
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qhbox.h>
-#include <qtabwidget.h>
+#include <opie/otabwidget.h>
 #include <qdialog.h>
 
 
 struct TodayPlugin {
@@ -259,9 +259,10 @@ void Today::startConfig() {
         // load the config widgets in the tabs
         if ( plugin.guiPart->configWidget( this ) != 0l ) {
             ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3  );
             configWidgetList.append( widget );
-            conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() );
+            conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig()
+                                     , plugin.guiPart->appName() );
         }
         // set the order/activate tab
         conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(),
                               Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) );
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 532d126..04f595b 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -54,11 +54,9 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
 
     setCaption( tr( "Today config" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
-    TabWidget3 = new QTabWidget( this, "TabWidget3" );
-    TabWidget3->setAutoMask( FALSE );
-    TabWidget3->setTabShape( QTabWidget::Rounded );
+    TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
     layout->addWidget( TabWidget3 );
 
     tab_2 = new QWidget( TabWidget3, "tab_2" );
     QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 );
@@ -72,9 +70,9 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
     QVBox *vbox1 = new QVBox( hbox1 );
     new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up",  this , SLOT( moveSelectedUp() ) );
     new ToolButton( vbox1, tr( "Move Down" ),"opieplayer/down", this , SLOT( moveSelectedDown() ) );
     tab2Layout->addWidget( hbox1 );
-    TabWidget3->insertTab( tab_2, tr( "active/order" ) );
+    TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) );
 
     tab_3 = new QWidget( TabWidget3, "tab_3" );
     QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 );
     tab3Layout->setMargin( 20 );
@@ -87,9 +85,9 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
     TimeLabel->setText( tr( "minutes inactive" ) );
     SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" );
     tab3Layout->addWidget( hbox_auto );
     tab3Layout->addWidget( hbox_inactive );
-    TabWidget3->insertTab( tab_3, tr( "Misc" ) );
+    TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
 
     m_applets_changed = false;
 
     connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index d5bdb4b..49cd10f 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -19,8 +19,9 @@
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qlistview.h>
+#include <opie/otabwidget.h>
 
 class QCheckBox;
 class QLabel;
 class QSpinBox;
@@ -33,9 +34,9 @@ class TodayConfig : public QDialog {
 public:
     TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~TodayConfig();
 
-    QTabWidget* TabWidget3;
+    OTabWidget* TabWidget3;
 
     void writeConfig();
     void pluginManagement( QString libName, QString name, QPixmap icon );