2 files changed, 13 insertions, 11 deletions

diff --git a/core/pim/today/config.in b/core/pim/today/config.in
index c4377e4..c663fc1 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 ) && LIBOPIE2UI && LIBOPIE2PIM
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index ebcd2dd..3ddb88d 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -5,32 +5,34 @@
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #define QTOPIA_INTERNAL_LANGLIST
 
 #include "today.h"
 
+#include <opie2/odebug.h>
+
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #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;
@@ -175,65 +177,65 @@ void Today::loadPlugins() {
     init();
 
     QValueList<TodayPlugin>::Iterator tit;
     if ( !pluginList.isEmpty() ) {
         for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
             (*tit).guiBox->hide();
             (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) );
             delete (*tit).guiBox;
             (*tit).library->unload();
             delete (*tit).library;
         }
         pluginList.clear();
     }
 
     QString path = QPEApplication::qpeDir() + "/plugins/today";
 #ifdef Q_OS_MACX
-    qWarning("Searching for Plugins in: %s", path.latin1());
+        Opie::Core::owarn << "Searching for Plugins in: " << path << oendl;
     QDir dir( path, "lib*.dylib" );
 #else
     QDir dir( path, "lib*.so" );
 #endif
 
     QStringList list = dir.entryList();
     QStringList::Iterator it;
 
     //   QMap<QString, TodayPlugin> tempList;
 
     for ( it = list.begin(); it != list.end(); ++it ) {
         QInterfacePtr<TodayPluginInterface> iface;
         QLibrary *lib = new QLibrary( path + "/" + *it );
 
-        qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
+                Opie::Core::odebug << "querying: " << path + "/" + *it << oendl;
         if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
-            qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() );
-            qDebug( QString(*it) );
+                        Opie::Core::odebug << "accepted: " << path + "/" + *it << oendl;
+                        Opie::Core::odebug << *it << oendl;
 
             TodayPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it);
 
             QString type = (*it).left( (*it).find(".") );
 
             QString lang;
             Config config("locale");
             config.setGroup("Language");
             lang = config.readEntry( "Language", "en" );
 
-            qDebug( "Languages: " + lang );
+                        Opie::Core::odebug << "Languages: " << lang << oendl;
             QTranslator * trans = new QTranslator( qApp );
             QString tfn = QPEApplication::qpeDir()+"/i18n/" + lang + "/" + type + ".qm";
             if ( trans->load( tfn ) )  {
                 qApp->installTranslator( trans );
             }  else {
                 delete trans;
             }
 
 
             // find out if plugins should be shown
             if ( m_excludeApplets.grep( *it ).isEmpty() ) {
                 plugin.active = true;
             } else {
                 plugin.active = false;
             }
 
@@ -258,33 +260,33 @@ void Today::loadPlugins() {
             boxLayout->setStretchFactor( plugWidget, 9 );
 
            // "prebuffer" it in one more list, to get the sorting done
             tempList.insert( plugin.name, plugin );
 
             // on first start the list is off course empty
             if ( m_allApplets.isEmpty() ) {
                 pluginList.append( plugin );
                 m_bblayout->addWidget( plugin.guiBox );
             }
 
             // if plugin is not yet in the list, add it to the layout too
             else if ( !m_allApplets.contains( plugin.name ) ) {
                 pluginList.append( plugin );
             }
         } else {
-            qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
+                        Opie::Core::odebug << "could not recognize " << path + "/" + *it << oendl;
             delete lib;
         }
 
     }
 
 
     if ( !m_allApplets.isEmpty() ) {
         TodayPlugin tempPlugin;
         QStringList::Iterator stringit;
 
         for( stringit = m_allApplets.begin(); stringit !=  m_allApplets.end(); ++stringit ) {
             tempPlugin = ( tempList.find( *stringit ) ).data();
             if ( !( (tempPlugin.name).isEmpty() ) ) {
                 pluginList.append( tempPlugin );
                 m_bblayout->addWidget( tempPlugin.guiBox );
             }
@@ -302,36 +304,36 @@ void Today::loadPlugins() {
  */
 void Today::draw() {
 
     if ( pluginList.count() == 0 ) {
         QLabel *noPlugins = new QLabel( this );
         noPlugins->setText( tr( "No plugins found" ) );
         layout->addWidget( noPlugins );
         return;
     }
 
     uint count = 0;
     TodayPlugin plugin;
     for ( uint i = 0; i < pluginList.count(); i++ ) {
         plugin = pluginList[i];
 
         if ( plugin.active ) {
-            //   qDebug( plugin.name + " is ACTIVE " );
+                        //Opie::Core::odebug << plugin.name << " is ACTIVE " << oendl;
             plugin.guiBox->show();
         } else {
-            //  qDebug( plugin.name + " is INACTIVE" );
+                        //Opie::Core::odebug << plugin.name << " is INACTIVE " << oendl;
             plugin.guiBox->hide();
         }
         count++;
     }
 
     if ( count == 0 ) {
         QLabel *noPluginsActive = new QLabel( this );
         noPluginsActive->setText( tr( "No plugins activated" ) );
         layout->addWidget( noPluginsActive );
     }
     repaint();
 }
 
 
 /**
  * The method for the configuration dialog.
@@ -382,33 +384,33 @@ void Today::startConfig() {
 }
 
 
 
 void Today::reinitialize()  {
 
     Config cfg( "today" );
     cfg.setGroup( "Plugins" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
     m_allApplets = cfg.readListEntry( "AllApplets", ',' );
 
     /* reinitialize all plugins */
     QValueList<TodayPlugin>::Iterator it;
     for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
         if ( !(*it).excludeRefresh ) {
             (*it).guiPart->reinitialize();
-            qDebug( "reinit" );
+                        Opie::Core::odebug << "reinit" << oendl;
         }
 
         /* check if plugins is still to be shown */
         if ( m_excludeApplets.grep( (*it).name ).isEmpty() ) {
             (*it).active = true;
         } else {
             (*it).active = false;
         }
 
     }
 
     cfg.setGroup( "General" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
     m_hideBanner = cfg.readNumEntry( "HideBanner", 0 );
     setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) );
 
@@ -436,33 +438,33 @@ void Today::reinitialize()  {
         }
     }
     m_bblayout->addStretch( 2 );
 
 }
 
 /**
  * Refresh for the view. Reload all applets
  *
  */
 void Today::refresh() {
 
     QValueList<TodayPlugin>::Iterator it;
     for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
         if ( !(*it).excludeRefresh ) {
             (*it).guiPart->refresh();
-            qDebug( "refresh" );
+                        Opie::Core::odebug << "refresh" << oendl;
         }
     }
 
     DateLabel->setText( QString( "<font color=#FFFFFF>" +  TimeString::longDateString( QDate::currentDate() )  + "</font>" ) );
 
     updateGeometry();
     repaint();
 }
 
 void Today::startApplication() {
     QCopEnvelope e( "QPE/System", "execute(QString)" );
     e << QString( sender()->name() );
 }
 
 /**
  * launch addressbook (personal card)