summaryrefslogtreecommitdiff
authordrw <drw>2004-04-02 21:41:10 (UTC)
committer drw <drw>2004-04-02 21:41:10 (UTC)
commit6f335843b89f60fe009b43a4134e9b3753fff974 (patch) (unidiff)
tree5734d3080e664131cc575038d59858f1b0633af4
parent67cf56e3907fba139e2d1ce612f9df29747b8201 (diff)
downloadopie-6f335843b89f60fe009b43a4134e9b3753fff974.zip
opie-6f335843b89f60fe009b43a4134e9b3753fff974.tar.gz
opie-6f335843b89f60fe009b43a4134e9b3753fff974.tar.bz2
Use ODebug (another 10 down...)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/config.in2
-rw-r--r--core/pim/today/today.cpp22
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 @@
1 config TODAY 1 config TODAY
2 boolean "opie-today (today gives an overview of appointments and todos)" 2 boolean "opie-today (today gives an overview of appointments and todos)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2PIM 4 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
@@ -18,6 +18,8 @@
18 18
19#include "today.h" 19#include "today.h"
20 20
21#include <opie2/odebug.h>
22
21#include <qpe/config.h> 23#include <qpe/config.h>
22#include <qpe/qcopenvelope_qws.h> 24#include <qpe/qcopenvelope_qws.h>
23#include <qpe/resource.h> 25#include <qpe/resource.h>
@@ -188,7 +190,7 @@ void Today::loadPlugins() {
188 190
189 QString path = QPEApplication::qpeDir() + "/plugins/today"; 191 QString path = QPEApplication::qpeDir() + "/plugins/today";
190#ifdef Q_OS_MACX 192#ifdef Q_OS_MACX
191 qWarning("Searching for Plugins in: %s", path.latin1()); 193 Opie::Core::owarn << "Searching for Plugins in: " << path << oendl;
192 QDir dir( path, "lib*.dylib" ); 194 QDir dir( path, "lib*.dylib" );
193#else 195#else
194 QDir dir( path, "lib*.so" ); 196 QDir dir( path, "lib*.so" );
@@ -203,10 +205,10 @@ void Today::loadPlugins() {
203 QInterfacePtr<TodayPluginInterface> iface; 205 QInterfacePtr<TodayPluginInterface> iface;
204 QLibrary *lib = new QLibrary( path + "/" + *it ); 206 QLibrary *lib = new QLibrary( path + "/" + *it );
205 207
206 qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); 208 Opie::Core::odebug << "querying: " << path + "/" + *it << oendl;
207 if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { 209 if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
208 qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() ); 210 Opie::Core::odebug << "accepted: " << path + "/" + *it << oendl;
209 qDebug( QString(*it) ); 211 Opie::Core::odebug << *it << oendl;
210 212
211 TodayPlugin plugin; 213 TodayPlugin plugin;
212 plugin.library = lib; 214 plugin.library = lib;
@@ -220,7 +222,7 @@ void Today::loadPlugins() {
220 config.setGroup("Language"); 222 config.setGroup("Language");
221 lang = config.readEntry( "Language", "en" ); 223 lang = config.readEntry( "Language", "en" );
222 224
223 qDebug( "Languages: " + lang ); 225 Opie::Core::odebug << "Languages: " << lang << oendl;
224 QTranslator * trans = new QTranslator( qApp ); 226 QTranslator * trans = new QTranslator( qApp );
225 QString tfn = QPEApplication::qpeDir()+"/i18n/" + lang + "/" + type + ".qm"; 227 QString tfn = QPEApplication::qpeDir()+"/i18n/" + lang + "/" + type + ".qm";
226 if ( trans->load( tfn ) ) { 228 if ( trans->load( tfn ) ) {
@@ -271,7 +273,7 @@ void Today::loadPlugins() {
271 pluginList.append( plugin ); 273 pluginList.append( plugin );
272 } 274 }
273 } else { 275 } else {
274 qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); 276 Opie::Core::odebug << "could not recognize " << path + "/" + *it << oendl;
275 delete lib; 277 delete lib;
276 } 278 }
277 279
@@ -315,10 +317,10 @@ void Today::draw() {
315 plugin = pluginList[i]; 317 plugin = pluginList[i];
316 318
317 if ( plugin.active ) { 319 if ( plugin.active ) {
318 // qDebug( plugin.name + " is ACTIVE " ); 320 //Opie::Core::odebug << plugin.name << " is ACTIVE " << oendl;
319 plugin.guiBox->show(); 321 plugin.guiBox->show();
320 } else { 322 } else {
321 // qDebug( plugin.name + " is INACTIVE" ); 323 //Opie::Core::odebug << plugin.name << " is INACTIVE " << oendl;
322 plugin.guiBox->hide(); 324 plugin.guiBox->hide();
323 } 325 }
324 count++; 326 count++;
@@ -395,7 +397,7 @@ void Today::reinitialize() {
395 for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { 397 for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
396 if ( !(*it).excludeRefresh ) { 398 if ( !(*it).excludeRefresh ) {
397 (*it).guiPart->reinitialize(); 399 (*it).guiPart->reinitialize();
398 qDebug( "reinit" ); 400 Opie::Core::odebug << "reinit" << oendl;
399 } 401 }
400 402
401 /* check if plugins is still to be shown */ 403 /* check if plugins is still to be shown */
@@ -449,7 +451,7 @@ void Today::refresh() {
449 for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { 451 for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
450 if ( !(*it).excludeRefresh ) { 452 if ( !(*it).excludeRefresh ) {
451 (*it).guiPart->refresh(); 453 (*it).guiPart->refresh();
452 qDebug( "refresh" ); 454 Opie::Core::odebug << "refresh" << oendl;
453 } 455 }
454 } 456 }
455 457