-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 | |||
@@ -16,16 +16,23 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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 | |||
26 | Data Engine::evalStack (Data num, bool inbrace = FALSE) | 33 | Data Engine::evalStack (Data num, bool inbrace = FALSE) |
27 | { | 34 | { |
28 | if (state != sError) { | 35 | if (state != sError) { |
29 | Instruction *i; | 36 | Instruction *i; |
30 | 37 | ||
31 | // Pop the next op from the stack | 38 | // Pop the next op from the stack |
@@ -39,13 +46,13 @@ Data Engine::evalStack (Data num, bool inbrace = FALSE) | |||
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 | } |
@@ -110,13 +117,13 @@ void Engine::pushValue (char v) | |||
110 | } else if (state == sStart) { | 117 | } else if (state == sStart) { |
111 | softReset(); | 118 | softReset(); |
112 | displayString.truncate(0); | 119 | displayString.truncate(0); |
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 | } |
120 | 127 | ||
121 | void Engine::del () | 128 | void Engine::del () |
122 | { | 129 | { |
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 | |||
@@ -210,13 +210,13 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { | |||
210 | QStringList text; | 210 | QStringList text; |
211 | text << "audio/*"; | 211 | text << "audio/*"; |
212 | map.insert(tr("Audio"), text ); | 212 | map.insert(tr("Audio"), text ); |
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 | } |
220 | } else { | 220 | } else { |
221 | config.writeEntry("mp3Alarm",0); | 221 | config.writeEntry("mp3Alarm",0); |
222 | config.writeEntry("mp3File",""); | 222 | 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,20 +1,24 @@ | |||
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 | |||
15 | using namespace Opie; | 19 | using namespace Opie; |
16 | using namespace Pim; | 20 | using namespace Pim; |
17 | 21 | ||
18 | Converter::Converter(): | 22 | Converter::Converter(): |
19 | m_selectedDatabase( ADDRESSBOOK ), | 23 | m_selectedDatabase( ADDRESSBOOK ), |
20 | m_selectedSourceFormat( XML ), | 24 | m_selectedSourceFormat( XML ), |
@@ -46,13 +50,13 @@ void Converter::start_conversion(){ | |||
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:{ |
@@ -60,18 +64,18 @@ void Converter::start_conversion(){ | |||
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:{ |
@@ -79,24 +83,24 @@ void Converter::start_conversion(){ | |||
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:{ |
@@ -104,18 +108,18 @@ void Converter::start_conversion(){ | |||
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:{ |
@@ -123,18 +127,18 @@ void Converter::start_conversion(){ | |||
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 | ||
@@ -143,23 +147,23 @@ void Converter::start_conversion(){ | |||
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.. |
@@ -178,18 +182,18 @@ void Converter::start_conversion(){ | |||
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 | ||
192 | int main( int argc, char** argv ) { | 196 | int main( int argc, char** argv ) { |
193 | 197 | ||
194 | QPEApplication a( argc, argv ); | 198 | QPEApplication a( argc, argv ); |
195 | 199 | ||