summaryrefslogtreecommitdiff
authorar <ar>2004-05-21 21:03:21 (UTC)
committer ar <ar>2004-05-21 21:03:21 (UTC)
commite7810bdfec718c3364e31c2d32357ec0fd2fda77 (patch) (unidiff)
tree2e5e4028580ca4fce98dc56567731b4cdce4b74b
parent37294c41a902eab36427372bdda31b4462fd73ca (diff)
downloadopie-e7810bdfec718c3364e31c2d32357ec0fd2fda77.zip
opie-e7810bdfec718c3364e31c2d32357ec0fd2fda77.tar.gz
opie-e7810bdfec718c3364e31c2d32357ec0fd2fda77.tar.bz2
- convert qDebug to odebug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/calc2/engine.cpp133
-rw-r--r--noncore/tools/clock/setAlarm.cpp2
-rw-r--r--noncore/tools/pimconverter/converter.cpp334
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
@@ -19,10 +19,17 @@
19**********************************************************************/ 19**********************************************************************/
20 20
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
26Data Engine::evalStack (Data num, bool inbrace = FALSE) 33Data Engine::evalStack (Data num, bool inbrace = FALSE)
27{ 34{
28 if (state != sError) { 35 if (state != sError) {
@@ -34,18 +41,18 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE)
34 41
35// Check this ops prec vs next ops prec 42// Check this ops prec vs next ops prec
36 if (!stack.isEmpty ()) 43 if (!stack.isEmpty ())
37 if (i->precedence <= stack.top()->precedence) 44 if (i->precedence <= stack.top()->precedence)
38 i->acc = evalStack (i->acc, inbrace); 45 i->acc = evalStack (i->acc, inbrace);
39 46
40// Evaluate this instruction 47// Evaluate this instruction
41 num = i->eval (num); 48 num = i->eval (num);
42 49
43// Error-check ( change this to work for all types ) 50// Error-check ( change this to work for all types )
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;
47 clearData(&num); 54 clearData(&num);
48 return num; 55 return num;
49 } 56 }
50 } 57 }
51 } 58 }
@@ -89,22 +96,22 @@ void Engine::pushValue (char v)
89 if (state == sAppend) { 96 if (state == sAppend) {
90 bool ok = FALSE; 97 bool ok = FALSE;
91 switch (currentRep) { 98 switch (currentRep) {
92 case rDouble: 99 case rDouble:
93 displayString.append(v); 100 displayString.append(v);
94 num.dbl=displayString.toDouble(&ok); 101 num.dbl=displayString.toDouble(&ok);
95 break; 102 break;
96 case rFraction: 103 case rFraction:
97 break; 104 break;
98 default: 105 default:
99 displayString.append(v); 106 displayString.append(v);
100 num.i=displayString.toInt(&ok, calcBase()); 107 num.i=displayString.toInt(&ok, calcBase());
101 }; 108 };
102 if (!ok) { 109 if (!ok) {
103 state = sError; 110 state = sError;
104 odebug << "pushValue() - num->string conversion" << oendl; 111 odebug << "pushValue() - num->string conversion" << oendl;
105 } else { 112 } else {
106 const QString constString = displayString; 113 const QString constString = displayString;
107 emit(display(constString)); 114 emit(display(constString));
108 }; 115 };
109 116
110 } else if (state == sStart) { 117 } else if (state == sStart) {
@@ -113,7 +120,7 @@ void Engine::pushValue (char v)
113 state = sAppend; 120 state = sAppend;
114 pushValue (v); 121 pushValue (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;
118 } 125 }
119} 126}
@@ -122,38 +129,38 @@ void Engine::del ()
122{ 129{
123 bool ok; 130 bool ok;
124 switch (currentRep) { 131 switch (currentRep) {
125 case rDouble: 132 case rDouble:
126 displayString.truncate(displayString.length()); 133 displayString.truncate(displayString.length());
127 num.dbl=displayString.toDouble(&ok); 134 num.dbl=displayString.toDouble(&ok);
128 break; 135 break;
129 case rFraction: 136 case rFraction:
130 odebug << "not available" << oendl; 137 odebug << "not available" << oendl;
131 break; 138 break;
132 default: 139 default:
133 displayString.truncate(displayString.length()); 140 displayString.truncate(displayString.length());
134 num.i = displayString.toInt(&ok, calcBase()); 141 num.i = displayString.toInt(&ok, calcBase());
135 }; 142 };
136 143
137 if (!ok) { 144 if (!ok) {
138 state = sError; 145 state = sError;
139 odebug << "del() - num->string conversion" << oendl; 146 odebug << "del() - num->string conversion" << oendl;
140 } else { 147 } else {
141 const QString constString = displayString; 148 const QString constString = displayString;
142 emit(display(constString)); 149 emit(display(constString));
143 }; 150 };
144} 151}
145 152
146void Engine::displayData(Data d) { 153void Engine::displayData(Data d) {
147 switch (currentRep) { 154 switch (currentRep) {
148 case rDouble: 155 case rDouble:
149 displayString.setNum(d.dbl); 156 displayString.setNum(d.dbl);
150 break; 157 break;
151 case rFraction: 158 case rFraction:
152 odebug << "fractional display not yet impl" << oendl; 159 odebug << "fractional display not yet impl" << oendl;
153 break; 160 break;
154 default: 161 default:
155 displayString.setNum(d.i, calcBase()); 162 displayString.setNum(d.i, calcBase());
156 break; 163 break;
157 }; 164 };
158 const QString constString= displayString; 165 const QString constString= displayString;
159 emit(display(constString)); 166 emit(display(constString));
@@ -162,33 +169,33 @@ void Engine::displayData(Data d) {
162// Returns the base when Rep is an integer type 169// Returns the base when Rep is an integer type
163int Engine::calcBase () { 170int Engine::calcBase () {
164 switch (currentRep) { 171 switch (currentRep) {
165 case rBin: 172 case rBin:
166 return 2; 173 return 2;
167 case rOct: 174 case rOct:
168 return 8; 175 return 8;
169 case rDec: 176 case rDec:
170 return 10; 177 return 10;
171 case rHex: 178 case rHex:
172 return 16; 179 return 16;
173 default: 180 default:
174 state = sError; 181 state = sError;
175 odebug << "Error - attempt to calc base for non-integer" << oendl; 182 odebug << "Error - attempt to calc base for non-integer" << oendl;
176 return 10; 183 return 10;
177 }; 184 };
178} 185}
179 186
180// Special instruction for internal use only 187// Special instruction for internal use only
181class iOpenBrace:public Instruction { 188class iOpenBrace:public Instruction {
182 public: 189 public:
183 iOpenBrace (Engine *e):Instruction (100) {engine = e;}; 190 iOpenBrace (Engine *e):Instruction (100) {engine = e;};
184 ~iOpenBrace () {}; 191 ~iOpenBrace () {};
185 192
186 Data eval (Data num) { 193 Data eval (Data num) {
187 engine->decBraces(); 194 engine->decBraces();
188 return num; 195 return num;
189 }; 196 };
190 private: 197 private:
191 Engine *engine; 198 Engine *engine;
192}; 199};
193 200
194void Engine::openBrace() { 201void Engine::openBrace() {
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
@@ -213,7 +213,7 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
213 QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); 213 QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
214// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); 214// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
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);
218 config.writeEntry("mp3File",str); 218 config.writeEntry("mp3File",str);
219 } 219 }
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,203 +1,207 @@
1#include "converter.h" 1#include "converter.h"
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>
11// Include SQL related header files 8// Include SQL related header files
12#define __USE_SQL 9#define __USE_SQL
13#include <opie2/opimaccessfactory.h> 10#include <opie2/opimaccessfactory.h>
14 11
12/* QT */
13#include <qdatetime.h>
14#include <qprogressbar.h>
15#include <qcombobox.h>
16#include <qcheckbox.h>
17
18
15using namespace Opie; 19using namespace Opie;
16using namespace Pim; 20using namespace Pim;
17 21
18Converter::Converter(): 22Converter::Converter():
19 m_selectedDatabase( ADDRESSBOOK ), 23 m_selectedDatabase( ADDRESSBOOK ),
20 m_selectedSourceFormat( XML ), 24 m_selectedSourceFormat( XML ),
21 m_selectedDestFormat( SQL ) 25 m_selectedDestFormat( SQL )
22{ 26{
23 m_dataBaseSelector -> setCurrentItem( m_selectedDatabase ); 27 m_dataBaseSelector -> setCurrentItem( m_selectedDatabase );
24 m_sourceFormatSelector -> setCurrentItem( m_selectedSourceFormat ); 28 m_sourceFormatSelector -> setCurrentItem( m_selectedSourceFormat );
25 m_destFormatSelector -> setCurrentItem( m_selectedDestFormat ); 29 m_destFormatSelector -> setCurrentItem( m_selectedDestFormat );
26 m_eraseDB -> setChecked( true ); // Default erase on copy 30 m_eraseDB -> setChecked( true ); // Default erase on copy
27} 31}
28 32
29void Converter::selectedDatabase( int num ) 33void Converter::selectedDatabase( int num )
30{ 34{
31 m_selectedDatabase = num; 35 m_selectedDatabase = num;
32} 36}
33 37
34void Converter::selectedDestFormat( int num ) 38void Converter::selectedDestFormat( int num )
35{ 39{
36 m_selectedDestFormat = num; 40 m_selectedDestFormat = num;
37} 41}
38 42
39void Converter::selectedSourceFormat( int num ) 43void Converter::selectedSourceFormat( int num )
40{ 44{
41 m_selectedSourceFormat = num; 45 m_selectedSourceFormat = num;
42} 46}
43 47
44void Converter::start_conversion(){ 48void Converter::start_conversion(){
45 49
46 // Creating backends to the requested databases.. 50 // Creating backends to the requested databases..
47 OPimBase* sourceDB; 51 OPimBase* sourceDB;
48 OPimBase* destDB; 52 OPimBase* destDB;
49 53
50 switch( m_selectedSourceFormat ){ 54 switch( m_selectedSourceFormat ){
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 ){
54 case ADDRESSBOOK:{ 58 case ADDRESSBOOK:{
55 sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" ); 59 sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" );
56 } 60 }
57 break; 61 break;
58 case TODOLIST:{ 62 case TODOLIST:{
59 sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" ); 63 sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" );
60 }break; 64 }break;
61 case DATEBOOK:{ 65 case DATEBOOK:{
62 sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" ); 66 sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" );
63 } 67 }
64 break; 68 break;
65 default: 69 default:
66 qWarning( "Unknown database selected (%d)", m_selectedDatabase ); 70 owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
67 return; 71 return;
68 } 72 }
69 break; 73 break;
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 ){
73 case ADDRESSBOOK:{ 77 case ADDRESSBOOK:{
74 sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" ); 78 sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" );
75 } 79 }
76 break; 80 break;
77 case TODOLIST:{ 81 case TODOLIST:{
78 sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" ); 82 sourceDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" );
79 }break; 83 }break;
80 case DATEBOOK:{ 84 case DATEBOOK:{
81 sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" ); 85 sourceDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" );
82 } 86 }
83 break; 87 break;
84 default: 88 default:
85 qWarning( "Unknown database selected (%d)", m_selectedDatabase ); 89 owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
86 return; 90 return;
87 } 91 }
88 break; 92 break;
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;
92 } 96 }
93 97
94 switch ( m_selectedDestFormat ){ 98 switch ( m_selectedDestFormat ){
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 ){
98 case ADDRESSBOOK:{ 102 case ADDRESSBOOK:{
99 destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" ); 103 destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" );
100 } 104 }
101 break; 105 break;
102 case TODOLIST:{ 106 case TODOLIST:{
103 destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" ); 107 destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "converter" );
104 }break; 108 }break;
105 case DATEBOOK:{ 109 case DATEBOOK:{
106 destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" ); 110 destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::XML, "converter" );
107 } 111 }
108 break; 112 break;
109 default: 113 default:
110 qWarning( "Unknown database selected (%d)", m_selectedDatabase ); 114 owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
111 return; 115 return;
112 } 116 }
113 break; 117 break;
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 ){
117 case ADDRESSBOOK:{ 121 case ADDRESSBOOK:{
118 destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" ); 122 destDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::SQL, "converter" );
119 } 123 }
120 break; 124 break;
121 case TODOLIST:{ 125 case TODOLIST:{
122 destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" ); 126 destDB = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::SQL, "converter" );
123 }break; 127 }break;
124 case DATEBOOK:{ 128 case DATEBOOK:{
125 destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" ); 129 destDB = OPimAccessFactory<ODateBookAccess>::create( OPimGlobal::DATEBOOK, OPimGlobal::SQL, "converter" );
126 } 130 }
127 break; 131 break;
128 default: 132 default:
129 qWarning( "Unknown database selected (%d)", m_selectedDatabase ); 133 owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
130 return; 134 return;
131 } 135 }
132 break; 136 break;
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;
136 } 140 }
137 141
138 if ( !sourceDB || !destDB ) 142 if ( !sourceDB || !destDB )
139 return; 143 return;
140 144
141 sourceDB -> load(); 145 sourceDB -> load();
142 destDB -> load(); 146 destDB -> load();
143 147
144 QTime t; 148 QTime t;
145 t.start(); 149 t.start();
146 150
147 // Clean the dest-database if requested (isChecked) 151 // Clean the dest-database if requested (isChecked)
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();
151 } 155 }
152 156
153 // Now transmit every pim-item from the source database to the destination -database 157 // Now transmit every pim-item from the source database to the destination -database
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() );
157 int count = 0; 161 int count = 0;
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] );
161 destDB -> add( rec ); 165 destDB -> add( rec );
162 m_progressBar->setProgress( ++count ); 166 m_progressBar->setProgress( ++count );
163 } 167 }
164 168
165 // Now commit data.. 169 // Now commit data..
166 destDB -> save(); 170 destDB -> save();
167 171
168 // Delete the frontends. Backends will be deleted automatically, too ! 172 // Delete the frontends. Backends will be deleted automatically, too !
169 // We have to cast them back to delete them properly ! 173 // We have to cast them back to delete them properly !
170 switch( m_selectedDatabase ){ 174 switch( m_selectedDatabase ){
171 case ADDRESSBOOK: 175 case ADDRESSBOOK:
172 delete static_cast<OPimContactAccess*> (sourceDB); 176 delete static_cast<OPimContactAccess*> (sourceDB);
173 delete static_cast<OPimContactAccess*> (destDB); 177 delete static_cast<OPimContactAccess*> (destDB);
174 break; 178 break;
175 case TODOLIST: 179 case TODOLIST:
176 delete static_cast<OPimTodoAccess*> (sourceDB); 180 delete static_cast<OPimTodoAccess*> (sourceDB);
177 delete static_cast<OPimTodoAccess*> (destDB); 181 delete static_cast<OPimTodoAccess*> (destDB);
178 break; 182 break;
179 case DATEBOOK: 183 case DATEBOOK:
180 delete static_cast<ODateBookAccess*> (sourceDB); 184 delete static_cast<ODateBookAccess*> (sourceDB);
181 delete static_cast<ODateBookAccess*> (destDB); 185 delete static_cast<ODateBookAccess*> (destDB);
182 break; 186 break;
183 default: 187 default:
184 qWarning( "Unknown database selected (%d)", m_selectedDatabase ); 188 owarn << "Unknown database selected (" << m_selectedDatabase << ")" << oendl;
185 return; 189 return;
186 } 190 }
187 191
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}
191 195
192int main( int argc, char** argv ) { 196int main( int argc, char** argv ) {
193 197
194 QPEApplication a( argc, argv ); 198 QPEApplication a( argc, argv );
195 199
196 Converter dlg; 200 Converter dlg;
197 201
198 a.showMainWidget( &dlg ); 202 a.showMainWidget( &dlg );
199 // dlg. showMaximized ( ); 203 // dlg. showMaximized ( );
200 204
201 return a.exec(); 205 return a.exec();
202 206
203} 207}