| -rw-r--r-- | noncore/tools/calc2/engine.cpp | 13 | ||||
| -rw-r--r-- | noncore/tools/clock/setAlarm.cpp | 2 | ||||
| -rw-r--r-- | noncore/tools/pimconverter/converter.cpp | 44 |
3 files changed, 35 insertions, 24 deletions
diff --git a/noncore/tools/calc2/engine.cpp b/noncore/tools/calc2/engine.cpp index e843e29..74cd701 100644 --- a/noncore/tools/calc2/engine.cpp +++ b/noncore/tools/calc2/engine.cpp @@ -21,6 +21,13 @@ #include "engine.h" + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qstring.h> -#include <math.h> #include <qlcdnumber.h> +/* STD */ +#include <math.h> + Data Engine::evalStack (Data num, bool inbrace = FALSE) @@ -44,3 +51,3 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE) if (isnan (num.dbl) || isinf (num.dbl)) { - qDebug ("bad result from operation"); + odebug << "bad result from operation" << oendl; state = sError; @@ -115,3 +122,3 @@ void Engine::pushValue (char v) } else if (state == sError) { - qDebug ("in error state"); + odebug << "in error state" << oendl; return; diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp index 9d5fc49..049af8d 100644 --- a/noncore/tools/clock/setAlarm.cpp +++ b/noncore/tools/clock/setAlarm.cpp @@ -215,3 +215,3 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { if(!str.isEmpty() ) { - qDebug(str); + odebug << str << oendl; config.writeEntry("mp3Alarm",1); diff --git a/noncore/tools/pimconverter/converter.cpp b/noncore/tools/pimconverter/converter.cpp index 2bd47a4..7d34b24 100644 --- a/noncore/tools/pimconverter/converter.cpp +++ b/noncore/tools/pimconverter/converter.cpp @@ -2,9 +2,6 @@ -#include <qdatetime.h> -#include <qprogressbar.h> -#include <qcombobox.h> -#include <qcheckbox.h> - +/* OPIE */ #include <qpe/qpeapplication.h> +#include <opie2/odebug.h> #include <opie2/opimglobal.h> @@ -14,2 +11,9 @@ +/* QT */ +#include <qdatetime.h> +#include <qprogressbar.h> +#include <qcombobox.h> +#include <qcheckbox.h> + + using namespace Opie; @@ -51,3 +55,3 @@ void Converter::start_conversion(){ case XML: - qDebug("XMLSourceDB = %d", m_selectedDatabase); + odebug << "XMLSourceDB = " << m_selectedDatabase << "" << oendl; switch( m_selectedDatabase ){ @@ -65,3 +69,3 @@ void Converter::start_conversion(){ default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; return; @@ -70,3 +74,3 @@ void Converter::start_conversion(){ case SQL: - qDebug("SQLSourceDB = %d", m_selectedDatabase); + odebug << "SQLSourceDB = " << m_selectedDatabase << "" << oendl; switch( m_selectedDatabase ){ @@ -84,3 +88,3 @@ void Converter::start_conversion(){ default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; return; @@ -89,3 +93,3 @@ void Converter::start_conversion(){ default: - qWarning( "Unknown source format selected (%d) !!", m_selectedSourceFormat ); + owarn << "Unknown source format selected (" << m_selectedSourceFormat << ") !!" << oendl; return; @@ -95,3 +99,3 @@ void Converter::start_conversion(){ case XML: - qDebug("XMLDestDB = %d", m_selectedDatabase); + odebug << "XMLDestDB = " << m_selectedDatabase << "" << oendl; switch( m_selectedDatabase ){ @@ -109,3 +113,3 @@ void Converter::start_conversion(){ default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; return; @@ -114,3 +118,3 @@ void Converter::start_conversion(){ case SQL: - qDebug("SQLDestDB = %d", m_selectedDatabase); + odebug << "SQLDestDB = " << m_selectedDatabase << "" << oendl; switch( m_selectedDatabase ){ @@ -128,3 +132,3 @@ void Converter::start_conversion(){ default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; return; @@ -133,3 +137,3 @@ void Converter::start_conversion(){ default: - qWarning( "Unknown destination format selected (%d)!!", m_selectedDestFormat ); + owarn << "Unknown destination format selected (" << m_selectedDestFormat << ")!!" << oendl; return; @@ -148,3 +152,3 @@ void Converter::start_conversion(){ if ( m_eraseDB -> isChecked() ){ - qDebug( "Clearing destination database!" ); + odebug << "Clearing destination database!" << oendl; destDB -> clear(); @@ -154,3 +158,3 @@ void Converter::start_conversion(){ QArray<int> uidList = sourceDB->records(); - qDebug( "Try to move data for addressbook.. (%d items) ", uidList.count() ); + odebug << "Try to move data for addressbook.. (" << uidList.count() << " items) " << oendl; m_progressBar->setTotalSteps( uidList.count() ); @@ -158,3 +162,3 @@ void Converter::start_conversion(){ for ( uint i = 0; i < uidList.count(); ++i ){ - qDebug( "Adding uid: %d", uidList[i] ); + odebug << "Adding uid: " << uidList[i] << "" << oendl; OPimRecord* rec = sourceDB -> record( uidList[i] ); @@ -183,3 +187,3 @@ void Converter::start_conversion(){ default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; return; @@ -188,3 +192,3 @@ void Converter::start_conversion(){ - qWarning("Conversion is finished and needed %d ms !", t.elapsed()); + owarn << "Conversion is finished and needed " << t.elapsed() << " ms !" << oendl; } |