summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/calc2/engine.cpp13
-rw-r--r--noncore/tools/clock/setAlarm.cpp2
-rw-r--r--noncore/tools/pimconverter/converter.cpp44
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
@@ -10,48 +10,55 @@
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#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)
{
if (state != sError) {
Instruction *i;
// Pop the next op from the stack
while (!stack.isEmpty () && (braces || !inbrace)) {
i = stack.pop ();
// Check this ops prec vs next ops prec
if (!stack.isEmpty ())
if (i->precedence <= stack.top()->precedence)
i->acc = evalStack (i->acc, inbrace);
// Evaluate this instruction
num = i->eval (num);
// Error-check ( change this to work for all types )
if (isnan (num.dbl) || isinf (num.dbl)) {
- qDebug ("bad result from operation");
+ odebug << "bad result from operation" << oendl;
state = sError;
clearData(&num);
return num;
}
}
}
return num;
}
// Plugins call this to request the stack be evaluated
void Engine::eval ()
{
@@ -104,25 +111,25 @@ void Engine::pushValue (char v)
odebug << "pushValue() - num->string conversion" << oendl;
} else {
const QString constString = displayString;
emit(display(constString));
};
} else if (state == sStart) {
softReset();
displayString.truncate(0);
state = sAppend;
pushValue (v);
} else if (state == sError) {
- qDebug ("in error state");
+ odebug << "in error state" << oendl;
return;
}
}
void Engine::del ()
{
bool ok;
switch (currentRep) {
case rDouble:
displayString.truncate(displayString.length());
num.dbl=displayString.toDouble(&ok);
break;
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
@@ -204,21 +204,21 @@ void Set_Alarm::cleanUp()
void Set_Alarm::slotChangemp3CkeckBox(bool b) {
Config config( "qpe" );
config.setGroup("Time");
if(b) {
QMap<QString, QStringList> map;
map.insert(tr("All"), QStringList() );
QStringList text;
text << "audio/*";
map.insert(tr("Audio"), text );
QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
if(!str.isEmpty() ) {
- qDebug(str);
+ odebug << str << oendl;
config.writeEntry("mp3Alarm",1);
config.writeEntry("mp3File",str);
}
} else {
config.writeEntry("mp3Alarm",0);
config.writeEntry("mp3File","");
}
}
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
@@ -1,26 +1,30 @@
#include "converter.h"
-#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>
// Include SQL related header files
#define __USE_SQL
#include <opie2/opimaccessfactory.h>
+/* QT */
+#include <qdatetime.h>
+#include <qprogressbar.h>
+#include <qcombobox.h>
+#include <qcheckbox.h>
+
+
using namespace Opie;
using namespace Pim;
Converter::Converter():
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
@@ -40,162 +44,162 @@ void Converter::selectedSourceFormat( int num )
{
m_selectedSourceFormat = 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);
+ 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:
- qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+ owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
return;
}
break;
case SQL:
- qDebug("SQLSourceDB = %d", m_selectedDatabase);
+ 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:
- qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+ owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
return;
}
break;
default:
- qWarning( "Unknown source format selected (%d) !!", m_selectedSourceFormat );
+ owarn << "Unknown source format selected (" << m_selectedSourceFormat << ") !!" << oendl;
return;
}
switch ( m_selectedDestFormat ){
case XML:
- qDebug("XMLDestDB = %d", m_selectedDatabase);
+ 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:
- qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+ owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
return;
}
break;
case SQL:
- qDebug("SQLDestDB = %d", m_selectedDatabase);
+ 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:
- qWarning( "Unknown database selected (%d)", m_selectedDatabase );
+ owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
return;
}
break;
default:
- qWarning( "Unknown destination format selected (%d)!!", m_selectedDestFormat );
+ 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() ){
- qDebug( "Clearing destination database!" );
+ 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();
- 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() );
int count = 0;
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] );
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 );
+ owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
return;
}
- qWarning("Conversion is finished and needed %d ms !", t.elapsed());
+ owarn << "Conversion is finished and needed " << t.elapsed() << " ms !" << oendl;
}
int main( int argc, char** argv ) {
QPEApplication a( argc, argv );
Converter dlg;
a.showMainWidget( &dlg );
// dlg. showMaximized ( );
return a.exec();