-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 @@ | |||
21 | #include "engine.h" | 21 | #include "engine.h" |
22 | |||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
25 | |||
26 | /* QT */ | ||
22 | #include <qstring.h> | 27 | #include <qstring.h> |
23 | #include <math.h> | ||
24 | #include <qlcdnumber.h> | 28 | #include <qlcdnumber.h> |
25 | 29 | ||
30 | /* STD */ | ||
31 | #include <math.h> | ||
32 | |||
26 | Data Engine::evalStack (Data num, bool inbrace = FALSE) | 33 | Data Engine::evalStack (Data num, bool inbrace = FALSE) |
@@ -44,3 +51,3 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE) | |||
44 | if (isnan (num.dbl) || isinf (num.dbl)) { | 51 | if (isnan (num.dbl) || isinf (num.dbl)) { |
45 | qDebug ("bad result from operation"); | 52 | odebug << "bad result from operation" << oendl; |
46 | state = sError; | 53 | state = sError; |
@@ -115,3 +122,3 @@ void Engine::pushValue (char v) | |||
115 | } else if (state == sError) { | 122 | } else if (state == sError) { |
116 | qDebug ("in error state"); | 123 | odebug << "in error state" << oendl; |
117 | return; | 124 | 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) { | |||
215 | if(!str.isEmpty() ) { | 215 | if(!str.isEmpty() ) { |
216 | qDebug(str); | 216 | odebug << str << oendl; |
217 | config.writeEntry("mp3Alarm",1); | 217 | 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 @@ | |||
2 | 2 | ||
3 | #include <qdatetime.h> | 3 | /* OPIE */ |
4 | #include <qprogressbar.h> | ||
5 | #include <qcombobox.h> | ||
6 | #include <qcheckbox.h> | ||
7 | |||
8 | #include <qpe/qpeapplication.h> | 4 | #include <qpe/qpeapplication.h> |
9 | 5 | ||
6 | #include <opie2/odebug.h> | ||
10 | #include <opie2/opimglobal.h> | 7 | #include <opie2/opimglobal.h> |
@@ -14,2 +11,9 @@ | |||
14 | 11 | ||
12 | /* QT */ | ||
13 | #include <qdatetime.h> | ||
14 | #include <qprogressbar.h> | ||
15 | #include <qcombobox.h> | ||
16 | #include <qcheckbox.h> | ||
17 | |||
18 | |||
15 | using namespace Opie; | 19 | using namespace Opie; |
@@ -51,3 +55,3 @@ void Converter::start_conversion(){ | |||
51 | case XML: | 55 | case XML: |
52 | qDebug("XMLSourceDB = %d", m_selectedDatabase); | 56 | odebug << "XMLSourceDB = " << m_selectedDatabase << "" << oendl; |
53 | switch( m_selectedDatabase ){ | 57 | switch( m_selectedDatabase ){ |
@@ -65,3 +69,3 @@ void Converter::start_conversion(){ | |||
65 | default: | 69 | default: |
66 | qWarning( "Unknown database selected (%d)", m_selectedDatabase ); | 70 | owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; |
67 | return; | 71 | return; |
@@ -70,3 +74,3 @@ void Converter::start_conversion(){ | |||
70 | case SQL: | 74 | case SQL: |
71 | qDebug("SQLSourceDB = %d", m_selectedDatabase); | 75 | odebug << "SQLSourceDB = " << m_selectedDatabase << "" << oendl; |
72 | switch( m_selectedDatabase ){ | 76 | switch( m_selectedDatabase ){ |
@@ -84,3 +88,3 @@ void Converter::start_conversion(){ | |||
84 | default: | 88 | default: |
85 | qWarning( "Unknown database selected (%d)", m_selectedDatabase ); | 89 | owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; |
86 | return; | 90 | return; |
@@ -89,3 +93,3 @@ void Converter::start_conversion(){ | |||
89 | default: | 93 | default: |
90 | qWarning( "Unknown source format selected (%d) !!", m_selectedSourceFormat ); | 94 | owarn << "Unknown source format selected (" << m_selectedSourceFormat << ") !!" << oendl; |
91 | return; | 95 | return; |
@@ -95,3 +99,3 @@ void Converter::start_conversion(){ | |||
95 | case XML: | 99 | case XML: |
96 | qDebug("XMLDestDB = %d", m_selectedDatabase); | 100 | odebug << "XMLDestDB = " << m_selectedDatabase << "" << oendl; |
97 | switch( m_selectedDatabase ){ | 101 | switch( m_selectedDatabase ){ |
@@ -109,3 +113,3 @@ void Converter::start_conversion(){ | |||
109 | default: | 113 | default: |
110 | qWarning( "Unknown database selected (%d)", m_selectedDatabase ); | 114 | owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; |
111 | return; | 115 | return; |
@@ -114,3 +118,3 @@ void Converter::start_conversion(){ | |||
114 | case SQL: | 118 | case SQL: |
115 | qDebug("SQLDestDB = %d", m_selectedDatabase); | 119 | odebug << "SQLDestDB = " << m_selectedDatabase << "" << oendl; |
116 | switch( m_selectedDatabase ){ | 120 | switch( m_selectedDatabase ){ |
@@ -128,3 +132,3 @@ void Converter::start_conversion(){ | |||
128 | default: | 132 | default: |
129 | qWarning( "Unknown database selected (%d)", m_selectedDatabase ); | 133 | owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; |
130 | return; | 134 | return; |
@@ -133,3 +137,3 @@ void Converter::start_conversion(){ | |||
133 | default: | 137 | default: |
134 | qWarning( "Unknown destination format selected (%d)!!", m_selectedDestFormat ); | 138 | owarn << "Unknown destination format selected (" << m_selectedDestFormat << ")!!" << oendl; |
135 | return; | 139 | return; |
@@ -148,3 +152,3 @@ void Converter::start_conversion(){ | |||
148 | if ( m_eraseDB -> isChecked() ){ | 152 | if ( m_eraseDB -> isChecked() ){ |
149 | qDebug( "Clearing destination database!" ); | 153 | odebug << "Clearing destination database!" << oendl; |
150 | destDB -> clear(); | 154 | destDB -> clear(); |
@@ -154,3 +158,3 @@ void Converter::start_conversion(){ | |||
154 | QArray<int> uidList = sourceDB->records(); | 158 | QArray<int> uidList = sourceDB->records(); |
155 | qDebug( "Try to move data for addressbook.. (%d items) ", uidList.count() ); | 159 | odebug << "Try to move data for addressbook.. (" << uidList.count() << " items) " << oendl; |
156 | m_progressBar->setTotalSteps( uidList.count() ); | 160 | m_progressBar->setTotalSteps( uidList.count() ); |
@@ -158,3 +162,3 @@ void Converter::start_conversion(){ | |||
158 | for ( uint i = 0; i < uidList.count(); ++i ){ | 162 | for ( uint i = 0; i < uidList.count(); ++i ){ |
159 | qDebug( "Adding uid: %d", uidList[i] ); | 163 | odebug << "Adding uid: " << uidList[i] << "" << oendl; |
160 | OPimRecord* rec = sourceDB -> record( uidList[i] ); | 164 | OPimRecord* rec = sourceDB -> record( uidList[i] ); |
@@ -183,3 +187,3 @@ void Converter::start_conversion(){ | |||
183 | default: | 187 | default: |
184 | qWarning( "Unknown database selected (%d)", m_selectedDatabase ); | 188 | owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl; |
185 | return; | 189 | return; |
@@ -188,3 +192,3 @@ void Converter::start_conversion(){ | |||
188 | 192 | ||
189 | qWarning("Conversion is finished and needed %d ms !", t.elapsed()); | 193 | owarn << "Conversion is finished and needed " << t.elapsed() << " ms !" << oendl; |
190 | } | 194 | } |