| -rw-r--r-- | noncore/tools/calc2/engine.cpp | 133 | ||||
| -rw-r--r-- | noncore/tools/clock/setAlarm.cpp | 2 | ||||
| -rw-r--r-- | noncore/tools/pimconverter/converter.cpp | 334 |
3 files changed, 240 insertions, 229 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) @@ -36,4 +43,4 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE) if (!stack.isEmpty ()) - if (i->precedence <= stack.top()->precedence) - i->acc = evalStack (i->acc, inbrace); + if (i->precedence <= stack.top()->precedence) + i->acc = evalStack (i->acc, inbrace); @@ -44,6 +51,6 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE) if (isnan (num.dbl) || isinf (num.dbl)) { - qDebug ("bad result from operation"); - state = sError; - clearData(&num); - return num; + odebug << "bad result from operation" << oendl; + state = sError; + clearData(&num); + return num; } @@ -91,18 +98,18 @@ void Engine::pushValue (char v) switch (currentRep) { - case rDouble: - displayString.append(v); - num.dbl=displayString.toDouble(&ok); - break; - case rFraction: - break; - default: - displayString.append(v); - num.i=displayString.toInt(&ok, calcBase()); + case rDouble: + displayString.append(v); + num.dbl=displayString.toDouble(&ok); + break; + case rFraction: + break; + default: + displayString.append(v); + num.i=displayString.toInt(&ok, calcBase()); }; if (!ok) { - state = sError; - odebug << "pushValue() - num->string conversion" << oendl; + state = sError; + odebug << "pushValue() - num->string conversion" << oendl; } else { - const QString constString = displayString; - emit(display(constString)); + const QString constString = displayString; + emit(display(constString)); }; @@ -115,3 +122,3 @@ void Engine::pushValue (char v) } else if (state == sError) { - qDebug ("in error state"); + odebug << "in error state" << oendl; return; @@ -124,12 +131,12 @@ void Engine::del () switch (currentRep) { - case rDouble: - displayString.truncate(displayString.length()); - num.dbl=displayString.toDouble(&ok); - break; - case rFraction: - odebug << "not available" << oendl; - break; - default: - displayString.truncate(displayString.length()); - num.i = displayString.toInt(&ok, calcBase()); + case rDouble: + displayString.truncate(displayString.length()); + num.dbl=displayString.toDouble(&ok); + break; + case rFraction: + odebug << "not available" << oendl; + break; + default: + displayString.truncate(displayString.length()); + num.i = displayString.toInt(&ok, calcBase()); }; @@ -137,7 +144,7 @@ void Engine::del () if (!ok) { - state = sError; - odebug << "del() - num->string conversion" << oendl; + state = sError; + odebug << "del() - num->string conversion" << oendl; } else { - const QString constString = displayString; - emit(display(constString)); + const QString constString = displayString; + emit(display(constString)); }; @@ -147,11 +154,11 @@ void Engine::displayData(Data d) { switch (currentRep) { - case rDouble: - displayString.setNum(d.dbl); - break; - case rFraction: - odebug << "fractional display not yet impl" << oendl; - break; - default: - displayString.setNum(d.i, calcBase()); - break; + case rDouble: + displayString.setNum(d.dbl); + break; + case rFraction: + odebug << "fractional display not yet impl" << oendl; + break; + default: + displayString.setNum(d.i, calcBase()); + break; }; @@ -164,14 +171,14 @@ int Engine::calcBase () { switch (currentRep) { - case rBin: - return 2; - case rOct: - return 8; - case rDec: - return 10; - case rHex: - return 16; - default: - state = sError; - odebug << "Error - attempt to calc base for non-integer" << oendl; - return 10; + case rBin: + return 2; + case rOct: + return 8; + case rDec: + return 10; + case rHex: + return 16; + default: + state = sError; + odebug << "Error - attempt to calc base for non-integer" << oendl; + return 10; }; @@ -182,11 +189,11 @@ class iOpenBrace:public Instruction { public: - iOpenBrace (Engine *e):Instruction (100) {engine = e;}; - ~iOpenBrace () {}; + iOpenBrace (Engine *e):Instruction (100) {engine = e;}; + ~iOpenBrace () {}; - Data eval (Data num) { - engine->decBraces(); - return num; - }; + Data eval (Data num) { + engine->decBraces(); + return num; + }; private: - Engine *engine; + Engine *engine; }; 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; @@ -18,10 +22,10 @@ using namespace Pim; Converter::Converter(): - m_selectedDatabase( ADDRESSBOOK ), - m_selectedSourceFormat( XML ), - m_selectedDestFormat( SQL ) + m_selectedDatabase( ADDRESSBOOK ), + m_selectedSourceFormat( XML ), + m_selectedDestFormat( SQL ) { - m_dataBaseSelector -> setCurrentItem( m_selectedDatabase ); - m_sourceFormatSelector -> setCurrentItem( m_selectedSourceFormat ); - m_destFormatSelector -> setCurrentItem( m_selectedDestFormat ); - m_eraseDB -> setChecked( true ); // Default erase on copy + m_dataBaseSelector -> setCurrentItem( m_selectedDatabase ); + m_sourceFormatSelector -> setCurrentItem( m_selectedSourceFormat ); + m_destFormatSelector -> setCurrentItem( m_selectedDestFormat ); + m_eraseDB -> setChecked( true ); // Default erase on copy } @@ -30,3 +34,3 @@ void Converter::selectedDatabase( int num ) { - m_selectedDatabase = num; + m_selectedDatabase = num; } @@ -35,3 +39,3 @@ void Converter::selectedDestFormat( int num ) { - m_selectedDestFormat = num; + m_selectedDestFormat = num; } @@ -40,3 +44,3 @@ void Converter::selectedSourceFormat( int num ) { - m_selectedSourceFormat = num; + m_selectedSourceFormat = num; } @@ -44,147 +48,147 @@ void Converter::selectedSourceFormat( int num ) void Converter::start_conversion(){ - - // Creating backends to the requested databases.. - OPimBase* sourceDB; - OPimBase* destDB; - - switch( m_selectedSourceFormat ){ - case XML: - qDebug("XMLSourceDB = %d", m_selectedDatabase); - switch( m_selectedDatabase ){ - case ADDRESSBOOK:{ - sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" ); - } - break; - case TODOLIST:{ - sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" ); - }break; - case DATEBOOK:{ - sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" ); - } - break; - default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); - return; - } - break; - case SQL: - qDebug("SQLSourceDB = %d", m_selectedDatabase); - switch( m_selectedDatabase ){ - case ADDRESSBOOK:{ - sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" ); - } - break; - case TODOLIST:{ - sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" ); - }break; - case DATEBOOK:{ - sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" ); - } - break; - default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); - return; - } - break; - default: - qWarning( "Unknown source format selected (%d) !!", m_selectedSourceFormat ); - return; - } - - switch ( m_selectedDestFormat ){ - case XML: - qDebug("XMLDestDB = %d", m_selectedDatabase); - switch( m_selectedDatabase ){ - case ADDRESSBOOK:{ - destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" ); - } - break; - case TODOLIST:{ - destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" ); - }break; - case DATEBOOK:{ - destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" ); - } - break; - default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); - return; - } - break; - case SQL: - qDebug("SQLDestDB = %d", m_selectedDatabase); - switch( m_selectedDatabase ){ - case ADDRESSBOOK:{ - destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" ); - } - break; - case TODOLIST:{ - destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" ); - }break; - case DATEBOOK:{ - destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" ); - } - break; - default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); - return; - } - break; - default: - qWarning( "Unknown destination format selected (%d)!!", m_selectedDestFormat ); - return; - } - - if ( !sourceDB || !destDB ) - return; - - sourceDB -> load(); - destDB -> load(); - - QTime t; - t.start(); - - // Clean the dest-database if requested (isChecked) - if ( m_eraseDB -> isChecked() ){ - qDebug( "Clearing destination database!" ); - destDB -> clear(); - } - - // Now transmit every pim-item from the source database to the destination -database - QArray<int> uidList = sourceDB->records(); - qDebug( "Try to move data for addressbook.. (%d items) ", uidList.count() ); - m_progressBar->setTotalSteps( uidList.count() ); - int count = 0; - for ( uint i = 0; i < uidList.count(); ++i ){ - qDebug( "Adding uid: %d", uidList[i] ); - OPimRecord* rec = sourceDB -> record( uidList[i] ); - destDB -> add( rec ); - m_progressBar->setProgress( ++count ); - } - - // Now commit data.. - destDB -> save(); - - // Delete the frontends. Backends will be deleted automatically, too ! - // We have to cast them back to delete them properly ! - switch( m_selectedDatabase ){ - case ADDRESSBOOK: - delete static_cast<OPimContactAccess*> (sourceDB); - delete static_cast<OPimContactAccess*> (destDB); - break; - case TODOLIST: - delete static_cast<OPimTodoAccess*> (sourceDB); - delete static_cast<OPimTodoAccess*> (destDB); - break; - case DATEBOOK: - delete static_cast<ODateBookAccess*> (sourceDB); - delete static_cast<ODateBookAccess*> (destDB); - break; - default: - qWarning( "Unknown database selected (%d)", m_selectedDatabase ); - return; - } - - - qWarning("Conversion is finished and needed %d ms !", t.elapsed()); + + // Creating backends to the requested databases.. + OPimBase* sourceDB; + OPimBase* destDB; + + switch( m_selectedSourceFormat ){ + case XML: + odebug << "XMLSourceDB = " << m_selectedDatabase << "" << oendl; + switch( m_selectedDatabase ){ + case ADDRESSBOOK:{ + sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" ); + } + break; + case TODOLIST:{ + sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" ); + }break; + case DATEBOOK:{ + sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" ); + } + break; + default: + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; + return; + } + break; + case SQL: + odebug << "SQLSourceDB = " << m_selectedDatabase << "" << oendl; + switch( m_selectedDatabase ){ + case ADDRESSBOOK:{ + sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" ); + } + break; + case TODOLIST:{ + sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" ); + }break; + case DATEBOOK:{ + sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" ); + } + break; + default: + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; + return; + } + break; + default: + owarn << "Unknown source format selected (" << m_selectedSourceFormat << ") !!" << oendl; + return; + } + + switch ( m_selectedDestFormat ){ + case XML: + odebug << "XMLDestDB = " << m_selectedDatabase << "" << oendl; + switch( m_selectedDatabase ){ + case ADDRESSBOOK:{ + destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" ); + } + break; + case TODOLIST:{ + destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" ); + }break; + case DATEBOOK:{ + destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" ); + } + break; + default: + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; + return; + } + break; + case SQL: + odebug << "SQLDestDB = " << m_selectedDatabase << "" << oendl; + switch( m_selectedDatabase ){ + case ADDRESSBOOK:{ + destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" ); + } + break; + case TODOLIST:{ + destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" ); + }break; + case DATEBOOK:{ + destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" ); + } + break; + default: + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; + return; + } + break; + default: + owarn << "Unknown destination format selected (" << m_selectedDestFormat << ")!!" << oendl; + return; + } + + if ( !sourceDB || !destDB ) + return; + + sourceDB -> load(); + destDB -> load(); + + QTime t; + t.start(); + + // Clean the dest-database if requested (isChecked) + if ( m_eraseDB -> isChecked() ){ + odebug << "Clearing destination database!" << oendl; + destDB -> clear(); + } + + // Now transmit every pim-item from the source database to the destination -database + QArray<int> uidList = sourceDB->records(); + odebug << "Try to move data for addressbook.. (" << uidList.count() << " items) " << oendl; + m_progressBar->setTotalSteps( uidList.count() ); + int count = 0; + for ( uint i = 0; i < uidList.count(); ++i ){ + odebug << "Adding uid: " << uidList[i] << "" << oendl; + OPimRecord* rec = sourceDB -> record( uidList[i] ); + destDB -> add( rec ); + m_progressBar->setProgress( ++count ); + } + + // Now commit data.. + destDB -> save(); + + // Delete the frontends. Backends will be deleted automatically, too ! + // We have to cast them back to delete them properly ! + switch( m_selectedDatabase ){ + case ADDRESSBOOK: + delete static_cast<OPimContactAccess*> (sourceDB); + delete static_cast<OPimContactAccess*> (destDB); + break; + case TODOLIST: + delete static_cast<OPimTodoAccess*> (sourceDB); + delete static_cast<OPimTodoAccess*> (destDB); + break; + case DATEBOOK: + delete static_cast<ODateBookAccess*> (sourceDB); + delete static_cast<ODateBookAccess*> (destDB); + break; + default: + owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; + return; + } + + + owarn << "Conversion is finished and needed " << t.elapsed() << " ms !" << oendl; } @@ -193,10 +197,10 @@ int main( int argc, char** argv ) { - QPEApplication a( argc, argv ); + QPEApplication a( argc, argv ); - Converter dlg; + Converter dlg; - a.showMainWidget( &dlg ); - // dlg. showMaximized ( ); + a.showMainWidget( &dlg ); + // dlg. showMaximized ( ); - return a.exec(); + return a.exec(); |