author | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
commit | 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 (patch) (unidiff) | |
tree | 0701eae15aa606a0211a2fccfde0eafdac69357c | |
parent | 8d2d2664e5f544b8292806e617deb7a0e4170dc0 (diff) | |
download | opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.zip opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.gz opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.bz2 |
convert to Opie Debugging Framework
232 files changed, 2793 insertions, 2569 deletions
diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp index ae7fbd0..34802fb 100644 --- a/noncore/applets/autorotateapplet/autorotate.cpp +++ b/noncore/applets/autorotateapplet/autorotate.cpp | |||
@@ -12,18 +12,18 @@ | |||
12 | 12 | ||
13 | #include "autorotate.h" | 13 | #include "autorotate.h" |
14 | 14 | ||
15 | /* OPIE */ | 15 | /* OPIE */ |
16 | #include <opie2/odevice.h> | 16 | #include <opie2/odebug.h> |
17 | #include <opie2/otaskbarapplet.h> | 17 | #include <opie2/otaskbarapplet.h> |
18 | #include <qpe/applnk.h> | 18 | #include <qpe/applnk.h> |
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | using namespace Opie::Core; | ||
21 | 22 | ||
22 | /* QT */ | 23 | /* QT */ |
23 | #include <qpainter.h> | 24 | #include <qpainter.h> |
24 | 25 | ||
25 | using namespace Opie::Ui; | ||
26 | AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) | 26 | AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) |
27 | { | 27 | { |
28 | setFixedWidth( AppLnk::smallIconSize() ); | 28 | setFixedWidth( AppLnk::smallIconSize() ); |
29 | setFixedHeight( AppLnk::smallIconSize() ); | 29 | setFixedHeight( AppLnk::smallIconSize() ); |
@@ -86,12 +86,12 @@ bool AutoRotate::isRotateEnabled() | |||
86 | 86 | ||
87 | bool res = cfg.readBoolEntry( "rotateEnabled" ); | 87 | bool res = cfg.readBoolEntry( "rotateEnabled" ); |
88 | 88 | ||
89 | if (res ) | 89 | if (res ) |
90 | qDebug("Enabled"); | 90 | odebug << "Enabled" << oendl; |
91 | else | 91 | else |
92 | qDebug("Disabled"); | 92 | odebug << "Disabled" << oendl; |
93 | return res; | 93 | return res; |
94 | } | 94 | } |
95 | 95 | ||
96 | EXPORT_OPIE_APPLET_v1( AutoRotate ) | 96 | EXPORT_OPIE_APPLET_v1( AutoRotate ) |
97 | 97 | ||
diff --git a/noncore/applets/memoryapplet/swapfile.cpp b/noncore/applets/memoryapplet/swapfile.cpp index 9416db3..a71078f 100644 --- a/noncore/applets/memoryapplet/swapfile.cpp +++ b/noncore/applets/memoryapplet/swapfile.cpp | |||
@@ -19,8 +19,14 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "swapfile.h" | 21 | #include "swapfile.h" |
22 | 22 | ||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
25 | #include <qpe/resource.h> | ||
26 | using namespace Opie::Core; | ||
27 | |||
28 | /* QT */ | ||
23 | #include <qfile.h> | 29 | #include <qfile.h> |
24 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
25 | #include <qlabel.h> | 31 | #include <qlabel.h> |
26 | #include <qtimer.h> | 32 | #include <qtimer.h> |
@@ -33,15 +39,14 @@ | |||
33 | #include <qcombobox.h> | 39 | #include <qcombobox.h> |
34 | #include <qvgroupbox.h> | 40 | #include <qvgroupbox.h> |
35 | #include <qhbox.h> | 41 | #include <qhbox.h> |
36 | #include <qmessagebox.h> | 42 | #include <qmessagebox.h> |
43 | #include <qcopchannel_qws.h> | ||
44 | |||
45 | /* STD */ | ||
37 | #include <stdio.h> | 46 | #include <stdio.h> |
38 | #include <stdlib.h> | 47 | #include <stdlib.h> |
39 | #include <string.h> | 48 | #include <string.h> |
40 | |||
41 | #include <qcopchannel_qws.h> | ||
42 | #include <qpe/resource.h> | ||
43 | |||
44 | #include <unistd.h> | 49 | #include <unistd.h> |
45 | #include <fcntl.h> | 50 | #include <fcntl.h> |
46 | #include <sys/vfs.h> | 51 | #include <sys/vfs.h> |
47 | #include <mntent.h> | 52 | #include <mntent.h> |
@@ -53,13 +58,13 @@ Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f ) | |||
53 | { | 58 | { |
54 | // are we running as root? | 59 | // are we running as root? |
55 | isRoot = geteuid() == 0; | 60 | isRoot = geteuid() == 0; |
56 | 61 | ||
57 | QVBoxLayout* vb = new QVBoxLayout(this, 5); | 62 | QVBoxLayout* vb = new QVBoxLayout(this, 5); |
58 | 63 | ||
59 | QHButtonGroup* cfsdRBG = new QHButtonGroup(tr("Swapfile location"), this); | 64 | QHButtonGroup* cfsdRBG = new QHButtonGroup(tr("Swapfile location"), this); |
60 | cfsdRBG->setRadioButtonExclusive(true); | 65 | cfsdRBG->setRadioButtonExclusive(true); |
61 | vb->addWidget(cfsdRBG); | 66 | vb->addWidget(cfsdRBG); |
62 | 67 | ||
63 | ramRB = new QRadioButton(tr("RAM"), cfsdRBG); | 68 | ramRB = new QRadioButton(tr("RAM"), cfsdRBG); |
64 | cfRB = new QRadioButton(tr("CF Card"), cfsdRBG); | 69 | cfRB = new QRadioButton(tr("CF Card"), cfsdRBG); |
65 | sdRB = new QRadioButton(tr("SD Card"), cfsdRBG); | 70 | sdRB = new QRadioButton(tr("SD Card"), cfsdRBG); |
@@ -74,9 +79,9 @@ Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f ) | |||
74 | QPushButton* swapOff = new QPushButton(tr(" Off "), hb1); | 79 | QPushButton* swapOff = new QPushButton(tr(" Off "), hb1); |
75 | vb->addWidget(hb1); | 80 | vb->addWidget(hb1); |
76 | 81 | ||
77 | QVGroupBox* box1 = new QVGroupBox(tr("Manage Swapfile"), this); | 82 | QVGroupBox* box1 = new QVGroupBox(tr("Manage Swapfile"), this); |
78 | vb->addWidget(box1); | 83 | vb->addWidget(box1); |
79 | 84 | ||
80 | QHBox *hb2 = new QHBox(box1); | 85 | QHBox *hb2 = new QHBox(box1); |
81 | hb2->setSpacing(5); | 86 | hb2->setSpacing(5); |
82 | QPushButton* mkSwap = new QPushButton(tr("Generate"), hb2); | 87 | QPushButton* mkSwap = new QPushButton(tr("Generate"), hb2); |
@@ -212,9 +217,9 @@ void Swapfile::getStatusPcmcia() | |||
212 | } | 217 | } |
213 | } | 218 | } |
214 | } else { | 219 | } else { |
215 | // no file found | 220 | // no file found |
216 | qDebug("no file found"); | 221 | odebug << "no file found" << oendl; |
217 | cardInPcmcia0 = FALSE; | 222 | cardInPcmcia0 = FALSE; |
218 | cardInPcmcia1 = FALSE; | 223 | cardInPcmcia1 = FALSE; |
219 | } | 224 | } |
220 | Swapfile::cfsdchecked(); | 225 | Swapfile::cfsdchecked(); |
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp index 5eb5ad2..534a8d0 100644 --- a/noncore/applets/networkapplet/networkapplet.cpp +++ b/noncore/applets/networkapplet/networkapplet.cpp | |||
@@ -35,19 +35,21 @@ | |||
35 | #include <opie2/onetwork.h> | 35 | #include <opie2/onetwork.h> |
36 | #include <opie2/otaskbarapplet.h> | 36 | #include <opie2/otaskbarapplet.h> |
37 | #include <qpe/applnk.h> | 37 | #include <qpe/applnk.h> |
38 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
39 | #include <qpainter.h> | 39 | using namespace Opie::Core; |
40 | using namespace Opie::Ui; | ||
41 | using namespace Opie::Net; | ||
40 | 42 | ||
41 | /* QT */ | 43 | /* QT */ |
44 | #include <qpainter.h> | ||
42 | #include <qlabel.h> | 45 | #include <qlabel.h> |
43 | #include <qlayout.h> | 46 | #include <qlayout.h> |
44 | #include <qobjectlist.h> | 47 | #include <qobjectlist.h> |
45 | 48 | ||
49 | /* STD */ | ||
46 | #include <assert.h> | 50 | #include <assert.h> |
47 | 51 | ||
48 | using namespace Opie::Ui; | ||
49 | using namespace Opie::Net; | ||
50 | IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) | 52 | IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) |
51 | :QToolButton( parent, name ) | 53 | :QToolButton( parent, name ) |
52 | { | 54 | { |
53 | _iface = ONetwork::instance()->interface( name ); | 55 | _iface = ONetwork::instance()->interface( name ); |
@@ -166,17 +168,17 @@ QString NetworkAppletControl::guessDevice( ONetworkInterface* iface ) | |||
166 | 168 | ||
167 | 169 | ||
168 | void NetworkAppletControl::showEvent( QShowEvent* e ) | 170 | void NetworkAppletControl::showEvent( QShowEvent* e ) |
169 | { | 171 | { |
170 | qDebug( "showEvent" ); | 172 | odebug << "showEvent" << oendl; |
171 | build(); | 173 | build(); |
172 | QWidget::showEvent( e ); | 174 | QWidget::showEvent( e ); |
173 | } | 175 | } |
174 | 176 | ||
175 | 177 | ||
176 | void NetworkAppletControl::hideEvent( QHideEvent* e ) | 178 | void NetworkAppletControl::hideEvent( QHideEvent* e ) |
177 | { | 179 | { |
178 | qDebug( "hideEvent" ); | 180 | odebug << "hideEvent" << oendl; |
179 | QWidget::hideEvent( e ); | 181 | QWidget::hideEvent( e ); |
180 | 182 | ||
181 | delete l; | 183 | delete l; |
182 | 184 | ||
@@ -191,9 +193,9 @@ void NetworkAppletControl::hideEvent( QHideEvent* e ) | |||
191 | } | 193 | } |
192 | 194 | ||
193 | list = const_cast<QObjectList*>( children() ); | 195 | list = const_cast<QObjectList*>( children() ); |
194 | if ( list ) | 196 | if ( list ) |
195 | qWarning( "D'oh! We still have %d children...", list->count() ); | 197 | owarn << "D'oh! We still have " << list->count() << " children..." << oendl; |
196 | 198 | ||
197 | // renew layout | 199 | // renew layout |
198 | l = new QVBoxLayout( this, 4, 2 ); | 200 | l = new QVBoxLayout( this, 4, 2 ); |
199 | resize( 0, 0 ); | 201 | resize( 0, 0 ); |
@@ -202,9 +204,9 @@ void NetworkAppletControl::hideEvent( QHideEvent* e ) | |||
202 | 204 | ||
203 | QSize NetworkAppletControl::sizeHint() const | 205 | QSize NetworkAppletControl::sizeHint() const |
204 | { | 206 | { |
205 | ONetwork::instance()->synchronize(); // rebuild interface database | 207 | ONetwork::instance()->synchronize(); // rebuild interface database |
206 | qDebug( "sizeHint (#ifaces=%d)", ONetwork::instance()->count() ); | 208 | odebug << "sizeHint (#ifaces=" << ONetwork::instance()->count() << ")" << oendl; |
207 | return QSize( 14+35+105+14 + 8, ONetwork::instance()->count() * 26 ); | 209 | return QSize( 14+35+105+14 + 8, ONetwork::instance()->count() * 26 ); |
208 | } | 210 | } |
209 | 211 | ||
210 | 212 | ||
diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in index 27a8187..c92c1d5 100644 --- a/noncore/applets/notesapplet/config.in +++ b/noncore/applets/notesapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config NOTESAPPLET | 1 | config NOTESAPPLET |
2 | boolean "opie-notesapplet (quick note taking applet)" | 2 | boolean "opie-notesapplet (quick note taking applet)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 13f7cf3..b3e72a7 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp | |||
@@ -14,27 +14,26 @@ | |||
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "notes.h" | 16 | #include "notes.h" |
17 | 17 | ||
18 | #include <qapplication.h> | 18 | /* OPIE */ |
19 | #include <stdlib.h> | 19 | #include <opie2/odebug.h> |
20 | #include <qstringlist.h> | ||
21 | |||
22 | #include <opie2/otaskbarapplet.h> | 20 | #include <opie2/otaskbarapplet.h> |
23 | #include <qpe/filemanager.h> | 21 | #include <qpe/filemanager.h> |
24 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/timestring.h> | 23 | #include <qpe/timestring.h> |
26 | #include <qpe/applnk.h> | 24 | #include <qpe/applnk.h> |
27 | #include <qpe/ir.h> | 25 | #include <qpe/ir.h> |
28 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | using namespace Opie::Core; | ||
28 | using namespace Opie::Ui; | ||
29 | 29 | ||
30 | // #include <qsocket.h> | 30 | /* QT */ |
31 | // #include <qclipboard.h> | ||
32 | #include <qmultilineedit.h> | 31 | #include <qmultilineedit.h> |
33 | #include <qlistbox.h> | 32 | #include <qlistbox.h> |
34 | #include <qpopupmenu.h> | 33 | #include <qpopupmenu.h> |
35 | #include <qmessagebox.h> | 34 | #include <qmessagebox.h> |
36 | 35 | #include <qapplication.h> | |
37 | #include <qdir.h> | 36 | #include <qdir.h> |
38 | #include <qfile.h> | 37 | #include <qfile.h> |
39 | #include <qpoint.h> | 38 | #include <qpoint.h> |
40 | #include <qpushbutton.h> | 39 | #include <qpushbutton.h> |
@@ -42,12 +41,15 @@ | |||
42 | #include <qlayout.h> | 41 | #include <qlayout.h> |
43 | #include <qframe.h> | 42 | #include <qframe.h> |
44 | #include <qpixmap.h> | 43 | #include <qpixmap.h> |
45 | #include <qstring.h> | 44 | #include <qstring.h> |
45 | #include <qstringlist.h> | ||
46 | #include <qtimer.h> | 46 | #include <qtimer.h> |
47 | 47 | ||
48 | /* STD */ | ||
49 | #include <stdlib.h> | ||
50 | |||
48 | /* XPM */ | 51 | /* XPM */ |
49 | using namespace Opie::Ui; | ||
50 | static char * notes_xpm[] = { | 52 | static char * notes_xpm[] = { |
51 | "16 16 11 1", | 53 | "16 16 11 1", |
52 | " c None", | 54 | " c None", |
53 | ". c #000000", | 55 | ". c #000000", |
@@ -83,11 +85,11 @@ NotesControl::NotesControl( QWidget *, const char * ) | |||
83 | // : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) | 85 | // : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) |
84 | { | 86 | { |
85 | QDir d( QDir::homeDirPath()+"/notes"); | 87 | QDir d( QDir::homeDirPath()+"/notes"); |
86 | if( !d.exists()) { | 88 | if( !d.exists()) { |
87 | qDebug("make dir"); | 89 | odebug << "make dir" << oendl; |
88 | if(!d.mkdir( QDir::homeDirPath()+"/notes", true)) | 90 | if(!d.mkdir( QDir::homeDirPath()+"/notes", true)) |
89 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed"); | 91 | odebug << "<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed" << oendl; |
90 | } | 92 | } |
91 | Config cfg("Notes"); | 93 | Config cfg("Notes"); |
92 | cfg.setGroup("Options"); | 94 | cfg.setGroup("Options"); |
93 | showMax = cfg.readBoolEntry("ShowMax", false); | 95 | showMax = cfg.readBoolEntry("ShowMax", false); |
@@ -164,9 +166,9 @@ void NotesControl::slotDeleteButtonClicked() { | |||
164 | 166 | ||
165 | void NotesControl::slotDeleteButton() { | 167 | void NotesControl::slotDeleteButton() { |
166 | 168 | ||
167 | QString selectedText = box->currentText(); | 169 | QString selectedText = box->currentText(); |
168 | qDebug("deleting "+selectedText); | 170 | odebug << "deleting "+selectedText << oendl; |
169 | 171 | ||
170 | if( !selectedText.isEmpty()) { | 172 | if( !selectedText.isEmpty()) { |
171 | 173 | ||
172 | Config cfg("Notes"); | 174 | Config cfg("Notes"); |
@@ -175,14 +177,14 @@ void NotesControl::slotDeleteButton() { | |||
175 | QString entryName, entryName2;; | 177 | QString entryName, entryName2;; |
176 | for ( int i = 0; i < noOfFiles; i++ ) { | 178 | for ( int i = 0; i < noOfFiles; i++ ) { |
177 | entryName.sprintf( "File%i", i + 1 ); | 179 | entryName.sprintf( "File%i", i + 1 ); |
178 | if(selectedText == cfg.readEntry( entryName )) { | 180 | if(selectedText == cfg.readEntry( entryName )) { |
179 | qDebug("removing %s, %d", selectedText.latin1(), i); | 181 | odebug << "removing " << selectedText.latin1() << ", " << i << "" << oendl; |
180 | for ( int j = i; j < noOfFiles; j++ ) { | 182 | for ( int j = i; j < noOfFiles; j++ ) { |
181 | entryName.sprintf( "File%i", i + 1 ); | 183 | entryName.sprintf( "File%i", i + 1 ); |
182 | entryName2.sprintf( "File%i", i + 2 ); | 184 | entryName2.sprintf( "File%i", i + 2 ); |
183 | QString temp = cfg.readEntry(entryName2); | 185 | QString temp = cfg.readEntry(entryName2); |
184 | qDebug("move "+temp); | 186 | odebug << "move "+temp << oendl; |
185 | cfg.writeEntry(entryName, temp); | 187 | cfg.writeEntry(entryName, temp); |
186 | i++; | 188 | i++; |
187 | } | 189 | } |
188 | cfg.writeEntry("NumberOfFiles", noOfFiles-1 ); | 190 | cfg.writeEntry("NumberOfFiles", noOfFiles-1 ); |
@@ -191,12 +193,12 @@ void NotesControl::slotDeleteButton() { | |||
191 | cfg.write(); | 193 | cfg.write(); |
192 | DocLnk nf(selectedText); | 194 | DocLnk nf(selectedText); |
193 | nf.removeFiles(); | 195 | nf.removeFiles(); |
194 | QString fi=QPEApplication::documentDir()+"/text/plain/"+selectedText+".desktop"; | 196 | QString fi=QPEApplication::documentDir()+"/text/plain/"+selectedText+".desktop"; |
195 | qDebug(fi); | 197 | odebug << fi << oendl; |
196 | 198 | ||
197 | QFile f( fi); | 199 | QFile f( fi); |
198 | if( !f.remove()) qDebug(".desktop file not removed"); | 200 | if( !f.remove()) odebug << ".desktop file not removed" << oendl; |
199 | 201 | ||
200 | } | 202 | } |
201 | } | 203 | } |
202 | view->clear(); | 204 | view->clear(); |
@@ -282,9 +284,9 @@ void NotesControl::focusOutEvent ( QFocusEvent * e) { | |||
282 | void NotesControl::save() { | 284 | void NotesControl::save() { |
283 | Config cfg("Notes"); | 285 | Config cfg("Notes"); |
284 | cfg.setGroup("Docs"); | 286 | cfg.setGroup("Docs"); |
285 | if( edited) { | 287 | if( edited) { |
286 | // qDebug("is edited"); | 288 | // odebug << "is edited" << oendl; |
287 | QString rt = view->text(); | 289 | QString rt = view->text(); |
288 | if( rt.length()>1) { | 290 | if( rt.length()>1) { |
289 | QString pt = rt.simplifyWhiteSpace(); | 291 | QString pt = rt.simplifyWhiteSpace(); |
290 | int i = pt.find( ' ', pt.find( ' ' )+2 ); | 292 | int i = pt.find( ' ', pt.find( ' ' )+2 ); |
@@ -300,9 +302,9 @@ void NotesControl::save() { | |||
300 | if ( docname.length() > 40 ) | 302 | if ( docname.length() > 40 ) |
301 | docname = docname.left(40); | 303 | docname = docname.left(40); |
302 | if ( docname.isEmpty() ) | 304 | if ( docname.isEmpty() ) |
303 | docname = "Empty Text"; | 305 | docname = "Empty Text"; |
304 | // qDebug(docname); | 306 | // odebug << docname << oendl; |
305 | 307 | ||
306 | if( oldDocName != docname) { | 308 | if( oldDocName != docname) { |
307 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 309 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
308 | QString entryName; | 310 | QString entryName; |
@@ -311,13 +313,13 @@ void NotesControl::save() { | |||
311 | cfg.writeEntry("NumberOfFiles", noOfFiles+1 ); | 313 | cfg.writeEntry("NumberOfFiles", noOfFiles+1 ); |
312 | cfg.write(); | 314 | cfg.write(); |
313 | } | 315 | } |
314 | // else | 316 | // else |
315 | // qDebug("oldname equals docname"); | 317 | // odebug << "oldname equals docname" << oendl; |
316 | 318 | ||
317 | doc = new DocLnk(docname); | 319 | doc = new DocLnk(docname); |
318 | if(QFile(doc->linkFile()).exists()) | 320 | if(QFile(doc->linkFile()).exists()) |
319 | qDebug("puppie"); | 321 | odebug << "puppie" << oendl; |
320 | doc->setType("text/plain"); | 322 | doc->setType("text/plain"); |
321 | doc->setName(docname); | 323 | doc->setName(docname); |
322 | QString temp = docname.replace( QRegExp(" "), "_" ); | 324 | QString temp = docname.replace( QRegExp(" "), "_" ); |
323 | doc->setFile( QDir::homeDirPath()+"/notes/"+temp); | 325 | doc->setFile( QDir::homeDirPath()+"/notes/"+temp); |
@@ -326,9 +328,9 @@ void NotesControl::save() { | |||
326 | } | 328 | } |
327 | 329 | ||
328 | oldDocName=docname; | 330 | oldDocName=docname; |
329 | edited=false; | 331 | edited=false; |
330 | // qDebug("save"); | 332 | // odebug << "save" << oendl; |
331 | if (doPopulate) | 333 | if (doPopulate) |
332 | populateBox(); | 334 | populateBox(); |
333 | } | 335 | } |
334 | cfg.writeEntry( "LastDoc",oldDocName ); | 336 | cfg.writeEntry( "LastDoc",oldDocName ); |
@@ -338,9 +340,9 @@ void NotesControl::save() { | |||
338 | } | 340 | } |
339 | 341 | ||
340 | void NotesControl::populateBox() { | 342 | void NotesControl::populateBox() { |
341 | box->clear(); | 343 | box->clear(); |
342 | // qDebug("populate"); | 344 | // odebug << "populate" << oendl; |
343 | Config cfg("Notes"); | 345 | Config cfg("Notes"); |
344 | cfg.setGroup("Docs"); | 346 | cfg.setGroup("Docs"); |
345 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 347 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
346 | QStringList list; | 348 | QStringList list; |
@@ -373,9 +375,9 @@ void NotesControl::load() { | |||
373 | } | 375 | } |
374 | } | 376 | } |
375 | 377 | ||
376 | void NotesControl::load(const QString & file) { | 378 | void NotesControl::load(const QString & file) { |
377 | qDebug("loading "+file); | 379 | odebug << "loading "+file << oendl; |
378 | QString name = file; | 380 | QString name = file; |
379 | QString temp; | 381 | QString temp; |
380 | if( !QFile( QDir::homeDirPath()+"/"+file).exists() ) | 382 | if( !QFile( QDir::homeDirPath()+"/"+file).exists() ) |
381 | temp = QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" ); | 383 | temp = QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" ); |
@@ -400,9 +402,9 @@ void NotesControl::load(const QString & file) { | |||
400 | void NotesControl::loadDoc( const DocLnk &f) { | 402 | void NotesControl::loadDoc( const DocLnk &f) { |
401 | FileManager fm; | 403 | FileManager fm; |
402 | QString txt; | 404 | QString txt; |
403 | if ( !fm.loadFile( f, txt ) ) { | 405 | if ( !fm.loadFile( f, txt ) ) { |
404 | qDebug("could not load file "+f.file()); | 406 | odebug << "could not load file "+f.file() << oendl; |
405 | return; | 407 | return; |
406 | } | 408 | } |
407 | view->setText(txt); | 409 | view->setText(txt); |
408 | } | 410 | } |
@@ -434,9 +436,9 @@ void NotesControl::slotSearch() { | |||
434 | 436 | ||
435 | // switch ( e->state() ) { | 437 | // switch ( e->state() ) { |
436 | // case ControlButton: | 438 | // case ControlButton: |
437 | // if(e->key() == Key_C) { //copy | 439 | // if(e->key() == Key_C) { //copy |
438 | // qDebug("copy"); | 440 | // odebug << "copy" << oendl; |
439 | // QClipboard *cb = QApplication::clipboard(); | 441 | // QClipboard *cb = QApplication::clipboard(); |
440 | // QString text; | 442 | // QString text; |
441 | 443 | ||
442 | // // Copy text from the clipboard (paste) | 444 | // // Copy text from the clipboard (paste) |
@@ -481,12 +483,12 @@ void NotesApplet::mousePressEvent( QMouseEvent *) { | |||
481 | } else { | 483 | } else { |
482 | // vc = new NotesControl; | 484 | // vc = new NotesControl; |
483 | // QPoint curPos = mapToGlobal( rect().topLeft() ); | 485 | // QPoint curPos = mapToGlobal( rect().topLeft() ); |
484 | if(vc->showMax) { | 486 | if(vc->showMax) { |
485 | qDebug("show max"); | 487 | odebug << "show max" << oendl; |
486 | vc->showMaximized(); | 488 | vc->showMaximized(); |
487 | } else { | 489 | } else { |
488 | qDebug("no show max"); | 490 | odebug << "no show max" << oendl; |
489 | QWidget *wid = QPEApplication::desktop(); | 491 | QWidget *wid = QPEApplication::desktop(); |
490 | QRect rect = QApplication::desktop()->geometry(); | 492 | QRect rect = QApplication::desktop()->geometry(); |
491 | vc->setGeometry( ( wid->width() / 2) - ( vc->width() / 2 ) , 28 , wid->width() -10 , 180); | 493 | vc->setGeometry( ( wid->width() / 2) - ( vc->width() / 2 ) , 28 , wid->width() -10 , 180); |
492 | vc->move ( (rect.center()/2) - (vc->rect().center()/2)); | 494 | vc->move ( (rect.center()/2) - (vc->rect().center()/2)); |
diff --git a/noncore/applets/notesapplet/notesapplet.pro b/noncore/applets/notesapplet/notesapplet.pro index 44e5b34..c3f9b1c 100644 --- a/noncore/applets/notesapplet/notesapplet.pro +++ b/noncore/applets/notesapplet/notesapplet.pro | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on | 2 | CONFIG += qt plugin warn_on |
3 | HEADERS = notes.h | 3 | HEADERS = notes.h |
4 | SOURCES = notes.cpp | 4 | SOURCES = notes.cpp |
5 | TARGET = notesapplet | 5 | TARGET = notesapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.1 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp index 0491a86..364f3ad 100644 --- a/noncore/applets/wirelessapplet/wireless.cpp +++ b/noncore/applets/wirelessapplet/wireless.cpp | |||
@@ -15,12 +15,16 @@ | |||
15 | #include "mgraph.h" | 15 | #include "mgraph.h" |
16 | #include "advancedconfig.h" | 16 | #include "advancedconfig.h" |
17 | 17 | ||
18 | /* OPIE */ | 18 | /* OPIE */ |
19 | #include <opie2/odebug.h> | ||
19 | #include <opie2/onetwork.h> | 20 | #include <opie2/onetwork.h> |
20 | #include <opie2/otaskbarapplet.h> | 21 | #include <opie2/otaskbarapplet.h> |
21 | #include <qpe/config.h> | 22 | #include <qpe/config.h> |
22 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | using namespace Opie::Core; | ||
25 | using namespace Opie::Ui; | ||
26 | using namespace Opie::Net; | ||
23 | 27 | ||
24 | /* QT */ | 28 | /* QT */ |
25 | #include <qradiobutton.h> | 29 | #include <qradiobutton.h> |
26 | #include <qpushbutton.h> | 30 | #include <qpushbutton.h> |
@@ -42,10 +46,8 @@ | |||
42 | 46 | ||
43 | //#define MDEBUG | 47 | //#define MDEBUG |
44 | #undef MDEBUG | 48 | #undef MDEBUG |
45 | 49 | ||
46 | using namespace Opie::Ui; | ||
47 | using namespace Opie::Net; | ||
48 | WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) | 50 | WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) |
49 | : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) | 51 | : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) |
50 | { | 52 | { |
51 | 53 | ||
@@ -206,25 +208,25 @@ void WirelessApplet::checkInterface() | |||
206 | 208 | ||
207 | if ( interface ) | 209 | if ( interface ) |
208 | { | 210 | { |
209 | #ifdef MDEBUG | 211 | #ifdef MDEBUG |
210 | qDebug( "WIFIAPPLET: using interface '%s'", ( const char* ) interface->name() ); | 212 | odebug << "WIFIAPPLET: using interface '" << ( const char* ) interface->name() << "'" << oendl; |
211 | #endif | 213 | #endif |
212 | 214 | ||
213 | } | 215 | } |
214 | else | 216 | else |
215 | { | 217 | { |
216 | #ifdef MDEBUG | 218 | #ifdef MDEBUG |
217 | qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" ); | 219 | odebug << "WIFIAPPLET: D'oh! No Wireless interface present... :(" << oendl; |
218 | #endif | 220 | #endif |
219 | hide(); | 221 | hide(); |
220 | } | 222 | } |
221 | } | 223 | } |
222 | 224 | ||
223 | void WirelessApplet::renewDHCP() | 225 | void WirelessApplet::renewDHCP() |
224 | { | 226 | { |
225 | #ifdef MDEBUG | 227 | #ifdef MDEBUG |
226 | qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." ); | 228 | odebug << "WIFIAPPLET: Going to request a DHCP configuration renew." << oendl; |
227 | #endif | 229 | #endif |
228 | 230 | ||
229 | QString pidfile; | 231 | QString pidfile; |
230 | if ( !interface ) | 232 | if ( !interface ) |
@@ -234,9 +236,9 @@ void WirelessApplet::renewDHCP() | |||
234 | // At first we are trying dhcpcd | 236 | // At first we are trying dhcpcd |
235 | 237 | ||
236 | pidfile.sprintf( "/var/run/dhcpcd-%s.pid", ( const char* ) ifacename ); | 238 | pidfile.sprintf( "/var/run/dhcpcd-%s.pid", ( const char* ) ifacename ); |
237 | #ifdef MDEBUG | 239 | #ifdef MDEBUG |
238 | qDebug( "WIFIAPPLET: dhcpcd pidfile is '%s'", ( const char* ) pidfile ); | 240 | odebug << "WIFIAPPLET: dhcpcd pidfile is '" << ( const char* ) pidfile << "'" << oendl; |
239 | #endif | 241 | #endif |
240 | int pid; | 242 | int pid; |
241 | QFile pfile( pidfile ); | 243 | QFile pfile( pidfile ); |
242 | bool hasFile = pfile.open( IO_ReadOnly ); | 244 | bool hasFile = pfile.open( IO_ReadOnly ); |
@@ -244,30 +246,30 @@ void WirelessApplet::renewDHCP() | |||
244 | if ( hasFile ) | 246 | if ( hasFile ) |
245 | { | 247 | { |
246 | s >> pid; | 248 | s >> pid; |
247 | #ifdef MDEBUG | 249 | #ifdef MDEBUG |
248 | qDebug( "WIFIAPPLET: sent SIGALARM to pid %d", pid ); | 250 | odebug << "WIFIAPPLET: sent SIGALARM to pid " << pid << "" << oendl; |
249 | #endif | 251 | #endif |
250 | kill( pid, SIGALRM ); | 252 | kill( pid, SIGALRM ); |
251 | return ; | 253 | return ; |
252 | } | 254 | } |
253 | 255 | ||
254 | // No dhcpcd, so we are trying udhcpc | 256 | // No dhcpcd, so we are trying udhcpc |
255 | #ifdef MDEBUG | 257 | #ifdef MDEBUG |
256 | qDebug( "WIFIAPPLET: dhcpcd not available." ); | 258 | odebug << "WIFIAPPLET: dhcpcd not available." << oendl; |
257 | #endif | 259 | #endif |
258 | pidfile.sprintf( "/var/run/udhcpc.%s.pid", ( const char* ) ifacename ); | 260 | pidfile.sprintf( "/var/run/udhcpc.%s.pid", ( const char* ) ifacename ); |
259 | #ifdef MDEBUG | 261 | #ifdef MDEBUG |
260 | qDebug( "WIFIAPPLET: udhcpc pidfile is '%s'", ( const char* ) pidfile ); | 262 | odebug << "WIFIAPPLET: udhcpc pidfile is '" << ( const char* ) pidfile << "'" << oendl; |
261 | #endif | 263 | #endif |
262 | QFile pfile2( pidfile ); | 264 | QFile pfile2( pidfile ); |
263 | hasFile = pfile2.open( IO_ReadOnly ); | 265 | hasFile = pfile2.open( IO_ReadOnly ); |
264 | QTextStream s2( &pfile2 ); | 266 | QTextStream s2( &pfile2 ); |
265 | if ( hasFile ) | 267 | if ( hasFile ) |
266 | { | 268 | { |
267 | s2 >> pid; | 269 | s2 >> pid; |
268 | #ifdef MDEBUG | 270 | #ifdef MDEBUG |
269 | qDebug( "WIFIAPPLET: sent SIGUSR1 to pid %d", pid ); | 271 | odebug << "WIFIAPPLET: sent SIGUSR1 to pid " << pid << "" << oendl; |
270 | #endif | 272 | #endif |
271 | kill( pid, SIGUSR1 ); | 273 | kill( pid, SIGUSR1 ); |
272 | return ; | 274 | return ; |
273 | } | 275 | } |
@@ -302,16 +304,16 @@ WirelessApplet::~WirelessApplet() | |||
302 | 304 | ||
303 | void WirelessApplet::timerEvent( QTimerEvent* ) | 305 | void WirelessApplet::timerEvent( QTimerEvent* ) |
304 | { | 306 | { |
305 | #ifdef MDEBUG | 307 | #ifdef MDEBUG |
306 | qDebug( "WirelessApplet::timerEvent" ); | 308 | odebug << "WirelessApplet::timerEvent" << oendl; |
307 | #endif | 309 | #endif |
308 | if ( interface ) | 310 | if ( interface ) |
309 | { | 311 | { |
310 | if ( !ONetwork::instance()->isPresent( (const char*) interface->name() ) ) | 312 | if ( !ONetwork::instance()->isPresent( (const char*) interface->name() ) ) |
311 | { | 313 | { |
312 | #ifdef MDEBUG | 314 | #ifdef MDEBUG |
313 | qDebug( "WIFIAPPLET: Interface no longer present." ); | 315 | odebug << "WIFIAPPLET: Interface no longer present." << oendl; |
314 | #endif | 316 | #endif |
315 | interface = 0L; | 317 | interface = 0L; |
316 | mustRepaint(); | 318 | mustRepaint(); |
317 | return; | 319 | return; |
@@ -319,9 +321,9 @@ void WirelessApplet::timerEvent( QTimerEvent* ) | |||
319 | 321 | ||
320 | if ( mustRepaint() ) | 322 | if ( mustRepaint() ) |
321 | { | 323 | { |
322 | #ifdef MDEBUG | 324 | #ifdef MDEBUG |
323 | qDebug( "WIFIAPPLET: A value has changed -> repainting." ); | 325 | odebug << "WIFIAPPLET: A value has changed -> repainting." << oendl; |
324 | #endif | 326 | #endif |
325 | repaint(); | 327 | repaint(); |
326 | } | 328 | } |
327 | 329 | ||
@@ -355,16 +357,16 @@ bool WirelessApplet::mustRepaint() | |||
355 | oldiface = interface; | 357 | oldiface = interface; |
356 | if ( interface ) | 358 | if ( interface ) |
357 | { | 359 | { |
358 | #ifdef MDEBUG | 360 | #ifdef MDEBUG |
359 | qDebug( "WIFIAPPLET: We had no interface but now we have one! :-)" ); | 361 | odebug << "WIFIAPPLET: We had no interface but now we have one! :-)" << oendl; |
360 | #endif | 362 | #endif |
361 | show(); | 363 | show(); |
362 | } | 364 | } |
363 | else | 365 | else |
364 | { | 366 | { |
365 | #ifdef MDEBUG | 367 | #ifdef MDEBUG |
366 | qDebug( "WIFIAPPLET: We had a interface but now we don't have one! ;-(" ); | 368 | odebug << "WIFIAPPLET: We had a interface but now we don't have one! ;-(" << oendl; |
367 | #endif | 369 | #endif |
368 | hide(); | 370 | hide(); |
369 | return true; | 371 | return true; |
370 | } | 372 | } |
@@ -394,30 +396,30 @@ bool WirelessApplet::mustRepaint() | |||
394 | 396 | ||
395 | if ( rocESSID && ( oldESSID != interface->SSID() ) ) | 397 | if ( rocESSID && ( oldESSID != interface->SSID() ) ) |
396 | { | 398 | { |
397 | #ifdef MDEBUG | 399 | #ifdef MDEBUG |
398 | qDebug( "WIFIAPPLET: ESSID has changed." ); | 400 | odebug << "WIFIAPPLET: ESSID has changed." << oendl; |
399 | #endif | 401 | #endif |
400 | renewDHCP(); | 402 | renewDHCP(); |
401 | } | 403 | } |
402 | else if ( rocFREQ && ( oldFREQ != interface->frequency() ) ) | 404 | else if ( rocFREQ && ( oldFREQ != interface->frequency() ) ) |
403 | { | 405 | { |
404 | #ifdef MDEBUG | 406 | #ifdef MDEBUG |
405 | qDebug( "WIFIAPPLET: FREQ has changed." ); | 407 | odebug << "WIFIAPPLET: FREQ has changed." << oendl; |
406 | #endif | 408 | #endif |
407 | renewDHCP(); | 409 | renewDHCP(); |
408 | } | 410 | } |
409 | else if ( rocAP && ( oldAP != interface->associatedAP().toString() ) ) | 411 | else if ( rocAP && ( oldAP != interface->associatedAP().toString() ) ) |
410 | { | 412 | { |
411 | #ifdef MDEBUG | 413 | #ifdef MDEBUG |
412 | qDebug( "WIFIAPPLET: AP has changed." ); | 414 | odebug << "WIFIAPPLET: AP has changed." << oendl; |
413 | #endif | 415 | #endif |
414 | renewDHCP(); | 416 | renewDHCP(); |
415 | } | 417 | } |
416 | else if ( rocMODE && ( oldMODE != interface->mode() ) ) | 418 | else if ( rocMODE && ( oldMODE != interface->mode() ) ) |
417 | { | 419 | { |
418 | #ifdef MDEBUG | 420 | #ifdef MDEBUG |
419 | qDebug( "WIFIAPPLET: MODE has changed." ); | 421 | odebug << "WIFIAPPLET: MODE has changed." << oendl; |
420 | #endif | 422 | #endif |
421 | renewDHCP(); | 423 | renewDHCP(); |
422 | } | 424 | } |
423 | 425 | ||
@@ -449,9 +451,9 @@ void WirelessApplet::updatePopupWindow() | |||
449 | int WirelessApplet::numberOfRings() | 451 | int WirelessApplet::numberOfRings() |
450 | { | 452 | { |
451 | if ( !interface ) return -1; | 453 | if ( !interface ) return -1; |
452 | int qualityH = interface->signalStrength(); | 454 | int qualityH = interface->signalStrength(); |
453 | qDebug( "quality = %d", qualityH ); | 455 | odebug << "quality = " << qualityH << "" << oendl; |
454 | if ( qualityH < 1 ) return -1; | 456 | if ( qualityH < 1 ) return -1; |
455 | if ( qualityH < 20 ) return 0; | 457 | if ( qualityH < 20 ) return 0; |
456 | if ( qualityH < 40 ) return 1; | 458 | if ( qualityH < 40 ) return 1; |
457 | if ( qualityH < 60 ) return 2; | 459 | if ( qualityH < 60 ) return 2; |
@@ -480,9 +482,9 @@ void WirelessApplet::paintEvent( QPaintEvent* ) | |||
480 | p.drawLine( w/2+m+m, h/2-m-m, w/2-m-m, h/2+m+m ); | 482 | p.drawLine( w/2+m+m, h/2-m-m, w/2-m-m, h/2+m+m ); |
481 | return; | 483 | return; |
482 | } | 484 | } |
483 | 485 | ||
484 | qDebug( "WirelessApplet: painting %d rings", rings ); | 486 | odebug << "WirelessApplet: painting " << rings << " rings" << oendl; |
485 | int radius = 2; | 487 | int radius = 2; |
486 | int rstep = 4; | 488 | int rstep = 4; |
487 | int maxrings = w/rstep; | 489 | int maxrings = w/rstep; |
488 | 490 | ||
diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp index 3acff1e..13d554c 100644 --- a/noncore/applets/zkbapplet/zkbwidget.cpp +++ b/noncore/applets/zkbapplet/zkbwidget.cpp | |||
@@ -93,9 +93,9 @@ QSize ZkbWidget::sizeHint() const { | |||
93 | return QSize(AppLnk::smallIconSize(),AppLnk::smallIconSize()); | 93 | return QSize(AppLnk::smallIconSize(),AppLnk::smallIconSize()); |
94 | } | 94 | } |
95 | 95 | ||
96 | void ZkbWidget::stateChanged(const QString& s) { | 96 | void ZkbWidget::stateChanged(const QString& s) { |
97 | //qDebug("stateChanged: %s\n", (const char*) s.utf8()); | 97 | //odebug << "stateChanged: " << (const char*) s.utf8() << "\n" << oendl; |
98 | setText(s); | 98 | setText(s); |
99 | } | 99 | } |
100 | 100 | ||
101 | void ZkbWidget::labelChanged(int id) { | 101 | void ZkbWidget::labelChanged(int id) { |
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index a60d6ce..a47edd8 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -70,9 +70,9 @@ void AdvancedFm::cleanUp() { | |||
70 | file.remove(); | 70 | file.remove(); |
71 | } | 71 | } |
72 | 72 | ||
73 | void AdvancedFm::tabChanged(QWidget *) { | 73 | void AdvancedFm::tabChanged(QWidget *) { |
74 | // qWarning("tab changed"); | 74 | // owarn << "tab changed" << oendl; |
75 | QString path = CurrentDir()->canonicalPath(); | 75 | QString path = CurrentDir()->canonicalPath(); |
76 | currentPathCombo->lineEdit()->setText( path ); | 76 | currentPathCombo->lineEdit()->setText( path ); |
77 | 77 | ||
78 | if(whichTab == 1) { | 78 | if(whichTab == 1) { |
@@ -92,15 +92,15 @@ void AdvancedFm::tabChanged(QWidget *) { | |||
92 | 92 | ||
93 | 93 | ||
94 | void AdvancedFm::populateView() { | 94 | void AdvancedFm::populateView() { |
95 | 95 | ||
96 | // qWarning("PopulateView"); | 96 | // owarn << "PopulateView" << oendl; |
97 | QPixmap pm; | 97 | QPixmap pm; |
98 | QListView *thisView = CurrentView(); | 98 | QListView *thisView = CurrentView(); |
99 | QDir *thisDir = CurrentDir(); | 99 | QDir *thisDir = CurrentDir(); |
100 | QString path = thisDir->canonicalPath(); | 100 | QString path = thisDir->canonicalPath(); |
101 | 101 | ||
102 | //qWarning("path is "+path); | 102 | //owarn << "path is "+path << oendl; |
103 | thisView->clear(); | 103 | thisView->clear(); |
104 | thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 104 | thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
105 | thisDir->setMatchAllDirs(TRUE); | 105 | thisDir->setMatchAllDirs(TRUE); |
106 | thisDir->setNameFilter(filterStr); | 106 | thisDir->setNameFilter(filterStr); |
@@ -159,9 +159,9 @@ void AdvancedFm::populateView() { | |||
159 | pm = unknownXpm; | 159 | pm = unknownXpm; |
160 | } | 160 | } |
161 | } | 161 | } |
162 | if( fi->isSymLink() || fileL.find("->",0,TRUE) != -1) { | 162 | if( fi->isSymLink() || fileL.find("->",0,TRUE) != -1) { |
163 | // qDebug(" overlay link image"); | 163 | // odebug << " overlay link image" << oendl; |
164 | pm= Resource::loadPixmap( "advancedfm/symlink" ); | 164 | pm= Resource::loadPixmap( "advancedfm/symlink" ); |
165 | // pm= Resource::loadPixmap( "folder" ); | 165 | // pm= Resource::loadPixmap( "folder" ); |
166 | // QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); | 166 | // QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); |
167 | // QPainter painter( &pm ); | 167 | // QPainter painter( &pm ); |
@@ -183,9 +183,9 @@ void AdvancedFm::populateView() { | |||
183 | 183 | ||
184 | if((dir = opendir( path.latin1())) != NULL) | 184 | if((dir = opendir( path.latin1())) != NULL) |
185 | while ((mydirent = readdir(dir)) != NULL) { | 185 | while ((mydirent = readdir(dir)) != NULL) { |
186 | lstat( mydirent->d_name, &buf); | 186 | lstat( mydirent->d_name, &buf); |
187 | // qDebug(mydirent->d_name); | 187 | // odebug << mydirent->d_name << oendl; |
188 | fileL.sprintf("%s", mydirent->d_name); | 188 | fileL.sprintf("%s", mydirent->d_name); |
189 | devT = buf.st_dev; | 189 | devT = buf.st_dev; |
190 | fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); | 190 | fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); |
191 | fileDate.sprintf("%s", ctime( &buf.st_mtime)); | 191 | fileDate.sprintf("%s", ctime( &buf.st_mtime)); |
@@ -208,9 +208,9 @@ void AdvancedFm::rePopulate() { | |||
208 | setOtherTabCurrent(); | 208 | setOtherTabCurrent(); |
209 | populateView(); | 209 | populateView(); |
210 | 210 | ||
211 | // int tmpTab = whichTab; | 211 | // int tmpTab = whichTab; |
212 | // // qDebug("%d", tmpTab); | 212 | // // odebug << "" << tmpTab << "" << oendl; |
213 | 213 | ||
214 | // for(int i =1; i < 3; i++) { | 214 | // for(int i =1; i < 3; i++) { |
215 | // TabWidget->setCurrentWidget(i - 1); | 215 | // TabWidget->setCurrentWidget(i - 1); |
216 | // populateView(); | 216 | // populateView(); |
@@ -218,12 +218,12 @@ void AdvancedFm::rePopulate() { | |||
218 | // TabWidget->setCurrentWidget( tmpTab - 1); | 218 | // TabWidget->setCurrentWidget( tmpTab - 1); |
219 | } | 219 | } |
220 | 220 | ||
221 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) { | 221 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) { |
222 | //qWarning("listclicked"); | 222 | //owarn << "listclicked" << oendl; |
223 | if(selectedItem) { | 223 | if(selectedItem) { |
224 | QString strItem=selectedItem->text(0); | 224 | QString strItem=selectedItem->text(0); |
225 | // qWarning(strItem); | 225 | // owarn << strItem << oendl; |
226 | QString strSize=selectedItem->text(1); | 226 | QString strSize=selectedItem->text(1); |
227 | strSize=strSize.stripWhiteSpace(); | 227 | strSize=strSize.stripWhiteSpace(); |
228 | bool isDirectory = false; | 228 | bool isDirectory = false; |
229 | QString strItem2; | 229 | QString strItem2; |
@@ -266,15 +266,15 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in | |||
266 | } | 266 | } |
267 | 267 | ||
268 | 268 | ||
269 | void AdvancedFm::switchToLocalTab() { | 269 | void AdvancedFm::switchToLocalTab() { |
270 | //qWarning("switch to local view"); | 270 | //owarn << "switch to local view" << oendl; |
271 | TabWidget->setCurrentWidget(0); | 271 | TabWidget->setCurrentWidget(0); |
272 | Local_View->setFocus(); | 272 | Local_View->setFocus(); |
273 | } | 273 | } |
274 | 274 | ||
275 | void AdvancedFm::switchToRemoteTab() { | 275 | void AdvancedFm::switchToRemoteTab() { |
276 | //qWarning("switch to local view"); | 276 | //owarn << "switch to local view" << oendl; |
277 | TabWidget->setCurrentWidget(1); | 277 | TabWidget->setCurrentWidget(1); |
278 | Remote_View->setFocus(); | 278 | Remote_View->setFocus(); |
279 | } | 279 | } |
280 | 280 | ||
@@ -328,9 +328,9 @@ QStringList AdvancedFm::getPath() { | |||
328 | QListViewItemIterator it( thisView ); | 328 | QListViewItemIterator it( thisView ); |
329 | for ( ; it.current(); ++it ) { | 329 | for ( ; it.current(); ++it ) { |
330 | if ( it.current()->isSelected() ) { | 330 | if ( it.current()->isSelected() ) { |
331 | strList << it.current()->text(0); | 331 | strList << it.current()->text(0); |
332 | // qDebug(it.current()->text(0)); | 332 | // odebug << it.current()->text(0) << oendl; |
333 | } | 333 | } |
334 | } | 334 | } |
335 | return strList; | 335 | return strList; |
336 | } | 336 | } |
@@ -379,9 +379,9 @@ void AdvancedFm::doAbout() { | |||
379 | "and is licensed by the GPL")); | 379 | "and is licensed by the GPL")); |
380 | } | 380 | } |
381 | 381 | ||
382 | void AdvancedFm::keyPressEvent( QKeyEvent *e) { | 382 | void AdvancedFm::keyPressEvent( QKeyEvent *e) { |
383 | // qWarning("key %d", e->key()); | 383 | // owarn << "key " << e->key() << "" << oendl; |
384 | // if( CurrentView()->hasFocus() ) | 384 | // if( CurrentView()->hasFocus() ) |
385 | { | 385 | { |
386 | switch ( e->key() ) { | 386 | switch ( e->key() ) { |
387 | case Key_Left: | 387 | case Key_Left: |
@@ -637,9 +637,9 @@ void AdvancedFm::addToDocs() { | |||
637 | if( strListPaths.count() > 0) { | 637 | if( strListPaths.count() > 0) { |
638 | QString curFile; | 638 | QString curFile; |
639 | for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) { | 639 | for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) { |
640 | curFile = thisDir->canonicalPath()+"/"+(*it); | 640 | curFile = thisDir->canonicalPath()+"/"+(*it); |
641 | // qDebug(curFile); | 641 | // odebug << curFile << oendl; |
642 | QFileInfo fi(curFile); | 642 | QFileInfo fi(curFile); |
643 | DocLnk f; | 643 | DocLnk f; |
644 | // curFile.replace(QRegExp("\\..*"),""); | 644 | // curFile.replace(QRegExp("\\..*"),""); |
645 | f.setName(fi.baseName() ); | 645 | f.setName(fi.baseName() ); |
@@ -710,9 +710,9 @@ void AdvancedFm::addCustomDir() { | |||
710 | cfg.write(); | 710 | cfg.write(); |
711 | } | 711 | } |
712 | 712 | ||
713 | void AdvancedFm::removeCustomDir() { | 713 | void AdvancedFm::removeCustomDir() { |
714 | // qDebug("remove custom dir"); | 714 | // odebug << "remove custom dir" << oendl; |
715 | Config cfg("AdvancedFm"); | 715 | Config cfg("AdvancedFm"); |
716 | cfg.setGroup("Menu"); | 716 | cfg.setGroup("Menu"); |
717 | QString dir; | 717 | QString dir; |
718 | QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)','); | 718 | QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)','); |
@@ -745,9 +745,9 @@ void AdvancedFm::removeCustomDir() { | |||
745 | 745 | ||
746 | } | 746 | } |
747 | 747 | ||
748 | void AdvancedFm::gotoCustomDir(const QString &dir) { | 748 | void AdvancedFm::gotoCustomDir(const QString &dir) { |
749 | // qDebug("gotoCustomDir(const QString &dir) " +dir ); | 749 | // odebug << "gotoCustomDir(const QString &dir) " +dir << oendl; |
750 | // QString curDir = dir; | 750 | // QString curDir = dir; |
751 | // QDir *thisDir = CurrentDir(); | 751 | // QDir *thisDir = CurrentDir(); |
752 | // if( curDir.isEmpty()) { | 752 | // if( curDir.isEmpty()) { |
753 | // } | 753 | // } |
@@ -786,12 +786,12 @@ QDir *AdvancedFm::OtherDir() { | |||
786 | } | 786 | } |
787 | 787 | ||
788 | QListView * AdvancedFm::CurrentView() { | 788 | QListView * AdvancedFm::CurrentView() { |
789 | if ( whichTab == 1) { | 789 | if ( whichTab == 1) { |
790 | // qWarning("CurrentView Tab 1"); | 790 | // owarn << "CurrentView Tab 1" << oendl; |
791 | return Local_View; | 791 | return Local_View; |
792 | } else { | 792 | } else { |
793 | // qWarning("CurrentView Tab 2"); | 793 | // owarn << "CurrentView Tab 2" << oendl; |
794 | return Remote_View; | 794 | return Remote_View; |
795 | } | 795 | } |
796 | } | 796 | } |
797 | 797 | ||
@@ -802,9 +802,9 @@ QListView * AdvancedFm::OtherView() { | |||
802 | return Local_View; | 802 | return Local_View; |
803 | } | 803 | } |
804 | 804 | ||
805 | void AdvancedFm::setOtherTabCurrent() { | 805 | void AdvancedFm::setOtherTabCurrent() { |
806 | // qWarning("setOtherTabCurrent() %d", whichTab); | 806 | // owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; |
807 | if ( whichTab == 1) { | 807 | if ( whichTab == 1) { |
808 | TabWidget->setCurrentWidget(1); | 808 | TabWidget->setCurrentWidget(1); |
809 | } else { | 809 | } else { |
810 | TabWidget->setCurrentWidget(0); | 810 | TabWidget->setCurrentWidget(0); |
@@ -813,12 +813,12 @@ void AdvancedFm::setOtherTabCurrent() { | |||
813 | OtherView()->setSelected( CurrentView()->firstChild(), true); | 813 | OtherView()->setSelected( CurrentView()->firstChild(), true); |
814 | } | 814 | } |
815 | 815 | ||
816 | void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { | 816 | void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { |
817 | // qDebug("qcop message "+msg ); | 817 | // odebug << "qcop message "+msg << oendl; |
818 | QDataStream stream ( data, IO_ReadOnly ); | 818 | QDataStream stream ( data, IO_ReadOnly ); |
819 | if ( msg == "openDirectory(QString)" ) { | 819 | if ( msg == "openDirectory(QString)" ) { |
820 | // qDebug("received"); | 820 | // odebug << "received" << oendl; |
821 | QString file; | 821 | QString file; |
822 | stream >> file; | 822 | stream >> file; |
823 | gotoDirectory( (const QString &) file); | 823 | gotoDirectory( (const QString &) file); |
824 | } | 824 | } |
@@ -829,9 +829,9 @@ void AdvancedFm::setDocument(const QString &file) { | |||
829 | 829 | ||
830 | } | 830 | } |
831 | 831 | ||
832 | void AdvancedFm::gotoDirectory(const QString &file) { | 832 | void AdvancedFm::gotoDirectory(const QString &file) { |
833 | // qWarning("goto dir "+file); | 833 | // owarn << "goto dir "+file << oendl; |
834 | QString curDir = file; | 834 | QString curDir = file; |
835 | QDir *thisDir = CurrentDir(); | 835 | QDir *thisDir = CurrentDir(); |
836 | if(QDir( curDir).exists() ) { | 836 | if(QDir( curDir).exists() ) { |
837 | thisDir->setPath( curDir ); | 837 | thisDir->setPath( curDir ); |
@@ -865,9 +865,9 @@ void AdvancedFm::findFile(const QString &fileName) { | |||
865 | } | 865 | } |
866 | } | 866 | } |
867 | 867 | ||
868 | void AdvancedFm::slotSwitchMenu(int ) { | 868 | void AdvancedFm::slotSwitchMenu(int ) { |
869 | // qDebug("Switch %d", item); | 869 | // odebug << "Switch " << item << "" << oendl; |
870 | // viewMenu->setItemChecked(item, true); | 870 | // viewMenu->setItemChecked(item, true); |
871 | } | 871 | } |
872 | 872 | ||
873 | void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) { | 873 | void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) { |
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro index 716343d..f1c518e 100644 --- a/noncore/apps/advancedfm/advancedfm.pro +++ b/noncore/apps/advancedfm/advancedfm.pro | |||
@@ -1,32 +1,12 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on quick-app | 2 | CONFIG += qt warn_on quick-app |
3 | # CONFIG += qt warn_on | ||
4 | HEADERS = advancedfm.h filePermissions.h output.h | 3 | HEADERS = advancedfm.h filePermissions.h output.h |
5 | SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp | 4 | SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp |
6 | TARGET = advancedfm | 5 | TARGET = advancedfm |
7 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 7 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe -lopiecore2 -lopieui2 | 8 | LIBS += -lqpe -lopiecore2 -lopieui2 |
10 | |||
11 | TRANSLATIONS = ../../../i18n/de/advancedfm.ts \ | ||
12 | ../../../i18n/nl/advancedfm.ts \ | ||
13 | ../../../i18n/da/advancedfm.ts \ | ||
14 | ../../../i18n/xx/advancedfm.ts \ | ||
15 | ../../../i18n/en/advancedfm.ts \ | ||
16 | ../../../i18n/es/advancedfm.ts \ | ||
17 | ../../../i18n/fr/advancedfm.ts \ | ||
18 | ../../../i18n/hu/advancedfm.ts \ | ||
19 | ../../../i18n/ja/advancedfm.ts \ | ||
20 | ../../../i18n/ko/advancedfm.ts \ | ||
21 | ../../../i18n/no/advancedfm.ts \ | ||
22 | ../../../i18n/pl/advancedfm.ts \ | ||
23 | ../../../i18n/pt/advancedfm.ts \ | ||
24 | ../../../i18n/pt_BR/advancedfm.ts \ | ||
25 | ../../../i18n/sl/advancedfm.ts \ | ||
26 | ../../../i18n/zh_CN/advancedfm.ts \ | ||
27 | ../../../i18n/zh_TW/advancedfm.ts | ||
28 | |||
29 | 9 | ||
30 | !contains(CONFIG,quick-app) { | 10 | !contains(CONFIG,quick-app) { |
31 | DESTDIR = $(OPIEDIR)/bin | 11 | DESTDIR = $(OPIEDIR)/bin |
32 | DEFINES += NOQUICKLAUNCH | 12 | DEFINES += NOQUICKLAUNCH |
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index 2997c55..29335f8 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -10,25 +10,29 @@ | |||
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #include "advancedfm.h" | 12 | #include "advancedfm.h" |
13 | 13 | ||
14 | /* OPIE */ | ||
15 | #include <opie2/odebug.h> | ||
14 | #include <qpe/storage.h> | 16 | #include <qpe/storage.h> |
15 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
16 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
17 | #include <qpe/menubutton.h> | 19 | #include <qpe/menubutton.h> |
20 | using namespace Opie::Core; | ||
21 | using namespace Opie::Ui; | ||
18 | 22 | ||
23 | /* QT */ | ||
19 | #include <qlayout.h> | 24 | #include <qlayout.h> |
20 | #include <qhbox.h> | 25 | #include <qhbox.h> |
21 | #include <qmenubar.h> | 26 | #include <qmenubar.h> |
22 | #include <qcombobox.h> | 27 | #include <qcombobox.h> |
23 | #include <qtoolbutton.h> | 28 | #include <qtoolbutton.h> |
24 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
25 | #include <qlistview.h> | 30 | #include <qlistview.h> |
26 | 31 | ||
32 | /* STD */ | ||
27 | #include <sys/utsname.h> | 33 | #include <sys/utsname.h> |
28 | 34 | ||
29 | |||
30 | using namespace Opie::Ui; | ||
31 | void AdvancedFm::init() { | 35 | void AdvancedFm::init() { |
32 | b = false; | 36 | b = false; |
33 | setCaption( tr( "AdvancedFm" ) ); | 37 | setCaption( tr( "AdvancedFm" ) ); |
34 | 38 | ||
@@ -218,13 +222,13 @@ void AdvancedFm::init() { | |||
218 | zaurusDevice=FALSE; | 222 | zaurusDevice=FALSE; |
219 | 223 | ||
220 | 224 | ||
221 | if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) { | 225 | if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) { |
222 | qDebug("not have sd"); | 226 | odebug << "not have sd" << oendl; |
223 | sdButton->hide(); | 227 | sdButton->hide(); |
224 | } | 228 | } |
225 | if( !StorageInfo::hasCf() ) { | 229 | if( !StorageInfo::hasCf() ) { |
226 | qDebug("not have cf"); | 230 | odebug << "not have cf" << oendl; |
227 | cfButton->hide(); | 231 | cfButton->hide(); |
228 | } | 232 | } |
229 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 233 | currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
230 | currentDir.setPath( QDir::currentDirPath()); | 234 | currentDir.setPath( QDir::currentDirPath()); |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 81a4318..d34f330 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -1,839 +1,842 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | AdvancedFm.cpp | 2 | AdvancedFm.cpp |
3 | ------------------- | 3 | ------------------- |
4 | ** Created: Sat Mar 9 23:33:09 2002 | 4 | ** Created: Sat Mar 9 23:33:09 2002 |
5 | copyright : (C) 2002 by ljp | 5 | copyright : (C) 2002 by ljp |
6 | email : ljp@llornkcor.com | 6 | email : ljp@llornkcor.com |
7 | * This program is free software; you can redistribute it and/or modify * | 7 | * This program is free software; you can redistribute it and/or modify * |
8 | * it under the terms of the GNU General Public License as published by * | 8 | * it under the terms of the GNU General Public License as published by * |
9 | * the Free Software Foundation; either version 2 of the License, or * | 9 | * the Free Software Foundation; either version 2 of the License, or * |
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #include "advancedfm.h" | 12 | |
13 | #include "output.h" | 13 | #include "advancedfm.h" |
14 | #include "filePermissions.h" | 14 | #include "output.h" |
15 | 15 | #include "filePermissions.h" | |
16 | #include <qpe/lnkproperties.h> | 16 | |
17 | #include <qpe/qpeapplication.h> | 17 | /* OPIE */ |
18 | #include <qpe/applnk.h> | 18 | #include <opie2/odebug.h> |
19 | 19 | #include <qpe/lnkproperties.h> | |
20 | #include <qmessagebox.h> | 20 | #include <qpe/qpeapplication.h> |
21 | 21 | #include <qpe/applnk.h> | |
22 | 22 | using namespace Opie::Core; | |
23 | #include <qpopupmenu.h> | 23 | |
24 | #include <qlistview.h> | 24 | /* QT*/ |
25 | 25 | ||
26 | #include <errno.h> | 26 | #include <qmessagebox.h> |
27 | #include <stdlib.h> | 27 | #include <qpopupmenu.h> |
28 | #include <unistd.h> | 28 | #include <qlistview.h> |
29 | #include <sys/stat.h> | 29 | |
30 | #include <dirent.h> | 30 | /* STD */ |
31 | #include <sys/sendfile.h> | 31 | |
32 | #include <fcntl.h> | 32 | #include <errno.h> |
33 | 33 | #include <stdlib.h> | |
34 | 34 | #include <unistd.h> | |
35 | using namespace Opie::Core; | 35 | #include <sys/stat.h> |
36 | using namespace Opie::Core; | 36 | #include <dirent.h> |
37 | void AdvancedFm::doDirChange() { | 37 | #include <sys/sendfile.h> |
38 | QString pathItem = CurrentView()->currentItem()->text(0); | 38 | #include <fcntl.h> |
39 | if( pathItem == "../") { | 39 | |
40 | ListClicked( CurrentView()->currentItem()); | 40 | void AdvancedFm::doDirChange() { |
41 | } else { | 41 | QString pathItem = CurrentView()->currentItem()->text(0); |
42 | if( pathItem.find(" -> ",0,TRUE) != -1) | 42 | if( pathItem == "../") { |
43 | pathItem = dealWithSymName((const QString&)pathItem)+"/"; | 43 | ListClicked( CurrentView()->currentItem()); |
44 | // qWarning(pathItem); | 44 | } else { |
45 | gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) ); | 45 | if( pathItem.find(" -> ",0,TRUE) != -1) |
46 | } | 46 | pathItem = dealWithSymName((const QString&)pathItem)+"/"; |
47 | } | 47 | // owarn << pathItem << oendl; |
48 | 48 | gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) ); | |
49 | void AdvancedFm::showMenuHidden() { | 49 | } |
50 | if (b) { | 50 | } |
51 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 51 | |
52 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 52 | void AdvancedFm::showMenuHidden() { |
53 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); | 53 | if (b) { |
54 | } else { | 54 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
55 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 55 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
56 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 56 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); |
57 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 57 | } else { |
58 | } | 58 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
59 | b = !b; | 59 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
60 | populateView(); | 60 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
61 | } | 61 | } |
62 | 62 | b = !b; | |
63 | void AdvancedFm::showHidden() { | 63 | populateView(); |
64 | if (b) { | 64 | } |
65 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 65 | |
66 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 66 | void AdvancedFm::showHidden() { |
67 | } else { | 67 | if (b) { |
68 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 68 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
69 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 69 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
70 | } | 70 | } else { |
71 | populateView(); | 71 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
72 | } | 72 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
73 | 73 | } | |
74 | QString AdvancedFm::dealWithSymName(const QString &fileName) { | 74 | populateView(); |
75 | QString strItem = fileName; | 75 | } |
76 | return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | 76 | |
77 | } | 77 | QString AdvancedFm::dealWithSymName(const QString &fileName) { |
78 | 78 | QString strItem = fileName; | |
79 | void AdvancedFm::runThis() { | 79 | return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); |
80 | if( !CurrentView()->currentItem()) return; | 80 | } |
81 | QString fs; | 81 | |
82 | QDir *thisDir = CurrentDir(); | 82 | void AdvancedFm::runThis() { |
83 | 83 | if( !CurrentView()->currentItem()) return; | |
84 | QString curFile = CurrentView()->currentItem()->text(0); | 84 | QString fs; |
85 | QString path = thisDir->canonicalPath(); | 85 | QDir *thisDir = CurrentDir(); |
86 | 86 | ||
87 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink | 87 | QString curFile = CurrentView()->currentItem()->text(0); |
88 | 88 | QString path = thisDir->canonicalPath(); | |
89 | curFile = dealWithSymName((const QString&)curFile); | 89 | |
90 | 90 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink | |
91 | if(curFile != "../") { | 91 | |
92 | 92 | curFile = dealWithSymName((const QString&)curFile); | |
93 | fs = getFileSystemType((const QString &) path); | 93 | |
94 | QFileInfo fileInfo( path + "/" + curFile); | 94 | if(curFile != "../") { |
95 | // qDebug( fileInfo.owner()); | 95 | |
96 | 96 | fs = getFileSystemType((const QString &) path); | |
97 | if( (fileInfo.permission( QFileInfo::ExeUser) | 97 | QFileInfo fileInfo( path + "/" + curFile); |
98 | | fileInfo.permission( QFileInfo::ExeGroup) | 98 | // odebug << fileInfo.owner() << oendl; |
99 | | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) { | 99 | |
100 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | 100 | if( (fileInfo.permission( QFileInfo::ExeUser) |
101 | QCopEnvelope e("QPE/System", "execute(QString)" ); | 101 | | fileInfo.permission( QFileInfo::ExeGroup) |
102 | e << curFile; | 102 | | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) { |
103 | } else { | 103 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { |
104 | curFile = path + "/" + curFile; | 104 | QCopEnvelope e("QPE/System", "execute(QString)" ); |
105 | DocLnk nf(curFile); | 105 | e << curFile; |
106 | QString execStr = nf.exec(); | 106 | } else { |
107 | // qDebug( execStr); | 107 | curFile = path + "/" + curFile; |
108 | if( execStr.isEmpty() ) { | 108 | DocLnk nf(curFile); |
109 | } else { | 109 | QString execStr = nf.exec(); |
110 | nf.execute(); | 110 | // odebug << execStr << oendl; |
111 | } | 111 | if( execStr.isEmpty() ) { |
112 | } | 112 | } else { |
113 | } | 113 | nf.execute(); |
114 | } | 114 | } |
115 | 115 | } | |
116 | void AdvancedFm::runText() { | 116 | } |
117 | if( !CurrentView()->currentItem()) return; | 117 | } |
118 | QString curFile = CurrentView()->currentItem()->text(0); | 118 | |
119 | if(curFile != "../") { | 119 | void AdvancedFm::runText() { |
120 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink | 120 | if( !CurrentView()->currentItem()) return; |
121 | curFile = dealWithSymName((const QString&)curFile); | 121 | QString curFile = CurrentView()->currentItem()->text(0); |
122 | curFile = CurrentDir()->canonicalPath()+"/"+curFile; | 122 | if(curFile != "../") { |
123 | QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); | 123 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink |
124 | e << curFile; | 124 | curFile = dealWithSymName((const QString&)curFile); |
125 | } | 125 | curFile = CurrentDir()->canonicalPath()+"/"+curFile; |
126 | } | 126 | QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); |
127 | 127 | e << curFile; | |
128 | void AdvancedFm::makeDir() { | 128 | } |
129 | InputDialog *fileDlg; | 129 | } |
130 | fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); | 130 | |
131 | fileDlg->exec(); | 131 | void AdvancedFm::makeDir() { |
132 | if( fileDlg->result() == 1 ) { | 132 | InputDialog *fileDlg; |
133 | QDir *thisDir = CurrentDir(); | 133 | fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); |
134 | QString filename = fileDlg->LineEdit1->text(); | 134 | fileDlg->exec(); |
135 | thisDir->mkdir( thisDir->canonicalPath()+"/"+filename); | 135 | if( fileDlg->result() == 1 ) { |
136 | } | 136 | QDir *thisDir = CurrentDir(); |
137 | populateView(); | 137 | QString filename = fileDlg->LineEdit1->text(); |
138 | } | 138 | thisDir->mkdir( thisDir->canonicalPath()+"/"+filename); |
139 | 139 | } | |
140 | void AdvancedFm::doDelete() { | 140 | populateView(); |
141 | QStringList curFileList = getPath(); | 141 | } |
142 | bool doMsg=true; | 142 | |
143 | int count = curFileList.count(); | 143 | void AdvancedFm::doDelete() { |
144 | if( count > 0) { | 144 | QStringList curFileList = getPath(); |
145 | if(count > 1 ) { | 145 | bool doMsg=true; |
146 | QString msg; | 146 | int count = curFileList.count(); |
147 | msg=tr("Really delete\n%1 files?").arg(count); | 147 | if( count > 0) { |
148 | switch ( QMessageBox::warning(this,tr("Delete"),msg | 148 | if(count > 1 ) { |
149 | ,tr("Yes"),tr("No"),0,0,1) ) | 149 | QString msg; |
150 | { | 150 | msg=tr("Really delete\n%1 files?").arg(count); |
151 | case 0: | 151 | switch ( QMessageBox::warning(this,tr("Delete"),msg |
152 | doMsg=false; | 152 | ,tr("Yes"),tr("No"),0,0,1) ) |
153 | break; | 153 | { |
154 | case 1: | 154 | case 0: |
155 | return; | 155 | doMsg=false; |
156 | break; | 156 | break; |
157 | }; | 157 | case 1: |
158 | } | 158 | return; |
159 | 159 | break; | |
160 | QString myFile; | 160 | }; |
161 | 161 | } | |
162 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 162 | |
163 | myFile = (*it); | 163 | QString myFile; |
164 | if( myFile.find(" -> ",0,TRUE) != -1) | 164 | |
165 | myFile = myFile.left( myFile.find(" -> ",0,TRUE)); | 165 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
166 | 166 | myFile = (*it); | |
167 | QString f = CurrentDir()->canonicalPath(); | 167 | if( myFile.find(" -> ",0,TRUE) != -1) |
168 | if(f.right(1).find("/",0,TRUE) == -1) | 168 | myFile = myFile.left( myFile.find(" -> ",0,TRUE)); |
169 | f += "/"; | 169 | |
170 | f += myFile; | 170 | QString f = CurrentDir()->canonicalPath(); |
171 | if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) { | 171 | if(f.right(1).find("/",0,TRUE) == -1) |
172 | //if file is a directory | 172 | f += "/"; |
173 | 173 | f += myFile; | |
174 | switch ( QMessageBox::warning( this, tr("Delete Directory?"), | 174 | if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) { |
175 | tr("Really delete %1\nand all it's contents ?" ).arg( f ) , | 175 | //if file is a directory |
176 | tr("Yes"), tr("No"), 0, 0, 1) ) { | 176 | |
177 | case 0: | 177 | switch ( QMessageBox::warning( this, tr("Delete Directory?"), |
178 | { | 178 | tr("Really delete %1\nand all it's contents ?" ).arg( f ) , |
179 | f=f.left(f.length()-1); | 179 | tr("Yes"), tr("No"), 0, 0, 1) ) { |
180 | QString cmd="rm -rf "+f; | 180 | case 0: |
181 | startProcess( (const QString)cmd.latin1() ); | 181 | { |
182 | populateView(); | 182 | f=f.left(f.length()-1); |
183 | } | 183 | QString cmd="rm -rf "+f; |
184 | break; | 184 | startProcess( (const QString)cmd.latin1() ); |
185 | case 1: | 185 | populateView(); |
186 | // exit | 186 | } |
187 | break; | 187 | break; |
188 | }; | 188 | case 1: |
189 | 189 | // exit | |
190 | } else { | 190 | break; |
191 | if(doMsg) { | 191 | }; |
192 | switch ( QMessageBox::warning(this,tr("Delete"), | 192 | |
193 | tr("Really delete\n%1?").arg( myFile ), | 193 | } else { |
194 | tr("Yes"), tr("No"), 0, 0, 1) ) { | 194 | if(doMsg) { |
195 | case 1: | 195 | switch ( QMessageBox::warning(this,tr("Delete"), |
196 | return; | 196 | tr("Really delete\n%1?").arg( myFile ), |
197 | break; | 197 | tr("Yes"), tr("No"), 0, 0, 1) ) { |
198 | }; | 198 | case 1: |
199 | } | 199 | return; |
200 | 200 | break; | |
201 | QString cmd="rm "+f; | 201 | }; |
202 | QFile file(f); | 202 | } |
203 | QFileInfo fi(myFile); | 203 | |
204 | if( fi.fileName().find("../",0,TRUE)==-1) { | 204 | QString cmd="rm "+f; |
205 | // qDebug("remove link files "+myFile); | 205 | QFile file(f); |
206 | 206 | QFileInfo fi(myFile); | |
207 | // DocLnk lnk(f); | 207 | if( fi.fileName().find("../",0,TRUE)==-1) { |
208 | DocLnk *lnk; | 208 | // odebug << "remove link files "+myFile << oendl; |
209 | lnk = new DocLnk(f); | 209 | |
210 | // qDebug("Deleting doclnk " + lnk->linkFile()); | 210 | // DocLnk lnk(f); |
211 | if(lnk->isValid()) | 211 | DocLnk *lnk; |
212 | lnk->removeLinkFile(); | 212 | lnk = new DocLnk(f); |
213 | // delete lnk; | 213 | // odebug << "Deleting doclnk " + lnk->linkFile() << oendl; |
214 | file.remove(); | 214 | if(lnk->isValid()) |
215 | } | 215 | lnk->removeLinkFile(); |
216 | } | 216 | // delete lnk; |
217 | } | 217 | file.remove(); |
218 | } | 218 | } |
219 | populateView(); | 219 | } |
220 | } | 220 | } |
221 | 221 | } | |
222 | void AdvancedFm::filePerms() { | 222 | populateView(); |
223 | QStringList curFileList = getPath(); | 223 | } |
224 | QString filePath; | 224 | |
225 | 225 | void AdvancedFm::filePerms() { | |
226 | filePath = CurrentDir()->canonicalPath()+"/"; | 226 | QStringList curFileList = getPath(); |
227 | 227 | QString filePath; | |
228 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 228 | |
229 | filePermissions *filePerm; | 229 | filePath = CurrentDir()->canonicalPath()+"/"; |
230 | filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); | 230 | |
231 | QPEApplication::execDialog( filePerm ); | 231 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
232 | if( filePerm ) | 232 | filePermissions *filePerm; |
233 | delete filePerm; | 233 | filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); |
234 | } | 234 | QPEApplication::execDialog( filePerm ); |
235 | populateView(); | 235 | if( filePerm ) |
236 | } | 236 | delete filePerm; |
237 | 237 | } | |
238 | void AdvancedFm::doProperties() { | 238 | populateView(); |
239 | #if defined(QT_QWS_OPIE) | 239 | } |
240 | 240 | ||
241 | QStringList curFileList = getPath(); | 241 | void AdvancedFm::doProperties() { |
242 | 242 | #if defined(QT_QWS_OPIE) | |
243 | QString filePath; | 243 | |
244 | filePath = CurrentDir()->canonicalPath()+"/"; | 244 | QStringList curFileList = getPath(); |
245 | 245 | ||
246 | // qDebug("%d",curFileList.count()); | 246 | QString filePath; |
247 | 247 | filePath = CurrentDir()->canonicalPath()+"/"; | |
248 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 248 | |
249 | // qDebug((filePath+*it)); | 249 | // odebug << "" << curFileList.count() << "" << oendl; |
250 | DocLnk lnk( (filePath+*it)); | 250 | |
251 | LnkProperties prop( &lnk ); | 251 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
252 | QPEApplication::execDialog( &prop ); | 252 | // odebug << (filePath+*it) << oendl; |
253 | } | 253 | DocLnk lnk( (filePath+*it)); |
254 | #endif | 254 | LnkProperties prop( &lnk ); |
255 | 255 | QPEApplication::execDialog( &prop ); | |
256 | } | 256 | } |
257 | 257 | #endif | |
258 | void AdvancedFm::upDir() { | 258 | |
259 | QDir *thisDir = CurrentDir(); | 259 | } |
260 | QString current = thisDir->canonicalPath(); | 260 | |
261 | QDir dir(current); | 261 | void AdvancedFm::upDir() { |
262 | dir.cdUp(); | 262 | QDir *thisDir = CurrentDir(); |
263 | current = dir.canonicalPath(); | 263 | QString current = thisDir->canonicalPath(); |
264 | chdir( current.latin1() ); | 264 | QDir dir(current); |
265 | thisDir->cd( current, TRUE); | 265 | dir.cdUp(); |
266 | 266 | current = dir.canonicalPath(); | |
267 | populateView(); | 267 | chdir( current.latin1() ); |
268 | update(); | 268 | thisDir->cd( current, TRUE); |
269 | } | 269 | |
270 | 270 | populateView(); | |
271 | void AdvancedFm::copy() { | 271 | update(); |
272 | qApp->processEvents(); | 272 | } |
273 | QStringList curFileList = getPath(); | 273 | |
274 | 274 | void AdvancedFm::copy() { | |
275 | QDir *thisDir = CurrentDir(); | 275 | qApp->processEvents(); |
276 | QDir *thatDir = OtherDir(); | 276 | QStringList curFileList = getPath(); |
277 | 277 | ||
278 | bool doMsg=true; | 278 | QDir *thisDir = CurrentDir(); |
279 | int count=curFileList.count(); | 279 | QDir *thatDir = OtherDir(); |
280 | if( count > 0) { | 280 | |
281 | if(count > 1 ){ | 281 | bool doMsg=true; |
282 | QString msg; | 282 | int count=curFileList.count(); |
283 | msg=tr("Really copy\n%1 files?").arg(count); | 283 | if( count > 0) { |
284 | switch ( QMessageBox::warning(this,tr("Copy"),msg | 284 | if(count > 1 ){ |
285 | ,tr("Yes"),tr("No"),0,0,1) ) | 285 | QString msg; |
286 | { | 286 | msg=tr("Really copy\n%1 files?").arg(count); |
287 | case 0: | 287 | switch ( QMessageBox::warning(this,tr("Copy"),msg |
288 | doMsg=false; | 288 | ,tr("Yes"),tr("No"),0,0,1) ) |
289 | break; | 289 | { |
290 | case 1: | 290 | case 0: |
291 | return; | 291 | doMsg=false; |
292 | break; | 292 | break; |
293 | }; | 293 | case 1: |
294 | } | 294 | return; |
295 | 295 | break; | |
296 | QString curFile, item, destFile; | 296 | }; |
297 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 297 | } |
298 | item=(*it); | 298 | |
299 | if(item.find("->",0,TRUE)) //symlink | 299 | QString curFile, item, destFile; |
300 | item = item.left(item.find("->",0,TRUE)); | 300 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
301 | 301 | item=(*it); | |
302 | curFile = thisDir->canonicalPath()+"/"+ item; | 302 | if(item.find("->",0,TRUE)) //symlink |
303 | destFile = thatDir->canonicalPath()+"/"+ item; | 303 | item = item.left(item.find("->",0,TRUE)); |
304 | 304 | ||
305 | // qDebug("Destination file is "+destFile); | 305 | curFile = thisDir->canonicalPath()+"/"+ item; |
306 | // qDebug("CurrentFile file is " + curFile); | 306 | destFile = thatDir->canonicalPath()+"/"+ item; |
307 | 307 | ||
308 | QFile f(destFile); | 308 | // odebug << "Destination file is "+destFile << oendl; |
309 | if( f.exists()) { | 309 | // odebug << "CurrentFile file is " + curFile << oendl; |
310 | if(doMsg) { | 310 | |
311 | switch ( QMessageBox::warning(this,tr("File Exists!"), | 311 | QFile f(destFile); |
312 | tr("%1 exists. Ok to overwrite?").arg( item ), | 312 | if( f.exists()) { |
313 | tr("Yes"),tr("No"),0,0,1) ) { | 313 | if(doMsg) { |
314 | case 1: | 314 | switch ( QMessageBox::warning(this,tr("File Exists!"), |
315 | return; | 315 | tr("%1 exists. Ok to overwrite?").arg( item ), |
316 | break; | 316 | tr("Yes"),tr("No"),0,0,1) ) { |
317 | }; | 317 | case 1: |
318 | } | 318 | return; |
319 | f.remove(); | 319 | break; |
320 | } | 320 | }; |
321 | 321 | } | |
322 | if( !copyFile( curFile, destFile) ) { | 322 | f.remove(); |
323 | QMessageBox::message("AdvancedFm", | 323 | } |
324 | tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) ); | 324 | |
325 | return; | 325 | if( !copyFile( curFile, destFile) ) { |
326 | } | 326 | QMessageBox::message("AdvancedFm", |
327 | } | 327 | tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) ); |
328 | setOtherTabCurrent(); | 328 | return; |
329 | rePopulate(); | 329 | } |
330 | } | 330 | } |
331 | } | 331 | setOtherTabCurrent(); |
332 | 332 | rePopulate(); | |
333 | void AdvancedFm::copyAs() { | 333 | } |
334 | qApp->processEvents(); | 334 | } |
335 | 335 | ||
336 | QStringList curFileList = getPath(); | 336 | void AdvancedFm::copyAs() { |
337 | QString curFile, item; | 337 | qApp->processEvents(); |
338 | InputDialog *fileDlg; | 338 | |
339 | 339 | QStringList curFileList = getPath(); | |
340 | QDir *thisDir = CurrentDir(); | 340 | QString curFile, item; |
341 | QDir *thatDir = OtherDir(); | 341 | InputDialog *fileDlg; |
342 | 342 | ||
343 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 343 | QDir *thisDir = CurrentDir(); |
344 | QString destFile; | 344 | QDir *thatDir = OtherDir(); |
345 | item=(*it); | 345 | |
346 | curFile = thisDir->canonicalPath()+"/"+(*it); | 346 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
347 | fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0); | 347 | QString destFile; |
348 | 348 | item=(*it); | |
349 | fileDlg->setInputText((const QString &) destFile ); | 349 | curFile = thisDir->canonicalPath()+"/"+(*it); |
350 | fileDlg->exec(); | 350 | fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0); |
351 | 351 | ||
352 | if( fileDlg->result() == 1 ) { | 352 | fileDlg->setInputText((const QString &) destFile ); |
353 | QString filename = fileDlg->LineEdit1->text(); | 353 | fileDlg->exec(); |
354 | destFile = thatDir->canonicalPath()+"/"+filename; | 354 | |
355 | 355 | if( fileDlg->result() == 1 ) { | |
356 | QFile f( destFile); | 356 | QString filename = fileDlg->LineEdit1->text(); |
357 | if( f.exists()) { | 357 | destFile = thatDir->canonicalPath()+"/"+filename; |
358 | switch (QMessageBox::warning(this,tr("File Exists!"), | 358 | |
359 | item+tr("\nexists. Ok to overwrite?"), | 359 | QFile f( destFile); |
360 | tr("Yes"),tr("No"),0,0,1) ) { | 360 | if( f.exists()) { |
361 | case 0: | 361 | switch (QMessageBox::warning(this,tr("File Exists!"), |
362 | f.remove(); | 362 | item+tr("\nexists. Ok to overwrite?"), |
363 | break; | 363 | tr("Yes"),tr("No"),0,0,1) ) { |
364 | case 1: | 364 | case 0: |
365 | return; | 365 | f.remove(); |
366 | break; | 366 | break; |
367 | }; | 367 | case 1: |
368 | } | 368 | return; |
369 | if( !copyFile( curFile, destFile) ) { | 369 | break; |
370 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 370 | }; |
371 | +curFile +tr("to\n")+destFile); | 371 | } |
372 | return; | 372 | if( !copyFile( curFile, destFile) ) { |
373 | } | 373 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
374 | } | 374 | +curFile +tr("to\n")+destFile); |
375 | delete fileDlg; | 375 | return; |
376 | 376 | } | |
377 | } | 377 | } |
378 | rePopulate(); | 378 | delete fileDlg; |
379 | setOtherTabCurrent(); | 379 | |
380 | } | 380 | } |
381 | 381 | rePopulate(); | |
382 | void AdvancedFm::copySameDir() { | 382 | setOtherTabCurrent(); |
383 | qApp->processEvents(); | 383 | } |
384 | QStringList curFileList = getPath(); | 384 | |
385 | QString curFile, item, destFile; | 385 | void AdvancedFm::copySameDir() { |
386 | InputDialog *fileDlg; | 386 | qApp->processEvents(); |
387 | 387 | QStringList curFileList = getPath(); | |
388 | QDir *thisDir = CurrentDir(); | 388 | QString curFile, item, destFile; |
389 | 389 | InputDialog *fileDlg; | |
390 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 390 | |
391 | item=(*it); | 391 | QDir *thisDir = CurrentDir(); |
392 | curFile = thisDir->canonicalPath()+"/"+ item; | 392 | |
393 | 393 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | |
394 | fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0); | 394 | item=(*it); |
395 | fileDlg->setInputText((const QString &) destFile ); | 395 | curFile = thisDir->canonicalPath()+"/"+ item; |
396 | fileDlg->exec(); | 396 | |
397 | 397 | fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0); | |
398 | if( fileDlg->result() == 1 ) { | 398 | fileDlg->setInputText((const QString &) destFile ); |
399 | 399 | fileDlg->exec(); | |
400 | QString filename = fileDlg->LineEdit1->text(); | 400 | |
401 | destFile = thisDir->canonicalPath()+"/"+filename; | 401 | if( fileDlg->result() == 1 ) { |
402 | 402 | ||
403 | QFile f(destFile); | 403 | QString filename = fileDlg->LineEdit1->text(); |
404 | if( f.exists()) { | 404 | destFile = thisDir->canonicalPath()+"/"+filename; |
405 | switch (QMessageBox::warning(this,tr("Delete"), | 405 | |
406 | destFile+tr(" already exists.\nDo you really want to delete it?"), | 406 | QFile f(destFile); |
407 | tr("Yes"),tr("No"),0,0,1) ) { | 407 | if( f.exists()) { |
408 | case 0: | 408 | switch (QMessageBox::warning(this,tr("Delete"), |
409 | 409 | destFile+tr(" already exists.\nDo you really want to delete it?"), | |
410 | f.remove(); | 410 | tr("Yes"),tr("No"),0,0,1) ) { |
411 | break; | 411 | case 0: |
412 | case 1: | 412 | |
413 | return; | 413 | f.remove(); |
414 | break; | 414 | break; |
415 | }; | 415 | case 1: |
416 | } | 416 | return; |
417 | if(!copyFile( curFile,destFile) ) { | 417 | break; |
418 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 418 | }; |
419 | +curFile +tr("to\n")+destFile); | 419 | } |
420 | return; | 420 | if(!copyFile( curFile,destFile) ) { |
421 | } | 421 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
422 | 422 | +curFile +tr("to\n")+destFile); | |
423 | // qDebug("copy "+curFile+" as "+destFile); | 423 | return; |
424 | } | 424 | } |
425 | delete fileDlg; | 425 | |
426 | } | 426 | // odebug << "copy "+curFile+" as "+destFile << oendl; |
427 | rePopulate(); | 427 | } |
428 | } | 428 | delete fileDlg; |
429 | 429 | } | |
430 | void AdvancedFm::move() { | 430 | rePopulate(); |
431 | qApp->processEvents(); | 431 | } |
432 | 432 | ||
433 | QStringList curFileList = getPath(); | 433 | void AdvancedFm::move() { |
434 | if( curFileList.count() > 0) { | 434 | qApp->processEvents(); |
435 | QString curFile, destFile, item; | 435 | |
436 | 436 | QStringList curFileList = getPath(); | |
437 | QDir *thisDir = CurrentDir(); | 437 | if( curFileList.count() > 0) { |
438 | QDir *thatDir = OtherDir(); | 438 | QString curFile, destFile, item; |
439 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 439 | |
440 | item=(*it); | 440 | QDir *thisDir = CurrentDir(); |
441 | QString destFile = thatDir->canonicalPath(); | 441 | QDir *thatDir = OtherDir(); |
442 | 442 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | |
443 | if(destFile.right(1).find("/",0,TRUE) == -1) | 443 | item=(*it); |
444 | destFile+="/"; | 444 | QString destFile = thatDir->canonicalPath(); |
445 | destFile += item; | 445 | |
446 | // qDebug("Destination file is "+destFile); | 446 | if(destFile.right(1).find("/",0,TRUE) == -1) |
447 | 447 | destFile+="/"; | |
448 | curFile = thisDir->canonicalPath(); | 448 | destFile += item; |
449 | if(curFile.right(1).find("/",0,TRUE) == -1) | 449 | // odebug << "Destination file is "+destFile << oendl; |
450 | curFile +="/"; | 450 | |
451 | curFile+= item; | 451 | curFile = thisDir->canonicalPath(); |
452 | // qDebug("CurrentFile file is " + curFile); | 452 | if(curFile.right(1).find("/",0,TRUE) == -1) |
453 | 453 | curFile +="/"; | |
454 | if(QFileInfo(curFile).isDir()) { | 454 | curFile+= item; |
455 | moveDirectory( curFile, destFile ); | 455 | // odebug << "CurrentFile file is " + curFile << oendl; |
456 | rePopulate(); | 456 | |
457 | return; | 457 | if(QFileInfo(curFile).isDir()) { |
458 | } | 458 | moveDirectory( curFile, destFile ); |
459 | 459 | rePopulate(); | |
460 | QFile f( curFile); | 460 | return; |
461 | if( f.exists()) { | 461 | } |
462 | if( !copyFile( curFile, destFile) ) { | 462 | |
463 | QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); | 463 | QFile f( curFile); |
464 | return; | 464 | if( f.exists()) { |
465 | } else | 465 | if( !copyFile( curFile, destFile) ) { |
466 | QFile::remove(curFile); | 466 | QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); |
467 | } | 467 | return; |
468 | } | 468 | } else |
469 | 469 | QFile::remove(curFile); | |
470 | } | 470 | } |
471 | rePopulate(); | 471 | } |
472 | setOtherTabCurrent(); | 472 | |
473 | } | 473 | } |
474 | 474 | rePopulate(); | |
475 | bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) { | 475 | setOtherTabCurrent(); |
476 | int err = 0; | 476 | } |
477 | if( copyDirectory( src, dest ) ) { QString cmd = "rm -rf " + src; | 477 | |
478 | err = system((const char*)cmd); | 478 | bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) { |
479 | } else | 479 | int err = 0; |
480 | err = -1; | 480 | if( copyDirectory( src, dest ) ) { QString cmd = "rm -rf " + src; |
481 | 481 | err = system((const char*)cmd); | |
482 | if(err!=0) { | 482 | } else |
483 | QMessageBox::message(tr("Note"),tr("Could not move\n") + src); | 483 | err = -1; |
484 | return false; | 484 | |
485 | } | 485 | if(err!=0) { |
486 | return true; | 486 | QMessageBox::message(tr("Note"),tr("Could not move\n") + src); |
487 | } | 487 | return false; |
488 | 488 | } | |
489 | bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) { | 489 | return true; |
490 | 490 | } | |
491 | QString cmd = "/bin/cp -fpR " + src + " " + dest; | 491 | |
492 | qWarning(cmd); | 492 | bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) { |
493 | int err = system( (const char *) cmd ); | 493 | |
494 | if ( err != 0 ) { | 494 | QString cmd = "/bin/cp -fpR " + src + " " + dest; |
495 | QMessageBox::message("AdvancedFm", | 495 | owarn << cmd << oendl; |
496 | tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) ); | 496 | int err = system( (const char *) cmd ); |
497 | return false; | 497 | if ( err != 0 ) { |
498 | } | 498 | QMessageBox::message("AdvancedFm", |
499 | 499 | tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) ); | |
500 | return true; | 500 | return false; |
501 | } | 501 | } |
502 | 502 | ||
503 | 503 | return true; | |
504 | bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { | 504 | } |
505 | 505 | ||
506 | 506 | ||
507 | if(QFileInfo(src).isDir()) { | 507 | bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { |
508 | if( copyDirectory( src, dest )) { | 508 | |
509 | setOtherTabCurrent(); | 509 | |
510 | populateView(); | 510 | if(QFileInfo(src).isDir()) { |
511 | return true; | 511 | if( copyDirectory( src, dest )) { |
512 | } | 512 | setOtherTabCurrent(); |
513 | else | 513 | populateView(); |
514 | return false; | 514 | return true; |
515 | } | 515 | } |
516 | 516 | else | |
517 | 517 | return false; | |
518 | bool success = true; | 518 | } |
519 | struct stat status; | 519 | |
520 | QFile srcFile(src); | 520 | |
521 | QFile destFile(dest); | 521 | bool success = true; |
522 | int err=0; | 522 | struct stat status; |
523 | int read_fd=0; | 523 | QFile srcFile(src); |
524 | int write_fd=0; | 524 | QFile destFile(dest); |
525 | struct stat stat_buf; | 525 | int err=0; |
526 | off_t offset = 0; | 526 | int read_fd=0; |
527 | if(!srcFile.open( IO_ReadOnly|IO_Raw)) { | 527 | int write_fd=0; |
528 | // qWarning("open failed"); | 528 | struct stat stat_buf; |
529 | return success = false; | 529 | off_t offset = 0; |
530 | } | 530 | if(!srcFile.open( IO_ReadOnly|IO_Raw)) { |
531 | read_fd = srcFile.handle(); | 531 | // owarn << "open failed" << oendl; |
532 | if(read_fd != -1) { | 532 | return success = false; |
533 | fstat (read_fd, &stat_buf); | 533 | } |
534 | if( !destFile.open( IO_WriteOnly|IO_Raw ) ) { | 534 | read_fd = srcFile.handle(); |
535 | // qWarning("destfile open failed"); | 535 | if(read_fd != -1) { |
536 | return success = false; | 536 | fstat (read_fd, &stat_buf); |
537 | } | 537 | if( !destFile.open( IO_WriteOnly|IO_Raw ) ) { |
538 | write_fd = destFile.handle(); | 538 | // owarn << "destfile open failed" << oendl; |
539 | if(write_fd != -1) { | 539 | return success = false; |
540 | err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size); | 540 | } |
541 | if( err == -1) { | 541 | write_fd = destFile.handle(); |
542 | QString msg; | 542 | if(write_fd != -1) { |
543 | switch(err) { | 543 | err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size); |
544 | case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. "; | 544 | if( err == -1) { |
545 | case EINVAL: msg = "Descriptor is not valid or locked. "; | 545 | QString msg; |
546 | case ENOMEM: msg = "Insufficient memory to read from in_fd."; | 546 | switch(err) { |
547 | case EIO: msg = "Unspecified error while reading from in_fd."; | 547 | case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. "; |
548 | }; | 548 | case EINVAL: msg = "Descriptor is not valid or locked. "; |
549 | success = false; | 549 | case ENOMEM: msg = "Insufficient memory to read from in_fd."; |
550 | // qWarning(msg); | 550 | case EIO: msg = "Unspecified error while reading from in_fd."; |
551 | } | 551 | }; |
552 | } else { | 552 | success = false; |
553 | success = false; | 553 | // owarn << msg << oendl; |
554 | } | 554 | } |
555 | } else { | 555 | } else { |
556 | success = false; | 556 | success = false; |
557 | } | 557 | } |
558 | srcFile.close(); | 558 | } else { |
559 | destFile.close(); | 559 | success = false; |
560 | // Set file permissions | 560 | } |
561 | if( stat( (const char *) src, &status ) == 0 ) { | 561 | srcFile.close(); |
562 | chmod( (const char *) dest, status.st_mode ); | 562 | destFile.close(); |
563 | } | 563 | // Set file permissions |
564 | 564 | if( stat( (const char *) src, &status ) == 0 ) { | |
565 | return success; | 565 | chmod( (const char *) dest, status.st_mode ); |
566 | } | 566 | } |
567 | 567 | ||
568 | void AdvancedFm::runCommand() { | 568 | return success; |
569 | if( !CurrentView()->currentItem()) return; | 569 | } |
570 | QDir *thisDir = CurrentDir(); | 570 | |
571 | 571 | void AdvancedFm::runCommand() { | |
572 | QString curFile; | 572 | if( !CurrentView()->currentItem()) return; |
573 | curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0); | 573 | QDir *thisDir = CurrentDir(); |
574 | 574 | ||
575 | InputDialog *fileDlg; | 575 | QString curFile; |
576 | fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0); | 576 | curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0); |
577 | fileDlg->setInputText(curFile); | 577 | |
578 | fileDlg->exec(); | 578 | InputDialog *fileDlg; |
579 | //QString command; | 579 | fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0); |
580 | 580 | fileDlg->setInputText(curFile); | |
581 | if( fileDlg->result() == 1 ) { | 581 | fileDlg->exec(); |
582 | // qDebug(fileDlg->LineEdit1->text()); | 582 | //QString command; |
583 | QStringList command; | 583 | |
584 | 584 | if( fileDlg->result() == 1 ) { | |
585 | command << "/bin/sh"; | 585 | // odebug << fileDlg->LineEdit1->text() << oendl; |
586 | command << "-c"; | 586 | QStringList command; |
587 | command << fileDlg->LineEdit1->text(); | 587 | |
588 | Output *outDlg; | 588 | command << "/bin/sh"; |
589 | outDlg = new Output( command, this, tr("AdvancedFm Output"), true); | 589 | command << "-c"; |
590 | QPEApplication::execDialog( outDlg ); | 590 | command << fileDlg->LineEdit1->text(); |
591 | qApp->processEvents(); | 591 | Output *outDlg; |
592 | 592 | outDlg = new Output( command, this, tr("AdvancedFm Output"), true); | |
593 | } | 593 | QPEApplication::execDialog( outDlg ); |
594 | } | 594 | qApp->processEvents(); |
595 | 595 | ||
596 | void AdvancedFm::runCommandStd() { | 596 | } |
597 | if( !CurrentView()->currentItem()) return; | 597 | } |
598 | QString curFile; | 598 | |
599 | QDir *thisDir = CurrentDir(); | 599 | void AdvancedFm::runCommandStd() { |
600 | QListView *thisView = CurrentView(); | 600 | if( !CurrentView()->currentItem()) return; |
601 | if( thisView->currentItem()) | 601 | QString curFile; |
602 | curFile = thisDir->canonicalPath() +"/"+ thisView->currentItem()->text(0); | 602 | QDir *thisDir = CurrentDir(); |
603 | 603 | QListView *thisView = CurrentView(); | |
604 | InputDialog *fileDlg; | 604 | if( thisView->currentItem()) |
605 | fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0); | 605 | curFile = thisDir->canonicalPath() +"/"+ thisView->currentItem()->text(0); |
606 | fileDlg->setInputText(curFile); | 606 | |
607 | fileDlg->exec(); | 607 | InputDialog *fileDlg; |
608 | 608 | fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0); | |
609 | if( fileDlg->result() == 1 ) { | 609 | fileDlg->setInputText(curFile); |
610 | qApp->processEvents(); | 610 | fileDlg->exec(); |
611 | startProcess( (const QString)fileDlg->LineEdit1->text().latin1()); | 611 | |
612 | } | 612 | if( fileDlg->result() == 1 ) { |
613 | } | 613 | qApp->processEvents(); |
614 | 614 | startProcess( (const QString)fileDlg->LineEdit1->text().latin1()); | |
615 | void AdvancedFm::fileStatus() { | 615 | } |
616 | if( !CurrentView()->currentItem()) return; | 616 | } |
617 | QString curFile; | 617 | |
618 | curFile = CurrentView()->currentItem()->text(0); | 618 | void AdvancedFm::fileStatus() { |
619 | 619 | if( !CurrentView()->currentItem()) return; | |
620 | QStringList command; | 620 | QString curFile; |
621 | command << "/bin/sh"; | 621 | curFile = CurrentView()->currentItem()->text(0); |
622 | command << "-c"; | 622 | |
623 | command << "stat -l "+ curFile; | 623 | QStringList command; |
624 | 624 | command << "/bin/sh"; | |
625 | Output *outDlg; | 625 | command << "-c"; |
626 | outDlg = new Output( command, this, tr("AdvancedFm Output"), true); | 626 | command << "stat -l "+ curFile; |
627 | QPEApplication::execDialog( outDlg ); | 627 | |
628 | qApp->processEvents(); | 628 | Output *outDlg; |
629 | } | 629 | outDlg = new Output( command, this, tr("AdvancedFm Output"), true); |
630 | 630 | QPEApplication::execDialog( outDlg ); | |
631 | 631 | qApp->processEvents(); | |
632 | void AdvancedFm::mkDir() { | 632 | } |
633 | makeDir(); | 633 | |
634 | } | 634 | |
635 | 635 | void AdvancedFm::mkDir() { | |
636 | void AdvancedFm::rn() { | 636 | makeDir(); |
637 | renameIt(); | 637 | } |
638 | } | 638 | |
639 | 639 | void AdvancedFm::rn() { | |
640 | void AdvancedFm::del() { | 640 | renameIt(); |
641 | doDelete(); | 641 | } |
642 | } | 642 | |
643 | 643 | void AdvancedFm::del() { | |
644 | void AdvancedFm::mkSym() { | 644 | doDelete(); |
645 | QString cmd; | 645 | } |
646 | QStringList curFileList = getPath(); | 646 | |
647 | if( curFileList.count() > 0) { | 647 | void AdvancedFm::mkSym() { |
648 | QDir *thisDir = CurrentDir(); | 648 | QString cmd; |
649 | QDir * thatDir = OtherDir(); | 649 | QStringList curFileList = getPath(); |
650 | 650 | if( curFileList.count() > 0) { | |
651 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 651 | QDir *thisDir = CurrentDir(); |
652 | 652 | QDir * thatDir = OtherDir(); | |
653 | QString destName = thatDir->canonicalPath()+"/"+(*it); | 653 | |
654 | if(destName.right(1) == "/") { | 654 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
655 | destName = destName.left( destName.length() -1); | 655 | |
656 | } | 656 | QString destName = thatDir->canonicalPath()+"/"+(*it); |
657 | 657 | if(destName.right(1) == "/") { | |
658 | QString curFile = thisDir->canonicalPath()+"/"+(*it); | 658 | destName = destName.left( destName.length() -1); |
659 | 659 | } | |
660 | if( curFile.right(1) == "/") { | 660 | |
661 | curFile = curFile.left( curFile.length() -1); | 661 | QString curFile = thisDir->canonicalPath()+"/"+(*it); |
662 | } | 662 | |
663 | 663 | if( curFile.right(1) == "/") { | |
664 | cmd = "ln -s "+curFile+" "+destName; | 664 | curFile = curFile.left( curFile.length() -1); |
665 | // qDebug(cmd); | 665 | } |
666 | startProcess( (const QString)cmd ); | 666 | |
667 | } | 667 | cmd = "ln -s "+curFile+" "+destName; |
668 | rePopulate(); | 668 | // odebug << cmd << oendl; |
669 | setOtherTabCurrent(); | 669 | startProcess( (const QString)cmd ); |
670 | } | 670 | } |
671 | } | 671 | rePopulate(); |
672 | 672 | setOtherTabCurrent(); | |
673 | void AdvancedFm::doBeam() { | 673 | } |
674 | Ir ir; | 674 | } |
675 | if(!ir.supported()) { | 675 | |
676 | } else { | 676 | void AdvancedFm::doBeam() { |
677 | QStringList curFileList = getPath(); | 677 | Ir ir; |
678 | if( curFileList.count() > 0) { | 678 | if(!ir.supported()) { |
679 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 679 | } else { |
680 | QString curFile = (*it); | 680 | QStringList curFileList = getPath(); |
681 | QString curFilePath = CurrentDir()->canonicalPath()+"/"+curFile; | 681 | if( curFileList.count() > 0) { |
682 | if( curFilePath.right(1) == "/") { | 682 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
683 | curFilePath = curFilePath.left( curFilePath.length() -1); | 683 | QString curFile = (*it); |
684 | } | 684 | QString curFilePath = CurrentDir()->canonicalPath()+"/"+curFile; |
685 | Ir *file = new Ir(this, "IR"); | 685 | if( curFilePath.right(1) == "/") { |
686 | connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*))); | 686 | curFilePath = curFilePath.left( curFilePath.length() -1); |
687 | file->send( curFilePath, curFile ); | 687 | } |
688 | } | 688 | Ir *file = new Ir(this, "IR"); |
689 | } | 689 | connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*))); |
690 | } | 690 | file->send( curFilePath, curFile ); |
691 | } | 691 | } |
692 | 692 | } | |
693 | void AdvancedFm::fileBeamFinished( Ir *) { | 693 | } |
694 | QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") ); | 694 | } |
695 | } | 695 | |
696 | 696 | void AdvancedFm::fileBeamFinished( Ir *) { | |
697 | void AdvancedFm::selectAll() { | 697 | QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") ); |
698 | QListView *thisView = CurrentView(); | 698 | } |
699 | thisView->selectAll(true); | 699 | |
700 | thisView->setSelected( thisView->firstChild(),false); | 700 | void AdvancedFm::selectAll() { |
701 | } | 701 | QListView *thisView = CurrentView(); |
702 | 702 | thisView->selectAll(true); | |
703 | void AdvancedFm::startProcess(const QString & cmd) { | 703 | thisView->setSelected( thisView->firstChild(),false); |
704 | QStringList command; | 704 | } |
705 | OProcess *process; | 705 | |
706 | process = new OProcess(); | 706 | void AdvancedFm::startProcess(const QString & cmd) { |
707 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), | 707 | QStringList command; |
708 | this, SLOT( processEnded(Opie::Core::OProcess*))); | 708 | OProcess *process; |
709 | 709 | process = new OProcess(); | |
710 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), | 710 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
711 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); | 711 | this, SLOT( processEnded(Opie::Core::OProcess*))); |
712 | 712 | ||
713 | command << "/bin/sh"; | 713 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
714 | command << "-c"; | 714 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
715 | command << cmd.latin1(); | 715 | |
716 | *process << command; | 716 | command << "/bin/sh"; |
717 | if(!process->start(OProcess::NotifyOnExit, OProcess::All) ) | 717 | command << "-c"; |
718 | qDebug("could not start process"); | 718 | command << cmd.latin1(); |
719 | } | 719 | *process << command; |
720 | 720 | if(!process->start(OProcess::NotifyOnExit, OProcess::All) ) | |
721 | void AdvancedFm::processEnded(OProcess *) { | 721 | odebug << "could not start process" << oendl; |
722 | rePopulate(); | 722 | } |
723 | } | 723 | |
724 | 724 | void AdvancedFm::processEnded(OProcess *) { | |
725 | void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) { | 725 | rePopulate(); |
726 | // qWarning("received stderrt %d bytes", buflen); | 726 | } |
727 | 727 | ||
728 | QString lineStr = buffer; | 728 | void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) { |
729 | QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") ); | 729 | // owarn << "received stderrt " << buflen << " bytes" << oendl; |
730 | } | 730 | |
731 | 731 | QString lineStr = buffer; | |
732 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { | 732 | QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") ); |
733 | if ( o->inherits( "QLineEdit" ) ) { | 733 | } |
734 | if ( e->type() == QEvent::KeyPress ) { | 734 | |
735 | QKeyEvent *ke = (QKeyEvent*)e; | 735 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { |
736 | if ( ke->key() == Key_Return || | 736 | if ( o->inherits( "QLineEdit" ) ) { |
737 | ke->key() == Key_Enter ) { | 737 | if ( e->type() == QEvent::KeyPress ) { |
738 | okRename(); | 738 | QKeyEvent *ke = (QKeyEvent*)e; |
739 | return true; | 739 | if ( ke->key() == Key_Return || |
740 | } | 740 | ke->key() == Key_Enter ) { |
741 | else if ( ke->key() == Key_Escape ) { | 741 | okRename(); |
742 | cancelRename(); | 742 | return true; |
743 | return true; | 743 | } |
744 | } | 744 | else if ( ke->key() == Key_Escape ) { |
745 | } | 745 | cancelRename(); |
746 | else if ( e->type() == QEvent::FocusOut ) { | 746 | return true; |
747 | cancelRename(); | 747 | } |
748 | return true; | 748 | } |
749 | } | 749 | else if ( e->type() == QEvent::FocusOut ) { |
750 | } | 750 | cancelRename(); |
751 | if ( o->inherits( "QListView" ) ) { | 751 | return true; |
752 | if ( e->type() == QEvent::FocusIn ) { | 752 | } |
753 | if( o == Local_View) { //keep track of which view | 753 | } |
754 | whichTab=1; | 754 | if ( o->inherits( "QListView" ) ) { |
755 | } | 755 | if ( e->type() == QEvent::FocusIn ) { |
756 | else { | 756 | if( o == Local_View) { //keep track of which view |
757 | whichTab=2; | 757 | whichTab=1; |
758 | } | 758 | } |
759 | } | 759 | else { |
760 | OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection | 760 | whichTab=2; |
761 | } | 761 | } |
762 | 762 | } | |
763 | return QWidget::eventFilter( o, e ); | 763 | OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection |
764 | } | 764 | } |
765 | 765 | ||
766 | 766 | return QWidget::eventFilter( o, e ); | |
767 | void AdvancedFm::cancelRename() { | 767 | } |
768 | // qDebug("cancel rename"); | 768 | |
769 | QListView * view; | 769 | |
770 | view = CurrentView(); | 770 | void AdvancedFm::cancelRename() { |
771 | 771 | // odebug << "cancel rename" << oendl; | |
772 | bool resetFocus = view->viewport()->focusProxy() == renameBox; | 772 | QListView * view; |
773 | delete renameBox; | 773 | view = CurrentView(); |
774 | renameBox = 0; | 774 | |
775 | if ( resetFocus ) { | 775 | bool resetFocus = view->viewport()->focusProxy() == renameBox; |
776 | view->viewport()->setFocusProxy( view); | 776 | delete renameBox; |
777 | view->setFocus(); | 777 | renameBox = 0; |
778 | } | 778 | if ( resetFocus ) { |
779 | } | 779 | view->viewport()->setFocusProxy( view); |
780 | 780 | view->setFocus(); | |
781 | void AdvancedFm::doRename(QListView * view) { | 781 | } |
782 | if( !CurrentView()->currentItem()) return; | 782 | } |
783 | 783 | ||
784 | QRect r = view->itemRect( view->currentItem( )); | 784 | void AdvancedFm::doRename(QListView * view) { |
785 | r = QRect( view->viewportToContents( r.topLeft() ), r.size() ); | 785 | if( !CurrentView()->currentItem()) return; |
786 | r.setX( view->contentsX() ); | 786 | |
787 | 787 | QRect r = view->itemRect( view->currentItem( )); | |
788 | if ( r.width() > view->visibleWidth() ) | 788 | r = QRect( view->viewportToContents( r.topLeft() ), r.size() ); |
789 | r.setWidth( view->visibleWidth() ); | 789 | r.setX( view->contentsX() ); |
790 | 790 | ||
791 | renameBox = new QLineEdit( view->viewport(), "qt_renamebox" ); | 791 | if ( r.width() > view->visibleWidth() ) |
792 | renameBox->setFrame(true); | 792 | r.setWidth( view->visibleWidth() ); |
793 | 793 | ||
794 | renameBox->setText( view->currentItem()->text(0) ); | 794 | renameBox = new QLineEdit( view->viewport(), "qt_renamebox" ); |
795 | 795 | renameBox->setFrame(true); | |
796 | renameBox->selectAll(); | 796 | |
797 | renameBox->installEventFilter( this ); | 797 | renameBox->setText( view->currentItem()->text(0) ); |
798 | 798 | ||
799 | view->addChild( renameBox, r.x(), r.y() ); | 799 | renameBox->selectAll(); |
800 | 800 | renameBox->installEventFilter( this ); | |
801 | renameBox->resize( r.size() ); | 801 | |
802 | 802 | view->addChild( renameBox, r.x(), r.y() ); | |
803 | view->viewport()->setFocusProxy( renameBox ); | 803 | |
804 | 804 | renameBox->resize( r.size() ); | |
805 | renameBox->setFocus(); | 805 | |
806 | renameBox->show(); | 806 | view->viewport()->setFocusProxy( renameBox ); |
807 | } | 807 | |
808 | 808 | renameBox->setFocus(); | |
809 | 809 | renameBox->show(); | |
810 | void AdvancedFm::renameIt() { | 810 | } |
811 | if( !CurrentView()->currentItem()) return; | 811 | |
812 | 812 | ||
813 | QListView *thisView = CurrentView(); | 813 | void AdvancedFm::renameIt() { |
814 | oldName = thisView->currentItem()->text(0); | 814 | if( !CurrentView()->currentItem()) return; |
815 | doRename( thisView ); | 815 | |
816 | } | 816 | QListView *thisView = CurrentView(); |
817 | 817 | oldName = thisView->currentItem()->text(0); | |
818 | void AdvancedFm::okRename() { | 818 | doRename( thisView ); |
819 | if( !renameBox) return; | 819 | } |
820 | 820 | ||
821 | QString newName = renameBox->text(); | 821 | void AdvancedFm::okRename() { |
822 | cancelRename(); | 822 | if( !renameBox) return; |
823 | QListView * view = CurrentView(); | 823 | |
824 | QString path = CurrentDir()->canonicalPath() + "/"; | 824 | QString newName = renameBox->text(); |
825 | oldName = path + oldName; | 825 | cancelRename(); |
826 | newName = path + newName; | 826 | QListView * view = CurrentView(); |
827 | if( rename( oldName.latin1(), newName.latin1())== -1) | 827 | QString path = CurrentDir()->canonicalPath() + "/"; |
828 | QMessageBox::message(tr("Note"),tr("Could not rename")); | 828 | oldName = path + oldName; |
829 | else | 829 | newName = path + newName; |
830 | oldName = ""; | 830 | if( rename( oldName.latin1(), newName.latin1())== -1) |
831 | QListViewItem *item = view->currentItem(); | 831 | QMessageBox::message(tr("Note"),tr("Could not rename")); |
832 | view->takeItem( item ); | 832 | else |
833 | delete item; | 833 | oldName = ""; |
834 | rePopulate(); | 834 | QListViewItem *item = view->currentItem(); |
835 | } | 835 | view->takeItem( item ); |
836 | 836 | delete item; | |
837 | void AdvancedFm::openSearch() { | 837 | rePopulate(); |
838 | QMessageBox::message(tr("Note"),tr("Not Yet Implemented")); | 838 | } |
839 | } | 839 | |
840 | void AdvancedFm::openSearch() { | ||
841 | QMessageBox::message(tr("Note"),tr("Not Yet Implemented")); | ||
842 | } | ||
diff --git a/noncore/apps/advancedfm/filePermissions.cpp b/noncore/apps/advancedfm/filePermissions.cpp index 9698de7..b7d48e8 100644 --- a/noncore/apps/advancedfm/filePermissions.cpp +++ b/noncore/apps/advancedfm/filePermissions.cpp | |||
@@ -31,9 +31,9 @@ filePermissions::filePermissions( QWidget* parent, const char* name, bool modal | |||
31 | : QDialog( parent, name, modal, fl ) | 31 | : QDialog( parent, name, modal, fl ) |
32 | { | 32 | { |
33 | if ( !name ) | 33 | if ( !name ) |
34 | setName( tr("filePermissions") ); | 34 | setName( tr("filePermissions") ); |
35 | // qDebug("FilePermissions "+fileName); | 35 | // odebug << "FilePermissions "+fileName << oendl; |
36 | /* resize( 236, 210 ); | 36 | /* resize( 236, 210 ); |
37 | setMaximumSize( QSize( 236, 210 ) ); | 37 | setMaximumSize( QSize( 236, 210 ) ); |
38 | */ setCaption( tr( "Set File Permissions" ) ); | 38 | */ setCaption( tr( "Set File Permissions" ) ); |
39 | 39 | ||
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index 6906298..8c585f4 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp | |||
@@ -4,21 +4,24 @@ | |||
4 | ** Copyright: Fri Apr 12 15:12:58 2002 L.J. Potter <ljp@llornkcor.com> | 4 | ** Copyright: Fri Apr 12 15:12:58 2002 L.J. Potter <ljp@llornkcor.com> |
5 | ****************************************************************************/ | 5 | ****************************************************************************/ |
6 | #include "output.h" | 6 | #include "output.h" |
7 | 7 | ||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
8 | #include <qpe/qpeapplication.h> | 10 | #include <qpe/qpeapplication.h> |
9 | #include <qpe/applnk.h> | 11 | #include <qpe/applnk.h> |
12 | using namespace Opie::Core; | ||
10 | 13 | ||
14 | /* QT */ | ||
11 | #include <qfile.h> | 15 | #include <qfile.h> |
12 | #include <qmultilineedit.h> | 16 | #include <qmultilineedit.h> |
13 | #include <qpushbutton.h> | 17 | #include <qpushbutton.h> |
14 | #include <qlayout.h> | 18 | #include <qlayout.h> |
15 | 19 | ||
20 | /* STD */ | ||
16 | #include <errno.h> | 21 | #include <errno.h> |
17 | 22 | ||
18 | /* XPM */ | 23 | /* XPM */ |
19 | using namespace Opie::Core; | ||
20 | using namespace Opie::Core; | ||
21 | static char * filesave_xpm[] = { | 24 | static char * filesave_xpm[] = { |
22 | "16 16 78 1", | 25 | "16 16 78 1", |
23 | " c None", | 26 | " c None", |
24 | ". c #343434", | 27 | ". c #343434", |
@@ -120,9 +123,9 @@ Output::Output( const QStringList commands, QWidget* parent, const char* name, | |||
120 | { | 123 | { |
121 | QStringList cmmds; | 124 | QStringList cmmds; |
122 | // cmmds=QStringList::split( " ", commands, false); | 125 | // cmmds=QStringList::split( " ", commands, false); |
123 | cmmds=commands; | 126 | cmmds=commands; |
124 | // qDebug("count %d", cmmds.count()); | 127 | // odebug << "count " << cmmds.count() << "" << oendl; |
125 | if ( !name ) | 128 | if ( !name ) |
126 | setName( tr("Output")); | 129 | setName( tr("Output")); |
127 | resize( 196, 269 ); | 130 | resize( 196, 269 ); |
128 | setCaption( name ); | 131 | setCaption( name ); |
@@ -156,9 +159,9 @@ Output::Output( const QStringList commands, QWidget* parent, const char* name, | |||
156 | // this, SLOT(commandStdin(const QByteArray&))); | 159 | // this, SLOT(commandStdin(const QByteArray&))); |
157 | 160 | ||
158 | // * proc << commands.latin1(); | 161 | // * proc << commands.latin1(); |
159 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { | 162 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { |
160 | qDebug( "%s", (*it).latin1() ); | 163 | odebug << "" << (*it).latin1() << "" << oendl; |
161 | * proc << (*it).latin1(); | 164 | * proc << (*it).latin1(); |
162 | } | 165 | } |
163 | 166 | ||
164 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) { | 167 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) { |
@@ -185,9 +188,9 @@ void Output::saveOutput() { | |||
185 | if(filename.right(1).find('/') == -1) | 188 | if(filename.right(1).find('/') == -1) |
186 | filename+="/"; | 189 | filename+="/"; |
187 | QString name = fileDlg->LineEdit1->text(); | 190 | QString name = fileDlg->LineEdit1->text(); |
188 | filename+="text/plain/"+name; | 191 | filename+="text/plain/"+name; |
189 | qDebug(filename); | 192 | odebug << filename << oendl; |
190 | 193 | ||
191 | QFile f(filename); | 194 | QFile f(filename); |
192 | f.open( IO_WriteOnly); | 195 | f.open( IO_WriteOnly); |
193 | if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) { | 196 | if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) { |
@@ -195,18 +198,18 @@ void Output::saveOutput() { | |||
195 | lnk.setName(name); //sets file name | 198 | lnk.setName(name); //sets file name |
196 | lnk.setFile(filename); //sets File property | 199 | lnk.setFile(filename); //sets File property |
197 | lnk.setType("text/plain"); | 200 | lnk.setType("text/plain"); |
198 | if(!lnk.writeLink()) { | 201 | if(!lnk.writeLink()) { |
199 | qDebug("Writing doclink did not work"); | 202 | odebug << "Writing doclink did not work" << oendl; |
200 | } | 203 | } |
201 | } else | 204 | } else |
202 | qWarning("Could not write file"); | 205 | owarn << "Could not write file" << oendl; |
203 | f.close(); | 206 | f.close(); |
204 | } | 207 | } |
205 | } | 208 | } |
206 | 209 | ||
207 | void Output::commandStdout(OProcess*, char *buffer, int buflen) { | 210 | void Output::commandStdout(OProcess*, char *buffer, int buflen) { |
208 | qWarning("received stdout %d bytes", buflen); | 211 | owarn << "received stdout " << buflen << " bytes" << oendl; |
209 | 212 | ||
210 | // QByteArray data(buflen); | 213 | // QByteArray data(buflen); |
211 | // data.fill(*buffer, buflen); | 214 | // data.fill(*buffer, buflen); |
212 | // for (uint i = 0; i < data.count(); i++ ) { | 215 | // for (uint i = 0; i < data.count(); i++ ) { |
@@ -221,15 +224,15 @@ void Output::commandStdout(OProcess*, char *buffer, int buflen) { | |||
221 | } | 224 | } |
222 | 225 | ||
223 | 226 | ||
224 | void Output::commandStdin( const QByteArray &data) { | 227 | void Output::commandStdin( const QByteArray &data) { |
225 | qWarning("received stdin %d bytes", data.size()); | 228 | owarn << "received stdin " << data.size() << " bytes" << oendl; |
226 | // recieved data from the io layer goes to sz | 229 | // recieved data from the io layer goes to sz |
227 | proc->writeStdin(data.data(), data.size()); | 230 | proc->writeStdin(data.data(), data.size()); |
228 | } | 231 | } |
229 | 232 | ||
230 | void Output::commandStderr(OProcess*, char *buffer, int buflen) { | 233 | void Output::commandStderr(OProcess*, char *buffer, int buflen) { |
231 | qWarning("received stderrt %d bytes", buflen); | 234 | owarn << "received stderrt " << buflen << " bytes" << oendl; |
232 | 235 | ||
233 | QString lineStr = buffer; | 236 | QString lineStr = buffer; |
234 | // lineStr=lineStr.left(lineStr.length()-1); | 237 | // lineStr=lineStr.left(lineStr.length()-1); |
235 | OutputEdit->append(lineStr); | 238 | OutputEdit->append(lineStr); |
diff --git a/noncore/apps/checkbook/checkbook.pro b/noncore/apps/checkbook/checkbook.pro index 34641f4..1472df6 100644 --- a/noncore/apps/checkbook/checkbook.pro +++ b/noncore/apps/checkbook/checkbook.pro | |||
@@ -1,5 +1,5 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | HEADERS = mainwindow.h \ | 2 | HEADERS = mainwindow.h \ |
3 | cbinfo.h \ | 3 | cbinfo.h \ |
4 | traninfo.h \ | 4 | traninfo.h \ |
5 | graphinfo.h \ | 5 | graphinfo.h \ |
diff --git a/noncore/apps/checkbook/listedit.cpp b/noncore/apps/checkbook/listedit.cpp index d00e305..5026c9d 100644 --- a/noncore/apps/checkbook/listedit.cpp +++ b/noncore/apps/checkbook/listedit.cpp | |||
@@ -26,16 +26,21 @@ | |||
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "listedit.h" | 29 | #include "listedit.h" |
30 | |||
31 | /* OPIE */ | ||
32 | #include <opie2/odebug.h> | ||
33 | #include <qpe/resource.h> | ||
34 | using namespace Opie::Core; | ||
35 | |||
36 | /* QT */ | ||
30 | #include <qlayout.h> | 37 | #include <qlayout.h> |
31 | #include <qlineedit.h> | 38 | #include <qlineedit.h> |
32 | #include <qlistview.h> | 39 | #include <qlistview.h> |
33 | #include <qwidgetstack.h> | 40 | #include <qwidgetstack.h> |
34 | #include <qcombobox.h> | 41 | #include <qcombobox.h> |
35 | #include <qpushbutton.h> | 42 | #include <qpushbutton.h> |
36 | #include <qpe/resource.h> | ||
37 | |||
38 | 43 | ||
39 | // --- ListEdit --------------------------------------------------------------- | 44 | // --- ListEdit --------------------------------------------------------------- |
40 | ListEdit::ListEdit( QWidget *parent, const char *sName ) | 45 | ListEdit::ListEdit( QWidget *parent, const char *sName ) |
41 | : QWidget(parent, sName), TableDef(sName) | 46 | : QWidget(parent, sName), TableDef(sName) |
@@ -301,9 +306,9 @@ void ListEdit::slotClick(QListViewItem *itm, const QPoint &pnt, int col) | |||
301 | _box->setCurrentItem(i); | 306 | _box->setCurrentItem(i); |
302 | } | 307 | } |
303 | _stack->raiseWidget(_box); | 308 | _stack->raiseWidget(_box); |
304 | } else { | 309 | } else { |
305 | qDebug( "Unsupported column type for column %s", (const char *)pDef->getName() ); | 310 | odebug << "Unsupported column type for column " << (const char *)pDef->getName() << "" << oendl; |
306 | _typeEdit->setText(""); | 311 | _typeEdit->setText(""); |
307 | _stack->raiseWidget(_typeEdit); | 312 | _stack->raiseWidget(_typeEdit); |
308 | } | 313 | } |
309 | } | 314 | } |
diff --git a/noncore/apps/checkbook/tabledef.cpp b/noncore/apps/checkbook/tabledef.cpp index 9a42308..745cd80 100644 --- a/noncore/apps/checkbook/tabledef.cpp +++ b/noncore/apps/checkbook/tabledef.cpp | |||
@@ -27,8 +27,10 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "tabledef.h" | 29 | #include "tabledef.h" |
30 | 30 | ||
31 | #include <opie2/odebug.h> | ||
32 | using namespace Opie::Core; | ||
31 | 33 | ||
32 | // --- ColumnDef -------------------------------------------------------------- | 34 | // --- ColumnDef -------------------------------------------------------------- |
33 | ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue) | 35 | ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue) |
34 | { | 36 | { |
@@ -41,16 +43,16 @@ ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue) | |||
41 | // --- addColumnValue --------------------------------------------------------- | 43 | // --- addColumnValue --------------------------------------------------------- |
42 | void ColumnDef::addColumnValue(const QString &sValue) | 44 | void ColumnDef::addColumnValue(const QString &sValue) |
43 | { | 45 | { |
44 | if( (_type & 0x00ffffff) !=typeList ) | 46 | if( (_type & 0x00ffffff) !=typeList ) |
45 | qDebug("Column %s is not a list", (const char *)_sName); | 47 | odebug << "Column " << (const char *)_sName << " is not a list" << oendl; |
46 | else | 48 | else |
47 | _valueList.append(sValue); | 49 | _valueList.append(sValue); |
48 | } | 50 | } |
49 | void ColumnDef::addColumnValue(const char *sValue) | 51 | void ColumnDef::addColumnValue(const char *sValue) |
50 | { | 52 | { |
51 | if( (_type & 0x00ffffff)!=typeList ) | 53 | if( (_type & 0x00ffffff)!=typeList ) |
52 | qDebug("Column %s is not a list", (const char *)_sName); | 54 | odebug << "Column " << (const char *)_sName << " is not a list" << oendl; |
53 | else | 55 | else |
54 | _valueList.append(sValue); | 56 | _valueList.append(sValue); |
55 | } | 57 | } |
56 | 58 | ||
diff --git a/noncore/apps/checkbook/transaction.cpp b/noncore/apps/checkbook/transaction.cpp index 1b08b24..aafb588 100644 --- a/noncore/apps/checkbook/transaction.cpp +++ b/noncore/apps/checkbook/transaction.cpp | |||
@@ -30,10 +30,14 @@ | |||
30 | #include "traninfo.h" | 30 | #include "traninfo.h" |
31 | #include "cfg.h" | 31 | #include "cfg.h" |
32 | #include "checkbook.h" | 32 | #include "checkbook.h" |
33 | 33 | ||
34 | /* OPIE */ | ||
35 | #include <opie2/odebug.h> | ||
34 | #include <qpe/datebookmonth.h> | 36 | #include <qpe/datebookmonth.h> |
37 | using namespace Opie::Core; | ||
35 | 38 | ||
39 | /* QT */ | ||
36 | #include <qbuttongroup.h> | 40 | #include <qbuttongroup.h> |
37 | #include <qcombobox.h> | 41 | #include <qcombobox.h> |
38 | #include <qlabel.h> | 42 | #include <qlabel.h> |
39 | #include <qlayout.h> | 43 | #include <qlayout.h> |
@@ -331,7 +335,7 @@ void Transaction::slotActivated(const QString &arg ) | |||
331 | 335 | ||
332 | // slotNotNew ----------------------------------------------------------------- | 336 | // slotNotNew ----------------------------------------------------------------- |
333 | void Transaction::slotNotNew() | 337 | void Transaction::slotNotNew() |
334 | { | 338 | { |
335 | qDebug("Not new"); | 339 | odebug << "Not new" << oendl; |
336 | _bNew=false; | 340 | _bNew=false; |
337 | } | 341 | } |
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro index 5a71680..785c588 100644 --- a/noncore/apps/confedit/confedit.pro +++ b/noncore/apps/confedit/confedit.pro | |||
@@ -1,21 +1,9 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h | 2 | HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h |
3 | SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp | 3 | SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp |
4 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
5 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
6 | INTERFACES = | 6 | LIBS += -lqpe -lopiecore2 |
7 | LIBS += -lopiecore2 | ||
8 | TARGET = confedit | 7 | TARGET = confedit |
9 | 8 | ||
10 | !contains( platform, x11 ) { | 9 | include ( $(OPIEDIR)/include.pro ) |
11 | |||
12 | include ( $(OPIEDIR)/include.pro ) | ||
13 | LIBS += -lqpe | ||
14 | } | ||
15 | |||
16 | contains( platform, x11 ) { | ||
17 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
18 | } | ||
19 | |||
20 | |||
21 | |||
diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in index e377307..d7682dc 100644 --- a/noncore/apps/confedit/config.in +++ b/noncore/apps/confedit/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config CONFEDIT | 1 | config CONFEDIT |
2 | boolean "opie-confeditor (generic editor for all Opie settings)" | 2 | boolean "opie-confedit (generic editor for all Opie settings)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/apps/confedit/listviewconfdir.cpp b/noncore/apps/confedit/listviewconfdir.cpp index 0c2feeb..33bffe1 100644 --- a/noncore/apps/confedit/listviewconfdir.cpp +++ b/noncore/apps/confedit/listviewconfdir.cpp | |||
@@ -8,12 +8,16 @@ | |||
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> | 9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> |
10 | 10 | ||
11 | #include "listviewconfdir.h" | 11 | #include "listviewconfdir.h" |
12 | #include "listviewitemconffile.h" | ||
12 | 13 | ||
13 | #include <qmessagebox.h> | 14 | /* OPIE */ |
15 | #include <opie2/odebug.h> | ||
16 | using namespace Opie::Core; | ||
14 | 17 | ||
15 | #include "listviewitemconffile.h" | 18 | /* QT */ |
19 | #include <qmessagebox.h> | ||
16 | 20 | ||
17 | ListViewConfDir::ListViewConfDir(QString settingsPath, QWidget *parent, const char *name ) | 21 | ListViewConfDir::ListViewConfDir(QString settingsPath, QWidget *parent, const char *name ) |
18 | : QListView(parent,name), confDir(settingsPath) | 22 | : QListView(parent,name), confDir(settingsPath) |
19 | { | 23 | { |
@@ -35,9 +39,9 @@ ListViewConfDir::~ListViewConfDir() | |||
35 | 39 | ||
36 | void ListViewConfDir::readConfFiles() | 40 | void ListViewConfDir::readConfFiles() |
37 | { | 41 | { |
38 | 42 | ||
39 | confDir.setFilter( QDir::Files | QDir::NoSymLinks ); | 43 | confDir.setFilter( QDir::Files | QDir::NoSymLinks ); |
40 | confDir.setSorting( QDir::Name ); | 44 | confDir.setSorting( QDir::Name ); |
41 | confDir.setNameFilter("*.conf"); | 45 | confDir.setNameFilter("*.conf"); |
42 | const QFileInfoList *list = confDir.entryInfoList(); | 46 | const QFileInfoList *list = confDir.entryInfoList(); |
43 | QFileInfoListIterator it( *list ); | 47 | QFileInfoListIterator it( *list ); |
@@ -46,9 +50,9 @@ void ListViewConfDir::readConfFiles() | |||
46 | ListViewItemConfFile *fileEntry; | 50 | ListViewItemConfFile *fileEntry; |
47 | 51 | ||
48 | while ( (fi=it.current()) ) | 52 | while ( (fi=it.current()) ) |
49 | { | 53 | { |
50 | qDebug( "opening: >%s<", fi->fileName().data() ); | 54 | odebug << "opening: >" << fi->fileName().data() << "<" << oendl; |
51 | fileEntry = new ListViewItemConfFile( fi, this ); | 55 | fileEntry = new ListViewItemConfFile( fi, this ); |
52 | QListViewItem *dummy = new QListViewItem(fileEntry, "dummy"); | 56 | QListViewItem *dummy = new QListViewItem(fileEntry, "dummy"); |
53 | ++it; | 57 | ++it; |
54 | } | 58 | } |
diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp index 1ff2c44..2958cf5 100644 --- a/noncore/apps/confedit/listviewitemconffile.cpp +++ b/noncore/apps/confedit/listviewitemconffile.cpp | |||
@@ -8,19 +8,25 @@ | |||
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 9 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> |
10 | 10 | ||
11 | #include "listviewitemconffile.h" | 11 | #include "listviewitemconffile.h" |
12 | #include "listviewitemconfigentry.h" | ||
13 | |||
14 | /* OPIE */ | ||
15 | #include <opie2/odebug.h> | ||
16 | using namespace Opie::Core; | ||
17 | |||
18 | /* QT */ | ||
12 | #include <qmessagebox.h> | 19 | #include <qmessagebox.h> |
13 | #include <qtextstream.h> | 20 | #include <qtextstream.h> |
14 | #include "listviewitemconfigentry.h" | ||
15 | 21 | ||
16 | #define tr QObject::tr | 22 | #define tr QObject::tr |
17 | 23 | ||
18 | ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent) | 24 | ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent) |
19 | : ListViewItemConf(parent), _valid(false) | 25 | : ListViewItemConf(parent), _valid(false) |
20 | { | 26 | { |
21 | confFileInfo = file; | 27 | confFileInfo = file; |
22 | // parseFile(); | 28 | // parseFile(); |
23 | displayText(); | 29 | displayText(); |
24 | } | 30 | } |
25 | 31 | ||
26 | ListViewItemConfFile::~ListViewItemConfFile() | 32 | ListViewItemConfFile::~ListViewItemConfFile() |
@@ -39,10 +45,10 @@ QString ListViewItemConfFile::fileName() | |||
39 | } | 45 | } |
40 | 46 | ||
41 | void ListViewItemConfFile::parseFile() | 47 | void ListViewItemConfFile::parseFile() |
42 | { | 48 | { |
43 | //qDebug("ListViewItemConfFile::parseFile BEGIN"); | 49 | //odebug << "ListViewItemConfFile::parseFile BEGIN" << oendl; |
44 | QFile confFile(confFileInfo->absFilePath()); | 50 | QFile confFile(confFileInfo->absFilePath()); |
45 | if(! confFile.open(IO_ReadOnly)) | 51 | if(! confFile.open(IO_ReadOnly)) |
46 | QMessageBox::critical(0,tr("Could not open"),tr("The file ")+confFileInfo->fileName()+tr(" could not be opened."),1,0); | 52 | QMessageBox::critical(0,tr("Could not open"),tr("The file ")+confFileInfo->fileName()+tr(" could not be opened."),1,0); |
47 | QTextStream t( &confFile ); | 53 | QTextStream t( &confFile ); |
48 | QString s; | 54 | QString s; |
@@ -51,33 +57,33 @@ void ListViewItemConfFile::parseFile() | |||
51 | ListViewItemConfigEntry *item; | 57 | ListViewItemConfigEntry *item; |
52 | while ( !t.atEnd() ) | 58 | while ( !t.atEnd() ) |
53 | { | 59 | { |
54 | s = t.readLine().stripWhiteSpace(); | 60 | s = t.readLine().stripWhiteSpace(); |
55 | //qDebug( "line: >%s<\n", s.latin1() ); | 61 | //odebug << "line: >" << s.latin1() << "<\n" << oendl; |
56 | if (s.contains("<?xml")) | 62 | if (s.contains("<?xml")) |
57 | { | 63 | { |
58 | _valid = false; | 64 | _valid = false; |
59 | break; | 65 | break; |
60 | }else | 66 | }else |
61 | if ( s[0] == '[' && s[s.length()-1] == ']' ) | 67 | if ( s[0] == '[' && s[s.length()-1] == ']' ) |
62 | { | 68 | { |
63 | // qDebug("got group"+s); | 69 | // odebug << "got group"+s << oendl; |
64 | group = s.mid(1,s.length()-2); | 70 | group = s.mid(1,s.length()-2); |
65 | if (!groupItem) groupItem = new ListViewItemConfigEntry(this, tr("no group") ); | 71 | if (!groupItem) groupItem = new ListViewItemConfigEntry(this, tr("no group") ); |
66 | groupItem = new ListViewItemConfigEntry(this, group ); | 72 | groupItem = new ListViewItemConfigEntry(this, group ); |
67 | insertItem( groupItem ); | 73 | insertItem( groupItem ); |
68 | } else | 74 | } else |
69 | if ( int pos = s.find('=') ) | 75 | if ( int pos = s.find('=') ) |
70 | { | 76 | { |
71 | // qDebug("got key"+s); | 77 | // odebug << "got key"+s << oendl; |
72 | if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1()); | 78 | if (!groupItem) odebug << "PANIK NO GROUP! >" << group.latin1() << "<" << oendl; |
73 | item = new ListViewItemConfigEntry(this, group, s ); | 79 | item = new ListViewItemConfigEntry(this, group, s ); |
74 | groupItem->insertItem( item ); | 80 | groupItem->insertItem( item ); |
75 | } | 81 | } |
76 | } | 82 | } |
77 | confFile.close(); | 83 | confFile.close(); |
78 | setExpandable( _valid ); | 84 | setExpandable( _valid ); |
79 | //qDebug("ListViewItemConfFile::parseFile END"); | 85 | //odebug << "ListViewItemConfFile::parseFile END" << oendl; |
80 | } | 86 | } |
81 | 87 | ||
82 | 88 | ||
83 | void ListViewItemConfFile::remove() | 89 | void ListViewItemConfFile::remove() |
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp index 6ef1043..4b04c97 100644 --- a/noncore/apps/confedit/mainwindow.cpp +++ b/noncore/apps/confedit/mainwindow.cpp | |||
@@ -10,17 +10,20 @@ | |||
10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> |
11 | 11 | ||
12 | 12 | ||
13 | #include "mainwindow.h" | 13 | #include "mainwindow.h" |
14 | #include "listviewconfdir.h" | ||
15 | #include "listviewitemconfigentry.h" | ||
14 | 16 | ||
17 | /* OPIE */ | ||
18 | #include <opie2/odebug.h> | ||
19 | using namespace Opie::Core; | ||
20 | |||
21 | /* QT */ | ||
15 | #include <qlabel.h> | 22 | #include <qlabel.h> |
16 | #include <qlayout.h> | 23 | #include <qlayout.h> |
17 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
18 | 25 | ||
19 | #include "listviewconfdir.h" | ||
20 | #include "listviewitemconfigentry.h" | ||
21 | |||
22 | |||
23 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | 26 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : |
24 | QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0) | 27 | QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0) |
25 | { | 28 | { |
26 | setCaption( tr("Conf File Editor") ); | 29 | setCaption( tr("Conf File Editor") ); |
@@ -32,14 +35,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
32 | mainLayout->setSpacing( 0 ); | 35 | mainLayout->setSpacing( 0 ); |
33 | mainLayout->setMargin( 0 ); | 36 | mainLayout->setMargin( 0 ); |
34 | 37 | ||
35 | 38 | ||
36 | qDebug("creating settingList"); | 39 | odebug << "creating settingList" << oendl; |
37 | settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist"); | 40 | settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist"); |
38 | settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) ); | 41 | settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) ); |
39 | mainLayout->addWidget( settingList, 0); | 42 | mainLayout->addWidget( settingList, 0); |
40 | 43 | ||
41 | qDebug("creating editor"); | 44 | odebug << "creating editor" << oendl; |
42 | editor = new EditWidget(this); | 45 | editor = new EditWidget(this); |
43 | editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) ); | 46 | editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) ); |
44 | mainLayout->addWidget( editor, 1 ); | 47 | mainLayout->addWidget( editor, 1 ); |
45 | editor->layoutType( ListViewItemConf::File ); | 48 | editor->layoutType( ListViewItemConf::File ); |
@@ -97,9 +100,9 @@ MainWindow::~MainWindow() | |||
97 | 100 | ||
98 | 101 | ||
99 | void MainWindow::setCurrent(QListViewItem *item) | 102 | void MainWindow::setCurrent(QListViewItem *item) |
100 | { | 103 | { |
101 | //qDebug("MainWindow::setCurrent"); | 104 | //odebug << "MainWindow::setCurrent" << oendl; |
102 | if (!item) return; | 105 | if (!item) return; |
103 | _item = (ListViewItemConf*) item; | 106 | _item = (ListViewItemConf*) item; |
104 | if (!_item) return; | 107 | if (!_item) return; |
105 | popupTimer->start( 750, true ); | 108 | popupTimer->start( 750, true ); |
@@ -173,9 +176,9 @@ void MainWindow::removeConfFile() | |||
173 | } | 176 | } |
174 | 177 | ||
175 | void MainWindow::showPopup() | 178 | void MainWindow::showPopup() |
176 | { | 179 | { |
177 | qDebug("showPopup"); | 180 | odebug << "showPopup" << oendl; |
178 | if (!_item) return; | 181 | if (!_item) return; |
179 | popupActionRevert->setEnabled(_item->revertable()); | 182 | popupActionRevert->setEnabled(_item->revertable()); |
180 | popupActionSave->setEnabled(_item->isChanged()); | 183 | popupActionSave->setEnabled(_item->isChanged()); |
181 | if (_fileItem) | 184 | if (_fileItem) |
diff --git a/noncore/apps/keyz-cfg/cfgfile.cpp b/noncore/apps/keyz-cfg/cfgfile.cpp index b0dc968..81d1ee1 100644 --- a/noncore/apps/keyz-cfg/cfgfile.cpp +++ b/noncore/apps/keyz-cfg/cfgfile.cpp | |||
@@ -1,7 +1,13 @@ | |||
1 | #include <qmessagebox.h> | ||
2 | #include "cfgfile.h" | 1 | #include "cfgfile.h" |
3 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
8 | #include <qmessagebox.h> | ||
9 | |||
4 | // CfgEntry implementation | 10 | // CfgEntry implementation |
5 | CfgEntry::CfgEntry() { | 11 | CfgEntry::CfgEntry() { |
6 | } | 12 | } |
7 | 13 | ||
@@ -94,9 +100,9 @@ bool CfgParser::load(QString file, CfgFile& cfg) { | |||
94 | arperiod = -1; | 100 | arperiod = -1; |
95 | reader.parse(is); | 101 | reader.parse(is); |
96 | 102 | ||
97 | if (!err.isEmpty()) { | 103 | if (!err.isEmpty()) { |
98 | qDebug(err); | 104 | odebug << err << oendl; |
99 | return false; | 105 | return false; |
100 | } | 106 | } |
101 | 107 | ||
102 | QMap<QString, QString>::Iterator fit, lit; | 108 | QMap<QString, QString>::Iterator fit, lit; |
@@ -105,9 +111,9 @@ bool CfgParser::load(QString file, CfgFile& cfg) { | |||
105 | fit = includes.find(file); | 111 | fit = includes.find(file); |
106 | QString prefix = fit.data(); | 112 | QString prefix = fit.data(); |
107 | QString label = ""; | 113 | QString label = ""; |
108 | 114 | ||
109 | qDebug("include: file=" + fit.key() + ", prefix=" + fit.data()); | 115 | odebug << "include: file=" + fit.key() + ", prefix=" + fit.data() << oendl; |
110 | lit = labels.find(prefix+":*"); | 116 | lit = labels.find(prefix+":*"); |
111 | if (lit != labels.end()) { | 117 | if (lit != labels.end()) { |
112 | label = lit.data(); | 118 | label = lit.data(); |
113 | } | 119 | } |
diff --git a/noncore/apps/keyz-cfg/config.in b/noncore/apps/keyz-cfg/config.in index 29a10f5..8e1be2d 100644 --- a/noncore/apps/keyz-cfg/config.in +++ b/noncore/apps/keyz-cfg/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config KEYZCFG | 1 | config KEYZCFG |
2 | boolean "keyz-cfg (configuration tool for keyz applet)" | 2 | boolean "keyz-cfg (configuration tool for keyz applet)" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/apps/keyz-cfg/keyz-cfg.pro b/noncore/apps/keyz-cfg/keyz-cfg.pro index 44bbb5f..7ac604b 100644 --- a/noncore/apps/keyz-cfg/keyz-cfg.pro +++ b/noncore/apps/keyz-cfg/keyz-cfg.pro | |||
@@ -1,24 +1,24 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | DESTDIR = $(OPIEDIR)/bin | 2 | DESTDIR = $(OPIEDIR)/bin |
3 | CONFIG = qt warn_on | 3 | CONFIG = qt warn_on |
4 | HEADERS = zkb.h \ | 4 | HEADERS = zkb.h \ |
5 | zkbcfg.h \ | 5 | zkbcfg.h \ |
6 | zkbnames.h \ | 6 | zkbnames.h \ |
7 | zkbxml.h \ | 7 | zkbxml.h \ |
8 | cfgdlg.h \ | 8 | cfgdlg.h \ |
9 | cfgfile.h | 9 | cfgfile.h |
10 | 10 | ||
11 | SOURCES = main.cpp \ | 11 | SOURCES = main.cpp \ |
12 | cfgdlg.cpp \ | 12 | cfgdlg.cpp \ |
13 | cfgfile.cpp \ | 13 | cfgfile.cpp \ |
14 | zkb.cpp \ | 14 | zkb.cpp \ |
15 | zkbcfg.cpp \ | 15 | zkbcfg.cpp \ |
16 | zkbnames.cpp \ | 16 | zkbnames.cpp \ |
17 | zkbxml.cpp | 17 | zkbxml.cpp |
18 | 18 | ||
19 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH += $(OPIEDIR)/include | 20 | DEPENDPATH += $(OPIEDIR)/include |
21 | LIBS += -lqpe | 21 | LIBS += -lqpe -lopiecore2 |
22 | TARGET = keyz-cfg | 22 | TARGET = keyz-cfg |
23 | 23 | ||
24 | include ( $(OPIEDIR)/include.pro ) | 24 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/apps/keyz-cfg/zkb.cpp index f315d4b..8382615 100644 --- a/noncore/apps/keyz-cfg/zkb.cpp +++ b/noncore/apps/keyz-cfg/zkb.cpp | |||
@@ -363,9 +363,9 @@ State* Keymap::getStateByLabel(const QString& label) { | |||
363 | name += currentStateName.mid(n+1); | 363 | name += currentStateName.mid(n+1); |
364 | } | 364 | } |
365 | } | 365 | } |
366 | 366 | ||
367 | //qDebug("look for: %s\n", (const char*) name.utf8()); | 367 | //odebug << "look for: " << (const char*) name.utf8() << "\n" << oendl; |
368 | QMap<QString, State*>::Iterator sit = states.find(name); | 368 | QMap<QString, State*>::Iterator sit = states.find(name); |
369 | if (sit != states.end()) { | 369 | if (sit != states.end()) { |
370 | state = sit.data(); | 370 | state = sit.data(); |
371 | } | 371 | } |
@@ -415,9 +415,9 @@ bool Keymap::setCurrentState(State* state) { | |||
415 | tit = stateLabelMap.find(state); | 415 | tit = stateLabelMap.find(state); |
416 | if (tit != stateLabelMap.end()) { | 416 | if (tit != stateLabelMap.end()) { |
417 | currentLabel = tit.data(); | 417 | currentLabel = tit.data(); |
418 | } else { | 418 | } else { |
419 | // qDebug("no label for: " + currentStateName + "\n"); | 419 | // odebug << "no label for: " + currentStateName + "\n" << oendl; |
420 | currentLabel = ""; | 420 | currentLabel = ""; |
421 | } | 421 | } |
422 | 422 | ||
423 | return true; | 423 | return true; |
diff --git a/noncore/apps/keyz-cfg/zkbcfg.cpp b/noncore/apps/keyz-cfg/zkbcfg.cpp index 0992b9a..f1d53ba 100644 --- a/noncore/apps/keyz-cfg/zkbcfg.cpp +++ b/noncore/apps/keyz-cfg/zkbcfg.cpp | |||
@@ -1,8 +1,12 @@ | |||
1 | #include <qfileinfo.h> | ||
2 | |||
3 | #include "zkbcfg.h" | 1 | #include "zkbcfg.h" |
4 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
8 | #include <qfileinfo.h> | ||
5 | 9 | ||
6 | // Implementation of XkbConfig class | 10 | // Implementation of XkbConfig class |
7 | ZkbConfig::ZkbConfig(const QString& dir):path(dir) { | 11 | ZkbConfig::ZkbConfig(const QString& dir):path(dir) { |
8 | } | 12 | } |
@@ -14,9 +18,9 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix) | |||
14 | bool ret; | 18 | bool ret; |
15 | QFile f(path+"/"+file); | 19 | QFile f(path+"/"+file); |
16 | QFileInfo fi(f); | 20 | QFileInfo fi(f); |
17 | 21 | ||
18 | qDebug("start loading file=%s\n", (const char*) file.utf8()); | 22 | odebug << "start loading file=" << (const char*) file.utf8() << "\n" << oendl; |
19 | if (includedFiles.find(fi.absFilePath()) != includedFiles.end()) { | 23 | if (includedFiles.find(fi.absFilePath()) != includedFiles.end()) { |
20 | return false; | 24 | return false; |
21 | } | 25 | } |
22 | 26 | ||
@@ -29,10 +33,9 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix) | |||
29 | reader.setErrorHandler(this); | 33 | reader.setErrorHandler(this); |
30 | ret = reader.parse(is); | 34 | ret = reader.parse(is); |
31 | includedFiles.remove(fi.absFilePath()); | 35 | includedFiles.remove(fi.absFilePath()); |
32 | 36 | ||
33 | qDebug("end loading file=%s : status=%s\n", (const char*) file.utf8(), | 37 | odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl; |
34 | (const char*) err.utf8()); | ||
35 | return ret; | 38 | return ret; |
36 | } | 39 | } |
37 | 40 | ||
38 | bool ZkbConfig::warning(const QXmlParseException& e) { | 41 | bool ZkbConfig::warning(const QXmlParseException& e) { |
@@ -121,9 +124,9 @@ bool ZkbHandler::startStateElement(const QString& name, | |||
121 | 124 | ||
122 | currentStateName = prefix + name; | 125 | currentStateName = prefix + name; |
123 | currentState = keymap.getStateByName(currentStateName); | 126 | currentState = keymap.getStateByName(currentStateName); |
124 | 127 | ||
125 | //qDebug("state name=%s\n", (const char*) currentStateName.utf8()); | 128 | //odebug << "state name=" << (const char*) currentStateName.utf8() << "\n" << oendl; |
126 | 129 | ||
127 | State* parent = 0; | 130 | State* parent = 0; |
128 | if (!parentName.isEmpty()) { | 131 | if (!parentName.isEmpty()) { |
129 | QString pn = prefix + parentName; | 132 | QString pn = prefix + parentName; |
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp index e6cb515..59fc242 100644 --- a/noncore/apps/opie-bartender/bartender.cpp +++ b/noncore/apps/opie-bartender/bartender.cpp | |||
@@ -15,14 +15,15 @@ | |||
15 | #include "inputDialog.h" | 15 | #include "inputDialog.h" |
16 | #include "searchresults.h" | 16 | #include "searchresults.h" |
17 | #include "bac.h" | 17 | #include "bac.h" |
18 | 18 | ||
19 | #include <qtoolbar.h> | 19 | /* OPIE */ |
20 | #include <qmenubar.h> | 20 | #include <opie2/odebug.h> |
21 | //#include <opie2/colorpopupmenu.h> | ||
22 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
23 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | using namespace Opie::Core; | ||
24 | 24 | ||
25 | /* QT */ | ||
25 | #include <qlineedit.h> | 26 | #include <qlineedit.h> |
26 | #include <qdir.h> | 27 | #include <qdir.h> |
27 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
28 | #include <qlistbox.h> | 29 | #include <qlistbox.h> |
@@ -32,16 +33,18 @@ | |||
32 | #include <qaction.h> | 33 | #include <qaction.h> |
33 | #include <qheader.h> | 34 | #include <qheader.h> |
34 | #include <qlistview.h> | 35 | #include <qlistview.h> |
35 | #include <qlayout.h> | 36 | #include <qlayout.h> |
37 | #include <qtoolbar.h> | ||
38 | #include <qmenubar.h> | ||
36 | 39 | ||
40 | /* STD */ | ||
37 | #include <fcntl.h> | 41 | #include <fcntl.h> |
38 | #include <unistd.h> | 42 | #include <unistd.h> |
39 | #include <stdlib.h> | 43 | #include <stdlib.h> |
40 | #include <stdio.h> | 44 | #include <stdio.h> |
41 | #include <errno.h> | 45 | #include <errno.h> |
42 | 46 | ||
43 | |||
44 | Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) | 47 | Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) |
45 | : QMainWindow( parent, name, fl ) { | 48 | : QMainWindow( parent, name, fl ) { |
46 | if ( !name ) | 49 | if ( !name ) |
47 | setName( "Bartender" ); | 50 | setName( "Bartender" ); |
@@ -143,15 +146,15 @@ void Bartender::fillList() { | |||
143 | QString s; | 146 | QString s; |
144 | while ( !t.eof()) { | 147 | while ( !t.eof()) { |
145 | s = t.readLine(); | 148 | s = t.readLine(); |
146 | if(s.find("#",0,TRUE) != -1) { | 149 | if(s.find("#",0,TRUE) != -1) { |
147 | // qDebug(s.right(s.length()-2)); | 150 | // odebug << s.right(s.length()-2) << oendl; |
148 | item= new QListViewItem( DrinkView, 0 ); | 151 | item= new QListViewItem( DrinkView, 0 ); |
149 | item->setText( 0, s.right(s.length()-2)); | 152 | item->setText( 0, s.right(s.length()-2)); |
150 | i++; | 153 | i++; |
151 | } | 154 | } |
152 | } | 155 | } |
153 | qDebug("there are currently %d of drinks", i); | 156 | odebug << "there are currently " << i << " of drinks" << oendl; |
154 | } | 157 | } |
155 | 158 | ||
156 | void Bartender::fileNew() { | 159 | void Bartender::fileNew() { |
157 | 160 | ||
@@ -170,9 +173,9 @@ void Bartender::fileNew() { | |||
170 | } | 173 | } |
171 | if(newDrinks ->result() == 1 ) { | 174 | if(newDrinks ->result() == 1 ) { |
172 | QString newDrink="\n# "+newName+"\n"; | 175 | QString newDrink="\n# "+newName+"\n"; |
173 | newDrink.append(newIng+"\n"); | 176 | newDrink.append(newIng+"\n"); |
174 | qDebug("writing "+newDrink); | 177 | odebug << "writing "+newDrink << oendl; |
175 | dbFile.writeBlock( newDrink.latin1(), newDrink.length()); | 178 | dbFile.writeBlock( newDrink.latin1(), newDrink.length()); |
176 | clearList(); | 179 | clearList(); |
177 | dbFile.close(); | 180 | dbFile.close(); |
178 | 181 | ||
@@ -206,9 +209,9 @@ void Bartender::showDrink( QListViewItem *item) { | |||
206 | if(s.find( myDrink, 0, TRUE) != -1) { | 209 | if(s.find( myDrink, 0, TRUE) != -1) { |
207 | for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) { | 210 | for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) { |
208 | s2 = t.readLine(); | 211 | s2 = t.readLine(); |
209 | if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) { | 212 | if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) { |
210 | // qDebug(s2); | 213 | // odebug << s2 << oendl; |
211 | showDrinks->MultiLineEdit1->append(s2); | 214 | showDrinks->MultiLineEdit1->append(s2); |
212 | } | 215 | } |
213 | if( dbFile.atEnd() ) break; | 216 | if( dbFile.atEnd() ) break; |
214 | } | 217 | } |
@@ -247,9 +250,9 @@ void Bartender::doSearchByName() { | |||
247 | searchForDrinkName = fileDlg->LineEdit1->text(); | 250 | searchForDrinkName = fileDlg->LineEdit1->text(); |
248 | QListViewItemIterator it( DrinkView ); | 251 | QListViewItemIterator it( DrinkView ); |
249 | for ( ; it.current(); ++it ) { | 252 | for ( ; it.current(); ++it ) { |
250 | if ( it.current()->text(0).find( searchForDrinkName, 0, TRUE) != -1 ) { | 253 | if ( it.current()->text(0).find( searchForDrinkName, 0, TRUE) != -1 ) { |
251 | // qDebug( it.current()->text(0)); | 254 | // odebug << it.current()->text(0) << oendl; |
252 | searchList.append(it.current()->text(0)); | 255 | searchList.append(it.current()->text(0)); |
253 | } | 256 | } |
254 | } | 257 | } |
255 | if(searchList.count() >0) | 258 | if(searchList.count() >0) |
@@ -278,12 +281,12 @@ void Bartender::doSearchByDrink() { | |||
278 | while ( !t.eof()) { | 281 | while ( !t.eof()) { |
279 | s = t.readLine(); | 282 | s = t.readLine(); |
280 | if(s.find("#",0,TRUE) != -1) { | 283 | if(s.find("#",0,TRUE) != -1) { |
281 | lastDrinkName=s.right(s.length()-2); | 284 | lastDrinkName=s.right(s.length()-2); |
282 | // qDebug("last drink name "+lastDrinkName); | 285 | // odebug << "last drink name "+lastDrinkName << oendl; |
283 | } | 286 | } |
284 | else if( s.find( searchForDrinkName ,0, FALSE) != -1 && lastDrinkName != tempName ) { | 287 | else if( s.find( searchForDrinkName ,0, FALSE) != -1 && lastDrinkName != tempName ) { |
285 | // qDebug("appending "+lastDrinkName); | 288 | // odebug << "appending "+lastDrinkName << oendl; |
286 | searchList.append( lastDrinkName); | 289 | searchList.append( lastDrinkName); |
287 | tempName=lastDrinkName; | 290 | tempName=lastDrinkName; |
288 | } | 291 | } |
289 | // if( dbFile.atEnd() ) break; | 292 | // if( dbFile.atEnd() ) break; |
@@ -312,9 +315,9 @@ void Bartender::showSearchResult(QStringList &searchList) { | |||
312 | } | 315 | } |
313 | QListViewItemIterator it2( DrinkView ); | 316 | QListViewItemIterator it2( DrinkView ); |
314 | for ( ; it2.current(); ++it2 ) { | 317 | for ( ; it2.current(); ++it2 ) { |
315 | if ( it2.current()->text(0)== result ) { | 318 | if ( it2.current()->text(0)== result ) { |
316 | // qDebug( it2.current()->text(0)); | 319 | // odebug << it2.current()->text(0) << oendl; |
317 | showDrink(it2.current()); | 320 | showDrink(it2.current()); |
318 | } | 321 | } |
319 | } | 322 | } |
320 | delete searchDlg; | 323 | delete searchDlg; |
@@ -342,9 +345,9 @@ void Bartender::doEdit() { | |||
342 | foundAt = dbFile.at() - (s.length()+1); | 345 | foundAt = dbFile.at() - (s.length()+1); |
343 | for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) { | 346 | for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) { |
344 | s2 = t.readLine(); | 347 | s2 = t.readLine(); |
345 | if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) { | 348 | if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) { |
346 | // qDebug(s2); | 349 | // odebug << s2 << oendl; |
347 | newDrinks->MultiLineEdit1->append(s2); | 350 | newDrinks->MultiLineEdit1->append(s2); |
348 | newDrinks->LineEdit1->setText(myDrink); | 351 | newDrinks->LineEdit1->setText(myDrink); |
349 | } | 352 | } |
350 | if( dbFile.atEnd() ) break; | 353 | if( dbFile.atEnd() ) break; |
@@ -369,9 +372,9 @@ void Bartender::doEdit() { | |||
369 | #warning FIXME problems with editing drinks db | 372 | #warning FIXME problems with editing drinks db |
370 | ////////// FIXME write to user file | 373 | ////////// FIXME write to user file |
371 | QString newDrink="# "+newName+"\n"; | 374 | QString newDrink="# "+newName+"\n"; |
372 | newDrink.append(newIng+"\n"); | 375 | newDrink.append(newIng+"\n"); |
373 | qDebug("writing "+newDrink); | 376 | odebug << "writing "+newDrink << oendl; |
374 | dbFile.writeBlock( newDrink.latin1(), newDrink.length()); | 377 | dbFile.writeBlock( newDrink.latin1(), newDrink.length()); |
375 | clearList(); | 378 | clearList(); |
376 | 379 | ||
377 | dbFile.flush(); | 380 | dbFile.flush(); |
@@ -396,9 +399,9 @@ void Bartender::openCurrentDrink() { | |||
396 | showDrink(DrinkView->currentItem()); | 399 | showDrink(DrinkView->currentItem()); |
397 | } | 400 | } |
398 | 401 | ||
399 | void Bartender::fileMenuActivated( int item) { | 402 | void Bartender::fileMenuActivated( int item) { |
400 | qDebug("Item %d", item); | 403 | odebug << "Item " << item << "" << oendl; |
401 | switch(item) { | 404 | switch(item) { |
402 | case -3: // new -3 | 405 | case -3: // new -3 |
403 | fileNew(); | 406 | fileNew(); |
404 | break; | 407 | break; |
@@ -417,9 +420,9 @@ void Bartender::fileMenuActivated( int item) { | |||
417 | } | 420 | } |
418 | } | 421 | } |
419 | 422 | ||
420 | void Bartender::editMenuActivated(int item) { | 423 | void Bartender::editMenuActivated(int item) { |
421 | qDebug("Item %d", item); | 424 | odebug << "Item " << item << "" << oendl; |
422 | /* | 425 | /* |
423 | edit -8 | 426 | edit -8 |
424 | */ | 427 | */ |
425 | switch(item) { | 428 | switch(item) { |
diff --git a/noncore/apps/opie-bartender/bartender.pro b/noncore/apps/opie-bartender/bartender.pro index 4ad3c31..41fc0e5 100644 --- a/noncore/apps/opie-bartender/bartender.pro +++ b/noncore/apps/opie-bartender/bartender.pro | |||
@@ -1,12 +1,11 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | #CONFIG = qt warn_on | ||
3 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
4 | HEADERS = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h | 3 | HEADERS = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h |
5 | SOURCES = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp | 4 | SOURCES = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
8 | LIBS += -lqpe | 7 | LIBS += -lqpe -lopiecore2 |
9 | DESTDIR = $(OPIEDIR)/bin | 8 | DESTDIR = $(OPIEDIR)/bin |
10 | TARGET = bartender | 9 | TARGET = bartender |
11 | 10 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 11 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-bartender/config.in b/noncore/apps/opie-bartender/config.in index c6ca2e6..c39a7d6 100644 --- a/noncore/apps/opie-bartender/config.in +++ b/noncore/apps/opie-bartender/config.in | |||
@@ -1,4 +1,5 @@ | |||
1 | config BARTENDER | 1 | config BARTENDER |
2 | boolean "bartender - bar receipe and blood alcohol estimator" | 2 | boolean "bartender - bar receipe and blood alcohol estimator" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
5 | |||
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp index a37f980..6d57703 100644 --- a/noncore/apps/opie-console/MyPty.cpp +++ b/noncore/apps/opie-console/MyPty.cpp | |||
@@ -62,12 +62,20 @@ | |||
62 | There's a sinister ioctl(2), signal(2) and job control stuff | 62 | There's a sinister ioctl(2), signal(2) and job control stuff |
63 | nessesary to make everything work as it should. | 63 | nessesary to make everything work as it should. |
64 | */ | 64 | */ |
65 | 65 | ||
66 | #include "procctl.h" | ||
67 | #include "MyPty.h" | ||
66 | 68 | ||
69 | /* OPIE */ | ||
70 | #include <opie2/odebug.h> | ||
71 | using namespace Opie::Core; | ||
72 | |||
73 | /* QT */ | ||
67 | #include <qsocketnotifier.h> | 74 | #include <qsocketnotifier.h> |
68 | #include <qfile.h> | 75 | #include <qfile.h> |
69 | 76 | ||
77 | /* STD */ | ||
70 | #include <stdlib.h> | 78 | #include <stdlib.h> |
71 | #include <stdio.h> | 79 | #include <stdio.h> |
72 | #include <signal.h> | 80 | #include <signal.h> |
73 | #include <fcntl.h> | 81 | #include <fcntl.h> |
@@ -80,12 +88,8 @@ | |||
80 | #ifdef HAVE_OPENPTY | 88 | #ifdef HAVE_OPENPTY |
81 | #include <pty.h> | 89 | #include <pty.h> |
82 | #endif | 90 | #endif |
83 | 91 | ||
84 | #include "procctl.h" | ||
85 | #include "MyPty.h" | ||
86 | |||
87 | |||
88 | #undef VERBOSE_DEBUG | 92 | #undef VERBOSE_DEBUG |
89 | 93 | ||
90 | 94 | ||
91 | /* -------------------------------------------------------------------------- */ | 95 | /* -------------------------------------------------------------------------- */ |
@@ -96,9 +100,9 @@ | |||
96 | */ | 100 | */ |
97 | 101 | ||
98 | void MyPty::setSize(int lines, int columns) | 102 | void MyPty::setSize(int lines, int columns) |
99 | { | 103 | { |
100 | qWarning("setting size"); | 104 | owarn << "setting size" << oendl; |
101 | struct winsize wsize; | 105 | struct winsize wsize; |
102 | wsize.ws_row = (unsigned short)lines; | 106 | wsize.ws_row = (unsigned short)lines; |
103 | wsize.ws_col = (unsigned short)columns; | 107 | wsize.ws_col = (unsigned short)columns; |
104 | if(m_fd < 0) return; | 108 | if(m_fd < 0) return; |
diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp index e535296..d168a5e 100644 --- a/noncore/apps/opie-console/TEWidget.cpp +++ b/noncore/apps/opie-console/TEWidget.cpp | |||
@@ -1028,9 +1028,9 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
1028 | 1028 | ||
1029 | #ifdef FAKE_CTRL_AND_ALT | 1029 | #ifdef FAKE_CTRL_AND_ALT |
1030 | static bool control = FALSE; | 1030 | static bool control = FALSE; |
1031 | static bool alt = FALSE; | 1031 | static bool alt = FALSE; |
1032 | // qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); | 1032 | // odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; |
1033 | bool dele=FALSE; | 1033 | bool dele=FALSE; |
1034 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { | 1034 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { |
1035 | QKeyEvent* ke = (QKeyEvent*)e; | 1035 | QKeyEvent* ke = (QKeyEvent*)e; |
1036 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); | 1036 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); |
@@ -1067,13 +1067,13 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
1067 | QKeyEvent* ke = (QKeyEvent*)e; | 1067 | QKeyEvent* ke = (QKeyEvent*)e; |
1068 | actSel=0; // Key stroke implies a screen update, so TEWidget won't | 1068 | actSel=0; // Key stroke implies a screen update, so TEWidget won't |
1069 | // know where the current selection is. | 1069 | // know where the current selection is. |
1070 | 1070 | ||
1071 | // qDebug("key pressed is 0x%x",ke->key()); | 1071 | // odebug << "key pressed is 0x" << ke->key() << "" << oendl; |
1072 | 1072 | ||
1073 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker | 1073 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker |
1074 | 1074 | ||
1075 | // qDebug("key pressed 2 is 0x%x",ke->key()); | 1075 | // odebug << "key pressed 2 is 0x" << ke->key() << "" << oendl; |
1076 | emitText("\\"); // expose | 1076 | emitText("\\"); // expose |
1077 | } else | 1077 | } else |
1078 | emit keyPressedSignal(ke); // expose | 1078 | emit keyPressedSignal(ke); // expose |
1079 | ke->accept(); | 1079 | ke->accept(); |
diff --git a/noncore/apps/opie-console/TEmulation.cpp b/noncore/apps/opie-console/TEmulation.cpp index d0169d7..6ff73af 100644 --- a/noncore/apps/opie-console/TEmulation.cpp +++ b/noncore/apps/opie-console/TEmulation.cpp | |||
@@ -69,8 +69,14 @@ | |||
69 | - evtl. the bulk operations could be made more transparent. | 69 | - evtl. the bulk operations could be made more transparent. |
70 | */ | 70 | */ |
71 | 71 | ||
72 | #include "TEmulation.h" | 72 | #include "TEmulation.h" |
73 | |||
74 | /* OPIE */ | ||
75 | #include <opie2/odebug.h> | ||
76 | using namespace Opie::Core; | ||
77 | |||
78 | /* STD */ | ||
73 | #include <stdio.h> | 79 | #include <stdio.h> |
74 | #include <stdlib.h> | 80 | #include <stdlib.h> |
75 | #include <unistd.h> | 81 | #include <unistd.h> |
76 | 82 | ||
@@ -203,9 +209,9 @@ void TEmulation::onRcvChar(int c) | |||
203 | */ | 209 | */ |
204 | 210 | ||
205 | void TEmulation::onKeyPress( QKeyEvent* ev ) | 211 | void TEmulation::onKeyPress( QKeyEvent* ev ) |
206 | { | 212 | { |
207 | qWarning("onKeyPress,...."); | 213 | owarn << "onKeyPress,...." << oendl; |
208 | if (!connected) return; // someone else gets the keys | 214 | if (!connected) return; // someone else gets the keys |
209 | if (scr->getHistCursor() != scr->getHistLines()); | 215 | if (scr->getHistCursor() != scr->getHistLines()); |
210 | scr->setHistCursor(scr->getHistLines()); | 216 | scr->setHistCursor(scr->getHistLines()); |
211 | if (!ev->text().isEmpty()) | 217 | if (!ev->text().isEmpty()) |
diff --git a/noncore/apps/opie-console/atconfigdialog.cpp b/noncore/apps/opie-console/atconfigdialog.cpp index 8e91b9e..c998f96 100644 --- a/noncore/apps/opie-console/atconfigdialog.cpp +++ b/noncore/apps/opie-console/atconfigdialog.cpp | |||
@@ -1,17 +1,20 @@ | |||
1 | #include "atconfigdialog.h" | ||
2 | #include "io_modem.h" | ||
1 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | ||
7 | |||
8 | /* QT */ | ||
2 | #include <qlineedit.h> | 9 | #include <qlineedit.h> |
3 | #include <qspinbox.h> | 10 | #include <qspinbox.h> |
4 | #include <qlayout.h> | 11 | #include <qlayout.h> |
5 | #include <qcombobox.h> | 12 | #include <qcombobox.h> |
6 | #include <qtabwidget.h> | 13 | #include <qtabwidget.h> |
7 | #include <qlabel.h> | 14 | #include <qlabel.h> |
8 | #include <qscrollview.h> | 15 | #include <qscrollview.h> |
9 | 16 | ||
10 | #include "atconfigdialog.h" | ||
11 | #include "io_modem.h" | ||
12 | |||
13 | |||
14 | ATConfigDialog::ATConfigDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 17 | ATConfigDialog::ATConfigDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
15 | : QDialog( parent, name, modal, fl ) { | 18 | : QDialog( parent, name, modal, fl ) { |
16 | 19 | ||
17 | 20 | ||
@@ -151,9 +154,9 @@ QWidget* ATConfigDialog::tab1( QWidget* parent ) { | |||
151 | } | 154 | } |
152 | 155 | ||
153 | 156 | ||
154 | void ATConfigDialog::readConfig( const Profile& config ) { | 157 | void ATConfigDialog::readConfig( const Profile& config ) { |
155 | qWarning("config in atconfigdialog"); | 158 | owarn << "config in atconfigdialog" << oendl; |
156 | 159 | ||
157 | initStringLine->setText( config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ) ); | 160 | initStringLine->setText( config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ) ); |
158 | resetStringLine->setText( config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ) ); | 161 | resetStringLine->setText( config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ) ); |
159 | dialPref1Line->setText( config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ) ); | 162 | dialPref1Line->setText( config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ) ); |
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index 67ad10e..7010594 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp | |||
@@ -1,21 +1,26 @@ | |||
1 | #include "dialer.h" | 1 | #include "dialer.h" |
2 | #include "io_modem.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | ||
2 | 7 | ||
8 | /* QT */ | ||
3 | #include <qlayout.h> | 9 | #include <qlayout.h> |
4 | #include <qprogressbar.h> | 10 | #include <qprogressbar.h> |
5 | #include <qlabel.h> | 11 | #include <qlabel.h> |
6 | #include <qpushbutton.h> | 12 | #include <qpushbutton.h> |
7 | #include <qapp.h> | 13 | #include <qapp.h> |
8 | #include <qtimer.h> | 14 | #include <qtimer.h> |
9 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
10 | 16 | ||
17 | /* STD */ | ||
11 | #include <unistd.h> | 18 | #include <unistd.h> |
12 | #include <string.h> | 19 | #include <string.h> |
13 | #include <fcntl.h> | 20 | #include <fcntl.h> |
14 | #include <errno.h> | 21 | #include <errno.h> |
15 | 22 | ||
16 | #include "io_modem.h" | ||
17 | |||
18 | // State machine: | When an error occurs, we don't have to | 23 | // State machine: | When an error occurs, we don't have to |
19 | // | reset everything. | 24 | // | reset everything. |
20 | // (init) <------+ | But if the user wants to reset, | 25 | // (init) <------+ | But if the user wants to reset, |
21 | // | | | we stop dialing immediately. | 26 | // | | | we stop dialing immediately. |
@@ -103,9 +108,9 @@ void Dialer::slotCancel() | |||
103 | } | 108 | } |
104 | 109 | ||
105 | void Dialer::reset() | 110 | void Dialer::reset() |
106 | { | 111 | { |
107 | qWarning("reset"); | 112 | owarn << "reset" << oendl; |
108 | switchState(state_cancel); | 113 | switchState(state_cancel); |
109 | } | 114 | } |
110 | 115 | ||
111 | void Dialer::slotAutostart() | 116 | void Dialer::slotAutostart() |
@@ -135,20 +140,20 @@ void Dialer::dial(const QString& number) | |||
135 | } | 140 | } |
136 | 141 | ||
137 | void Dialer::trydial(const QString& number) | 142 | void Dialer::trydial(const QString& number) |
138 | { | 143 | { |
139 | qWarning("TryDial:%s", number.latin1() ); | 144 | owarn << "TryDial:" << number.latin1() << "" << oendl; |
140 | if(state != state_cancel) switchState(state_preinit); | 145 | if(state != state_cancel) switchState(state_preinit); |
141 | if(cleanshutdown) | 146 | if(cleanshutdown) |
142 | { | 147 | { |
143 | qWarning("HangupString " + m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING)); | 148 | owarn << "HangupString " << m_profile.readEntry("HangupString") << oendl; |
144 | send(m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) + "\r"); | 149 | send(m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) + "\r"); |
145 | } | 150 | } |
146 | 151 | ||
147 | if(state != state_cancel) | 152 | if(state != state_cancel) |
148 | { | 153 | { |
149 | switchState(state_init); | 154 | switchState(state_init); |
150 | // qWarning("Init String " + m_profile.readEntry("InitString") ); | 155 | // owarn << "Init String " + m_profile.readEntry("InitString") << oendl; |
151 | send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r"); | 156 | send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r"); |
152 | QString response2 = receive(); | 157 | QString response2 = receive(); |
153 | if(!response2.contains("\nOK\r")) | 158 | if(!response2.contains("\nOK\r")) |
154 | reset(); | 159 | reset(); |
@@ -157,9 +162,9 @@ void Dialer::trydial(const QString& number) | |||
157 | /*if(state != state_cancel) | 162 | /*if(state != state_cancel) |
158 | { | 163 | { |
159 | switchState(state_options); | 164 | switchState(state_options); |
160 | 165 | ||
161 | qWarning("ATM3l3"); | 166 | owarn << "ATM3l3" << oendl; |
162 | send("ATM3L3\r"); | 167 | send("ATM3L3\r"); |
163 | QString response3 = receive(); | 168 | QString response3 = receive(); |
164 | if(!response3.contains("\nOK\r")) | 169 | if(!response3.contains("\nOK\r")) |
165 | reset(); | 170 | reset(); |
@@ -177,9 +182,9 @@ void Dialer::trydial(const QString& number) | |||
177 | } | 182 | } |
178 | 183 | ||
179 | if(state != state_cancel) | 184 | if(state != state_cancel) |
180 | { | 185 | { |
181 | qWarning("progress"); | 186 | owarn << "progress" << oendl; |
182 | switchState(state_dialing); | 187 | switchState(state_dialing); |
183 | 188 | ||
184 | // send(QString("ATDT %1\r").arg(number)); | 189 | // send(QString("ATDT %1\r").arg(number)); |
185 | send(QString("%1 %2\r").arg(m_profile.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 )) | 190 | send(QString("%1 %2\r").arg(m_profile.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 )) |
@@ -213,9 +218,9 @@ void Dialer::send(const QString& msg) | |||
213 | QString m = msg; | 218 | QString m = msg; |
214 | int bytes; | 219 | int bytes; |
215 | QString termination; | 220 | QString termination; |
216 | 221 | ||
217 | qWarning("Sending: %s", m.latin1()); | 222 | owarn << "Sending: " << m.latin1() << "" << oendl; |
218 | 223 | ||
219 | /*termination = "\r"; | 224 | /*termination = "\r"; |
220 | //termination = m_profile.readEntry("Termination"); | 225 | //termination = m_profile.readEntry("Termination"); |
221 | if(termination == "\n") m = m + "\n"; | 226 | if(termination == "\n") m = m + "\n"; |
@@ -246,13 +251,13 @@ QString Dialer::receive() | |||
246 | { | 251 | { |
247 | for(int i = 0; i < ret; i++) | 252 | for(int i = 0; i < ret; i++) |
248 | buffer[i] = buffer[i] & 0x7F; | 253 | buffer[i] = buffer[i] & 0x7F; |
249 | buffer[ret] = 0; | 254 | buffer[ret] = 0; |
250 | qWarning("Got: %s", buffer); | 255 | owarn << "Got: " << buffer << "" << oendl; |
251 | buf.append(QString(buffer)); | 256 | buf.append(QString(buffer)); |
252 | if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY"))) | 257 | if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY"))) |
253 | { | 258 | { |
254 | //qWarning("Receiving: '%s'", buf.latin1()); | 259 | //owarn << "Receiving: '" << buf.latin1() << "'" << oendl; |
255 | cleanshutdown = 1; | 260 | cleanshutdown = 1; |
256 | return buf; | 261 | return buf; |
257 | }else if (buf.contains("NO CARRIER") || buf.contains("NO DIALTONE") ) { | 262 | }else if (buf.contains("NO CARRIER") || buf.contains("NO DIALTONE") ) { |
258 | cleanshutdown = 1; | 263 | cleanshutdown = 1; |
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp index 99d069f..89b70c6 100644 --- a/noncore/apps/opie-console/emulation_handler.cpp +++ b/noncore/apps/opie-console/emulation_handler.cpp | |||
@@ -1,11 +1,13 @@ | |||
1 | |||
2 | #include "TEmuVt102.h" | 1 | #include "TEmuVt102.h" |
3 | |||
4 | #include "profile.h" | 2 | #include "profile.h" |
5 | #include "emulation_handler.h" | 3 | #include "emulation_handler.h" |
6 | #include "script.h" | 4 | #include "script.h" |
7 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
8 | EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const char* name ) | 10 | EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const char* name ) |
9 | : QObject(0, name ) | 11 | : QObject(0, name ) |
10 | { | 12 | { |
11 | m_teWid = new TEWidget( parent, "TerminalMain"); | 13 | m_teWid = new TEWidget( parent, "TerminalMain"); |
@@ -127,13 +129,13 @@ QColor EmulationHandler::foreColor(int col) { | |||
127 | case Profile::Black: | 129 | case Profile::Black: |
128 | co = Qt::black; | 130 | co = Qt::black; |
129 | break; | 131 | break; |
130 | case Profile::Green: | 132 | case Profile::Green: |
131 | qWarning("Foreground green"); | 133 | owarn << "Foreground green" << oendl; |
132 | co = Qt::green; | 134 | co = Qt::green; |
133 | break; | 135 | break; |
134 | case Profile::Orange: | 136 | case Profile::Orange: |
135 | qWarning("Foreground orange"); | 137 | owarn << "Foreground orange" << oendl; |
136 | co.setRgb( 231, 184, 98 ); | 138 | co.setRgb( 231, 184, 98 ); |
137 | break; | 139 | break; |
138 | } | 140 | } |
139 | 141 | ||
@@ -151,13 +153,13 @@ QColor EmulationHandler::backColor(int col ) { | |||
151 | case Profile::Black: | 153 | case Profile::Black: |
152 | co = Qt::white; | 154 | co = Qt::white; |
153 | break; | 155 | break; |
154 | case Profile::Green: | 156 | case Profile::Green: |
155 | qWarning("Background black"); | 157 | owarn << "Background black" << oendl; |
156 | co = Qt::black; | 158 | co = Qt::black; |
157 | break; | 159 | break; |
158 | case Profile::Orange: | 160 | case Profile::Orange: |
159 | qWarning("Background black"); | 161 | owarn << "Background black" << oendl; |
160 | co = Qt::black; | 162 | co = Qt::black; |
161 | break; | 163 | break; |
162 | } | 164 | } |
163 | 165 | ||
diff --git a/noncore/apps/opie-console/emulation_widget.cpp b/noncore/apps/opie-console/emulation_widget.cpp index ad8ecba..4688551 100644 --- a/noncore/apps/opie-console/emulation_widget.cpp +++ b/noncore/apps/opie-console/emulation_widget.cpp | |||
@@ -223,11 +223,11 @@ void EmulationWidget::paintEvent( QPaintEvent* pe ) | |||
223 | void EmulationWidget::calcGeometry() | 223 | void EmulationWidget::calcGeometry() |
224 | { | 224 | { |
225 | m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() ); | 225 | m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() ); |
226 | 226 | ||
227 | qDebug( QString(" TEST").arg( contentsRect().width() ) ); | 227 | odebug << QString(" TEST").arg( contentsRect().width() ) << oendl; |
228 | qDebug( QString(" TEST").arg( contentsRect().height() ) ); | 228 | odebug << QString(" TEST").arg( contentsRect().height() ) << oendl; |
229 | qDebug("NEUER TESTT!!!!!!!!"); | 229 | odebug << "NEUER TESTT!!!!!!!!" << oendl; |
230 | 230 | ||
231 | switch( scrollLoc ) | 231 | switch( scrollLoc ) |
232 | { | 232 | { |
233 | case SCRNONE : | 233 | case SCRNONE : |
@@ -257,9 +257,9 @@ void EmulationWidget::calcGeometry() | |||
257 | } | 257 | } |
258 | 258 | ||
259 | void EmulationWidget::drawAttrString( QString& string, QPainter &painter, QRect rect, Character attr, bool usePixmap, bool clear ) | 259 | void EmulationWidget::drawAttrString( QString& string, QPainter &painter, QRect rect, Character attr, bool usePixmap, bool clear ) |
260 | { | 260 | { |
261 | qWarning("Color1 %s", color_table[attr.b].color.name().latin1() ); | 261 | owarn << "Color1 " << color_table[attr.b].color.name().latin1() << "" << oendl; |
262 | if ( usePixmap && color_table[attr.b].transparent ) | 262 | if ( usePixmap && color_table[attr.b].transparent ) |
263 | { | 263 | { |
264 | painter.setBackgroundMode( TransparentMode ); | 264 | painter.setBackgroundMode( TransparentMode ); |
265 | if ( clear ) | 265 | if ( clear ) |
@@ -271,9 +271,9 @@ void EmulationWidget::drawAttrString( QString& string, QPainter &painter, QRect | |||
271 | painter.fillRect( rect, color_table[attr.b].color ); | 271 | painter.fillRect( rect, color_table[attr.b].color ); |
272 | else | 272 | else |
273 | { | 273 | { |
274 | painter.setBackgroundMode( OpaqueMode ); | 274 | painter.setBackgroundMode( OpaqueMode ); |
275 | qWarning("Color %s", color_table[attr.b].color.name().latin1() ); | 275 | owarn << "Color " << color_table[attr.b].color.name().latin1() << "" << oendl; |
276 | painter.setBackgroundColor( color_table[attr.b].color ); | 276 | painter.setBackgroundColor( color_table[attr.b].color ); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | if ( color_table[attr.f].bold ) | 279 | if ( color_table[attr.f].bold ) |
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index eb32551..6613183 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -1,6 +1,11 @@ | |||
1 | #include "function_keyboard.h" | 1 | #include "function_keyboard.h" |
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
3 | #include <qlayout.h> | 8 | #include <qlayout.h> |
4 | #include <qlistbox.h> | 9 | #include <qlistbox.h> |
5 | #include <qlabel.h> | 10 | #include <qlabel.h> |
6 | #include <qdir.h> | 11 | #include <qdir.h> |
@@ -36,9 +41,9 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | |||
36 | handle, | 41 | handle, |
37 | FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort()) | 42 | FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort()) |
38 | ); | 43 | ); |
39 | } | 44 | } |
40 | //qWarning("loaded %d keys", keys.count()); | 45 | //owarn << "loaded " << keys.count() << " keys" << oendl; |
41 | */ | 46 | */ |
42 | if (keys.isEmpty()) loadDefaults(); | 47 | if (keys.isEmpty()) loadDefaults(); |
43 | 48 | ||
44 | 49 | ||
@@ -255,9 +260,9 @@ void FunctionKeyboard::loadDefaults() { | |||
255 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) | 260 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) |
256 | : ProfileDialogKeyWidget(name, parent, na), | 261 | : ProfileDialogKeyWidget(name, parent, na), |
257 | selectedRow(0), selectedCol(0) | 262 | selectedRow(0), selectedCol(0) |
258 | { | 263 | { |
259 | qWarning("FunctionKeyboardConfig"); | 264 | owarn << "FunctionKeyboardConfig" << oendl; |
260 | 265 | ||
261 | 266 | ||
262 | kb = new FunctionKeyboard(this); | 267 | kb = new FunctionKeyboard(this); |
263 | connect (kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)), | 268 | connect (kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)), |
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp index a29fa8e..c102427 100644 --- a/noncore/apps/opie-console/io_bt.cpp +++ b/noncore/apps/opie-console/io_bt.cpp | |||
@@ -1,8 +1,11 @@ | |||
1 | 1 | ||
2 | #include "io_bt.h" | 2 | #include "io_bt.h" |
3 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
4 | using namespace Opie::Core; | 6 | using namespace Opie::Core; |
7 | |||
5 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { | 8 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { |
6 | m_attach = 0; | 9 | m_attach = 0; |
7 | } | 10 | } |
8 | 11 | ||
@@ -42,9 +45,9 @@ bool IOBt::open() { | |||
42 | 45 | ||
43 | if ( m_attach->start() ) { | 46 | if ( m_attach->start() ) { |
44 | ret = IOSerial::open(); | 47 | ret = IOSerial::open(); |
45 | } else { | 48 | } else { |
46 | qWarning("could not attach to device"); | 49 | owarn << "could not attach to device" << oendl; |
47 | delete m_attach; | 50 | delete m_attach; |
48 | m_attach = 0; | 51 | m_attach = 0; |
49 | } | 52 | } |
50 | } else { | 53 | } else { |
@@ -88,6 +91,6 @@ bool IOBt::isConnected() { | |||
88 | return false; | 91 | return false; |
89 | } | 92 | } |
90 | 93 | ||
91 | void IOBt::send(const QByteArray &data) { | 94 | void IOBt::send(const QByteArray &data) { |
92 | qDebug( "Please overload me..." ); | 95 | odebug << "Please overload me..." << oendl; |
93 | } | 96 | } |
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp index 07c2b62..38542f5 100644 --- a/noncore/apps/opie-console/io_irda.cpp +++ b/noncore/apps/opie-console/io_irda.cpp | |||
@@ -1,8 +1,10 @@ | |||
1 | |||
2 | #include "io_irda.h" | 1 | #include "io_irda.h" |
3 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
4 | using namespace Opie::Core; | 5 | using namespace Opie::Core; |
6 | |||
5 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { | 7 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { |
6 | m_attach = 0; | 8 | m_attach = 0; |
7 | } | 9 | } |
8 | 10 | ||
@@ -34,9 +36,9 @@ bool IOIrda::open() { | |||
34 | if ( m_attach->start() ) { | 36 | if ( m_attach->start() ) { |
35 | ret= IOSerial::open(); | 37 | ret= IOSerial::open(); |
36 | } else { | 38 | } else { |
37 | // emit error!!! | 39 | // emit error!!! |
38 | qWarning("could not attach to device"); | 40 | owarn << "could not attach to device" << oendl; |
39 | delete m_attach; | 41 | delete m_attach; |
40 | m_attach = 0l; | 42 | m_attach = 0l; |
41 | } | 43 | } |
42 | return ret; | 44 | return ret; |
@@ -73,6 +75,6 @@ bool IOIrda::isConnected() { | |||
73 | return false; | 75 | return false; |
74 | } | 76 | } |
75 | 77 | ||
76 | void IOIrda::send(const QByteArray &data) { | 78 | void IOIrda::send(const QByteArray &data) { |
77 | qDebug( "Please overload me..." ); | 79 | odebug << "Please overload me..." << oendl; |
78 | } | 80 | } |
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index b74d076..c499dfe 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp | |||
@@ -1,19 +1,19 @@ | |||
1 | 1 | ||
2 | #include "io_modem.h" | 2 | #include "io_modem.h" |
3 | |||
4 | #include "dialer.h" | 3 | #include "dialer.h" |
5 | 4 | ||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | 7 | using namespace Opie::Core; |
7 | using namespace Opie::Core; | 8 | |
8 | IOModem::IOModem( const Profile &profile ) | 9 | IOModem::IOModem( const Profile &profile ) |
9 | : IOSerial( profile ) { | 10 | : IOSerial( profile ) { |
10 | m_profile = profile; | 11 | m_profile = profile; |
11 | } | 12 | } |
12 | 13 | ||
13 | 14 | ||
14 | IOModem::~IOModem() { | 15 | IOModem::~IOModem() { |
15 | |||
16 | } | 16 | } |
17 | 17 | ||
18 | 18 | ||
19 | void IOModem::close() { | 19 | void IOModem::close() { |
@@ -103,6 +103,6 @@ bool IOModem::isConnected() { | |||
103 | return false; | 103 | return false; |
104 | } | 104 | } |
105 | 105 | ||
106 | void IOModem::send(const QByteArray &data) { | 106 | void IOModem::send(const QByteArray &data) { |
107 | qDebug( "Please overload me..." ); | 107 | odebug << "Please overload me..." << oendl; |
108 | } | 108 | } |
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp index dfb2f83..1bd4338 100644 --- a/noncore/apps/opie-console/main.cpp +++ b/noncore/apps/opie-console/main.cpp | |||
@@ -90,9 +90,9 @@ int main(int argc, char **argv) { | |||
90 | // too bad this gives us trouble the taskbar... argv[0]="embeddedkonsole"; | 90 | // too bad this gives us trouble the taskbar... argv[0]="embeddedkonsole"; |
91 | QPEApplication app( argc, argv ); | 91 | QPEApplication app( argc, argv ); |
92 | 92 | ||
93 | #ifdef FSCKED_DISTRIBUTION | 93 | #ifdef FSCKED_DISTRIBUTION |
94 | qWarning("fscked"); | 94 | owarn << "fscked" << oendl; |
95 | FixIt it; | 95 | FixIt it; |
96 | it.fixIt(); | 96 | it.fixIt(); |
97 | #endif | 97 | #endif |
98 | 98 | ||
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 06a8f7d..b403b4d 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -1,17 +1,4 @@ | |||
1 | #include <assert.h> | ||
2 | |||
3 | #include <qaction.h> | ||
4 | #include <qmenubar.h> | ||
5 | #include <qtoolbar.h> | ||
6 | #include <qmessagebox.h> | ||
7 | #include <qwhatsthis.h> | ||
8 | #include <qfileinfo.h> | ||
9 | |||
10 | #include <qpe/filemanager.h> | ||
11 | |||
12 | #include <opie2/ofiledialog.h> | ||
13 | |||
14 | #include "TEmulation.h" | 1 | #include "TEmulation.h" |
15 | #include "profileeditordialog.h" | 2 | #include "profileeditordialog.h" |
16 | #include "configdialog.h" | 3 | #include "configdialog.h" |
17 | #include "default.h" | 4 | #include "default.h" |
@@ -22,10 +9,26 @@ | |||
22 | #include "function_keyboard.h" | 9 | #include "function_keyboard.h" |
23 | #include "emulation_handler.h" | 10 | #include "emulation_handler.h" |
24 | #include "script.h" | 11 | #include "script.h" |
25 | 12 | ||
26 | 13 | /* OPIE */ | |
14 | #include <opie2/odebug.h> | ||
15 | #include <opie2/ofiledialog.h> | ||
16 | #include <qpe/filemanager.h> | ||
17 | using namespace Opie::Core; | ||
27 | using namespace Opie::Ui; | 18 | using namespace Opie::Ui; |
19 | |||
20 | /* QT */ | ||
21 | #include <qaction.h> | ||
22 | #include <qmenubar.h> | ||
23 | #include <qtoolbar.h> | ||
24 | #include <qmessagebox.h> | ||
25 | #include <qwhatsthis.h> | ||
26 | #include <qfileinfo.h> | ||
27 | |||
28 | /* STD */ | ||
29 | #include <assert.h> | ||
30 | |||
28 | MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { | 31 | MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { |
29 | KeyTrans::loadAll(); | 32 | KeyTrans::loadAll(); |
30 | for (int i = 0; i < KeyTrans::count(); i++ ) { | 33 | for (int i = 0; i < KeyTrans::count(); i++ ) { |
31 | KeyTrans* s = KeyTrans::find(i ); | 34 | KeyTrans* s = KeyTrans::find(i ); |
@@ -445,15 +448,15 @@ void MainWindow::slotClose() { | |||
445 | if (!currentSession() ) | 448 | if (!currentSession() ) |
446 | return; | 449 | return; |
447 | 450 | ||
448 | Session* ses = currentSession(); | 451 | Session* ses = currentSession(); |
449 | qWarning("removing! currentSession %s", currentSession()->name().latin1() ); | 452 | owarn << "removing! currentSession " << currentSession()->name().latin1() << "" << oendl; |
450 | /* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */ | 453 | /* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */ |
451 | m_curSession = NULL; | 454 | m_curSession = NULL; |
452 | tabWidget()->remove( /*currentSession()*/ses ); | 455 | tabWidget()->remove( /*currentSession()*/ses ); |
453 | /*it's autodelete */ | 456 | /*it's autodelete */ |
454 | m_sessions.remove( ses ); | 457 | m_sessions.remove( ses ); |
455 | qWarning("after remove!!"); | 458 | owarn << "after remove!!" << oendl; |
456 | 459 | ||
457 | if (!currentSession() ) { | 460 | if (!currentSession() ) { |
458 | m_connect->setEnabled( false ); | 461 | m_connect->setEnabled( false ); |
459 | m_disconnect->setEnabled( false ); | 462 | m_disconnect->setEnabled( false ); |
@@ -569,18 +572,18 @@ void MainWindow::slotOpenButtons( bool state ) { | |||
569 | 572 | ||
570 | 573 | ||
571 | 574 | ||
572 | void MainWindow::slotSessionChanged( Session* ses ) { | 575 | void MainWindow::slotSessionChanged( Session* ses ) { |
573 | qWarning("changed!"); | 576 | owarn << "changed!" << oendl; |
574 | 577 | ||
575 | if(m_curSession) | 578 | if(m_curSession) |
576 | if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide(); | 579 | if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide(); |
577 | if(ses) | 580 | if(ses) |
578 | if(ses->transferDialog()) ses->transferDialog()->show(); | 581 | if(ses->transferDialog()) ses->transferDialog()->show(); |
579 | 582 | ||
580 | if ( ses ) { | 583 | if ( ses ) { |
581 | m_curSession = ses; | 584 | m_curSession = ses; |
582 | qDebug(QString("is connected : %1").arg( m_curSession->layer()->isConnected() ) ); | 585 | odebug << QString("is connected : %1").arg( m_curSession->layer()->isConnected() ) << oendl; |
583 | if ( m_curSession->layer()->isConnected() ) { | 586 | if ( m_curSession->layer()->isConnected() ) { |
584 | m_connect->setEnabled( false ); | 587 | m_connect->setEnabled( false ); |
585 | m_disconnect->setEnabled( true ); | 588 | m_disconnect->setEnabled( true ); |
586 | m_recordScript->setEnabled(!m_curSession->emulationHandler()->isRecording()); | 589 | m_recordScript->setEnabled(!m_curSession->emulationHandler()->isRecording()); |
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp index 3466e3a..9fdaf73 100644 --- a/noncore/apps/opie-console/modemconfigwidget.cpp +++ b/noncore/apps/opie-console/modemconfigwidget.cpp | |||
@@ -1,16 +1,19 @@ | |||
1 | #include "modemconfigwidget.h" | ||
2 | #include "dialdialog.h" | ||
1 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
2 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
7 | using namespace Opie::Core; | ||
3 | 8 | ||
9 | /* QT */ | ||
4 | #include <qlabel.h> | 10 | #include <qlabel.h> |
5 | #include <qlayout.h> | 11 | #include <qlayout.h> |
6 | #include <qcombobox.h> | 12 | #include <qcombobox.h> |
7 | #include <qpushbutton.h> | 13 | #include <qpushbutton.h> |
8 | #include <qhbox.h> | 14 | #include <qhbox.h> |
9 | 15 | ||
10 | #include "modemconfigwidget.h" | ||
11 | #include "dialdialog.h" | ||
12 | |||
13 | namespace { | 16 | namespace { |
14 | void setCurrent( const QString& str, QComboBox* bo ) { | 17 | void setCurrent( const QString& str, QComboBox* bo ) { |
15 | uint b = bo->count(); | 18 | uint b = bo->count(); |
16 | for (int i = 0; i < bo->count(); i++ ) { | 19 | for (int i = 0; i < bo->count(); i++ ) { |
@@ -134,9 +137,9 @@ void ModemConfigWidget::load( const Profile& prof ) { | |||
134 | 137 | ||
135 | 138 | ||
136 | atConf->readConfig( prof ); | 139 | atConf->readConfig( prof ); |
137 | if ( prof.readEntry( "Device" ).isEmpty() ) { | 140 | if ( prof.readEntry( "Device" ).isEmpty() ) { |
138 | qWarning("device empty!"); | 141 | owarn << "device empty!" << oendl; |
139 | return; | 142 | return; |
140 | } | 143 | } |
141 | setCurrent( prof.readEntry( "Device" ), m_deviceCmb ); | 144 | setCurrent( prof.readEntry( "Device" ), m_deviceCmb ); |
142 | 145 | ||
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro index 7a15828..f7e33e9 100644 --- a/noncore/apps/opie-console/opie-console.pro +++ b/noncore/apps/opie-console/opie-console.pro | |||
@@ -1,8 +1,6 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | TMAKE_CXXFLAGS += -DHAVE_OPENPTY | ||
3 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
4 | #CONFIG = qt | ||
5 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
6 | HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ | 4 | HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ |
7 | file_layer.h filetransfer.h \ | 5 | file_layer.h filetransfer.h \ |
8 | metafactory.h \ | 6 | metafactory.h \ |
@@ -69,8 +67,8 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
69 | DEPENDPATH += $(OPIEDIR)/include | 67 | DEPENDPATH += $(OPIEDIR)/include |
70 | LIBS += -lqpe -lopiecore2 -lopieui2 -lutil | 68 | LIBS += -lqpe -lopiecore2 -lopieui2 -lutil |
71 | TARGET = opie-console | 69 | TARGET = opie-console |
72 | 70 | ||
73 | 71 | DEFINES += HAVE_OPENPTY | |
74 | 72 | ||
75 | 73 | ||
76 | include ( $(OPIEDIR)/include.pro ) | 74 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp index fbc5306..f505998 100644 --- a/noncore/apps/opie-console/sz_transfer.cpp +++ b/noncore/apps/opie-console/sz_transfer.cpp | |||
@@ -40,9 +40,9 @@ void SzTransfer::sendFile(const QString& file) { | |||
40 | } | 40 | } |
41 | 41 | ||
42 | void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) { | 42 | void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) { |
43 | 43 | ||
44 | qWarning("recieved from sz on stdout %d bytes", buflen); | 44 | owarn << "recieved from sz on stdout " << buflen << " bytes" << oendl; |
45 | 45 | ||
46 | QByteArray data(buflen); | 46 | QByteArray data(buflen); |
47 | data.fill(*buffer, buflen); | 47 | data.fill(*buffer, buflen); |
48 | for (uint i = 0; i < data.count(); i++ ) { | 48 | for (uint i = 0; i < data.count(); i++ ) { |
@@ -64,18 +64,18 @@ void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | void SzTransfer::receivedStdin(const QByteArray &data) { | 66 | void SzTransfer::receivedStdin(const QByteArray &data) { |
67 | 67 | ||
68 | qWarning("recieved from io_serial %d bytes", data.size()); | 68 | owarn << "recieved from io_serial " << data.size() << " bytes" << oendl; |
69 | 69 | ||
70 | // recieved data from the io layer goes to sz | 70 | // recieved data from the io layer goes to sz |
71 | proc->writeStdin(data.data(), data.size()); | 71 | proc->writeStdin(data.data(), data.size()); |
72 | 72 | ||
73 | } | 73 | } |
74 | 74 | ||
75 | void SzTransfer::sent() { | 75 | void SzTransfer::sent() { |
76 | 76 | ||
77 | qWarning("sent file"); | 77 | owarn << "sent file" << oendl; |
78 | 78 | ||
79 | //setcbreak(0); /* default */ | 79 | //setcbreak(0); /* default */ |
80 | 80 | ||
81 | 81 | ||
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp index 6429e3c..41a91ed 100644 --- a/noncore/apps/opie-console/tabwidget.cpp +++ b/noncore/apps/opie-console/tabwidget.cpp | |||
@@ -1,8 +1,11 @@ | |||
1 | |||
2 | #include "tabwidget.h" | 1 | #include "tabwidget.h" |
3 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
4 | using namespace Opie::Ui; | 6 | using namespace Opie::Ui; |
7 | |||
5 | TabWidget::TabWidget( QWidget* parent, const char* name ) | 8 | TabWidget::TabWidget( QWidget* parent, const char* name ) |
6 | : OTabWidget( parent, name ) { | 9 | : OTabWidget( parent, name ) { |
7 | connect(this, SIGNAL( currentChanged(QWidget*) ), | 10 | connect(this, SIGNAL( currentChanged(QWidget*) ), |
8 | this, SLOT( slotCurChanged(QWidget*) ) ); | 11 | this, SLOT( slotCurChanged(QWidget*) ) ); |
@@ -11,9 +14,9 @@ TabWidget::TabWidget( QWidget* parent, const char* name ) | |||
11 | TabWidget::~TabWidget() { | 14 | TabWidget::~TabWidget() { |
12 | } | 15 | } |
13 | 16 | ||
14 | void TabWidget::add( Session* ses ) { | 17 | void TabWidget::add( Session* ses ) { |
15 | qWarning("session ses " + ses->name() ); | 18 | owarn << "session ses " + ses->name() << oendl; |
16 | if ( !ses->widgetStack() ) return; | 19 | if ( !ses->widgetStack() ) return; |
17 | //reparent( ses->widgetStack(), QPoint() ); | 20 | //reparent( ses->widgetStack(), QPoint() ); |
18 | addTab( ses->widgetStack(), "console/konsole", ses->name() ); | 21 | addTab( ses->widgetStack(), "console/konsole", ses->name() ); |
19 | //addTab( ses->widgetStack(), ses->name() ); | 22 | //addTab( ses->widgetStack(), ses->name() ); |
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp index 6870487..087476b 100644 --- a/noncore/apps/opie-console/terminalwidget.cpp +++ b/noncore/apps/opie-console/terminalwidget.cpp | |||
@@ -1,14 +1,19 @@ | |||
1 | #include "terminalwidget.h" | ||
2 | |||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
1 | #include <qlabel.h> | 8 | #include <qlabel.h> |
2 | #include <qcheckbox.h> | 9 | #include <qcheckbox.h> |
3 | #include <qcombobox.h> | 10 | #include <qcombobox.h> |
4 | #include <qradiobutton.h> | 11 | #include <qradiobutton.h> |
5 | #include <qhgroupbox.h> | 12 | #include <qhgroupbox.h> |
6 | #include <qhbuttongroup.h> | 13 | #include <qhbuttongroup.h> |
7 | #include <qlayout.h> | 14 | #include <qlayout.h> |
8 | 15 | ||
9 | #include "terminalwidget.h" | ||
10 | |||
11 | namespace { | 16 | namespace { |
12 | enum TermIds { | 17 | enum TermIds { |
13 | id_term_vt100 = 0, | 18 | id_term_vt100 = 0, |
14 | id_term_vt102, | 19 | id_term_vt102, |
@@ -68,9 +73,9 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent, | |||
68 | m_lroot->add( m_groupOptions ); | 73 | m_lroot->add( m_groupOptions ); |
69 | m_lroot->addStretch( 0 ); | 74 | m_lroot->addStretch( 0 ); |
70 | 75 | ||
71 | // Fill in some options | 76 | // Fill in some options |
72 | qWarning("Options for terminal box"); | 77 | owarn << "Options for terminal box" << oendl; |
73 | m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ ); | 78 | m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ ); |
74 | m_terminalBox->insertItem( tr("VT 102"), 1 ); // /* , id_term_vt102 */); | 79 | m_terminalBox->insertItem( tr("VT 102"), 1 ); // /* , id_term_vt102 */); |
75 | m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux ); | 80 | m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux ); |
76 | m_terminalBox->insertItem( tr("X-Terminal"), 3 ); //, id_term_xterm ); | 81 | m_terminalBox->insertItem( tr("X-Terminal"), 3 ); //, id_term_xterm ); |
diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp index df27055..45fd11d 100644 --- a/noncore/apps/opie-console/test/senderui.cpp +++ b/noncore/apps/opie-console/test/senderui.cpp | |||
@@ -25,17 +25,17 @@ SenderUI::SenderUI() | |||
25 | QString str = "/dev/bty0"; | 25 | QString str = "/dev/bty0"; |
26 | prof.writeEntry("Device",str ); | 26 | prof.writeEntry("Device",str ); |
27 | prof.writeEntry("Baud", 19200 ); | 27 | prof.writeEntry("Baud", 19200 ); |
28 | 28 | ||
29 | qWarning("prof " + prof.readEntry("Device") + " " + str); | 29 | owarn << "prof " + prof.readEntry("Device") + " " + str << oendl; |
30 | ser = new IOSerial(prof); | 30 | ser = new IOSerial(prof); |
31 | connect(ser, SIGNAL(received(const QByteArray&) ), | 31 | connect(ser, SIGNAL(received(const QByteArray&) ), |
32 | this, SLOT(got(const QByteArray&) ) ); | 32 | this, SLOT(got(const QByteArray&) ) ); |
33 | 33 | ||
34 | if ( ser->open() ) | 34 | if ( ser->open() ) |
35 | qWarning("opened!!!"); | 35 | owarn << "opened!!!" << oendl; |
36 | else | 36 | else |
37 | qWarning("could not open"); | 37 | owarn << "could not open" << oendl; |
38 | 38 | ||
39 | 39 | ||
40 | } | 40 | } |
41 | SenderUI::~SenderUI() { | 41 | SenderUI::~SenderUI() { |
@@ -51,29 +51,29 @@ void SenderUI::slotSendFile() { | |||
51 | } | 51 | } |
52 | 52 | ||
53 | void SenderUI::slotSend() { | 53 | void SenderUI::slotSend() { |
54 | QCString str = MultiLineEdit1->text().utf8(); | 54 | QCString str = MultiLineEdit1->text().utf8(); |
55 | qWarning("sending: %s", str.data() ); | 55 | owarn << "sending: " << str.data() << "" << oendl; |
56 | str = str.replace( QRegExp("\n"), "\r"); | 56 | str = str.replace( QRegExp("\n"), "\r"); |
57 | ser->send( str ); | 57 | ser->send( str ); |
58 | } | 58 | } |
59 | void SenderUI::got(const QByteArray& ar) { | 59 | void SenderUI::got(const QByteArray& ar) { |
60 | qWarning("got:"); | 60 | owarn << "got:" << oendl; |
61 | for ( uint i = 0; i < ar.count(); i++ ) { | 61 | for ( uint i = 0; i < ar.count(); i++ ) { |
62 | printf("%c", ar[i] ); | 62 | printf("%c", ar[i] ); |
63 | } | 63 | } |
64 | printf("\n"); | 64 | printf("\n"); |
65 | } | 65 | } |
66 | 66 | ||
67 | void SenderUI::fileTransComplete() { | 67 | void SenderUI::fileTransComplete() { |
68 | 68 | ||
69 | qWarning("file transfer complete"); | 69 | owarn << "file transfer complete" << oendl; |
70 | } | 70 | } |
71 | void SenderUI::send() { | 71 | void SenderUI::send() { |
72 | 72 | ||
73 | } | 73 | } |
74 | void SenderUI::slotRev(){ | 74 | void SenderUI::slotRev(){ |
75 | qWarning("Going to receive!"); | 75 | owarn << "Going to receive!" << oendl; |
76 | FileReceive *rev = new FileReceive( FileReceive::SZ, ser ); | 76 | FileReceive *rev = new FileReceive( FileReceive::SZ, ser ); |
77 | rev->receive(); | 77 | rev->receive(); |
78 | 78 | ||
79 | } | 79 | } |
diff --git a/noncore/apps/opie-console/widget.cpp b/noncore/apps/opie-console/widget.cpp index e17dfd4..c51983f 100644 --- a/noncore/apps/opie-console/widget.cpp +++ b/noncore/apps/opie-console/widget.cpp | |||
@@ -994,9 +994,9 @@ bool Widget::eventFilter( QObject *obj, QEvent *e ) | |||
994 | 994 | ||
995 | #ifdef FAKE_CTRL_AND_ALT | 995 | #ifdef FAKE_CTRL_AND_ALT |
996 | static bool control = FALSE; | 996 | static bool control = FALSE; |
997 | static bool alt = FALSE; | 997 | static bool alt = FALSE; |
998 | // qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); | 998 | // odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; |
999 | bool dele=FALSE; | 999 | bool dele=FALSE; |
1000 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { | 1000 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { |
1001 | QKeyEvent* ke = (QKeyEvent*)e; | 1001 | QKeyEvent* ke = (QKeyEvent*)e; |
1002 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); | 1002 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); |
@@ -1033,13 +1033,13 @@ bool Widget::eventFilter( QObject *obj, QEvent *e ) | |||
1033 | QKeyEvent* ke = (QKeyEvent*)e; | 1033 | QKeyEvent* ke = (QKeyEvent*)e; |
1034 | actSel=0; // Key stroke implies a screen update, so Widget won't | 1034 | actSel=0; // Key stroke implies a screen update, so Widget won't |
1035 | // know where the current selection is. | 1035 | // know where the current selection is. |
1036 | 1036 | ||
1037 | // qDebug("key pressed is 0x%x",ke->key()); | 1037 | // odebug << "key pressed is 0x" << ke->key() << "" << oendl; |
1038 | 1038 | ||
1039 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker | 1039 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker |
1040 | 1040 | ||
1041 | // qDebug("key pressed 2 is 0x%x",ke->key()); | 1041 | // odebug << "key pressed 2 is 0x" << ke->key() << "" << oendl; |
1042 | emitText("\\"); // expose | 1042 | emitText("\\"); // expose |
1043 | } else | 1043 | } else |
1044 | emit keyPressedSignal(ke); // expose | 1044 | emit keyPressedSignal(ke); // expose |
1045 | ke->accept(); | 1045 | ke->accept(); |
diff --git a/noncore/apps/opie-console/widget_layer.cpp b/noncore/apps/opie-console/widget_layer.cpp index 96dda1c..ab25919 100644 --- a/noncore/apps/opie-console/widget_layer.cpp +++ b/noncore/apps/opie-console/widget_layer.cpp | |||
@@ -74,9 +74,9 @@ bool WidgetLayer::eventFilter( QObject *obj, QEvent *e ) | |||
74 | 74 | ||
75 | #ifdef FAKE_CTRL_AND_ALT | 75 | #ifdef FAKE_CTRL_AND_ALT |
76 | static bool control = false; | 76 | static bool control = false; |
77 | static bool alt = false; | 77 | static bool alt = false; |
78 | // qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); | 78 | // odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; |
79 | bool dele = false; | 79 | bool dele = false; |
80 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { | 80 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { |
81 | QKeyEvent* ke = (QKeyEvent*)e; | 81 | QKeyEvent* ke = (QKeyEvent*)e; |
82 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); | 82 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); |
@@ -114,9 +114,9 @@ QChar(a,0)); | |||
114 | QKeyEvent* ke = (QKeyEvent*)e; | 114 | QKeyEvent* ke = (QKeyEvent*)e; |
115 | //actSel=0; // Key stroke implies a screen update, so Widget won't | 115 | //actSel=0; // Key stroke implies a screen update, so Widget won't |
116 | // know where the current selection is. | 116 | // know where the current selection is. |
117 | 117 | ||
118 | // qDebug("key pressed is 0x%x",ke->key()); | 118 | // odebug << "key pressed is 0x" << ke->key() << "" << oendl; |
119 | 119 | ||
120 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker | 120 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker |
121 | insertText("\\"); // expose | 121 | insertText("\\"); // expose |
122 | } else | 122 | } else |
diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp index 90e1a70..aa03060 100644 --- a/noncore/apps/opie-write/mainwindow.cpp +++ b/noncore/apps/opie-write/mainwindow.cpp | |||
@@ -19,14 +19,18 @@ | |||
19 | ** | 19 | ** |
20 | **********************************************************************/ | 20 | **********************************************************************/ |
21 | 21 | ||
22 | #include "mainwindow.h" | 22 | #include "mainwindow.h" |
23 | |||
24 | /* OPIE */ | ||
25 | #include <opie2/odebug.h> | ||
23 | #include <qpe/fileselector.h> | 26 | #include <qpe/fileselector.h> |
24 | #include <qpe/applnk.h> | 27 | #include <qpe/applnk.h> |
25 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
26 | #include <qpe/fontdatabase.h> | 29 | #include <qpe/fontdatabase.h> |
30 | using namespace Opie::Core; | ||
27 | 31 | ||
28 | //#include "qspellchecker.h" | 32 | /* QT */ |
29 | #include "qtextedit.h" | 33 | #include "qtextedit.h" |
30 | #include <qaction.h> | 34 | #include <qaction.h> |
31 | #include <qtoolbar.h> | 35 | #include <qtoolbar.h> |
32 | #include <qtoolbutton.h> | 36 | #include <qtoolbutton.h> |
@@ -443,9 +447,9 @@ void MainWindow::fileOpen() | |||
443 | } | 447 | } |
444 | 448 | ||
445 | void MainWindow::fileRevert() | 449 | void MainWindow::fileRevert() |
446 | { | 450 | { |
447 | qDebug( "QMainWindow::fileRevert needs to be done" ); | 451 | odebug << "QMainWindow::fileRevert needs to be done" << oendl; |
448 | } | 452 | } |
449 | 453 | ||
450 | void MainWindow::fileNew() | 454 | void MainWindow::fileNew() |
451 | { | 455 | { |
@@ -455,9 +459,9 @@ void MainWindow::fileNew() | |||
455 | } | 459 | } |
456 | 460 | ||
457 | void MainWindow::insertTable() | 461 | void MainWindow::insertTable() |
458 | { | 462 | { |
459 | qDebug( "MainWindow::insertTable() needs to be done" ); | 463 | odebug << "MainWindow::insertTable() needs to be done" << oendl; |
460 | } | 464 | } |
461 | 465 | ||
462 | void MainWindow::newFile( const DocLnk &dl ) | 466 | void MainWindow::newFile( const DocLnk &dl ) |
463 | { | 467 | { |
@@ -474,9 +478,9 @@ void MainWindow::openFile( const DocLnk &dl ) | |||
474 | { | 478 | { |
475 | FileManager fm; | 479 | FileManager fm; |
476 | QString txt; | 480 | QString txt; |
477 | if ( !fm.loadFile( dl, txt ) ) | 481 | if ( !fm.loadFile( dl, txt ) ) |
478 | qDebug( "couldn't open file" ); | 482 | odebug << "couldn't open file" << oendl; |
479 | clear(); | 483 | clear(); |
480 | editorStack->raiseWidget( editor ); | 484 | editorStack->raiseWidget( editor ); |
481 | editor->viewport()->setFocus(); | 485 | editor->viewport()->setFocus(); |
482 | doc = new DocLnk( dl ); | 486 | doc = new DocLnk( dl ); |
diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro index 044ce7e..8e514d4 100644 --- a/noncore/apps/opie-write/opie-write.pro +++ b/noncore/apps/opie-write/opie-write.pro | |||
@@ -1,7 +1,6 @@ | |||
1 | 1 | ||
2 | CONFIG += qt warn on quick-app | 2 | CONFIG += qt warn on quick-app |
3 | |||
4 | 3 | ||
5 | HEADERS = qcleanuphandler.h \ | 4 | HEADERS = qcleanuphandler.h \ |
6 | qcomplextext_p.h \ | 5 | qcomplextext_p.h \ |
7 | qrichtext_p.h \ | 6 | qrichtext_p.h \ |
diff --git a/noncore/apps/opie-write/qcomplextext.cpp b/noncore/apps/opie-write/qcomplextext.cpp index 473f184..00a91c5 100644 --- a/noncore/apps/opie-write/qcomplextext.cpp +++ b/noncore/apps/opie-write/qcomplextext.cpp | |||
@@ -105,9 +105,9 @@ QBidiContext::~QBidiContext() | |||
105 | rightChar() returns true if the char to the right is a right join-causing char | 105 | rightChar() returns true if the char to the right is a right join-causing char |
106 | */ | 106 | */ |
107 | static inline const QChar *prevChar( const QString &str, int pos ) | 107 | static inline const QChar *prevChar( const QString &str, int pos ) |
108 | { | 108 | { |
109 | //qDebug("leftChar: pos=%d", pos); | 109 | //odebug << "leftChar: pos=" << pos << "" << oendl; |
110 | pos--; | 110 | pos--; |
111 | const QChar *ch = str.unicode() + pos; | 111 | const QChar *ch = str.unicode() + pos; |
112 | while( pos > -1 ) { | 112 | while( pos > -1 ) { |
113 | if( !ch->isMark() ) | 113 | if( !ch->isMark() ) |
@@ -123,9 +123,9 @@ static inline const QChar *nextChar( const QString &str, int pos) | |||
123 | pos++; | 123 | pos++; |
124 | int len = str.length(); | 124 | int len = str.length(); |
125 | const QChar *ch = str.unicode() + pos; | 125 | const QChar *ch = str.unicode() + pos; |
126 | while( pos < len ) { | 126 | while( pos < len ) { |
127 | //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining()); | 127 | //odebug << "rightChar: " << pos << " isLetter=" << ch.isLetter() << ", joining=" << ch.joining() << "" << oendl; |
128 | if( !ch->isMark() ) | 128 | if( !ch->isMark() ) |
129 | return ch; | 129 | return ch; |
130 | // assume it's a transparent char, this might not be 100% correct | 130 | // assume it's a transparent char, this might not be 100% correct |
131 | pos++; | 131 | pos++; |
diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp index b77a0fc..c27eb1e 100644 --- a/noncore/apps/opie-write/qrichtext.cpp +++ b/noncore/apps/opie-write/qrichtext.cpp | |||
@@ -36,13 +36,19 @@ | |||
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | 37 | ||
38 | #include "qrichtext_p.h" | 38 | #include "qrichtext_p.h" |
39 | 39 | ||
40 | /* OPIE */ | ||
41 | #include <opie2/odebug.h> | ||
42 | using namespace Opie::Core; | ||
43 | |||
44 | /* QT */ | ||
40 | #include "qdragobject.h" | 45 | #include "qdragobject.h" |
41 | #include "qpaintdevicemetrics.h" | 46 | #include "qpaintdevicemetrics.h" |
42 | #include "qdrawutil.h" | 47 | #include "qdrawutil.h" |
43 | #include "qcleanuphandler.h" | 48 | #include "qcleanuphandler.h" |
44 | 49 | ||
50 | /* STD */ | ||
45 | #include <stdlib.h> | 51 | #include <stdlib.h> |
46 | 52 | ||
47 | using namespace Qt3; | 53 | using namespace Qt3; |
48 | 54 | ||
@@ -183,9 +189,9 @@ QTextDeleteCommand::~QTextDeleteCommand() | |||
183 | QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) | 189 | QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) |
184 | { | 190 | { |
185 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; | 191 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; |
186 | if ( !s ) { | 192 | if ( !s ) { |
187 | qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); | 193 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; |
188 | return 0; | 194 | return 0; |
189 | } | 195 | } |
190 | 196 | ||
191 | cursor.setParagraph( s ); | 197 | cursor.setParagraph( s ); |
@@ -211,9 +217,9 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) | |||
211 | QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) | 217 | QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) |
212 | { | 218 | { |
213 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; | 219 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; |
214 | if ( !s ) { | 220 | if ( !s ) { |
215 | qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); | 221 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; |
216 | return 0; | 222 | return 0; |
217 | } | 223 | } |
218 | 224 | ||
219 | cursor.setParagraph( s ); | 225 | cursor.setParagraph( s ); |
@@ -1543,12 +1549,12 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso | |||
1543 | QImage img; | 1549 | QImage img; |
1544 | QString bg = attr["background"]; | 1550 | QString bg = attr["background"]; |
1545 | const QMimeSource* m = factory_->data( bg, contxt ); | 1551 | const QMimeSource* m = factory_->data( bg, contxt ); |
1546 | if ( !m ) { | 1552 | if ( !m ) { |
1547 | qWarning("QRichText: no mimesource for %s", bg.latin1() ); | 1553 | owarn << "QRichText: no mimesource for " << bg.latin1() << "" << oendl; |
1548 | } else { | 1554 | } else { |
1549 | if ( !QImageDrag::decode( m, img ) ) { | 1555 | if ( !QImageDrag::decode( m, img ) ) { |
1550 | qWarning("QTextImage: cannot decode %s", bg.latin1() ); | 1556 | owarn << "QTextImage: cannot decode " << bg.latin1() << "" << oendl; |
1551 | } | 1557 | } |
1552 | } | 1558 | } |
1553 | if ( !img.isNull() ) { | 1559 | if ( !img.isNull() ) { |
1554 | QPixmap pm; | 1560 | QPixmap pm; |
@@ -2151,9 +2157,9 @@ QString QTextDocument::richText() const | |||
2151 | QStyleSheetItem* item_ul = styleSheet()->item("ul"); | 2157 | QStyleSheetItem* item_ul = styleSheet()->item("ul"); |
2152 | QStyleSheetItem* item_ol = styleSheet()->item("ol"); | 2158 | QStyleSheetItem* item_ol = styleSheet()->item("ol"); |
2153 | QStyleSheetItem* item_li = styleSheet()->item("li"); | 2159 | QStyleSheetItem* item_li = styleSheet()->item("li"); |
2154 | if ( !item_p || !item_ul || !item_ol || !item_li ) { | 2160 | if ( !item_p || !item_ul || !item_ol || !item_li ) { |
2155 | qWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" ); | 2161 | owarn << "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" << oendl; |
2156 | return QString::null; | 2162 | return QString::null; |
2157 | } | 2163 | } |
2158 | int pastListDepth = 0; | 2164 | int pastListDepth = 0; |
2159 | int listDepth = 0; | 2165 | int listDepth = 0; |
@@ -4095,9 +4101,9 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const | |||
4095 | break; | 4101 | break; |
4096 | --it; | 4102 | --it; |
4097 | } | 4103 | } |
4098 | 4104 | ||
4099 | qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i ); | 4105 | owarn << "QTextParagraph::lineHeightOfChar: couldn't find lh for " << i << "" << oendl; |
4100 | return 15; | 4106 | return 15; |
4101 | } | 4107 | } |
4102 | 4108 | ||
4103 | QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line ) const | 4109 | QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line ) const |
@@ -4121,9 +4127,9 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line ) | |||
4121 | --it; | 4127 | --it; |
4122 | --l; | 4128 | --l; |
4123 | } | 4129 | } |
4124 | 4130 | ||
4125 | qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i ); | 4131 | owarn << "QTextParagraph::lineStartOfChar: couldn't find " << i << "" << oendl; |
4126 | return 0; | 4132 | return 0; |
4127 | } | 4133 | } |
4128 | 4134 | ||
4129 | int QTextParagraph::lines() const | 4135 | int QTextParagraph::lines() const |
@@ -4148,9 +4154,9 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const | |||
4148 | *index = i; | 4154 | *index = i; |
4149 | return &str->at( i ); | 4155 | return &str->at( i ); |
4150 | } | 4156 | } |
4151 | 4157 | ||
4152 | qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line ); | 4158 | owarn << "QTextParagraph::lineStartOfLine: couldn't find " << line << "" << oendl; |
4153 | return 0; | 4159 | return 0; |
4154 | } | 4160 | } |
4155 | 4161 | ||
4156 | int QTextParagraph::leftGap() const | 4162 | int QTextParagraph::leftGap() const |
@@ -5696,9 +5702,9 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c ) | |||
5696 | cachedFormat = createFormat( f, c ); | 5702 | cachedFormat = createFormat( f, c ); |
5697 | cachedFormat->collection = this; | 5703 | cachedFormat->collection = this; |
5698 | cKey.insert( cachedFormat->key(), cachedFormat ); | 5704 | cKey.insert( cachedFormat->key(), cachedFormat ); |
5699 | if ( cachedFormat->key() != key ) | 5705 | if ( cachedFormat->key() != key ) |
5700 | qWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() ); | 5706 | owarn << "ASSERT: keys for format not identical: '" << cachedFormat->key().latin1() << " '" << key.latin1() << "'" << oendl; |
5701 | return cachedFormat; | 5707 | return cachedFormat; |
5702 | } | 5708 | } |
5703 | 5709 | ||
5704 | void QTextFormatCollection::remove( QTextFormat *f ) | 5710 | void QTextFormatCollection::remove( QTextFormat *f ) |
@@ -6082,13 +6088,13 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co | |||
6082 | QImage img; | 6088 | QImage img; |
6083 | const QMimeSource* m = | 6089 | const QMimeSource* m = |
6084 | factory.data( imageName, context ); | 6090 | factory.data( imageName, context ); |
6085 | if ( !m ) { | 6091 | if ( !m ) { |
6086 | qWarning("QTextImage: no mimesource for %s", imageName.latin1() ); | 6092 | owarn << "QTextImage: no mimesource for " << imageName.latin1() << "" << oendl; |
6087 | } | 6093 | } |
6088 | else { | 6094 | else { |
6089 | if ( !QImageDrag::decode( m, img ) ) { | 6095 | if ( !QImageDrag::decode( m, img ) ) { |
6090 | qWarning("QTextImage: cannot decode %s", imageName.latin1() ); | 6096 | owarn << "QTextImage: cannot decode " << imageName.latin1() << "" << oendl; |
6091 | } | 6097 | } |
6092 | } | 6098 | } |
6093 | 6099 | ||
6094 | if ( !img.isNull() ) { | 6100 | if ( !img.isNull() ) { |
diff --git a/noncore/apps/opie-write/qrichtext_p.cpp b/noncore/apps/opie-write/qrichtext_p.cpp index 6783e0b..2e8b09c 100644 --- a/noncore/apps/opie-write/qrichtext_p.cpp +++ b/noncore/apps/opie-write/qrichtext_p.cpp | |||
@@ -34,8 +34,11 @@ | |||
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | 37 | ||
38 | #include <opie2/odebug.h> | ||
39 | using namespace Opie::Core; | ||
40 | |||
38 | #include "qrichtext_p.h" | 41 | #include "qrichtext_p.h" |
39 | 42 | ||
40 | using namespace Qt3; | 43 | using namespace Qt3; |
41 | 44 | ||
@@ -136,9 +139,9 @@ void QTextCursor::gotoPosition( QTextParagraph* p, int index ) | |||
136 | } | 139 | } |
137 | para = p; | 140 | para = p; |
138 | if ( index < 0 || index >= para->length() ) { | 141 | if ( index < 0 || index >= para->length() ) { |
139 | #if defined(QT_CHECK_RANGE) | 142 | #if defined(QT_CHECK_RANGE) |
140 | qWarning( "QTextCursor::gotoParagraph Index: %d out of range", index ); | 143 | owarn << "QTextCursor::gotoParagraph Index: " << index << " out of range" << oendl; |
141 | #endif | 144 | #endif |
142 | index = index < 0 ? 0 : para->length() - 1; | 145 | index = index < 0 ? 0 : para->length() - 1; |
143 | } | 146 | } |
144 | 147 | ||
@@ -476,9 +479,9 @@ bool QTextParagraph::fullSelected( int id ) const | |||
476 | 479 | ||
477 | int QTextParagraph::lineY( int l ) const | 480 | int QTextParagraph::lineY( int l ) const |
478 | { | 481 | { |
479 | if ( l > (int)lineStarts.count() - 1 ) { | 482 | if ( l > (int)lineStarts.count() - 1 ) { |
480 | qWarning( "QTextParagraph::lineY: line %d out of range!", l ); | 483 | owarn << "QTextParagraph::lineY: line " << l << " out of range!" << oendl; |
481 | return 0; | 484 | return 0; |
482 | } | 485 | } |
483 | 486 | ||
484 | if ( !isValid() ) | 487 | if ( !isValid() ) |
@@ -492,9 +495,9 @@ int QTextParagraph::lineY( int l ) const | |||
492 | 495 | ||
493 | int QTextParagraph::lineBaseLine( int l ) const | 496 | int QTextParagraph::lineBaseLine( int l ) const |
494 | { | 497 | { |
495 | if ( l > (int)lineStarts.count() - 1 ) { | 498 | if ( l > (int)lineStarts.count() - 1 ) { |
496 | qWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l ); | 499 | owarn << "QTextParagraph::lineBaseLine: line " << l << " out of range!" << oendl; |
497 | return 10; | 500 | return 10; |
498 | } | 501 | } |
499 | 502 | ||
500 | if ( !isValid() ) | 503 | if ( !isValid() ) |
@@ -508,9 +511,9 @@ int QTextParagraph::lineBaseLine( int l ) const | |||
508 | 511 | ||
509 | int QTextParagraph::lineHeight( int l ) const | 512 | int QTextParagraph::lineHeight( int l ) const |
510 | { | 513 | { |
511 | if ( l > (int)lineStarts.count() - 1 ) { | 514 | if ( l > (int)lineStarts.count() - 1 ) { |
512 | qWarning( "QTextParagraph::lineHeight: line %d out of range!", l ); | 515 | owarn << "QTextParagraph::lineHeight: line " << l << " out of range!" << oendl; |
513 | return 15; | 516 | return 15; |
514 | } | 517 | } |
515 | 518 | ||
516 | if ( !isValid() ) | 519 | if ( !isValid() ) |
@@ -524,10 +527,10 @@ int QTextParagraph::lineHeight( int l ) const | |||
524 | 527 | ||
525 | void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const | 528 | void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const |
526 | { | 529 | { |
527 | if ( l > (int)lineStarts.count() - 1 ) { | 530 | if ( l > (int)lineStarts.count() - 1 ) { |
528 | qWarning( "QTextParagraph::lineInfo: line %d out of range!", l ); | 531 | owarn << "QTextParagraph::lineInfo: line " << l << " out of range!" << oendl; |
529 | qDebug( "%d %d", (int)lineStarts.count() - 1, l ); | 532 | odebug << "" << (int)lineStarts.count() - 1 << " " << l << "" << oendl; |
530 | y = 0; | 533 | y = 0; |
531 | h = 15; | 534 | h = 15; |
532 | bl = 10; | 535 | bl = 10; |
533 | return; | 536 | return; |
diff --git a/noncore/apps/qashmoney/accountdisplay.cpp b/noncore/apps/qashmoney/accountdisplay.cpp index 0fe5b09..046d997 100755 --- a/noncore/apps/qashmoney/accountdisplay.cpp +++ b/noncore/apps/qashmoney/accountdisplay.cpp | |||
@@ -1,13 +1,18 @@ | |||
1 | #include <qmessagebox.h> | ||
2 | #include <qheader.h> | ||
3 | |||
4 | #include "accountdisplay.h" | 1 | #include "accountdisplay.h" |
5 | #include "newaccount.h" | 2 | #include "newaccount.h" |
6 | #include "transaction.h" | 3 | #include "transaction.h" |
7 | #include "transferdialog.h" | 4 | #include "transferdialog.h" |
8 | #include "transfer.h" | 5 | #include "transfer.h" |
9 | 6 | ||
7 | /* OPIE */ | ||
8 | #include <opie2/odebug.h> | ||
9 | using namespace Opie::Core; | ||
10 | |||
11 | /* QT */ | ||
12 | #include <qmessagebox.h> | ||
13 | #include <qheader.h> | ||
14 | |||
10 | extern Account *account; | 15 | extern Account *account; |
11 | extern Transaction *transaction; | 16 | extern Transaction *transaction; |
12 | extern Transfer *transfer; | 17 | extern Transfer *transfer; |
13 | extern Preferences *preferences; | 18 | extern Preferences *preferences; |
@@ -266,9 +271,9 @@ void AccountDisplay::getTransferAccounts ( QListViewItem * item ) | |||
266 | { | 271 | { |
267 | // set the cleared integer if the checkbox is checked | 272 | // set the cleared integer if the checkbox is checked |
268 | if ( td->clearedcheckbox->isChecked() == TRUE ) | 273 | if ( td->clearedcheckbox->isChecked() == TRUE ) |
269 | cleared = 1; | 274 | cleared = 1; |
270 | qDebug("Year from transferdialog = %i",td->getYear()); | 275 | odebug << "Year from transferdialog = " << td->getYear() << "" << oendl; |
271 | // add the transfer with a new date if its been edited or use the default date | 276 | // add the transfer with a new date if its been edited or use the default date |
272 | if ( td->getDateEdited () == TRUE ) | 277 | if ( td->getDateEdited () == TRUE ) |
273 | transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared ); | 278 | transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared ); |
274 | else | 279 | else |
diff --git a/noncore/apps/qashmoney/config.in b/noncore/apps/qashmoney/config.in index 91739fe..aeed298 100644 --- a/noncore/apps/qashmoney/config.in +++ b/noncore/apps/qashmoney/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config QASHMONEY | 1 | config QASHMONEY |
2 | boolean "opie-qashmoney (money manager)" | 2 | boolean "opie-qashmoney (money manager)" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/apps/qashmoney/qashmoney.pro b/noncore/apps/qashmoney/qashmoney.pro index 6ad3db3..8a4302f 100755 --- a/noncore/apps/qashmoney/qashmoney.pro +++ b/noncore/apps/qashmoney/qashmoney.pro | |||
@@ -42,8 +42,8 @@ DEPENDPATH = $(OPIEDIR)/include | |||
42 | 42 | ||
43 | DESTDIR = $(OPIEDIR)/bin | 43 | DESTDIR = $(OPIEDIR)/bin |
44 | 44 | ||
45 | unix:LIBS += -lm | 45 | unix:LIBS += -lm |
46 | LIBS += -lqpe -lqte -lsqlite | 46 | LIBS += -lqpe -lopiecore2 -lsqlite |
47 | 47 | ||
48 | include ( $(OPIEDIR)/include.pro ) | 48 | include ( $(OPIEDIR)/include.pro ) |
49 | 49 | ||
diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp index dbf9370..6e544ba 100644 --- a/noncore/apps/tableviewer/db/common.cpp +++ b/noncore/apps/tableviewer/db/common.cpp | |||
@@ -16,17 +16,25 @@ | |||
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 | #include <stdlib.h> | 20 | #include "common.h" |
21 | #include "datacache.h" | ||
22 | |||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
25 | #include <qpe/timestring.h> | ||
26 | using namespace Opie::Core; | ||
27 | |||
28 | /* QT */ | ||
21 | #include <qstring.h> | 29 | #include <qstring.h> |
22 | #include <qheader.h> | 30 | #include <qheader.h> |
23 | #include <qvector.h> | 31 | #include <qvector.h> |
24 | #include <qdatetime.h> | 32 | #include <qdatetime.h> |
25 | #include <qpe/timestring.h> | 33 | |
26 | #include "common.h" | 34 | /* STD */ |
27 | #include "datacache.h" | ||
28 | #include <assert.h> | 35 | #include <assert.h> |
36 | #include <stdlib.h> | ||
29 | 37 | ||
30 | static const int del_flag = 0x1; | 38 | static const int del_flag = 0x1; |
31 | static const int new_flag = 0x2; | 39 | static const int new_flag = 0x2; |
32 | 40 | ||
@@ -311,9 +319,9 @@ void TVVariant::load(QDataStream &s ) | |||
311 | d->value.i = x; | 319 | d->value.i = x; |
312 | } | 320 | } |
313 | break; | 321 | break; |
314 | default: | 322 | default: |
315 | qFatal("Unrecognized data type"); | 323 | ofatal << "Unrecognized data type" << oendl; |
316 | } | 324 | } |
317 | } | 325 | } |
318 | 326 | ||
319 | void TVVariant::save( QDataStream &s ) const | 327 | void TVVariant::save( QDataStream &s ) const |
@@ -1077,9 +1085,9 @@ QDataStream &operator>>( QDataStream &s, DataElem &d) | |||
1077 | int index = 0; | 1085 | int index = 0; |
1078 | 1086 | ||
1079 | s >> size; /* redundent data but makes streaming easier */ | 1087 | s >> size; /* redundent data but makes streaming easier */ |
1080 | if (size != d.getNumFields()) { | 1088 | if (size != d.getNumFields()) { |
1081 | qWarning("DataSize mis-match"); | 1089 | owarn << "DataSize mis-match" << oendl; |
1082 | return s; /* sanity check failed.. don't load */ | 1090 | return s; /* sanity check failed.. don't load */ |
1083 | } | 1091 | } |
1084 | 1092 | ||
1085 | for(i = 0; i < size; i++) { | 1093 | for(i = 0; i < size; i++) { |
@@ -1376,9 +1384,9 @@ bool DataElem::contains(int i, TVVariant v) const | |||
1376 | case TVVariant::Time: | 1384 | case TVVariant::Time: |
1377 | case TVVariant::Date: | 1385 | case TVVariant::Date: |
1378 | break; | 1386 | break; |
1379 | default: | 1387 | default: |
1380 | qWarning("Tried to compare unknown data type"); | 1388 | owarn << "Tried to compare unknown data type" << oendl; |
1381 | } | 1389 | } |
1382 | return FALSE; | 1390 | return FALSE; |
1383 | } | 1391 | } |
1384 | 1392 | ||
@@ -1402,9 +1410,9 @@ bool DataElem::startsWith(int i, TVVariant v) const | |||
1402 | case TVVariant::Time: | 1410 | case TVVariant::Time: |
1403 | case TVVariant::Date: | 1411 | case TVVariant::Date: |
1404 | return FALSE; | 1412 | return FALSE; |
1405 | default: | 1413 | default: |
1406 | qWarning("Tried to compare unknown data type"); | 1414 | owarn << "Tried to compare unknown data type" << oendl; |
1407 | } | 1415 | } |
1408 | return FALSE; | 1416 | return FALSE; |
1409 | } | 1417 | } |
1410 | 1418 | ||
@@ -1428,9 +1436,9 @@ bool DataElem::endsWith(int i, TVVariant v) const | |||
1428 | case TVVariant::Time: | 1436 | case TVVariant::Time: |
1429 | case TVVariant::Date: | 1437 | case TVVariant::Date: |
1430 | return FALSE; | 1438 | return FALSE; |
1431 | default: | 1439 | default: |
1432 | qWarning("Tried to compare unknown data type"); | 1440 | owarn << "Tried to compare unknown data type" << oendl; |
1433 | } | 1441 | } |
1434 | return FALSE; | 1442 | return FALSE; |
1435 | } | 1443 | } |
1436 | 1444 | ||
@@ -1460,9 +1468,9 @@ bool DataElem::closer(DataElem*d1, DataElem *d2, TVVariant target, int column) | |||
1460 | 1468 | ||
1461 | if(d2) { | 1469 | if(d2) { |
1462 | if (type != d2->getField(column).type()) { | 1470 | if (type != d2->getField(column).type()) { |
1463 | /* can't do compare */ | 1471 | /* can't do compare */ |
1464 | qWarning("Tried to compare two incompatable types"); | 1472 | owarn << "Tried to compare two incompatable types" << oendl; |
1465 | return FALSE; | 1473 | return FALSE; |
1466 | } | 1474 | } |
1467 | return target.closer(d1->getField(column), d2->getField(column)); | 1475 | return target.closer(d1->getField(column), d2->getField(column)); |
1468 | } | 1476 | } |
diff --git a/noncore/apps/tableviewer/db/datacache.cpp b/noncore/apps/tableviewer/db/datacache.cpp index 7c14eef..6380e1b 100644 --- a/noncore/apps/tableviewer/db/datacache.cpp +++ b/noncore/apps/tableviewer/db/datacache.cpp | |||
@@ -25,11 +25,19 @@ | |||
25 | 25 | ||
26 | #include "datacache.h" | 26 | #include "datacache.h" |
27 | #include "xmlsource.h" | 27 | #include "xmlsource.h" |
28 | #include "csvsource.h" | 28 | #include "csvsource.h" |
29 | #include <stdlib.h> | 29 | |
30 | /* OPIE */ | ||
31 | #include <opie2/odebug.h> | ||
32 | using namespace Opie::Core; | ||
33 | |||
34 | /* QT */ | ||
30 | #include <qheader.h> | 35 | #include <qheader.h> |
31 | 36 | ||
37 | /* STD */ | ||
38 | #include <stdlib.h> | ||
39 | |||
32 | #define INIT_TABLE_SIZE 128 | 40 | #define INIT_TABLE_SIZE 128 |
33 | 41 | ||
34 | /*! | 42 | /*! |
35 | \class DBStore datastore.h | 43 | \class DBStore datastore.h |
@@ -149,9 +157,9 @@ void DBStore::addItem(DataElem *delem) | |||
149 | void DBStore::addItemInternal(DataElem *delem) | 157 | void DBStore::addItemInternal(DataElem *delem) |
150 | { | 158 | { |
151 | /* if already full, don't over fill, do a qWarning though */ | 159 | /* if already full, don't over fill, do a qWarning though */ |
152 | if (full) { | 160 | if (full) { |
153 | qWarning("Attempted to add items to already full table"); | 161 | owarn << "Attempted to add items to already full table" << oendl; |
154 | return; | 162 | return; |
155 | } | 163 | } |
156 | 164 | ||
157 | master_table.insert(number_elems, delem); | 165 | master_table.insert(number_elems, delem); |
diff --git a/noncore/apps/tableviewer/db/xmlsource.cpp b/noncore/apps/tableviewer/db/xmlsource.cpp index 94fec36..4ca6aee 100644 --- a/noncore/apps/tableviewer/db/xmlsource.cpp +++ b/noncore/apps/tableviewer/db/xmlsource.cpp | |||
@@ -17,14 +17,20 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "xmlsource.h" | 20 | #include "xmlsource.h" |
21 | #include <qdict.h> | ||
22 | #include <stdlib.h> | ||
23 | #include <qtextstream.h> | ||
24 | #include "../xmlencodeattr.h" | 21 | #include "../xmlencodeattr.h" |
25 | 22 | ||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
25 | using namespace Opie::Core; | ||
26 | 26 | ||
27 | /* QT */ | ||
28 | #include <qdict.h> | ||
29 | #include <qtextstream.h> | ||
30 | |||
31 | /* STD */ | ||
32 | #include <stdlib.h> | ||
27 | 33 | ||
28 | DBXml::DBXml(DBStore *d) | 34 | DBXml::DBXml(DBStore *d) |
29 | { | 35 | { |
30 | dstore = d; | 36 | dstore = d; |
@@ -139,9 +145,9 @@ DBXmlHandler::~DBXmlHandler() | |||
139 | } | 145 | } |
140 | 146 | ||
141 | QString DBXmlHandler::errorProtocol() | 147 | QString DBXmlHandler::errorProtocol() |
142 | { | 148 | { |
143 | qWarning("Error reading file"); | 149 | owarn << "Error reading file" << oendl; |
144 | return errorProt; | 150 | return errorProt; |
145 | } | 151 | } |
146 | 152 | ||
147 | bool DBXmlHandler::startDocument() | 153 | bool DBXmlHandler::startDocument() |
@@ -171,9 +177,9 @@ bool DBXmlHandler::startElement(const QString&, const QString&, | |||
171 | state = StateKey; | 177 | state = StateKey; |
172 | last_key_type = TVVariant::String; | 178 | last_key_type = TVVariant::String; |
173 | key = atts.value("name"); | 179 | key = atts.value("name"); |
174 | if (key.isEmpty()) { | 180 | if (key.isEmpty()) { |
175 | qWarning("empty key name"); | 181 | owarn << "empty key name" << oendl; |
176 | return FALSE; | 182 | return FALSE; |
177 | } | 183 | } |
178 | if(!atts.value("type").isEmpty()) | 184 | if(!atts.value("type").isEmpty()) |
179 | last_key_type = TVVariant::nameToType(atts.value("type")); | 185 | last_key_type = TVVariant::nameToType(atts.value("type")); |
@@ -189,15 +195,15 @@ bool DBXmlHandler::startElement(const QString&, const QString&, | |||
189 | state = StateField; | 195 | state = StateField; |
190 | /* the qName is the name of a key */ | 196 | /* the qName is the name of a key */ |
191 | if (!keyIndexList[qName]) { | 197 | if (!keyIndexList[qName]) { |
192 | /* invalid key, we failed */ | 198 | /* invalid key, we failed */ |
193 | qWarning("Invalid key in record"); | 199 | owarn << "Invalid key in record" << oendl; |
194 | return FALSE; | 200 | return FALSE; |
195 | } | 201 | } |
196 | keyIndex = *keyIndexList[qName]; | 202 | keyIndex = *keyIndexList[qName]; |
197 | return TRUE; | 203 | return TRUE; |
198 | } | 204 | } |
199 | qWarning("Unable to determine tag type"); | 205 | owarn << "Unable to determine tag type" << oendl; |
200 | return FALSE; | 206 | return FALSE; |
201 | } | 207 | } |
202 | 208 | ||
203 | bool DBXmlHandler::endElement(const QString&, const QString&, | 209 | bool DBXmlHandler::endElement(const QString&, const QString&, |
@@ -224,9 +230,9 @@ bool DBXmlHandler::endElement(const QString&, const QString&, | |||
224 | // we are done... | 230 | // we are done... |
225 | break; | 231 | break; |
226 | default: | 232 | default: |
227 | // should only get a 'endElement' from one of the above states. | 233 | // should only get a 'endElement' from one of the above states. |
228 | qWarning("Invalid end tag"); | 234 | owarn << "Invalid end tag" << oendl; |
229 | return FALSE; | 235 | return FALSE; |
230 | break; | 236 | break; |
231 | } | 237 | } |
232 | return TRUE; | 238 | return TRUE; |
@@ -253,9 +259,9 @@ bool DBXmlHandler::characters(const QString& ch) | |||
253 | current_data->setField(keyIndex, ch_simplified); | 259 | current_data->setField(keyIndex, ch_simplified); |
254 | return TRUE; | 260 | return TRUE; |
255 | } | 261 | } |
256 | 262 | ||
257 | qWarning("Junk characters found... ignored"); | 263 | owarn << "Junk characters found... ignored" << oendl; |
258 | return TRUE; | 264 | return TRUE; |
259 | } | 265 | } |
260 | 266 | ||
261 | QString DBXmlHandler::errorString() | 267 | QString DBXmlHandler::errorString() |
@@ -269,9 +275,9 @@ bool DBXmlHandler::warning(const QXmlParseException& exception) | |||
269 | .arg(exception.message()) | 275 | .arg(exception.message()) |
270 | .arg(exception.lineNumber()) | 276 | .arg(exception.lineNumber()) |
271 | .arg(exception.columnNumber()); | 277 | .arg(exception.columnNumber()); |
272 | 278 | ||
273 | qWarning(errorProt); | 279 | owarn << errorProt << oendl; |
274 | return QXmlDefaultHandler::fatalError(exception); | 280 | return QXmlDefaultHandler::fatalError(exception); |
275 | } | 281 | } |
276 | 282 | ||
277 | bool DBXmlHandler::error(const QXmlParseException& exception) | 283 | bool DBXmlHandler::error(const QXmlParseException& exception) |
@@ -280,9 +286,9 @@ bool DBXmlHandler::error(const QXmlParseException& exception) | |||
280 | .arg(exception.message()) | 286 | .arg(exception.message()) |
281 | .arg(exception.lineNumber()) | 287 | .arg(exception.lineNumber()) |
282 | .arg(exception.columnNumber()); | 288 | .arg(exception.columnNumber()); |
283 | 289 | ||
284 | qWarning(errorProt); | 290 | owarn << errorProt << oendl; |
285 | return QXmlDefaultHandler::fatalError(exception); | 291 | return QXmlDefaultHandler::fatalError(exception); |
286 | } | 292 | } |
287 | 293 | ||
288 | bool DBXmlHandler::fatalError(const QXmlParseException& exception) | 294 | bool DBXmlHandler::fatalError(const QXmlParseException& exception) |
@@ -291,7 +297,7 @@ bool DBXmlHandler::fatalError(const QXmlParseException& exception) | |||
291 | .arg(exception.message()) | 297 | .arg(exception.message()) |
292 | .arg(exception.lineNumber()) | 298 | .arg(exception.lineNumber()) |
293 | .arg(exception.columnNumber()); | 299 | .arg(exception.columnNumber()); |
294 | 300 | ||
295 | qWarning(errorProt); | 301 | owarn << errorProt << oendl; |
296 | return QXmlDefaultHandler::fatalError(exception); | 302 | return QXmlDefaultHandler::fatalError(exception); |
297 | } | 303 | } |
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp index 102b94c..9538cb3 100644 --- a/noncore/apps/tableviewer/tableviewer.cpp +++ b/noncore/apps/tableviewer/tableviewer.cpp | |||
@@ -17,29 +17,31 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | /* local includes */ | ||
22 | #include "tableviewer.h" | 21 | #include "tableviewer.h" |
23 | #include "ui/tvbrowseview.h" | 22 | #include "ui/tvbrowseview.h" |
24 | #include "ui/tvfilterview.h" | 23 | #include "ui/tvfilterview.h" |
25 | #include "ui/tvlistview.h" | 24 | #include "ui/tvlistview.h" |
26 | #include "ui/tveditview.h" | 25 | #include "ui/tveditview.h" |
27 | #include "ui/tvkeyedit.h" | 26 | #include "ui/tvkeyedit.h" |
28 | #include "db/datacache.h" | 27 | #include "db/datacache.h" |
29 | 28 | ||
30 | /* QPE includes */ | 29 | /* OPIE */ |
30 | #include <opie2/odebug.h> | ||
31 | #include <qpe/fileselector.h> | 31 | #include <qpe/fileselector.h> |
32 | #include <qpe/resource.h> | 32 | #include <qpe/resource.h> |
33 | #include <qtoolbar.h> | 33 | using namespace Opie::Core; |
34 | 34 | ||
35 | /* QTE includes */ | 35 | /* QT */ |
36 | #include <qmenubar.h> | 36 | #include <qmenubar.h> |
37 | #include <qtoolbar.h> | ||
37 | #include <qpopupmenu.h> | 38 | #include <qpopupmenu.h> |
38 | #include <qapplication.h> | 39 | #include <qapplication.h> |
39 | #include <qwidgetstack.h> | 40 | #include <qwidgetstack.h> |
40 | #include <qlayout.h> | 41 | #include <qlayout.h> |
41 | #include <qbuffer.h> | 42 | #include <qbuffer.h> |
43 | |||
42 | /*! | 44 | /*! |
43 | \class TableViewerWindow | 45 | \class TableViewerWindow |
44 | \brief The main window widget of the application | 46 | \brief The main window widget of the application |
45 | 47 | ||
@@ -200,9 +202,9 @@ void TableViewerWindow::saveDocument() | |||
200 | FileManager fm; | 202 | FileManager fm; |
201 | QIODevice *dev = fm.saveFile(doc); | 203 | QIODevice *dev = fm.saveFile(doc); |
202 | 204 | ||
203 | if(!ds->saveSource(dev, doc.type())){ | 205 | if(!ds->saveSource(dev, doc.type())){ |
204 | qWarning("Save unsuccessful"); | 206 | owarn << "Save unsuccessful" << oendl; |
205 | return; | 207 | return; |
206 | } | 208 | } |
207 | dev->close(); | 209 | dev->close(); |
208 | dirty = FALSE; | 210 | dirty = FALSE; |
@@ -287,9 +289,9 @@ void TableViewerWindow::openDocument(const DocLnk &f) | |||
287 | setCaption(tr(scratch)); | 289 | setCaption(tr(scratch)); |
288 | 290 | ||
289 | dirty = FALSE; | 291 | dirty = FALSE; |
290 | } else { | 292 | } else { |
291 | qWarning(tr("could not load Document")); | 293 | owarn << tr("could not load Document") << oendl; |
292 | } | 294 | } |
293 | dev->close(); | 295 | dev->close(); |
294 | } | 296 | } |
295 | 297 | ||
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro index 1de23bb..564f50f 100644 --- a/noncore/apps/tableviewer/tableviewer.pro +++ b/noncore/apps/tableviewer/tableviewer.pro | |||
@@ -1,5 +1,5 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | SUBDIRS = db ui | 2 | SUBDIRS = db ui |
3 | HEADERS = tableviewer.h \ | 3 | HEADERS = tableviewer.h \ |
4 | xmlencodeattr.h \ | 4 | xmlencodeattr.h \ |
5 | ui/commonwidgets.h \ | 5 | ui/commonwidgets.h \ |
@@ -30,9 +30,9 @@ SOURCES = main.cpp \ | |||
30 | db/csvsource.cpp \ | 30 | db/csvsource.cpp \ |
31 | db/common.cpp | 31 | db/common.cpp |
32 | INTERFACES= ui/tvkeyedit_gen.ui | 32 | INTERFACES= ui/tvkeyedit_gen.ui |
33 | TARGET = tableviewer | 33 | TARGET = tableviewer |
34 | INCLUDEPATH += $(OPIEDIR)/include | 34 | INCLUDEPATH+= $(OPIEDIR)/include |
35 | DEPENDPATH += $(OPIEDIR)/include | 35 | DEPENDPATH+= $(OPIEDIR)/include |
36 | LIBS += -lqpe -lopiecore2 | 36 | LIBS += -lqpe -lopiecore2 |
37 | 37 | ||
38 | include ( $(OPIEDIR)/include.pro ) | 38 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/tableviewer/ui/tvlistview.cpp b/noncore/apps/tableviewer/ui/tvlistview.cpp index b10ff1d..c3e6432 100644 --- a/noncore/apps/tableviewer/ui/tvlistview.cpp +++ b/noncore/apps/tableviewer/ui/tvlistview.cpp | |||
@@ -16,10 +16,17 @@ | |||
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 | #include "tvlistview.h" | 21 | #include "tvlistview.h" |
21 | #include "../db/common.h" | 22 | #include "../db/common.h" |
23 | |||
24 | /* OPIE */ | ||
25 | #include <opie2/odebug.h> | ||
26 | using namespace Opie::Core; | ||
27 | |||
28 | /* QT */ | ||
22 | #include <qtoolbutton.h> | 29 | #include <qtoolbutton.h> |
23 | #include <qlistview.h> | 30 | #include <qlistview.h> |
24 | #include <qlayout.h> | 31 | #include <qlayout.h> |
25 | 32 | ||
@@ -162,9 +169,9 @@ void TVListView::first() | |||
162 | } | 169 | } |
163 | 170 | ||
164 | void TVListView::last() | 171 | void TVListView::last() |
165 | { | 172 | { |
166 | qWarning("TVListView::last not yet implemented"); | 173 | owarn << "TVListView::last not yet implemented" << oendl; |
167 | } | 174 | } |
168 | 175 | ||
169 | void TVListView::next() | 176 | void TVListView::next() |
170 | { | 177 | { |
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro index 11ee275..1552dff 100644 --- a/noncore/apps/tinykate/libkate/libkate.pro +++ b/noncore/apps/tinykate/libkate/libkate.pro | |||
@@ -1,89 +1,86 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | HEADERS = microkde/kapplication.h \ | 3 | HEADERS = microkde/kapplication.h \ |
4 | kateconfig.h \ | 4 | kateconfig.h \ |
5 | microkde/kdebug.h \ | 5 | microkde/kdebug.h \ |
6 | microkde/kdialog.h \ | 6 | microkde/kdialog.h \ |
7 | microkde/kdialogbase.h \ | 7 | microkde/kdialogbase.h \ |
8 | microkde/kfiledialog.h \ | 8 | microkde/kfiledialog.h \ |
9 | microkde/kglobal.h \ | 9 | microkde/kglobal.h \ |
10 | microkde/kiconloader.h \ | 10 | microkde/kiconloader.h \ |
11 | microkde/klineedit.h \ | 11 | microkde/klineedit.h \ |
12 | microkde/klocale.h \ | 12 | microkde/klocale.h \ |
13 | microkde/kmessagebox.h \ | 13 | microkde/kmessagebox.h \ |
14 | microkde/kprinter.h \ | 14 | microkde/kprinter.h \ |
15 | microkde/krestrictedline.h \ | 15 | microkde/krestrictedline.h \ |
16 | microkde/kseparator.h \ | 16 | microkde/kseparator.h \ |
17 | microkde/kstandarddirs.h \ | 17 | microkde/kstandarddirs.h \ |
18 | microkde/ktempfile.h \ | 18 | microkde/ktempfile.h \ |
19 | microkde/kunload.h \ | 19 | microkde/kunload.h \ |
20 | microkde/kurlrequester.h \ | 20 | microkde/kurlrequester.h \ |
21 | microkde/kfontdialog.h \ | 21 | microkde/kfontdialog.h \ |
22 | microkde/krun.h \ | 22 | microkde/krun.h \ |
23 | microkde/knumvalidator.h \ | 23 | microkde/knumvalidator.h \ |
24 | microkde/kstaticdeleter.h \ | 24 | microkde/kstaticdeleter.h \ |
25 | microkde/klistview.h \ | 25 | microkde/klistview.h \ |
26 | microkde/kglobalsettings.h \ | 26 | microkde/kglobalsettings.h \ |
27 | microkde/kcolorbtn.h \ | 27 | microkde/kcolorbtn.h \ |
28 | \ | ||
29 | \ | 28 | \ |
30 | qt3back/qregexp3.h \ | 29 | qt3back/qregexp3.h \ |
31 | microkde/ksharedptr.h \ | 30 | microkde/ksharedptr.h \ |
32 | document/katebuffer.h document/katedialogs.h \ | 31 | document/katebuffer.h document/katedialogs.h \ |
33 | document/katetextline.h \ | 32 | document/katetextline.h \ |
34 | document/katecmd.h \ | 33 | document/katecmd.h \ |
35 | document/katehighlight.h \ | 34 | document/katehighlight.h \ |
36 | document/katecmds.h document/katedocument.h \ | 35 | document/katecmds.h document/katedocument.h \ |
37 | document/katesyntaxdocument.h \ | 36 | document/katesyntaxdocument.h \ |
38 | view/kateundohistory.h \ | 37 | view/kateundohistory.h \ |
39 | view/kateview.h \ | 38 | view/kateview.h \ |
40 | view/kateviewdialog.h \ | 39 | view/kateviewdialog.h \ |
41 | interfaces/view.h \ | 40 | interfaces/view.h \ |
42 | interfaces/document.h \ | 41 | interfaces/document.h \ |
43 | ktexteditor/ktexteditor.h | 42 | ktexteditor/ktexteditor.h |
44 | 43 | ||
45 | SOURCES = microkde/kapplication.cpp \ | 44 | SOURCES = microkde/kapplication.cpp \ |
46 | microkde/kdialogbase.cpp \ | 45 | microkde/kdialogbase.cpp \ |
47 | kateconfig.cpp \ | 46 | kateconfig.cpp \ |
48 | microkde/klocale.cpp \ | 47 | microkde/klocale.cpp \ |
49 | microkde/kmessagebox.cpp \ | 48 | microkde/kmessagebox.cpp \ |
50 | microkde/kprocess.cpp \ | 49 | microkde/kprocess.cpp \ |
51 | microkde/kstandarddirs.cpp \ | 50 | microkde/kstandarddirs.cpp \ |
52 | microkde/ktempfile.cpp \ | 51 | microkde/ktempfile.cpp \ |
53 | microkde/kurlrequester.cpp \ | 52 | microkde/kurlrequester.cpp \ |
54 | microkde/kfontdialog.cpp \ | 53 | microkde/kfontdialog.cpp \ |
55 | microkde/krun.cpp \ | 54 | microkde/krun.cpp \ |
56 | microkde/knumvalidator.cpp \ | 55 | microkde/knumvalidator.cpp \ |
57 | microkde/kglobal.cpp \ | 56 | microkde/kglobal.cpp \ |
58 | microkde/kglobalsettings.cpp \ | 57 | microkde/kglobalsettings.cpp \ |
59 | microkde/kcolorbtn.cpp \ | 58 | microkde/kcolorbtn.cpp \ |
60 | \ | 59 | \ |
61 | \ | 60 | qt3back/qregexp3.cpp \ |
62 | qt3back/qregexp3.cpp \ | 61 | ktexteditor/ktexteditor.cpp \ |
63 | ktexteditor/ktexteditor.cpp \ | 62 | document/katebuffer.cpp document/katedialogs.cpp \ |
64 | document/katebuffer.cpp document/katedialogs.cpp \ | 63 | document/katehighlight.cpp \ |
65 | document/katehighlight.cpp \ | 64 | document/katecmd.cpp \ |
66 | document/katecmd.cpp \ | 65 | document/katesyntaxdocument.cpp document/katecmds.cpp \ |
67 | document/katesyntaxdocument.cpp document/katecmds.cpp \ | 66 | document/katedocument.cpp document/katetextline.cpp \ |
68 | document/katedocument.cpp document/katetextline.cpp \ | 67 | view/kateundohistory.cpp \ |
69 | view/kateundohistory.cpp \ | 68 | view/kateview.cpp \ |
70 | view/kateview.cpp \ | 69 | view/kateviewdialog.cpp \ |
71 | view/kateviewdialog.cpp \ | 70 | interfaces/interfaces.cpp |
72 | interfaces/interfaces.cpp | 71 | INTERFACES = |
73 | 72 | INCLUDEPATH += $(OPIEDIR)/include \ | |
74 | INTERFACES = | ||
75 | INCLUDEPATH += $(OPIEDIR)/include \ | ||
76 | $(OPIEDIR)/noncore/apps/tinykate/libkate \ | 73 | $(OPIEDIR)/noncore/apps/tinykate/libkate \ |
77 | $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ | 74 | $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ |
78 | $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ | 75 | $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ |
79 | $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ | 76 | $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ |
80 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ | 77 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ |
81 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ | 78 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ |
82 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back | 79 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back |
83 | DEPENDPATH += $(OPIEDIR)/include | 80 | DEPENDPATH += $(OPIEDIR)/include |
84 | LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 | 81 | LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 |
85 | TARGET = tinykate | 82 | TARGET = tinykate |
86 | 83 | ||
87 | INCLUDEPATH += $(OPIEDIR)/include | 84 | INCLUDEPATH += $(OPIEDIR)/include |
88 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 85 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
89 | 86 | ||
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro index 6f4baa8..d34e519 100644 --- a/noncore/apps/tinykate/tinykate.pro +++ b/noncore/apps/tinykate/tinykate.pro | |||
@@ -1,22 +1,20 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on quick-app | 2 | CONFIG = qt warn_on quick-app |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = tinykate.h | 4 | HEADERS = tinykate.h |
5 | SOURCES = tinykate.cpp main.cpp | 5 | SOURCES = tinykate.cpp main.cpp |
6 | INTERFACES = | ||
7 | INCLUDEPATH += $(OPIEDIR)/include \ | 6 | INCLUDEPATH += $(OPIEDIR)/include \ |
8 | $(OPIEDIR)/noncore/apps/tinykate/libkate \ | 7 | $(OPIEDIR)/noncore/apps/tinykate/libkate \ |
9 | $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ | 8 | $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ |
10 | $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ | 9 | $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ |
11 | $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ | 10 | $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ |
12 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ | 11 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ |
13 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ | 12 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ |
14 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back | 13 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back |
15 | 14 | DEPENDPATH += $(OPIEDIR)/include | |
16 | DEPENDPATH += $(OPIEDIR)/include | 15 | LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2 |
17 | LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2 | 16 | TARGET = kate |
18 | TARGET = kate | ||
19 | 17 | ||
20 | 18 | ||
21 | 19 | ||
22 | include ( $(OPIEDIR)/include.pro ) | 20 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in index 6e321f3..b6d3ffe 100644 --- a/noncore/apps/zsafe/config.in +++ b/noncore/apps/zsafe/config.in | |||
@@ -1,5 +1,5 @@ | |||
1 | config ZSAFE | 1 | config ZSAFE |
2 | boolean "zsafe (Zaurus Password Manager)" | 2 | boolean "zsafe (Zaurus Password Manager)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
5 | 5 | ||
diff --git a/noncore/apps/zsafe/scqtfiledlg.cpp b/noncore/apps/zsafe/scqtfiledlg.cpp index 52b8d0d..c67bbd5 100644 --- a/noncore/apps/zsafe/scqtfiledlg.cpp +++ b/noncore/apps/zsafe/scqtfiledlg.cpp | |||
@@ -1,14 +1,11 @@ | |||
1 | /**************************************************************************** | ||
2 | ** Form implementation generated from reading ui file 'scqtfiledlg.ui' | ||
3 | ** | ||
4 | ** Created: Sun Jun 8 15:51:12 2003 | ||
5 | ** by: The User Interface Compiler (uic) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | ****************************************************************************/ | ||
9 | #include "scqtfiledlg.h" | 1 | #include "scqtfiledlg.h" |
10 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
11 | #include <qcombobox.h> | 8 | #include <qcombobox.h> |
12 | #include <qlineedit.h> | 9 | #include <qlineedit.h> |
13 | #include <qlistview.h> | 10 | #include <qlistview.h> |
14 | #include <qtoolbutton.h> | 11 | #include <qtoolbutton.h> |
@@ -215,42 +212,42 @@ ScQtFileDlg::~ScQtFileDlg() | |||
215 | } | 212 | } |
216 | 213 | ||
217 | void ScQtFileDlg::slotCancel() | 214 | void ScQtFileDlg::slotCancel() |
218 | { | 215 | { |
219 | qWarning( "ScQtFileDlg::slotCancel(): Not implemented yet!" ); | 216 | owarn << "ScQtFileDlg::slotCancel(): Not implemented yet!" << oendl; |
220 | } | 217 | } |
221 | 218 | ||
222 | void ScQtFileDlg::slotDirComboBoxChanged( int ) | 219 | void ScQtFileDlg::slotDirComboBoxChanged( int ) |
223 | { | 220 | { |
224 | qWarning( "ScQtFileDlg::slotDirComboBoxChanged( int ): Not implemented yet!" ); | 221 | owarn << "ScQtFileDlg::slotDirComboBoxChanged( int ): Not implemented yet!" << oendl; |
225 | } | 222 | } |
226 | 223 | ||
227 | void ScQtFileDlg::slotDoubleClicked(QListViewItem *) | 224 | void ScQtFileDlg::slotDoubleClicked(QListViewItem *) |
228 | { | 225 | { |
229 | qWarning( "ScQtFileDlg::slotDoubleClicked(QListViewItem *): Not implemented yet!" ); | 226 | owarn << "ScQtFileDlg::slotDoubleClicked(QListViewItem *): Not implemented yet!" << oendl; |
230 | } | 227 | } |
231 | 228 | ||
232 | void ScQtFileDlg::slotFileTextChanged( const QString & ) | 229 | void ScQtFileDlg::slotFileTextChanged( const QString & ) |
233 | { | 230 | { |
234 | qWarning( "ScQtFileDlg::slotFileTextChanged( const QString & ): Not implemented yet!" ); | 231 | owarn << "ScQtFileDlg::slotFileTextChanged( const QString & ): Not implemented yet!" << oendl; |
235 | } | 232 | } |
236 | 233 | ||
237 | void ScQtFileDlg::slotMkDir() | 234 | void ScQtFileDlg::slotMkDir() |
238 | { | 235 | { |
239 | qWarning( "ScQtFileDlg::slotMkDir(): Not implemented yet!" ); | 236 | owarn << "ScQtFileDlg::slotMkDir(): Not implemented yet!" << oendl; |
240 | } | 237 | } |
241 | 238 | ||
242 | void ScQtFileDlg::slotOK() | 239 | void ScQtFileDlg::slotOK() |
243 | { | 240 | { |
244 | qWarning( "ScQtFileDlg::slotOK(): Not implemented yet!" ); | 241 | owarn << "ScQtFileDlg::slotOK(): Not implemented yet!" << oendl; |
245 | } | 242 | } |
246 | 243 | ||
247 | void ScQtFileDlg::slotSelectionChanged(QListViewItem *) | 244 | void ScQtFileDlg::slotSelectionChanged(QListViewItem *) |
248 | { | 245 | { |
249 | qWarning( "ScQtFileDlg::slotSelectionChanged(QListViewItem *): Not implemented yet!" ); | 246 | owarn << "ScQtFileDlg::slotSelectionChanged(QListViewItem *): Not implemented yet!" << oendl; |
250 | } | 247 | } |
251 | 248 | ||
252 | void ScQtFileDlg::slotTypeComboBoxChanged( int ) | 249 | void ScQtFileDlg::slotTypeComboBoxChanged( int ) |
253 | { | 250 | { |
254 | qWarning( "ScQtFileDlg::slotTypeComboBoxChanged( int ): Not implemented yet!" ); | 251 | owarn << "ScQtFileDlg::slotTypeComboBoxChanged( int ): Not implemented yet!" << oendl; |
255 | } | 252 | } |
256 | 253 | ||
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp index 3df55eb..bf8f7f4 100644 --- a/noncore/apps/zsafe/zsafe.cpp +++ b/noncore/apps/zsafe/zsafe.cpp | |||
@@ -28,19 +28,18 @@ | |||
28 | 28 | ||
29 | #ifndef DESKTOP | 29 | #ifndef DESKTOP |
30 | #ifndef NO_OPIE | 30 | #ifndef NO_OPIE |
31 | #include <opie2/ofiledialog.h> | 31 | #include <opie2/ofiledialog.h> |
32 | 32 | #include <opie2/odebug.h> | |
33 | using namespace Opie::Core; | ||
33 | using namespace Opie::Ui; | 34 | using namespace Opie::Ui; |
34 | #else | 35 | #else |
35 | #include "scqtfileedit.h" | 36 | #include "scqtfileedit.h" |
36 | #endif | 37 | #endif |
37 | #endif | 38 | #endif |
38 | 39 | ||
39 | #include <qclipboard.h> | 40 | #include <qclipboard.h> |
40 | 41 | ||
41 | #include <stdio.h> | ||
42 | |||
43 | #include <sys/types.h> | 42 | #include <sys/types.h> |
44 | #include <sys/stat.h> | 43 | #include <sys/stat.h> |
45 | #include <fcntl.h> | 44 | #include <fcntl.h> |
46 | #include <stdlib.h> | 45 | #include <stdlib.h> |
@@ -2068,9 +2067,8 @@ int ZSafe::loadInit(const char* _filename, const char *password) | |||
2068 | 2067 | ||
2069 | #ifndef WIN32 | 2068 | #ifndef WIN32 |
2070 | size = read(fileno (fd), (unsigned char *) (charbuf + count), 8); | 2069 | size = read(fileno (fd), (unsigned char *) (charbuf + count), 8); |
2071 | #else | 2070 | #else |
2072 | printf ("LoadInit() read1"); | ||
2073 | size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); | 2071 | size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); |
2074 | #endif | 2072 | #endif |
2075 | 2073 | ||
2076 | if (size < 8) | 2074 | if (size < 8) |
@@ -2088,9 +2086,8 @@ int ZSafe::loadInit(const char* _filename, const char *password) | |||
2088 | while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) { | 2086 | while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) { |
2089 | while (count < 8) { | 2087 | while (count < 8) { |
2090 | count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8); | 2088 | count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8); |
2091 | #else | 2089 | #else |
2092 | printf ("LoadInit() read2"); | ||
2093 | while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) { | 2090 | while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) { |
2094 | while (count < 8) { | 2091 | while (count < 8) { |
2095 | count2 = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); | 2092 | count2 = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); |
2096 | #endif | 2093 | #endif |
@@ -2258,9 +2255,9 @@ bool ZSafe::saveDocument(const char* _filename, | |||
2258 | 2255 | ||
2259 | retval = saveEntry(entry); | 2256 | retval = saveEntry(entry); |
2260 | for (int z=0; z<i; z++) free(entry[z]); | 2257 | for (int z=0; z<i; z++) free(entry[z]); |
2261 | if (retval == PWERR_DATA) { | 2258 | if (retval == PWERR_DATA) { |
2262 | qWarning("1: Error writing file, contents not saved"); | 2259 | owarn << "1: Error writing file, contents not saved" << oendl; |
2263 | saveFinalize(); | 2260 | saveFinalize(); |
2264 | return false; | 2261 | return false; |
2265 | } | 2262 | } |
2266 | // #ifndef WIN32 | 2263 | // #ifndef WIN32 |
@@ -2302,18 +2299,18 @@ bool ZSafe::saveDocument(const char* _filename, | |||
2302 | { | 2299 | { |
2303 | free(entry[z]); | 2300 | free(entry[z]); |
2304 | } | 2301 | } |
2305 | if (retval == PWERR_DATA) { | 2302 | if (retval == PWERR_DATA) { |
2306 | qWarning("1: Error writing file, contents not saved"); | 2303 | owarn << "1: Error writing file, contents not saved" << oendl; |
2307 | saveFinalize(); | 2304 | saveFinalize(); |
2308 | return false; | 2305 | return false; |
2309 | } | 2306 | } |
2310 | 2307 | ||
2311 | } | 2308 | } |
2312 | } | 2309 | } |
2313 | 2310 | ||
2314 | if (saveFinalize() == PWERR_DATA) { | 2311 | if (saveFinalize() == PWERR_DATA) { |
2315 | qWarning("2: Error writing file, contents not saved"); | 2312 | owarn << "2: Error writing file, contents not saved" << oendl; |
2316 | return false; | 2313 | return false; |
2317 | } else { | 2314 | } else { |
2318 | #ifndef DESKTOP | 2315 | #ifndef DESKTOP |
2319 | Global::statusMessage (tr("Password file saved.")); | 2316 | Global::statusMessage (tr("Password file saved.")); |
@@ -3189,9 +3186,9 @@ void ZSafe::editCategory() | |||
3189 | icon = dialog->IconField->currentText()+".png"; | 3186 | icon = dialog->IconField->currentText()+".png"; |
3190 | 3187 | ||
3191 | if (cat) | 3188 | if (cat) |
3192 | { | 3189 | { |
3193 | qWarning("Category found"); | 3190 | owarn << "Category found" << oendl; |
3194 | 3191 | ||
3195 | // if (!icon.isEmpty() && !icon.isNull()) | 3192 | // if (!icon.isEmpty() && !icon.isNull()) |
3196 | if (icon != "predefined.png") | 3193 | if (icon != "predefined.png") |
3197 | { | 3194 | { |
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro index 72c8fe9..3cae706 100644 --- a/noncore/apps/zsafe/zsafe.pro +++ b/noncore/apps/zsafe/zsafe.pro | |||
@@ -1,17 +1,17 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h \ | 4 | HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h \ |
5 | scqtfiledlg.h | 5 | scqtfiledlg.h |
6 | SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \ | 6 | SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \ |
7 | categorylist.cpp zlistview.cpp shadedlistitem.cpp\ | 7 | categorylist.cpp zlistview.cpp shadedlistitem.cpp\ |
8 | scqtfileedit.cpp scqtfileedit.moc.cpp \ | 8 | scqtfileedit.cpp scqtfileedit.moc.cpp \ |
9 | scqtfiledlg.cpp | 9 | scqtfiledlg.cpp |
10 | INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui | 10 | INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui |
11 | INCLUDEPATH += $(OPIEDIR)/include | 11 | INCLUDEPATH += $(OPIEDIR)/include |
12 | DEPENDPATH += $(OPIEDIR)/include | 12 | DEPENDPATH += $(OPIEDIR)/include |
13 | LIBS += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopiecore2 -lopieui2 | 13 | LIBS += -lqpe -lopiecore2 -lopieui2 |
14 | TARGET = zsafe | 14 | TARGET = zsafe |
15 | 15 | ||
16 | include ( $(OPIEDIR)/include.pro ) | 16 | include ( $(OPIEDIR)/include.pro ) |
17 | 17 | ||
diff --git a/noncore/comm/keypebble/config.in b/noncore/comm/keypebble/config.in index 20384aa..8a800b9 100644 --- a/noncore/comm/keypebble/config.in +++ b/noncore/comm/keypebble/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config KEYPEBBLE | 1 | config KEYPEBBLE |
2 | boolean "opie-keypebble (Virtual Network Computing VNC viewer)" | 2 | boolean "opie-keypebble (Virtual Network Computing VNC viewer)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro index 3515016..7631e4e 100644 --- a/noncore/comm/keypebble/keypebble.pro +++ b/noncore/comm/keypebble/keypebble.pro | |||
@@ -1,5 +1,5 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = d3des.h \ | 2 | HEADERS = d3des.h \ |
3 | krfbbuffer.h \ | 3 | krfbbuffer.h \ |
4 | krfbcanvas.h \ | 4 | krfbcanvas.h \ |
5 | krfbconnection.h \ | 5 | krfbconnection.h \ |
@@ -22,14 +22,13 @@ SOURCES = d3des.c \ | |||
22 | kvnc.cpp \ | 22 | kvnc.cpp \ |
23 | kvncconndlg.cpp \ | 23 | kvncconndlg.cpp \ |
24 | kvncbookmarkdlg.cpp \ | 24 | kvncbookmarkdlg.cpp \ |
25 | main.cpp | 25 | main.cpp |
26 | INTERFACES= kvncconndlgbase.ui \ | 26 | INTERFACES= kvncconndlgbase.ui kvncbookmarkdlgbase.ui |
27 | kvncbookmarkdlgbase.ui | ||
28 | 27 | ||
29 | INCLUDEPATH += $(OPIEDIR)/include | 28 | INCLUDEPATH += $(OPIEDIR)/include |
30 | DEPENDPATH += $(OPIEDIR)/include | 29 | DEPENDPATH += $(OPIEDIR)/include |
31 | LIBS += -lqpe | 30 | LIBS += -lqpe -lopiecore2 |
32 | 31 | ||
33 | TARGET = keypebble | 32 | TARGET = keypebble |
34 | 33 | ||
35 | include ( $(OPIEDIR)/include.pro ) | 34 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/comm/keypebble/krfbbuffer.cpp b/noncore/comm/keypebble/krfbbuffer.cpp index 4cec0c2..4b29612 100644 --- a/noncore/comm/keypebble/krfbbuffer.cpp +++ b/noncore/comm/keypebble/krfbbuffer.cpp | |||
@@ -1,17 +1,25 @@ | |||
1 | #include <assert.h> | ||
2 | #include <qimage.h> | ||
3 | #include <qpainter.h> | ||
4 | #include <qapplication.h> | ||
5 | #include "krfbdecoder.h" | 1 | #include "krfbdecoder.h" |
6 | #include "krfbbuffer.h" | 2 | #include "krfbbuffer.h" |
7 | #include "krfbconnection.h" | 3 | #include "krfbconnection.h" |
8 | #include "krfbserverinfo.h" | 4 | #include "krfbserverinfo.h" |
9 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
10 | /* QT */ | ||
11 | #include <qimage.h> | ||
12 | #include <qpainter.h> | ||
13 | #include <qapplication.h> | ||
14 | |||
15 | /* STD */ | ||
16 | #include <assert.h> | ||
17 | |||
10 | // | 18 | // |
11 | // Endian stuff | 19 | // Endian stuff |
12 | // | 20 | // |
13 | #ifndef KDE_USE_FINAL | 21 | #ifndef OPIE_NO_DEBUG |
14 | const int endianTest = 1; | 22 | const int endianTest = 1; |
15 | #endif | 23 | #endif |
16 | 24 | ||
17 | #define Swap16IfLE(s) \ | 25 | #define Swap16IfLE(s) \ |
@@ -38,9 +46,9 @@ KRFBBuffer::~KRFBBuffer() | |||
38 | } | 46 | } |
39 | 47 | ||
40 | void KRFBBuffer::resize( int w, int h ) | 48 | void KRFBBuffer::resize( int w, int h ) |
41 | { | 49 | { |
42 | qWarning( "Resizing buffer" ); | 50 | owarn << "Resizing buffer" << oendl; |
43 | 51 | ||
44 | pix->resize( w, h ); | 52 | pix->resize( w, h ); |
45 | 53 | ||
46 | QPalette pal = qApp->palette(); | 54 | QPalette pal = qApp->palette(); |
@@ -60,9 +68,9 @@ void KRFBBuffer::mouseEvent( QMouseEvent *e ) | |||
60 | } | 68 | } |
61 | 69 | ||
62 | void KRFBBuffer::keyPressEvent( QKeyEvent *e ) | 70 | void KRFBBuffer::keyPressEvent( QKeyEvent *e ) |
63 | { | 71 | { |
64 | qWarning( "Buffer got a key" ); | 72 | owarn << "Buffer got a key" << oendl; |
65 | 73 | ||
66 | decoder->sendKeyPressEvent( e ); | 74 | decoder->sendKeyPressEvent( e ); |
67 | } | 75 | } |
68 | 76 | ||
@@ -73,9 +81,9 @@ void KRFBBuffer::keyReleaseEvent( QKeyEvent *e ) | |||
73 | 81 | ||
74 | void KRFBBuffer::copyRect( int srcX, int srcY, | 82 | void KRFBBuffer::copyRect( int srcX, int srcY, |
75 | int destX, int destY, int w, int h ) | 83 | int destX, int destY, int w, int h ) |
76 | { | 84 | { |
77 | // qWarning( "Got copy rect" ); | 85 | // owarn << "Got copy rect" << oendl; |
78 | bitBlt( pix, destX, destY, pix, srcX, srcY, w, h, CopyROP ); | 86 | bitBlt( pix, destX, destY, pix, srcX, srcY, w, h, CopyROP ); |
79 | 87 | ||
80 | emit updated( destX, destY, w, h ); | 88 | emit updated( destX, destY, w, h ); |
81 | } | 89 | } |
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp index cd1fda0..b3525df 100644 --- a/noncore/comm/keypebble/krfbcanvas.cpp +++ b/noncore/comm/keypebble/krfbcanvas.cpp | |||
@@ -1,10 +1,14 @@ | |||
1 | #include "krfbconnection.h" | 1 | #include "krfbconnection.h" |
2 | #include "krfbcanvas.h" | 2 | #include "krfbcanvas.h" |
3 | #include "krfbbuffer.h" | 3 | #include "krfbbuffer.h" |
4 | 4 | ||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
5 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
8 | using namespace Opie::Core; | ||
6 | 9 | ||
10 | /* QT */ | ||
7 | #include <qclipboard.h> | 11 | #include <qclipboard.h> |
8 | 12 | ||
9 | KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name ) | 13 | KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name ) |
10 | : QScrollView( parent, name ) | 14 | : QScrollView( parent, name ) |
@@ -41,9 +45,9 @@ void KRFBCanvas::openConnection(KRFBServer server) | |||
41 | 45 | ||
42 | void KRFBCanvas::openURL( const QUrl &url ) | 46 | void KRFBCanvas::openURL( const QUrl &url ) |
43 | { | 47 | { |
44 | if ( loggedIn_ ) { | 48 | if ( loggedIn_ ) { |
45 | qWarning( "openURL invoked when logged in\n" ); | 49 | owarn << "openURL invoked when logged in\n" << oendl; |
46 | return; | 50 | return; |
47 | } | 51 | } |
48 | 52 | ||
49 | QCString host = url.host().latin1(); | 53 | QCString host = url.host().latin1(); |
@@ -73,9 +77,9 @@ void KRFBCanvas::bell() | |||
73 | } | 77 | } |
74 | 78 | ||
75 | void KRFBCanvas::loggedIn() | 79 | void KRFBCanvas::loggedIn() |
76 | { | 80 | { |
77 | qWarning( "Ok, we're logged in" ); | 81 | owarn << "Ok, we're logged in" << oendl; |
78 | 82 | ||
79 | // | 83 | // |
80 | // Get ready for action | 84 | // Get ready for action |
81 | // | 85 | // |
diff --git a/noncore/comm/keypebble/krfbconnection.cpp b/noncore/comm/keypebble/krfbconnection.cpp index b447046..33e0563 100644 --- a/noncore/comm/keypebble/krfbconnection.cpp +++ b/noncore/comm/keypebble/krfbconnection.cpp | |||
@@ -1,14 +1,21 @@ | |||
1 | #include <assert.h> | ||
2 | #include <qsocket.h> | ||
3 | #include <qtimer.h> | ||
4 | #include <string.h> | ||
5 | |||
6 | #include "krfbconnection.h" | 1 | #include "krfbconnection.h" |
7 | #include "krfblogin.h" | 2 | #include "krfblogin.h" |
8 | #include "krfbdecoder.h" | 3 | #include "krfbdecoder.h" |
9 | #include "krfbbuffer.h" | 4 | #include "krfbbuffer.h" |
10 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
10 | /* QT */ | ||
11 | #include <qsocket.h> | ||
12 | #include <qtimer.h> | ||
13 | |||
14 | /* STD */ | ||
15 | #include <assert.h> | ||
16 | #include <string.h> | ||
17 | |||
11 | KRFBConnection::KRFBConnection( QObject *parent ) | 18 | KRFBConnection::KRFBConnection( QObject *parent ) |
12 | : QObject( parent, "KRFBConnection" ) | 19 | : QObject( parent, "KRFBConnection" ) |
13 | { | 20 | { |
14 | portBase_ = 5900; | 21 | portBase_ = 5900; |
@@ -42,17 +49,17 @@ void KRFBConnection::connectTo( KRFBServer server) | |||
42 | // Connect to something to notice connection or error | 49 | // Connect to something to notice connection or error |
43 | connect( sock, SIGNAL( error(int) ), SLOT( gotSocketError(int) ) ); | 50 | connect( sock, SIGNAL( error(int) ), SLOT( gotSocketError(int) ) ); |
44 | connect( sock, SIGNAL( connected() ), SLOT( gotSocketConnection() ) ); | 51 | connect( sock, SIGNAL( connected() ), SLOT( gotSocketConnection() ) ); |
45 | 52 | ||
46 | qWarning( "Connecting..." ); | 53 | owarn << "Connecting..." << oendl; |
47 | 54 | ||
48 | currentState_ = Connecting; | 55 | currentState_ = Connecting; |
49 | sock->connectToHost( options_->hostname.latin1(), portBase_ + options_->display ); | 56 | sock->connectToHost( options_->hostname.latin1(), portBase_ + options_->display ); |
50 | } | 57 | } |
51 | 58 | ||
52 | void KRFBConnection::disconnect() | 59 | void KRFBConnection::disconnect() |
53 | { | 60 | { |
54 | qWarning( "Disconnecting from server" ); | 61 | owarn << "Disconnecting from server" << oendl; |
55 | 62 | ||
56 | if ( ( currentState_ != Disconnected ) | 63 | if ( ( currentState_ != Disconnected ) |
57 | && ( currentState_ != Disconnecting ) | 64 | && ( currentState_ != Disconnecting ) |
58 | && sock ) { | 65 | && sock ) { |
@@ -81,9 +88,9 @@ void KRFBConnection::disconnectDone() | |||
81 | void KRFBConnection::gotSocketConnection() | 88 | void KRFBConnection::gotSocketConnection() |
82 | { | 89 | { |
83 | currentState_ = LoggingIn; | 90 | currentState_ = LoggingIn; |
84 | 91 | ||
85 | qWarning( "Connected, logging in..." ); | 92 | owarn << "Connected, logging in..." << oendl; |
86 | 93 | ||
87 | static QString statusMsg = tr( "Connected" ); | 94 | static QString statusMsg = tr( "Connected" ); |
88 | emit statusChanged( statusMsg ); | 95 | emit statusChanged( statusMsg ); |
89 | 96 | ||
@@ -92,9 +99,9 @@ void KRFBConnection::gotSocketConnection() | |||
92 | } | 99 | } |
93 | 100 | ||
94 | void KRFBConnection::gotRFBConnection() | 101 | void KRFBConnection::gotRFBConnection() |
95 | { | 102 | { |
96 | qWarning( "Logged into server" ); | 103 | owarn << "Logged into server" << oendl; |
97 | 104 | ||
98 | currentState_ = Connected; | 105 | currentState_ = Connected; |
99 | emit connected(); | 106 | emit connected(); |
100 | 107 | ||
@@ -121,9 +128,9 @@ void KRFBConnection::gotSocketError( int err ) | |||
121 | { | 128 | { |
122 | currentState_ = Error; | 129 | currentState_ = Error; |
123 | 130 | ||
124 | // Do some error handling stuff | 131 | // Do some error handling stuff |
125 | qWarning( "KRFBConnection: Socket error %d", err ); | 132 | owarn << "KRFBConnection: Socket error " << err << "" << oendl; |
126 | 133 | ||
127 | static QString refused = tr( "Connection Refused" ); | 134 | static QString refused = tr( "Connection Refused" ); |
128 | static QString host = tr( "Host not found" ); | 135 | static QString host = tr( "Host not found" ); |
129 | static QString read = tr( "Read Error: QSocket reported an error reading\n" | 136 | static QString read = tr( "Read Error: QSocket reported an error reading\n" |
@@ -171,13 +178,13 @@ void KRFBConnection::waitForData( unsigned int sz ) | |||
171 | assert( sz > 0 ); | 178 | assert( sz > 0 ); |
172 | assert( currentState_ != Error ); | 179 | assert( currentState_ != Error ); |
173 | 180 | ||
174 | if ( sock->size() >= sz ) { | 181 | if ( sock->size() >= sz ) { |
175 | // qWarning( "No need to wait for data" ); | 182 | // owarn << "No need to wait for data" << oendl; |
176 | emit gotEnoughData(); | 183 | emit gotEnoughData(); |
177 | } | 184 | } |
178 | else { | 185 | else { |
179 | // qWarning( "Waiting for %u bytes", sz ); | 186 | // owarn << "Waiting for " << sz << " bytes" << oendl; |
180 | minData_ = sz; | 187 | minData_ = sz; |
181 | connect( sock, SIGNAL( readyRead() ), SLOT( gotMoreData() ) ); | 188 | connect( sock, SIGNAL( readyRead() ), SLOT( gotMoreData() ) ); |
182 | } | 189 | } |
183 | } | 190 | } |
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp index db95154..69457e2 100644 --- a/noncore/comm/keypebble/krfbdecoder.cpp +++ b/noncore/comm/keypebble/krfbdecoder.cpp | |||
@@ -2,17 +2,22 @@ | |||
2 | #include "krfbserverinfo.h" | 2 | #include "krfbserverinfo.h" |
3 | #include "krfbdecoder.h" | 3 | #include "krfbdecoder.h" |
4 | #include "krfbbuffer.h" | 4 | #include "krfbbuffer.h" |
5 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
6 | 9 | ||
10 | /* QT */ | ||
7 | #include <qpixmap.h> | 11 | #include <qpixmap.h> |
8 | 12 | ||
13 | /* STD */ | ||
9 | #include <assert.h> | 14 | #include <assert.h> |
10 | 15 | ||
11 | // | 16 | // |
12 | // Endian stuff | 17 | // Endian stuff |
13 | // | 18 | // |
14 | #ifndef KDE_USE_FINAL | 19 | #ifndef OPIE_NO_DEBUG |
15 | const int endianTest = 1; | 20 | const int endianTest = 1; |
16 | #endif | 21 | #endif |
17 | 22 | ||
18 | #define Swap16IfLE(s) \ | 23 | #define Swap16IfLE(s) \ |
@@ -134,9 +139,9 @@ void KRFBDecoder::sendClientInit() | |||
134 | { | 139 | { |
135 | con->write( &( con->options()->shared ), 1 ); | 140 | con->write( &( con->options()->shared ), 1 ); |
136 | 141 | ||
137 | // Wait for server init | 142 | // Wait for server init |
138 | qWarning( "Waiting for server init" ); | 143 | owarn << "Waiting for server init" << oendl; |
139 | 144 | ||
140 | static QString statusMsg = tr( "Waiting for server initialization..." ); | 145 | static QString statusMsg = tr( "Waiting for server initialization..." ); |
141 | emit status( statusMsg ); | 146 | emit status( statusMsg ); |
142 | 147 | ||
@@ -146,9 +151,9 @@ void KRFBDecoder::sendClientInit() | |||
146 | } | 151 | } |
147 | 152 | ||
148 | void KRFBDecoder::gotServerInit() | 153 | void KRFBDecoder::gotServerInit() |
149 | { | 154 | { |
150 | qWarning( "Got server init" ); | 155 | owarn << "Got server init" << oendl; |
151 | disconnect( con, SIGNAL( gotEnoughData() ), this, SLOT( gotServerInit() ) ); | 156 | disconnect( con, SIGNAL( gotEnoughData() ), this, SLOT( gotServerInit() ) ); |
152 | 157 | ||
153 | if ( info ) | 158 | if ( info ) |
154 | delete info; | 159 | delete info; |
@@ -180,9 +185,9 @@ void KRFBDecoder::gotServerInit() | |||
180 | 185 | ||
181 | con->read( &(info->nameLength), 4 ); | 186 | con->read( &(info->nameLength), 4 ); |
182 | info->nameLength = Swap32IfLE( info->nameLength ); | 187 | info->nameLength = Swap32IfLE( info->nameLength ); |
183 | 188 | ||
184 | qWarning( "Width = %d, Height = %d", info->width, info->height ); | 189 | owarn << "Width = " << info->width << ", Height = " << info->height << "" << oendl; |
185 | qWarning( "Bpp = %d, Depth = %d, Big = %d, True = %d", | 190 | qWarning( "Bpp = %d, Depth = %d, Big = %d, True = %d", |
186 | info->bpp, info->depth, info->bigEndian, info->trueColor ); | 191 | info->bpp, info->depth, info->bigEndian, info->trueColor ); |
187 | qWarning( "RedMax = %d, GreenMax = %d, BlueMax = %d", | 192 | qWarning( "RedMax = %d, GreenMax = %d, BlueMax = %d", |
188 | info->redMax, info->greenMax, info->blueMax ); | 193 | info->redMax, info->greenMax, info->blueMax ); |
@@ -191,9 +196,9 @@ void KRFBDecoder::gotServerInit() | |||
191 | 196 | ||
192 | buf->resize( info->width/con->options()->scaleFactor, info->height /con->options()->scaleFactor); | 197 | buf->resize( info->width/con->options()->scaleFactor, info->height /con->options()->scaleFactor); |
193 | 198 | ||
194 | // Wait for desktop name | 199 | // Wait for desktop name |
195 | qWarning( "Waiting for desktop name" ); | 200 | owarn << "Waiting for desktop name" << oendl; |
196 | 201 | ||
197 | static QString statusMsg = tr( "Waiting for desktop name..." ); | 202 | static QString statusMsg = tr( "Waiting for desktop name..." ); |
198 | emit status( statusMsg ); | 203 | emit status( statusMsg ); |
199 | 204 | ||
@@ -206,9 +211,9 @@ void KRFBDecoder::gotDesktopName() | |||
206 | { | 211 | { |
207 | assert( info ); | 212 | assert( info ); |
208 | assert( currentState == AwaitingDesktopName ); | 213 | assert( currentState == AwaitingDesktopName ); |
209 | 214 | ||
210 | qWarning( "Got desktop name" ); | 215 | owarn << "Got desktop name" << oendl; |
211 | 216 | ||
212 | disconnect( con, SIGNAL( gotEnoughData() ), | 217 | disconnect( con, SIGNAL( gotEnoughData() ), |
213 | this, SLOT( gotDesktopName() ) ); | 218 | this, SLOT( gotDesktopName() ) ); |
214 | 219 | ||
@@ -218,9 +223,9 @@ void KRFBDecoder::gotDesktopName() | |||
218 | con->read( buf, info->nameLength ); | 223 | con->read( buf, info->nameLength ); |
219 | buf[ info->nameLength ] = '\0'; | 224 | buf[ info->nameLength ] = '\0'; |
220 | info->name = buf; | 225 | info->name = buf; |
221 | 226 | ||
222 | qWarning( "Desktop: %s", info->name.latin1() ); | 227 | owarn << "Desktop: " << info->name.latin1() << "" << oendl; |
223 | 228 | ||
224 | delete buf; | 229 | delete buf; |
225 | 230 | ||
226 | // Get the format we'll really use and tell the server | 231 | // Get the format we'll really use and tell the server |
@@ -370,9 +375,9 @@ void KRFBDecoder::sendUpdateRequest( bool incremental ) | |||
370 | void KRFBDecoder::gotUpdateHeader() | 375 | void KRFBDecoder::gotUpdateHeader() |
371 | { | 376 | { |
372 | assert( currentState == AwaitingUpdate ); | 377 | assert( currentState == AwaitingUpdate ); |
373 | 378 | ||
374 | // qWarning( "Got update header" ); | 379 | // owarn << "Got update header" << oendl; |
375 | 380 | ||
376 | disconnect( con, SIGNAL( gotEnoughData() ), | 381 | disconnect( con, SIGNAL( gotEnoughData() ), |
377 | this, SLOT( gotUpdateHeader() ) ); | 382 | this, SLOT( gotUpdateHeader() ) ); |
378 | 383 | ||
@@ -405,9 +410,9 @@ void KRFBDecoder::gotUpdateHeader() | |||
405 | 410 | ||
406 | con->read( &noRects, 2 ); | 411 | con->read( &noRects, 2 ); |
407 | noRects = Swap16IfLE( noRects ); | 412 | noRects = Swap16IfLE( noRects ); |
408 | 413 | ||
409 | // qWarning( "Expecting %d rects", noRects ); | 414 | // owarn << "Expecting " << noRects << " rects" << oendl; |
410 | 415 | ||
411 | // Now wait for the data | 416 | // Now wait for the data |
412 | currentState = AwaitingRectHeader; | 417 | currentState = AwaitingRectHeader; |
413 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); | 418 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); |
@@ -417,9 +422,9 @@ void KRFBDecoder::gotUpdateHeader() | |||
417 | void KRFBDecoder::gotRectHeader() | 422 | void KRFBDecoder::gotRectHeader() |
418 | { | 423 | { |
419 | assert( currentState == AwaitingRectHeader ); | 424 | assert( currentState == AwaitingRectHeader ); |
420 | 425 | ||
421 | // qWarning( "Got rect header" ); | 426 | // owarn << "Got rect header" << oendl; |
422 | 427 | ||
423 | disconnect( con, SIGNAL( gotEnoughData() ), | 428 | disconnect( con, SIGNAL( gotEnoughData() ), |
424 | this, SLOT( gotRectHeader() ) ); | 429 | this, SLOT( gotRectHeader() ) ); |
425 | 430 | ||
@@ -445,33 +450,33 @@ void KRFBDecoder::gotRectHeader() | |||
445 | // Our constants have already been byte swapped, so we use | 450 | // Our constants have already been byte swapped, so we use |
446 | // the remote value as is. | 451 | // the remote value as is. |
447 | // | 452 | // |
448 | if ( encoding == RawEncoding ) { | 453 | if ( encoding == RawEncoding ) { |
449 | // qWarning( "Raw encoding" ); | 454 | // owarn << "Raw encoding" << oendl; |
450 | handleRawRect(); | 455 | handleRawRect(); |
451 | } | 456 | } |
452 | else if ( encoding == CopyRectEncoding ) { | 457 | else if ( encoding == CopyRectEncoding ) { |
453 | // qWarning( "CopyRect encoding" ); | 458 | // owarn << "CopyRect encoding" << oendl; |
454 | handleCopyRect(); | 459 | handleCopyRect(); |
455 | } | 460 | } |
456 | else if ( encoding == RreEncoding ) { | 461 | else if ( encoding == RreEncoding ) { |
457 | qWarning( "RRE encoding" ); | 462 | owarn << "RRE encoding" << oendl; |
458 | handleRRERect(); | 463 | handleRRERect(); |
459 | } | 464 | } |
460 | else if ( encoding == CorreEncoding ) { | 465 | else if ( encoding == CorreEncoding ) { |
461 | qWarning( "CoRRE encoding" ); | 466 | owarn << "CoRRE encoding" << oendl; |
462 | handleCoRRERect(); | 467 | handleCoRRERect(); |
463 | } | 468 | } |
464 | else if ( encoding == HexTileEncoding ) { | 469 | else if ( encoding == HexTileEncoding ) { |
465 | qWarning( "HexTile encoding" ); | 470 | owarn << "HexTile encoding" << oendl; |
466 | handleHexTileRect(); | 471 | handleHexTileRect(); |
467 | } | 472 | } |
468 | else { | 473 | else { |
469 | int msg = Swap32IfLE( encoding ); | 474 | int msg = Swap32IfLE( encoding ); |
470 | QString protocolError = tr( "Protocol Error: An unknown encoding was " | 475 | QString protocolError = tr( "Protocol Error: An unknown encoding was " |
471 | "used by the server %1" ).arg( msg ); | 476 | "used by the server %1" ).arg( msg ); |
472 | currentState = Error; | 477 | currentState = Error; |
473 | qWarning( "Unknown encoding, %d", msg ); | 478 | owarn << "Unknown encoding, " << msg << "" << oendl; |
474 | emit error( protocolError ); | 479 | emit error( protocolError ); |
475 | return; | 480 | return; |
476 | } | 481 | } |
477 | } | 482 | } |
@@ -485,9 +490,9 @@ void KRFBDecoder::handleRawRect() | |||
485 | // We need something a bit cleverer here to handle large | 490 | // We need something a bit cleverer here to handle large |
486 | // rectanges nicely. The chunking should be based on the | 491 | // rectanges nicely. The chunking should be based on the |
487 | // overall size (but has to be in complete lines). | 492 | // overall size (but has to be in complete lines). |
488 | 493 | ||
489 | // qWarning( "Handling a raw rect chunk" ); | 494 | // owarn << "Handling a raw rect chunk" << oendl; |
490 | 495 | ||
491 | // CARD32 lineCount = w * format->bpp / 8; | 496 | // CARD32 lineCount = w * format->bpp / 8; |
492 | 497 | ||
493 | if ( h > RectChunkSize ) { | 498 | if ( h > RectChunkSize ) { |
@@ -508,9 +513,9 @@ void KRFBDecoder::getRawRectChunk( int lines ) | |||
508 | this->lines = lines; | 513 | this->lines = lines; |
509 | CARD32 count = lines * w * format->bpp / 8; | 514 | CARD32 count = lines * w * format->bpp / 8; |
510 | 515 | ||
511 | // Wait for server init | 516 | // Wait for server init |
512 | // qWarning( "Waiting for raw rect chunk, %ld", count ); | 517 | // owarn << "Waiting for raw rect chunk, " << count << "" << oendl; |
513 | 518 | ||
514 | currentState = AwaitingRawRectChunk; | 519 | currentState = AwaitingRawRectChunk; |
515 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRawRectChunk() ) ); | 520 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRawRectChunk() ) ); |
516 | con->waitForData( count ); | 521 | con->waitForData( count ); |
@@ -522,9 +527,9 @@ void KRFBDecoder::gotRawRectChunk() | |||
522 | 527 | ||
523 | disconnect( con, SIGNAL( gotEnoughData() ), | 528 | disconnect( con, SIGNAL( gotEnoughData() ), |
524 | this, SLOT( gotRawRectChunk() ) ); | 529 | this, SLOT( gotRawRectChunk() ) ); |
525 | 530 | ||
526 | // qWarning( "Got raw rect chunk" ); | 531 | // owarn << "Got raw rect chunk" << oendl; |
527 | 532 | ||
528 | // | 533 | // |
529 | // Read the rect data and copy it to the buffer. | 534 | // Read the rect data and copy it to the buffer. |
530 | // | 535 | // |
@@ -545,9 +550,9 @@ void KRFBDecoder::gotRawRectChunk() | |||
545 | } | 550 | } |
546 | else { | 551 | else { |
547 | noRects--; | 552 | noRects--; |
548 | 553 | ||
549 | // qWarning( "There are %d rects left", noRects ); | 554 | // owarn << "There are " << noRects << " rects left" << oendl; |
550 | 555 | ||
551 | if ( noRects ) { | 556 | if ( noRects ) { |
552 | currentState = AwaitingRectHeader; | 557 | currentState = AwaitingRectHeader; |
553 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); | 558 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); |
@@ -589,9 +594,9 @@ void KRFBDecoder::gotCopyRectPos() | |||
589 | buf->copyRect( srcX, srcY, x, y, w, h ); | 594 | buf->copyRect( srcX, srcY, x, y, w, h ); |
590 | 595 | ||
591 | noRects--; | 596 | noRects--; |
592 | 597 | ||
593 | // qWarning( "There are %d rects left", noRects ); | 598 | // owarn << "There are " << noRects << " rects left" << oendl; |
594 | 599 | ||
595 | if ( noRects ) { | 600 | if ( noRects ) { |
596 | currentState = AwaitingRectHeader; | 601 | currentState = AwaitingRectHeader; |
597 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); | 602 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); |
@@ -602,19 +607,19 @@ void KRFBDecoder::gotCopyRectPos() | |||
602 | } | 607 | } |
603 | 608 | ||
604 | void KRFBDecoder::handleRRERect() | 609 | void KRFBDecoder::handleRRERect() |
605 | { | 610 | { |
606 | qWarning( "RRE not implemented" ); | 611 | owarn << "RRE not implemented" << oendl; |
607 | } | 612 | } |
608 | 613 | ||
609 | void KRFBDecoder::handleCoRRERect() | 614 | void KRFBDecoder::handleCoRRERect() |
610 | { | 615 | { |
611 | qWarning( "CoRRE not implemented" ); | 616 | owarn << "CoRRE not implemented" << oendl; |
612 | } | 617 | } |
613 | 618 | ||
614 | void KRFBDecoder::handleHexTileRect() | 619 | void KRFBDecoder::handleHexTileRect() |
615 | { | 620 | { |
616 | qWarning( "HexTile not implemented" ); | 621 | owarn << "HexTile not implemented" << oendl; |
617 | } | 622 | } |
618 | 623 | ||
619 | void KRFBDecoder::sendMouseEvent( QMouseEvent *e ) | 624 | void KRFBDecoder::sendMouseEvent( QMouseEvent *e ) |
620 | { | 625 | { |
@@ -672,9 +677,9 @@ void KRFBDecoder::sendCutEvent( const QString &unicode ) | |||
672 | } | 677 | } |
673 | 678 | ||
674 | void KRFBDecoder::gotServerCut() | 679 | void KRFBDecoder::gotServerCut() |
675 | { | 680 | { |
676 | qWarning( "Got server cut" ); | 681 | owarn << "Got server cut" << oendl; |
677 | 682 | ||
678 | currentState = AwaitingServerCutLength; | 683 | currentState = AwaitingServerCutLength; |
679 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutLength() ) ); | 684 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutLength() ) ); |
680 | con->waitForData( ServerCutLenLength ); | 685 | con->waitForData( ServerCutLenLength ); |
@@ -720,9 +725,9 @@ void KRFBDecoder::gotServerCutText() | |||
720 | cutbuf[ serverCutTextLen ] = '\0'; | 725 | cutbuf[ serverCutTextLen ] = '\0'; |
721 | 726 | ||
722 | /* For some reason QApplication::clipboard()->setText() segfaults when called | 727 | /* For some reason QApplication::clipboard()->setText() segfaults when called |
723 | * from within keypebble's mass of signals and slots | 728 | * from within keypebble's mass of signals and slots |
724 | qWarning( "Server cut: %s", cutbuf ); | 729 | owarn << "Server cut: " << cutbuf << "" << oendl; |
725 | 730 | ||
726 | QString cutText( cutbuf ); // DANGER!! | 731 | QString cutText( cutbuf ); // DANGER!! |
727 | qApp->clipboard()->setText( cutText ); | 732 | qApp->clipboard()->setText( cutText ); |
728 | */ | 733 | */ |
@@ -737,16 +742,16 @@ void KRFBDecoder::gotServerCutText() | |||
737 | else if ( oldState == Idle ) { | 742 | else if ( oldState == Idle ) { |
738 | currentState = Idle; | 743 | currentState = Idle; |
739 | } | 744 | } |
740 | else { | 745 | else { |
741 | qWarning( "Async handled in weird state" ); | 746 | owarn << "Async handled in weird state" << oendl; |
742 | currentState = oldState; | 747 | currentState = oldState; |
743 | }; | 748 | }; |
744 | } | 749 | } |
745 | 750 | ||
746 | void KRFBDecoder::gotBell() | 751 | void KRFBDecoder::gotBell() |
747 | { | 752 | { |
748 | qWarning( "Got server bell" ); | 753 | owarn << "Got server bell" << oendl; |
749 | buf->soundBell(); | 754 | buf->soundBell(); |
750 | 755 | ||
751 | // Now wait for the update (again) | 756 | // Now wait for the update (again) |
752 | if ( oldState == AwaitingUpdate ) { | 757 | if ( oldState == AwaitingUpdate ) { |
@@ -757,9 +762,9 @@ void KRFBDecoder::gotBell() | |||
757 | else if ( oldState == Idle ) { | 762 | else if ( oldState == Idle ) { |
758 | currentState = Idle; | 763 | currentState = Idle; |
759 | } | 764 | } |
760 | else { | 765 | else { |
761 | qWarning( "Async handled in weird state" ); | 766 | owarn << "Async handled in weird state" << oendl; |
762 | currentState = oldState; | 767 | currentState = oldState; |
763 | }; | 768 | }; |
764 | } | 769 | } |
765 | 770 | ||
diff --git a/noncore/comm/keypebble/krfblogin.cpp b/noncore/comm/keypebble/krfblogin.cpp index 2bbd110..92005d2 100644 --- a/noncore/comm/keypebble/krfblogin.cpp +++ b/noncore/comm/keypebble/krfblogin.cpp | |||
@@ -1,15 +1,20 @@ | |||
1 | #include <assert.h> | 1 | #include "krfblogin.h" |
2 | #include "krfbconnection.h" | ||
2 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | ||
7 | |||
8 | /* QT */ | ||
9 | #include <qtimer.h> | ||
3 | 10 | ||
11 | /* STD */ | ||
12 | #include <assert.h> | ||
4 | extern "C" { | 13 | extern "C" { |
5 | #include "vncauth.h" | 14 | #include "vncauth.h" |
6 | } | 15 | } |
7 | 16 | ||
8 | #include "krfblogin.h" | ||
9 | #include "krfbconnection.h" | ||
10 | #include <qtimer.h> | ||
11 | |||
12 | // The length of the various messages (used to decide how many bytes to | 17 | // The length of the various messages (used to decide how many bytes to |
13 | // wait for). | 18 | // wait for). |
14 | const int ServerVersionLength = 12; | 19 | const int ServerVersionLength = 12; |
15 | const int ClientVersionLength = 12; | 20 | const int ClientVersionLength = 12; |
@@ -51,9 +56,9 @@ KRFBLogin::KRFBLogin( KRFBConnection *con ) | |||
51 | connect( this, SIGNAL( error(const QString&) ), | 56 | connect( this, SIGNAL( error(const QString&) ), |
52 | con, SIGNAL( error(const QString&) ) ); | 57 | con, SIGNAL( error(const QString&) ) ); |
53 | 58 | ||
54 | 59 | ||
55 | qWarning( "Waiting for server version..." ); | 60 | owarn << "Waiting for server version..." << oendl; |
56 | 61 | ||
57 | static QString statusMsg = tr( "Waiting for server version..." ); | 62 | static QString statusMsg = tr( "Waiting for server version..." ); |
58 | emit status( statusMsg ); | 63 | emit status( statusMsg ); |
59 | 64 | ||
@@ -73,9 +78,9 @@ KRFBLogin::State KRFBLogin::state() const | |||
73 | } | 78 | } |
74 | 79 | ||
75 | void KRFBLogin::gotServerVersion() | 80 | void KRFBLogin::gotServerVersion() |
76 | { | 81 | { |
77 | qWarning( "Got server version" ); | 82 | owarn << "Got server version" << oendl; |
78 | 83 | ||
79 | disconnect( con, SIGNAL( gotEnoughData() ), | 84 | disconnect( con, SIGNAL( gotEnoughData() ), |
80 | this, SLOT( gotServerVersion() ) ); | 85 | this, SLOT( gotServerVersion() ) ); |
81 | 86 | ||
@@ -91,9 +96,9 @@ void KRFBLogin::gotServerVersion() | |||
91 | 96 | ||
92 | if ( rfbString.find( regexp ) == -1 ) { | 97 | if ( rfbString.find( regexp ) == -1 ) { |
93 | static QString msg = tr( "Error: Invalid server version, %1" ).arg( rfbString ); | 98 | static QString msg = tr( "Error: Invalid server version, %1" ).arg( rfbString ); |
94 | 99 | ||
95 | qWarning( msg ); | 100 | owarn << msg << oendl; |
96 | emit error( msg ); | 101 | emit error( msg ); |
97 | currentState = Error; | 102 | currentState = Error; |
98 | return; | 103 | return; |
99 | } | 104 | } |
@@ -105,22 +110,22 @@ void KRFBLogin::gotServerVersion() | |||
105 | serverMinor = (serverVersion[8] - '0') * 100 | 110 | serverMinor = (serverVersion[8] - '0') * 100 |
106 | + (serverVersion[9] - '0') * 10 | 111 | + (serverVersion[9] - '0') * 10 |
107 | + (serverVersion[10] - '0'); | 112 | + (serverVersion[10] - '0'); |
108 | 113 | ||
109 | qWarning("Server Version: %03d.%03d", serverMajor, serverMinor ); | 114 | owarn << "Server Version: " << serverMajor << "." << serverMinor << "" << oendl; |
110 | 115 | ||
111 | if ( serverMajor != 3 ) { | 116 | if ( serverMajor != 3 ) { |
112 | QString msg = tr( "Error: Unsupported server version, %1" ) | 117 | QString msg = tr( "Error: Unsupported server version, %1" ) |
113 | .arg( rfbString ); | 118 | .arg( rfbString ); |
114 | 119 | ||
115 | qWarning( msg ); | 120 | owarn << msg << oendl; |
116 | emit error( msg ); | 121 | emit error( msg ); |
117 | currentState = Error; | 122 | currentState = Error; |
118 | return; | 123 | return; |
119 | } | 124 | } |
120 | 125 | ||
121 | if ( serverMinor != 3 ) { | 126 | if ( serverMinor != 3 ) { |
122 | qWarning( "Minor version mismatch: %d", serverMinor ); | 127 | owarn << "Minor version mismatch: " << serverMinor << "" << oendl; |
123 | } | 128 | } |
124 | 129 | ||
125 | // Setup for the next state | 130 | // Setup for the next state |
126 | sendClientVersion(); | 131 | sendClientVersion(); |
@@ -142,9 +147,9 @@ void KRFBLogin::gotAuthScheme() | |||
142 | static QString statusMsgOk = tr( "Logged in" ); | 147 | static QString statusMsgOk = tr( "Logged in" ); |
143 | 148 | ||
144 | switch ( scheme ) { | 149 | switch ( scheme ) { |
145 | case 0: | 150 | case 0: |
146 | qWarning( "Failed" ); | 151 | owarn << "Failed" << oendl; |
147 | // Handle failure | 152 | // Handle failure |
148 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotFailureReasonSize() ) ); | 153 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotFailureReasonSize() ) ); |
149 | con->waitForData( FailureReasonSizeLength ); | 154 | con->waitForData( FailureReasonSizeLength ); |
150 | break; | 155 | break; |
@@ -158,9 +163,9 @@ void KRFBLogin::gotAuthScheme() | |||
158 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotChallenge() ) ); | 163 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotChallenge() ) ); |
159 | con->waitForData( ChallengeLength ); | 164 | con->waitForData( ChallengeLength ); |
160 | break; | 165 | break; |
161 | default: | 166 | default: |
162 | qWarning( "Unknown authentication scheme, 0x%08lx", scheme ); | 167 | owarn << "Unknown authentication scheme, 0x" << scheme << "" << oendl; |
163 | currentState = Error; | 168 | currentState = Error; |
164 | break; | 169 | break; |
165 | }; | 170 | }; |
166 | } | 171 | } |
@@ -180,9 +185,9 @@ void KRFBLogin::getPassword() | |||
180 | con->read( challenge, ChallengeLength ); | 185 | con->read( challenge, ChallengeLength ); |
181 | 186 | ||
182 | // Last chance to enter a password | 187 | // Last chance to enter a password |
183 | if ( con->options_->password.isNull() ) { | 188 | if ( con->options_->password.isNull() ) { |
184 | qWarning( "krfblogin needs a password" ); | 189 | owarn << "krfblogin needs a password" << oendl; |
185 | emit passwordRequired( con ); | 190 | emit passwordRequired( con ); |
186 | } | 191 | } |
187 | 192 | ||
188 | if ( con->options_->password.isNull() ) { | 193 | if ( con->options_->password.isNull() ) { |
@@ -215,9 +220,9 @@ void KRFBLogin::gotAuthResult() | |||
215 | long result; | 220 | long result; |
216 | con->read( &result, AuthResultLength ); | 221 | con->read( &result, AuthResultLength ); |
217 | result = Swap32IfLE( result ); | 222 | result = Swap32IfLE( result ); |
218 | 223 | ||
219 | qWarning( "Authentication Result is 0x%08lx", result ); | 224 | owarn << "Authentication Result is 0x" << result << "" << oendl; |
220 | 225 | ||
221 | static QString failed = tr( "Error: The password you specified was incorrect." ); | 226 | static QString failed = tr( "Error: The password you specified was incorrect." ); |
222 | static QString tooMany = tr( "Error: Too many invalid login attempts have been made\n" | 227 | static QString tooMany = tr( "Error: Too many invalid login attempts have been made\n" |
223 | "to this account, please try later." ); | 228 | "to this account, please try later." ); |
@@ -231,23 +236,23 @@ void KRFBLogin::gotAuthResult() | |||
231 | emit status( statusMsgOk ); | 236 | emit status( statusMsgOk ); |
232 | con->gotRFBConnection(); | 237 | con->gotRFBConnection(); |
233 | break; | 238 | break; |
234 | case AuthFailed: | 239 | case AuthFailed: |
235 | qWarning( "Dammit" ); | 240 | owarn << "Dammit" << oendl; |
236 | emit status( statusMsgFailed ); | 241 | emit status( statusMsgFailed ); |
237 | emit error( failed ); | 242 | emit error( failed ); |
238 | break; | 243 | break; |
239 | case AuthTooMany: | 244 | case AuthTooMany: |
240 | emit status( statusMsgTooMany ); | 245 | emit status( statusMsgTooMany ); |
241 | emit error( tooMany ); | 246 | emit error( tooMany ); |
242 | break; | 247 | break; |
243 | default: | 248 | default: |
244 | qWarning( "Invalid authentication result, %lx", result ); | 249 | owarn << "Invalid authentication result, " << result << "" << oendl; |
245 | break; | 250 | break; |
246 | } | 251 | } |
247 | } | 252 | } |
248 | 253 | ||
249 | void KRFBLogin::sendClientVersion() | 254 | void KRFBLogin::sendClientVersion() |
250 | { | 255 | { |
251 | qWarning( "Sending client version" ); | 256 | owarn << "Sending client version" << oendl; |
252 | con->write( (void*)"RFB 003.003\n", ClientVersionLength ); | 257 | con->write( (void*)"RFB 003.003\n", ClientVersionLength ); |
253 | } | 258 | } |
diff --git a/noncore/comm/keypebble/kvncbookmarkdlg.cpp b/noncore/comm/keypebble/kvncbookmarkdlg.cpp index ef2fa12..149c398 100644 --- a/noncore/comm/keypebble/kvncbookmarkdlg.cpp +++ b/noncore/comm/keypebble/kvncbookmarkdlg.cpp | |||
@@ -1,9 +1,15 @@ | |||
1 | #include "kvncbookmarkdlg.h" | ||
2 | |||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | #include <qpe/global.h> | ||
6 | using namespace Opie::Core; | ||
7 | |||
8 | /* QT */ | ||
1 | #include <qdir.h> | 9 | #include <qdir.h> |
2 | #include <qtextstream.h> | 10 | #include <qtextstream.h> |
3 | #include <qlistbox.h> | 11 | #include <qlistbox.h> |
4 | #include <qpe/global.h> | ||
5 | #include "kvncbookmarkdlg.h" | ||
6 | 12 | ||
7 | KVNCBookmarkDlg::KVNCBookmarkDlg( QWidget * parent, const char * name, WFlags f ) | 13 | KVNCBookmarkDlg::KVNCBookmarkDlg( QWidget * parent, const char * name, WFlags f ) |
8 | 14 | ||
9 | : KVNCBookmarkDlgBase( parent, name,f) | 15 | : KVNCBookmarkDlgBase( parent, name,f) |
@@ -174,9 +180,9 @@ void KVNCBookmarkDlg::writeBookmarks(void) | |||
174 | int n = 1; | 180 | int n = 1; |
175 | KRFBServer *server; | 181 | KRFBServer *server; |
176 | 182 | ||
177 | for ( server=servers.first(); server != 0; server=servers.next() ) { | 183 | for ( server=servers.first(); server != 0; server=servers.next() ) { |
178 | qDebug(server->name); | 184 | odebug << server->name << oendl; |
179 | t << "server=" << server->name << '\n'; | 185 | t << "server=" << server->name << '\n'; |
180 | t << "\thostname=" << server->hostname << '\n'; | 186 | t << "\thostname=" << server->hostname << '\n'; |
181 | t << "\tpassword=" << encipher(server->password )<< '\n'; | 187 | t << "\tpassword=" << encipher(server->password )<< '\n'; |
182 | t << "\tdisplay=" << server->display << '\n'; | 188 | t << "\tdisplay=" << server->display << '\n'; |
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp index 51020a0..bdb1c78 100644 --- a/noncore/games/backgammon/backgammon.cpp +++ b/noncore/games/backgammon/backgammon.cpp | |||
@@ -1,20 +1,24 @@ | |||
1 | #include "backgammon.h" | 1 | #include "backgammon.h" |
2 | |||
3 | #include "aidialog.h" | 2 | #include "aidialog.h" |
4 | #include "filedialog.h" | 3 | #include "filedialog.h" |
5 | #include "playerdialog.h" | 4 | #include "playerdialog.h" |
6 | #include "rulesdialog.h" | 5 | #include "rulesdialog.h" |
7 | #include "themedialog.h" | 6 | #include "themedialog.h" |
8 | 7 | ||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
10 | #include <qpe/qpeapplication.h> | ||
11 | #include <qpe/config.h> | ||
12 | #include <qpe/resource.h> | ||
13 | using namespace Opie::Core; | ||
14 | |||
15 | /* QT */ | ||
9 | #include <qfile.h> | 16 | #include <qfile.h> |
10 | #include <qlayout.h> | 17 | #include <qlayout.h> |
11 | #include <qmessagebox.h> | 18 | #include <qmessagebox.h> |
12 | #include <qtimer.h> | 19 | #include <qtimer.h> |
13 | #include <qpe/qpeapplication.h> | ||
14 | #include <qpe/config.h> | ||
15 | #include <qmenubar.h> | 20 | #include <qmenubar.h> |
16 | #include <qpe/resource.h> | ||
17 | 21 | ||
18 | #include <stdlib.h> | 22 | #include <stdlib.h> |
19 | 23 | ||
20 | 24 | ||
@@ -32,9 +36,9 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) | |||
32 | //load the default theme | 36 | //load the default theme |
33 | Config conf("backgammon"); | 37 | Config conf("backgammon"); |
34 | if(!conf.isValid()) | 38 | if(!conf.isValid()) |
35 | { | 39 | { |
36 | qDebug("config file does not exist"); | 40 | odebug << "config file does not exist" << oendl; |
37 | conf.setGroup("general"); | 41 | conf.setGroup("general"); |
38 | conf.writeEntry("theme","default"); | 42 | conf.writeEntry("theme","default"); |
39 | conf.setGroup("rules"); | 43 | conf.setGroup("rules"); |
40 | conf.writeEntry("move_with_pieces_out",false); | 44 | conf.writeEntry("move_with_pieces_out",false); |
@@ -77,9 +81,9 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) | |||
77 | //get the theme component names | 81 | //get the theme component names |
78 | Config theme(theme_file,Config::File); | 82 | Config theme(theme_file,Config::File); |
79 | if(!theme.isValid()) | 83 | if(!theme.isValid()) |
80 | { | 84 | { |
81 | qDebug("theme file does not exist"); | 85 | odebug << "theme file does not exist" << oendl; |
82 | theme.setGroup("theme"); | 86 | theme.setGroup("theme"); |
83 | theme.writeEntry("board","casino_board_1"); | 87 | theme.writeEntry("board","casino_board_1"); |
84 | theme.writeEntry("pieces1","casino_pieces_blue"); | 88 | theme.writeEntry("pieces1","casino_pieces_blue"); |
85 | theme.writeEntry("pieces2","casino_pieces_white"); | 89 | theme.writeEntry("pieces2","casino_pieces_white"); |
diff --git a/noncore/games/backgammon/moveengine.cpp b/noncore/games/backgammon/moveengine.cpp index 7de7147..a4145cc 100644 --- a/noncore/games/backgammon/moveengine.cpp +++ b/noncore/games/backgammon/moveengine.cpp | |||
@@ -456,9 +456,9 @@ int MoveEngine::getPossibleMoves() | |||
456 | } | 456 | } |
457 | 457 | ||
458 | void MoveEngine::move(const int& from, int to, const int& dice) | 458 | void MoveEngine::move(const int& from, int to, const int& dice) |
459 | { | 459 | { |
460 | //qDebug("%d moves from %d to %d (%d) with dice %d",player,from,to,to-from,dice); | 460 | //odebug << "" << player << " moves from " << from << " to " << to << " (" << to-from << ") with dice " << dice << "" << oendl; |
461 | 461 | ||
462 | if(player==1 && to==25) | 462 | if(player==1 && to==25) |
463 | to=26; | 463 | to=26; |
464 | if(player==2 && to==0) | 464 | if(player==2 && to==0) |
diff --git a/noncore/games/bounce/bounce.pro b/noncore/games/bounce/bounce.pro index ba745c8..56a325c 100644 --- a/noncore/games/bounce/bounce.pro +++ b/noncore/games/bounce/bounce.pro | |||
@@ -1,10 +1,9 @@ | |||
1 | #CONFIG = qt warn_on | 1 | CONFIG = qt warn_on quick-app |
2 | CONFIG = qt warn_on quick-app | ||
3 | HEADERS = game.h kbounce.h | 2 | HEADERS = game.h kbounce.h |
4 | SOURCES = game.cpp kbounce.cpp main.cpp | 3 | SOURCES = game.cpp kbounce.cpp main.cpp |
5 | INCLUDEPATH+= $(OPIEDIR)/include | 4 | INCLUDEPATH+= $(OPIEDIR)/include |
6 | DEPENDPATH+= $(OPIEDIR)/include | 5 | DEPENDPATH+= $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 | 6 | LIBS += -lqpe -lopiecore2 |
8 | TARGET = bounce | 7 | TARGET = bounce |
9 | 8 | ||
10 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/bounce/game.cpp b/noncore/games/bounce/game.cpp index 1f1f8cd..bbd3d0b 100644 --- a/noncore/games/bounce/game.cpp +++ b/noncore/games/bounce/game.cpp | |||
@@ -16,13 +16,20 @@ | |||
16 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 16 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | 19 | ||
20 | #include <stdlib.h> | 20 | #include "game.h" |
21 | #include <qtimer.h> | 21 | |
22 | /* OPIE */ | ||
23 | #include <opie2/odebug.h> | ||
22 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | using namespace Opie::Core; | ||
23 | 26 | ||
24 | #include "game.h" | 27 | /* QT */ |
28 | #include <qtimer.h> | ||
29 | |||
30 | /* STD */ | ||
31 | #include <stdlib.h> | ||
25 | 32 | ||
26 | #define TILE_SIZE 9 | 33 | #define TILE_SIZE 9 |
27 | 34 | ||
28 | #define TILE_FIRST ((FIELD_WIDTH-2)*(FIELD_HEIGHT-2)) | 35 | #define TILE_FIRST ((FIELD_WIDTH-2)*(FIELD_HEIGHT-2)) |
@@ -366,9 +373,9 @@ JezzGame::~JezzGame() | |||
366 | } | 373 | } |
367 | 374 | ||
368 | void JezzGame::display( QString text, int size ) | 375 | void JezzGame::display( QString text, int size ) |
369 | { | 376 | { |
370 | qDebug("This function \"display\" shouldn't be called!!!"); | 377 | odebug << "This function \"display\" shouldn't be called!!!" << oendl; |
371 | if ( !text.isEmpty() ) | 378 | if ( !text.isEmpty() ) |
372 | { | 379 | { |
373 | QFont font( "Helvetica", size, QFont::Bold ); | 380 | QFont font( "Helvetica", size, QFont::Bold ); |
374 | font.setStyleHint( QFont::Helvetica ); | 381 | font.setStyleHint( QFont::Helvetica ); |
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro index b73bbb0..72425a5 100644 --- a/noncore/games/go/go.pro +++ b/noncore/games/go/go.pro | |||
@@ -1,19 +1,18 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | HEADERS = amigo.h \ | 2 | HEADERS = amigo.h \ |
3 | go.h \ | 3 | go.h \ |
4 | goplayutils.h \ | 4 | goplayutils.h \ |
5 | gowidget.h | 5 | gowidget.h |
6 | SOURCES = amigo.c \ | 6 | SOURCES = amigo.c \ |
7 | goplayer.c \ | 7 | goplayer.c \ |
8 | goplayutils.c \ | 8 | goplayutils.c \ |
9 | killable.c \ | 9 | killable.c \ |
10 | gowidget.cpp \ | 10 | gowidget.cpp \ |
11 | main.cpp | 11 | main.cpp |
12 | INCLUDEPATH += $(OPIEDIR)/include | 12 | INCLUDEPATH += $(OPIEDIR)/include |
13 | DEPENDPATH+= $(OPIEDIR)/include | 13 | DEPENDPATH+= $(OPIEDIR)/include |
14 | LIBS += -lqpe -lopiecore2 | 14 | LIBS += -lqpe -lopiecore2 |
15 | TARGET = go | 15 | TARGET = go |
16 | 16 | ||
17 | 17 | ||
18 | |||
19 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp index d134540..ec03c1d 100644 --- a/noncore/games/go/gowidget.cpp +++ b/noncore/games/go/gowidget.cpp | |||
@@ -19,21 +19,22 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "gowidget.h" | 21 | #include "gowidget.h" |
22 | 22 | ||
23 | /* OPIE */ | ||
24 | #include <opie2/odebug.h> | ||
23 | #include <qpe/config.h> | 25 | #include <qpe/config.h> |
24 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | using namespace Opie::Core; | ||
25 | 28 | ||
29 | /* QT */ | ||
26 | #include <qpainter.h> | 30 | #include <qpainter.h> |
27 | #include <qtoolbar.h> | 31 | #include <qtoolbar.h> |
28 | #include <qmenubar.h> | 32 | #include <qmenubar.h> |
29 | #include <qaction.h> | 33 | #include <qaction.h> |
30 | #include <qapplication.h> //processEvents() | 34 | #include <qapplication.h> //processEvents() |
31 | #include <qlabel.h> | 35 | #include <qlabel.h> |
32 | 36 | ||
33 | //#include <stdio.h> | ||
34 | |||
35 | |||
36 | static const enum bVal computer_color = BLACK; | 37 | static const enum bVal computer_color = BLACK; |
37 | 38 | ||
38 | static int current_handicap = 1; | 39 | static int current_handicap = 1; |
39 | 40 | ||
@@ -447,9 +448,9 @@ void placestone (enum bVal c, short x, short y ) | |||
447 | } | 448 | } |
448 | 449 | ||
449 | voidintrMoveReport(enum bVal c ,char *coord ,char *reason ) | 450 | voidintrMoveReport(enum bVal c ,char *coord ,char *reason ) |
450 | { | 451 | { |
451 | qDebug( "intrMoveReport colour %d, %s %s", c, coord, reason ); | 452 | odebug << "intrMoveReport colour " << c << ", " << coord << " " << reason << "" << oendl; |
452 | } | 453 | } |
453 | 454 | ||
454 | voidintrPrisonerReport( short blackcnt, short whitecnt ) | 455 | voidintrPrisonerReport( short blackcnt, short whitecnt ) |
455 | { | 456 | { |
diff --git a/noncore/games/kpacman/kpacman.pro b/noncore/games/kpacman/kpacman.pro index 8453f78..45314f9 100644 --- a/noncore/games/kpacman/kpacman.pro +++ b/noncore/games/kpacman/kpacman.pro | |||
@@ -1,8 +1,6 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | #CONFIG = qt warn_on | ||
3 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
4 | #TMAKE_CXXFLAGS+= | ||
5 | HEADERS = kpacmanwidget.h \ | 3 | HEADERS = kpacmanwidget.h \ |
6 | referee.h \ | 4 | referee.h \ |
7 | status.h \ | 5 | status.h \ |
8 | painter.h \ | 6 | painter.h \ |
@@ -33,9 +31,9 @@ SOURCES = kpacmanwidget.cpp \ | |||
33 | kpacman.cpp \ | 31 | kpacman.cpp \ |
34 | main.cpp | 32 | main.cpp |
35 | INCLUDEPATH+= $(OPIEDIR)/include | 33 | INCLUDEPATH+= $(OPIEDIR)/include |
36 | DEPENDPATH+= $(OPIEDIR)/include | 34 | DEPENDPATH+= $(OPIEDIR)/include |
37 | LIBS += -lqpe | 35 | LIBS += -lqpe -lopiecore2 |
38 | DESTDIR = $(OPIEDIR)/bin | 36 | DESTDIR = $(OPIEDIR)/bin |
39 | TARGET = kpacman | 37 | TARGET = kpacman |
40 | 38 | ||
41 | include ( $(OPIEDIR)/include.pro ) | 39 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp index 9631495..b59dd02 100644 --- a/noncore/games/kpacman/kpacmanwidget.cpp +++ b/noncore/games/kpacman/kpacmanwidget.cpp | |||
@@ -12,9 +12,10 @@ | |||
12 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
13 | #include "kpacmanwidget.h" | 13 | #include "kpacmanwidget.h" |
14 | #endif | 14 | #endif |
15 | 15 | ||
16 | 16 | #include <opie2/odebug.h> | |
17 | using namespace Opie::Core; | ||
17 | 18 | ||
18 | KpacmanWidget::KpacmanWidget( QWidget *parent, const char *name) | 19 | KpacmanWidget::KpacmanWidget( QWidget *parent, const char *name) |
19 | : QWidget( parent, name ) | 20 | : QWidget( parent, name ) |
20 | { | 21 | { |
@@ -138,9 +139,9 @@ void KpacmanWidget::setScheme(int Scheme, int Mode) | |||
138 | } | 139 | } |
139 | 140 | ||
140 | void KpacmanWidget::resizeEvent( QResizeEvent * ) | 141 | void KpacmanWidget::resizeEvent( QResizeEvent * ) |
141 | { | 142 | { |
142 | qWarning("Resize"); | 143 | owarn << "Resize" << oendl; |
143 | referee->setGeometry(0, bitfont->height()*3, referee->width(), referee->height()); | 144 | referee->setGeometry(0, bitfont->height()*3, referee->width(), referee->height()); |
144 | referee->setBackgroundColor(BLACK); | 145 | referee->setBackgroundColor(BLACK); |
145 | 146 | ||
146 | if(!status ) return; | 147 | if(!status ) return; |
diff --git a/noncore/games/kpacman/status.cpp b/noncore/games/kpacman/status.cpp index 02ff63d..db6938e 100644 --- a/noncore/games/kpacman/status.cpp +++ b/noncore/games/kpacman/status.cpp | |||
@@ -12,16 +12,19 @@ | |||
12 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
13 | #include "status.h" | 13 | #include "status.h" |
14 | #endif | 14 | #endif |
15 | 15 | ||
16 | #include <opie2/odebug.h> | ||
17 | using namespace Opie::Core; | ||
18 | |||
16 | #include <qbitmap.h> | 19 | #include <qbitmap.h> |
17 | #include <qmsgbox.h> | 20 | #include <qmsgbox.h> |
18 | #include <qfileinfo.h> | 21 | #include <qfileinfo.h> |
19 | 22 | ||
20 | Status::Status( QWidget *parent, const char *name, int Scheme, int Mode ) : | 23 | Status::Status( QWidget *parent, const char *name, int Scheme, int Mode ) : |
21 | QWidget( parent, name ) | 24 | QWidget( parent, name ) |
22 | { | 25 | { |
23 | qWarning("Status::Status"); | 26 | owarn << "Status::Status" << oendl; |
24 | actualLifes = 0; | 27 | actualLifes = 0; |
25 | actualLevel = 0; | 28 | actualLevel = 0; |
26 | 29 | ||
27 | lifesPix = NULL; | 30 | lifesPix = NULL; |
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp index 2b924c6..1f554d2 100644 --- a/noncore/games/mindbreaker/mindbreaker.cpp +++ b/noncore/games/mindbreaker/mindbreaker.cpp | |||
@@ -89,9 +89,9 @@ static void setupBoardSize(int w, int h) | |||
89 | 89 | ||
90 | adjusted_board_height = adjusted_title_height + (adjusted_panel_height * 9); | 90 | adjusted_board_height = adjusted_title_height + (adjusted_panel_height * 9); |
91 | adjusted_board_width = adjusted_panel_width + (adjusted_bin_margin * 2) + adjusted_peg_size; | 91 | adjusted_board_width = adjusted_panel_width + (adjusted_bin_margin * 2) + adjusted_peg_size; |
92 | 92 | ||
93 | // qDebug("Adjusted width %d height %d", adjusted_board_width, adjusted_board_height); | 93 | // odebug << "Adjusted width " << adjusted_board_width << " height " << adjusted_board_height << "" << oendl; |
94 | } | 94 | } |
95 | 95 | ||
96 | 96 | ||
97 | /* helper class, */ | 97 | /* helper class, */ |
diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp index a55aa73..27c0a9f 100644 --- a/noncore/games/oyatzee/oyatzee.cpp +++ b/noncore/games/oyatzee/oyatzee.cpp | |||
@@ -1,11 +1,17 @@ | |||
1 | #include "oyatzee.h" | 1 | #include "oyatzee.h" |
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
3 | #include <qmessagebox.h> | 8 | #include <qmessagebox.h> |
4 | #include <qpushbutton.h> | 9 | #include <qpushbutton.h> |
5 | #include <qpainter.h> | 10 | #include <qpainter.h> |
6 | #include <qlayout.h> | 11 | #include <qlayout.h> |
7 | 12 | ||
13 | /* STD */ | ||
8 | #include <stdlib.h> | 14 | #include <stdlib.h> |
9 | 15 | ||
10 | OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( parent , name , fl ) | 16 | OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( parent , name , fl ) |
11 | { | 17 | { |
@@ -40,9 +46,9 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( | |||
40 | } | 46 | } |
41 | 47 | ||
42 | void OYatzee::slotEndRound( int item ) | 48 | void OYatzee::slotEndRound( int item ) |
43 | { | 49 | { |
44 | qDebug( "Der User hat Nummer %d ausgewählt" , item ); | 50 | odebug << "Der User hat Nummer " << item << " ausgewählt" << oendl; |
45 | 51 | ||
46 | /* | 52 | /* |
47 | * if the user clicked on Total, Bonus or Score and thus not on a | 53 | * if the user clicked on Total, Bonus or Score and thus not on a |
48 | * selectable item return and do nothing | 54 | * selectable item return and do nothing |
@@ -108,9 +114,9 @@ void OYatzee::slotEndRound( int item ) | |||
108 | 114 | ||
109 | sb->nextRB(currentPlayer-1)->updateMap( item , points ); | 115 | sb->nextRB(currentPlayer-1)->updateMap( item , points ); |
110 | nextPlayer(); | 116 | nextPlayer(); |
111 | 117 | ||
112 | qDebug( "Punkte: %d" , points ); | 118 | odebug << "Punkte: " << points << "" << oendl; |
113 | } | 119 | } |
114 | 120 | ||
115 | void OYatzee::nextPlayer() | 121 | void OYatzee::nextPlayer() |
116 | { | 122 | { |
@@ -155,9 +161,9 @@ OYatzee::~OYatzee() | |||
155 | 161 | ||
156 | void OYatzee::detectPosibilities() | 162 | void OYatzee::detectPosibilities() |
157 | { | 163 | { |
158 | posibilities.clear(); | 164 | posibilities.clear(); |
159 | qDebug( "running detectPosibilities()" ); | 165 | odebug << "running detectPosibilities()" << oendl; |
160 | 166 | ||
161 | Dice *d = dw->diceList.first(); | 167 | Dice *d = dw->diceList.first(); |
162 | 168 | ||
163 | QValueListInt numbers; | 169 | QValueListInt numbers; |
@@ -260,49 +266,49 @@ void OYatzee::detectPosibilities() | |||
260 | void OYatzee::displayPossibilites() | 266 | void OYatzee::displayPossibilites() |
261 | { | 267 | { |
262 | //X for ( QValueListInt::Iterator it = posibilities.begin() ; it != posibilities.end(); ++it ) | 268 | //X for ( QValueListInt::Iterator it = posibilities.begin() ; it != posibilities.end(); ++it ) |
263 | //X { | 269 | //X { |
264 | //X qDebug( QString::number( *it ) ); | 270 | //X odebug << QString::number( *it ) << oendl; |
265 | //X switch ( *it ) | 271 | //X switch ( *it ) |
266 | //X { | 272 | //X { |
267 | //X case Ones: | 273 | //X case Ones: |
268 | //X qDebug( "1er" ); | 274 | //X odebug << "1er" << oendl; |
269 | //X break; | 275 | //X break; |
270 | //X case Twos: | 276 | //X case Twos: |
271 | //X qDebug( "2er" ); | 277 | //X odebug << "2er" << oendl; |
272 | //X break; | 278 | //X break; |
273 | //X case Threes: | 279 | //X case Threes: |
274 | //X qDebug( "3er" ); | 280 | //X odebug << "3er" << oendl; |
275 | //X break; | 281 | //X break; |
276 | //X case Fours: | 282 | //X case Fours: |
277 | //X qDebug( "4er" ); | 283 | //X odebug << "4er" << oendl; |
278 | //X break; | 284 | //X break; |
279 | //X case Fives: | 285 | //X case Fives: |
280 | //X qDebug( "5er" ); | 286 | //X odebug << "5er" << oendl; |
281 | //X break; | 287 | //X break; |
282 | //X case Sixes: | 288 | //X case Sixes: |
283 | //X qDebug( "6er" ); | 289 | //X odebug << "6er" << oendl; |
284 | //X break; | 290 | //X break; |
285 | //X case ThreeOfAKind: | 291 | //X case ThreeOfAKind: |
286 | //X qDebug( "3oaK" ); | 292 | //X odebug << "3oaK" << oendl; |
287 | //X break; | 293 | //X break; |
288 | //X case FourOfAKind: | 294 | //X case FourOfAKind: |
289 | //X qDebug( "4oaK" ); | 295 | //X odebug << "4oaK" << oendl; |
290 | //X break; | 296 | //X break; |
291 | //X case FullHouse: | 297 | //X case FullHouse: |
292 | //X qDebug( "Full House" ); | 298 | //X odebug << "Full House" << oendl; |
293 | //X break; | 299 | //X break; |
294 | //X case SStraight: | 300 | //X case SStraight: |
295 | //X qDebug( "Short S" ); | 301 | //X odebug << "Short S" << oendl; |
296 | //X break; | 302 | //X break; |
297 | //X case LStraight: | 303 | //X case LStraight: |
298 | //X qDebug( "Long S" ); | 304 | //X odebug << "Long S" << oendl; |
299 | //X break; | 305 | //X break; |
300 | //X case Yatzee: | 306 | //X case Yatzee: |
301 | //X qDebug( "Yatzee!" ); | 307 | //X odebug << "Yatzee!" << oendl; |
302 | //X break; | 308 | //X break; |
303 | //X case Chance: | 309 | //X case Chance: |
304 | //X qDebug( "Chance" ); | 310 | //X odebug << "Chance" << oendl; |
305 | //X break; | 311 | //X break; |
306 | //X } | 312 | //X } |
307 | //X } | 313 | //X } |
308 | 314 | ||
@@ -334,9 +340,9 @@ void OYatzee::slotStartGame() | |||
334 | } | 340 | } |
335 | 341 | ||
336 | void OYatzee::slotRollDices() | 342 | void OYatzee::slotRollDices() |
337 | { | 343 | { |
338 | qDebug( "Roll nummer: %d" , ps.at( currentPlayer-1 )->turn ); | 344 | odebug << "Roll nummer: " << ps.at( currentPlayer-1 )->turn << "" << oendl; |
339 | 345 | ||
340 | if ( ps.at( currentPlayer-1 )->turn == 3 ) | 346 | if ( ps.at( currentPlayer-1 )->turn == 3 ) |
341 | { | 347 | { |
342 | QMessageBox::information( this, | 348 | QMessageBox::information( this, |
@@ -352,11 +358,11 @@ void OYatzee::slotRollDices() | |||
352 | if ( !d->isSelected ) | 358 | if ( !d->isSelected ) |
353 | d->roll(); | 359 | d->roll(); |
354 | } | 360 | } |
355 | 361 | ||
356 | //qDebug( "Roll nummer (vorher): %d" , ps.at( currentPlayer-1 )->turn ); | 362 | //odebug << "Roll nummer (vorher): " << ps.at( currentPlayer-1 )->turn << "" << oendl; |
357 | ps.at(currentPlayer-1)->turn++; | 363 | ps.at(currentPlayer-1)->turn++; |
358 | //qDebug( "Roll nummer (nachher): %d" , ps.at( currentPlayer-1 )->turn ); | 364 | //odebug << "Roll nummer (nachher): " << ps.at( currentPlayer-1 )->turn << "" << oendl; |
359 | 365 | ||
360 | detectPosibilities(); | 366 | detectPosibilities(); |
361 | } | 367 | } |
362 | 368 | ||
@@ -390,9 +396,9 @@ Resultboard* Scoreboard::nextRB( int currentPlayer ) | |||
390 | Resultboard *b; | 396 | Resultboard *b; |
391 | 397 | ||
392 | b = rbList.at( currentPlayer ); | 398 | b = rbList.at( currentPlayer ); |
393 | 399 | ||
394 | qDebug( "Anzahl: %d" ,rbList.count() ); | 400 | odebug << "Anzahl: " << rbList.count() << "" << oendl; |
395 | 401 | ||
396 | return b; | 402 | return b; |
397 | } | 403 | } |
398 | 404 | ||
@@ -607,9 +613,9 @@ void Resultboard::paintEvent( QPaintEvent* ) | |||
607 | pointMap::Iterator it = pMap.begin(); | 613 | pointMap::Iterator it = pMap.begin(); |
608 | for ( ; it != pMap.end() ; ++it ) | 614 | for ( ; it != pMap.end() ; ++it ) |
609 | { | 615 | { |
610 | int i = it.key(); | 616 | int i = it.key(); |
611 | qDebug( "ok: %d , %d" , i , it.data() ); | 617 | odebug << "ok: " << i << " , " << it.data() << "" << oendl; |
612 | p.drawText( 0, i*cell_height , cell_width , cell_height , Qt::AlignCenter , QString::number( it.data() ) ); | 618 | p.drawText( 0, i*cell_height , cell_width , cell_height , Qt::AlignCenter , QString::number( it.data() ) ); |
613 | } | 619 | } |
614 | 620 | ||
615 | p.drawText( 0,0,cell_width,cell_height, Qt::AlignCenter , pName ); //Playername | 621 | p.drawText( 0,0,cell_width,cell_height, Qt::AlignCenter , pName ); //Playername |
diff --git a/noncore/games/oyatzee/oyatzee.pro b/noncore/games/oyatzee/oyatzee.pro index 754abd2..f505c66 100644 --- a/noncore/games/oyatzee/oyatzee.pro +++ b/noncore/games/oyatzee/oyatzee.pro | |||
@@ -5,7 +5,7 @@ HEADERS = oyatzee.h | |||
5 | SOURCES = main.cpp oyatzee.cpp | 5 | SOURCES = main.cpp oyatzee.cpp |
6 | TARGET = oyatzee | 6 | TARGET = oyatzee |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | 10 | ||
11 | include ( $(OPIEDIR)/include.pro ) | 11 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp index a80bd35..47d6725 100644 --- a/noncore/games/wordgame/wordgame.cpp +++ b/noncore/games/wordgame/wordgame.cpp | |||
@@ -674,9 +674,9 @@ void ComputerPlayer::noteChoice(const Tile** tiles, int n, const QPoint& d, cons | |||
674 | if (s>0 || current==QPoint(5,1)){ | 674 | if (s>0 || current==QPoint(5,1)){ |
675 | QString st; | 675 | QString st; |
676 | for ( int i=0; i<n; i++ ) | 676 | for ( int i=0; i<n; i++ ) |
677 | st += tiles[i]->text(); | 677 | st += tiles[i]->text(); |
678 | qDebug("%d,%d: %s (%d) for %d",current.x(),current.y(),st.latin1(),n,s); | 678 | odebug << "" << current.x() << "," << current.y() << ": " << st.latin1() << " (" << n << ") for " << s << "" << oendl; |
679 | } | 679 | } |
680 | */ | 680 | */ |
681 | if ( s > best_score ) { | 681 | if ( s > best_score ) { |
682 | int i; | 682 | int i; |
diff --git a/noncore/graphics/opie-eye/config.in b/noncore/graphics/opie-eye/config.in index 996dcf3..d7f9963 100644 --- a/noncore/graphics/opie-eye/config.in +++ b/noncore/graphics/opie-eye/config.in | |||
@@ -1,9 +1,9 @@ | |||
1 | config OPIE_EYE | 1 | config OPIE_EYE |
2 | boolean "opie-eye The Image Viewer and Browser" | 2 | boolean "opie-eye The Image Viewer and Browser" |
3 | default "y" | 3 | default "y" |
4 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI | 4 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
5 | 5 | ||
6 | config OPIE_EYE_SLAVE | 6 | config OPIE_EYE_SLAVE |
7 | boolean | 7 | boolean |
8 | default "y" if OPIE_EYE | 8 | default "y" if OPIE_EYE |
9 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI | 9 | depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp index 79f4510..5599ad1 100644 --- a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp +++ b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp | |||
@@ -2,17 +2,21 @@ | |||
2 | * GPLv2 | 2 | * GPLv2 |
3 | * zecke@handhelds.org | 3 | * zecke@handhelds.org |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "dir_ifaceinfo.h" | ||
7 | |||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
10 | #include <qpe/config.h> | ||
11 | using namespace Opie::Core; | ||
12 | |||
13 | /* QT */ | ||
6 | #include <qwidget.h> | 14 | #include <qwidget.h> |
7 | #include <qcheckbox.h> | 15 | #include <qcheckbox.h> |
8 | #include <qhbox.h> | 16 | #include <qhbox.h> |
9 | #include <qlabel.h> | 17 | #include <qlabel.h> |
10 | 18 | ||
11 | #include <qpe/config.h> | ||
12 | |||
13 | #include "dir_ifaceinfo.h" | ||
14 | |||
15 | namespace { | 19 | namespace { |
16 | class DirImageWidget : public QHBox { | 20 | class DirImageWidget : public QHBox { |
17 | public: | 21 | public: |
18 | DirImageWidget() { | 22 | DirImageWidget() { |
@@ -40,8 +44,8 @@ QWidget* DirInterfaceInfo::configWidget(const Config& cfg) { | |||
40 | return wid; | 44 | return wid; |
41 | } | 45 | } |
42 | 46 | ||
43 | void DirInterfaceInfo::writeConfig( QWidget* _wid, Config& cfg) { | 47 | void DirInterfaceInfo::writeConfig( QWidget* _wid, Config& cfg) { |
44 | qWarning( "Write Config" ); | 48 | owarn << "Write Config" << oendl; |
45 | DirImageWidget* wid = static_cast<DirImageWidget*>(_wid); | 49 | DirImageWidget* wid = static_cast<DirImageWidget*>(_wid); |
46 | cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() ); | 50 | cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() ); |
47 | } | 51 | } |
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp index ffea29e..0a5cff4 100644 --- a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp +++ b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp | |||
@@ -5,21 +5,23 @@ | |||
5 | #include "dir_lister.h" | 5 | #include "dir_lister.h" |
6 | 6 | ||
7 | #include <lib/slavemaster.h> | 7 | #include <lib/slavemaster.h> |
8 | 8 | ||
9 | 9 | /* OPIE */ | |
10 | #include <opie2/odebug.h> | ||
10 | #include <qpe/config.h> | 11 | #include <qpe/config.h> |
11 | #include <qpe/qpeapplication.h> | 12 | #include <qpe/qpeapplication.h> |
13 | using namespace Opie::Core; | ||
12 | 14 | ||
15 | /* QT */ | ||
13 | #include <qdir.h> | 16 | #include <qdir.h> |
14 | #include <qfileinfo.h> | 17 | #include <qfileinfo.h> |
15 | 18 | ||
16 | |||
17 | Dir_DirLister::Dir_DirLister( bool list ) | 19 | Dir_DirLister::Dir_DirLister( bool list ) |
18 | : PDirLister( "dir_dir_lister" ) | 20 | : PDirLister( "dir_dir_lister" ) |
19 | { | 21 | { |
20 | m_allFiles = list; | 22 | m_allFiles = list; |
21 | qWarning("All Files %d", m_allFiles ); | 23 | owarn << "All Files " << m_allFiles << "" << oendl; |
22 | 24 | ||
23 | SlaveMaster* master = SlaveMaster::self(); | 25 | SlaveMaster* master = SlaveMaster::self(); |
24 | connect( master, SIGNAL(sig_start()), this, SIGNAL(sig_start()) ); | 26 | connect( master, SIGNAL(sig_start()), this, SIGNAL(sig_start()) ); |
25 | connect( master, SIGNAL(sig_end()), this, SIGNAL(sig_end()) ); | 27 | connect( master, SIGNAL(sig_end()), this, SIGNAL(sig_end()) ); |
diff --git a/noncore/graphics/opie-eye/lib/slavemaster.cpp b/noncore/graphics/opie-eye/lib/slavemaster.cpp index 4e28535..5bb7ab8 100644 --- a/noncore/graphics/opie-eye/lib/slavemaster.cpp +++ b/noncore/graphics/opie-eye/lib/slavemaster.cpp | |||
@@ -1,9 +1,13 @@ | |||
1 | #include "slavemaster.h" | 1 | #include "slavemaster.h" |
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
3 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
4 | #include <qpe/qcopenvelope_qws.h> | 6 | #include <qpe/qcopenvelope_qws.h> |
7 | using namespace Opie::Core; | ||
5 | 8 | ||
9 | /* QT */ | ||
6 | #include <qcopchannel_qws.h> | 10 | #include <qcopchannel_qws.h> |
7 | #include <qtimer.h> | 11 | #include <qtimer.h> |
8 | 12 | ||
9 | QDataStream & operator << (QDataStream & str, bool b) | 13 | QDataStream & operator << (QDataStream & str, bool b) |
@@ -22,9 +26,9 @@ QDataStream & operator >> (QDataStream & str, bool & b) | |||
22 | /* | 26 | /* |
23 | * ! We don't put a Pixmap in!!!! | 27 | * ! We don't put a Pixmap in!!!! |
24 | */ | 28 | */ |
25 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { | 29 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { |
26 | qWarning( "Image request is %s %d %d", inf.file.latin1(), inf.width, inf.height ); | 30 | owarn << "Image request is " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; |
27 | return s << inf.file << inf.width << inf.height; | 31 | return s << inf.file << inf.width << inf.height; |
28 | } | 32 | } |
29 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { | 33 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { |
30 | s >> inf.file >> inf.pixmap >> inf.width >> inf.height; | 34 | s >> inf.file >> inf.pixmap >> inf.width >> inf.height; |
@@ -77,12 +81,12 @@ void SlaveMaster::imageInfo( const QString& str ) { | |||
77 | } | 81 | } |
78 | 82 | ||
79 | void SlaveMaster::thumbNail( const QString& str, int w, int h ) { | 83 | void SlaveMaster::thumbNail( const QString& str, int w, int h ) { |
80 | if ( str.isEmpty() ) { | 84 | if ( str.isEmpty() ) { |
81 | qWarning( "Asking for empty nail" ); | 85 | owarn << "Asking for empty nail" << oendl; |
82 | return; | 86 | return; |
83 | } | 87 | } |
84 | qWarning( "Asking for thumbNail in size %d %d" + str, w,h ); | 88 | owarn << "Asking for thumbNail in size " << w << " " << h << "" + str << oendl; |
85 | PixmapInfo item; | 89 | PixmapInfo item; |
86 | item.file = str; item.width = w; item.height = h; | 90 | item.file = str; item.width = w; item.height = h; |
87 | item.pixmap = QPixmap(); | 91 | item.pixmap = QPixmap(); |
88 | m_inThumbNail.append( item ); | 92 | m_inThumbNail.append( item ); |
@@ -104,9 +108,9 @@ void SlaveMaster::recieve( const QCString& str, const QByteArray& at) { | |||
104 | stream >> pixinfos; | 108 | stream >> pixinfos; |
105 | else if ( str == "pixmapsHandled(StringList)" ) | 109 | else if ( str == "pixmapsHandled(StringList)" ) |
106 | stream >> infos; | 110 | stream >> infos; |
107 | 111 | ||
108 | qWarning( "PixInfos %d", pixinfos.count() ); | 112 | owarn << "PixInfos " << pixinfos.count() << "" << oendl; |
109 | 113 | ||
110 | bool got_data = ( !infos.isEmpty() || !pixinfos.isEmpty() ); | 114 | bool got_data = ( !infos.isEmpty() || !pixinfos.isEmpty() ); |
111 | if ( got_data ) { | 115 | if ( got_data ) { |
112 | emit sig_start(); | 116 | emit sig_start(); |
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro index 17fa22c..0e2202a 100644 --- a/noncore/graphics/opie-eye/phunk_view.pro +++ b/noncore/graphics/opie-eye/phunk_view.pro | |||
@@ -30,7 +30,7 @@ INCLUDEPATH += . $(OPIEDIR)/include | |||
30 | DEPENDPATH += $(OPIEDIR)/include | 30 | DEPENDPATH += $(OPIEDIR)/include |
31 | 31 | ||
32 | 32 | ||
33 | 33 | ||
34 | LIBS += -lqpe -lopieui2 | 34 | LIBS += -lqpe -lopiecore2 -lopieui2 |
35 | 35 | ||
36 | include ( $(OPIEDIR)/include.pro ) | 36 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp index 086b47f..fb7d5de 100644 --- a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp +++ b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp | |||
@@ -1,11 +1,15 @@ | |||
1 | #include "jpeg_slave.h" | 1 | #include "jpeg_slave.h" |
2 | |||
3 | #include "thumbnailtool.h" | 2 | #include "thumbnailtool.h" |
4 | 3 | ||
5 | PHUNK_VIEW_INTERFACE( "JPEG", JpegSlave ) | 4 | PHUNK_VIEW_INTERFACE( "JPEG", JpegSlave ) |
6 | 5 | ||
7 | #include <qtopia/timestring.h> | 6 | /* OPIE */ |
7 | #include <opie2/odebug.h> | ||
8 | #include <qpe/timestring.h> | ||
9 | using namespace Opie::Core; | ||
10 | |||
11 | /* QT */ | ||
8 | #include <qobject.h> | 12 | #include <qobject.h> |
9 | #include <qimage.h> | 13 | #include <qimage.h> |
10 | 14 | ||
11 | /** | 15 | /** |
@@ -118,9 +122,9 @@ public: | |||
118 | class FatalError { | 122 | class FatalError { |
119 | const char* ex; | 123 | const char* ex; |
120 | public: | 124 | public: |
121 | FatalError(const char* s) { ex = s; } | 125 | FatalError(const char* s) { ex = s; } |
122 | void debug_print() const { qWarning("exception: %s", ex ); } | 126 | void debug_print() const { owarn << "exception: " << ex << "" << oendl; } |
123 | }; | 127 | }; |
124 | 128 | ||
125 | 129 | ||
126 | 130 | ||
@@ -261,9 +265,9 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode) | |||
261 | if (marker != 0xff) break; | 265 | if (marker != 0xff) break; |
262 | 266 | ||
263 | if (a >= 6){ | 267 | if (a >= 6){ |
264 | 268 | ||
265 | qWarning( "too many padding bytes" ); | 269 | owarn << "too many padding bytes" << oendl; |
266 | return false; | 270 | return false; |
267 | 271 | ||
268 | } | 272 | } |
269 | } | 273 | } |
@@ -326,9 +330,9 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode) | |||
326 | } | 330 | } |
327 | return true; | 331 | return true; |
328 | 332 | ||
329 | case M_EOI: // in case it's a tables-only JPEG stream | 333 | case M_EOI: // in case it's a tables-only JPEG stream |
330 | qWarning( "No image in jpeg!" ); | 334 | owarn << "No image in jpeg!" << oendl; |
331 | return false; | 335 | return false; |
332 | 336 | ||
333 | case M_COM: // Comment section | 337 | case M_COM: // Comment section |
334 | // pieczy 2002-02-12 | 338 | // pieczy 2002-02-12 |
@@ -725,9 +729,9 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa | |||
725 | if (SubdirStart < OffsetBase+ExifLength+20){ | 729 | if (SubdirStart < OffsetBase+ExifLength+20){ |
726 | // Jhead 1.3 or earlier would crop the whole directory! | 730 | // Jhead 1.3 or earlier would crop the whole directory! |
727 | // As Jhead produces this form of format incorrectness, | 731 | // As Jhead produces this form of format incorrectness, |
728 | // I'll just let it pass silently | 732 | // I'll just let it pass silently |
729 | qWarning( "Thumbnail removed with Jhead 1.3 or earlier" ); | 733 | owarn << "Thumbnail removed with Jhead 1.3 or earlier" << oendl; |
730 | }else{ | 734 | }else{ |
731 | return; | 735 | return; |
732 | } | 736 | } |
733 | }else{ | 737 | }else{ |
@@ -912,9 +916,9 @@ bool ExifData::scan(const QString & path) | |||
912 | // Scan the JPEG headers. | 916 | // Scan the JPEG headers. |
913 | ret = ReadJpegSections(f, READ_EXIF); | 917 | ret = ReadJpegSections(f, READ_EXIF); |
914 | 918 | ||
915 | if (ret == false){ | 919 | if (ret == false){ |
916 | qWarning( "Not JPEG file!" ); | 920 | owarn << "Not JPEG file!" << oendl; |
917 | DiscardData(); | 921 | DiscardData(); |
918 | f.close(); | 922 | f.close(); |
919 | return false; | 923 | return false; |
920 | } | 924 | } |
diff --git a/noncore/graphics/opie-eye/slave/main.cpp b/noncore/graphics/opie-eye/slave/main.cpp index 37020e6..5b90483 100644 --- a/noncore/graphics/opie-eye/slave/main.cpp +++ b/noncore/graphics/opie-eye/slave/main.cpp | |||
@@ -30,28 +30,28 @@ int main( int argc, char* argv[] ) { | |||
30 | int main( int argc, char* argv[] ) { | 30 | int main( int argc, char* argv[] ) { |
31 | QString str = QString::fromLatin1(argv[2] ); | 31 | QString str = QString::fromLatin1(argv[2] ); |
32 | QApplication app( argc, argv ); | 32 | QApplication app( argc, argv ); |
33 | GifSlave slave; | 33 | GifSlave slave; |
34 | qWarning( str +" "+slave.iconViewName(str ) ); | 34 | owarn << str +" "+slave.iconViewName(str ) << oendl; |
35 | qWarning( str+" "+slave.fullImageInfo( str ) ); | 35 | owarn << str+" "+slave.fullImageInfo( str ) << oendl; |
36 | 36 | ||
37 | PNGSlave pngslave; | 37 | PNGSlave pngslave; |
38 | qWarning( str + " " + pngslave.iconViewName(str) ); | 38 | owarn << str + " " + pngslave.iconViewName(str) << oendl; |
39 | qWarning( str + " " + pngslave.fullImageInfo(str)); | 39 | owarn << str + " " + pngslave.fullImageInfo(str) << oendl; |
40 | 40 | ||
41 | 41 | ||
42 | JpegSlave jpgslave; | 42 | JpegSlave jpgslave; |
43 | qWarning( str + " " + jpgslave.iconViewName(str ) ); | 43 | owarn << str + " " + jpgslave.iconViewName(str ) << oendl; |
44 | qWarning( str + " " + jpgslave.fullImageInfo( str ) ); | 44 | owarn << str + " " + jpgslave.fullImageInfo( str ) << oendl; |
45 | //return app.exec(); | 45 | //return app.exec(); |
46 | QPixmap pix = ThumbNailTool::getThumb( str, 24, 24 ); | 46 | QPixmap pix = ThumbNailTool::getThumb( str, 24, 24 ); |
47 | if ( pix.isNull() ) { | 47 | if ( pix.isNull() ) { |
48 | qWarning( "No Thumbnail" ); | 48 | owarn << "No Thumbnail" << oendl; |
49 | pix = slave.pixmap(str, 24, 24); | 49 | pix = slave.pixmap(str, 24, 24); |
50 | } | 50 | } |
51 | 51 | ||
52 | if (!pix.isNull() ) { | 52 | if (!pix.isNull() ) { |
53 | qWarning( "Saving Thumbnail" ); | 53 | owarn << "Saving Thumbnail" << oendl; |
54 | ThumbNailTool::putThumb( str, pix, 24, 24 ); | 54 | ThumbNailTool::putThumb( str, pix, 24, 24 ); |
55 | } | 55 | } |
56 | 56 | ||
57 | } | 57 | } |
diff --git a/noncore/graphics/opie-eye/slave/slave.pro b/noncore/graphics/opie-eye/slave/slave.pro index 3f42495..903d667 100644 --- a/noncore/graphics/opie-eye/slave/slave.pro +++ b/noncore/graphics/opie-eye/slave/slave.pro | |||
@@ -1,5 +1,5 @@ | |||
1 | CONFIG += qte | 1 | CONFIG = qt |
2 | TEMPLATE = app | 2 | TEMPLATE = app |
3 | TARGET = opie-eye_slave | 3 | TARGET = opie-eye_slave |
4 | DESTDIR = $(OPIEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | 5 | ||
@@ -12,7 +12,7 @@ SOURCES = main.cpp gif_slave.cpp slavereciever.cpp \ | |||
12 | 12 | ||
13 | INCLUDEPATH += $(OPIEDIR)/include ../ | 13 | INCLUDEPATH += $(OPIEDIR)/include ../ |
14 | DEPENDSPATH += $(OPIEDIR)/include | 14 | DEPENDSPATH += $(OPIEDIR)/include |
15 | 15 | ||
16 | LIBS += -lqpe | 16 | LIBS += -lqpe -lopiecore2 |
17 | 17 | ||
18 | include ( $(OPIEDIR)/include.pro ) \ No newline at end of file | 18 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp index bbbbb30..82b3d23 100644 --- a/noncore/graphics/opie-eye/slave/slavereciever.cpp +++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp | |||
@@ -4,11 +4,15 @@ | |||
4 | 4 | ||
5 | #include "slavereciever.h" | 5 | #include "slavereciever.h" |
6 | #include "slaveiface.h" | 6 | #include "slaveiface.h" |
7 | 7 | ||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
8 | #include <qpe/qcopenvelope_qws.h> | 10 | #include <qpe/qcopenvelope_qws.h> |
9 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
12 | using namespace Opie::Core; | ||
10 | 13 | ||
14 | /* QT */ | ||
11 | #include <qtimer.h> | 15 | #include <qtimer.h> |
12 | 16 | ||
13 | static SlaveObjects* _slaveObj = 0; | 17 | static SlaveObjects* _slaveObj = 0; |
14 | 18 | ||
@@ -36,9 +40,9 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { | |||
36 | * GUI sends no QPIxmap!!! | 40 | * GUI sends no QPIxmap!!! |
37 | */ | 41 | */ |
38 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { | 42 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { |
39 | s >> inf.file >> inf.width >> inf.height; | 43 | s >> inf.file >> inf.width >> inf.height; |
40 | qWarning( "Recieved %s %d %d", inf.file.latin1(), inf.width, inf.height ); | 44 | owarn << "Recieved " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; |
41 | return s; | 45 | return s; |
42 | } | 46 | } |
43 | QDataStream &operator<<( QDataStream& s, const ImageInfo& i) { | 47 | QDataStream &operator<<( QDataStream& s, const ImageInfo& i) { |
44 | return s << i.kind << i.file << i.info; | 48 | return s << i.kind << i.file << i.info; |
@@ -81,9 +85,9 @@ SlaveReciever::SlaveReciever( QObject* par) | |||
81 | SlaveReciever::~SlaveReciever() { | 85 | SlaveReciever::~SlaveReciever() { |
82 | } | 86 | } |
83 | 87 | ||
84 | void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) { | 88 | void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) { |
85 | qWarning( "String is %s", string.data() ); | 89 | owarn << "String is " << string.data() << "" << oendl; |
86 | QDataStream stream(ar, IO_ReadOnly ); | 90 | QDataStream stream(ar, IO_ReadOnly ); |
87 | QStringList lst; | 91 | QStringList lst; |
88 | static ImageInfo inf; | 92 | static ImageInfo inf; |
89 | static PixmapInfo pix; | 93 | static PixmapInfo pix; |
@@ -93,9 +97,9 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
93 | m_inList.append(inf); | 97 | m_inList.append(inf); |
94 | }else if ( string == "thumbInfos(QStringList)" ) { | 98 | }else if ( string == "thumbInfos(QStringList)" ) { |
95 | stream >> lst; | 99 | stream >> lst; |
96 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { | 100 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { |
97 | qWarning( "Adding thumbinfo for file "+ *it ); | 101 | owarn << "Adding thumbinfo for file "+ *it << oendl; |
98 | inf.file = (*it); | 102 | inf.file = (*it); |
99 | m_inList.append(inf); | 103 | m_inList.append(inf); |
100 | } | 104 | } |
101 | }else if ( string == "fullInfo(QString)" ) { | 105 | }else if ( string == "fullInfo(QString)" ) { |
@@ -104,9 +108,9 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
104 | m_inList.append(inf); | 108 | m_inList.append(inf); |
105 | }else if ( string == "fullInfos(QStringList)" ) { | 109 | }else if ( string == "fullInfos(QStringList)" ) { |
106 | stream >> lst; | 110 | stream >> lst; |
107 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { | 111 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { |
108 | qWarning( "Adding fullInfo for"+ *it ); | 112 | owarn << "Adding fullInfo for"+ *it << oendl; |
109 | inf.file = (*it); | 113 | inf.file = (*it); |
110 | inf.kind = true; | 114 | inf.kind = true; |
111 | m_inList.append(inf); | 115 | m_inList.append(inf); |
112 | } | 116 | } |
@@ -116,9 +120,9 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
116 | }else if ( string == "pixmapInfos(PixmapInfos)" ) { | 120 | }else if ( string == "pixmapInfos(PixmapInfos)" ) { |
117 | PixmapList list; | 121 | PixmapList list; |
118 | stream >> list; | 122 | stream >> list; |
119 | for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) { | 123 | for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) { |
120 | qWarning( "Got %d %d " + (*it).file, (*it).width , (*it).height ); | 124 | owarn << "Got " << (*it).width << " " << (*it).height << " " + (*it).file << oendl; |
121 | m_inPix.append(*it); | 125 | m_inPix.append(*it); |
122 | } | 126 | } |
123 | }else if ( string == "refUp()" ) { | 127 | }else if ( string == "refUp()" ) { |
124 | m_refs++; | 128 | m_refs++; |
@@ -180,9 +184,9 @@ void SlaveReciever::slotThumbNail() { | |||
180 | for(it = map->begin(); it != map->end(); ++it ) { | 184 | for(it = map->begin(); it != map->end(); ++it ) { |
181 | SlaveInterface* iface = it.data(); | 185 | SlaveInterface* iface = it.data(); |
182 | if( iface->supports(inf.file ) ) { | 186 | if( iface->supports(inf.file ) ) { |
183 | /* pixmap */ | 187 | /* pixmap */ |
184 | qWarning( "Asking for thumbNail in size %d %d for "+inf.file, inf.width, inf.height ); | 188 | owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; |
185 | inf.pixmap = iface->pixmap(inf.file, 64, 64); | 189 | inf.pixmap = iface->pixmap(inf.file, 64, 64); |
186 | m_outPix.append( inf ); | 190 | m_outPix.append( inf ); |
187 | break; | 191 | break; |
188 | } | 192 | } |
@@ -199,25 +203,25 @@ void SlaveReciever::slotThumbNail() { | |||
199 | void SlaveReciever::slotSend() { | 203 | void SlaveReciever::slotSend() { |
200 | 204 | ||
201 | m_out->stop(); | 205 | m_out->stop(); |
202 | 206 | ||
203 | qWarning( "Sending %d %d", outPix().count(), outInf().count() ); | 207 | owarn << "Sending " << outPix().count() << " " << outInf().count() << "" << oendl; |
204 | /* queue it and send */ | 208 | /* queue it and send */ |
205 | /* if this ever gets a service introduce request queues | 209 | /* if this ever gets a service introduce request queues |
206 | * so we can differinatate between different clients | 210 | * so we can differinatate between different clients |
207 | */ | 211 | */ |
208 | if (! m_outPix.isEmpty() ) { | 212 | if (! m_outPix.isEmpty() ) { |
209 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(PixmapList)" ); | 213 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(PixmapList)" ); |
210 | answer << outPix(); | 214 | answer << outPix(); |
211 | for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) { | 215 | for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) { |
212 | qWarning( "Sending out %s %d %d", (*it).file.latin1(), (*it).width, (*it).height ); | 216 | owarn << "Sending out " << (*it).file.latin1() << " " << (*it).width << " " << (*it).height << "" << oendl; |
213 | } | 217 | } |
214 | } | 218 | } |
215 | if ( !m_outList.isEmpty() ) { | 219 | if ( !m_outList.isEmpty() ) { |
216 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(StringList)" ); | 220 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(StringList)" ); |
217 | answer << outInf(); | 221 | answer << outInf(); |
218 | for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) { | 222 | for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) { |
219 | qWarning( "Sending out2 " + (*it).file ); | 223 | owarn << "Sending out2 " + (*it).file << oendl; |
220 | } | 224 | } |
221 | } | 225 | } |
222 | 226 | ||
223 | m_outList.clear(); | 227 | m_outList.clear(); |
diff --git a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp index a202457..d2e169c 100644 --- a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp +++ b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp | |||
@@ -1,6 +1,11 @@ | |||
1 | #include "thumbnailtool.h" | 1 | #include "thumbnailtool.h" |
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
3 | #include <qfileinfo.h> | 8 | #include <qfileinfo.h> |
4 | #include <qdir.h> | 9 | #include <qdir.h> |
5 | #include <qimage.h> | 10 | #include <qimage.h> |
6 | #include <qpixmap.h> | 11 | #include <qpixmap.h> |
@@ -25,24 +30,24 @@ static bool makeThumbDir( const QFileInfo& inf, bool make = false) { | |||
25 | * check for a png in /foo/bar/.opie-eye/%dx%d-imagefoo.gif | 30 | * check for a png in /foo/bar/.opie-eye/%dx%d-imagefoo.gif |
26 | */ | 31 | */ |
27 | QPixmap ThumbNailTool::getThumb( const QString& path, int width, int height ) { | 32 | QPixmap ThumbNailTool::getThumb( const QString& path, int width, int height ) { |
28 | QFileInfo inf( path ); | 33 | QFileInfo inf( path ); |
29 | qWarning( "Get Thumb" ); | 34 | owarn << "Get Thumb" << oendl; |
30 | if ( !makeThumbDir( inf ) ) { | 35 | if ( !makeThumbDir( inf ) ) { |
31 | QPixmap pix; | 36 | QPixmap pix; |
32 | return pix; | 37 | return pix; |
33 | } | 38 | } |
34 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); | 39 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); |
35 | qWarning( inf.dirPath()+str ); | 40 | owarn << inf.dirPath()+str << oendl; |
36 | return QPixmap( inf.dirPath()+str,"PNG" ); | 41 | return QPixmap( inf.dirPath()+str,"PNG" ); |
37 | 42 | ||
38 | } | 43 | } |
39 | 44 | ||
40 | void ThumbNailTool::putThumb( const QString& path, const QPixmap& pix, int width, int height ) { | 45 | void ThumbNailTool::putThumb( const QString& path, const QPixmap& pix, int width, int height ) { |
41 | QFileInfo inf( path ); | 46 | QFileInfo inf( path ); |
42 | makeThumbDir( inf, true ); | 47 | makeThumbDir( inf, true ); |
43 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); | 48 | QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() ); |
44 | qWarning( inf.dirPath()+str ); | 49 | owarn << inf.dirPath()+str << oendl; |
45 | pix.save( inf.dirPath()+str, "PNG" ); | 50 | pix.save( inf.dirPath()+str, "PNG" ); |
46 | } | 51 | } |
47 | 52 | ||
48 | 53 | ||
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 28a42eb..36def67 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -132,9 +132,9 @@ void AudioWidget::sliderReleased() { | |||
132 | mediaPlayerState.setPosition( val ); | 132 | mediaPlayerState.setPosition( val ); |
133 | } | 133 | } |
134 | 134 | ||
135 | void AudioWidget::setPosition( long i ) { | 135 | void AudioWidget::setPosition( long i ) { |
136 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); | 136 | // odebug << "<<<<<<<<<<<<<<<<<<<<<<<<set position " << i << "" << oendl; |
137 | updateSlider( i, mediaPlayerState.length() ); | 137 | updateSlider( i, mediaPlayerState.length() ); |
138 | } | 138 | } |
139 | 139 | ||
140 | 140 | ||
@@ -186,9 +186,9 @@ void AudioWidget::loadSkin() | |||
186 | 186 | ||
187 | void AudioWidget::setSeekable( bool isSeekable ) { | 187 | void AudioWidget::setSeekable( bool isSeekable ) { |
188 | 188 | ||
189 | if ( !isSeekable ) { | 189 | if ( !isSeekable ) { |
190 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | 190 | odebug << "<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>" << oendl; |
191 | if( !slider.isHidden()) { | 191 | if( !slider.isHidden()) { |
192 | slider.hide(); | 192 | slider.hide(); |
193 | } | 193 | } |
194 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 194 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
@@ -198,9 +198,9 @@ void AudioWidget::setSeekable( bool isSeekable ) { | |||
198 | } else { | 198 | } else { |
199 | // this stops the slider from being moved, thus | 199 | // this stops the slider from being moved, thus |
200 | // does not stop stream when it reaches the end | 200 | // does not stop stream when it reaches the end |
201 | slider.show(); | 201 | slider.show(); |
202 | qDebug( " CONNECT SET POSTION " ); | 202 | odebug << " CONNECT SET POSTION " << oendl; |
203 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 203 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
204 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 204 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
205 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 205 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
206 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 206 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
@@ -270,9 +270,9 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | |||
270 | case Key_Home: | 270 | case Key_Home: |
271 | break; | 271 | break; |
272 | case Key_F9: //activity | 272 | case Key_F9: //activity |
273 | hide(); | 273 | hide(); |
274 | // qDebug("Audio F9"); | 274 | // odebug << "Audio F9" << oendl; |
275 | e->accept(); | 275 | e->accept(); |
276 | break; | 276 | break; |
277 | case Key_F10: //contacts | 277 | case Key_F10: //contacts |
278 | break; | 278 | break; |
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index a42b8e5..5c24dbe 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -105,12 +105,12 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) | |||
105 | } | 105 | } |
106 | 106 | ||
107 | void Lib::run() | 107 | void Lib::run() |
108 | { | 108 | { |
109 | qDebug( "Lib::run() started" ); | 109 | odebug << "Lib::run() started" << oendl; |
110 | initialize(); | 110 | initialize(); |
111 | m_initialized = true; | 111 | m_initialized = true; |
112 | qDebug( "Lib::run() finished" ); | 112 | odebug << "Lib::run() finished" << oendl; |
113 | } | 113 | } |
114 | 114 | ||
115 | void Lib::initialize() | 115 | void Lib::initialize() |
116 | { | 116 | { |
@@ -214,9 +214,9 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { | |||
214 | 214 | ||
215 | void Lib::stop() { | 215 | void Lib::stop() { |
216 | assert( m_initialized ); | 216 | assert( m_initialized ); |
217 | 217 | ||
218 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); | 218 | odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl; |
219 | xine_stop( m_stream ); | 219 | xine_stop( m_stream ); |
220 | } | 220 | } |
221 | 221 | ||
222 | void Lib::pause( bool toggle ) { | 222 | void Lib::pause( bool toggle ) { |
@@ -326,11 +326,11 @@ void Lib::ensureInitialized() | |||
326 | { | 326 | { |
327 | if ( m_initialized ) | 327 | if ( m_initialized ) |
328 | return; | 328 | return; |
329 | 329 | ||
330 | qDebug( "waiting for initialization thread to finish" ); | 330 | odebug << "waiting for initialization thread to finish" << oendl; |
331 | wait(); | 331 | wait(); |
332 | qDebug( "initialization thread finished!" ); | 332 | odebug << "initialization thread finished!" << oendl; |
333 | } | 333 | } |
334 | 334 | ||
335 | void Lib::setWidget( XineVideoWidget *widget ) | 335 | void Lib::setWidget( XineVideoWidget *widget ) |
336 | { | 336 | { |
@@ -421,9 +421,9 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame, | |||
421 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | 421 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { |
422 | assert( m_initialized ); | 422 | assert( m_initialized ); |
423 | 423 | ||
424 | if ( !m_video ) { | 424 | if ( !m_video ) { |
425 | qWarning("not showing video now"); | 425 | owarn << "not showing video now" << oendl; |
426 | return; | 426 | return; |
427 | } | 427 | } |
428 | 428 | ||
429 | assert( m_wid ); | 429 | assert( m_wid ); |
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index a236775..7e38fc7 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -151,9 +151,9 @@ void MediaPlayer::next() { | |||
151 | } else { | 151 | } else { |
152 | mediaPlayerState.setList(); | 152 | mediaPlayerState.setList(); |
153 | } | 153 | } |
154 | } else { //if playing from file list, let's just stop | 154 | } else { //if playing from file list, let's just stop |
155 | qDebug("<<<<<<<<<<<<<<<<<stop for filelists"); | 155 | odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl; |
156 | mediaPlayerState.setPlaying(false); | 156 | mediaPlayerState.setPlaying(false); |
157 | mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); | 157 | mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); |
158 | if(l) mediaPlayerState.setLooping(l); | 158 | if(l) mediaPlayerState.setLooping(l); |
159 | if(r) mediaPlayerState.setShuffled(r); | 159 | if(r) mediaPlayerState.setShuffled(r); |
@@ -284,9 +284,9 @@ void MediaPlayer::blank( bool b ) { | |||
284 | fl= open( "/dev/fl", O_RDWR ); | 284 | fl= open( "/dev/fl", O_RDWR ); |
285 | #endif | 285 | #endif |
286 | if (fd != -1) { | 286 | if (fd != -1) { |
287 | if ( b ) { | 287 | if ( b ) { |
288 | qDebug("do blanking"); | 288 | odebug << "do blanking" << oendl; |
289 | #ifdef QT_QWS_SL5XXX | 289 | #ifdef QT_QWS_SL5XXX |
290 | ioctl( fd, FBIOBLANK, 1 ); | 290 | ioctl( fd, FBIOBLANK, 1 ); |
291 | if(fl !=-1) { | 291 | if(fl !=-1) { |
292 | ioctl( fl, 2 ); | 292 | ioctl( fl, 2 ); |
@@ -296,9 +296,9 @@ void MediaPlayer::blank( bool b ) { | |||
296 | ioctl( fd, FBIOBLANK, 3 ); | 296 | ioctl( fd, FBIOBLANK, 3 ); |
297 | #endif | 297 | #endif |
298 | isBlanked = TRUE; | 298 | isBlanked = TRUE; |
299 | } else { | 299 | } else { |
300 | qDebug("do unblanking"); | 300 | odebug << "do unblanking" << oendl; |
301 | ioctl( fd, FBIOBLANK, 0); | 301 | ioctl( fd, FBIOBLANK, 0); |
302 | #ifdef QT_QWS_SL5XXX | 302 | #ifdef QT_QWS_SL5XXX |
303 | if(fl != -1) { | 303 | if(fl != -1) { |
304 | ioctl( fl, 1); | 304 | ioctl( fl, 1); |
@@ -308,9 +308,9 @@ void MediaPlayer::blank( bool b ) { | |||
308 | isBlanked = FALSE; | 308 | isBlanked = FALSE; |
309 | } | 309 | } |
310 | close( fd ); | 310 | close( fd ); |
311 | } else { | 311 | } else { |
312 | qDebug("<< /dev/fb0 could not be opened >>"); | 312 | odebug << "<< /dev/fb0 could not be opened >>" << oendl; |
313 | } | 313 | } |
314 | } | 314 | } |
315 | 315 | ||
316 | void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { | 316 | void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { |
@@ -324,13 +324,13 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { | |||
324 | break; | 324 | break; |
325 | case Key_F11: //menu | 325 | case Key_F11: //menu |
326 | break; | 326 | break; |
327 | case Key_F12: //home | 327 | case Key_F12: //home |
328 | qDebug("Blank here"); | 328 | odebug << "Blank here" << oendl; |
329 | // mediaPlayerState->toggleBlank(); | 329 | // mediaPlayerState->toggleBlank(); |
330 | break; | 330 | break; |
331 | case Key_F13: //mail | 331 | case Key_F13: //mail |
332 | qDebug("Blank here"); | 332 | odebug << "Blank here" << oendl; |
333 | // mediaPlayerState->toggleBlank(); | 333 | // mediaPlayerState->toggleBlank(); |
334 | break; | 334 | break; |
335 | } | 335 | } |
336 | } | 336 | } |
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp index 26d5e15..95dbab5 100644 --- a/noncore/multimedia/opieplayer2/om3u.cpp +++ b/noncore/multimedia/opieplayer2/om3u.cpp | |||
@@ -36,32 +36,32 @@ | |||
36 | //extern PlayListWidget *playList; | 36 | //extern PlayListWidget *playList; |
37 | 37 | ||
38 | Om3u::Om3u( const QString &filePath, int mode) | 38 | Om3u::Om3u( const QString &filePath, int mode) |
39 | : QStringList (){ | 39 | : QStringList (){ |
40 | qDebug("<<<<<<<new m3u "+filePath); | 40 | odebug << "<<<<<<<new m3u "+filePath << oendl; |
41 | f.setName(filePath); | 41 | f.setName(filePath); |
42 | f.open(mode); | 42 | f.open(mode); |
43 | } | 43 | } |
44 | 44 | ||
45 | Om3u::~Om3u(){} | 45 | Om3u::~Om3u(){} |
46 | 46 | ||
47 | void Om3u::readM3u() { | 47 | void Om3u::readM3u() { |
48 | // qDebug("<<<<<<reading m3u "+f.name()); | 48 | // odebug << "<<<<<<reading m3u "+f.name() << oendl; |
49 | QTextStream t(&f); | 49 | QTextStream t(&f); |
50 | t.setEncoding(QTextStream::UnicodeUTF8); | 50 | t.setEncoding(QTextStream::UnicodeUTF8); |
51 | QString s; | 51 | QString s; |
52 | while ( !t.atEnd() ) { | 52 | while ( !t.atEnd() ) { |
53 | s=t.readLine(); | 53 | s=t.readLine(); |
54 | // qDebug(s); | 54 | // odebug << s << oendl; |
55 | if( s.find( "#", 0, TRUE) == -1 ) { | 55 | if( s.find( "#", 0, TRUE) == -1 ) { |
56 | if( s.left(2) == "E:" || s.left(2) == "P:" ) { | 56 | if( s.left(2) == "E:" || s.left(2) == "P:" ) { |
57 | s = s.right( s.length() -2 ); | 57 | s = s.right( s.length() -2 ); |
58 | QFileInfo f( s ); | 58 | QFileInfo f( s ); |
59 | QString name = f.baseName(); | 59 | QString name = f.baseName(); |
60 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 ); | 60 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 ); |
61 | s=s.replace( QRegExp( "\\" ), "/" ); | 61 | s=s.replace( QRegExp( "\\" ), "/" ); |
62 | append(s); | 62 | append(s); |
63 | // qDebug(s); | 63 | // odebug << s << oendl; |
64 | } else { // is url | 64 | } else { // is url |
65 | QString name; | 65 | QString name; |
66 | name = s; | 66 | name = s; |
67 | append(name); | 67 | append(name); |
@@ -79,9 +79,9 @@ void Om3u::readPls() { //it's a pls file | |||
79 | if( s.left(4) == "File" ) { | 79 | if( s.left(4) == "File" ) { |
80 | s = s.right( s.length() - s.find("=",0,true)-1 ); | 80 | s = s.right( s.length() - s.find("=",0,true)-1 ); |
81 | s = s.stripWhiteSpace(); | 81 | s = s.stripWhiteSpace(); |
82 | s.replace( QRegExp( "%20" )," "); | 82 | s.replace( QRegExp( "%20" )," "); |
83 | // qDebug( "adding " + s + " to playlist" ); | 83 | // odebug << "adding " + s + " to playlist" << oendl; |
84 | // numberofentries=2 | 84 | // numberofentries=2 |
85 | // File1=http | 85 | // File1=http |
86 | // Title | 86 | // Title |
87 | // Length | 87 | // Length |
@@ -113,9 +113,9 @@ void Om3u::write() { //writes list to m3u file | |||
113 | QTextStream t(&f); | 113 | QTextStream t(&f); |
114 | t.setEncoding(QTextStream::UnicodeUTF8); | 114 | t.setEncoding(QTextStream::UnicodeUTF8); |
115 | if(count()>0) { | 115 | if(count()>0) { |
116 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { | 116 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { |
117 | // qDebug(*it); | 117 | // odebug << *it << oendl; |
118 | t << *it << "\n"; | 118 | t << *it << "\n"; |
119 | } | 119 | } |
120 | } | 120 | } |
121 | // f.close(); | 121 | // f.close(); |
@@ -129,9 +129,9 @@ void Om3u::remove(const QString &filePath) { //removes from m3u list | |||
129 | QString list, currentFile; | 129 | QString list, currentFile; |
130 | if(count()>0) { | 130 | if(count()>0) { |
131 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { | 131 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { |
132 | currentFile=*it; | 132 | currentFile=*it; |
133 | // qDebug(*it); | 133 | // odebug << *it << oendl; |
134 | 134 | ||
135 | if( filePath != currentFile) | 135 | if( filePath != currentFile) |
136 | list += currentFile+"\n"; | 136 | list += currentFile+"\n"; |
137 | } | 137 | } |
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp index 015896f..3499837 100644 --- a/noncore/multimedia/opieplayer2/playlistselection.cpp +++ b/noncore/multimedia/opieplayer2/playlistselection.cpp | |||
@@ -43,9 +43,9 @@ private: | |||
43 | 43 | ||
44 | PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) | 44 | PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) |
45 | : QListView( parent, name ) | 45 | : QListView( parent, name ) |
46 | { | 46 | { |
47 | // qDebug("starting playlistselector"); | 47 | // odebug << "starting playlistselector" << oendl; |
48 | // #ifdef USE_PLAYLIST_BACKGROUND | 48 | // #ifdef USE_PLAYLIST_BACKGROUND |
49 | // setStaticBackground( TRUE ); | 49 | // setStaticBackground( TRUE ); |
50 | // setBackgroundPixmap( Resource::loadPixmap( "opieplayer/background" ) ); | 50 | // setBackgroundPixmap( Resource::loadPixmap( "opieplayer/background" ) ); |
51 | 51 | ||
@@ -64,9 +64,9 @@ PlayListSelection::~PlayListSelection() { | |||
64 | 64 | ||
65 | 65 | ||
66 | // #ifdef USE_PLAYLIST_BACKGROUND | 66 | // #ifdef USE_PLAYLIST_BACKGROUND |
67 | void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { | 67 | void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { |
68 | // qDebug("drawBackground"); | 68 | // odebug << "drawBackground" << oendl; |
69 | p->fillRect( r, QBrush( white ) ); | 69 | p->fillRect( r, QBrush( white ) ); |
70 | // QImage logo = Resource::loadImage( "launcher/opielogo" ); | 70 | // QImage logo = Resource::loadImage( "launcher/opielogo" ); |
71 | // if ( !logo.isNull() ) | 71 | // if ( !logo.isNull() ) |
72 | // p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); | 72 | // p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); |
@@ -183,20 +183,20 @@ void PlayListSelection::writeCurrent( Config& cfg ) { | |||
183 | cfg.setGroup("PlayList"); | 183 | cfg.setGroup("PlayList"); |
184 | QListViewItem *item = selectedItem(); | 184 | QListViewItem *item = selectedItem(); |
185 | if ( item ) | 185 | if ( item ) |
186 | cfg.writeEntry("current", item->text(0) ); | 186 | cfg.writeEntry("current", item->text(0) ); |
187 | qDebug(item->text(0)); | 187 | odebug << item->text(0) << oendl; |
188 | 188 | ||
189 | } | 189 | } |
190 | 190 | ||
191 | void PlayListSelection::setSelectedItem(const QString &strk ) { | 191 | void PlayListSelection::setSelectedItem(const QString &strk ) { |
192 | 192 | ||
193 | unSelect(); | 193 | unSelect(); |
194 | QListViewItemIterator it( this ); | 194 | QListViewItemIterator it( this ); |
195 | for ( ; it.current(); ++it ) { | 195 | for ( ; it.current(); ++it ) { |
196 | // qDebug( it.current()->text(0)); | 196 | // odebug << it.current()->text(0) << oendl; |
197 | if( strk == it.current()->text(0)) { | 197 | if( strk == it.current()->text(0)) { |
198 | // qDebug( "We have a match "+strk); | 198 | // odebug << "We have a match "+strk << oendl; |
199 | setSelected( it.current(), TRUE); | 199 | setSelected( it.current(), TRUE); |
200 | ensureItemVisible( it.current() ); | 200 | ensureItemVisible( it.current() ); |
201 | return; | 201 | return; |
202 | } | 202 | } |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 4460833..956d206 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -181,13 +181,13 @@ void PlayListWidget::writeDefaultPlaylist() { | |||
181 | QString filename=QPEApplication::documentDir() + "/default.m3u"; | 181 | QString filename=QPEApplication::documentDir() + "/default.m3u"; |
182 | QString currentString = config.readEntry( "CurrentPlaylist", filename); | 182 | QString currentString = config.readEntry( "CurrentPlaylist", filename); |
183 | if( currentString == filename) { | 183 | if( currentString == filename) { |
184 | Om3u *m3uList; | 184 | Om3u *m3uList; |
185 | // qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>"); | 185 | // odebug << "<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>" << oendl; |
186 | if( d->selectedFiles->first() ) { | 186 | if( d->selectedFiles->first() ) { |
187 | m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); | 187 | m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); |
188 | do { | 188 | do { |
189 | // qDebug(d->selectedFiles->current()->file()); | 189 | // odebug << d->selectedFiles->current()->file() << oendl; |
190 | m3uList->add( d->selectedFiles->current()->file() ); | 190 | m3uList->add( d->selectedFiles->current()->file() ); |
191 | } | 191 | } |
192 | while ( d->selectedFiles->next() ); | 192 | while ( d->selectedFiles->next() ); |
193 | 193 | ||
@@ -324,9 +324,9 @@ void PlayListWidget::addAllVideoToList() { | |||
324 | } | 324 | } |
325 | 325 | ||
326 | 326 | ||
327 | void PlayListWidget::setDocument( const QString& fileref ) { | 327 | void PlayListWidget::setDocument( const QString& fileref ) { |
328 | // qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref ); | 328 | // odebug << "<<<<<<<<set document>>>>>>>>>> "+fileref << oendl; |
329 | fromSetDocument = TRUE; | 329 | fromSetDocument = TRUE; |
330 | QFileInfo fileInfo(fileref); | 330 | QFileInfo fileInfo(fileref); |
331 | 331 | ||
332 | if ( !fileInfo.exists() ) { | 332 | if ( !fileInfo.exists() ) { |
@@ -400,9 +400,9 @@ bool PlayListWidget::prev() { | |||
400 | } | 400 | } |
401 | 401 | ||
402 | 402 | ||
403 | bool PlayListWidget::next() { | 403 | bool PlayListWidget::next() { |
404 | //qDebug("<<<<<<<<<<<<next()"); | 404 | //odebug << "<<<<<<<<<<<<next()" << oendl; |
405 | if ( mediaPlayerState->isShuffled() ) { | 405 | if ( mediaPlayerState->isShuffled() ) { |
406 | return prev(); | 406 | return prev(); |
407 | } else { | 407 | } else { |
408 | if ( !d->selectedFiles->next() ) { | 408 | if ( !d->selectedFiles->next() ) { |
@@ -611,9 +611,9 @@ void PlayListWidget::openURL() { | |||
611 | fileDlg = new InputDialog(this,tr("Add URL"),TRUE, 0); | 611 | fileDlg = new InputDialog(this,tr("Add URL"),TRUE, 0); |
612 | fileDlg->exec(); | 612 | fileDlg->exec(); |
613 | if( fileDlg->result() == 1 ) { | 613 | if( fileDlg->result() == 1 ) { |
614 | filename = fileDlg->text(); | 614 | filename = fileDlg->text(); |
615 | qDebug( "Selected filename is " + filename ); | 615 | odebug << "Selected filename is " + filename << oendl; |
616 | // Om3u *m3uList; | 616 | // Om3u *m3uList; |
617 | DocLnk lnk; | 617 | DocLnk lnk; |
618 | Config cfg( "OpiePlayer" ); | 618 | Config cfg( "OpiePlayer" ); |
619 | cfg.setGroup("PlayList"); | 619 | cfg.setGroup("PlayList"); |
@@ -687,9 +687,9 @@ void PlayListWidget::openFile() { | |||
687 | cfg.writeEntry( "LastDirectory" ,QFileInfo( str ).dirPath() ); | 687 | cfg.writeEntry( "LastDirectory" ,QFileInfo( str ).dirPath() ); |
688 | 688 | ||
689 | if( !str.isEmpty() ) { | 689 | if( !str.isEmpty() ) { |
690 | 690 | ||
691 | qDebug( "Selected filename is " + str ); | 691 | odebug << "Selected filename is " + str << oendl; |
692 | filename = str; | 692 | filename = str; |
693 | DocLnk lnk; | 693 | DocLnk lnk; |
694 | 694 | ||
695 | if( filename.right( 3) == "m3u" || filename.right(3) == "pls" ) { | 695 | if( filename.right( 3) == "m3u" || filename.right(3) == "pls" ) { |
@@ -705,9 +705,9 @@ void PlayListWidget::openFile() { | |||
705 | } | 705 | } |
706 | 706 | ||
707 | 707 | ||
708 | void PlayListWidget::readListFromFile( const QString &filename ) { | 708 | void PlayListWidget::readListFromFile( const QString &filename ) { |
709 | qDebug( "read list filename " + filename ); | 709 | odebug << "read list filename " + filename << oendl; |
710 | QFileInfo fi(filename); | 710 | QFileInfo fi(filename); |
711 | Om3u *m3uList; | 711 | Om3u *m3uList; |
712 | QString s, name; | 712 | QString s, name; |
713 | m3uList = new Om3u( filename, IO_ReadOnly ); | 713 | m3uList = new Om3u( filename, IO_ReadOnly ); |
@@ -718,9 +718,9 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
718 | 718 | ||
719 | DocLnk lnk; | 719 | DocLnk lnk; |
720 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { | 720 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { |
721 | s = *it; | 721 | s = *it; |
722 | // qDebug(s); | 722 | // odebug << s << oendl; |
723 | if(s.left(4)=="http") { | 723 | if(s.left(4)=="http") { |
724 | lnk.setName( s ); //sets file name | 724 | lnk.setName( s ); //sets file name |
725 | lnk.setIcon("opieplayer2/musicfile"); | 725 | lnk.setIcon("opieplayer2/musicfile"); |
726 | lnk.setFile( s ); //sets file name | 726 | lnk.setFile( s ); //sets file name |
@@ -752,9 +752,9 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
752 | } | 752 | } |
753 | 753 | ||
754 | // writes current playlist to current m3u file */ | 754 | // writes current playlist to current m3u file */ |
755 | void PlayListWidget::writeCurrentM3u() { | 755 | void PlayListWidget::writeCurrentM3u() { |
756 | qDebug("writing to current m3u"); | 756 | odebug << "writing to current m3u" << oendl; |
757 | Config cfg( "OpiePlayer" ); | 757 | Config cfg( "OpiePlayer" ); |
758 | cfg.setGroup("PlayList"); | 758 | cfg.setGroup("PlayList"); |
759 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default"); | 759 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default"); |
760 | 760 | ||
@@ -762,13 +762,13 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
762 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); | 762 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); |
763 | if( d->selectedFiles->first()) { | 763 | if( d->selectedFiles->first()) { |
764 | 764 | ||
765 | do { | 765 | do { |
766 | // qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file()); | 766 | // odebug << "add writeCurrentM3u " +d->selectedFiles->current()->file() << oendl; |
767 | m3uList->add( d->selectedFiles->current()->file() ); | 767 | m3uList->add( d->selectedFiles->current()->file() ); |
768 | } | 768 | } |
769 | while ( d->selectedFiles->next() ); | 769 | while ( d->selectedFiles->next() ); |
770 | // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); | 770 | // odebug << "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" << oendl; |
771 | m3uList->write(); | 771 | m3uList->write(); |
772 | m3uList->close(); | 772 | m3uList->close(); |
773 | } | 773 | } |
774 | delete m3uList; | 774 | delete m3uList; |
@@ -811,9 +811,9 @@ void PlayListWidget::writem3u() { | |||
811 | 811 | ||
812 | if( !str.isEmpty() ) { | 812 | if( !str.isEmpty() ) { |
813 | name = str; | 813 | name = str; |
814 | // name = fileDlg->text(); | 814 | // name = fileDlg->text(); |
815 | // qDebug( filename ); | 815 | // odebug << filename << oendl; |
816 | if( name.find("/",0,true) != -1) {// assume they specify a file path | 816 | if( name.find("/",0,true) != -1) {// assume they specify a file path |
817 | filename = name; | 817 | filename = name; |
818 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); | 818 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); |
819 | } | 819 | } |
@@ -829,9 +829,9 @@ void PlayListWidget::writem3u() { | |||
829 | do { | 829 | do { |
830 | m3uList->add( d->selectedFiles->current()->file()); | 830 | m3uList->add( d->selectedFiles->current()->file()); |
831 | } | 831 | } |
832 | while ( d->selectedFiles->next() ); | 832 | while ( d->selectedFiles->next() ); |
833 | // qDebug( list ); | 833 | // odebug << list << oendl; |
834 | m3uList->write(); | 834 | m3uList->write(); |
835 | m3uList->close(); | 835 | m3uList->close(); |
836 | delete m3uList; | 836 | delete m3uList; |
837 | 837 | ||
@@ -841,17 +841,17 @@ void PlayListWidget::writem3u() { | |||
841 | lnk.setFile( filename); | 841 | lnk.setFile( filename); |
842 | lnk.setIcon("opieplayer2/playlist2"); | 842 | lnk.setIcon("opieplayer2/playlist2"); |
843 | lnk.setName( name); //sets file name | 843 | lnk.setName( name); //sets file name |
844 | 844 | ||
845 | // qDebug(filename); | 845 | // odebug << filename << oendl; |
846 | Config config( "OpiePlayer" ); | 846 | Config config( "OpiePlayer" ); |
847 | config.setGroup( "PlayList" ); | 847 | config.setGroup( "PlayList" ); |
848 | 848 | ||
849 | config.writeEntry("CurrentPlaylist",filename); | 849 | config.writeEntry("CurrentPlaylist",filename); |
850 | currentPlayList=filename; | 850 | currentPlayList=filename; |
851 | 851 | ||
852 | if(!lnk.writeLink()) { | 852 | if(!lnk.writeLink()) { |
853 | qDebug("Writing doclink did not work"); | 853 | odebug << "Writing doclink did not work" << oendl; |
854 | } | 854 | } |
855 | 855 | ||
856 | setCaption(tr("OpiePlayer: ") + name); | 856 | setCaption(tr("OpiePlayer: ") + name); |
857 | } | 857 | } |
@@ -883,9 +883,9 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) { | |||
883 | case Key_R: //remove from playlist | 883 | case Key_R: //remove from playlist |
884 | removeSelected(); | 884 | removeSelected(); |
885 | break; | 885 | break; |
886 | // case Key_P: //play | 886 | // case Key_P: //play |
887 | // qDebug("Play"); | 887 | // odebug << "Play" << oendl; |
888 | // playSelected(); | 888 | // playSelected(); |
889 | // break; | 889 | // break; |
890 | case Key_Space: | 890 | case Key_Space: |
891 | // playSelected(); puh | 891 | // playSelected(); puh |
@@ -913,9 +913,9 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) { | |||
913 | } | 913 | } |
914 | } | 914 | } |
915 | 915 | ||
916 | void PlayListWidget::pmViewActivated(int index) { | 916 | void PlayListWidget::pmViewActivated(int index) { |
917 | // qDebug("%d", index); | 917 | // odebug << "" << index << "" << oendl; |
918 | switch(index) { | 918 | switch(index) { |
919 | case -16: | 919 | case -16: |
920 | { | 920 | { |
921 | mediaPlayerState->toggleFullscreen(); | 921 | mediaPlayerState->toggleFullscreen(); |
@@ -943,9 +943,9 @@ void PlayListWidget::populateSkinsMenu() { | |||
943 | QFileInfoListIterator it( *skinslist ); | 943 | QFileInfoListIterator it( *skinslist ); |
944 | QFileInfo *fi; | 944 | QFileInfo *fi; |
945 | while ( ( fi = it.current() ) ) { | 945 | while ( ( fi = it.current() ) ) { |
946 | skinName = fi->fileName(); | 946 | skinName = fi->fileName(); |
947 | // qDebug( fi->fileName() ); | 947 | // odebug << fi->fileName() << oendl; |
948 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { | 948 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { |
949 | item = skinsMenu->insertItem( fi->fileName() ) ; | 949 | item = skinsMenu->insertItem( fi->fileName() ) ; |
950 | } | 950 | } |
951 | if( skinName == "default" ) { | 951 | if( skinName == "default" ) { |
@@ -999,9 +999,9 @@ QString PlayListWidget::currentFileListPathName() const { | |||
999 | } | 999 | } |
1000 | 1000 | ||
1001 | 1001 | ||
1002 | void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | 1002 | void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { |
1003 | qDebug("qcop message "+msg ); | 1003 | odebug << "qcop message "+msg << oendl; |
1004 | QDataStream stream ( data, IO_ReadOnly ); | 1004 | QDataStream stream ( data, IO_ReadOnly ); |
1005 | if ( msg == "play()" ) { //plays current selection | 1005 | if ( msg == "play()" ) { //plays current selection |
1006 | btnPlay( true); | 1006 | btnPlay( true); |
1007 | } else if ( msg == "stop()" ) { | 1007 | } else if ( msg == "stop()" ) { |
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index 2ff190d..922f9d7 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | |||
@@ -182,9 +182,9 @@ void PlayListWidgetGui::setView( char view ) { | |||
182 | } | 182 | } |
183 | 183 | ||
184 | 184 | ||
185 | void PlayListWidgetGui::setActiveWindow() { | 185 | void PlayListWidgetGui::setActiveWindow() { |
186 | // qDebug("SETTING active window"); | 186 | // odebug << "SETTING active window" << oendl; |
187 | // When we get raised we need to ensure that it switches views | 187 | // When we get raised we need to ensure that it switches views |
188 | MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType(); | 188 | MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType(); |
189 | mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); // invalidate | 189 | mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); // invalidate |
190 | mediaPlayerState->setDisplayType( origDisplayType ); // now switch back | 190 | mediaPlayerState->setDisplayType( origDisplayType ); // now switch back |
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index 7c38983..84f5f87 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -177,13 +177,13 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file | |||
177 | SkinData *data = m_cache.take( key ); | 177 | SkinData *data = m_cache.take( key ); |
178 | if ( !data ) | 178 | if ( !data ) |
179 | data = new SkinData; | 179 | data = new SkinData; |
180 | else | 180 | else |
181 | qDebug( "SkinCache: hit" ); | 181 | odebug << "SkinCache: hit" << oendl; |
182 | 182 | ||
183 | QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath ); | 183 | QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath ); |
184 | if ( bgPixmap ) { | 184 | if ( bgPixmap ) { |
185 | qDebug( "SkinCache: hit on bgpixmap" ); | 185 | odebug << "SkinCache: hit on bgpixmap" << oendl; |
186 | data->backgroundPixmap = *bgPixmap; | 186 | data->backgroundPixmap = *bgPixmap; |
187 | } | 187 | } |
188 | else | 188 | else |
189 | data->backgroundPixmap = QPixmap(); | 189 | data->backgroundPixmap = QPixmap(); |
@@ -217,34 +217,34 @@ SkinLoader::IncrementalLoader::IncrementalLoader( const Info &info ) | |||
217 | SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadStep() | 217 | SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadStep() |
218 | { | 218 | { |
219 | switch ( m_currentState ) { | 219 | switch ( m_currentState ) { |
220 | case LoadBackgroundPixmap: | 220 | case LoadBackgroundPixmap: |
221 | qDebug( "load bgpixmap" ); | 221 | odebug << "load bgpixmap" << oendl; |
222 | m_skin.backgroundPixmap(); | 222 | m_skin.backgroundPixmap(); |
223 | m_currentState = LoadButtonUpImage; | 223 | m_currentState = LoadButtonUpImage; |
224 | break; | 224 | break; |
225 | case LoadButtonUpImage: | 225 | case LoadButtonUpImage: |
226 | qDebug( "load upimage" ); | 226 | odebug << "load upimage" << oendl; |
227 | m_skin.buttonUpImage(); | 227 | m_skin.buttonUpImage(); |
228 | m_currentState = LoadButtonDownImage; | 228 | m_currentState = LoadButtonDownImage; |
229 | break; | 229 | break; |
230 | case LoadButtonDownImage: | 230 | case LoadButtonDownImage: |
231 | qDebug( "load downimage" ); | 231 | odebug << "load downimage" << oendl; |
232 | m_skin.buttonDownImage(); | 232 | m_skin.buttonDownImage(); |
233 | m_currentState = LoadButtonMasks; | 233 | m_currentState = LoadButtonMasks; |
234 | m_currentButton = 0; | 234 | m_currentButton = 0; |
235 | break; | 235 | break; |
236 | case LoadButtonMasks: | 236 | case LoadButtonMasks: |
237 | qDebug( "load button masks %i", m_currentButton ); | 237 | odebug << "load button masks " << m_currentButton << "" << oendl; |
238 | m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName ); | 238 | m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName ); |
239 | 239 | ||
240 | m_currentButton++; | 240 | m_currentButton++; |
241 | if ( m_currentButton >= m_info.buttonCount ) | 241 | if ( m_currentButton >= m_info.buttonCount ) |
242 | m_currentState = LoadButtonMask; | 242 | m_currentState = LoadButtonMask; |
243 | 243 | ||
244 | break; | 244 | break; |
245 | case LoadButtonMask: | 245 | case LoadButtonMask: |
246 | qDebug( "load whole mask" ); | 246 | odebug << "load whole mask" << oendl; |
247 | m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount ); | 247 | m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount ); |
248 | return LoadingCompleted; | 248 | return LoadingCompleted; |
249 | } | 249 | } |
250 | 250 | ||
@@ -257,9 +257,9 @@ SkinLoader::SkinLoader() | |||
257 | } | 257 | } |
258 | 258 | ||
259 | SkinLoader::~SkinLoader() | 259 | SkinLoader::~SkinLoader() |
260 | { | 260 | { |
261 | qDebug( "SkinLoader::~SkinLoader()" ); | 261 | odebug << "SkinLoader::~SkinLoader()" << oendl; |
262 | killTimers(); | 262 | killTimers(); |
263 | delete m_currentLoader; | 263 | delete m_currentLoader; |
264 | } | 264 | } |
265 | 265 | ||
@@ -276,9 +276,9 @@ void SkinLoader::schedule( const QString &skinName, const MediaWidget::GUIInfo & | |||
276 | void SkinLoader::start() | 276 | void SkinLoader::start() |
277 | { | 277 | { |
278 | assert( m_timerId == -1 ); | 278 | assert( m_timerId == -1 ); |
279 | m_timerId = startTimer( 100 /* ms */ ); | 279 | m_timerId = startTimer( 100 /* ms */ ); |
280 | qDebug( "SkinLoader::start() %d jobs", pendingSkins.count() ); | 280 | odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; |
281 | } | 281 | } |
282 | 282 | ||
283 | void SkinLoader::timerEvent( QTimerEvent *ev ) | 283 | void SkinLoader::timerEvent( QTimerEvent *ev ) |
284 | { | 284 | { |
@@ -289,9 +289,9 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) | |||
289 | 289 | ||
290 | if ( !m_currentLoader ) { | 290 | if ( !m_currentLoader ) { |
291 | 291 | ||
292 | if ( pendingSkins.isEmpty() ) { | 292 | if ( pendingSkins.isEmpty() ) { |
293 | qDebug( "all jobs done" ); | 293 | odebug << "all jobs done" << oendl; |
294 | killTimer( m_timerId ); | 294 | killTimer( m_timerId ); |
295 | m_timerId = -1; | 295 | m_timerId = -1; |
296 | // ### qt3: use deleteLater(); | 296 | // ### qt3: use deleteLater(); |
297 | QTimer::singleShot( 0, this, SLOT( deleteMe() ) ); | 297 | QTimer::singleShot( 0, this, SLOT( deleteMe() ) ); |
@@ -301,17 +301,17 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) | |||
301 | Info nfo = *pendingSkins.begin(); | 301 | Info nfo = *pendingSkins.begin(); |
302 | pendingSkins.remove( pendingSkins.begin() ); | 302 | pendingSkins.remove( pendingSkins.begin() ); |
303 | 303 | ||
304 | m_currentLoader = new IncrementalLoader( nfo ); | 304 | m_currentLoader = new IncrementalLoader( nfo ); |
305 | qDebug( "new loader %i jobs left", pendingSkins.count() ); | 305 | odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; |
306 | } | 306 | } |
307 | 307 | ||
308 | if ( m_currentLoader->loadStep() == IncrementalLoader::LoadingCompleted ) { | 308 | if ( m_currentLoader->loadStep() == IncrementalLoader::LoadingCompleted ) { |
309 | delete m_currentLoader; | 309 | delete m_currentLoader; |
310 | m_currentLoader = 0; | 310 | m_currentLoader = 0; |
311 | } | 311 | } |
312 | 312 | ||
313 | qDebug( "finished step" ); | 313 | odebug << "finished step" << oendl; |
314 | } | 314 | } |
315 | 315 | ||
316 | void SkinLoader::deleteMe() | 316 | void SkinLoader::deleteMe() |
317 | { | 317 | { |
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp index fb951b4..d8b8abe 100644 --- a/noncore/multimedia/opieplayer2/threadutil.cpp +++ b/noncore/multimedia/opieplayer2/threadutil.cpp | |||
@@ -186,18 +186,18 @@ void Thread::start() | |||
186 | { | 186 | { |
187 | AutoLock lock( d->guard ); | 187 | AutoLock lock( d->guard ); |
188 | 188 | ||
189 | if ( d->isRunning ) { | 189 | if ( d->isRunning ) { |
190 | qDebug( "ThreadUtil::Thread::start() called for running thread." ); | 190 | odebug << "ThreadUtil::Thread::start() called for running thread." << oendl; |
191 | return; | 191 | return; |
192 | } | 192 | } |
193 | 193 | ||
194 | pthread_attr_t attributes; | 194 | pthread_attr_t attributes; |
195 | pthread_attr_init( &attributes ); | 195 | pthread_attr_init( &attributes ); |
196 | pthread_attr_setscope( &attributes, PTHREAD_SCOPE_SYSTEM ); | 196 | pthread_attr_setscope( &attributes, PTHREAD_SCOPE_SYSTEM ); |
197 | int err = pthread_create( &d->self, &attributes, start_thread, ( void* )d ); | 197 | int err = pthread_create( &d->self, &attributes, start_thread, ( void* )d ); |
198 | if ( err != 0 ) { | 198 | if ( err != 0 ) { |
199 | qDebug( "ThreadUtil::Thread::start() : can't create thread: %s", strerror( err ) ); | 199 | odebug << "ThreadUtil::Thread::start() : can't create thread: " << strerror( err ) << "" << oendl; |
200 | pthread_attr_destroy( &attributes ); | 200 | pthread_attr_destroy( &attributes ); |
201 | return; | 201 | return; |
202 | } | 202 | } |
203 | pthread_attr_destroy( &attributes ); | 203 | pthread_attr_destroy( &attributes ); |
@@ -283,9 +283,9 @@ ChannelMessage::~ChannelMessage() | |||
283 | void ChannelMessage::reply() | 283 | void ChannelMessage::reply() |
284 | { | 284 | { |
285 | if ( !m_isCall ) | 285 | if ( !m_isCall ) |
286 | { | 286 | { |
287 | qDebug( "ChannelMessage::reply() - can't reply oneway message!" ); | 287 | odebug << "ChannelMessage::reply() - can't reply oneway message!" << oendl; |
288 | return; | 288 | return; |
289 | } | 289 | } |
290 | 290 | ||
291 | if ( m_inEventHandler ) | 291 | if ( m_inEventHandler ) |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 8f11b2e..94f99f8 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -92,9 +92,9 @@ void XineControl::play( const QString& fileName ) { | |||
92 | hasVideoChannel = FALSE; | 92 | hasVideoChannel = FALSE; |
93 | hasAudioChannel = FALSE; | 93 | hasAudioChannel = FALSE; |
94 | m_fileName = fileName; | 94 | m_fileName = fileName; |
95 | 95 | ||
96 | qDebug("<<FILENAME: " + fileName + ">>>>"); | 96 | odebug << "<<FILENAME: " + fileName + ">>>>" << oendl; |
97 | 97 | ||
98 | if ( !libXine->play( fileName, 0, 0 ) ) { | 98 | if ( !libXine->play( fileName, 0, 0 ) ) { |
99 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); | 99 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); |
100 | // toggle stop so the the play button is reset | 100 | // toggle stop so the the play button is reset |
@@ -105,14 +105,14 @@ void XineControl::play( const QString& fileName ) { | |||
105 | 105 | ||
106 | MediaPlayerState::DisplayType displayType; | 106 | MediaPlayerState::DisplayType displayType; |
107 | if ( !libXine->hasVideo() ) { | 107 | if ( !libXine->hasVideo() ) { |
108 | displayType = MediaPlayerState::Audio; | 108 | displayType = MediaPlayerState::Audio; |
109 | qDebug("HAS AUDIO"); | 109 | odebug << "HAS AUDIO" << oendl; |
110 | libXine->setShowVideo( false ); | 110 | libXine->setShowVideo( false ); |
111 | hasAudioChannel = TRUE; | 111 | hasAudioChannel = TRUE; |
112 | } else { | 112 | } else { |
113 | displayType = MediaPlayerState::Video; | 113 | displayType = MediaPlayerState::Video; |
114 | qDebug("HAS VIDEO"); | 114 | odebug << "HAS VIDEO" << oendl; |
115 | libXine->setShowVideo( true ); | 115 | libXine->setShowVideo( true ); |
116 | hasVideoChannel = TRUE; | 116 | hasVideoChannel = TRUE; |
117 | } | 117 | } |
118 | // determine if slider is shown | 118 | // determine if slider is shown |
@@ -242,9 +242,9 @@ QString XineControl::getMetaInfo() { | |||
242 | QString XineControl::getErrorCode() { | 242 | QString XineControl::getErrorCode() { |
243 | 243 | ||
244 | int errorCode = libXine->error(); | 244 | int errorCode = libXine->error(); |
245 | 245 | ||
246 | qDebug( QString("ERRORCODE: %1 ").arg(errorCode) ); | 246 | odebug << QString("ERRORCODE: %1 ").arg(errorCode) << oendl; |
247 | 247 | ||
248 | if ( errorCode == 1 ) { | 248 | if ( errorCode == 1 ) { |
249 | return tr( "No input plugin found for this media type" ); | 249 | return tr( "No input plugin found for this media type" ); |
250 | } else if ( errorCode == 2 ) { | 250 | } else if ( errorCode == 2 ) { |
diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp index ce49e96..5319d97 100644 --- a/noncore/multimedia/opierec/device.cpp +++ b/noncore/multimedia/opierec/device.cpp | |||
@@ -1,22 +1,22 @@ | |||
1 | // device.cpp | 1 | // device.cpp |
2 | 2 | ||
3 | #include "device.h" | 3 | #include "device.h" |
4 | 4 | ||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
5 | #include <qpe/config.h> | 7 | #include <qpe/config.h> |
6 | #include <qpe/qcopenvelope_qws.h> | 8 | #include <qpe/qcopenvelope_qws.h> |
9 | using namespace Opie::Core; | ||
7 | 10 | ||
8 | 11 | /* STD */ | |
9 | #include <fcntl.h> | 12 | #include <fcntl.h> |
10 | #include <stdio.h> | 13 | #include <stdio.h> |
11 | #include <stdlib.h> | 14 | #include <stdlib.h> |
12 | #include <sys/ioctl.h> | 15 | #include <sys/ioctl.h> |
13 | #include <sys/soundcard.h> | 16 | #include <sys/soundcard.h> |
14 | #include <unistd.h> | 17 | #include <unistd.h> |
15 | #include<sys/wait.h> | 18 | #include <sys/wait.h> |
16 | // #include <sys/stat.h> | ||
17 | // #include <sys/time.h> | ||
18 | // #include <sys/types.h> | ||
19 | #include <unistd.h> | 19 | #include <unistd.h> |
20 | #include <errno.h> | 20 | #include <errno.h> |
21 | 21 | ||
22 | //extern QtRec *qperec; | 22 | //extern QtRec *qperec; |
@@ -31,12 +31,12 @@ Device::Device( QObject * parent, const char * dsp, const char * mixr, bool reco | |||
31 | devCh=-1; | 31 | devCh=-1; |
32 | devRate=-1; | 32 | devRate=-1; |
33 | 33 | ||
34 | if( !record){ //playing | 34 | if( !record){ //playing |
35 | qDebug("setting up DSP for playing"); | 35 | odebug << "setting up DSP for playing" << oendl; |
36 | flags = O_WRONLY; | 36 | flags = O_WRONLY; |
37 | } else { //recording | 37 | } else { //recording |
38 | qDebug("setting up DSP for recording"); | 38 | odebug << "setting up DSP for recording" << oendl; |
39 | flags = O_RDWR; | 39 | flags = O_RDWR; |
40 | // flags = O_RDONLY; | 40 | // flags = O_RDONLY; |
41 | 41 | ||
42 | // selectMicInput(); | 42 | // selectMicInput(); |
@@ -95,9 +95,9 @@ void Device::changedOutVolume(int vol) { | |||
95 | Config cfg("qpe"); | 95 | Config cfg("qpe"); |
96 | cfg.setGroup("Volume"); | 96 | cfg.setGroup("Volume"); |
97 | cfg.writeEntry("VolumePercent", QString::number( vol )); | 97 | cfg.writeEntry("VolumePercent", QString::number( vol )); |
98 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; | 98 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; |
99 | qWarning("changing output vol %d", vol); | 99 | owarn << "changing output vol " << vol << "" << oendl; |
100 | } | 100 | } |
101 | ::close(fd); | 101 | ::close(fd); |
102 | } | 102 | } |
103 | 103 | ||
@@ -110,9 +110,9 @@ void Device::changedInVolume(int vol ) { | |||
110 | Config cfg("qpe"); | 110 | Config cfg("qpe"); |
111 | cfg.setGroup("Volume"); | 111 | cfg.setGroup("Volume"); |
112 | cfg.writeEntry("Mic", QString::number(vol )); | 112 | cfg.writeEntry("Mic", QString::number(vol )); |
113 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << false; | 113 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << false; |
114 | qWarning("changing input volume %d", vol); | 114 | owarn << "changing input volume " << vol << "" << oendl; |
115 | } | 115 | } |
116 | ::close(fd); | 116 | ::close(fd); |
117 | } | 117 | } |
118 | 118 | ||
@@ -148,24 +148,24 @@ exit(1); | |||
148 | perror("The fork failed!"); | 148 | perror("The fork failed!"); |
149 | break; | 149 | break; |
150 | case 0: { | 150 | case 0: { |
151 | */ | 151 | */ |
152 | qDebug("Opening %s",dspstr); | 152 | odebug << "Opening " << dspstr << "" << oendl; |
153 | if (( sd = ::open( dspstr, flags)) == -1) { | 153 | if (( sd = ::open( dspstr, flags)) == -1) { |
154 | perror("open(\"/dev/dsp\")"); | 154 | perror("open(\"/dev/dsp\")"); |
155 | QString errorMsg="Could not open audio device\n /dev/dsp\n" | 155 | QString errorMsg="Could not open audio device\n /dev/dsp\n" |
156 | +(QString)strerror(errno); | 156 | +(QString)strerror(errno); |
157 | qDebug("XXXXXXXXXXXXXXXXXXXXXXX "+errorMsg); | 157 | odebug << "XXXXXXXXXXXXXXXXXXXXXXX "+errorMsg << oendl; |
158 | return -1; | 158 | return -1; |
159 | } | 159 | } |
160 | 160 | ||
161 | qDebug("Opening mixer"); | 161 | odebug << "Opening mixer" << oendl; |
162 | int mixerHandle=0; | 162 | int mixerHandle=0; |
163 | if (( mixerHandle = open("/dev/mixer",O_RDWR))<0) { | 163 | if (( mixerHandle = open("/dev/mixer",O_RDWR))<0) { |
164 | perror("open(\"/dev/mixer\")"); | 164 | perror("open(\"/dev/mixer\")"); |
165 | QString errorMsg="Could not open audio device\n /dev/dsp\n" | 165 | QString errorMsg="Could not open audio device\n /dev/dsp\n" |
166 | +(QString)strerror(errno); | 166 | +(QString)strerror(errno); |
167 | qDebug("XXXXXXXXXXXXXXXXXXXXXX "+errorMsg); | 167 | odebug << "XXXXXXXXXXXXXXXXXXXXXX "+errorMsg << oendl; |
168 | } | 168 | } |
169 | 169 | ||
170 | if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){ | 170 | if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){ |
171 | perror("ioctl RESET"); | 171 | perror("ioctl RESET"); |
@@ -179,9 +179,9 @@ qDebug("Opening mixer"); | |||
179 | */ | 179 | */ |
180 | /* close(pipefd[0]); | 180 | /* close(pipefd[0]); |
181 | write(pipefd[1], message, sizeof(message)); | 181 | write(pipefd[1], message, sizeof(message)); |
182 | close(pipefd[1]); | 182 | close(pipefd[1]); |
183 | // qDebug("%d",soundDevice->sd ); | 183 | // odebug << "" << soundDevice->sd << "" << oendl; |
184 | _exit(0); | 184 | _exit(0); |
185 | } | 185 | } |
186 | default: | 186 | default: |
187 | // pid greater than zero is parent getting the child's pid | 187 | // pid greater than zero is parent getting the child's pid |
@@ -205,15 +205,15 @@ qDebug("Opening mixer"); | |||
205 | // } | 205 | // } |
206 | */ | 206 | */ |
207 | // bool ok; | 207 | // bool ok; |
208 | // sd = s.toInt(&ok, 10); | 208 | // sd = s.toInt(&ok, 10); |
209 | // qDebug("<<<<<<<<<<<<<>>>>>>>>>>>>"+s); | 209 | // odebug << "<<<<<<<<<<<<<>>>>>>>>>>>>"+s << oendl; |
210 | 210 | ||
211 | // f2.close(); | 211 | // f2.close(); |
212 | // } | 212 | // } |
213 | ::close(mixerHandle ); | 213 | ::close(mixerHandle ); |
214 | // qDebug("open device %s", dspstr); | 214 | // odebug << "open device " << dspstr << "" << oendl; |
215 | // qDebug("success! %d",sd); | 215 | // odebug << "success! " << sd << "" << oendl; |
216 | return sd; | 216 | return sd; |
217 | } | 217 | } |
218 | 218 | ||
219 | bool Device::closeDevice( bool) { | 219 | bool Device::closeDevice( bool) { |
@@ -229,14 +229,14 @@ bool Device::closeDevice( bool) { | |||
229 | 229 | ||
230 | ::close( sd); //close sound device | 230 | ::close( sd); //close sound device |
231 | // sdfd=0; | 231 | // sdfd=0; |
232 | // sd=0; | 232 | // sd=0; |
233 | // qDebug("closed dsp"); | 233 | // odebug << "closed dsp" << oendl; |
234 | return true; | 234 | return true; |
235 | } | 235 | } |
236 | 236 | ||
237 | bool Device::setDeviceFormat( int form) { | 237 | bool Device::setDeviceFormat( int form) { |
238 | qDebug("set device res %d %d", form, sd); | 238 | odebug << "set device res " << form << " " << sd << "" << oendl; |
239 | if (ioctl( sd, SNDCTL_DSP_SETFMT, &form)==-1) { //set format | 239 | if (ioctl( sd, SNDCTL_DSP_SETFMT, &form)==-1) { //set format |
240 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | 240 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); |
241 | return false; | 241 | return false; |
242 | } | 242 | } |
@@ -244,9 +244,9 @@ bool Device::setDeviceFormat( int form) { | |||
244 | return true; | 244 | return true; |
245 | } | 245 | } |
246 | 246 | ||
247 | bool Device::setDeviceChannels( int ch) { | 247 | bool Device::setDeviceChannels( int ch) { |
248 | qDebug("set channels %d %d", ch, sd); | 248 | odebug << "set channels " << ch << " " << sd << "" << oendl; |
249 | if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) { | 249 | if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) { |
250 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 250 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
251 | return false; | 251 | return false; |
252 | } | 252 | } |
@@ -254,9 +254,9 @@ bool Device::setDeviceChannels( int ch) { | |||
254 | return true; | 254 | return true; |
255 | } | 255 | } |
256 | 256 | ||
257 | bool Device::setDeviceRate( int rate) { | 257 | bool Device::setDeviceRate( int rate) { |
258 | qDebug("set rate %d %d", rate, sd); | 258 | odebug << "set rate " << rate << " " << sd << "" << oendl; |
259 | if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) { | 259 | if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) { |
260 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | 260 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); |
261 | return false; | 261 | return false; |
262 | } | 262 | } |
@@ -317,11 +317,11 @@ int Device::getDeviceChannels() { | |||
317 | int Device::getDeviceFragSize() { | 317 | int Device::getDeviceFragSize() { |
318 | int frag_size; | 318 | int frag_size; |
319 | 319 | ||
320 | if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) { | 320 | if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) { |
321 | qDebug("no fragsize"); | 321 | odebug << "no fragsize" << oendl; |
322 | } else { | 322 | } else { |
323 | qDebug("driver says frag size is %d", frag_size); | 323 | odebug << "driver says frag size is " << frag_size << "" << oendl; |
324 | } | 324 | } |
325 | return frag_size; | 325 | return frag_size; |
326 | } | 326 | } |
327 | 327 | ||
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp index 6aebaa1..7f984c3 100644 --- a/noncore/multimedia/opierec/helpwindow.cpp +++ b/noncore/multimedia/opierec/helpwindow.cpp | |||
@@ -8,25 +8,30 @@ | |||
8 | ** | 8 | ** |
9 | *****************************************************************************/ | 9 | *****************************************************************************/ |
10 | 10 | ||
11 | #include "helpwindow.h" | 11 | #include "helpwindow.h" |
12 | #include <qlayout.h> | ||
13 | 12 | ||
14 | #include <qtoolbar.h> | 13 | /* OPIE */ |
14 | #include <opie2/odebug.h> | ||
15 | #include <qpe/resource.h> | 15 | #include <qpe/resource.h> |
16 | using namespace Opie::Core; | ||
16 | 17 | ||
18 | /* QT */ | ||
19 | #include <qlayout.h> | ||
20 | #include <qtoolbar.h> | ||
17 | #include <qaction.h> | 21 | #include <qaction.h> |
18 | #include <qmenubar.h> | 22 | #include <qmenubar.h> |
19 | 23 | ||
24 | /* STD */ | ||
20 | #include <ctype.h> | 25 | #include <ctype.h> |
21 | 26 | ||
22 | HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name ) | 27 | HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name ) |
23 | : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() | 28 | : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() |
24 | { | 29 | { |
25 | QGridLayout *layout = new QGridLayout( this ); | 30 | QGridLayout *layout = new QGridLayout( this ); |
26 | layout->setSpacing( 2); | 31 | layout->setSpacing( 2); |
27 | layout->setMargin( 2); | 32 | layout->setMargin( 2); |
28 | qDebug(_path); | 33 | odebug << _path << oendl; |
29 | browser = new QTextBrowser( this ); | 34 | browser = new QTextBrowser( this ); |
30 | QStringList Strlist; | 35 | QStringList Strlist; |
31 | Strlist.append( home_); | 36 | Strlist.append( home_); |
32 | browser->mimeSourceFactory()->setFilePath( Strlist ); | 37 | browser->mimeSourceFactory()->setFilePath( Strlist ); |
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro index 7b08f0e..ea1bae3 100644 --- a/noncore/multimedia/opierec/opierec.pro +++ b/noncore/multimedia/opierec/opierec.pro | |||
@@ -1,7 +1,5 @@ | |||
1 | #CONFIG = qt warn_on pdaudio | 1 | CONFIG = qt warn_on |
2 | CONFIG = qt warn_on opie | ||
3 | #CONFIG = qt warn_on quick-app | ||
4 | HEADERS = adpcm.h \ | 2 | HEADERS = adpcm.h \ |
5 | pixmaps.h \ | 3 | pixmaps.h \ |
6 | helpwindow.h \ | 4 | helpwindow.h \ |
7 | qtrec.h \ | 5 | qtrec.h \ |
@@ -28,9 +26,9 @@ contains(CONFIG, pdaudio) { | |||
28 | 26 | ||
29 | # DESTDIR=$(QPEDIR)/bin | 27 | # DESTDIR=$(QPEDIR)/bin |
30 | } | 28 | } |
31 | 29 | ||
32 | contains(CONFIG, opie) { | 30 | !contains(CONFIG, pdaudio) { |
33 | INCLUDEPATH += $(OPIEDIR)/include | 31 | INCLUDEPATH += $(OPIEDIR)/include |
34 | DEPENDPATH += $(OPIEDIR)/include | 32 | DEPENDPATH += $(OPIEDIR)/include |
35 | DESTDIR=$(OPIEDIR)/bin | 33 | DESTDIR=$(OPIEDIR)/bin |
36 | LIBS += -lqpe -lopiecore2 -lpthread | 34 | LIBS += -lqpe -lopiecore2 -lpthread |
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index 1c64ab1..2187d5a 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp | |||
@@ -7,26 +7,24 @@ | |||
7 | 7 | ||
8 | #include "pixmaps.h" | 8 | #include "pixmaps.h" |
9 | #include "qtrec.h" | 9 | #include "qtrec.h" |
10 | #include "waveform.h" | 10 | #include "waveform.h" |
11 | |||
12 | #include <pthread.h> | ||
13 | |||
14 | extern "C" { | 11 | extern "C" { |
15 | #include "adpcm.h" | 12 | #include "adpcm.h" |
16 | } | 13 | } |
17 | 14 | ||
18 | #include <sys/soundcard.h> | 15 | /* OPIE */ |
19 | 16 | #include <opie2/odebug.h> | |
20 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
21 | #include <qpe/qcopenvelope_qws.h> | 18 | #include <qpe/qcopenvelope_qws.h> |
22 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
23 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
24 | #include <qpe/storage.h> | 21 | #include <qpe/storage.h> |
22 | using namespace Opie::Core; | ||
25 | 23 | ||
24 | /* QT */ | ||
26 | #include <qcheckbox.h> | 25 | #include <qcheckbox.h> |
27 | #include <qcombobox.h> | 26 | #include <qcombobox.h> |
28 | //#include <qdatetime.h> | ||
29 | #include <qdir.h> | 27 | #include <qdir.h> |
30 | #include <qgroupbox.h> | 28 | #include <qgroupbox.h> |
31 | #include <qlabel.h> | 29 | #include <qlabel.h> |
32 | #include <qlayout.h> | 30 | #include <qlayout.h> |
@@ -37,8 +35,9 @@ extern "C" { | |||
37 | #include <qslider.h> | 35 | #include <qslider.h> |
38 | #include <qtabwidget.h> | 36 | #include <qtabwidget.h> |
39 | #include <qtimer.h> | 37 | #include <qtimer.h> |
40 | 38 | ||
39 | /* STD */ | ||
41 | #include <errno.h> | 40 | #include <errno.h> |
42 | #include <fcntl.h> | 41 | #include <fcntl.h> |
43 | #include <math.h> | 42 | #include <math.h> |
44 | #include <mntent.h> | 43 | #include <mntent.h> |
@@ -52,9 +51,9 @@ extern "C" { | |||
52 | #include <sys/vfs.h> | 51 | #include <sys/vfs.h> |
53 | #include <unistd.h> | 52 | #include <unistd.h> |
54 | #include <sys/wait.h> | 53 | #include <sys/wait.h> |
55 | #include <sys/signal.h> | 54 | #include <sys/signal.h> |
56 | 55 | #include <pthread.h> | |
57 | 56 | ||
58 | #ifdef PDAUDIO //ALSA | 57 | #ifdef PDAUDIO //ALSA |
59 | #include <alsa/asoundlib.h> | 58 | #include <alsa/asoundlib.h> |
60 | static int deviceSampleRates[8] = { 32000, 44100, 48000, 88200, 96000, 176400, 192000, -1 }; | 59 | static int deviceSampleRates[8] = { 32000, 44100, 48000, 88200, 96000, 176400, 192000, -1 }; |
@@ -135,19 +134,19 @@ void quickRec() | |||
135 | QString num; | 134 | QString num; |
136 | int level = 0; | 135 | int level = 0; |
137 | int threshold = 0; | 136 | int threshold = 0; |
138 | // int bits = filePara.resolution; | 137 | // int bits = filePara.resolution; |
139 | // qDebug("bits %d", bits); | 138 | // odebug << "bits " << bits << "" << oendl; |
140 | 139 | ||
141 | if( filePara.resolution == 16 ) { //AFMT_S16_LE) | 140 | if( filePara.resolution == 16 ) { //AFMT_S16_LE) |
142 | // qDebug("AFMT_S16_LE size %d", filePara.SecondsToRecord); | 141 | // odebug << "AFMT_S16_LE size " << filePara.SecondsToRecord << "" << oendl; |
143 | // qDebug("samples to record %d", filePara.samplesToRecord); | 142 | // odebug << "samples to record " << filePara.samplesToRecord << "" << oendl; |
144 | // qDebug("%d", filePara.sd); | 143 | // odebug << "" << filePara.sd << "" << oendl; |
145 | level = 7; | 144 | level = 7; |
146 | threshold = 0; | 145 | threshold = 0; |
147 | 146 | ||
148 | if( filePara.format == WAVE_FORMAT_DVI_ADPCM) { | 147 | if( filePara.format == WAVE_FORMAT_DVI_ADPCM) { |
149 | // qDebug("start recording WAVE_FORMAT_DVI_ADPCM"); | 148 | // odebug << "start recording WAVE_FORMAT_DVI_ADPCM" << oendl; |
150 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_DVI_ADPCM >>>>>>>>>>>>>>>>>>>>>> | 149 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_DVI_ADPCM >>>>>>>>>>>>>>>>>>>>>> |
151 | char abuf[ BUFSIZE/2 ]; | 150 | char abuf[ BUFSIZE/2 ]; |
152 | short sbuf[ BUFSIZE ]; | 151 | short sbuf[ BUFSIZE ]; |
153 | short sbuf2[ BUFSIZE ]; | 152 | short sbuf2[ BUFSIZE ]; |
@@ -156,18 +155,18 @@ void quickRec() | |||
156 | memset( sbuf2, 0, BUFSIZE); | 155 | memset( sbuf2, 0, BUFSIZE); |
157 | 156 | ||
158 | for(;;) { | 157 | for(;;) { |
159 | if ( stopped) { | 158 | if ( stopped) { |
160 | // qDebug("quickRec:: stopped"); | 159 | // odebug << "quickRec:: stopped" << oendl; |
161 | break; | 160 | break; |
162 | } | 161 | } |
163 | 162 | ||
164 | // number=::read( filePara.sd, sbuf, BUFSIZE); | 163 | // number=::read( filePara.sd, sbuf, BUFSIZE); |
165 | number = soundDevice ->devRead( filePara.sd, sbuf, BUFSIZE); | 164 | number = soundDevice ->devRead( filePara.sd, sbuf, BUFSIZE); |
166 | 165 | ||
167 | if(number <= 0) { | 166 | if(number <= 0) { |
168 | perror("recording error "); | 167 | perror("recording error "); |
169 | qDebug( "%s %d", filePara.fileName, number); | 168 | odebug << "" << filePara.fileName << " " << number << "" << oendl; |
170 | stopped = true; | 169 | stopped = true; |
171 | return; | 170 | return; |
172 | } | 171 | } |
173 | //if(stereo == 2) { | 172 | //if(stereo == 2) { |
@@ -191,16 +190,16 @@ void quickRec() | |||
191 | } | 190 | } |
192 | } | 191 | } |
193 | } else { | 192 | } else { |
194 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>> | 193 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>> |
195 | qDebug("start recording WAVE_FORMAT_PCM"); | 194 | odebug << "start recording WAVE_FORMAT_PCM" << oendl; |
196 | short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ]; | 195 | short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ]; |
197 | memset( inbuffer, 0, BUFSIZE); | 196 | memset( inbuffer, 0, BUFSIZE); |
198 | memset( outbuffer, 0, BUFSIZE); | 197 | memset( outbuffer, 0, BUFSIZE); |
199 | 198 | ||
200 | for(;;) { | 199 | for(;;) { |
201 | if ( stopped) { | 200 | if ( stopped) { |
202 | qDebug("quickRec:: stopped"); | 201 | odebug << "quickRec:: stopped" << oendl; |
203 | stopped = true; | 202 | stopped = true; |
204 | break; // stop if playing was set to false | 203 | break; // stop if playing was set to false |
205 | return; | 204 | return; |
206 | } | 205 | } |
@@ -209,9 +208,9 @@ void quickRec() | |||
209 | waveform->newSamples( inbuffer, number ); | 208 | waveform->newSamples( inbuffer, number ); |
210 | 209 | ||
211 | if( number <= 0) { | 210 | if( number <= 0) { |
212 | perror( "recording error "); | 211 | perror( "recording error "); |
213 | qDebug( filePara.fileName); | 212 | odebug << filePara.fileName << oendl; |
214 | stopped = true; | 213 | stopped = true; |
215 | return; | 214 | return; |
216 | } | 215 | } |
217 | 216 | ||
@@ -249,9 +248,9 @@ void quickRec() | |||
249 | memset( unsigned_outbuffer, 0, BUFSIZE); | 248 | memset( unsigned_outbuffer, 0, BUFSIZE); |
250 | 249 | ||
251 | for(;;) { | 250 | for(;;) { |
252 | if ( stopped) { | 251 | if ( stopped) { |
253 | qDebug("quickRec:: stopped"); | 252 | odebug << "quickRec:: stopped" << oendl; |
254 | break; // stop if playing was set to false | 253 | break; // stop if playing was set to false |
255 | } | 254 | } |
256 | 255 | ||
257 | number = ::read( filePara.sd, unsigned_inbuffer, BUFSIZE); | 256 | number = ::read( filePara.sd, unsigned_inbuffer, BUFSIZE); |
@@ -372,9 +371,9 @@ void playIt() | |||
372 | 371 | ||
373 | qApp->processEvents(); | 372 | qApp->processEvents(); |
374 | 373 | ||
375 | if( /*total >= filePara.numberSamples || */ bytesWritten == 0) { | 374 | if( /*total >= filePara.numberSamples || */ bytesWritten == 0) { |
376 | qWarning("Jane! Stop this crazy thing!"); | 375 | owarn << "Jane! Stop this crazy thing!" << oendl; |
377 | stopped = true; | 376 | stopped = true; |
378 | // playing = false; | 377 | // playing = false; |
379 | break; | 378 | break; |
380 | } | 379 | } |
@@ -717,9 +716,9 @@ void QtRec::initIconView() { | |||
717 | QString temp; | 716 | QString temp; |
718 | QPixmap image0( ( const char** ) image0_data ); | 717 | QPixmap image0( ( const char** ) image0_data ); |
719 | 718 | ||
720 | int nFiles = cfg.readNumEntry("NumberofFiles",0); | 719 | int nFiles = cfg.readNumEntry("NumberofFiles",0); |
721 | // qDebug("init number of files %d", nFiles); | 720 | // odebug << "init number of files " << nFiles << "" << oendl; |
722 | 721 | ||
723 | for(int i=1;i<= nFiles;i++) { | 722 | for(int i=1;i<= nFiles;i++) { |
724 | 723 | ||
725 | QListViewItem * item; | 724 | QListViewItem * item; |
@@ -859,9 +858,9 @@ void QtRec::initConfig() { | |||
859 | inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0)); | 858 | inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0)); |
860 | } | 859 | } |
861 | 860 | ||
862 | void QtRec::stop() { | 861 | void QtRec::stop() { |
863 | qWarning("STOP"); | 862 | owarn << "STOP" << oendl; |
864 | setRecordButton(false); | 863 | setRecordButton(false); |
865 | 864 | ||
866 | if( !recording) | 865 | if( !recording) |
867 | endPlaying(); | 866 | endPlaying(); |
@@ -921,22 +920,22 @@ bool QtRec::rec() { //record | |||
921 | // soundDevice->getDeviceRate(), | 920 | // soundDevice->getDeviceRate(), |
922 | // soundDevice->getDeviceChannels()); | 921 | // soundDevice->getDeviceChannels()); |
923 | 922 | ||
924 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); | 923 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); |
925 | // qDebug("sample rate is %d", filePara.sampleRate); | 924 | // odebug << "sample rate is " << filePara.sampleRate << "" << oendl; |
926 | filePara.SecondsToRecord = getCurrentSizeLimit(); | 925 | filePara.SecondsToRecord = getCurrentSizeLimit(); |
927 | 926 | ||
928 | // qDebug("size limit %d sec", filePara.SecondsToRecord); | 927 | // odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl; |
929 | int diskSize = checkDiskSpace( (const QString &) wavFile->trackName()); | 928 | int diskSize = checkDiskSpace( (const QString &) wavFile->trackName()); |
930 | 929 | ||
931 | if( filePara.SecondsToRecord == 0) { | 930 | if( filePara.SecondsToRecord == 0) { |
932 | fileSize = diskSize; | 931 | fileSize = diskSize; |
933 | } else if( filePara.format == WAVE_FORMAT_PCM) { | 932 | } else if( filePara.format == WAVE_FORMAT_PCM) { |
934 | // qDebug("WAVE_FORMAT_PCM"); | 933 | // odebug << "WAVE_FORMAT_PCM" << oendl; |
935 | fileSize = (filePara.SecondsToRecord ) * filePara.channels | 934 | fileSize = (filePara.SecondsToRecord ) * filePara.channels |
936 | * filePara.sampleRate * ( filePara.resolution / 8) + 1000; | 935 | * filePara.sampleRate * ( filePara.resolution / 8) + 1000; |
937 | } else { | 936 | } else { |
938 | // qDebug("WAVE_FORMAT_DVI_ADPCM"); | 937 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; |
939 | fileSize = ((filePara.SecondsToRecord) * filePara.channels | 938 | fileSize = ((filePara.SecondsToRecord) * filePara.channels |
940 | * filePara.sampleRate * ( filePara.resolution / 8) ) / 4 + 250; | 939 | * filePara.sampleRate * ( filePara.resolution / 8) ) / 4 + 250; |
941 | } | 940 | } |
942 | 941 | ||
@@ -946,9 +945,9 @@ bool QtRec::rec() { //record | |||
946 | if( paused) { | 945 | if( paused) { |
947 | paused = false; | 946 | paused = false; |
948 | } | 947 | } |
949 | // else { | 948 | // else { |
950 | qDebug("Setting timeslider %d", filePara.samplesToRecord); | 949 | odebug << "Setting timeslider " << filePara.samplesToRecord << "" << oendl; |
951 | // if(fileSize != 0) | 950 | // if(fileSize != 0) |
952 | timeSlider->setRange(0, filePara.samplesToRecord); | 951 | timeSlider->setRange(0, filePara.samplesToRecord); |
953 | // } | 952 | // } |
954 | 953 | ||
@@ -965,9 +964,9 @@ bool QtRec::rec() { //record | |||
965 | #ifdef DEV_VERSION | 964 | #ifdef DEV_VERSION |
966 | setCaption( msg); | 965 | setCaption( msg); |
967 | #endif | 966 | #endif |
968 | filePara.fileName=currentFile.latin1(); | 967 | filePara.fileName=currentFile.latin1(); |
969 | qDebug("Start recording thread"); | 968 | odebug << "Start recording thread" << oendl; |
970 | stopped = false; | 969 | stopped = false; |
971 | 970 | ||
972 | #ifdef THREADED | 971 | #ifdef THREADED |
973 | pthread_t thread1; | 972 | pthread_t thread1; |
@@ -1009,15 +1008,15 @@ void QtRec::thisTab(QWidget* widg) { | |||
1009 | } | 1008 | } |
1010 | 1009 | ||
1011 | void QtRec::getOutVol( ) { | 1010 | void QtRec::getOutVol( ) { |
1012 | filePara.outVol = soundDevice->getOutVolume(); | 1011 | filePara.outVol = soundDevice->getOutVolume(); |
1013 | // qDebug("out vol %d", filePara.outVol); | 1012 | // odebug << "out vol " << filePara.outVol << "" << oendl; |
1014 | OutputSlider->setValue( -filePara.outVol); | 1013 | OutputSlider->setValue( -filePara.outVol); |
1015 | } | 1014 | } |
1016 | 1015 | ||
1017 | void QtRec::getInVol() { | 1016 | void QtRec::getInVol() { |
1018 | filePara.inVol = soundDevice->getInVolume(); | 1017 | filePara.inVol = soundDevice->getInVolume(); |
1019 | // qDebug("in vol %d", filePara.inVol); | 1018 | // odebug << "in vol " << filePara.inVol << "" << oendl; |
1020 | InputSlider->setValue( -filePara.inVol); | 1019 | InputSlider->setValue( -filePara.inVol); |
1021 | } | 1020 | } |
1022 | 1021 | ||
1023 | void QtRec::changedOutVolume() { | 1022 | void QtRec::changedOutVolume() { |
@@ -1089,13 +1088,13 @@ bool QtRec::setupAudio( bool b) { | |||
1089 | sampleformat = AFMT_U8; | 1088 | sampleformat = AFMT_U8; |
1090 | 1089 | ||
1091 | if( !compressionCheckBox->isChecked()) { | 1090 | if( !compressionCheckBox->isChecked()) { |
1092 | filePara.format = WAVE_FORMAT_PCM; | 1091 | filePara.format = WAVE_FORMAT_PCM; |
1093 | // qDebug("WAVE_FORMAT_PCM"); | 1092 | // odebug << "WAVE_FORMAT_PCM" << oendl; |
1094 | } else { | 1093 | } else { |
1095 | filePara.format = WAVE_FORMAT_DVI_ADPCM; | 1094 | filePara.format = WAVE_FORMAT_DVI_ADPCM; |
1096 | sampleformat = AFMT_S16_LE; | 1095 | sampleformat = AFMT_S16_LE; |
1097 | // qDebug("WAVE_FORMAT_DVI_ADPCM"); | 1096 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; |
1098 | } | 1097 | } |
1099 | #endif | 1098 | #endif |
1100 | 1099 | ||
1101 | stereo = filePara.channels; | 1100 | stereo = filePara.channels; |
@@ -1109,17 +1108,17 @@ bool QtRec::setupAudio( bool b) { | |||
1109 | recording = true; | 1108 | recording = true; |
1110 | } | 1109 | } |
1111 | 1110 | ||
1112 | // if(soundDevice) delete soundDevice; | 1111 | // if(soundDevice) delete soundDevice; |
1113 | qDebug("<<<<<<<<<<<<<<<<<<<open dsp %d %d %d", filePara.sampleRate, filePara.channels, sampleformat); | 1112 | odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl; |
1114 | qWarning("change waveform settings"); | 1113 | owarn << "change waveform settings" << oendl; |
1115 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); | 1114 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); |
1116 | 1115 | ||
1117 | soundDevice = new Device( this, dspString, mixerString, b); | 1116 | soundDevice = new Device( this, dspString, mixerString, b); |
1118 | // soundDevice->openDsp(); | 1117 | // soundDevice->openDsp(); |
1119 | soundDevice->reset(); | 1118 | soundDevice->reset(); |
1120 | 1119 | ||
1121 | qDebug("device has been made %d", soundDevice->sd); | 1120 | odebug << "device has been made " << soundDevice->sd << "" << oendl; |
1122 | 1121 | ||
1123 | ////////////////// <<<<<<<<<<<<>>>>>>>>>>>> | 1122 | ////////////////// <<<<<<<<<<<<>>>>>>>>>>>> |
1124 | soundDevice->setDeviceFormat( sampleformat); | 1123 | soundDevice->setDeviceFormat( sampleformat); |
1125 | soundDevice->setDeviceChannels( filePara.channels); | 1124 | soundDevice->setDeviceChannels( filePara.channels); |
@@ -1148,9 +1147,9 @@ bool QtRec::setupAudio( bool b) { | |||
1148 | } | 1147 | } |
1149 | 1148 | ||
1150 | 1149 | ||
1151 | bool QtRec::setUpFile() { //setup file for recording | 1150 | bool QtRec::setUpFile() { //setup file for recording |
1152 | // qDebug("Setting up wavfile"); | 1151 | // odebug << "Setting up wavfile" << oendl; |
1153 | // if(wavFile) delete wavFile; | 1152 | // if(wavFile) delete wavFile; |
1154 | wavFile = new WavFile( this, (const QString &)"", | 1153 | wavFile = new WavFile( this, (const QString &)"", |
1155 | true, | 1154 | true, |
1156 | filePara.sampleRate, | 1155 | filePara.sampleRate, |
@@ -1181,9 +1180,9 @@ bool QtRec::doPlay() { | |||
1181 | stopped = false; | 1180 | stopped = false; |
1182 | recording = false; | 1181 | recording = false; |
1183 | 1182 | ||
1184 | QString num; | 1183 | QString num; |
1185 | qDebug( "Play number of samples %d", filePara.numberSamples); | 1184 | odebug << "Play number of samples " << filePara.numberSamples << "" << oendl; |
1186 | 1185 | ||
1187 | // timeSlider->setRange( 0, filePara.numberSamples); | 1186 | // timeSlider->setRange( 0, filePara.numberSamples); |
1188 | 1187 | ||
1189 | timeString.sprintf("%f", filePara.numberOfRecordedSeconds); | 1188 | timeString.sprintf("%f", filePara.numberOfRecordedSeconds); |
@@ -1233,9 +1232,9 @@ void QtRec::changesamplerateCombo(int i) { | |||
1233 | bool ok; | 1232 | bool ok; |
1234 | rate = sampleRateComboBox->text(i).toInt(&ok, 10); | 1233 | rate = sampleRateComboBox->text(i).toInt(&ok, 10); |
1235 | cfg.writeEntry( "samplerate",rate); | 1234 | cfg.writeEntry( "samplerate",rate); |
1236 | filePara.sampleRate=rate; | 1235 | filePara.sampleRate=rate; |
1237 | qDebug( "Change sample rate %d", rate); | 1236 | odebug << "Change sample rate " << rate << "" << oendl; |
1238 | cfg.write(); | 1237 | cfg.write(); |
1239 | } | 1238 | } |
1240 | 1239 | ||
1241 | 1240 | ||
@@ -1253,9 +1252,9 @@ void QtRec::changeDirCombo(int index) { | |||
1253 | (*it)->name() == sName ) { | 1252 | (*it)->name() == sName ) { |
1254 | const QString path = (*it)->path(); | 1253 | const QString path = (*it)->path(); |
1255 | recDir = path; | 1254 | recDir = path; |
1256 | cfg.writeEntry("directory", recDir); | 1255 | cfg.writeEntry("directory", recDir); |
1257 | qDebug("new rec dir "+recDir); | 1256 | odebug << "new rec dir "+recDir << oendl; |
1258 | } | 1257 | } |
1259 | } | 1258 | } |
1260 | cfg.write(); | 1259 | cfg.write(); |
1261 | } | 1260 | } |
@@ -1373,9 +1372,9 @@ void QtRec::keyPressEvent( QKeyEvent *e) { | |||
1373 | case Key_Down: | 1372 | case Key_Down: |
1374 | // newSound(); | 1373 | // newSound(); |
1375 | break; | 1374 | break; |
1376 | case Key_Left: { | 1375 | case Key_Left: { |
1377 | qDebug("rewinding"); | 1376 | odebug << "rewinding" << oendl; |
1378 | if( !e->isAutoRepeat()) | 1377 | if( !e->isAutoRepeat()) |
1379 | rewindPressed(); | 1378 | rewindPressed(); |
1380 | } | 1379 | } |
1381 | break; | 1380 | break; |
@@ -1427,21 +1426,21 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) { | |||
1427 | deleteSound(); | 1426 | deleteSound(); |
1428 | break; | 1427 | break; |
1429 | case Key_Up: | 1428 | case Key_Up: |
1430 | // stop(); | 1429 | // stop(); |
1431 | qDebug("Up"); | 1430 | odebug << "Up" << oendl; |
1432 | break; | 1431 | break; |
1433 | case Key_Down: | 1432 | case Key_Down: |
1434 | // start(); | 1433 | // start(); |
1435 | // qDebug("Down"); | 1434 | // odebug << "Down" << oendl; |
1436 | // newSound(); | 1435 | // newSound(); |
1437 | break; | 1436 | break; |
1438 | case Key_Left: | 1437 | case Key_Left: |
1439 | qDebug("Left"); | 1438 | odebug << "Left" << oendl; |
1440 | rewindReleased(); | 1439 | rewindReleased(); |
1441 | break; | 1440 | break; |
1442 | case Key_Right: | 1441 | case Key_Right: |
1443 | qDebug("Right"); | 1442 | odebug << "Right" << oendl; |
1444 | FastforwardReleased(); | 1443 | FastforwardReleased(); |
1445 | break; | 1444 | break; |
1446 | } | 1445 | } |
1447 | } | 1446 | } |
@@ -1474,13 +1473,13 @@ void QtRec::endRecording() { | |||
1474 | if( wavFile->isTempFile()) { | 1473 | if( wavFile->isTempFile()) { |
1475 | // move tmp file to regular file | 1474 | // move tmp file to regular file |
1476 | QString cmd; | 1475 | QString cmd; |
1477 | cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName); | 1476 | cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName); |
1478 | // qDebug("moving tmp file to "+currentFileName); | 1477 | // odebug << "moving tmp file to "+currentFileName << oendl; |
1479 | system( cmd.latin1()); | 1478 | system( cmd.latin1()); |
1480 | } | 1479 | } |
1481 | 1480 | ||
1482 | qDebug("Just moved " + wavFile->currentFileName); | 1481 | odebug << "Just moved " + wavFile->currentFileName << oendl; |
1483 | Config cfg("OpieRec"); | 1482 | Config cfg("OpieRec"); |
1484 | cfg.setGroup("Sounds"); | 1483 | cfg.setGroup("Sounds"); |
1485 | 1484 | ||
1486 | int nFiles = cfg.readNumEntry( "NumberofFiles",0); | 1485 | int nFiles = cfg.readNumEntry( "NumberofFiles",0); |
@@ -1494,12 +1493,12 @@ void QtRec::endRecording() { | |||
1494 | 1493 | ||
1495 | QString time; | 1494 | QString time; |
1496 | time.sprintf("%.2f", filePara.numberOfRecordedSeconds); | 1495 | time.sprintf("%.2f", filePara.numberOfRecordedSeconds); |
1497 | cfg.writeEntry( wavFile->currentFileName, time ); | 1496 | cfg.writeEntry( wavFile->currentFileName, time ); |
1498 | // qDebug("writing config numberOfRecordedSeconds "+time); | 1497 | // odebug << "writing config numberOfRecordedSeconds "+time << oendl; |
1499 | 1498 | ||
1500 | cfg.write(); | 1499 | cfg.write(); |
1501 | qDebug("finished recording"); | 1500 | odebug << "finished recording" << oendl; |
1502 | timeLabel->setText(""); | 1501 | timeLabel->setText(""); |
1503 | } | 1502 | } |
1504 | 1503 | ||
1505 | if(soundDevice) delete soundDevice; | 1504 | if(soundDevice) delete soundDevice; |
@@ -1515,9 +1514,9 @@ void QtRec::endPlaying() { | |||
1515 | playing = false; | 1514 | playing = false; |
1516 | stopped = true; | 1515 | stopped = true; |
1517 | waveform->reset(); | 1516 | waveform->reset(); |
1518 | // errorStop(); | 1517 | // errorStop(); |
1519 | // qDebug("end playing"); | 1518 | // odebug << "end playing" << oendl; |
1520 | setRecordButton( false); | 1519 | setRecordButton( false); |
1521 | 1520 | ||
1522 | toBeginningButton->setEnabled( true); | 1521 | toBeginningButton->setEnabled( true); |
1523 | toEndButton->setEnabled( true); | 1522 | toEndButton->setEnabled( true); |
@@ -1527,20 +1526,20 @@ void QtRec::endPlaying() { | |||
1527 | 1526 | ||
1528 | soundDevice->closeDevice( false); | 1527 | soundDevice->closeDevice( false); |
1529 | soundDevice->sd = -1; | 1528 | soundDevice->sd = -1; |
1530 | // if(soundDevice) delete soundDevice; | 1529 | // if(soundDevice) delete soundDevice; |
1531 | // qDebug("file and sound device closed"); | 1530 | // odebug << "file and sound device closed" << oendl; |
1532 | timeLabel->setText(""); | 1531 | timeLabel->setText(""); |
1533 | total = 0; | 1532 | total = 0; |
1534 | filePara.numberSamples = 0; | 1533 | filePara.numberSamples = 0; |
1535 | filePara.sd = -1; | 1534 | filePara.sd = -1; |
1536 | // wavFile->closeFile(); | 1535 | // wavFile->closeFile(); |
1537 | filePara.fd = 0; | 1536 | filePara.fd = 0; |
1538 | // if(wavFile) delete wavFile; //this crashes | 1537 | // if(wavFile) delete wavFile; //this crashes |
1539 | 1538 | ||
1540 | // qDebug("track closed"); | 1539 | // odebug << "track closed" << oendl; |
1541 | killTimers(); | 1540 | killTimers(); |
1542 | qWarning("reset slider"); | 1541 | owarn << "reset slider" << oendl; |
1543 | timeSlider->setValue(0); | 1542 | timeSlider->setValue(0); |
1544 | 1543 | ||
1545 | if(soundDevice) delete soundDevice; | 1544 | if(soundDevice) delete soundDevice; |
1546 | 1545 | ||
@@ -1560,9 +1559,9 @@ bool QtRec::openPlayFile() { | |||
1560 | int nFiles = cfg.readNumEntry( "NumberofFiles", 0); | 1559 | int nFiles = cfg.readNumEntry( "NumberofFiles", 0); |
1561 | for(int i=0;i<nFiles+1;i++) { //look for file | 1560 | for(int i=0;i<nFiles+1;i++) { //look for file |
1562 | if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) { | 1561 | if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) { |
1563 | currentFileName = cfg.readEntry( currentFile, "" ); | 1562 | currentFileName = cfg.readEntry( currentFile, "" ); |
1564 | qDebug("opening for play: " + currentFileName); | 1563 | odebug << "opening for play: " + currentFileName << oendl; |
1565 | } | 1564 | } |
1566 | } | 1565 | } |
1567 | wavFile = new WavFile(this, | 1566 | wavFile = new WavFile(this, |
1568 | currentFileName, | 1567 | currentFileName, |
@@ -1585,12 +1584,12 @@ bool QtRec::openPlayFile() { | |||
1585 | filePara.channels = wavFile->getChannels(); | 1584 | filePara.channels = wavFile->getChannels(); |
1586 | timeSlider->setPageStep(1); | 1585 | timeSlider->setPageStep(1); |
1587 | monitoring = true; | 1586 | monitoring = true; |
1588 | 1587 | ||
1589 | qDebug("file %d, samples %d %d", filePara.fd, filePara.numberSamples, filePara.sampleRate); | 1588 | odebug << "file " << filePara.fd << ", samples " << filePara.numberSamples << " " << filePara.sampleRate << "" << oendl; |
1590 | int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8)); | 1589 | int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8)); |
1591 | 1590 | ||
1592 | qWarning("seconds %d", sec); | 1591 | owarn << "seconds " << sec << "" << oendl; |
1593 | 1592 | ||
1594 | timeSlider->setRange(0, filePara.numberSamples ); | 1593 | timeSlider->setRange(0, filePara.numberSamples ); |
1595 | } | 1594 | } |
1596 | 1595 | ||
@@ -1689,9 +1688,9 @@ void QtRec::doRename() { | |||
1689 | 1688 | ||
1690 | } | 1689 | } |
1691 | 1690 | ||
1692 | void QtRec::okRename() { | 1691 | void QtRec::okRename() { |
1693 | qDebug(renameBox->text()); | 1692 | odebug << renameBox->text() << oendl; |
1694 | QString filename = renameBox->text(); | 1693 | QString filename = renameBox->text(); |
1695 | cancelRename(); | 1694 | cancelRename(); |
1696 | 1695 | ||
1697 | if( ListView1->currentItem() == NULL) | 1696 | if( ListView1->currentItem() == NULL) |
@@ -1701,9 +1700,9 @@ void QtRec::okRename() { | |||
1701 | cfg.setGroup("Sounds"); | 1700 | cfg.setGroup("Sounds"); |
1702 | 1701 | ||
1703 | QString file = ListView1->currentItem()->text(0); | 1702 | QString file = ListView1->currentItem()->text(0); |
1704 | 1703 | ||
1705 | qDebug("filename is " + filename); | 1704 | odebug << "filename is " + filename << oendl; |
1706 | 1705 | ||
1707 | int nFiles = cfg.readNumEntry("NumberofFiles",0); | 1706 | int nFiles = cfg.readNumEntry("NumberofFiles",0); |
1708 | 1707 | ||
1709 | for(int i=0;i<nFiles+1;i++) { //look for file | 1708 | for(int i=0;i<nFiles+1;i++) { //look for file |
@@ -1772,9 +1771,9 @@ void QtRec::doVolMuting(bool b) { | |||
1772 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << b; | 1771 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << b; |
1773 | } | 1772 | } |
1774 | 1773 | ||
1775 | void QtRec::doMicMuting(bool b) { | 1774 | void QtRec::doMicMuting(bool b) { |
1776 | // qDebug("mic mute"); | 1775 | // odebug << "mic mute" << oendl; |
1777 | Config cfg( "qpe" ); | 1776 | Config cfg( "qpe" ); |
1778 | cfg. setGroup( "Volume" ); | 1777 | cfg. setGroup( "Volume" ); |
1779 | cfg.writeEntry( "MicMute",b); | 1778 | cfg.writeEntry( "MicMute",b); |
1780 | cfg.write(); | 1779 | cfg.write(); |
@@ -1828,9 +1827,9 @@ long QtRec::checkDiskSpace(const QString &path) { | |||
1828 | // char f_fname[6]; /* Volumename */ | 1827 | // char f_fname[6]; /* Volumename */ |
1829 | // char f_fpack[6]; /* Pack name */ | 1828 | // char f_fpack[6]; /* Pack name */ |
1830 | 1829 | ||
1831 | void QtRec::receive( const QCString &msg, const QByteArray & ) { | 1830 | void QtRec::receive( const QCString &msg, const QByteArray & ) { |
1832 | qDebug("Voicerecord received message "+msg); | 1831 | odebug << "Voicerecord received message "+msg << oendl; |
1833 | 1832 | ||
1834 | } | 1833 | } |
1835 | 1834 | ||
1836 | 1835 | ||
@@ -1853,9 +1852,9 @@ void QtRec::timerEvent( QTimerEvent * ) { | |||
1853 | if( recording && filePara.SecondsToRecord < secCount && filePara.SecondsToRecord != 0) { | 1852 | if( recording && filePara.SecondsToRecord < secCount && filePara.SecondsToRecord != 0) { |
1854 | stop(); | 1853 | stop(); |
1855 | } | 1854 | } |
1856 | 1855 | ||
1857 | qDebug( "%d", secCount ); | 1856 | odebug << "" << secCount << "" << oendl; |
1858 | QString timeString; | 1857 | QString timeString; |
1859 | #ifdef DEV_VERSION | 1858 | #ifdef DEV_VERSION |
1860 | QString msg; | 1859 | QString msg; |
1861 | msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution); | 1860 | msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution); |
@@ -1869,9 +1868,9 @@ void QtRec::timerEvent( QTimerEvent * ) { | |||
1869 | } | 1868 | } |
1870 | 1869 | ||
1871 | void QtRec::changeTimeSlider(int index) { | 1870 | void QtRec::changeTimeSlider(int index) { |
1872 | if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return; | 1871 | if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return; |
1873 | // qDebug("Slider moved to %d",index); | 1872 | // odebug << "Slider moved to " << index << "" << oendl; |
1874 | paused = true; | 1873 | paused = true; |
1875 | stopped = true; | 1874 | stopped = true; |
1876 | 1875 | ||
1877 | sliderPos=index; | 1876 | sliderPos=index; |
@@ -1884,18 +1883,18 @@ void QtRec::changeTimeSlider(int index) { | |||
1884 | } | 1883 | } |
1885 | 1884 | ||
1886 | void QtRec::timeSliderPressed() { | 1885 | void QtRec::timeSliderPressed() { |
1887 | if( ListView1->currentItem() == 0) return; | 1886 | if( ListView1->currentItem() == 0) return; |
1888 | // qDebug("slider pressed"); | 1887 | // odebug << "slider pressed" << oendl; |
1889 | paused = true; | 1888 | paused = true; |
1890 | stopped = true; | 1889 | stopped = true; |
1891 | } | 1890 | } |
1892 | 1891 | ||
1893 | void QtRec::timeSliderReleased() { | 1892 | void QtRec::timeSliderReleased() { |
1894 | if( ListView1->currentItem() == 0) return; | 1893 | if( ListView1->currentItem() == 0) return; |
1895 | sliderPos = timeSlider->value(); | 1894 | sliderPos = timeSlider->value(); |
1896 | 1895 | ||
1897 | // qDebug("slider released %d", sliderPos); | 1896 | // odebug << "slider released " << sliderPos << "" << oendl; |
1898 | stopped = false; | 1897 | stopped = false; |
1899 | int newPos = lseek( filePara.fd, sliderPos, SEEK_SET); | 1898 | int newPos = lseek( filePara.fd, sliderPos, SEEK_SET); |
1900 | total = newPos*4; | 1899 | total = newPos*4; |
1901 | filePara.numberOfRecordedSeconds = (float)sliderPos / (float)filePara.sampleRate * (float)2; | 1900 | filePara.numberOfRecordedSeconds = (float)sliderPos / (float)filePara.sampleRate * (float)2; |
@@ -1923,9 +1922,9 @@ void QtRec::rewindTimerTimeout() { | |||
1923 | int sliderValue = timeSlider->value(); | 1922 | int sliderValue = timeSlider->value(); |
1924 | sliderValue = sliderValue - ( filePara.numberSamples / 100); | 1923 | sliderValue = sliderValue - ( filePara.numberSamples / 100); |
1925 | // if(toBeginningButton->isDown()) | 1924 | // if(toBeginningButton->isDown()) |
1926 | timeSlider->setValue( sliderValue ) ; | 1925 | timeSlider->setValue( sliderValue ) ; |
1927 | // qDebug("%d", sliderValue); | 1926 | // odebug << "" << sliderValue << "" << oendl; |
1928 | QString timeString; | 1927 | QString timeString; |
1929 | filePara.numberOfRecordedSeconds = (float)sliderValue / (float)filePara.sampleRate * (float)2; | 1928 | filePara.numberOfRecordedSeconds = (float)sliderValue / (float)filePara.sampleRate * (float)2; |
1930 | timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds); | 1929 | timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds); |
1931 | timeLabel->setText( timeString+ tr(" seconds")); | 1930 | timeLabel->setText( timeString+ tr(" seconds")); |
@@ -1937,9 +1936,9 @@ void QtRec::rewindReleased() { | |||
1937 | sliderPos=timeSlider->value(); | 1936 | sliderPos=timeSlider->value(); |
1938 | stopped = false; | 1937 | stopped = false; |
1939 | int newPos = lseek( filePara.fd, sliderPos, SEEK_SET); | 1938 | int newPos = lseek( filePara.fd, sliderPos, SEEK_SET); |
1940 | total = newPos * 4; | 1939 | total = newPos * 4; |
1941 | // qDebug("rewind released %d", total); | 1940 | // odebug << "rewind released " << total << "" << oendl; |
1942 | startTimer( 1000); | 1941 | startTimer( 1000); |
1943 | doPlay(); | 1942 | doPlay(); |
1944 | } | 1943 | } |
1945 | } | 1944 | } |
@@ -2001,9 +2000,9 @@ QString QtRec::getStorage(const QString &fileName) { | |||
2001 | storage = name; | 2000 | storage = name; |
2002 | // const QString options = (*it)->options(); | 2001 | // const QString options = (*it)->options(); |
2003 | // if( name.find( tr("Internal"),0,true) == -1) { | 2002 | // if( name.find( tr("Internal"),0,true) == -1) { |
2004 | // storageComboBox->insertItem( name +" -> "+disk); | 2003 | // storageComboBox->insertItem( name +" -> "+disk); |
2005 | // qDebug(name); | 2004 | // odebug << name << oendl; |
2006 | } | 2005 | } |
2007 | return storage; | 2006 | return storage; |
2008 | // struct mntent *me; | 2007 | // struct mntent *me; |
2009 | // // if(fileName == "/etc/mtab") { | 2008 | // // if(fileName == "/etc/mtab") { |
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp index 35bc14d..7e9b50f 100644 --- a/noncore/multimedia/opierec/wavFile.cpp +++ b/noncore/multimedia/opierec/wavFile.cpp | |||
@@ -1,19 +1,22 @@ | |||
1 | //wavFile.cpp | 1 | //wavFile.cpp |
2 | #include "wavFile.h" | 2 | #include "wavFile.h" |
3 | #include "qtrec.h" | 3 | #include "qtrec.h" |
4 | 4 | ||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
7 | #include <qpe/config.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
10 | /* QT */ | ||
5 | #include <qmessagebox.h> | 11 | #include <qmessagebox.h> |
6 | #include <qdir.h> | 12 | #include <qdir.h> |
7 | 13 | ||
8 | #include <qpe/config.h> | 14 | /* STD */ |
9 | |||
10 | #include <errno.h> | 15 | #include <errno.h> |
11 | |||
12 | #include <sys/time.h> | 16 | #include <sys/time.h> |
13 | #include <sys/types.h> | 17 | #include <sys/types.h> |
14 | #include <sys/vfs.h> | 18 | #include <sys/vfs.h> |
15 | |||
16 | #include <fcntl.h> | 19 | #include <fcntl.h> |
17 | #include <math.h> | 20 | #include <math.h> |
18 | #include <mntent.h> | 21 | #include <mntent.h> |
19 | #include <stdio.h> | 22 | #include <stdio.h> |
@@ -23,9 +26,9 @@ | |||
23 | WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate, | 26 | WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate, |
24 | int channels, int resolution, int format ) | 27 | int channels, int resolution, int format ) |
25 | : QObject( parent) | 28 | : QObject( parent) |
26 | { | 29 | { |
27 | //qDebug("new wave file"); | 30 | //odebug << "new wave file" << oendl; |
28 | bool b = makeNwFile; | 31 | bool b = makeNwFile; |
29 | wavSampleRate=sampleRate; | 32 | wavSampleRate=sampleRate; |
30 | wavFormat=format; | 33 | wavFormat=format; |
31 | wavChannels=channels; | 34 | wavChannels=channels; |
@@ -39,9 +42,9 @@ WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int | |||
39 | } | 42 | } |
40 | 43 | ||
41 | bool WavFile::newFile() { | 44 | bool WavFile::newFile() { |
42 | 45 | ||
43 | // qDebug("Set up new file"); | 46 | // odebug << "Set up new file" << oendl; |
44 | Config cfg("OpieRec"); | 47 | Config cfg("OpieRec"); |
45 | cfg.setGroup("Settings"); | 48 | cfg.setGroup("Settings"); |
46 | 49 | ||
47 | currentFileName=cfg.readEntry("directory",QDir::homeDirPath()); | 50 | currentFileName=cfg.readEntry("directory",QDir::homeDirPath()); |
@@ -59,9 +62,9 @@ bool WavFile::newFile() { | |||
59 | else | 62 | else |
60 | currentFileName += date; | 63 | currentFileName += date; |
61 | currentFileName+=".wav"; | 64 | currentFileName+=".wav"; |
62 | 65 | ||
63 | // qDebug("set up file for recording: "+currentFileName); | 66 | // odebug << "set up file for recording: "+currentFileName << oendl; |
64 | char pointer[] = "/tmp/opierec-XXXXXX"; | 67 | char pointer[] = "/tmp/opierec-XXXXXX"; |
65 | int fd = 0; | 68 | int fd = 0; |
66 | 69 | ||
67 | if( currentFileName.find("/mnt",0,true) == -1 | 70 | if( currentFileName.find("/mnt",0,true) == -1 |
@@ -74,9 +77,9 @@ bool WavFile::newFile() { | |||
74 | perror("mkstemp failed"); | 77 | perror("mkstemp failed"); |
75 | return false; | 78 | return false; |
76 | } | 79 | } |
77 | 80 | ||
78 | // qDebug("Opening tmp file %s",pointer); | 81 | // odebug << "Opening tmp file " << pointer << "" << oendl; |
79 | track.setName( pointer); | 82 | track.setName( pointer); |
80 | 83 | ||
81 | } else { //just use regular file.. no moving | 84 | } else { //just use regular file.. no moving |
82 | 85 | ||
@@ -84,9 +87,9 @@ bool WavFile::newFile() { | |||
84 | track.setName( currentFileName); | 87 | track.setName( currentFileName); |
85 | } | 88 | } |
86 | if(!track.open( IO_ReadWrite | IO_Truncate)) { | 89 | if(!track.open( IO_ReadWrite | IO_Truncate)) { |
87 | QString errorMsg=(QString)strerror(errno); | 90 | QString errorMsg=(QString)strerror(errno); |
88 | qDebug(errorMsg); | 91 | odebug << errorMsg << oendl; |
89 | QMessageBox::message("Note", "Error opening file.\n" +errorMsg); | 92 | QMessageBox::message("Note", "Error opening file.\n" +errorMsg); |
90 | 93 | ||
91 | return false; | 94 | return false; |
92 | } else { | 95 | } else { |
@@ -105,16 +108,16 @@ void WavFile::closeFile() { | |||
105 | track.close(); | 108 | track.close(); |
106 | } | 109 | } |
107 | 110 | ||
108 | int WavFile::openFile(const QString ¤tFileName) { | 111 | int WavFile::openFile(const QString ¤tFileName) { |
109 | // qDebug("open play file "+currentFileName); | 112 | // odebug << "open play file "+currentFileName << oendl; |
110 | closeFile(); | 113 | closeFile(); |
111 | 114 | ||
112 | track.setName(currentFileName); | 115 | track.setName(currentFileName); |
113 | 116 | ||
114 | if(!track.open(IO_ReadOnly)) { | 117 | if(!track.open(IO_ReadOnly)) { |
115 | QString errorMsg=(QString)strerror(errno); | 118 | QString errorMsg=(QString)strerror(errno); |
116 | qDebug("<<<<<<<<<<< "+errorMsg+currentFileName); | 119 | odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl; |
117 | QMessageBox::message("Note", "Error opening file.\n" +errorMsg); | 120 | QMessageBox::message("Note", "Error opening file.\n" +errorMsg); |
118 | return -1; | 121 | return -1; |
119 | } else { | 122 | } else { |
120 | parseWavHeader( track.handle()); | 123 | parseWavHeader( track.handle()); |
@@ -130,13 +133,13 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) { | |||
130 | (*hdr).fmtLen = 16; // format length = 16 | 133 | (*hdr).fmtLen = 16; // format length = 16 |
131 | 134 | ||
132 | if( wavFormat == WAVE_FORMAT_PCM) { | 135 | if( wavFormat == WAVE_FORMAT_PCM) { |
133 | (*hdr).fmtTag = 1; // PCM | 136 | (*hdr).fmtTag = 1; // PCM |
134 | // qDebug("set header WAVE_FORMAT_PCM"); | 137 | // odebug << "set header WAVE_FORMAT_PCM" << oendl; |
135 | } | 138 | } |
136 | else { | 139 | else { |
137 | (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM | 140 | (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM |
138 | // qDebug("set header WAVE_FORMAT_DVI_ADPCM"); | 141 | // odebug << "set header WAVE_FORMAT_DVI_ADPCM" << oendl; |
139 | } | 142 | } |
140 | 143 | ||
141 | // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels | 144 | // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels |
142 | (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels | 145 | (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels |
@@ -159,54 +162,54 @@ bool WavFile::adjustHeaders(int fd, int total) { | |||
159 | int i = total + 36; | 162 | int i = total + 36; |
160 | write( fd, &i, sizeof(i)); | 163 | write( fd, &i, sizeof(i)); |
161 | lseek( fd, 40, SEEK_SET); | 164 | lseek( fd, 40, SEEK_SET); |
162 | write( fd, &total, sizeof(total)); | 165 | write( fd, &total, sizeof(total)); |
163 | qDebug("adjusting header %d", total); | 166 | odebug << "adjusting header " << total << "" << oendl; |
164 | return true; | 167 | return true; |
165 | } | 168 | } |
166 | 169 | ||
167 | int WavFile::parseWavHeader(int fd) { | 170 | int WavFile::parseWavHeader(int fd) { |
168 | qDebug("Parsing wav header"); | 171 | odebug << "Parsing wav header" << oendl; |
169 | char string[4]; | 172 | char string[4]; |
170 | int found; | 173 | int found; |
171 | short fmt; | 174 | short fmt; |
172 | unsigned short ch, bitrate; | 175 | unsigned short ch, bitrate; |
173 | unsigned long samplerrate, longdata; | 176 | unsigned long samplerrate, longdata; |
174 | 177 | ||
175 | if (read(fd, string, 4) < 4) { | 178 | if (read(fd, string, 4) < 4) { |
176 | qDebug(" Could not read from sound file.\n"); | 179 | odebug << " Could not read from sound file.\n" << oendl; |
177 | return -1; | 180 | return -1; |
178 | } | 181 | } |
179 | if (strncmp(string, "RIFF", 4)) { | 182 | if (strncmp(string, "RIFF", 4)) { |
180 | qDebug(" not a valid WAV file.\n"); | 183 | odebug << " not a valid WAV file.\n" << oendl; |
181 | return -1; | 184 | return -1; |
182 | } | 185 | } |
183 | lseek(fd, 4, SEEK_CUR); | 186 | lseek(fd, 4, SEEK_CUR); |
184 | if (read(fd, string, 4) < 4) { | 187 | if (read(fd, string, 4) < 4) { |
185 | qDebug("Could not read from sound file.\n"); | 188 | odebug << "Could not read from sound file.\n" << oendl; |
186 | return -1; | 189 | return -1; |
187 | } | 190 | } |
188 | if (strncmp(string, "WAVE", 4)) { | 191 | if (strncmp(string, "WAVE", 4)) { |
189 | qDebug("not a valid WAV file.\n"); | 192 | odebug << "not a valid WAV file.\n" << oendl; |
190 | return -1; | 193 | return -1; |
191 | } | 194 | } |
192 | found = 0; | 195 | found = 0; |
193 | 196 | ||
194 | while (!found) { | 197 | while (!found) { |
195 | if (read(fd, string, 4) < 4) { | 198 | if (read(fd, string, 4) < 4) { |
196 | qDebug("Could not read from sound file.\n"); | 199 | odebug << "Could not read from sound file.\n" << oendl; |
197 | return -1; | 200 | return -1; |
198 | } | 201 | } |
199 | if (strncmp(string, "fmt ", 4)) { | 202 | if (strncmp(string, "fmt ", 4)) { |
200 | if (read(fd, &longdata, 4) < 4) { | 203 | if (read(fd, &longdata, 4) < 4) { |
201 | qDebug("Could not read from sound file.\n"); | 204 | odebug << "Could not read from sound file.\n" << oendl; |
202 | return -1; | 205 | return -1; |
203 | } | 206 | } |
204 | lseek(fd, longdata, SEEK_CUR); | 207 | lseek(fd, longdata, SEEK_CUR); |
205 | } else { | 208 | } else { |
206 | lseek(fd, 4, SEEK_CUR); | 209 | lseek(fd, 4, SEEK_CUR); |
207 | if (read(fd, &fmt, 2) < 2) { | 210 | if (read(fd, &fmt, 2) < 2) { |
208 | qDebug("Could not read format chunk.\n"); | 211 | odebug << "Could not read format chunk.\n" << oendl; |
209 | return -1; | 212 | return -1; |
210 | } | 213 | } |
211 | if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { | 214 | if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { |
212 | qDebug("Wave file contains unknown format." | 215 | qDebug("Wave file contains unknown format." |
@@ -214,53 +217,53 @@ int WavFile::parseWavHeader(int fd) { | |||
214 | return -1; | 217 | return -1; |
215 | } | 218 | } |
216 | wavFormat = fmt; | 219 | wavFormat = fmt; |
217 | // compressionFormat=fmt; | 220 | // compressionFormat=fmt; |
218 | qDebug("compressionFormat is %d", fmt); | 221 | odebug << "compressionFormat is " << fmt << "" << oendl; |
219 | if (read(fd, &ch, 2) < 2) { | 222 | if (read(fd, &ch, 2) < 2) { |
220 | qDebug("Could not read format chunk.\n"); | 223 | odebug << "Could not read format chunk.\n" << oendl; |
221 | return -1; | 224 | return -1; |
222 | } else { | 225 | } else { |
223 | wavChannels = ch; | 226 | wavChannels = ch; |
224 | qDebug("File has %d channels", ch); | 227 | odebug << "File has " << ch << " channels" << oendl; |
225 | } | 228 | } |
226 | if (read(fd, &samplerrate, 4) < 4) { | 229 | if (read(fd, &samplerrate, 4) < 4) { |
227 | qDebug("Could not read from format chunk.\n"); | 230 | odebug << "Could not read from format chunk.\n" << oendl; |
228 | return -1; | 231 | return -1; |
229 | } else { | 232 | } else { |
230 | wavSampleRate = samplerrate; | 233 | wavSampleRate = samplerrate; |
231 | // sampleRate = samplerrate; | 234 | // sampleRate = samplerrate; |
232 | qDebug("File has samplerate of %d",(int) samplerrate); | 235 | odebug << "File has samplerate of " << (int) samplerrate << "" << oendl; |
233 | } | 236 | } |
234 | lseek(fd, 6, SEEK_CUR); | 237 | lseek(fd, 6, SEEK_CUR); |
235 | if (read(fd, &bitrate, 2) < 2) { | 238 | if (read(fd, &bitrate, 2) < 2) { |
236 | qDebug("Could not read format chunk.\n"); | 239 | odebug << "Could not read format chunk.\n" << oendl; |
237 | return -1; | 240 | return -1; |
238 | } else { | 241 | } else { |
239 | wavResolution=bitrate; | 242 | wavResolution=bitrate; |
240 | // resolution = bitrate; | 243 | // resolution = bitrate; |
241 | qDebug("File has bitrate of %d", bitrate); | 244 | odebug << "File has bitrate of " << bitrate << "" << oendl; |
242 | } | 245 | } |
243 | found++; | 246 | found++; |
244 | } | 247 | } |
245 | } | 248 | } |
246 | found = 0; | 249 | found = 0; |
247 | while (!found) { | 250 | while (!found) { |
248 | if (read(fd, string, 4) < 4) { | 251 | if (read(fd, string, 4) < 4) { |
249 | qDebug("Could not read from sound file.\n"); | 252 | odebug << "Could not read from sound file.\n" << oendl; |
250 | return -1; | 253 | return -1; |
251 | } | 254 | } |
252 | 255 | ||
253 | if (strncmp(string, "data", 4)) { | 256 | if (strncmp(string, "data", 4)) { |
254 | if (read(fd, &longdata, 4)<4) { | 257 | if (read(fd, &longdata, 4)<4) { |
255 | qDebug("Could not read from sound file.\n"); | 258 | odebug << "Could not read from sound file.\n" << oendl; |
256 | return -1; | 259 | return -1; |
257 | } | 260 | } |
258 | 261 | ||
259 | lseek(fd, longdata, SEEK_CUR); | 262 | lseek(fd, longdata, SEEK_CUR); |
260 | } else { | 263 | } else { |
261 | if (read(fd, &longdata, 4) < 4) { | 264 | if (read(fd, &longdata, 4) < 4) { |
262 | qDebug("Could not read from sound file.\n"); | 265 | odebug << "Could not read from sound file.\n" << oendl; |
263 | return -1; | 266 | return -1; |
264 | } else { | 267 | } else { |
265 | wavNumberSamples = longdata; | 268 | wavNumberSamples = longdata; |
266 | qDebug("file has length of %d \nlasting %d seconds", (int)longdata, | 269 | qDebug("file has length of %d \nlasting %d seconds", (int)longdata, |
diff --git a/noncore/multimedia/opierec/waveform.cpp b/noncore/multimedia/opierec/waveform.cpp index 9cc40b4..7c9a25f 100644 --- a/noncore/multimedia/opierec/waveform.cpp +++ b/noncore/multimedia/opierec/waveform.cpp | |||
@@ -18,10 +18,14 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "waveform.h" | 20 | #include "waveform.h" |
21 | 21 | ||
22 | #include <qpainter.h> | 22 | /* OPIE */ |
23 | #include <opie2/odebug.h> | ||
24 | using namespace Opie::Core; | ||
23 | 25 | ||
26 | /* QT */ | ||
27 | #include <qpainter.h> | ||
24 | 28 | ||
25 | Waveform::Waveform( QWidget *parent, const char *name, WFlags fl ) | 29 | Waveform::Waveform( QWidget *parent, const char *name, WFlags fl ) |
26 | : QWidget( parent, name, fl ) | 30 | : QWidget( parent, name, fl ) |
27 | { | 31 | { |
@@ -37,11 +41,11 @@ Waveform::Waveform( QWidget *parent, const char *name, WFlags fl ) | |||
37 | 41 | ||
38 | void Waveform::changeSettings( int frequency, int channels ) | 42 | void Waveform::changeSettings( int frequency, int channels ) |
39 | { | 43 | { |
40 | makePixmap(); | 44 | makePixmap(); |
41 | // qWarning("change waveform %d, %d", frequency, channels); | 45 | // owarn << "change waveform " << frequency << ", " << channels << "" << oendl; |
42 | samplesPerPixel = frequency * channels / (5 * windowSize); | 46 | samplesPerPixel = frequency * channels / (5 * windowSize); |
43 | qWarning("Waveform::changeSettings %d", samplesPerPixel); | 47 | owarn << "Waveform::changeSettings " << samplesPerPixel << "" << oendl; |
44 | if ( !samplesPerPixel ) | 48 | if ( !samplesPerPixel ) |
45 | samplesPerPixel = 1; | 49 | samplesPerPixel = 1; |
46 | currentValue = 0; | 50 | currentValue = 0; |
47 | numSamples = 0; | 51 | numSamples = 0; |
@@ -95,9 +99,9 @@ void Waveform::newSamples( const short *buf, int len ) | |||
95 | } | 99 | } |
96 | } | 100 | } |
97 | 101 | ||
98 | // Copy the final state back to the object. | 102 | // Copy the final state back to the object. |
99 | //qWarning("%d, %d, %d", currentValue, numSamples, windowPosn); | 103 | //owarn << "" << currentValue << ", " << numSamples << ", " << windowPosn << "" << oendl; |
100 | this->currentValue = currentValue; | 104 | this->currentValue = currentValue; |
101 | this->numSamples = numSamples; | 105 | this->numSamples = numSamples; |
102 | this->windowPosn = windowPosn; | 106 | this->windowPosn = windowPosn; |
103 | } | 107 | } |
diff --git a/noncore/multimedia/powerchord/config.in b/noncore/multimedia/powerchord/config.in index ab1512b..5db784a 100644 --- a/noncore/multimedia/powerchord/config.in +++ b/noncore/multimedia/powerchord/config.in | |||
@@ -1,7 +1,7 @@ | |||
1 | config POWERCHORD | 1 | config POWERCHORD |
2 | boolean "opie-powerchord (guitar chord generator and tuning)" | 2 | boolean "opie-powerchord (guitar chord generator and tuning)" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
5 | comment "opie-powerchord needs a libqpe" | 5 | comment "opie-powerchord needs a libqpe and libopiecore2" |
6 | depends !(( LIBQPE || LIBQPE-X11 ) ) | 6 | depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE ) |
7 | 7 | ||
diff --git a/noncore/multimedia/powerchord/powerchord.pro b/noncore/multimedia/powerchord/powerchord.pro index 917c88f..f7af6d6 100644 --- a/noncore/multimedia/powerchord/powerchord.pro +++ b/noncore/multimedia/powerchord/powerchord.pro | |||
@@ -17,10 +17,9 @@ SOURCES = main.cpp \ | |||
17 | powerchordbase.cpp | 17 | powerchordbase.cpp |
18 | 18 | ||
19 | INCLUDEPATH+= $(OPIEDIR)/include | 19 | INCLUDEPATH+= $(OPIEDIR)/include |
20 | DEPENDPATH+= $(OPIEDIR)/include | 20 | DEPENDPATH+= $(OPIEDIR)/include |
21 | LIBS += -lqpe | 21 | LIBS += -lqpe -lopiecore2 |
22 | #INTERFACES= powerchordbase.ui | ||
23 | DESTDIR = $(OPIEDIR)/bin | 22 | DESTDIR = $(OPIEDIR)/bin |
24 | TARGET = powerchord | 23 | TARGET = powerchord |
25 | 24 | ||
26 | include ( $(OPIEDIR)/include.pro ) | 25 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/multimedia/powerchord/powerchordbase.cpp b/noncore/multimedia/powerchord/powerchordbase.cpp index 4fb5dda..0694ba3 100644 --- a/noncore/multimedia/powerchord/powerchordbase.cpp +++ b/noncore/multimedia/powerchord/powerchordbase.cpp | |||
@@ -6,21 +6,25 @@ | |||
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #include "powerchordbase.h" | 9 | #include "powerchordbase.h" |
10 | |||
11 | #include "fretboard.h" | 10 | #include "fretboard.h" |
12 | #include "vumeter.h" | 11 | #include "vumeter.h" |
12 | |||
13 | /* OPIE */ | ||
14 | #include <opie2/odebug.h> | ||
15 | #include <qpe/resource.h> | ||
16 | using namespace Opie::Core; | ||
17 | |||
18 | /* QT */ | ||
13 | #include <qcombobox.h> | 19 | #include <qcombobox.h> |
14 | #include <qlabel.h> | 20 | #include <qlabel.h> |
15 | #include <qlistbox.h> | 21 | #include <qlistbox.h> |
16 | #include <qpushbutton.h> | 22 | #include <qpushbutton.h> |
17 | #include <qspinbox.h> | 23 | #include <qspinbox.h> |
18 | #include <qtabwidget.h> | 24 | #include <qtabwidget.h> |
19 | #include <qlayout.h> | 25 | #include <qlayout.h> |
20 | #include <qtooltip.h> | 26 | #include <qtooltip.h> |
21 | #include <qpe/resource.h> | ||
22 | |||
23 | 27 | ||
24 | /* | 28 | /* |
25 | * Constructs a PowerchordBase which is a child of 'parent', with the | 29 | * Constructs a PowerchordBase which is a child of 'parent', with the |
26 | * name 'name' and widget flags set to 'f' | 30 | * name 'name' and widget flags set to 'f' |
@@ -579,7 +583,7 @@ PowerchordBase::~PowerchordBase() | |||
579 | } | 583 | } |
580 | 584 | ||
581 | void PowerchordBase::change_handler() | 585 | void PowerchordBase::change_handler() |
582 | { | 586 | { |
583 | qWarning( "PowerchordBase::change_handler(): Not implemented yet!" ); | 587 | owarn << "PowerchordBase::change_handler(): Not implemented yet!" << oendl; |
584 | } | 588 | } |
585 | 589 | ||
diff --git a/noncore/multimedia/showimg/ImageFileSelector.cpp b/noncore/multimedia/showimg/ImageFileSelector.cpp index 79ee925..53cc883 100644 --- a/noncore/multimedia/showimg/ImageFileSelector.cpp +++ b/noncore/multimedia/showimg/ImageFileSelector.cpp | |||
@@ -1,15 +1,17 @@ | |||
1 | #include "ImageFileSelector.h" | ||
1 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | #include <qpe/qpeapplication.h> | ||
6 | using namespace Opie::Core; | ||
2 | 7 | ||
3 | #include "qpe/qpeapplication.h" | 8 | /* QT */ |
4 | 9 | #include <qlabel.h> | |
5 | #include <stdlib.h> | ||
6 | |||
7 | #include <qlabel.h> | ||
8 | #include <qfileinfo.h> | 10 | #include <qfileinfo.h> |
9 | 11 | ||
10 | #include "ImageFileSelector.h" | 12 | /* STD */ |
11 | 13 | #include <stdlib.h> | |
12 | 14 | ||
13 | ThumbWidget::ThumbWidget(QPixmap p,QString text,const DocLnk& f,QWidget *parent,int w) | 15 | ThumbWidget::ThumbWidget(QPixmap p,QString text,const DocLnk& f,QWidget *parent,int w) |
14 | : QWidget( parent ),fl(f) | 16 | : QWidget( parent ),fl(f) |
15 | { | 17 | { |
@@ -154,9 +156,9 @@ void ImageFileSelector::updateSizes() | |||
154 | } | 156 | } |
155 | 157 | ||
156 | void ImageFileSelector::reread(bool) | 158 | void ImageFileSelector::reread(bool) |
157 | { | 159 | { |
158 | // qDebug("reread"); | 160 | // odebug << "reread" << oendl; |
159 | ImageFileSelectorItem *item = (ImageFileSelectorItem *)detailed->selectedItem(); | 161 | ImageFileSelectorItem *item = (ImageFileSelectorItem *)detailed->selectedItem(); |
160 | QString oldFile; | 162 | QString oldFile; |
161 | if ( item ) | 163 | if ( item ) |
162 | oldFile = item->file().file(); | 164 | oldFile = item->file().file(); |
@@ -220,9 +222,9 @@ int ImageFileSelector::fileCount() | |||
220 | return count; | 222 | return count; |
221 | } | 223 | } |
222 | const DocLnk * ImageFileSelector::selected() | 224 | const DocLnk * ImageFileSelector::selected() |
223 | { | 225 | { |
224 | qDebug("image selected"); | 226 | odebug << "image selected" << oendl; |
225 | ImageFileSelectorItem *item = (ImageFileSelectorItem *) detailed->selectedItem(); | 227 | ImageFileSelectorItem *item = (ImageFileSelectorItem *) detailed->selectedItem(); |
226 | if ( item ) | 228 | if ( item ) |
227 | return new DocLnk( item->file() ); | 229 | return new DocLnk( item->file() ); |
228 | return 0; | 230 | return 0; |
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp index 696a57b..24377ed 100644 --- a/noncore/multimedia/showimg/showimg.cpp +++ b/noncore/multimedia/showimg/showimg.cpp | |||
@@ -25,25 +25,27 @@ | |||
25 | #include "showimg.h" | 25 | #include "showimg.h" |
26 | #include "ImageFileSelector.h" | 26 | #include "ImageFileSelector.h" |
27 | #include "settingsdialog.h" | 27 | #include "settingsdialog.h" |
28 | 28 | ||
29 | 29 | /* OPIE */ | |
30 | #include <opie2/odebug.h> | ||
30 | #include <opie2/ofiledialog.h> | 31 | #include <opie2/ofiledialog.h> |
31 | |||
32 | #include <qpe/qpeapplication.h> | 32 | #include <qpe/qpeapplication.h> |
33 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
34 | #include <qpe/resource.h> | 34 | #include <qpe/resource.h> |
35 | #include <qtoolbar.h> | 35 | using namespace Opie::Core; |
36 | using namespace Opie::Ui; | ||
36 | 37 | ||
38 | /* QT */ | ||
39 | #include <qtoolbar.h> | ||
37 | #include <qaction.h> | 40 | #include <qaction.h> |
38 | #include <qfiledialog.h> | 41 | #include <qfiledialog.h> |
39 | #include <qmenubar.h> | 42 | #include <qmenubar.h> |
40 | #include <qspinbox.h> | 43 | #include <qspinbox.h> |
41 | 44 | ||
45 | /* STD */ | ||
42 | #include <math.h> | 46 | #include <math.h> |
43 | 47 | ||
44 | |||
45 | using namespace Opie::Ui; | ||
46 | ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) | 48 | ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) |
47 | : QDialog(parent,0,true) | 49 | : QDialog(parent,0,true) |
48 | { | 50 | { |
49 | setCaption(caption); | 51 | setCaption(caption); |
@@ -285,9 +287,9 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int /*wFlags*/ ) | |||
285 | cv=ImageFileSelector::THUMBNAIL; | 287 | cv=ImageFileSelector::THUMBNAIL; |
286 | else | 288 | else |
287 | cv=ImageFileSelector::DETAILED; | 289 | cv=ImageFileSelector::DETAILED; |
288 | 290 | ||
289 | qDebug("cv = %d",cv); | 291 | odebug << "cv = " << cv << "" << oendl; |
290 | 292 | ||
291 | fileSelector = new ImageFileSelector( cv,stack, "fs"); | 293 | fileSelector = new ImageFileSelector( cv,stack, "fs"); |
292 | 294 | ||
293 | //switchThumbView(); | 295 | //switchThumbView(); |
@@ -412,9 +414,9 @@ void ImageViewer::settings() | |||
412 | dlg.setRotate(rotateOnLoad); | 414 | dlg.setRotate(rotateOnLoad); |
413 | dlg.setFastLoad(fastLoad); | 415 | dlg.setFastLoad(fastLoad); |
414 | 416 | ||
415 | if ( QPEApplication::execDialog(&dlg) == QDialog::Accepted ) { | 417 | if ( QPEApplication::execDialog(&dlg) == QDialog::Accepted ) { |
416 | qDebug("<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>"); | 418 | odebug << "<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>" << oendl; |
417 | slideDelay = dlg.delay(); | 419 | slideDelay = dlg.delay(); |
418 | slideRepeat = dlg.repeat(); | 420 | slideRepeat = dlg.repeat(); |
419 | slideReverse = dlg.reverse(); | 421 | slideReverse = dlg.reverse(); |
420 | rotateOnLoad = dlg.rotate(); | 422 | rotateOnLoad = dlg.rotate(); |
@@ -504,9 +506,9 @@ void ImageViewer::show() | |||
504 | } | 506 | } |
505 | 507 | ||
506 | void ImageViewer::show(const QString& fileref) | 508 | void ImageViewer::show(const QString& fileref) |
507 | { | 509 | { |
508 | // qDebug("Show "+fileref); | 510 | // odebug << "Show "+fileref << oendl; |
509 | bFromDocView = TRUE; | 511 | bFromDocView = TRUE; |
510 | closeFileSelector(); | 512 | closeFileSelector(); |
511 | DocLnk link(fileref); | 513 | DocLnk link(fileref); |
512 | if ( link.isValid() ) { | 514 | if ( link.isValid() ) { |
@@ -534,9 +536,9 @@ void ImageViewer::openFile() { | |||
534 | void ImageViewer::openFile( const DocLnk &link ) | 536 | void ImageViewer::openFile( const DocLnk &link ) |
535 | { | 537 | { |
536 | closeFileSelector(); | 538 | closeFileSelector(); |
537 | // DocLnk link(file); | 539 | // DocLnk link(file); |
538 | qDebug("open "+link.name()); | 540 | odebug << "open "+link.name() << oendl; |
539 | updateCaption( link.name() ); | 541 | updateCaption( link.name() ); |
540 | loadImage( link.file() ); | 542 | loadImage( link.file() ); |
541 | if (slideTimer->isActive()) { | 543 | if (slideTimer->isActive()) { |
542 | slideTimer->start(slideDelay * 1000, FALSE); | 544 | slideTimer->start(slideDelay * 1000, FALSE); |
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro index 6fd019e..c905da8 100644 --- a/noncore/multimedia/showimg/showimg.pro +++ b/noncore/multimedia/showimg/showimg.pro | |||
@@ -1,5 +1,5 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h | 2 | HEADERS = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h |
3 | SOURCES = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp | 3 | SOURCES = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp |
4 | TARGET = showimg | 4 | TARGET = showimg |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/multimedia/tonleiter/config.in b/noncore/multimedia/tonleiter/config.in index d580ad7..9bd167e 100644 --- a/noncore/multimedia/tonleiter/config.in +++ b/noncore/multimedia/tonleiter/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TONLEITER | 1 | config TONLEITER |
2 | boolean "tonleiter (shows scales on sting instruments)" | 2 | boolean "tonleiter (shows scales on sting instruments)" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/multimedia/tonleiter/editinst.cpp b/noncore/multimedia/tonleiter/editinst.cpp index ccb4560..a8c20c8 100644 --- a/noncore/multimedia/tonleiter/editinst.cpp +++ b/noncore/multimedia/tonleiter/editinst.cpp | |||
@@ -1,9 +1,14 @@ | |||
1 | #include "editinst.h" | 1 | #include "editinst.h" |
2 | 2 | ||
3 | #include <qpushbutton.h> | 3 | /* OPIE */ |
4 | 4 | #include <opie2/odebug.h> | |
5 | #include <qpe/config.h> | ||
5 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
7 | using namespace Opie::Core; | ||
8 | |||
9 | /* QT */ | ||
10 | #include <qpushbutton.h> | ||
6 | 11 | ||
7 | Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const char* name) | 12 | Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const char* name) |
8 | :QDialog(parent,name,true,0),data(data) | 13 | :QDialog(parent,name,true,0),data(data) |
9 | { | 14 | { |
@@ -99,9 +104,9 @@ void Menu::InstEditDialog::saveInstrument() | |||
99 | void Menu::InstEditDialog::loadInstrument() | 104 | void Menu::InstEditDialog::loadInstrument() |
100 | { | 105 | { |
101 | stringlist.clear(); | 106 | stringlist.clear(); |
102 | Instrument inst=data->getInstrument(instid); | 107 | Instrument inst=data->getInstrument(instid); |
103 | qDebug("load Instrument : %d strings",inst.noOfStrings()); | 108 | odebug << "load Instrument : " << inst.noOfStrings() << " strings" << oendl; |
104 | for(uint s=0;s<inst.noOfStrings();s++) | 109 | for(uint s=0;s<inst.noOfStrings();s++) |
105 | { | 110 | { |
106 | stringlist.append(new EditStringWidget(inst.string(s),stringwidget)); | 111 | stringlist.append(new EditStringWidget(inst.string(s),stringwidget)); |
107 | } | 112 | } |
diff --git a/noncore/multimedia/tonleiter/fretboard.cpp b/noncore/multimedia/tonleiter/fretboard.cpp index 7e63e01..58bdb86 100644 --- a/noncore/multimedia/tonleiter/fretboard.cpp +++ b/noncore/multimedia/tonleiter/fretboard.cpp | |||
@@ -1,6 +1,11 @@ | |||
1 | #include "fretboard.h" | 1 | #include "fretboard.h" |
2 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
3 | #include <qpainter.h> | 8 | #include <qpainter.h> |
4 | 9 | ||
5 | Graph::FretBoard::FretBoard(TonleiterData* data,QWidget* parent,const char* name,WFlags f) | 10 | Graph::FretBoard::FretBoard(TonleiterData* data,QWidget* parent,const char* name,WFlags f) |
6 | :QWidget(parent,name,f),data(data) | 11 | :QWidget(parent,name,f),data(data) |
@@ -26,9 +31,9 @@ void Graph::FretBoard::paintEvent(QPaintEvent* pe) | |||
26 | Q_UNUSED(pe); | 31 | Q_UNUSED(pe); |
27 | 32 | ||
28 | int instid=data->getCurrentInstrumentID(); | 33 | int instid=data->getCurrentInstrumentID(); |
29 | inst=data->getInstrument(instid); | 34 | inst=data->getInstrument(instid); |
30 | //qDebug("inst %d is %s",instid,inst.instName().data()); | 35 | //odebug << "inst " << instid << " is " << inst.instName().data() << "" << oendl; |
31 | 36 | ||
32 | QRect mysize=rect(); | 37 | QRect mysize=rect(); |
33 | 38 | ||
34 | xmargin=(int)(mysize.width()*0.05); | 39 | xmargin=(int)(mysize.width()*0.05); |
@@ -142,19 +147,19 @@ void Graph::FretBoard::paintScale(QPainter* p) | |||
142 | 147 | ||
143 | //no more than six octaves can be visualised (there is a zero octave) | 148 | //no more than six octaves can be visualised (there is a zero octave) |
144 | int octave=Note::octaveOfBaseNote(data->getCurrentBaseNote(),note)-baseoctave; | 149 | int octave=Note::octaveOfBaseNote(data->getCurrentBaseNote(),note)-baseoctave; |
145 | if(octave<0) | 150 | if(octave<0) |
146 | qDebug("%d,%d",octave,baseoctave); | 151 | odebug << "" << octave << "," << baseoctave << "" << oendl; |
147 | if(octave>5) | 152 | if(octave>5) |
148 | { | 153 | { |
149 | qDebug("octave out of range"); | 154 | odebug << "octave out of range" << oendl; |
150 | octave=5; | 155 | octave=5; |
151 | } | 156 | } |
152 | 157 | ||
153 | p->setPen(QColor(255,0,0)); | 158 | p->setPen(QColor(255,0,0)); |
154 | int c= ( (note-12*baseoctave) - (12*octave+data->getCurrentBaseNote()) )*15; | 159 | int c= ( (note-12*baseoctave) - (12*octave+data->getCurrentBaseNote()) )*15; |
155 | if(c<0 || c>255) | 160 | if(c<0 || c>255) |
156 | qDebug("%d = %d - ( %d + %d)",c,note,12*octave,data->getCurrentBaseNote()); | 161 | odebug << "" << c << " = " << note << " - ( " << 12*octave << " + " << data->getCurrentBaseNote() << ")" << oendl; |
157 | QColor dotcolor(255,255,255); | 162 | QColor dotcolor(255,255,255); |
158 | 163 | ||
159 | if(octave==0) | 164 | if(octave==0) |
160 | dotcolor=QColor(c,c,255); | 165 | dotcolor=QColor(c,c,255); |
diff --git a/noncore/multimedia/tonleiter/tonleiter.pro b/noncore/multimedia/tonleiter/tonleiter.pro index 4bd1bc2..4be3bef 100644 --- a/noncore/multimedia/tonleiter/tonleiter.pro +++ b/noncore/multimedia/tonleiter/tonleiter.pro | |||
@@ -1,13 +1,11 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | #CONFIG = qt warn_on | ||
3 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
4 | HEADERS = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h | 3 | HEADERS = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h |
5 | SOURCES = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp | 4 | SOURCES = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
8 | LIBS += -lqpe | 7 | LIBS += -lqpe -lopiecore2 |
9 | INTERFACES = | ||
10 | TARGET = tonleiter | 8 | TARGET = tonleiter |
11 | DESTDIR = $(OPIEDIR)/bin | 9 | DESTDIR = $(OPIEDIR)/bin |
12 | #TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti | 10 | |
13 | include ( $(OPIEDIR)/include.pro ) | 11 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/multimedia/tonleiter/tonleiterdata.cpp b/noncore/multimedia/tonleiter/tonleiterdata.cpp index 33b3c49..564b7f0 100644 --- a/noncore/multimedia/tonleiter/tonleiterdata.cpp +++ b/noncore/multimedia/tonleiter/tonleiterdata.cpp | |||
@@ -1,10 +1,11 @@ | |||
1 | #include "tonleiterdata.h" | 1 | #include "tonleiterdata.h" |
2 | |||
3 | #include <qpe/config.h> | ||
4 | |||
5 | using namespace Data; | 2 | using namespace Data; |
6 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | #include <qpe/config.h> | ||
7 | using namespace Opie::Core; | ||
7 | 8 | ||
8 | TonleiterData::TonleiterData(QObject* parent) | 9 | TonleiterData::TonleiterData(QObject* parent) |
9 | :QObject(parent) | 10 | :QObject(parent) |
10 | { | 11 | { |
@@ -151,9 +152,9 @@ Instrument TonleiterData::getInstrument(int id) | |||
151 | if(id>=0 && id<noOfInstruments()) | 152 | if(id>=0 && id<noOfInstruments()) |
152 | return instruments[id]; | 153 | return instruments[id]; |
153 | else | 154 | else |
154 | { | 155 | { |
155 | qDebug("undefined insrtument %d of %d",id,instruments.count()); | 156 | odebug << "undefined insrtument " << id << " of " << instruments.count() << "" << oendl; |
156 | return Instrument(); | 157 | return Instrument(); |
157 | } | 158 | } |
158 | 159 | ||
159 | } | 160 | } |
@@ -173,9 +174,9 @@ Scale TonleiterData::getScale(int id) | |||
173 | if(id>=0 && id<noOfScales()) | 174 | if(id>=0 && id<noOfScales()) |
174 | return scales[id]; | 175 | return scales[id]; |
175 | else | 176 | else |
176 | { | 177 | { |
177 | qDebug("Undefined scale"); | 178 | odebug << "Undefined scale" << oendl; |
178 | return Scale(); | 179 | return Scale(); |
179 | } | 180 | } |
180 | } | 181 | } |
181 | //**************************************************************************** | 182 | //**************************************************************************** |
diff --git a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp index d904a71..285d2c1 100644 --- a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp +++ b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp | |||
@@ -33,9 +33,9 @@ int Note::getNoteFromName(QString name,int octave) | |||
33 | int Note::octaveOfBaseNote(int base,int note) | 33 | int Note::octaveOfBaseNote(int base,int note) |
34 | { | 34 | { |
35 | int normnote = (note>=base) ? note-base : (12-base)+note; | 35 | int normnote = (note>=base) ? note-base : (12-base)+note; |
36 | int octave=getOctaveOfNote(normnote); | 36 | int octave=getOctaveOfNote(normnote); |
37 | //qDebug("note %d of %d base is norm %d -> ocatve %d",note,base,normnote,octave); | 37 | //odebug << "note " << note << " of " << base << " base is norm " << normnote << " -> ocatve " << octave << "" << oendl; |
38 | return octave; | 38 | return octave; |
39 | } | 39 | } |
40 | //**************************************************************************** | 40 | //**************************************************************************** |
41 | //**************************************************************************** | 41 | //**************************************************************************** |
@@ -130,14 +130,14 @@ bool Scale::noteInScale(int base,int note) | |||
130 | int normnote = (note>=base) ? note-base : (12-base)+note; | 130 | int normnote = (note>=base) ? note-base : (12-base)+note; |
131 | 131 | ||
132 | if(halftones.contains(normnote)>0) | 132 | if(halftones.contains(normnote)>0) |
133 | { | 133 | { |
134 | //qDebug("OK : base : %d, note %d -> norm %d",base,note,normnote); | 134 | //odebug << "OK : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; |
135 | return true; | 135 | return true; |
136 | } | 136 | } |
137 | else | 137 | else |
138 | { | 138 | { |
139 | //qDebug("BAD : base : %d, note %d -> norm %d",base,note,normnote); | 139 | //odebug << "BAD : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; |
140 | return false; | 140 | return false; |
141 | } | 141 | } |
142 | } | 142 | } |
143 | //**************************************************************************** | 143 | //**************************************************************************** |
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp index 54d2da2..ae28313 100644 --- a/noncore/net/mail/accountitem.cpp +++ b/noncore/net/mail/accountitem.cpp | |||
@@ -77,9 +77,9 @@ void POP3viewItem::refresh() | |||
77 | } | 77 | } |
78 | 78 | ||
79 | RECBODYP POP3viewItem::fetchBody( const RecMailP &mail ) | 79 | RECBODYP POP3viewItem::fetchBody( const RecMailP &mail ) |
80 | { | 80 | { |
81 | qDebug( "POP3 fetchBody" ); | 81 | odebug << "POP3 fetchBody" << oendl; |
82 | return wrapper->fetchBody( mail ); | 82 | return wrapper->fetchBody( mail ); |
83 | } | 83 | } |
84 | 84 | ||
85 | QPopupMenu * POP3viewItem::getContextMenu() | 85 | QPopupMenu * POP3viewItem::getContextMenu() |
@@ -268,9 +268,9 @@ void NNTPviewItem::refresh() | |||
268 | } | 268 | } |
269 | 269 | ||
270 | RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail ) | 270 | RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail ) |
271 | { | 271 | { |
272 | qDebug( "NNTP fetchBody" ); | 272 | odebug << "NNTP fetchBody" << oendl; |
273 | return wrapper->fetchBody( mail ); | 273 | return wrapper->fetchBody( mail ); |
274 | } | 274 | } |
275 | 275 | ||
276 | QPopupMenu * NNTPviewItem::getContextMenu() | 276 | QPopupMenu * NNTPviewItem::getContextMenu() |
@@ -459,9 +459,9 @@ void IMAPviewItem::refreshFolders(bool force) | |||
459 | if ((*it)->getDisplayName().lower()=="inbox") | 459 | if ((*it)->getDisplayName().lower()=="inbox") |
460 | { | 460 | { |
461 | item = new IMAPfolderItem( (*it), this , item ); | 461 | item = new IMAPfolderItem( (*it), this , item ); |
462 | folders->remove(it); | 462 | folders->remove(it); |
463 | qDebug("inbox found"); | 463 | odebug << "inbox found" << oendl; |
464 | break; | 464 | break; |
465 | } | 465 | } |
466 | } | 466 | } |
467 | for ( it = folders->begin(); it!=folders->end(); ++it) | 467 | for ( it = folders->begin(); it!=folders->end(); ++it) |
@@ -532,9 +532,9 @@ void IMAPviewItem::createNewFolder() | |||
532 | } | 532 | } |
533 | 533 | ||
534 | void IMAPviewItem::contextMenuSelected(int id) | 534 | void IMAPviewItem::contextMenuSelected(int id) |
535 | { | 535 | { |
536 | qDebug("Id selected: %i",id); | 536 | odebug << "Id selected: " << id << "" << oendl; |
537 | switch (id) | 537 | switch (id) |
538 | { | 538 | { |
539 | case 0: | 539 | case 0: |
540 | refreshFolders(true); | 540 | refreshFolders(true); |
@@ -670,9 +670,9 @@ void IMAPfolderItem::deleteFolder() | |||
670 | int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), | 670 | int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), |
671 | QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()), | 671 | QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()), |
672 | QObject::tr("Yes",contextName), | 672 | QObject::tr("Yes",contextName), |
673 | QObject::tr("No",contextName),QString::null,1,1); | 673 | QObject::tr("No",contextName),QString::null,1,1); |
674 | qDebug("Auswahl: %i",yesno); | 674 | odebug << "Auswahl: " << yesno << "" << oendl; |
675 | if (yesno == 0) | 675 | if (yesno == 0) |
676 | { | 676 | { |
677 | if (imap->getWrapper()->deleteMbox(folder)) | 677 | if (imap->getWrapper()->deleteMbox(folder)) |
678 | { | 678 | { |
@@ -697,9 +697,9 @@ void IMAPfolderItem::downloadMails() | |||
697 | } | 697 | } |
698 | 698 | ||
699 | void IMAPfolderItem::contextMenuSelected(int id) | 699 | void IMAPfolderItem::contextMenuSelected(int id) |
700 | { | 700 | { |
701 | qDebug("Selected id: %i",id); | 701 | odebug << "Selected id: " << id << "" << oendl; |
702 | AccountView * view = (AccountView*)listView(); | 702 | AccountView * view = (AccountView*)listView(); |
703 | switch(id) | 703 | switch(id) |
704 | { | 704 | { |
705 | case 0: | 705 | case 0: |
@@ -801,9 +801,9 @@ void MHviewItem::refresh(bool force) | |||
801 | } | 801 | } |
802 | 802 | ||
803 | RECBODYP MHviewItem::fetchBody( const RecMailP &mail ) | 803 | RECBODYP MHviewItem::fetchBody( const RecMailP &mail ) |
804 | { | 804 | { |
805 | qDebug( "MH fetchBody" ); | 805 | odebug << "MH fetchBody" << oendl; |
806 | return wrapper->fetchBody( mail ); | 806 | return wrapper->fetchBody( mail ); |
807 | } | 807 | } |
808 | 808 | ||
809 | QPopupMenu * MHviewItem::getContextMenu() | 809 | QPopupMenu * MHviewItem::getContextMenu() |
@@ -931,9 +931,9 @@ void MHfolderItem::deleteFolder() | |||
931 | int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), | 931 | int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), |
932 | QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()), | 932 | QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()), |
933 | QObject::tr("Yes",contextName), | 933 | QObject::tr("Yes",contextName), |
934 | QObject::tr("No",contextName),QString::null,1,1); | 934 | QObject::tr("No",contextName),QString::null,1,1); |
935 | qDebug("Auswahl: %i",yesno); | 935 | odebug << "Auswahl: " << yesno << "" << oendl; |
936 | if (yesno == 0) | 936 | if (yesno == 0) |
937 | { | 937 | { |
938 | if (mbox->getWrapper()->deleteMbox(folder)) | 938 | if (mbox->getWrapper()->deleteMbox(folder)) |
939 | { | 939 | { |
@@ -1073,9 +1073,9 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder) | |||
1073 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName). | 1073 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName). |
1074 | arg(fname), | 1074 | arg(fname), |
1075 | QObject::tr("Yes",contextName), | 1075 | QObject::tr("Yes",contextName), |
1076 | QObject::tr("No",contextName),QString::null,1,1); | 1076 | QObject::tr("No",contextName),QString::null,1,1); |
1077 | qDebug("Auswahl: %i",yesno); | 1077 | odebug << "Auswahl: " << yesno << "" << oendl; |
1078 | if (yesno == 0) | 1078 | if (yesno == 0) |
1079 | { | 1079 | { |
1080 | if (wrapper->deleteAllMail(folder)) | 1080 | if (wrapper->deleteAllMail(folder)) |
1081 | { | 1081 | { |
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index f0a163e..0052061 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -65,22 +65,22 @@ void AccountView::populate( QList<Account> list ) | |||
65 | { | 65 | { |
66 | if ( it->getType() == MAILLIB::A_IMAP ) | 66 | if ( it->getType() == MAILLIB::A_IMAP ) |
67 | { | 67 | { |
68 | IMAPaccount *imap = static_cast<IMAPaccount *>(it); | 68 | IMAPaccount *imap = static_cast<IMAPaccount *>(it); |
69 | qDebug( "added IMAP " + imap->getAccountName() ); | 69 | odebug << "added IMAP " + imap->getAccountName() << oendl; |
70 | imapAccounts.append(new IMAPviewItem( imap, this )); | 70 | imapAccounts.append(new IMAPviewItem( imap, this )); |
71 | } | 71 | } |
72 | else if ( it->getType() == MAILLIB::A_POP3 ) | 72 | else if ( it->getType() == MAILLIB::A_POP3 ) |
73 | { | 73 | { |
74 | POP3account *pop3 = static_cast<POP3account *>(it); | 74 | POP3account *pop3 = static_cast<POP3account *>(it); |
75 | qDebug( "added POP3 " + pop3->getAccountName() ); | 75 | odebug << "added POP3 " + pop3->getAccountName() << oendl; |
76 | /* must not be hold 'cause it isn't required */ | 76 | /* must not be hold 'cause it isn't required */ |
77 | (void) new POP3viewItem( pop3, this ); | 77 | (void) new POP3viewItem( pop3, this ); |
78 | } | 78 | } |
79 | else if ( it->getType() == MAILLIB::A_NNTP ) | 79 | else if ( it->getType() == MAILLIB::A_NNTP ) |
80 | { | 80 | { |
81 | NNTPaccount *nntp = static_cast<NNTPaccount *>(it); | 81 | NNTPaccount *nntp = static_cast<NNTPaccount *>(it); |
82 | qDebug( "added NNTP " + nntp->getAccountName() ); | 82 | odebug << "added NNTP " + nntp->getAccountName() << oendl; |
83 | /* must not be hold 'cause it isn't required */ | 83 | /* must not be hold 'cause it isn't required */ |
84 | (void) new NNTPviewItem( nntp, this ); | 84 | (void) new NNTPviewItem( nntp, this ); |
85 | } | 85 | } |
86 | } | 86 | } |
@@ -88,9 +88,9 @@ void AccountView::populate( QList<Account> list ) | |||
88 | 88 | ||
89 | void AccountView::refresh(QListViewItem *item) | 89 | void AccountView::refresh(QListViewItem *item) |
90 | { | 90 | { |
91 | 91 | ||
92 | qDebug("AccountView refresh..."); | 92 | odebug << "AccountView refresh..." << oendl; |
93 | if ( item ) | 93 | if ( item ) |
94 | { | 94 | { |
95 | m_currentItem = item; | 95 | m_currentItem = item; |
96 | QValueList<RecMailP> headerlist; | 96 | QValueList<RecMailP> headerlist; |
@@ -161,10 +161,10 @@ void AccountView::downloadMails(const FolderP&fromFolder,AbstractMail*fromWrappe | |||
161 | QMessageBox::critical(0,tr("Error creating new Folder"), | 161 | QMessageBox::critical(0,tr("Error creating new Folder"), |
162 | tr("<center>Error while creating<br>new folder - breaking.</center>")); | 162 | tr("<center>Error while creating<br>new folder - breaking.</center>")); |
163 | return; | 163 | return; |
164 | } | 164 | } |
165 | qDebug("Targetfolder: %s",targetFolder.latin1()); | 165 | odebug << "Targetfolder: " << targetFolder.latin1() << "" << oendl; |
166 | qDebug("Fromfolder: %s",fromFolder->getName().latin1()); | 166 | odebug << "Fromfolder: " << fromFolder->getName().latin1() << "" << oendl; |
167 | fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails()); | 167 | fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails()); |
168 | refreshCurrent(); | 168 | refreshCurrent(); |
169 | } | 169 | } |
170 | 170 | ||
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 988a1d9..fa703c4 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -182,9 +182,9 @@ void ComposeMail::removeAttachment() | |||
182 | 182 | ||
183 | void ComposeMail::accept() | 183 | void ComposeMail::accept() |
184 | { | 184 | { |
185 | if ( checkBoxLater->isChecked() ) { | 185 | if ( checkBoxLater->isChecked() ) { |
186 | qDebug( "Send later" ); | 186 | odebug << "Send later" << oendl; |
187 | } | 187 | } |
188 | 188 | ||
189 | #if 0 | 189 | #if 0 |
190 | qDebug( "Sending Mail with " + | 190 | qDebug( "Sending Mail with " + |
@@ -255,9 +255,9 @@ void ComposeMail::reject() | |||
255 | if ( !sigMultiLine->text().isEmpty() ) { | 255 | if ( !sigMultiLine->text().isEmpty() ) { |
256 | txt.append( "\n--\n" ); | 256 | txt.append( "\n--\n" ); |
257 | txt.append( sigMultiLine->text() ); | 257 | txt.append( sigMultiLine->text() ); |
258 | } | 258 | } |
259 | qDebug(txt); | 259 | odebug << txt << oendl; |
260 | mail->setMessage( txt ); | 260 | mail->setMessage( txt ); |
261 | 261 | ||
262 | /* only use the default drafts folder name! */ | 262 | /* only use the default drafts folder name! */ |
263 | Storemail wrapper(AbstractMail::draftFolder()); | 263 | Storemail wrapper(AbstractMail::draftFolder()); |
@@ -291,9 +291,9 @@ void ComposeMail::reEditMail(const RecMailP¤t) | |||
291 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | 291 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) |
292 | : QListViewItem( parent ) | 292 | : QListViewItem( parent ) |
293 | { | 293 | { |
294 | attachment = att; | 294 | attachment = att; |
295 | qDebug( att->getMimeType() ); | 295 | odebug << att->getMimeType() << oendl; |
296 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? | 296 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? |
297 | Resource::loadPixmap( "UnknownDocument-14" ) : | 297 | Resource::loadPixmap( "UnknownDocument-14" ) : |
298 | attachment->getDocLnk().pixmap() ); | 298 | attachment->getDocLnk().pixmap() ); |
299 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); | 299 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); |
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp index 5c4bdf7..de064ca 100644 --- a/noncore/net/mail/editaccounts.cpp +++ b/noncore/net/mail/editaccounts.cpp | |||
@@ -39,9 +39,9 @@ AccountListItem::AccountListItem( QListView *parent, Account *a) | |||
39 | 39 | ||
40 | EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 40 | EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
41 | : EditAccountsUI( parent, name, modal, flags ) | 41 | : EditAccountsUI( parent, name, modal, flags ) |
42 | { | 42 | { |
43 | qDebug( "New Account Configuration Widget" ); | 43 | odebug << "New Account Configuration Widget" << oendl; |
44 | settings = s; | 44 | settings = s; |
45 | 45 | ||
46 | mailList->addColumn( tr( "Account" ) ); | 46 | mailList->addColumn( tr( "Account" ) ); |
47 | mailList->addColumn( tr( "Type" ) ); | 47 | mailList->addColumn( tr( "Type" ) ); |
@@ -79,9 +79,9 @@ void EditAccounts::slotFillLists() | |||
79 | } | 79 | } |
80 | 80 | ||
81 | void EditAccounts::slotNewMail() | 81 | void EditAccounts::slotNewMail() |
82 | { | 82 | { |
83 | qDebug( "New Mail Account" ); | 83 | odebug << "New Mail Account" << oendl; |
84 | QString *selection = new QString(); | 84 | QString *selection = new QString(); |
85 | SelectMailType selType( selection, this, 0, true ); | 85 | SelectMailType selType( selection, this, 0, true ); |
86 | selType.show(); | 86 | selType.show(); |
87 | if ( QDialog::Accepted == selType.exec() ) | 87 | if ( QDialog::Accepted == selType.exec() ) |
@@ -93,9 +93,9 @@ void EditAccounts::slotNewMail() | |||
93 | void EditAccounts::slotNewAccount( const QString &type ) | 93 | void EditAccounts::slotNewAccount( const QString &type ) |
94 | { | 94 | { |
95 | if ( type.compare( "IMAP" ) == 0 ) | 95 | if ( type.compare( "IMAP" ) == 0 ) |
96 | { | 96 | { |
97 | qDebug( "-> config IMAP" ); | 97 | odebug << "-> config IMAP" << oendl; |
98 | IMAPaccount *account = new IMAPaccount(); | 98 | IMAPaccount *account = new IMAPaccount(); |
99 | IMAPconfig imap( account, this, 0, true ); | 99 | IMAPconfig imap( account, this, 0, true ); |
100 | if ( QDialog::Accepted == QPEApplication::execDialog( &imap ) ) | 100 | if ( QDialog::Accepted == QPEApplication::execDialog( &imap ) ) |
101 | { | 101 | { |
@@ -109,9 +109,9 @@ void EditAccounts::slotNewAccount( const QString &type ) | |||
109 | } | 109 | } |
110 | } | 110 | } |
111 | else if ( type.compare( "POP3" ) == 0 ) | 111 | else if ( type.compare( "POP3" ) == 0 ) |
112 | { | 112 | { |
113 | qDebug( "-> config POP3" ); | 113 | odebug << "-> config POP3" << oendl; |
114 | POP3account *account = new POP3account(); | 114 | POP3account *account = new POP3account(); |
115 | POP3config pop3( account, this, 0, true, WStyle_ContextHelp ); | 115 | POP3config pop3( account, this, 0, true, WStyle_ContextHelp ); |
116 | if ( QDialog::Accepted == QPEApplication::execDialog( &pop3 ) ) | 116 | if ( QDialog::Accepted == QPEApplication::execDialog( &pop3 ) ) |
117 | { | 117 | { |
@@ -125,9 +125,9 @@ void EditAccounts::slotNewAccount( const QString &type ) | |||
125 | } | 125 | } |
126 | } | 126 | } |
127 | else if ( type.compare( "SMTP" ) == 0 ) | 127 | else if ( type.compare( "SMTP" ) == 0 ) |
128 | { | 128 | { |
129 | qDebug( "-> config SMTP" ); | 129 | odebug << "-> config SMTP" << oendl; |
130 | SMTPaccount *account = new SMTPaccount(); | 130 | SMTPaccount *account = new SMTPaccount(); |
131 | SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp ); | 131 | SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp ); |
132 | if ( QDialog::Accepted == QPEApplication::execDialog( &smtp ) ) | 132 | if ( QDialog::Accepted == QPEApplication::execDialog( &smtp ) ) |
133 | { | 133 | { |
@@ -142,9 +142,9 @@ void EditAccounts::slotNewAccount( const QString &type ) | |||
142 | } | 142 | } |
143 | } | 143 | } |
144 | else if ( type.compare( "NNTP" ) == 0 ) | 144 | else if ( type.compare( "NNTP" ) == 0 ) |
145 | { | 145 | { |
146 | qDebug( "-> config NNTP" ); | 146 | odebug << "-> config NNTP" << oendl; |
147 | NNTPaccount *account = new NNTPaccount(); | 147 | NNTPaccount *account = new NNTPaccount(); |
148 | NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp ); | 148 | NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp ); |
149 | if ( QDialog::Accepted == QPEApplication::execDialog( &nntp ) ) | 149 | if ( QDialog::Accepted == QPEApplication::execDialog( &nntp ) ) |
150 | { | 150 | { |
@@ -211,9 +211,9 @@ void EditAccounts::slotDeleteAccount( Account *account ) | |||
211 | } | 211 | } |
212 | 212 | ||
213 | void EditAccounts::slotEditMail() | 213 | void EditAccounts::slotEditMail() |
214 | { | 214 | { |
215 | qDebug( "Edit Mail Account" ); | 215 | odebug << "Edit Mail Account" << oendl; |
216 | if ( !mailList->currentItem() ) | 216 | if ( !mailList->currentItem() ) |
217 | { | 217 | { |
218 | QMessageBox::information( this, tr( "Error" ), | 218 | QMessageBox::information( this, tr( "Error" ), |
219 | tr( "<p>Please select an account.</p>" ), | 219 | tr( "<p>Please select an account.</p>" ), |
@@ -240,15 +240,15 @@ void EditAccounts::slotDeleteMail() | |||
240 | } | 240 | } |
241 | 241 | ||
242 | void EditAccounts::slotNewNews() | 242 | void EditAccounts::slotNewNews() |
243 | { | 243 | { |
244 | qDebug( "New News Account" ); | 244 | odebug << "New News Account" << oendl; |
245 | slotNewAccount( "NNTP" ); | 245 | slotNewAccount( "NNTP" ); |
246 | } | 246 | } |
247 | 247 | ||
248 | void EditAccounts::slotEditNews() | 248 | void EditAccounts::slotEditNews() |
249 | { | 249 | { |
250 | qDebug( "Edit News Account" ); | 250 | odebug << "Edit News Account" << oendl; |
251 | if ( !newsList->currentItem() ) | 251 | if ( !newsList->currentItem() ) |
252 | { | 252 | { |
253 | QMessageBox::information( this, tr( "Error" ), | 253 | QMessageBox::information( this, tr( "Error" ), |
254 | tr( "<p>Please select an account.</p>" ), | 254 | tr( "<p>Please select an account.</p>" ), |
@@ -261,9 +261,9 @@ void EditAccounts::slotEditNews() | |||
261 | } | 261 | } |
262 | 262 | ||
263 | void EditAccounts::slotDeleteNews() | 263 | void EditAccounts::slotDeleteNews() |
264 | { | 264 | { |
265 | qDebug( "Delete News Account" ); | 265 | odebug << "Delete News Account" << oendl; |
266 | if ( !newsList->currentItem() ) | 266 | if ( !newsList->currentItem() ) |
267 | { | 267 | { |
268 | QMessageBox::information( this, tr( "Error" ), | 268 | QMessageBox::information( this, tr( "Error" ), |
269 | tr( "<p>Please select an account.</p>" ), | 269 | tr( "<p>Please select an account.</p>" ), |
@@ -577,9 +577,9 @@ void NNTPconfig::save() | |||
577 | QStringList groupList; | 577 | QStringList groupList; |
578 | for ( ; list_it.current(); ++list_it ) { | 578 | for ( ; list_it.current(); ++list_it ) { |
579 | 579 | ||
580 | if ( ( (QCheckListItem*)list_it.current() )->isOn() ) { | 580 | if ( ( (QCheckListItem*)list_it.current() )->isOn() ) { |
581 | qDebug(list_it.current()->text(0) ); | 581 | odebug << list_it.current()->text(0) << oendl; |
582 | groupList.append( list_it.current()->text(0) ); | 582 | groupList.append( list_it.current()->text(0) ); |
583 | } | 583 | } |
584 | 584 | ||
585 | } | 585 | } |
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index 6bebb7b..1a26351 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp | |||
@@ -51,9 +51,9 @@ AbstractMail* AbstractMail::getWrapper(Account*a) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) | 53 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) |
54 | { | 54 | { |
55 | qDebug("Decode string start"); | 55 | odebug << "Decode string start" << oendl; |
56 | char*result_text; | 56 | char*result_text; |
57 | size_t index = 0; | 57 | size_t index = 0; |
58 | /* reset for recursive use! */ | 58 | /* reset for recursive use! */ |
59 | size_t target_length = 0; | 59 | size_t target_length = 0; |
@@ -75,9 +75,9 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin | |||
75 | encodedString* result = new encodedString(); | 75 | encodedString* result = new encodedString(); |
76 | if (err == MAILIMF_NO_ERROR) { | 76 | if (err == MAILIMF_NO_ERROR) { |
77 | result->setContent(result_text,target_length); | 77 | result->setContent(result_text,target_length); |
78 | } | 78 | } |
79 | qDebug("Decode string finished"); | 79 | odebug << "Decode string finished" << oendl; |
80 | return result; | 80 | return result; |
81 | } | 81 | } |
82 | 82 | ||
83 | QString AbstractMail::convert_String(const char*text) | 83 | QString AbstractMail::convert_String(const char*text) |
@@ -90,12 +90,12 @@ QString AbstractMail::convert_String(const char*text) | |||
90 | 90 | ||
91 | /* due a bug in libetpan it isn't usable this moment */ | 91 | /* due a bug in libetpan it isn't usable this moment */ |
92 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", | 92 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", |
93 | text, strlen(text),&index, "iso-8859-1",&res);*/ | 93 | text, strlen(text),&index, "iso-8859-1",&res);*/ |
94 | //qDebug("Input: %s",text); | 94 | //odebug << "Input: " << text << "" << oendl; |
95 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 95 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
96 | // result = QString(res); | 96 | // result = QString(res); |
97 | // qDebug("Res: %s, length: %i",res,strlen(res)); | 97 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; |
98 | } | 98 | } |
99 | if (res) free(res); | 99 | if (res) free(res); |
100 | return result; | 100 | return result; |
101 | } | 101 | } |
diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp index cb58d82..36ec232 100644 --- a/noncore/net/mail/libmailwrapper/generatemail.cpp +++ b/noncore/net/mail/libmailwrapper/generatemail.cpp | |||
@@ -96,9 +96,9 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) { | |||
96 | if (!literal_open) { | 96 | if (!literal_open) { |
97 | s = addr.mid(startpos,i-startpos); | 97 | s = addr.mid(startpos,i-startpos); |
98 | if (!s.isEmpty()) { | 98 | if (!s.isEmpty()) { |
99 | list.append(s); | 99 | list.append(s); |
100 | qDebug("Appended %s",s.latin1()); | 100 | odebug << "Appended " << s.latin1() << "" << oendl; |
101 | } | 101 | } |
102 | // !!!! this is a MUST BE! | 102 | // !!!! this is a MUST BE! |
103 | startpos = ++i; | 103 | startpos = ++i; |
104 | } | 104 | } |
@@ -109,18 +109,18 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) { | |||
109 | } | 109 | } |
110 | s = addr.mid(startpos,i-startpos); | 110 | s = addr.mid(startpos,i-startpos); |
111 | if (!s.isEmpty()) { | 111 | if (!s.isEmpty()) { |
112 | list.append(s); | 112 | list.append(s); |
113 | qDebug("Appended %s",s.latin1()); | 113 | odebug << "Appended " << s.latin1() << "" << oendl; |
114 | } | 114 | } |
115 | QStringList::Iterator it; | 115 | QStringList::Iterator it; |
116 | for ( it = list.begin(); it != list.end(); it++ ) { | 116 | for ( it = list.begin(); it != list.end(); it++ ) { |
117 | int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() ); | 117 | int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() ); |
118 | if ( err != MAILIMF_NO_ERROR ) { | 118 | if ( err != MAILIMF_NO_ERROR ) { |
119 | qDebug( "Error parsing" ); | 119 | odebug << "Error parsing" << oendl; |
120 | qDebug( *it ); | 120 | odebug << *it << oendl; |
121 | } else { | 121 | } else { |
122 | qDebug( "Parse success! %s",(*it).latin1()); | 122 | odebug << "Parse success! " << (*it).latin1() << "" << oendl; |
123 | } | 123 | } |
124 | } | 124 | } |
125 | return addresses; | 125 | return addresses; |
126 | } | 126 | } |
@@ -174,9 +174,9 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet | |||
174 | } else { | 174 | } else { |
175 | err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length()); | 175 | err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length()); |
176 | } | 176 | } |
177 | if (err != MAILIMF_NO_ERROR) { | 177 | if (err != MAILIMF_NO_ERROR) { |
178 | qDebug("Error setting body with file %s",file); | 178 | odebug << "Error setting body with file " << file << "" << oendl; |
179 | mailmime_free( filePart ); | 179 | mailmime_free( filePart ); |
180 | filePart = 0; | 180 | filePart = 0; |
181 | } | 181 | } |
182 | } | 182 | } |
@@ -205,25 +205,25 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet | |||
205 | 205 | ||
206 | void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files ) { | 206 | void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files ) { |
207 | const Attachment *it; | 207 | const Attachment *it; |
208 | unsigned int count = files.count(); | 208 | unsigned int count = files.count(); |
209 | qDebug("List contains %i values",count); | 209 | odebug << "List contains " << count << " values" << oendl; |
210 | for ( unsigned int i = 0; i < count; ++i ) { | 210 | for ( unsigned int i = 0; i < count; ++i ) { |
211 | qDebug( "Adding file" ); | 211 | odebug << "Adding file" << oendl; |
212 | mailmime *filePart; | 212 | mailmime *filePart; |
213 | int err; | 213 | int err; |
214 | it = ((QList<Attachment>)files).at(i); | 214 | it = ((QList<Attachment>)files).at(i); |
215 | 215 | ||
216 | filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" ); | 216 | filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" ); |
217 | if ( filePart == NULL ) { | 217 | if ( filePart == NULL ) { |
218 | qDebug( "addFileParts: error adding file:" ); | 218 | odebug << "addFileParts: error adding file:" << oendl; |
219 | qDebug( it->getFileName() ); | 219 | odebug << it->getFileName() << oendl; |
220 | continue; | 220 | continue; |
221 | } | 221 | } |
222 | err = mailmime_smart_add_part( message, filePart ); | 222 | err = mailmime_smart_add_part( message, filePart ); |
223 | if ( err != MAILIMF_NO_ERROR ) { | 223 | if ( err != MAILIMF_NO_ERROR ) { |
224 | mailmime_free( filePart ); | 224 | mailmime_free( filePart ); |
225 | qDebug("error smart add"); | 225 | odebug << "error smart add" << oendl; |
226 | } | 226 | } |
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
@@ -269,9 +269,9 @@ err_free_content: | |||
269 | mailmime_content_free( content ); | 269 | mailmime_content_free( content ); |
270 | err_free_param: | 270 | err_free_param: |
271 | mailmime_parameter_free( param ); | 271 | mailmime_parameter_free( param ); |
272 | err_free: | 272 | err_free: |
273 | qDebug( "buildTxtPart - error" ); | 273 | odebug << "buildTxtPart - error" << oendl; |
274 | 274 | ||
275 | return NULL; // Error :( | 275 | return NULL; // Error :( |
276 | } | 276 | } |
277 | 277 | ||
@@ -344,17 +344,17 @@ mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Ma | |||
344 | c_reply = (char*)malloc( (nsize+1)*sizeof(char)); | 344 | c_reply = (char*)malloc( (nsize+1)*sizeof(char)); |
345 | memset(c_reply,0,nsize+1); | 345 | memset(c_reply,0,nsize+1); |
346 | memcpy(c_reply,h.latin1(),nsize); | 346 | memcpy(c_reply,h.latin1(),nsize); |
347 | clist_append(in_reply_to,c_reply); | 347 | clist_append(in_reply_to,c_reply); |
348 | qDebug("In reply to: %s",c_reply); | 348 | odebug << "In reply to: " << c_reply << "" << oendl; |
349 | } | 349 | } |
350 | } | 350 | } |
351 | 351 | ||
352 | if (res) { | 352 | if (res) { |
353 | fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc, | 353 | fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc, |
354 | in_reply_to, NULL, subject ); | 354 | in_reply_to, NULL, subject ); |
355 | if ( fields == NULL ) { | 355 | if ( fields == NULL ) { |
356 | qDebug("Error creating mailimf fields"); | 356 | odebug << "Error creating mailimf fields" << oendl; |
357 | res = 0; | 357 | res = 0; |
358 | } | 358 | } |
359 | } | 359 | } |
360 | if (res) xmailer = mailimf_field_new_custom( strdup( "User-Agent" ), | 360 | if (res) xmailer = mailimf_field_new_custom( strdup( "User-Agent" ), |
@@ -434,9 +434,9 @@ err_free_message: | |||
434 | mailmime_free( message ); | 434 | mailmime_free( message ); |
435 | err_free_fields: | 435 | err_free_fields: |
436 | mailimf_fields_free( fields ); | 436 | mailimf_fields_free( fields ); |
437 | err_free: | 437 | err_free: |
438 | qDebug( "createMimeMail: error" ); | 438 | odebug << "createMimeMail: error" << oendl; |
439 | 439 | ||
440 | return NULL; // Error :( | 440 | return NULL; // Error :( |
441 | } | 441 | } |
442 | 442 | ||
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index 0c68280..fae4c99 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp | |||
@@ -134,9 +134,9 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc) | |||
134 | 134 | ||
135 | void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count) | 135 | void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count) |
136 | { | 136 | { |
137 | if (current_rec >= 10) { | 137 | if (current_rec >= 10) { |
138 | qDebug("too deep recursion!"); | 138 | odebug << "too deep recursion!" << oendl; |
139 | } | 139 | } |
140 | if (!message || !mime) { | 140 | if (!message || !mime) { |
141 | return; | 141 | return; |
142 | } | 142 | } |
@@ -271,9 +271,9 @@ QString Genericwrapper::parseAddressList( mailimf_address_list *list ) | |||
271 | case MAILIMF_ADDRESS_GROUP: | 271 | case MAILIMF_ADDRESS_GROUP: |
272 | result.append( parseGroup( addr->ad_data.ad_group ) ); | 272 | result.append( parseGroup( addr->ad_data.ad_group ) ); |
273 | break; | 273 | break; |
274 | default: | 274 | default: |
275 | qDebug( "Generic: unkown mailimf address type" ); | 275 | odebug << "Generic: unkown mailimf address type" << oendl; |
276 | break; | 276 | break; |
277 | } | 277 | } |
278 | } | 278 | } |
279 | 279 | ||
@@ -364,9 +364,9 @@ void Genericwrapper::cleanMimeCache() | |||
364 | //it.setValue(0); | 364 | //it.setValue(0); |
365 | if (t) delete t; | 365 | if (t) delete t; |
366 | } | 366 | } |
367 | bodyCache.clear(); | 367 | bodyCache.clear(); |
368 | qDebug("Genericwrapper: cache cleaned"); | 368 | odebug << "Genericwrapper: cache cleaned" << oendl; |
369 | } | 369 | } |
370 | 370 | ||
371 | QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) | 371 | QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) |
372 | { | 372 | { |
@@ -393,14 +393,14 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > & | |||
393 | int r; | 393 | int r; |
394 | mailmessage_list * env_list = 0; | 394 | mailmessage_list * env_list = 0; |
395 | r = mailsession_get_messages_list(session,&env_list); | 395 | r = mailsession_get_messages_list(session,&env_list); |
396 | if (r != MAIL_NO_ERROR) { | 396 | if (r != MAIL_NO_ERROR) { |
397 | qDebug("Error message list"); | 397 | odebug << "Error message list" << oendl; |
398 | return; | 398 | return; |
399 | } | 399 | } |
400 | r = mailsession_get_envelopes_list(session, env_list); | 400 | r = mailsession_get_envelopes_list(session, env_list); |
401 | if (r != MAIL_NO_ERROR) { | 401 | if (r != MAIL_NO_ERROR) { |
402 | qDebug("Error filling message list"); | 402 | odebug << "Error filling message list" << oendl; |
403 | if (env_list) { | 403 | if (env_list) { |
404 | mailmessage_list_free(env_list); | 404 | mailmessage_list_free(env_list); |
405 | } | 405 | } |
406 | return; | 406 | return; |
@@ -412,9 +412,9 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > & | |||
412 | mailmessage * msg; | 412 | mailmessage * msg; |
413 | QBitArray mFlags(7); | 413 | QBitArray mFlags(7); |
414 | msg = (mailmessage*)carray_get(env_list->msg_tab, i); | 414 | msg = (mailmessage*)carray_get(env_list->msg_tab, i); |
415 | if (msg->msg_fields == NULL) { | 415 | if (msg->msg_fields == NULL) { |
416 | //qDebug("could not fetch envelope of message %i", i); | 416 | //odebug << "could not fetch envelope of message " << i << "" << oendl; |
417 | continue; | 417 | continue; |
418 | } | 418 | } |
419 | RecMailP mail = new RecMail(); | 419 | RecMailP mail = new RecMail(); |
420 | mail->setWrapper(this); | 420 | mail->setWrapper(this); |
@@ -447,9 +447,9 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > & | |||
447 | mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); | 447 | mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); |
448 | // crashes when accessing pop3 account? | 448 | // crashes when accessing pop3 account? |
449 | if (single_fields.fld_message_id->mid_value) { | 449 | if (single_fields.fld_message_id->mid_value) { |
450 | mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); | 450 | mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); |
451 | qDebug("Msgid == %s",mail->Msgid().latin1()); | 451 | odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl; |
452 | } | 452 | } |
453 | 453 | ||
454 | if (single_fields.fld_reply_to) { | 454 | if (single_fields.fld_reply_to) { |
455 | QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); | 455 | QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 657c2ba..35468fe 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -29,9 +29,9 @@ int IMAPwrapper::selectMbox(const QString&mbox) | |||
29 | return MAILIMAP_NO_ERROR; | 29 | return MAILIMAP_NO_ERROR; |
30 | } | 30 | } |
31 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); | 31 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); |
32 | if ( err != MAILIMAP_NO_ERROR ) { | 32 | if ( err != MAILIMAP_NO_ERROR ) { |
33 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 33 | odebug << "error selecting mailbox: " << m_imap->imap_response << "" << oendl; |
34 | m_Lastmbox = ""; | 34 | m_Lastmbox = ""; |
35 | return err; | 35 | return err; |
36 | } | 36 | } |
37 | m_Lastmbox = mbox; | 37 | m_Lastmbox = mbox; |
@@ -40,9 +40,9 @@ int IMAPwrapper::selectMbox(const QString&mbox) | |||
40 | 40 | ||
41 | void IMAPwrapper::imap_progress( size_t current, size_t maximum ) | 41 | void IMAPwrapper::imap_progress( size_t current, size_t maximum ) |
42 | { | 42 | { |
43 | qApp->processEvents(); | 43 | qApp->processEvents(); |
44 | qDebug( "IMAP: %i of %i", current, maximum ); | 44 | odebug << "IMAP: " << current << " of " << maximum << "" << oendl; |
45 | } | 45 | } |
46 | 46 | ||
47 | bool IMAPwrapper::start_tls(bool force_tls) | 47 | bool IMAPwrapper::start_tls(bool force_tls) |
48 | { | 48 | { |
@@ -52,9 +52,9 @@ bool IMAPwrapper::start_tls(bool force_tls) | |||
52 | 52 | ||
53 | err = mailimap_capability(m_imap,&cap_data); | 53 | err = mailimap_capability(m_imap,&cap_data); |
54 | if (err != MAILIMAP_NO_ERROR) { | 54 | if (err != MAILIMAP_NO_ERROR) { |
55 | Global::statusMessage("error getting capabilities!"); | 55 | Global::statusMessage("error getting capabilities!"); |
56 | qDebug("error getting capabilities!"); | 56 | odebug << "error getting capabilities!" << oendl; |
57 | return false; | 57 | return false; |
58 | } | 58 | } |
59 | clistiter * cur; | 59 | clistiter * cur; |
60 | for(cur = clist_begin(cap_data->cap_list) ; cur != NULL;cur = clist_next(cur)) { | 60 | for(cur = clist_begin(cap_data->cap_list) ; cur != NULL;cur = clist_next(cur)) { |
@@ -73,9 +73,9 @@ bool IMAPwrapper::start_tls(bool force_tls) | |||
73 | if (try_tls) { | 73 | if (try_tls) { |
74 | err = mailimap_starttls(m_imap); | 74 | err = mailimap_starttls(m_imap); |
75 | if (err != MAILIMAP_NO_ERROR && force_tls) { | 75 | if (err != MAILIMAP_NO_ERROR && force_tls) { |
76 | Global::statusMessage(tr("Server has no TLS support!")); | 76 | Global::statusMessage(tr("Server has no TLS support!")); |
77 | qDebug("Server has no TLS support!"); | 77 | odebug << "Server has no TLS support!" << oendl; |
78 | try_tls = false; | 78 | try_tls = false; |
79 | } else { | 79 | } else { |
80 | mailstream_low * low; | 80 | mailstream_low * low; |
81 | mailstream_low * new_low; | 81 | mailstream_low * new_low; |
@@ -124,9 +124,9 @@ void IMAPwrapper::login() | |||
124 | user = login.getUser().latin1(); | 124 | user = login.getUser().latin1(); |
125 | pass = login.getPassword().latin1(); | 125 | pass = login.getPassword().latin1(); |
126 | } else { | 126 | } else { |
127 | // cancel | 127 | // cancel |
128 | qDebug( "IMAP: Login canceled" ); | 128 | odebug << "IMAP: Login canceled" << oendl; |
129 | return; | 129 | return; |
130 | } | 130 | } |
131 | } else { | 131 | } else { |
132 | user = account->getUser().latin1(); | 132 | user = account->getUser().latin1(); |
@@ -147,9 +147,9 @@ void IMAPwrapper::login() | |||
147 | force_tls = true; | 147 | force_tls = true; |
148 | } | 148 | } |
149 | 149 | ||
150 | if ( ssl ) { | 150 | if ( ssl ) { |
151 | qDebug( "using ssl" ); | 151 | odebug << "using ssl" << oendl; |
152 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); | 152 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); |
153 | } else { | 153 | } else { |
154 | err = mailimap_socket_connect( m_imap, (char*)server, port ); | 154 | err = mailimap_socket_connect( m_imap, (char*)server, port ); |
155 | } | 155 | } |
@@ -175,9 +175,9 @@ void IMAPwrapper::login() | |||
175 | 175 | ||
176 | bool ok = true; | 176 | bool ok = true; |
177 | if (force_tls && !try_tls) { | 177 | if (force_tls && !try_tls) { |
178 | Global::statusMessage(tr("Server has no TLS support!")); | 178 | Global::statusMessage(tr("Server has no TLS support!")); |
179 | qDebug("Server has no TLS support!"); | 179 | odebug << "Server has no TLS support!" << oendl; |
180 | ok = false; | 180 | ok = false; |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
@@ -316,9 +316,9 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | |||
316 | } | 316 | } |
317 | folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); | 317 | folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); |
318 | } | 318 | } |
319 | } else { | 319 | } else { |
320 | qDebug("error fetching folders: %s",m_imap->imap_response); | 320 | odebug << "error fetching folders: " << m_imap->imap_response << "" << oendl; |
321 | } | 321 | } |
322 | mailimap_list_result_free( result ); | 322 | mailimap_list_result_free( result ); |
323 | 323 | ||
324 | /* | 324 | /* |
@@ -326,9 +326,9 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | |||
326 | */ | 326 | */ |
327 | mask = "*" ; | 327 | mask = "*" ; |
328 | path = account->getPrefix().latin1(); | 328 | path = account->getPrefix().latin1(); |
329 | if (!path) path = ""; | 329 | if (!path) path = ""; |
330 | qDebug(path); | 330 | odebug << path << oendl; |
331 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 331 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
332 | if ( err == MAILIMAP_NO_ERROR ) { | 332 | if ( err == MAILIMAP_NO_ERROR ) { |
333 | current = result->first; | 333 | current = result->first; |
334 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { | 334 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { |
@@ -353,9 +353,9 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | |||
353 | del = list->mb_delimiter; | 353 | del = list->mb_delimiter; |
354 | folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); | 354 | folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); |
355 | } | 355 | } |
356 | } else { | 356 | } else { |
357 | qDebug("error fetching folders %s",m_imap->imap_response); | 357 | odebug << "error fetching folders " << m_imap->imap_response << "" << oendl; |
358 | } | 358 | } |
359 | if (result) mailimap_list_result_free( result ); | 359 | if (result) mailimap_list_result_free( result ); |
360 | return folders; | 360 | return folders; |
361 | } | 361 | } |
@@ -465,10 +465,10 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
465 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { | 465 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { |
466 | #if 0 | 466 | #if 0 |
467 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; | 467 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; |
468 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); | 468 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); |
469 | qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec); | 469 | odebug << "" << d->dt_year << " " << d->dt_month << " " << d->dt_day << " - " << d->dt_hour << " " << d->dt_min << " " << d->dt_sec << "" << oendl; |
470 | qDebug(da.toString()); | 470 | odebug << da.toString() << oendl; |
471 | #endif | 471 | #endif |
472 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { | 472 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { |
473 | size = item->att_data.att_static->att_data.att_rfc822_size; | 473 | size = item->att_data.att_static->att_data.att_rfc822_size; |
474 | } | 474 | } |
@@ -523,9 +523,9 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail) | |||
523 | QValueList<int> path; | 523 | QValueList<int> path; |
524 | body_desc = item->att_data.att_static->att_data.att_body; | 524 | body_desc = item->att_data.att_static->att_data.att_body; |
525 | traverseBody(mail,body_desc,body,0,path); | 525 | traverseBody(mail,body_desc,body,0,path); |
526 | } else { | 526 | } else { |
527 | qDebug("error fetching body: %s",m_imap->imap_response); | 527 | odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; |
528 | } | 528 | } |
529 | if (result) mailimap_fetch_list_free(result); | 529 | if (result) mailimap_fetch_list_free(result); |
530 | return body; | 530 | return body; |
531 | } | 531 | } |
@@ -635,9 +635,9 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int | |||
635 | } | 635 | } |
636 | } | 636 | } |
637 | } | 637 | } |
638 | } else { | 638 | } else { |
639 | qDebug("error fetching text: %s",m_imap->imap_response); | 639 | odebug << "error fetching text: " << m_imap->imap_response << "" << oendl; |
640 | } | 640 | } |
641 | if (result) mailimap_fetch_list_free(result); | 641 | if (result) mailimap_fetch_list_free(result); |
642 | return res; | 642 | return res; |
643 | } | 643 | } |
@@ -662,9 +662,9 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t | |||
662 | for (unsigned int j = 0; j < countlist.count();++j) { | 662 | for (unsigned int j = 0; j < countlist.count();++j) { |
663 | id+=(j>0?" ":""); | 663 | id+=(j>0?" ":""); |
664 | id+=QString("%1").arg(countlist[j]); | 664 | id+=QString("%1").arg(countlist[j]); |
665 | } | 665 | } |
666 | qDebug("ID = %s",id.latin1()); | 666 | odebug << "ID = " << id.latin1() << "" << oendl; |
667 | currentPart->setIdentifier(id); | 667 | currentPart->setIdentifier(id); |
668 | fillSinglePart(currentPart,part1); | 668 | fillSinglePart(currentPart,part1); |
669 | /* important: Check for is NULL 'cause a body can be empty! | 669 | /* important: Check for is NULL 'cause a body can be empty! |
670 | And we put it only into the mail if it is the FIRST part */ | 670 | And we put it only into the mail if it is the FIRST part */ |
@@ -703,9 +703,9 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t | |||
703 | for (unsigned int j = 0; j < countlist.count();++j) { | 703 | for (unsigned int j = 0; j < countlist.count();++j) { |
704 | id+=(j>0?" ":""); | 704 | id+=(j>0?" ":""); |
705 | id+=QString("%1").arg(countlist[j]); | 705 | id+=QString("%1").arg(countlist[j]); |
706 | } | 706 | } |
707 | qDebug("ID(mpart) = %s",id.latin1()); | 707 | odebug << "ID(mpart) = " << id.latin1() << "" << oendl; |
708 | } | 708 | } |
709 | traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount); | 709 | traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount); |
710 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { | 710 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { |
711 | countlist = recList; | 711 | countlist = recList; |
@@ -747,9 +747,9 @@ void IMAPwrapper::fillSingleTextPart(RecPartP&target_part,mailimap_body_type_tex | |||
747 | return; | 747 | return; |
748 | } | 748 | } |
749 | QString sub; | 749 | QString sub; |
750 | sub = which->bd_media_text; | 750 | sub = which->bd_media_text; |
751 | qDebug("Type= text/%s",which->bd_media_text); | 751 | odebug << "Type= text/" << which->bd_media_text << "" << oendl; |
752 | target_part->setSubtype(sub.lower()); | 752 | target_part->setSubtype(sub.lower()); |
753 | target_part->setLines(which->bd_lines); | 753 | target_part->setLines(which->bd_lines); |
754 | fillBodyFields(target_part,which->bd_fields); | 754 | fillBodyFields(target_part,which->bd_fields); |
755 | } | 755 | } |
@@ -759,9 +759,9 @@ void IMAPwrapper::fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg* | |||
759 | if (!which) { | 759 | if (!which) { |
760 | return; | 760 | return; |
761 | } | 761 | } |
762 | target_part->setSubtype("rfc822"); | 762 | target_part->setSubtype("rfc822"); |
763 | qDebug("Message part"); | 763 | odebug << "Message part" << oendl; |
764 | /* we set this type to text/plain */ | 764 | /* we set this type to text/plain */ |
765 | target_part->setLines(which->bd_lines); | 765 | target_part->setLines(which->bd_lines); |
766 | fillBodyFields(target_part,which->bd_fields); | 766 | fillBodyFields(target_part,which->bd_fields); |
767 | } | 767 | } |
@@ -818,9 +818,9 @@ void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_ba | |||
818 | sub = which->bd_media_basic->med_subtype; | 818 | sub = which->bd_media_basic->med_subtype; |
819 | } else { | 819 | } else { |
820 | sub = ""; | 820 | sub = ""; |
821 | } | 821 | } |
822 | qDebug("Type = %s/%s",type.latin1(),sub.latin1()); | 822 | odebug << "Type = " << type.latin1() << "/" << sub.latin1() << "" << oendl; |
823 | target_part->setType(type.lower()); | 823 | target_part->setType(type.lower()); |
824 | target_part->setSubtype(sub.lower()); | 824 | target_part->setSubtype(sub.lower()); |
825 | fillBodyFields(target_part,which->bd_fields); | 825 | fillBodyFields(target_part,which->bd_fields); |
826 | } | 826 | } |
@@ -894,18 +894,18 @@ void IMAPwrapper::deleteMail(const RecMailP&mail) | |||
894 | mailimap_set_free( set ); | 894 | mailimap_set_free( set ); |
895 | mailimap_store_att_flags_free(store_flags); | 895 | mailimap_store_att_flags_free(store_flags); |
896 | 896 | ||
897 | if (err != MAILIMAP_NO_ERROR) { | 897 | if (err != MAILIMAP_NO_ERROR) { |
898 | qDebug("error deleting mail: %s",m_imap->imap_response); | 898 | odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; |
899 | return; | 899 | return; |
900 | } | 900 | } |
901 | qDebug("deleting mail: %s",m_imap->imap_response); | 901 | odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; |
902 | /* should we realy do that at this moment? */ | 902 | /* should we realy do that at this moment? */ |
903 | err = mailimap_expunge(m_imap); | 903 | err = mailimap_expunge(m_imap); |
904 | if (err != MAILIMAP_NO_ERROR) { | 904 | if (err != MAILIMAP_NO_ERROR) { |
905 | qDebug("error deleting mail: %s",m_imap->imap_response); | 905 | odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; |
906 | } | 906 | } |
907 | qDebug("Delete successfull %s",m_imap->imap_response); | 907 | odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; |
908 | } | 908 | } |
909 | 909 | ||
910 | void IMAPwrapper::answeredMail(const RecMailP&mail) | 910 | void IMAPwrapper::answeredMail(const RecMailP&mail) |
911 | { | 911 | { |
@@ -929,9 +929,9 @@ void IMAPwrapper::answeredMail(const RecMailP&mail) | |||
929 | mailimap_set_free( set ); | 929 | mailimap_set_free( set ); |
930 | mailimap_store_att_flags_free(store_flags); | 930 | mailimap_store_att_flags_free(store_flags); |
931 | 931 | ||
932 | if (err != MAILIMAP_NO_ERROR) { | 932 | if (err != MAILIMAP_NO_ERROR) { |
933 | qDebug("error marking mail: %s",m_imap->imap_response); | 933 | odebug << "error marking mail: " << m_imap->imap_response << "" << oendl; |
934 | return; | 934 | return; |
935 | } | 935 | } |
936 | } | 936 | } |
937 | 937 | ||
@@ -997,16 +997,16 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder) | |||
997 | if (err != MAILIMAP_NO_ERROR) { | 997 | if (err != MAILIMAP_NO_ERROR) { |
998 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); | 998 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); |
999 | return 0; | 999 | return 0; |
1000 | } | 1000 | } |
1001 | qDebug("deleting mail: %s",m_imap->imap_response); | 1001 | odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; |
1002 | /* should we realy do that at this moment? */ | 1002 | /* should we realy do that at this moment? */ |
1003 | err = mailimap_expunge(m_imap); | 1003 | err = mailimap_expunge(m_imap); |
1004 | if (err != MAILIMAP_NO_ERROR) { | 1004 | if (err != MAILIMAP_NO_ERROR) { |
1005 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); | 1005 | Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); |
1006 | return 0; | 1006 | return 0; |
1007 | } | 1007 | } |
1008 | qDebug("Delete successfull %s",m_imap->imap_response); | 1008 | odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; |
1009 | return 1; | 1009 | return 1; |
1010 | } | 1010 | } |
1011 | 1011 | ||
1012 | int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,const QString& delemiter,bool getsubfolder) | 1012 | int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,const QString& delemiter,bool getsubfolder) |
@@ -1029,9 +1029,9 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons | |||
1029 | Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre)); | 1029 | Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre)); |
1030 | return 0; | 1030 | return 0; |
1031 | } | 1031 | } |
1032 | } | 1032 | } |
1033 | qDebug("Creating %s",pre.latin1()); | 1033 | odebug << "Creating " << pre.latin1() << "" << oendl; |
1034 | int res = mailimap_create(m_imap,pre.latin1()); | 1034 | int res = mailimap_create(m_imap,pre.latin1()); |
1035 | if (res != MAILIMAP_NO_ERROR) { | 1035 | if (res != MAILIMAP_NO_ERROR) { |
1036 | Global::statusMessage(tr("%1").arg(m_imap->imap_response)); | 1036 | Global::statusMessage(tr("%1").arg(m_imap->imap_response)); |
1037 | return 0; | 1037 | return 0; |
@@ -1088,9 +1088,9 @@ void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) | |||
1088 | break; | 1088 | break; |
1089 | } | 1089 | } |
1090 | } | 1090 | } |
1091 | } else { | 1091 | } else { |
1092 | qDebug("Error retrieving status"); | 1092 | odebug << "Error retrieving status" << oendl; |
1093 | } | 1093 | } |
1094 | if (status) mailimap_mailbox_data_status_free(status); | 1094 | if (status) mailimap_mailbox_data_status_free(status); |
1095 | if (att_list) mailimap_status_att_list_free(att_list); | 1095 | if (att_list) mailimap_status_att_list_free(att_list); |
1096 | } | 1096 | } |
@@ -1112,9 +1112,9 @@ MAILLIB::ATYPE IMAPwrapper::getType()const | |||
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | const QString&IMAPwrapper::getName()const | 1114 | const QString&IMAPwrapper::getName()const |
1115 | { | 1115 | { |
1116 | qDebug("Get name: %s",account->getAccountName().latin1()); | 1116 | odebug << "Get name: " << account->getAccountName().latin1() << "" << oendl; |
1117 | return account->getAccountName(); | 1117 | return account->getAccountName(); |
1118 | } | 1118 | } |
1119 | 1119 | ||
1120 | encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail) | 1120 | encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail) |
@@ -1128,9 +1128,9 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
1128 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 1128 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
1129 | { | 1129 | { |
1130 | if (targetWrapper != this) { | 1130 | if (targetWrapper != this) { |
1131 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); | 1131 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); |
1132 | qDebug("Using generic"); | 1132 | odebug << "Using generic" << oendl; |
1133 | return; | 1133 | return; |
1134 | } | 1134 | } |
1135 | mailimap_set *set = 0; | 1135 | mailimap_set *set = 0; |
1136 | login(); | 1136 | login(); |
@@ -1147,9 +1147,9 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
1147 | mailimap_set_free( set ); | 1147 | mailimap_set_free( set ); |
1148 | if ( err != MAILIMAP_NO_ERROR ) { | 1148 | if ( err != MAILIMAP_NO_ERROR ) { |
1149 | QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response); | 1149 | QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response); |
1150 | Global::statusMessage(error_msg); | 1150 | Global::statusMessage(error_msg); |
1151 | qDebug(error_msg); | 1151 | odebug << error_msg << oendl; |
1152 | return; | 1152 | return; |
1153 | } | 1153 | } |
1154 | if (moveit) { | 1154 | if (moveit) { |
1155 | deleteAllMail(fromFolder); | 1155 | deleteAllMail(fromFolder); |
@@ -1158,9 +1158,9 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
1158 | 1158 | ||
1159 | void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 1159 | void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
1160 | { | 1160 | { |
1161 | if (targetWrapper != this) { | 1161 | if (targetWrapper != this) { |
1162 | qDebug("Using generic"); | 1162 | odebug << "Using generic" << oendl; |
1163 | AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit); | 1163 | AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit); |
1164 | return; | 1164 | return; |
1165 | } | 1165 | } |
1166 | mailimap_set *set = 0; | 1166 | mailimap_set *set = 0; |
@@ -1177,9 +1177,9 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra | |||
1177 | mailimap_set_free( set ); | 1177 | mailimap_set_free( set ); |
1178 | if ( err != MAILIMAP_NO_ERROR ) { | 1178 | if ( err != MAILIMAP_NO_ERROR ) { |
1179 | QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response); | 1179 | QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response); |
1180 | Global::statusMessage(error_msg); | 1180 | Global::statusMessage(error_msg); |
1181 | qDebug(error_msg); | 1181 | odebug << error_msg << oendl; |
1182 | return; | 1182 | return; |
1183 | } | 1183 | } |
1184 | if (moveit) { | 1184 | if (moveit) { |
1185 | deleteMail(mail); | 1185 | deleteMail(mail); |
diff --git a/noncore/net/mail/libmailwrapper/logindialog.cpp b/noncore/net/mail/libmailwrapper/logindialog.cpp index 01d177e..c9ae190 100644 --- a/noncore/net/mail/libmailwrapper/logindialog.cpp +++ b/noncore/net/mail/libmailwrapper/logindialog.cpp | |||
@@ -23,7 +23,7 @@ void LoginDialog::accept() | |||
23 | //_pass.replace( 0, _pass.length(), passLine->text() ); | 23 | //_pass.replace( 0, _pass.length(), passLine->text() ); |
24 | _user = userLine->text(); | 24 | _user = userLine->text(); |
25 | _pass = passLine->text(); | 25 | _pass = passLine->text(); |
26 | 26 | ||
27 | qDebug("User im accept: |%s|",_user.latin1()); | 27 | odebug << "User im accept: |" << _user.latin1() << "|" << oendl; |
28 | QDialog::accept(); | 28 | QDialog::accept(); |
29 | } | 29 | } |
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp index 90b8865..6d44db4 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.cpp +++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp | |||
@@ -12,9 +12,9 @@ RecMail::RecMail(const RecMail&old) | |||
12 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) | 12 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) |
13 | { | 13 | { |
14 | init(); | 14 | init(); |
15 | copy_old(old); | 15 | copy_old(old); |
16 | qDebug("Copy constructor RecMail"); | 16 | odebug << "Copy constructor RecMail" << oendl; |
17 | } | 17 | } |
18 | 18 | ||
19 | RecMail::~RecMail() | 19 | RecMail::~RecMail() |
20 | { | 20 | { |
@@ -130,9 +130,9 @@ RecPart::RecPart(const RecPart&old) | |||
130 | m_lines = old.m_lines; | 130 | m_lines = old.m_lines; |
131 | m_size = old.m_size; | 131 | m_size = old.m_size; |
132 | m_Parameters = old.m_Parameters; | 132 | m_Parameters = old.m_Parameters; |
133 | m_poslist = old.m_poslist; | 133 | m_poslist = old.m_poslist; |
134 | qDebug("RecPart copy constructor"); | 134 | odebug << "RecPart copy constructor" << oendl; |
135 | } | 135 | } |
136 | 136 | ||
137 | RecPart::~RecPart() | 137 | RecPart::~RecPart() |
138 | { | 138 | { |
@@ -254,9 +254,9 @@ RecBody::RecBody(const RecBody&old) | |||
254 | { | 254 | { |
255 | m_BodyText = old.m_BodyText; | 255 | m_BodyText = old.m_BodyText; |
256 | m_PartsList = old.m_PartsList; | 256 | m_PartsList = old.m_PartsList; |
257 | m_description = old.m_description; | 257 | m_description = old.m_description; |
258 | qDebug("Recbody copy constructor"); | 258 | odebug << "Recbody copy constructor" << oendl; |
259 | } | 259 | } |
260 | 260 | ||
261 | RecBody::~RecBody() | 261 | RecBody::~RecBody() |
262 | { | 262 | { |
@@ -319,16 +319,16 @@ encodedString::encodedString(char*nContent,unsigned int nSize) | |||
319 | encodedString::encodedString(const encodedString&old) | 319 | encodedString::encodedString(const encodedString&old) |
320 | { | 320 | { |
321 | init(); | 321 | init(); |
322 | copy_old(old); | 322 | copy_old(old); |
323 | qDebug("encodedeString: copy constructor!"); | 323 | odebug << "encodedeString: copy constructor!" << oendl; |
324 | } | 324 | } |
325 | 325 | ||
326 | encodedString& encodedString::operator=(const encodedString&old) | 326 | encodedString& encodedString::operator=(const encodedString&old) |
327 | { | 327 | { |
328 | init(); | 328 | init(); |
329 | copy_old(old); | 329 | copy_old(old); |
330 | qDebug("encodedString: assign operator!"); | 330 | odebug << "encodedString: assign operator!" << oendl; |
331 | return *this; | 331 | return *this; |
332 | } | 332 | } |
333 | 333 | ||
334 | encodedString::~encodedString() | 334 | encodedString::~encodedString() |
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp index eddc0b9..2b0d112 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp | |||
@@ -50,9 +50,9 @@ IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no | |||
50 | { | 50 | { |
51 | // Decode IMAP foldername | 51 | // Decode IMAP foldername |
52 | nameDisplay = IMAPFolder::decodeFolderName( name ); | 52 | nameDisplay = IMAPFolder::decodeFolderName( name ); |
53 | /* | 53 | /* |
54 | qDebug( "folder " + name + " - displayed as " + nameDisplay ); | 54 | odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; |
55 | */ | 55 | */ |
56 | prefix = aprefix; | 56 | prefix = aprefix; |
57 | 57 | ||
58 | if (prefix.length()>0) { | 58 | if (prefix.length()>0) { |
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp index e3c75f3..df2112f 100644 --- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp | |||
@@ -30,9 +30,9 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta | |||
30 | mailfolder*folder; | 30 | mailfolder*folder; |
31 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 31 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
32 | r = mailfolder_connect(folder); | 32 | r = mailfolder_connect(folder); |
33 | if (r != MAIL_NO_ERROR) { | 33 | if (r != MAIL_NO_ERROR) { |
34 | qDebug("Error initializing mbox"); | 34 | odebug << "Error initializing mbox" << oendl; |
35 | mailfolder_free(folder); | 35 | mailfolder_free(folder); |
36 | mailstorage_free(storage); | 36 | mailstorage_free(storage); |
37 | return; | 37 | return; |
38 | } | 38 | } |
@@ -69,16 +69,16 @@ void MBOXwrapper::deleteMail(const RecMailP & mail) | |||
69 | mailfolder*folder; | 69 | mailfolder*folder; |
70 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 70 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
71 | r = mailfolder_connect(folder); | 71 | r = mailfolder_connect(folder); |
72 | if (r != MAIL_NO_ERROR) { | 72 | if (r != MAIL_NO_ERROR) { |
73 | qDebug("Error initializing mbox"); | 73 | odebug << "Error initializing mbox" << oendl; |
74 | mailfolder_free(folder); | 74 | mailfolder_free(folder); |
75 | mailstorage_free(storage); | 75 | mailstorage_free(storage); |
76 | return; | 76 | return; |
77 | } | 77 | } |
78 | r = mailsession_remove_message(folder->fld_session,mail->getNumber()); | 78 | r = mailsession_remove_message(folder->fld_session,mail->getNumber()); |
79 | if (r != MAIL_NO_ERROR) { | 79 | if (r != MAIL_NO_ERROR) { |
80 | qDebug("error deleting mail"); | 80 | odebug << "error deleting mail" << oendl; |
81 | } | 81 | } |
82 | mailfolder_free(folder); | 82 | mailfolder_free(folder); |
83 | mailstorage_free(storage); | 83 | mailstorage_free(storage); |
84 | } | 84 | } |
@@ -101,23 +101,23 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail ) | |||
101 | mailfolder*folder; | 101 | mailfolder*folder; |
102 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 102 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
103 | r = mailfolder_connect(folder); | 103 | r = mailfolder_connect(folder); |
104 | if (r != MAIL_NO_ERROR) { | 104 | if (r != MAIL_NO_ERROR) { |
105 | qDebug("Error initializing mbox"); | 105 | odebug << "Error initializing mbox" << oendl; |
106 | mailfolder_free(folder); | 106 | mailfolder_free(folder); |
107 | mailstorage_free(storage); | 107 | mailstorage_free(storage); |
108 | return body; | 108 | return body; |
109 | } | 109 | } |
110 | r = mailsession_get_message(folder->fld_session, mail->getNumber(), &msg); | 110 | r = mailsession_get_message(folder->fld_session, mail->getNumber(), &msg); |
111 | if (r != MAIL_NO_ERROR) { | 111 | if (r != MAIL_NO_ERROR) { |
112 | qDebug("Error fetching mail %i",mail->getNumber()); | 112 | odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; |
113 | mailfolder_free(folder); | 113 | mailfolder_free(folder); |
114 | mailstorage_free(storage); | 114 | mailstorage_free(storage); |
115 | return body; | 115 | return body; |
116 | } | 116 | } |
117 | r = mailmessage_fetch(msg,&data,&size); | 117 | r = mailmessage_fetch(msg,&data,&size); |
118 | if (r != MAIL_NO_ERROR) { | 118 | if (r != MAIL_NO_ERROR) { |
119 | qDebug("Error fetching mail %i",mail->getNumber()); | 119 | odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; |
120 | mailfolder_free(folder); | 120 | mailfolder_free(folder); |
121 | mailstorage_free(storage); | 121 | mailstorage_free(storage); |
122 | mailmessage_free(msg); | 122 | mailmessage_free(msg); |
123 | return body; | 123 | return body; |
@@ -131,9 +131,9 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail ) | |||
131 | } | 131 | } |
132 | 132 | ||
133 | void MBOXwrapper::mbox_progress( size_t current, size_t maximum ) | 133 | void MBOXwrapper::mbox_progress( size_t current, size_t maximum ) |
134 | { | 134 | { |
135 | qDebug("MBOX %i von %i",current,maximum); | 135 | odebug << "MBOX " << current << " von " << maximum << "" << oendl; |
136 | } | 136 | } |
137 | 137 | ||
138 | int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,bool ) | 138 | int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,bool ) |
139 | { | 139 | { |
@@ -219,9 +219,9 @@ void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> | |||
219 | p+=mailbox; | 219 | p+=mailbox; |
220 | mailmbox_folder*f = 0; | 220 | mailmbox_folder*f = 0; |
221 | int r = mailmbox_init(p.latin1(),0,1,0,&f); | 221 | int r = mailmbox_init(p.latin1(),0,1,0,&f); |
222 | if (r != MAIL_NO_ERROR) { | 222 | if (r != MAIL_NO_ERROR) { |
223 | qDebug("Error init folder"); | 223 | odebug << "Error init folder" << oendl; |
224 | return; | 224 | return; |
225 | } | 225 | } |
226 | deleteMails(f,target); | 226 | deleteMails(f,target); |
227 | mailmbox_done(f); | 227 | mailmbox_done(f); |
@@ -234,14 +234,14 @@ void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &targ | |||
234 | QValueList<RecMailP>::ConstIterator it; | 234 | QValueList<RecMailP>::ConstIterator it; |
235 | for (it=target.begin(); it != target.end();++it) { | 235 | for (it=target.begin(); it != target.end();++it) { |
236 | r = mailmbox_delete_msg(f,(*it)->getNumber()); | 236 | r = mailmbox_delete_msg(f,(*it)->getNumber()); |
237 | if (r!=MAILMBOX_NO_ERROR) { | 237 | if (r!=MAILMBOX_NO_ERROR) { |
238 | qDebug("error delete mail"); | 238 | odebug << "error delete mail" << oendl; |
239 | } | 239 | } |
240 | } | 240 | } |
241 | r = mailmbox_expunge(f); | 241 | r = mailmbox_expunge(f); |
242 | if (r != MAILMBOX_NO_ERROR) { | 242 | if (r != MAILMBOX_NO_ERROR) { |
243 | qDebug("error expunge mailbox"); | 243 | odebug << "error expunge mailbox" << oendl; |
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | int MBOXwrapper::deleteAllMail(const FolderP&tfolder) | 247 | int MBOXwrapper::deleteAllMail(const FolderP&tfolder) |
@@ -268,9 +268,9 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder) | |||
268 | } | 268 | } |
269 | if (res) { | 269 | if (res) { |
270 | r = mailsession_get_messages_list(folder->fld_session,&l); | 270 | r = mailsession_get_messages_list(folder->fld_session,&l); |
271 | if (r != MAIL_NO_ERROR) { | 271 | if (r != MAIL_NO_ERROR) { |
272 | qDebug("Error message list"); | 272 | odebug << "Error message list" << oendl; |
273 | res=0; | 273 | res=0; |
274 | } | 274 | } |
275 | } | 275 | } |
276 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { | 276 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { |
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp index 12472e9..cd7cecb 100644 --- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp | |||
@@ -15,9 +15,9 @@ MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | |||
15 | if (MHPath.length()>0) { | 15 | if (MHPath.length()>0) { |
16 | if (MHPath[MHPath.length()-1]=='/') { | 16 | if (MHPath[MHPath.length()-1]=='/') { |
17 | MHPath=MHPath.left(MHPath.length()-1); | 17 | MHPath=MHPath.left(MHPath.length()-1); |
18 | } | 18 | } |
19 | qDebug(MHPath); | 19 | odebug << MHPath << oendl; |
20 | QDir dir(MHPath); | 20 | QDir dir(MHPath); |
21 | if (!dir.exists()) { | 21 | if (!dir.exists()) { |
22 | dir.mkdir(MHPath); | 22 | dir.mkdir(MHPath); |
23 | } | 23 | } |
@@ -32,17 +32,17 @@ void MHwrapper::init_storage() | |||
32 | if (!m_storage) { | 32 | if (!m_storage) { |
33 | m_storage = mailstorage_new(NULL); | 33 | m_storage = mailstorage_new(NULL); |
34 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); | 34 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); |
35 | if (r != MAIL_NO_ERROR) { | 35 | if (r != MAIL_NO_ERROR) { |
36 | qDebug("error initializing storage"); | 36 | odebug << "error initializing storage" << oendl; |
37 | mailstorage_free(m_storage); | 37 | mailstorage_free(m_storage); |
38 | m_storage = 0; | 38 | m_storage = 0; |
39 | return; | 39 | return; |
40 | } | 40 | } |
41 | } | 41 | } |
42 | r = mailstorage_connect(m_storage); | 42 | r = mailstorage_connect(m_storage); |
43 | if (r!=MAIL_NO_ERROR) { | 43 | if (r!=MAIL_NO_ERROR) { |
44 | qDebug("error connecting storage"); | 44 | odebug << "error connecting storage" << oendl; |
45 | mailstorage_free(m_storage); | 45 | mailstorage_free(m_storage); |
46 | m_storage = 0; | 46 | m_storage = 0; |
47 | } | 47 | } |
48 | } | 48 | } |
@@ -69,9 +69,9 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm | |||
69 | } | 69 | } |
70 | QString f = buildPath(mailbox); | 70 | QString f = buildPath(mailbox); |
71 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 71 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
72 | if (r!=MAIL_NO_ERROR) { | 72 | if (r!=MAIL_NO_ERROR) { |
73 | qDebug("listMessages: error selecting folder!"); | 73 | odebug << "listMessages: error selecting folder!" << oendl; |
74 | return; | 74 | return; |
75 | } | 75 | } |
76 | parseList(target,m_storage->sto_session,f); | 76 | parseList(target,m_storage->sto_session,f); |
77 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); | 77 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); |
@@ -89,9 +89,9 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() | |||
89 | mail_list*flist = 0; | 89 | mail_list*flist = 0; |
90 | clistcell*current=0; | 90 | clistcell*current=0; |
91 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); | 91 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); |
92 | if (r != MAIL_NO_ERROR || !flist) { | 92 | if (r != MAIL_NO_ERROR || !flist) { |
93 | qDebug("error getting folder list"); | 93 | odebug << "error getting folder list" << oendl; |
94 | return folders; | 94 | return folders; |
95 | } | 95 | } |
96 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { | 96 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { |
97 | QString t = (char*)current->data; | 97 | QString t = (char*)current->data; |
@@ -109,14 +109,14 @@ void MHwrapper::deleteMail(const RecMailP&mail) | |||
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 111 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
112 | if (r!=MAIL_NO_ERROR) { | 112 | if (r!=MAIL_NO_ERROR) { |
113 | qDebug("error selecting folder!"); | 113 | odebug << "error selecting folder!" << oendl; |
114 | return; | 114 | return; |
115 | } | 115 | } |
116 | r = mailsession_remove_message(m_storage->sto_session,mail->getNumber()); | 116 | r = mailsession_remove_message(m_storage->sto_session,mail->getNumber()); |
117 | if (r != MAIL_NO_ERROR) { | 117 | if (r != MAIL_NO_ERROR) { |
118 | qDebug("error deleting mail"); | 118 | odebug << "error deleting mail" << oendl; |
119 | } | 119 | } |
120 | } | 120 | } |
121 | 121 | ||
122 | void MHwrapper::answeredMail(const RecMailP&) | 122 | void MHwrapper::answeredMail(const RecMailP&) |
@@ -139,9 +139,9 @@ RecBodyP MHwrapper::fetchBody( const RecMailP &mail ) | |||
139 | return body; | 139 | return body; |
140 | } | 140 | } |
141 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); | 141 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); |
142 | if (r != MAIL_NO_ERROR) { | 142 | if (r != MAIL_NO_ERROR) { |
143 | qDebug("Error fetching mail %i",mail->getNumber()); | 143 | odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; |
144 | return body; | 144 | return body; |
145 | } | 145 | } |
146 | body = parseMail(msg); | 146 | body = parseMail(msg); |
147 | mailmessage_fetch_result_free(msg,data); | 147 | mailmessage_fetch_result_free(msg,data); |
@@ -149,9 +149,9 @@ RecBodyP MHwrapper::fetchBody( const RecMailP &mail ) | |||
149 | } | 149 | } |
150 | 150 | ||
151 | void MHwrapper::mbox_progress( size_t current, size_t maximum ) | 151 | void MHwrapper::mbox_progress( size_t current, size_t maximum ) |
152 | { | 152 | { |
153 | qDebug("MH %i von %i",current,maximum); | 153 | odebug << "MH " << current << " von " << maximum << "" << oendl; |
154 | } | 154 | } |
155 | 155 | ||
156 | QString MHwrapper::buildPath(const QString&p) | 156 | QString MHwrapper::buildPath(const QString&p) |
157 | { | 157 | { |
@@ -182,15 +182,15 @@ int MHwrapper::createMbox(const QString&folder,const FolderP&pfolder,const QStri | |||
182 | f = pfolder->getName(); | 182 | f = pfolder->getName(); |
183 | f+="/"; | 183 | f+="/"; |
184 | f+=folder; | 184 | f+=folder; |
185 | } | 185 | } |
186 | qDebug(f); | 186 | odebug << f << oendl; |
187 | int r = mailsession_create_folder(m_storage->sto_session,(char*)f.latin1()); | 187 | int r = mailsession_create_folder(m_storage->sto_session,(char*)f.latin1()); |
188 | if (r != MAIL_NO_ERROR) { | 188 | if (r != MAIL_NO_ERROR) { |
189 | qDebug("error creating folder %i",r); | 189 | odebug << "error creating folder " << r << "" << oendl; |
190 | return 0; | 190 | return 0; |
191 | } | 191 | } |
192 | qDebug("Folder created"); | 192 | odebug << "Folder created" << oendl; |
193 | return 1; | 193 | return 1; |
194 | } | 194 | } |
195 | 195 | ||
196 | void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) | 196 | void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) |
@@ -201,14 +201,14 @@ void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) | |||
201 | } | 201 | } |
202 | QString f = buildPath(Folder); | 202 | QString f = buildPath(Folder); |
203 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 203 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
204 | if (r!=MAIL_NO_ERROR) { | 204 | if (r!=MAIL_NO_ERROR) { |
205 | qDebug("error selecting folder!"); | 205 | odebug << "error selecting folder!" << oendl; |
206 | return; | 206 | return; |
207 | } | 207 | } |
208 | r = mailsession_append_message(m_storage->sto_session,(char*)msg,length); | 208 | r = mailsession_append_message(m_storage->sto_session,(char*)msg,length); |
209 | if (r!=MAIL_NO_ERROR) { | 209 | if (r!=MAIL_NO_ERROR) { |
210 | qDebug("error storing mail"); | 210 | odebug << "error storing mail" << oendl; |
211 | } | 211 | } |
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | 214 | ||
@@ -223,9 +223,9 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail) | |||
223 | char*data=0; | 223 | char*data=0; |
224 | size_t size; | 224 | size_t size; |
225 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 225 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
226 | if (r!=MAIL_NO_ERROR) { | 226 | if (r!=MAIL_NO_ERROR) { |
227 | qDebug("error selecting folder!"); | 227 | odebug << "error selecting folder!" << oendl; |
228 | return result; | 228 | return result; |
229 | } | 229 | } |
230 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); | 230 | r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); |
231 | if (r != MAIL_NO_ERROR) { | 231 | if (r != MAIL_NO_ERROR) { |
@@ -247,16 +247,16 @@ void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> & | |||
247 | { | 247 | { |
248 | QString f = buildPath(mailbox); | 248 | QString f = buildPath(mailbox); |
249 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 249 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
250 | if (r!=MAIL_NO_ERROR) { | 250 | if (r!=MAIL_NO_ERROR) { |
251 | qDebug("deleteMails: error selecting folder!"); | 251 | odebug << "deleteMails: error selecting folder!" << oendl; |
252 | return; | 252 | return; |
253 | } | 253 | } |
254 | QValueList<RecMailP>::ConstIterator it; | 254 | QValueList<RecMailP>::ConstIterator it; |
255 | for (it=target.begin(); it!=target.end();++it) { | 255 | for (it=target.begin(); it!=target.end();++it) { |
256 | r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber()); | 256 | r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber()); |
257 | if (r != MAIL_NO_ERROR) { | 257 | if (r != MAIL_NO_ERROR) { |
258 | qDebug("error deleting mail"); | 258 | odebug << "error deleting mail" << oendl; |
259 | break; | 259 | break; |
260 | } | 260 | } |
261 | } | 261 | } |
262 | } | 262 | } |
@@ -270,15 +270,15 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder) | |||
270 | int res = 1; | 270 | int res = 1; |
271 | if (!tfolder) return 0; | 271 | if (!tfolder) return 0; |
272 | int r = mailsession_select_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 272 | int r = mailsession_select_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
273 | if (r!=MAIL_NO_ERROR) { | 273 | if (r!=MAIL_NO_ERROR) { |
274 | qDebug("error selecting folder!"); | 274 | odebug << "error selecting folder!" << oendl; |
275 | return 0; | 275 | return 0; |
276 | } | 276 | } |
277 | mailmessage_list*l=0; | 277 | mailmessage_list*l=0; |
278 | r = mailsession_get_messages_list(m_storage->sto_session,&l); | 278 | r = mailsession_get_messages_list(m_storage->sto_session,&l); |
279 | if (r != MAIL_NO_ERROR) { | 279 | if (r != MAIL_NO_ERROR) { |
280 | qDebug("Error message list"); | 280 | odebug << "Error message list" << oendl; |
281 | res = 0; | 281 | res = 0; |
282 | } | 282 | } |
283 | unsigned j = 0; | 283 | unsigned j = 0; |
284 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { | 284 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { |
@@ -307,9 +307,9 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) | |||
307 | 307 | ||
308 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 308 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
309 | 309 | ||
310 | if (r != MAIL_NO_ERROR) { | 310 | if (r != MAIL_NO_ERROR) { |
311 | qDebug("error deleting mail box"); | 311 | odebug << "error deleting mail box" << oendl; |
312 | return 0; | 312 | return 0; |
313 | } | 313 | } |
314 | QString cmd = "rm -rf "+tfolder->getName(); | 314 | QString cmd = "rm -rf "+tfolder->getName(); |
315 | QStringList command; | 315 | QStringList command; |
@@ -325,12 +325,12 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) | |||
325 | 325 | ||
326 | *process << command; | 326 | *process << command; |
327 | removeMboxfailed = false; | 327 | removeMboxfailed = false; |
328 | if(!process->start(OProcess::Block, OProcess::All) ) { | 328 | if(!process->start(OProcess::Block, OProcess::All) ) { |
329 | qDebug("could not start process"); | 329 | odebug << "could not start process" << oendl; |
330 | return 0; | 330 | return 0; |
331 | } | 331 | } |
332 | qDebug("mail box deleted"); | 332 | odebug << "mail box deleted" << oendl; |
333 | return 1; | 333 | return 1; |
334 | } | 334 | } |
335 | 335 | ||
336 | void MHwrapper::processEnded(OProcess *p) | 336 | void MHwrapper::processEnded(OProcess *p) |
@@ -377,26 +377,26 @@ void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstract | |||
377 | if (!m_storage) { | 377 | if (!m_storage) { |
378 | return; | 378 | return; |
379 | } | 379 | } |
380 | if (targetWrapper != this) { | 380 | if (targetWrapper != this) { |
381 | qDebug("Using generic"); | 381 | odebug << "Using generic" << oendl; |
382 | Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit); | 382 | Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit); |
383 | return; | 383 | return; |
384 | } | 384 | } |
385 | qDebug("Using internal routines for move/copy"); | 385 | odebug << "Using internal routines for move/copy" << oendl; |
386 | QString tf = buildPath(targetFolder); | 386 | QString tf = buildPath(targetFolder); |
387 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); | 387 | int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); |
388 | if (r != MAIL_NO_ERROR) { | 388 | if (r != MAIL_NO_ERROR) { |
389 | qDebug("Error selecting source mailbox"); | 389 | odebug << "Error selecting source mailbox" << oendl; |
390 | return; | 390 | return; |
391 | } | 391 | } |
392 | if (moveit) { | 392 | if (moveit) { |
393 | r = mailsession_move_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); | 393 | r = mailsession_move_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); |
394 | } else { | 394 | } else { |
395 | r = mailsession_copy_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); | 395 | r = mailsession_copy_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1()); |
396 | } | 396 | } |
397 | if (r != MAIL_NO_ERROR) { | 397 | if (r != MAIL_NO_ERROR) { |
398 | qDebug("Error copy/moving mail internal (%i)",r); | 398 | odebug << "Error copy/moving mail internal (" << r << ")" << oendl; |
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
402 | void MHwrapper::mvcpAllMails(const FolderP&fromFolder, | 402 | void MHwrapper::mvcpAllMails(const FolderP&fromFolder, |
@@ -406,23 +406,23 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
406 | if (!m_storage) { | 406 | if (!m_storage) { |
407 | return; | 407 | return; |
408 | } | 408 | } |
409 | if (targetWrapper != this) { | 409 | if (targetWrapper != this) { |
410 | qDebug("Using generic"); | 410 | odebug << "Using generic" << oendl; |
411 | Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); | 411 | Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); |
412 | return; | 412 | return; |
413 | } | 413 | } |
414 | if (!fromFolder) return; | 414 | if (!fromFolder) return; |
415 | int r = mailsession_select_folder(m_storage->sto_session,(char*)fromFolder->getName().latin1()); | 415 | int r = mailsession_select_folder(m_storage->sto_session,(char*)fromFolder->getName().latin1()); |
416 | if (r!=MAIL_NO_ERROR) { | 416 | if (r!=MAIL_NO_ERROR) { |
417 | qDebug("error selecting source folder!"); | 417 | odebug << "error selecting source folder!" << oendl; |
418 | return; | 418 | return; |
419 | } | 419 | } |
420 | QString tf = buildPath(targetFolder); | 420 | QString tf = buildPath(targetFolder); |
421 | mailmessage_list*l=0; | 421 | mailmessage_list*l=0; |
422 | r = mailsession_get_messages_list(m_storage->sto_session,&l); | 422 | r = mailsession_get_messages_list(m_storage->sto_session,&l); |
423 | if (r != MAIL_NO_ERROR) { | 423 | if (r != MAIL_NO_ERROR) { |
424 | qDebug("Error message list"); | 424 | odebug << "Error message list" << oendl; |
425 | } | 425 | } |
426 | unsigned j = 0; | 426 | unsigned j = 0; |
427 | for(unsigned int i = 0 ; l!= 0 && i < carray_count(l->msg_tab) ; ++i) { | 427 | for(unsigned int i = 0 ; l!= 0 && i < carray_count(l->msg_tab) ; ++i) { |
428 | mailmessage * msg; | 428 | mailmessage * msg; |
@@ -433,9 +433,9 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
433 | } else { | 433 | } else { |
434 | r = mailsession_copy_message(m_storage->sto_session,j,(char*)tf.latin1()); | 434 | r = mailsession_copy_message(m_storage->sto_session,j,(char*)tf.latin1()); |
435 | } | 435 | } |
436 | if (r != MAIL_NO_ERROR) { | 436 | if (r != MAIL_NO_ERROR) { |
437 | qDebug("Error copy/moving mail internal (%i)",r); | 437 | odebug << "Error copy/moving mail internal (" << r << ")" << oendl; |
438 | break; | 438 | break; |
439 | } | 439 | } |
440 | } | 440 | } |
441 | if (l) mailmessage_list_free(l); | 441 | if (l) mailmessage_list_free(l); |
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp index cfded43..5d5011a 100644 --- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp | |||
@@ -28,9 +28,9 @@ NNTPwrapper::~NNTPwrapper() { | |||
28 | } | 28 | } |
29 | } | 29 | } |
30 | 30 | ||
31 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { | 31 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { |
32 | qDebug( "NNTP: %i of %i", current, maximum ); | 32 | odebug << "NNTP: " << current << " of " << maximum << "" << oendl; |
33 | } | 33 | } |
34 | 34 | ||
35 | 35 | ||
36 | RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) { | 36 | RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) { |
@@ -45,9 +45,9 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) { | |||
45 | } | 45 | } |
46 | 46 | ||
47 | mailmessage * mailmsg; | 47 | mailmessage * mailmsg; |
48 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { | 48 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { |
49 | qDebug("Message to large: %i",mail->Msgsize()); | 49 | odebug << "Message to large: " << mail->Msgsize() << "" << oendl; |
50 | return body; | 50 | return body; |
51 | } | 51 | } |
52 | 52 | ||
53 | QFile msg_cache(msgTempName); | 53 | QFile msg_cache(msgTempName); |
@@ -133,9 +133,9 @@ void NNTPwrapper::login() | |||
133 | User = login.getUser().latin1(); | 133 | User = login.getUser().latin1(); |
134 | Pass = login.getPassword().latin1(); | 134 | Pass = login.getPassword().latin1(); |
135 | } else { | 135 | } else { |
136 | // cancel | 136 | // cancel |
137 | qDebug( "NNTP: Login canceled" ); | 137 | odebug << "NNTP: Login canceled" << oendl; |
138 | return; | 138 | return; |
139 | } | 139 | } |
140 | } else { | 140 | } else { |
141 | User = account->getUser().latin1(); | 141 | User = account->getUser().latin1(); |
@@ -170,9 +170,9 @@ void NNTPwrapper::login() | |||
170 | 170 | ||
171 | err = mailstorage_connect( m_nntp ); | 171 | err = mailstorage_connect( m_nntp ); |
172 | 172 | ||
173 | if (err != NEWSNNTP_NO_ERROR) { | 173 | if (err != NEWSNNTP_NO_ERROR) { |
174 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); | 174 | odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; |
175 | // Global::statusMessage(tr("Error initializing folder")); | 175 | // Global::statusMessage(tr("Error initializing folder")); |
176 | mailstorage_free(m_nntp); | 176 | mailstorage_free(m_nntp); |
177 | m_nntp = 0; | 177 | m_nntp = 0; |
178 | 178 | ||
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 5467547..c586c29 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -27,9 +27,9 @@ POP3wrapper::~POP3wrapper() { | |||
27 | } | 27 | } |
28 | } | 28 | } |
29 | 29 | ||
30 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { | 30 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { |
31 | qDebug( "POP3: %i of %i", current, maximum ); | 31 | odebug << "POP3: " << current << " of " << maximum << "" << oendl; |
32 | } | 32 | } |
33 | 33 | ||
34 | RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) { | 34 | RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) { |
35 | int err = MAILPOP3_NO_ERROR; | 35 | int err = MAILPOP3_NO_ERROR; |
@@ -44,9 +44,9 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) { | |||
44 | } | 44 | } |
45 | 45 | ||
46 | mailmessage * mailmsg; | 46 | mailmessage * mailmsg; |
47 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { | 47 | if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { |
48 | qDebug("Message to large: %i",mail->Msgsize()); | 48 | odebug << "Message to large: " << mail->Msgsize() << "" << oendl; |
49 | return body; | 49 | return body; |
50 | } | 50 | } |
51 | 51 | ||
52 | QFile msg_cache(msgTempName); | 52 | QFile msg_cache(msgTempName); |
@@ -129,9 +129,9 @@ void POP3wrapper::login() | |||
129 | user = login.getUser().latin1(); | 129 | user = login.getUser().latin1(); |
130 | pass = login.getPassword().latin1(); | 130 | pass = login.getPassword().latin1(); |
131 | } else { | 131 | } else { |
132 | // cancel | 132 | // cancel |
133 | qDebug( "POP3: Login canceled" ); | 133 | odebug << "POP3: Login canceled" << oendl; |
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | } else { | 136 | } else { |
137 | user = account->getUser().latin1(); | 137 | user = account->getUser().latin1(); |
@@ -161,9 +161,9 @@ void POP3wrapper::login() | |||
161 | 161 | ||
162 | 162 | ||
163 | err = mailstorage_connect(m_pop3); | 163 | err = mailstorage_connect(m_pop3); |
164 | if (err != MAIL_NO_ERROR) { | 164 | if (err != MAIL_NO_ERROR) { |
165 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); | 165 | odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; |
166 | Global::statusMessage(tr("Error initializing folder")); | 166 | Global::statusMessage(tr("Error initializing folder")); |
167 | mailstorage_free(m_pop3); | 167 | mailstorage_free(m_pop3); |
168 | m_pop3 = 0; | 168 | m_pop3 = 0; |
169 | } else { | 169 | } else { |
@@ -235,9 +235,9 @@ void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) { | |||
235 | return; | 235 | return; |
236 | int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count, | 236 | int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count, |
237 | &target_stat.message_recent,&target_stat.message_unseen); | 237 | &target_stat.message_recent,&target_stat.message_unseen); |
238 | if (r != MAIL_NO_ERROR) { | 238 | if (r != MAIL_NO_ERROR) { |
239 | qDebug("error getting folter status."); | 239 | odebug << "error getting folter status." << oendl; |
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | encodedString* POP3wrapper::fetchRawBody(const RecMailP&mail) { | 243 | encodedString* POP3wrapper::fetchRawBody(const RecMailP&mail) { |
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp index 2c81963..de36eeb 100644 --- a/noncore/net/mail/libmailwrapper/settings.cpp +++ b/noncore/net/mail/libmailwrapper/settings.cpp | |||
@@ -25,9 +25,9 @@ Settings::Settings() | |||
25 | void Settings::checkDirectory() | 25 | void Settings::checkDirectory() |
26 | { | 26 | { |
27 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { | 27 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { |
28 | system( "mkdir -p $HOME/Applications/opiemail" ); | 28 | system( "mkdir -p $HOME/Applications/opiemail" ); |
29 | qDebug( "$HOME/Applications/opiemail created" ); | 29 | odebug << "$HOME/Applications/opiemail created" << oendl; |
30 | } | 30 | } |
31 | } | 31 | } |
32 | 32 | ||
33 | QList<Account> Settings::getAccounts() | 33 | QList<Account> Settings::getAccounts() |
@@ -53,30 +53,30 @@ void Settings::updateAccounts() | |||
53 | QStringList::Iterator it; | 53 | QStringList::Iterator it; |
54 | 54 | ||
55 | QStringList imap = dir.entryList( "imap-*" ); | 55 | QStringList imap = dir.entryList( "imap-*" ); |
56 | for ( it = imap.begin(); it != imap.end(); it++ ) { | 56 | for ( it = imap.begin(); it != imap.end(); it++ ) { |
57 | qDebug( "Added IMAP account" ); | 57 | odebug << "Added IMAP account" << oendl; |
58 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); | 58 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); |
59 | accounts.append( account ); | 59 | accounts.append( account ); |
60 | } | 60 | } |
61 | 61 | ||
62 | QStringList pop3 = dir.entryList( "pop3-*" ); | 62 | QStringList pop3 = dir.entryList( "pop3-*" ); |
63 | for ( it = pop3.begin(); it != pop3.end(); it++ ) { | 63 | for ( it = pop3.begin(); it != pop3.end(); it++ ) { |
64 | qDebug( "Added POP account" ); | 64 | odebug << "Added POP account" << oendl; |
65 | POP3account *account = new POP3account( (*it).replace(0, 5, "") ); | 65 | POP3account *account = new POP3account( (*it).replace(0, 5, "") ); |
66 | accounts.append( account ); | 66 | accounts.append( account ); |
67 | } | 67 | } |
68 | 68 | ||
69 | QStringList smtp = dir.entryList( "smtp-*" ); | 69 | QStringList smtp = dir.entryList( "smtp-*" ); |
70 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { | 70 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { |
71 | qDebug( "Added SMTP account" ); | 71 | odebug << "Added SMTP account" << oendl; |
72 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); | 72 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); |
73 | accounts.append( account ); | 73 | accounts.append( account ); |
74 | } | 74 | } |
75 | 75 | ||
76 | QStringList nntp = dir.entryList( "nntp-*" ); | 76 | QStringList nntp = dir.entryList( "nntp-*" ); |
77 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { | 77 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { |
78 | qDebug( "Added NNTP account" ); | 78 | odebug << "Added NNTP account" << oendl; |
79 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); | 79 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); |
80 | accounts.append( account ); | 80 | accounts.append( account ); |
81 | } | 81 | } |
82 | 82 | ||
@@ -178,9 +178,9 @@ void IMAPaccount::read() | |||
178 | } | 178 | } |
179 | 179 | ||
180 | void IMAPaccount::save() | 180 | void IMAPaccount::save() |
181 | { | 181 | { |
182 | qDebug( "saving " + getFileName() ); | 182 | odebug << "saving " + getFileName() << oendl; |
183 | Settings::checkDirectory(); | 183 | Settings::checkDirectory(); |
184 | 184 | ||
185 | Config *conf = new Config( getFileName(), Config::File ); | 185 | Config *conf = new Config( getFileName(), Config::File ); |
186 | conf->setGroup( "IMAP Account" ); | 186 | conf->setGroup( "IMAP Account" ); |
@@ -256,9 +256,9 @@ void POP3account::read() | |||
256 | } | 256 | } |
257 | 257 | ||
258 | void POP3account::save() | 258 | void POP3account::save() |
259 | { | 259 | { |
260 | qDebug( "saving " + getFileName() ); | 260 | odebug << "saving " + getFileName() << oendl; |
261 | Settings::checkDirectory(); | 261 | Settings::checkDirectory(); |
262 | 262 | ||
263 | Config *conf = new Config( getFileName(), Config::File ); | 263 | Config *conf = new Config( getFileName(), Config::File ); |
264 | conf->setGroup( "POP3 Account" ); | 264 | conf->setGroup( "POP3 Account" ); |
@@ -338,9 +338,9 @@ void SMTPaccount::read() | |||
338 | } | 338 | } |
339 | 339 | ||
340 | void SMTPaccount::save() | 340 | void SMTPaccount::save() |
341 | { | 341 | { |
342 | qDebug( "saving " + getFileName() ); | 342 | odebug << "saving " + getFileName() << oendl; |
343 | Settings::checkDirectory(); | 343 | Settings::checkDirectory(); |
344 | 344 | ||
345 | Config *conf = new Config( getFileName(), Config::File ); | 345 | Config *conf = new Config( getFileName(), Config::File ); |
346 | conf->setGroup( "SMTP Account" ); | 346 | conf->setGroup( "SMTP Account" ); |
@@ -415,9 +415,9 @@ void NNTPaccount::read() | |||
415 | } | 415 | } |
416 | 416 | ||
417 | void NNTPaccount::save() | 417 | void NNTPaccount::save() |
418 | { | 418 | { |
419 | qDebug( "saving " + getFileName() ); | 419 | odebug << "saving " + getFileName() << oendl; |
420 | Settings::checkDirectory(); | 420 | Settings::checkDirectory(); |
421 | 421 | ||
422 | Config *conf = new Config( getFileName(), Config::File ); | 422 | Config *conf = new Config( getFileName(), Config::File ); |
423 | conf->setGroup( "NNTP Account" ); | 423 | conf->setGroup( "NNTP Account" ); |
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index e2cea7a..ba78c3b 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -114,9 +114,9 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later) { | |||
114 | mailmessage_free(msg); | 114 | mailmessage_free(msg); |
115 | if (r != MAIL_NO_ERROR || !data) { | 115 | if (r != MAIL_NO_ERROR || !data) { |
116 | if (data) | 116 | if (data) |
117 | free(data); | 117 | free(data); |
118 | qDebug("Error fetching mime..."); | 118 | odebug << "Error fetching mime..." << oendl; |
119 | return; | 119 | return; |
120 | } | 120 | } |
121 | msg = 0; | 121 | msg = 0; |
122 | if (later) { | 122 | if (later) { |
@@ -207,18 +207,18 @@ void SMTPwrapper::connect_server() | |||
207 | return; | 207 | return; |
208 | } | 208 | } |
209 | 209 | ||
210 | int err = MAILSMTP_NO_ERROR; | 210 | int err = MAILSMTP_NO_ERROR; |
211 | qDebug( "Servername %s at port %i", server, port ); | 211 | odebug << "Servername " << server << " at port " << port << "" << oendl; |
212 | if ( ssl ) { | 212 | if ( ssl ) { |
213 | qDebug( "SSL session" ); | 213 | odebug << "SSL session" << oendl; |
214 | err = mailsmtp_ssl_connect( m_smtp, server, port ); | 214 | err = mailsmtp_ssl_connect( m_smtp, server, port ); |
215 | } else { | 215 | } else { |
216 | qDebug( "No SSL session" ); | 216 | odebug << "No SSL session" << oendl; |
217 | err = mailsmtp_socket_connect( m_smtp, server, port ); | 217 | err = mailsmtp_socket_connect( m_smtp, server, port ); |
218 | } | 218 | } |
219 | if ( err != MAILSMTP_NO_ERROR ) { | 219 | if ( err != MAILSMTP_NO_ERROR ) { |
220 | qDebug("Error init connection"); | 220 | odebug << "Error init connection" << oendl; |
221 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 221 | failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err)); |
222 | result = 0; | 222 | result = 0; |
223 | } | 223 | } |
224 | 224 | ||
@@ -245,9 +245,9 @@ void SMTPwrapper::connect_server() | |||
245 | failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err)); | 245 | failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err)); |
246 | } | 246 | } |
247 | 247 | ||
248 | if (result==1 && m_SmtpAccount->getLogin() ) { | 248 | if (result==1 && m_SmtpAccount->getLogin() ) { |
249 | qDebug("smtp with auth"); | 249 | odebug << "smtp with auth" << oendl; |
250 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { | 250 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { |
251 | // get'em | 251 | // get'em |
252 | LoginDialog login( m_SmtpAccount->getUser(), | 252 | LoginDialog login( m_SmtpAccount->getUser(), |
253 | m_SmtpAccount->getPassword(), NULL, 0, true ); | 253 | m_SmtpAccount->getPassword(), NULL, 0, true ); |
@@ -263,13 +263,13 @@ void SMTPwrapper::connect_server() | |||
263 | } else { | 263 | } else { |
264 | user = m_SmtpAccount->getUser().latin1(); | 264 | user = m_SmtpAccount->getUser().latin1(); |
265 | pass = m_SmtpAccount->getPassword().latin1(); | 265 | pass = m_SmtpAccount->getPassword().latin1(); |
266 | } | 266 | } |
267 | qDebug( "session->auth: %i", m_smtp->auth); | 267 | odebug << "session->auth: " << m_smtp->auth << "" << oendl; |
268 | if (result) { | 268 | if (result) { |
269 | err = mailsmtp_auth( m_smtp, (char*)user, (char*)pass ); | 269 | err = mailsmtp_auth( m_smtp, (char*)user, (char*)pass ); |
270 | if ( err == MAILSMTP_NO_ERROR ) { | 270 | if ( err == MAILSMTP_NO_ERROR ) { |
271 | qDebug("auth ok"); | 271 | odebug << "auth ok" << oendl; |
272 | } else { | 272 | } else { |
273 | failuretext = tr("Authentification failed"); | 273 | failuretext = tr("Authentification failed"); |
274 | result = 0; | 274 | result = 0; |
275 | } | 275 | } |
@@ -306,9 +306,9 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
306 | 306 | ||
307 | if (!result) { | 307 | if (!result) { |
308 | storeFailedMail(data,size,failuretext); | 308 | storeFailedMail(data,size,failuretext); |
309 | } else { | 309 | } else { |
310 | qDebug( "Mail sent." ); | 310 | odebug << "Mail sent." << oendl; |
311 | storeMail(data,size,"Sent"); | 311 | storeMail(data,size,"Sent"); |
312 | } | 312 | } |
313 | return result; | 313 | return result; |
314 | } | 314 | } |
@@ -318,15 +318,15 @@ void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later | |||
318 | mailmime * mimeMail; | 318 | mailmime * mimeMail; |
319 | 319 | ||
320 | mimeMail = createMimeMail(mail ); | 320 | mimeMail = createMimeMail(mail ); |
321 | if ( mimeMail == NULL ) { | 321 | if ( mimeMail == NULL ) { |
322 | qDebug( "sendMail: error creating mime mail" ); | 322 | odebug << "sendMail: error creating mime mail" << oendl; |
323 | } else { | 323 | } else { |
324 | sendProgress = new progressMailSend(); | 324 | sendProgress = new progressMailSend(); |
325 | sendProgress->show(); | 325 | sendProgress->show(); |
326 | sendProgress->setMaxMails(1); | 326 | sendProgress->setMaxMails(1); |
327 | smtpSend( mimeMail,later); | 327 | smtpSend( mimeMail,later); |
328 | qDebug("Clean up done"); | 328 | odebug << "Clean up done" << oendl; |
329 | sendProgress->hide(); | 329 | sendProgress->hide(); |
330 | delete sendProgress; | 330 | delete sendProgress; |
331 | sendProgress = 0; | 331 | sendProgress = 0; |
332 | mailmime_free( mimeMail ); | 332 | mailmime_free( mimeMail ); |
@@ -377,19 +377,19 @@ int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { | |||
377 | /* this is a special fun */ | 377 | /* this is a special fun */ |
378 | bool SMTPwrapper::flushOutbox() { | 378 | bool SMTPwrapper::flushOutbox() { |
379 | bool returnValue = true; | 379 | bool returnValue = true; |
380 | 380 | ||
381 | qDebug("Sending the queue"); | 381 | odebug << "Sending the queue" << oendl; |
382 | if (!m_SmtpAccount) { | 382 | if (!m_SmtpAccount) { |
383 | qDebug("No smtp account given"); | 383 | odebug << "No smtp account given" << oendl; |
384 | return false; | 384 | return false; |
385 | } | 385 | } |
386 | 386 | ||
387 | bool reset_user_value = false; | 387 | bool reset_user_value = false; |
388 | QString localfolders = AbstractMail::defaultLocalfolder(); | 388 | QString localfolders = AbstractMail::defaultLocalfolder(); |
389 | AbstractMail*wrap = AbstractMail::getWrapper(localfolders); | 389 | AbstractMail*wrap = AbstractMail::getWrapper(localfolders); |
390 | if (!wrap) { | 390 | if (!wrap) { |
391 | qDebug("memory error"); | 391 | odebug << "memory error" << oendl; |
392 | return false; | 392 | return false; |
393 | } | 393 | } |
394 | QString oldPw, oldUser; | 394 | QString oldPw, oldUser; |
395 | QValueList<RecMailP> mailsToSend; | 395 | QValueList<RecMailP> mailsToSend; |
@@ -397,9 +397,9 @@ bool SMTPwrapper::flushOutbox() { | |||
397 | QString mbox("Outgoing"); | 397 | QString mbox("Outgoing"); |
398 | wrap->listMessages(mbox,mailsToSend); | 398 | wrap->listMessages(mbox,mailsToSend); |
399 | if (mailsToSend.count()==0) { | 399 | if (mailsToSend.count()==0) { |
400 | delete wrap; | 400 | delete wrap; |
401 | qDebug("No mails to send"); | 401 | odebug << "No mails to send" << oendl; |
402 | return false; | 402 | return false; |
403 | } | 403 | } |
404 | 404 | ||
405 | oldPw = m_SmtpAccount->getPassword(); | 405 | oldPw = m_SmtpAccount->getPassword(); |
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp index b78244d..51383f6 100644 --- a/noncore/net/mail/libmailwrapper/statusmail.cpp +++ b/noncore/net/mail/libmailwrapper/statusmail.cpp | |||
@@ -42,9 +42,9 @@ void StatusMail::initAccounts(QList<Account>&accounts) | |||
42 | currentPop3Stat.message_count+=currentStat.message_count; | 42 | currentPop3Stat.message_count+=currentStat.message_count; |
43 | } | 43 | } |
44 | current->logout(); | 44 | current->logout(); |
45 | } | 45 | } |
46 | qDebug("Pop3 init count: %i",currentPop3Stat.message_count); | 46 | odebug << "Pop3 init count: " << currentPop3Stat.message_count << "" << oendl; |
47 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; | 47 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; |
48 | lastPop3Stat.message_unseen = currentPop3Stat.message_unseen; | 48 | lastPop3Stat.message_unseen = currentPop3Stat.message_unseen; |
49 | lastPop3Stat.message_recent = currentPop3Stat.message_recent; | 49 | lastPop3Stat.message_recent = currentPop3Stat.message_recent; |
50 | lastPop3Stat.message_count = currentPop3Stat.message_count; | 50 | lastPop3Stat.message_count = currentPop3Stat.message_count; |
@@ -71,12 +71,12 @@ void StatusMail::check_current_stat(folderStat&targetStat) | |||
71 | currentImapStat.message_recent+=currentStat.message_recent; | 71 | currentImapStat.message_recent+=currentStat.message_recent; |
72 | currentImapStat.message_count+=currentStat.message_count; | 72 | currentImapStat.message_count+=currentStat.message_count; |
73 | } else if (it->getType() == MAILLIB::A_POP3) { | 73 | } else if (it->getType() == MAILLIB::A_POP3) { |
74 | currentPop3Stat.message_count+=currentStat.message_count; | 74 | currentPop3Stat.message_count+=currentStat.message_count; |
75 | qDebug("Pop3 count: %i",currentPop3Stat.message_count); | 75 | odebug << "Pop3 count: " << currentPop3Stat.message_count << "" << oendl; |
76 | } | 76 | } |
77 | } | 77 | } |
78 | qDebug("Pop3 last: %i",lastPop3Stat.message_count); | 78 | odebug << "Pop3 last: " << lastPop3Stat.message_count << "" << oendl; |
79 | if (currentPop3Stat.message_count > lastPop3Stat.message_count) { | 79 | if (currentPop3Stat.message_count > lastPop3Stat.message_count) { |
80 | currentPop3Stat.message_recent = currentPop3Stat.message_count - lastPop3Stat.message_count; | 80 | currentPop3Stat.message_recent = currentPop3Stat.message_count - lastPop3Stat.message_count; |
81 | currentPop3Stat.message_unseen = currentPop3Stat.message_recent; | 81 | currentPop3Stat.message_unseen = currentPop3Stat.message_recent; |
82 | } else { | 82 | } else { |
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp index 914a11d..546d756 100644 --- a/noncore/net/mail/libmailwrapper/storemail.cpp +++ b/noncore/net/mail/libmailwrapper/storemail.cpp | |||
@@ -57,9 +57,9 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail) | |||
57 | 57 | ||
58 | mailmime * mimeMail = 0; | 58 | mailmime * mimeMail = 0; |
59 | mimeMail = createMimeMail(mail ); | 59 | mimeMail = createMimeMail(mail ); |
60 | if ( mimeMail == NULL ) { | 60 | if ( mimeMail == NULL ) { |
61 | qDebug( "storeMail: error creating mime mail" ); | 61 | odebug << "storeMail: error creating mime mail" << oendl; |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | char *data; | 64 | char *data; |
65 | size_t size; | 65 | size_t size; |
@@ -72,9 +72,9 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail) | |||
72 | mime_message_detach_mime(msg); | 72 | mime_message_detach_mime(msg); |
73 | mailmessage_free(msg); | 73 | mailmessage_free(msg); |
74 | msg = 0; | 74 | msg = 0; |
75 | if (r != MAIL_NO_ERROR || !data) { | 75 | if (r != MAIL_NO_ERROR || !data) { |
76 | qDebug("Error fetching mime..."); | 76 | odebug << "Error fetching mime..." << oendl; |
77 | ret = 0; | 77 | ret = 0; |
78 | } | 78 | } |
79 | 79 | ||
80 | if (ret) { | 80 | if (ret) { |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index c23ad3f..4c87d64 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -140,9 +140,9 @@ MainWindow::~MainWindow() | |||
140 | } | 140 | } |
141 | 141 | ||
142 | void MainWindow::appMessage(const QCString &, const QByteArray &) | 142 | void MainWindow::appMessage(const QCString &, const QByteArray &) |
143 | { | 143 | { |
144 | qDebug("appMessage not reached"); | 144 | odebug << "appMessage not reached" << oendl; |
145 | } | 145 | } |
146 | 146 | ||
147 | void MainWindow::slotAdjustLayout() { | 147 | void MainWindow::slotAdjustLayout() { |
148 | 148 | ||
@@ -174,34 +174,34 @@ void MainWindow::slotEditSettings() | |||
174 | } | 174 | } |
175 | 175 | ||
176 | void MainWindow::slotShowFolders( bool ) | 176 | void MainWindow::slotShowFolders( bool ) |
177 | { | 177 | { |
178 | qDebug( "slotShowFolders not reached" ); | 178 | odebug << "slotShowFolders not reached" << oendl; |
179 | } | 179 | } |
180 | 180 | ||
181 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) | 181 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) |
182 | { | 182 | { |
183 | qDebug( "refreshMailView not reached" ); | 183 | odebug << "refreshMailView not reached" << oendl; |
184 | } | 184 | } |
185 | 185 | ||
186 | void MainWindow::mailLeftClicked(int, QListViewItem *,const QPoint&,int ) | 186 | void MainWindow::mailLeftClicked(int, QListViewItem *,const QPoint&,int ) |
187 | { | 187 | { |
188 | qDebug( "mailLeftClicked not reached" ); | 188 | odebug << "mailLeftClicked not reached" << oendl; |
189 | } | 189 | } |
190 | 190 | ||
191 | void MainWindow::displayMail() | 191 | void MainWindow::displayMail() |
192 | { | 192 | { |
193 | qDebug("displayMail not reached"); | 193 | odebug << "displayMail not reached" << oendl; |
194 | } | 194 | } |
195 | 195 | ||
196 | void MainWindow::slotDeleteMail() | 196 | void MainWindow::slotDeleteMail() |
197 | { | 197 | { |
198 | qDebug("deleteMail not reached"); | 198 | odebug << "deleteMail not reached" << oendl; |
199 | } | 199 | } |
200 | 200 | ||
201 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) | 201 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) |
202 | { | 202 | { |
203 | qDebug("mailHold not reached"); | 203 | odebug << "mailHold not reached" << oendl; |
204 | } | 204 | } |
205 | 205 | ||
206 | void MainWindow::slotSendQueued() | 206 | void MainWindow::slotSendQueued() |
207 | { | 207 | { |
diff --git a/noncore/net/mail/nntpgroups.cpp b/noncore/net/mail/nntpgroups.cpp index 8741c4b..3243ee3 100644 --- a/noncore/net/mail/nntpgroups.cpp +++ b/noncore/net/mail/nntpgroups.cpp | |||
@@ -52,9 +52,9 @@ void NNTPGroups::storeValues() | |||
52 | QListViewItemIterator list_it( GroupListView ); | 52 | QListViewItemIterator list_it( GroupListView ); |
53 | subscribedGroups.clear(); | 53 | subscribedGroups.clear(); |
54 | for ( ; list_it.current(); ++list_it ) { | 54 | for ( ; list_it.current(); ++list_it ) { |
55 | if ( ( (QCheckListItem*)list_it.current() )->isOn() ) { | 55 | if ( ( (QCheckListItem*)list_it.current() )->isOn() ) { |
56 | qDebug(list_it.current()->text(0) ); | 56 | odebug << list_it.current()->text(0) << oendl; |
57 | subscribedGroups.append( list_it.current()->text(0) ); | 57 | subscribedGroups.append( list_it.current()->text(0) ); |
58 | } | 58 | } |
59 | } | 59 | } |
60 | subscribedGroups+=subscribedGroupsNotListed; | 60 | subscribedGroups+=subscribedGroupsNotListed; |
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index 5da2161..0669b5a 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -66,15 +66,15 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email) | |||
66 | } | 66 | } |
67 | 67 | ||
68 | void OpieMail::slotComposeMail() | 68 | void OpieMail::slotComposeMail() |
69 | { | 69 | { |
70 | qDebug( "Compose Mail" ); | 70 | odebug << "Compose Mail" << oendl; |
71 | slotwriteMail(0l,0l); | 71 | slotwriteMail(0l,0l); |
72 | } | 72 | } |
73 | 73 | ||
74 | void OpieMail::slotSendQueued() | 74 | void OpieMail::slotSendQueued() |
75 | { | 75 | { |
76 | qDebug( "Send Queued" ); | 76 | odebug << "Send Queued" << oendl; |
77 | SMTPaccount *smtp = 0; | 77 | SMTPaccount *smtp = 0; |
78 | 78 | ||
79 | QList<Account> list = settings->getAccounts(); | 79 | QList<Account> list = settings->getAccounts(); |
80 | QList<SMTPaccount> smtpList; | 80 | QList<SMTPaccount> smtpList; |
@@ -119,9 +119,9 @@ void OpieMail::slotSendQueued() | |||
119 | } | 119 | } |
120 | 120 | ||
121 | void OpieMail::slotSearchMails() | 121 | void OpieMail::slotSearchMails() |
122 | { | 122 | { |
123 | qDebug( "Search Mails" ); | 123 | odebug << "Search Mails" << oendl; |
124 | } | 124 | } |
125 | 125 | ||
126 | void OpieMail::slotEditSettings() | 126 | void OpieMail::slotEditSettings() |
127 | { | 127 | { |
@@ -130,9 +130,9 @@ void OpieMail::slotEditSettings() | |||
130 | } | 130 | } |
131 | 131 | ||
132 | void OpieMail::slotEditAccounts() | 132 | void OpieMail::slotEditAccounts() |
133 | { | 133 | { |
134 | qDebug( "Edit Accounts" ); | 134 | odebug << "Edit Accounts" << oendl; |
135 | EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); | 135 | EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); |
136 | eaDialog.slotAdjustColumns(); | 136 | eaDialog.slotAdjustColumns(); |
137 | QPEApplication::execDialog( &eaDialog ); | 137 | QPEApplication::execDialog( &eaDialog ); |
138 | if ( settings ) delete settings; | 138 | if ( settings ) delete settings; |
@@ -179,9 +179,9 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) | |||
179 | if (!mailView->currentItem()) return; | 179 | if (!mailView->currentItem()) return; |
180 | MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType(); | 180 | MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType(); |
181 | /* just the RIGHT button - or hold on pda */ | 181 | /* just the RIGHT button - or hold on pda */ |
182 | if (button!=2) {return;} | 182 | if (button!=2) {return;} |
183 | qDebug("Event right/hold"); | 183 | odebug << "Event right/hold" << oendl; |
184 | if (!item) return; | 184 | if (!item) return; |
185 | QPopupMenu *m = new QPopupMenu(0); | 185 | QPopupMenu *m = new QPopupMenu(0); |
186 | if (m) | 186 | if (m) |
187 | { | 187 | { |
@@ -203,17 +203,17 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) | |||
203 | } | 203 | } |
204 | 204 | ||
205 | void OpieMail::slotShowFolders( bool show ) | 205 | void OpieMail::slotShowFolders( bool show ) |
206 | { | 206 | { |
207 | qDebug( "Show Folders" ); | 207 | odebug << "Show Folders" << oendl; |
208 | if ( show && folderView->isHidden() ) | 208 | if ( show && folderView->isHidden() ) |
209 | { | 209 | { |
210 | qDebug( "-> showing" ); | 210 | odebug << "-> showing" << oendl; |
211 | folderView->show(); | 211 | folderView->show(); |
212 | } | 212 | } |
213 | else if ( !show && !folderView->isHidden() ) | 213 | else if ( !show && !folderView->isHidden() ) |
214 | { | 214 | { |
215 | qDebug( "-> hiding" ); | 215 | odebug << "-> hiding" << oendl; |
216 | folderView->hide(); | 216 | folderView->hide(); |
217 | } | 217 | } |
218 | } | 218 | } |
219 | 219 | ||
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index f672a36..cac9048 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp | |||
@@ -103,9 +103,9 @@ void MailApplet::slotCheck() { | |||
103 | folderStat stat; | 103 | folderStat stat; |
104 | m_statusMail->check_current_stat( stat ); | 104 | m_statusMail->check_current_stat( stat ); |
105 | int newMailsOld = m_newMails; | 105 | int newMailsOld = m_newMails; |
106 | m_newMails = stat.message_unseen; | 106 | m_newMails = stat.message_unseen; |
107 | qDebug( QString( "test %1" ).arg( m_newMails ) ); | 107 | odebug << QString( "test %1" ).arg( m_newMails ) << oendl; |
108 | if ( m_newMails > 0 && newMailsOld != m_newMails ) { | 108 | if ( m_newMails > 0 && newMailsOld != m_newMails ) { |
109 | ODevice *device = ODevice::inst(); | 109 | ODevice *device = ODevice::inst(); |
110 | if ( isHidden() ) | 110 | if ( isHidden() ) |
111 | show(); | 111 | show(); |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 156e11d..a574ea1 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -138,9 +138,9 @@ void ViewMail::setBody(const RecBodyP&body ) | |||
138 | type = body->Parts()[i]->Type()+"/"+body->Parts()[i]->Subtype(); | 138 | type = body->Parts()[i]->Type()+"/"+body->Parts()[i]->Subtype(); |
139 | part_plist_t::ConstIterator it = body->Parts()[i]->Parameters().begin(); | 139 | part_plist_t::ConstIterator it = body->Parts()[i]->Parameters().begin(); |
140 | for (;it!=body->Parts()[i]->Parameters().end();++it) | 140 | for (;it!=body->Parts()[i]->Parameters().end();++it) |
141 | { | 141 | { |
142 | qDebug(it.key()); | 142 | odebug << it.key() << oendl; |
143 | if (it.key().lower()=="name") | 143 | if (it.key().lower()=="name") |
144 | { | 144 | { |
145 | filename=it.data(); | 145 | filename=it.data(); |
146 | } | 146 | } |
diff --git a/noncore/net/opieftp/config.in b/noncore/net/opieftp/config.in index 96e8b27..95cf73c 100644 --- a/noncore/net/opieftp/config.in +++ b/noncore/net/opieftp/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIEFTP | 1 | config OPIEFTP |
2 | boolean "opie-ftp (ftp client for Opie)" | 2 | boolean "opie-ftp (ftp client for Opie)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && FTPLIB |
diff --git a/noncore/net/opieftp/filePermissions.cpp b/noncore/net/opieftp/filePermissions.cpp index f545c1f..991fcd5 100644 --- a/noncore/net/opieftp/filePermissions.cpp +++ b/noncore/net/opieftp/filePermissions.cpp | |||
@@ -31,9 +31,9 @@ filePermissions::filePermissions( QWidget* parent, const char* name, bool modal | |||
31 | : QDialog( parent, name, modal, fl ) | 31 | : QDialog( parent, name, modal, fl ) |
32 | { | 32 | { |
33 | if ( !name ) | 33 | if ( !name ) |
34 | setName( tr("filePermissions") ); | 34 | setName( tr("filePermissions") ); |
35 | // qDebug("FilePermissions "+fileName); | 35 | // odebug << "FilePermissions "+fileName << oendl; |
36 | resize( 236, 210 ); | 36 | resize( 236, 210 ); |
37 | isRemote=useRemote; | 37 | isRemote=useRemote; |
38 | setMaximumSize( QSize( 236, 210 ) ); | 38 | setMaximumSize( QSize( 236, 210 ) ); |
39 | setCaption( tr( "Set File Permissions" ) ); | 39 | setCaption( tr( "Set File Permissions" ) ); |
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 4c39569..fe96103 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -18,13 +18,15 @@ extern "C" { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | #include "inputDialog.h" | 20 | #include "inputDialog.h" |
21 | 21 | ||
22 | #include <qmenubar.h> | 22 | /* OPIE */ |
23 | #include <opie2/odebug.h> | ||
23 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
25 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
26 | #include <qpe/mimetype.h> | 27 | #include <qpe/mimetype.h> |
28 | using namespace Opie::Core; | ||
27 | 29 | ||
28 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
29 | #include <qpushbutton.h> | 31 | #include <qpushbutton.h> |
30 | #include <qtoolbutton.h> | 32 | #include <qtoolbutton.h> |
@@ -35,16 +37,17 @@ extern "C" { | |||
35 | #include <qspinbox.h> | 37 | #include <qspinbox.h> |
36 | #include <qtabwidget.h> | 38 | #include <qtabwidget.h> |
37 | #include <qlayout.h> | 39 | #include <qlayout.h> |
38 | #include <qmessagebox.h> | 40 | #include <qmessagebox.h> |
41 | #include <qmenubar.h> | ||
39 | #include <qlineedit.h> | 42 | #include <qlineedit.h> |
40 | #include <qlistbox.h> | 43 | #include <qlistbox.h> |
41 | #include <qvbox.h> | 44 | #include <qvbox.h> |
42 | 45 | ||
46 | /* STD */ | ||
43 | #include <unistd.h> | 47 | #include <unistd.h> |
44 | #include <stdlib.h> | 48 | #include <stdlib.h> |
45 | 49 | ||
46 | |||
47 | QProgressBar *ProgressBar; | 50 | QProgressBar *ProgressBar; |
48 | static netbuf *conn=NULL; | 51 | static netbuf *conn=NULL; |
49 | 52 | ||
50 | static int log_progress(netbuf *, int xfered, void *) | 53 | static int log_progress(netbuf *, int xfered, void *) |
@@ -60,9 +63,9 @@ static int log_progress(netbuf *, int xfered, void *) | |||
60 | 63 | ||
61 | OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | 64 | OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) |
62 | : QMainWindow( parent, name, fl ) | 65 | : QMainWindow( parent, name, fl ) |
63 | { | 66 | { |
64 | qDebug("OpieFtp constructor"); | 67 | odebug << "OpieFtp constructor" << oendl; |
65 | setCaption( tr( "OpieFtp" ) ); | 68 | setCaption( tr( "OpieFtp" ) ); |
66 | fuckeduphack=FALSE; | 69 | fuckeduphack=FALSE; |
67 | 70 | ||
68 | QVBox* wrapperBox = new QVBox( this ); | 71 | QVBox* wrapperBox = new QVBox( this ); |
@@ -333,9 +336,9 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
333 | 336 | ||
334 | // ServerComboBox->setCurrentItem(currentServerConfig); | 337 | // ServerComboBox->setCurrentItem(currentServerConfig); |
335 | 338 | ||
336 | TabWidget->setCurrentPage(2); | 339 | TabWidget->setCurrentPage(2); |
337 | qDebug("Constructor done"); | 340 | odebug << "Constructor done" << oendl; |
338 | } | 341 | } |
339 | 342 | ||
340 | OpieFtp::~OpieFtp() | 343 | OpieFtp::~OpieFtp() |
341 | { | 344 | { |
@@ -404,9 +407,9 @@ void OpieFtp::newConnection() | |||
404 | 407 | ||
405 | void OpieFtp::serverComboEdited(const QString & ) | 408 | void OpieFtp::serverComboEdited(const QString & ) |
406 | { | 409 | { |
407 | // if( ServerComboBox->text(currentServerConfig) != edit /*edit.isEmpty() */) { | 410 | // if( ServerComboBox->text(currentServerConfig) != edit /*edit.isEmpty() */) { |
408 | // qDebug("ServerComboEdited"); | 411 | // odebug << "ServerComboEdited" << oendl; |
409 | // // currentServerConfig = -1; | 412 | // // currentServerConfig = -1; |
410 | // } | 413 | // } |
411 | } | 414 | } |
412 | 415 | ||
@@ -529,9 +532,9 @@ void OpieFtp::localUpload() | |||
529 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); | 532 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); |
530 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); | 533 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); |
531 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); | 534 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); |
532 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); | 535 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); |
533 | qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); | 536 | odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; |
534 | 537 | ||
535 | if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { | 538 | if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { |
536 | QString msg; | 539 | QString msg; |
537 | msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn)); | 540 | msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn)); |
@@ -590,9 +593,9 @@ void OpieFtp::remoteDownload() | |||
590 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); | 593 | FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); |
591 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); | 594 | FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); |
592 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); | 595 | FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); |
593 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); | 596 | FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); |
594 | qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1()); | 597 | odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; |
595 | 598 | ||
596 | if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { | 599 | if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { |
597 | QString msg; | 600 | QString msg; |
598 | msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn)); | 601 | msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn)); |
@@ -619,9 +622,9 @@ bool OpieFtp::remoteDirList(const QString &dir) | |||
619 | if(tmp.right(1) != "/") | 622 | if(tmp.right(1) != "/") |
620 | tmp+="/._temp"; | 623 | tmp+="/._temp"; |
621 | else | 624 | else |
622 | tmp+="._temp"; | 625 | tmp+="._temp"; |
623 | // qDebug("Listing remote dir "+tmp); | 626 | // odebug << "Listing remote dir "+tmp << oendl; |
624 | // QCopEnvelope ( "QPE/System", "busy()" ); | 627 | // QCopEnvelope ( "QPE/System", "busy()" ); |
625 | if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) { | 628 | if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) { |
626 | QString msg; | 629 | QString msg; |
627 | msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) ); | 630 | msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) ); |
@@ -641,9 +644,9 @@ bool OpieFtp::remoteChDir(const QString &dir) | |||
641 | QString msg; | 644 | QString msg; |
642 | msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn)); | 645 | msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn)); |
643 | msg.replace(QRegExp(":"),"\n"); | 646 | msg.replace(QRegExp(":"),"\n"); |
644 | QMessageBox::message(tr("Note"),msg); | 647 | QMessageBox::message(tr("Note"),msg); |
645 | // qDebug(msg); | 648 | // odebug << msg << oendl; |
646 | // QCopEnvelope ( "QPE/System", "notBusy()" ); | 649 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
647 | return FALSE; | 650 | return FALSE; |
648 | } | 651 | } |
649 | // QCopEnvelope ( "QPE/System", "notBusy()" ); | 652 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
@@ -663,22 +666,22 @@ void OpieFtp::populateLocalView() | |||
663 | QFileInfo *fi; | 666 | QFileInfo *fi; |
664 | while ( (fi=it.current()) ) { | 667 | while ( (fi=it.current()) ) { |
665 | if (fi->isSymLink() ){ | 668 | if (fi->isSymLink() ){ |
666 | QString symLink=fi->readLink(); | 669 | QString symLink=fi->readLink(); |
667 | qDebug("Symlink detected "+symLink); | 670 | odebug << "Symlink detected "+symLink << oendl; |
668 | QFileInfo sym( symLink); | 671 | QFileInfo sym( symLink); |
669 | fileS.sprintf( "%10i", sym.size() ); | 672 | fileS.sprintf( "%10i", sym.size() ); |
670 | fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() ); | 673 | fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() ); |
671 | fileDate = sym.lastModified().toString(); | 674 | fileDate = sym.lastModified().toString(); |
672 | } else { | 675 | } else { |
673 | qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 676 | odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; |
674 | fileS.sprintf( "%10i", fi->size() ); | 677 | fileS.sprintf( "%10i", fi->size() ); |
675 | fileL.sprintf( "%s",fi->fileName().data() ); | 678 | fileL.sprintf( "%s",fi->fileName().data() ); |
676 | fileDate= fi->lastModified().toString(); | 679 | fileDate= fi->lastModified().toString(); |
677 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 680 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
678 | fileL+="/"; | 681 | fileL+="/"; |
679 | isDir=TRUE; | 682 | isDir=TRUE; |
680 | qDebug( fileL); | 683 | odebug << fileL << oendl; |
681 | } | 684 | } |
682 | } | 685 | } |
683 | if(fileL !="./" && fi->exists()) { | 686 | if(fileL !="./" && fi->exists()) { |
684 | item = new QListViewItem( Local_View,fileL, fileDate, fileS ); | 687 | item = new QListViewItem( Local_View,fileL, fileDate, fileS ); |
@@ -719,9 +722,9 @@ void OpieFtp::populateLocalView() | |||
719 | } | 722 | } |
720 | 723 | ||
721 | bool OpieFtp::populateRemoteView( ) | 724 | bool OpieFtp::populateRemoteView( ) |
722 | { | 725 | { |
723 | // qDebug("populate remoteview"); | 726 | // odebug << "populate remoteview" << oendl; |
724 | QString sfile=QDir::homeDirPath(); | 727 | QString sfile=QDir::homeDirPath(); |
725 | if(sfile.right(1) != "/") | 728 | if(sfile.right(1) != "/") |
726 | sfile+="/._temp"; | 729 | sfile+="/._temp"; |
727 | else | 730 | else |
@@ -768,9 +771,9 @@ bool OpieFtp::populateRemoteView( ) | |||
768 | file.close(); | 771 | file.close(); |
769 | if( file.exists()) | 772 | if( file.exists()) |
770 | file. remove(); | 773 | file. remove(); |
771 | } else | 774 | } else |
772 | qDebug("temp file not opened successfully "+sfile); | 775 | odebug << "temp file not opened successfully "+sfile << oendl; |
773 | Remote_View->setSorting( 4,TRUE); | 776 | Remote_View->setSorting( 4,TRUE); |
774 | return true; | 777 | return true; |
775 | } | 778 | } |
776 | 779 | ||
@@ -787,17 +790,17 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
787 | QString msg; | 790 | QString msg; |
788 | msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); | 791 | msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); |
789 | msg.replace(QRegExp(":"),"\n"); | 792 | msg.replace(QRegExp(":"),"\n"); |
790 | QMessageBox::message(tr("Note"),msg); | 793 | QMessageBox::message(tr("Note"),msg); |
791 | // qDebug(msg); | 794 | // odebug << msg << oendl; |
792 | } | 795 | } |
793 | char path[256]; | 796 | char path[256]; |
794 | if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string | 797 | if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string |
795 | QString msg; | 798 | QString msg; |
796 | msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn)); | 799 | msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn)); |
797 | msg.replace(QRegExp(":"),"\n"); | 800 | msg.replace(QRegExp(":"),"\n"); |
798 | QMessageBox::message(tr("Note"),msg); | 801 | QMessageBox::message(tr("Note"),msg); |
799 | // qDebug(msg); | 802 | // odebug << msg << oendl; |
800 | } | 803 | } |
801 | currentRemoteDir=path; | 804 | currentRemoteDir=path; |
802 | } else { | 805 | } else { |
803 | if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers | 806 | if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers |
@@ -806,15 +809,15 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
806 | currentRemoteDir = strItem; | 809 | currentRemoteDir = strItem; |
807 | if( !remoteChDir( (const QString &)strItem)) { | 810 | if( !remoteChDir( (const QString &)strItem)) { |
808 | currentRemoteDir = oldRemoteCurrentDir; | 811 | currentRemoteDir = oldRemoteCurrentDir; |
809 | strItem=""; | 812 | strItem=""; |
810 | // qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); | 813 | // odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; |
811 | } | 814 | } |
812 | } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory | 815 | } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory |
813 | if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) { | 816 | if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) { |
814 | currentRemoteDir = oldRemoteCurrentDir; | 817 | currentRemoteDir = oldRemoteCurrentDir; |
815 | strItem=""; | 818 | strItem=""; |
816 | // qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); | 819 | // odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; |
817 | 820 | ||
818 | } else { | 821 | } else { |
819 | currentRemoteDir = currentRemoteDir+strItem; | 822 | currentRemoteDir = currentRemoteDir+strItem; |
820 | } | 823 | } |
@@ -865,9 +868,9 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) | |||
865 | } | 868 | } |
866 | } else { | 869 | } else { |
867 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); | 870 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); |
868 | if( QFile::exists(strItem ) ) { | 871 | if( QFile::exists(strItem ) ) { |
869 | // qDebug("upload "+strItem); | 872 | // odebug << "upload "+strItem << oendl; |
870 | return; | 873 | return; |
871 | } | 874 | } |
872 | } //end not symlink | 875 | } //end not symlink |
873 | chdir(strItem.latin1()); | 876 | chdir(strItem.latin1()); |
@@ -1169,9 +1172,9 @@ void OpieFtp::fillRemoteCombo(const QString ¤tPath) { | |||
1169 | 1172 | ||
1170 | void OpieFtp::currentPathComboChanged() | 1173 | void OpieFtp::currentPathComboChanged() |
1171 | { | 1174 | { |
1172 | QString oldRemoteCurrentDir = currentRemoteDir; | 1175 | QString oldRemoteCurrentDir = currentRemoteDir; |
1173 | // qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir); | 1176 | // odebug << "oldRemoteCurrentDir "+oldRemoteCurrentDir << oendl; |
1174 | if (TabWidget->currentPageIndex() == 0) { | 1177 | if (TabWidget->currentPageIndex() == 0) { |
1175 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { | 1178 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { |
1176 | currentDir.setPath( currentPathCombo->lineEdit()->text() ); | 1179 | currentDir.setPath( currentPathCombo->lineEdit()->text() ); |
1177 | populateLocalView(); | 1180 | populateLocalView(); |
@@ -1215,16 +1218,16 @@ void OpieFtp::readConfig() | |||
1215 | Config cfg("opieftp"); | 1218 | Config cfg("opieftp"); |
1216 | cfg.setGroup("Server"); | 1219 | cfg.setGroup("Server"); |
1217 | currentServerConfig = cfg.readNumEntry("currentServer", -1); | 1220 | currentServerConfig = cfg.readNumEntry("currentServer", -1); |
1218 | 1221 | ||
1219 | // qDebug("Reading %d", currentServerConfig); | 1222 | // odebug << "Reading " << currentServerConfig << "" << oendl; |
1220 | serverComboSelected( currentServerConfig-1); | 1223 | serverComboSelected( currentServerConfig-1); |
1221 | 1224 | ||
1222 | } | 1225 | } |
1223 | 1226 | ||
1224 | void OpieFtp::writeConfig() | 1227 | void OpieFtp::writeConfig() |
1225 | { | 1228 | { |
1226 | qDebug("write config"); | 1229 | odebug << "write config" << oendl; |
1227 | Config cfg("opieftp"); | 1230 | Config cfg("opieftp"); |
1228 | cfg.setGroup("Server"); | 1231 | cfg.setGroup("Server"); |
1229 | 1232 | ||
1230 | QString username, remoteServerStr, remotePathStr, password, port, temp; | 1233 | QString username, remoteServerStr, remotePathStr, password, port, temp; |
@@ -1253,9 +1256,9 @@ void OpieFtp::writeConfig() | |||
1253 | cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() ); | 1256 | cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() ); |
1254 | cfg.writeEntry("currentServer", numberOfEntries+1); | 1257 | cfg.writeEntry("currentServer", numberOfEntries+1); |
1255 | 1258 | ||
1256 | currentServerConfig = numberOfEntries+1; | 1259 | currentServerConfig = numberOfEntries+1; |
1257 | qDebug("setting currentserverconfig to %d", currentServerConfig); | 1260 | odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; |
1258 | 1261 | ||
1259 | cfg.setGroup(temp); | 1262 | cfg.setGroup(temp); |
1260 | if(!newServerName.isEmpty()) | 1263 | if(!newServerName.isEmpty()) |
1261 | cfg.writeEntry("ServerName", newServerName); | 1264 | cfg.writeEntry("ServerName", newServerName); |
@@ -1272,9 +1275,9 @@ void OpieFtp::writeConfig() | |||
1272 | } | 1275 | } |
1273 | } | 1276 | } |
1274 | 1277 | ||
1275 | void OpieFtp::clearCombos() { | 1278 | void OpieFtp::clearCombos() { |
1276 | qDebug("clearing"); | 1279 | odebug << "clearing" << oendl; |
1277 | ServerComboBox->clear(); | 1280 | ServerComboBox->clear(); |
1278 | UsernameComboBox->clear(); | 1281 | UsernameComboBox->clear(); |
1279 | PasswordEdit->clear(); | 1282 | PasswordEdit->clear(); |
1280 | serverListView->clear(); | 1283 | serverListView->clear(); |
@@ -1291,20 +1294,20 @@ void OpieFtp::fillCombos() | |||
1291 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | 1294 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); |
1292 | 1295 | ||
1293 | for (int i = 1; i <= numberOfEntries; i++) { | 1296 | for (int i = 1; i <= numberOfEntries; i++) { |
1294 | temp.setNum(i); | 1297 | temp.setNum(i); |
1295 | qDebug(temp); | 1298 | odebug << temp << oendl; |
1296 | cfg.setGroup("Server"); | 1299 | cfg.setGroup("Server"); |
1297 | remoteServerStr = cfg.readEntry( temp,""); | 1300 | remoteServerStr = cfg.readEntry( temp,""); |
1298 | qDebug( remoteServerStr); | 1301 | odebug << remoteServerStr << oendl; |
1299 | 1302 | ||
1300 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); | 1303 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); |
1301 | port = remoteServerStr.right( divider - 1); | 1304 | port = remoteServerStr.right( divider - 1); |
1302 | bool ok; | 1305 | bool ok; |
1303 | PortSpinBox->setValue( port.toInt(&ok,10)); | 1306 | PortSpinBox->setValue( port.toInt(&ok,10)); |
1304 | 1307 | ||
1305 | remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); | 1308 | remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); |
1306 | qDebug( "remote server string "+remoteServerStr); | 1309 | odebug << "remote server string "+remoteServerStr << oendl; |
1307 | ServerComboBox->insertItem( remoteServerStr ); | 1310 | ServerComboBox->insertItem( remoteServerStr ); |
1308 | 1311 | ||
1309 | cfg.setGroup(temp); | 1312 | cfg.setGroup(temp); |
1310 | 1313 | ||
@@ -1320,9 +1323,9 @@ void OpieFtp::fillCombos() | |||
1320 | 1323 | ||
1321 | void OpieFtp::serverComboSelected(int index) | 1324 | void OpieFtp::serverComboSelected(int index) |
1322 | { | 1325 | { |
1323 | currentServerConfig = index+1; | 1326 | currentServerConfig = index+1; |
1324 | qDebug("server combo selected %d", index+1); | 1327 | odebug << "server combo selected " << index+1 << "" << oendl; |
1325 | QString username, remoteServerStr, remotePathStr, password, port, temp; | 1328 | QString username, remoteServerStr, remotePathStr, password, port, temp; |
1326 | // remoteServerStr = ServerComboBox->text(index); | 1329 | // remoteServerStr = ServerComboBox->text(index); |
1327 | 1330 | ||
1328 | Config cfg("opieftp"); | 1331 | Config cfg("opieftp"); |
@@ -1331,11 +1334,11 @@ void OpieFtp::serverComboSelected(int index) | |||
1331 | 1334 | ||
1332 | temp.setNum(index+1); | 1335 | temp.setNum(index+1); |
1333 | remoteServerStr = cfg.readEntry( temp,""); | 1336 | remoteServerStr = cfg.readEntry( temp,""); |
1334 | 1337 | ||
1335 | qDebug("Group" +temp); | 1338 | odebug << "Group" +temp << oendl; |
1336 | cfg.setGroup(temp); | 1339 | cfg.setGroup(temp); |
1337 | // qDebug(temp); | 1340 | // odebug << temp << oendl; |
1338 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); | 1341 | int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); |
1339 | port = remoteServerStr.right( divider - 1); | 1342 | port = remoteServerStr.right( divider - 1); |
1340 | bool ok; | 1343 | bool ok; |
1341 | int portInt = port.toInt(&ok,10); | 1344 | int portInt = port.toInt(&ok,10); |
@@ -1348,10 +1351,10 @@ void OpieFtp::serverComboSelected(int index) | |||
1348 | remotePath->setText(cfg.readEntry("RemotePath", "/")); | 1351 | remotePath->setText(cfg.readEntry("RemotePath", "/")); |
1349 | 1352 | ||
1350 | username = cfg.readEntry("Username", "anonymous"); | 1353 | username = cfg.readEntry("Username", "anonymous"); |
1351 | UsernameComboBox->lineEdit()->setText(username); | 1354 | UsernameComboBox->lineEdit()->setText(username); |
1352 | qDebug(username); | 1355 | odebug << username << oendl; |
1353 | // qDebug("Password is "+cfg.readEntryCrypt(username, "me@opieftp.org")); | 1356 | // odebug << "Password is "+cfg.readEntryCrypt(username << oendl; |
1354 | PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); | 1357 | PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); |
1355 | // UsernameComboBox | 1358 | // UsernameComboBox |
1356 | // PasswordEdit | 1359 | // PasswordEdit |
1357 | 1360 | ||
@@ -1361,9 +1364,9 @@ void OpieFtp::serverComboSelected(int index) | |||
1361 | 1364 | ||
1362 | fuckeduphack = TRUE; | 1365 | fuckeduphack = TRUE; |
1363 | serverListView->setCurrentItem( index); | 1366 | serverListView->setCurrentItem( index); |
1364 | fuckeduphack=FALSE; | 1367 | fuckeduphack=FALSE; |
1365 | qDebug("server list set selected %d",index); | 1368 | odebug << "server list set selected " << index << "" << oendl; |
1366 | update(); | 1369 | update(); |
1367 | } | 1370 | } |
1368 | 1371 | ||
1369 | void OpieFtp::deleteServer() | 1372 | void OpieFtp::deleteServer() |
@@ -1390,9 +1393,9 @@ void OpieFtp::deleteServer() | |||
1390 | // username.find( cfg.readEntry("Username")) != -1) { | 1393 | // username.find( cfg.readEntry("Username")) != -1) { |
1391 | 1394 | ||
1392 | serverListView->removeItem(i); | 1395 | serverListView->removeItem(i); |
1393 | 1396 | ||
1394 | qDebug("OK DELETE "+tempname); | 1397 | odebug << "OK DELETE "+tempname << oendl; |
1395 | cfg.removeEntry(QString::number(i)); | 1398 | cfg.removeEntry(QString::number(i)); |
1396 | for ( ; i <= numberOfEntries; i++) { | 1399 | for ( ; i <= numberOfEntries; i++) { |
1397 | cfg.setGroup("Server"); | 1400 | cfg.setGroup("Server"); |
1398 | cfg.writeEntry("Server", QString::number(numberOfEntries + 1 )); | 1401 | cfg.writeEntry("Server", QString::number(numberOfEntries + 1 )); |
@@ -1445,17 +1448,17 @@ void OpieFtp::upDir() | |||
1445 | QString msg; | 1448 | QString msg; |
1446 | msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); | 1449 | msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); |
1447 | msg.replace(QRegExp(":"),"\n"); | 1450 | msg.replace(QRegExp(":"),"\n"); |
1448 | QMessageBox::message(tr("Note"),msg); | 1451 | QMessageBox::message(tr("Note"),msg); |
1449 | // qDebug(msg); | 1452 | // odebug << msg << oendl; |
1450 | } | 1453 | } |
1451 | char path[256]; | 1454 | char path[256]; |
1452 | if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string | 1455 | if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string |
1453 | QString msg; | 1456 | QString msg; |
1454 | msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn)); | 1457 | msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn)); |
1455 | msg.replace(QRegExp(":"),"\n"); | 1458 | msg.replace(QRegExp(":"),"\n"); |
1456 | QMessageBox::message(tr("Note"),msg); | 1459 | QMessageBox::message(tr("Note"),msg); |
1457 | // qDebug(msg); | 1460 | // odebug << msg << oendl; |
1458 | } | 1461 | } |
1459 | currentRemoteDir=path; | 1462 | currentRemoteDir=path; |
1460 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 1463 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
1461 | if(currentRemoteDir.right(1) !="/") | 1464 | if(currentRemoteDir.right(1) !="/") |
@@ -1514,9 +1517,9 @@ void OpieFtp::NewServer() { | |||
1514 | 1517 | ||
1515 | void OpieFtp::serverListClicked( const QString &item) { | 1518 | void OpieFtp::serverListClicked( const QString &item) { |
1516 | if(item.isEmpty()) return; | 1519 | if(item.isEmpty()) return; |
1517 | Config cfg("opieftp"); | 1520 | Config cfg("opieftp"); |
1518 | qDebug("highltined "+item); | 1521 | odebug << "highltined "+item << oendl; |
1519 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); | 1522 | int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); |
1520 | for (int i = 1; i <= numberOfEntries; i++) { | 1523 | for (int i = 1; i <= numberOfEntries; i++) { |
1521 | cfg.setGroup(QString::number(i)); | 1524 | cfg.setGroup(QString::number(i)); |
1522 | if(cfg.readEntry( "ServerName").find(item) != -1 && !fuckeduphack) | 1525 | if(cfg.readEntry( "ServerName").find(item) != -1 && !fuckeduphack) |
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro index 2f97dc2..003b166 100644 --- a/noncore/net/opieftp/opieftp.pro +++ b/noncore/net/opieftp/opieftp.pro | |||
@@ -1,11 +1,10 @@ | |||
1 | #CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on |
2 | CONFIG += qt warn_on | 2 | HEADERS = opieftp.h inputDialog.h |
3 | HEADERS = opieftp.h inputDialog.h | 3 | SOURCES = opieftp.cpp inputDialog.cpp main.cpp |
4 | SOURCES = opieftp.cpp inputDialog.cpp main.cpp | 4 | TARGET = opieftp |
5 | TARGET = opieftp | ||
6 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
8 | LIBS += -lqpe -lftplib | 7 | LIBS += -lqpe -lopiecore2 -lftplib |
9 | DESTDIR = $(OPIEDIR)/bin | 8 | DESTDIR = $(OPIEDIR)/bin |
10 | 9 | ||
11 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in index a61cf70..2c56523 100644 --- a/noncore/net/opieirc/config.in +++ b/noncore/net/opieirc/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIEIRC | 1 | config OPIEIRC |
2 | boolean "opie-irc (chat via your favorite IRC server)" | 2 | boolean "opie-irc (chat via your favorite IRC server)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBQTAUX | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX |
diff --git a/noncore/net/opieirc/ircmisc.cpp b/noncore/net/opieirc/ircmisc.cpp index 22387b3..6d93a34 100644 --- a/noncore/net/opieirc/ircmisc.cpp +++ b/noncore/net/opieirc/ircmisc.cpp | |||
@@ -1,7 +1,10 @@ | |||
1 | #include <stdio.h> | ||
2 | #include "ircmisc.h" | 1 | #include "ircmisc.h" |
3 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
4 | IRCTabBar::IRCTabBar(QWidget *parent, const char *name) : QTabBar(parent, name) { | 7 | IRCTabBar::IRCTabBar(QWidget *parent, const char *name) : QTabBar(parent, name) { |
5 | } | 8 | } |
6 | 9 | ||
7 | int IRCTabBar::insertTab(QTab *tab, int index) { | 10 | int IRCTabBar::insertTab(QTab *tab, int index) { |
@@ -63,9 +66,9 @@ void IRCHistoryLineEdit::keyPressEvent(QKeyEvent *event) { | |||
63 | } else if (key == Key_Return) { | 66 | } else if (key == Key_Return) { |
64 | m_history.prepend(text()); | 67 | m_history.prepend(text()); |
65 | m_index = -1; | 68 | m_index = -1; |
66 | } else if (key == Key_Tab) { | 69 | } else if (key == Key_Tab) { |
67 | printf("got tab\n"); | 70 | odebug << "got tab" << oendl; |
68 | return; | 71 | return; |
69 | } | 72 | } |
70 | QLineEdit::keyPressEvent(event); | 73 | QLineEdit::keyPressEvent(event); |
71 | } | 74 | } |
@@ -74,9 +77,9 @@ bool IRCHistoryLineEdit::eventFilter(QObject *object, QEvent *event) { | |||
74 | if (event->type() == QEvent::KeyPress) { | 77 | if (event->type() == QEvent::KeyPress) { |
75 | QKeyEvent *k = (QKeyEvent *) event; | 78 | QKeyEvent *k = (QKeyEvent *) event; |
76 | /* Catch tab characters */ | 79 | /* Catch tab characters */ |
77 | if (k->key() == Key_Tab) { | 80 | if (k->key() == Key_Tab) { |
78 | qDebug("tab!"); | 81 | odebug << "tab!" << oendl; |
79 | return TRUE; | 82 | return TRUE; |
80 | } | 83 | } |
81 | } | 84 | } |
82 | return QLineEdit::eventFilter(object, event); | 85 | return QLineEdit::eventFilter(object, event); |
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro index 4f9092f..2455ec4 100644 --- a/noncore/net/opieirc/opieirc.pro +++ b/noncore/net/opieirc/opieirc.pro | |||
@@ -1,14 +1,14 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | HEADERS = ircchannel.h ircconnection.h \ | 2 | HEADERS = ircchannel.h ircconnection.h \ |
3 | ircmessage.h \ | 3 | ircmessage.h \ |
4 | ircmessageparser.h ircoutput.h \ | 4 | ircmessageparser.h ircoutput.h \ |
5 | ircperson.h ircserver.h ircsession.h \ | 5 | ircperson.h ircserver.h ircsession.h \ |
6 | mainwindow.h irctab.h ircservertab.h \ | 6 | mainwindow.h irctab.h ircservertab.h \ |
7 | ircchanneltab.h ircchannellist.h \ | 7 | ircchanneltab.h ircchannellist.h \ |
8 | ircserverlist.h ircservereditor.h \ | 8 | ircserverlist.h ircservereditor.h \ |
9 | ircquerytab.h ircsettings.h ircmisc.h | 9 | ircquerytab.h ircsettings.h ircmisc.h |
10 | SOURCES = ircchannel.cpp ircconnection.cpp \ | 10 | SOURCES = ircchannel.cpp ircconnection.cpp \ |
11 | ircmessage.cpp \ | 11 | ircmessage.cpp \ |
12 | ircmessageparser.cpp ircoutput.cpp \ | 12 | ircmessageparser.cpp ircoutput.cpp \ |
13 | ircperson.cpp ircserver.cpp \ | 13 | ircperson.cpp ircserver.cpp \ |
14 | ircsession.cpp main.cpp mainwindow.cpp \ | 14 | ircsession.cpp main.cpp mainwindow.cpp \ |
@@ -16,10 +16,9 @@ SOURCES = ircchannel.cpp ircconnection.cpp \ | |||
16 | ircchanneltab.cpp ircchannellist.cpp \ | 16 | ircchanneltab.cpp ircchannellist.cpp \ |
17 | ircserverlist.cpp ircservereditor.cpp \ | 17 | ircserverlist.cpp ircservereditor.cpp \ |
18 | ircquerytab.cpp ircsettings.cpp ircmisc.cpp | 18 | ircquerytab.cpp ircsettings.cpp ircmisc.cpp |
19 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH+= $(OPIEDIR)/include | 20 | DEPENDPATH += $(OPIEDIR)/include |
21 | LIBS += -lqpe -lopieui2 -lqtaux2 | 21 | LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2 |
22 | 22 | TARGET = opieirc | |
23 | TARGET= opieirc | ||
24 | 23 | ||
25 | include ( $(OPIEDIR)/include.pro ) | 24 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 8a7f0bc..1d93f5c 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -205,9 +205,9 @@ namespace OpieTooth { | |||
205 | * @param the QPaintEvent | 205 | * @param the QPaintEvent |
206 | */ | 206 | */ |
207 | void BluezApplet::paintEvent( QPaintEvent* ) { | 207 | void BluezApplet::paintEvent( QPaintEvent* ) { |
208 | QPainter p(this); | 208 | QPainter p(this); |
209 | qDebug("paint bluetooth pixmap"); | 209 | odebug << "paint bluetooth pixmap" << oendl; |
210 | 210 | ||
211 | if (bluezactive > 0) { | 211 | if (bluezactive > 0) { |
212 | p.drawPixmap( 0, 1, bluezOnPixmap ); | 212 | p.drawPixmap( 0, 1, bluezOnPixmap ); |
213 | } else { | 213 | } else { |
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index 09b19d2..37f2ae7 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp | |||
@@ -44,9 +44,9 @@ void StartDunConnection::start() { | |||
44 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 44 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
45 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 45 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
46 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 46 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
47 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 47 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
48 | qWarning( "could not start" ); | 48 | owarn << "could not start" << oendl; |
49 | delete m_dunConnect; | 49 | delete m_dunConnect; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index 24ac530..50afc9f 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -38,17 +38,17 @@ StartConnection::ConnectionType StartPanConnection::type() { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | void StartPanConnection::start() { | 40 | void StartPanConnection::start() { |
41 | m_panConnect = new OProcess(); | 41 | m_panConnect = new OProcess(); |
42 | qDebug( "IM START " + m_mac ); | 42 | odebug << "IM START " + m_mac << oendl; |
43 | *m_panConnect << "pand" << "--connect" << m_mac; | 43 | *m_panConnect << "pand" << "--connect" << m_mac; |
44 | 44 | ||
45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
46 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 46 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
48 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 48 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
50 | qWarning( "could not start" ); | 50 | owarn << "could not start" << oendl; |
51 | delete m_panConnect; | 51 | delete m_panConnect; |
52 | } | 52 | } |
53 | } | 53 | } |
54 | 54 | ||
@@ -67,18 +67,18 @@ void StartPanConnection::stop() { | |||
67 | delete m_panConnect; | 67 | delete m_panConnect; |
68 | m_panConnect = 0l; | 68 | m_panConnect = 0l; |
69 | } | 69 | } |
70 | m_panConnect = new OProcess(); | 70 | m_panConnect = new OProcess(); |
71 | qDebug("IM STOP " + m_mac); | 71 | odebug << "IM STOP " + m_mac << oendl; |
72 | 72 | ||
73 | *m_panConnect << "pand" << "--kill" << m_mac; | 73 | *m_panConnect << "pand" << "--kill" << m_mac; |
74 | 74 | ||
75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
76 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 76 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
78 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 78 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
80 | qWarning( "could not stop" ); | 80 | owarn << "could not stop" << oendl; |
81 | delete m_panConnect; | 81 | delete m_panConnect; |
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 29030ab..b1cddd2 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -154,9 +154,9 @@ void BlueBase::writeConfig() | |||
154 | * Modify the hcid.conf file to our needs | 154 | * Modify the hcid.conf file to our needs |
155 | */ | 155 | */ |
156 | void BlueBase::writeToHciConfig() | 156 | void BlueBase::writeToHciConfig() |
157 | { | 157 | { |
158 | qWarning("writeToHciConfig"); | 158 | owarn << "writeToHciConfig" << oendl; |
159 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); | 159 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); |
160 | hciconf.load(); | 160 | hciconf.load(); |
161 | hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); | 161 | hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); |
162 | hciconf.setName( m_deviceName ); | 162 | hciconf.setName( m_deviceName ); |
@@ -366,27 +366,27 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
366 | QMap<int, QString>::Iterator it = list.begin(); | 366 | QMap<int, QString>::Iterator it = list.begin(); |
367 | QPopupMenu *popup =0l; | 367 | QPopupMenu *popup =0l; |
368 | if ( it != list.end() ) | 368 | if ( it != list.end() ) |
369 | { | 369 | { |
370 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); | 370 | owarn << "Searching id " << it.key() << " " << it.data().latin1() << "" << oendl; |
371 | popup = m_popHelper.find( it.key(), | 371 | popup = m_popHelper.find( it.key(), |
372 | service->services(), | 372 | service->services(), |
373 | (BTDeviceItem*)service->parent() ); | 373 | (BTDeviceItem*)service->parent() ); |
374 | } | 374 | } |
375 | else | 375 | else |
376 | { | 376 | { |
377 | qWarning("Empty"); | 377 | owarn << "Empty" << oendl; |
378 | } | 378 | } |
379 | 379 | ||
380 | if ( popup == 0l ) | 380 | if ( popup == 0l ) |
381 | { | 381 | { |
382 | qWarning("factory returned 0l"); | 382 | owarn << "factory returned 0l" << oendl; |
383 | popup = new QPopupMenu(); | 383 | popup = new QPopupMenu(); |
384 | } | 384 | } |
385 | int test1 = popup->insertItem( tr("Test1:"), 2); | 385 | int test1 = popup->insertItem( tr("Test1:"), 2); |
386 | 386 | ||
387 | ret = popup->exec( point ); | 387 | ret = popup->exec( point ); |
388 | qWarning("returned from exec() "); | 388 | owarn << "returned from exec() " << oendl; |
389 | if ( ret == -1 ) | 389 | if ( ret == -1 ) |
390 | { | 390 | { |
391 | ; | 391 | ; |
392 | } | 392 | } |
@@ -405,9 +405,9 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
405 | * @param item the service item returned | 405 | * @param item the service item returned |
406 | */ | 406 | */ |
407 | void BlueBase::addServicesToDevice( BTDeviceItem * item ) | 407 | void BlueBase::addServicesToDevice( BTDeviceItem * item ) |
408 | { | 408 | { |
409 | qDebug("addServicesToDevice"); | 409 | odebug << "addServicesToDevice" << oendl; |
410 | // row of mac adress text(3) | 410 | // row of mac adress text(3) |
411 | RemoteDevice device = item->remoteDevice(); | 411 | RemoteDevice device = item->remoteDevice(); |
412 | m_deviceList.insert( item->mac() , item ); | 412 | m_deviceList.insert( item->mac() , item ); |
413 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back | 413 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back |
@@ -422,9 +422,9 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) | |||
422 | * @param servicesList the list with the service the device has. | 422 | * @param servicesList the list with the service the device has. |
423 | */ | 423 | */ |
424 | void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) | 424 | void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) |
425 | { | 425 | { |
426 | qDebug("fill services list"); | 426 | odebug << "fill services list" << oendl; |
427 | 427 | ||
428 | QMap<QString,BTDeviceItem*>::Iterator it; | 428 | QMap<QString,BTDeviceItem*>::Iterator it; |
429 | BTDeviceItem* deviceItem = 0; | 429 | BTDeviceItem* deviceItem = 0; |
430 | 430 | ||
@@ -606,9 +606,9 @@ void BlueBase::deviceActive( const RemoteDevice &device ) | |||
606 | * @param connected - if it is avail. or not | 606 | * @param connected - if it is avail. or not |
607 | */ | 607 | */ |
608 | void BlueBase::deviceActive( const QString& device, bool connected ) | 608 | void BlueBase::deviceActive( const QString& device, bool connected ) |
609 | { | 609 | { |
610 | qDebug("deviceActive slot"); | 610 | odebug << "deviceActive slot" << oendl; |
611 | 611 | ||
612 | QMap<QString,BTDeviceItem*>::Iterator it; | 612 | QMap<QString,BTDeviceItem*>::Iterator it; |
613 | 613 | ||
614 | it = m_deviceList.find( device ); | 614 | it = m_deviceList.find( device ); |
diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/manager/devicehandler.cpp index 9c5b817..bd34351 100644 --- a/noncore/net/opietooth/manager/devicehandler.cpp +++ b/noncore/net/opietooth/manager/devicehandler.cpp | |||
@@ -32,15 +32,15 @@ QString path = QDir::homeDirPath() + "/Settings/bluetooth"; | |||
32 | for (it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { | 32 | for (it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { |
33 | if ( (*it) == "." || (*it) == ".." ) | 33 | if ( (*it) == "." || (*it) == ".." ) |
34 | continue; | 34 | continue; |
35 | 35 | ||
36 | qDebug((*it).latin1() ); | 36 | odebug << (*it).latin1() << oendl; |
37 | Config conf(path + "/"+(*it), Config::File); | 37 | Config conf(path + "/"+(*it), Config::File); |
38 | conf.setGroup("Info"); | 38 | conf.setGroup("Info"); |
39 | name = conf.readEntry("name", "Error"); | 39 | name = conf.readEntry("name", "Error"); |
40 | mac = conf.readEntry("mac", QString::null); | 40 | mac = conf.readEntry("mac", QString::null); |
41 | qDebug("MAC: " + mac); | 41 | odebug << "MAC: " + mac << oendl; |
42 | qDebug("NAME: " + name); | 42 | odebug << "NAME: " + name << oendl; |
43 | if (mac.isEmpty() ) | 43 | if (mac.isEmpty() ) |
44 | continue; | 44 | continue; |
45 | RemoteDevice currentDevice( mac , name ); | 45 | RemoteDevice currentDevice( mac , name ); |
46 | list.append( currentDevice ); | 46 | list.append( currentDevice ); |
@@ -65,16 +65,16 @@ void DeviceHandler::save( const RemoteDevice::ValueList& list) { | |||
65 | * Create a new dir | 65 | * Create a new dir |
66 | */ | 66 | */ |
67 | rm = "mkdir "; | 67 | rm = "mkdir "; |
68 | rm += QDir::homeDirPath() + "/Settings/bluetooth"; | 68 | rm += QDir::homeDirPath() + "/Settings/bluetooth"; |
69 | qWarning("out %s", rm.data() ); | 69 | owarn << "out " << rm.data() << "" << oendl; |
70 | system( rm.data() ); | 70 | system( rm.data() ); |
71 | 71 | ||
72 | RemoteDevice::ValueList::ConstIterator it; | 72 | RemoteDevice::ValueList::ConstIterator it; |
73 | // write the config | 73 | // write the config |
74 | 74 | ||
75 | for ( it = list.begin(); it != list.end(); ++it ) { | 75 | for ( it = list.begin(); it != list.end(); ++it ) { |
76 | qDebug( "/Settings/bluetooth/" + (*it).mac() + ".conf"); | 76 | odebug << "/Settings/bluetooth/" + (*it).mac() + ".conf" << oendl; |
77 | 77 | ||
78 | Config conf( QDir::homeDirPath() + | 78 | Config conf( QDir::homeDirPath() + |
79 | "/Settings/bluetooth/" + | 79 | "/Settings/bluetooth/" + |
80 | (*it).mac() + ".conf", Config::File ); | 80 | (*it).mac() + ".conf", Config::File ); |
diff --git a/noncore/net/opietooth/manager/dunpopup.cpp b/noncore/net/opietooth/manager/dunpopup.cpp index 3043f71..5b01d2f 100644 --- a/noncore/net/opietooth/manager/dunpopup.cpp +++ b/noncore/net/opietooth/manager/dunpopup.cpp | |||
@@ -10,9 +10,9 @@ using namespace OpieTooth; | |||
10 | * c'tor init the QAction | 10 | * c'tor init the QAction |
11 | */ | 11 | */ |
12 | DunPopup::DunPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { | 12 | DunPopup::DunPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { |
13 | 13 | ||
14 | qWarning("DunPopup c'tor"); | 14 | owarn << "DunPopup c'tor" << oendl; |
15 | 15 | ||
16 | m_item = item; | 16 | m_item = item; |
17 | QAction *a, *b, *c; | 17 | QAction *a, *b, *c; |
18 | 18 | ||
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp index 35e9cd9..71c935c 100644 --- a/noncore/net/opietooth/manager/hciconfwrapper.cpp +++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp | |||
@@ -73,18 +73,18 @@ namespace OpieTooth { | |||
73 | QString str; | 73 | QString str; |
74 | for (it = m_file.begin(); it != m_file.end(); ++it ) { | 74 | for (it = m_file.begin(); it != m_file.end(); ++it ) { |
75 | str = (*it); | 75 | str = (*it); |
76 | if( (str.contains(key)) > 0 ) { | 76 | if( (str.contains(key)) > 0 ) { |
77 | qDebug("Found"); | 77 | odebug << "Found" << oendl; |
78 | // still need to look if its commented out!!! | 78 | // still need to look if its commented out!!! |
79 | str.simplifyWhiteSpace(); | 79 | str.simplifyWhiteSpace(); |
80 | qDebug( key ); | 80 | odebug << key << oendl; |
81 | if (str.startsWith("#")) { | 81 | if (str.startsWith("#")) { |
82 | str = (key + " " + value + ";"); | 82 | str = (key + " " + value + ";"); |
83 | } else { | 83 | } else { |
84 | str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";"); | 84 | str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";"); |
85 | } | 85 | } |
86 | qDebug( str ); | 86 | odebug << str << oendl; |
87 | it = m_file.remove( it ); | 87 | it = m_file.remove( it ); |
88 | it = m_file.insert( it, str ); | 88 | it = m_file.insert( it, str ); |
89 | //return; the regexp is too wide -zecke // all set | 89 | //return; the regexp is too wide -zecke // all set |
90 | } | 90 | } |
@@ -97,13 +97,13 @@ namespace OpieTooth { | |||
97 | * This loads the config file and stores it inside | 97 | * This loads the config file and stores it inside |
98 | * the m_file | 98 | * the m_file |
99 | */ | 99 | */ |
100 | void HciConfWrapper::load() { | 100 | void HciConfWrapper::load() { |
101 | qWarning("loaded"); | 101 | owarn << "loaded" << oendl; |
102 | m_file.clear(); | 102 | m_file.clear(); |
103 | QFile file( m_fileName ); | 103 | QFile file( m_fileName ); |
104 | if (!file.open( IO_ReadOnly ) ) { | 104 | if (!file.open( IO_ReadOnly ) ) { |
105 | qDebug("Could not open"); | 105 | odebug << "Could not open" << oendl; |
106 | return; | 106 | return; |
107 | } | 107 | } |
108 | 108 | ||
109 | /** | 109 | /** |
@@ -118,22 +118,22 @@ namespace OpieTooth { | |||
118 | m_file.append( tmp ); | 118 | m_file.append( tmp ); |
119 | } | 119 | } |
120 | } | 120 | } |
121 | void HciConfWrapper::save() { | 121 | void HciConfWrapper::save() { |
122 | qWarning("save"); | 122 | owarn << "save" << oendl; |
123 | if (m_file.isEmpty() ) // load first | 123 | if (m_file.isEmpty() ) // load first |
124 | return; | 124 | return; |
125 | 125 | ||
126 | QFile file( m_fileName ); | 126 | QFile file( m_fileName ); |
127 | if ( !file.open(IO_WriteOnly ) ) { | 127 | if ( !file.open(IO_WriteOnly ) ) { |
128 | qWarning("could not open %s", m_fileName.latin1() ); | 128 | owarn << "could not open " << m_fileName.latin1() << "" << oendl; |
129 | return; | 129 | return; |
130 | } | 130 | } |
131 | 131 | ||
132 | QTextStream stream(&file ); | 132 | QTextStream stream(&file ); |
133 | QStringList::Iterator it; | 133 | QStringList::Iterator it; |
134 | for ( it = m_file.begin(); it != m_file.end(); ++it ) { | 134 | for ( it = m_file.begin(); it != m_file.end(); ++it ) { |
135 | stream << (*it) << endl; | 135 | stream << (*it) << endl; |
136 | } | 136 | } |
137 | qWarning("saved"); | 137 | owarn << "saved" << oendl; |
138 | }; | 138 | }; |
139 | } | 139 | } |
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index 1ef862a..3a3dbb0 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp | |||
@@ -79,9 +79,9 @@ void ObexDialog::sendData() { | |||
79 | } else { | 79 | } else { |
80 | *obexSend << "ussp-push" << m_device << fileURL << file; | 80 | *obexSend << "ussp-push" << m_device << fileURL << file; |
81 | } | 81 | } |
82 | if (!obexSend->start(OProcess::DontCare, OProcess::AllOutput) ) { | 82 | if (!obexSend->start(OProcess::DontCare, OProcess::AllOutput) ) { |
83 | qWarning("could not start"); | 83 | owarn << "could not start" << oendl; |
84 | delete obexSend; | 84 | delete obexSend; |
85 | } | 85 | } |
86 | 86 | ||
87 | 87 | ||
diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp index d147d52..9a50199 100644 --- a/noncore/net/opietooth/manager/obexpopup.cpp +++ b/noncore/net/opietooth/manager/obexpopup.cpp | |||
@@ -15,9 +15,9 @@ using namespace OpieTooth; | |||
15 | */ | 15 | */ |
16 | ObexPopup::ObexPopup() | 16 | ObexPopup::ObexPopup() |
17 | : QPopupMenu() | 17 | : QPopupMenu() |
18 | { | 18 | { |
19 | qWarning("RfcCommPopup c'tor"); | 19 | owarn << "RfcCommPopup c'tor" << oendl; |
20 | 20 | ||
21 | QAction* a; | 21 | QAction* a; |
22 | 22 | ||
23 | /* connect action */ | 23 | /* connect action */ |
@@ -35,9 +35,9 @@ ObexPopup::~ObexPopup() | |||
35 | 35 | ||
36 | void ObexPopup::slotPush() | 36 | void ObexPopup::slotPush() |
37 | { | 37 | { |
38 | 38 | ||
39 | qWarning("push something"); | 39 | owarn << "push something" << oendl; |
40 | 40 | ||
41 | ObexDialog obexDialog; | 41 | ObexDialog obexDialog; |
42 | QPEApplication::execDialog( &obexDialog ); | 42 | QPEApplication::execDialog( &obexDialog ); |
43 | } | 43 | } |
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp index 8b05964..43c2777 100644 --- a/noncore/net/opietooth/manager/panpopup.cpp +++ b/noncore/net/opietooth/manager/panpopup.cpp | |||
@@ -10,9 +10,9 @@ using namespace OpieTooth; | |||
10 | * c'tor init the QAction | 10 | * c'tor init the QAction |
11 | */ | 11 | */ |
12 | PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { | 12 | PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { |
13 | 13 | ||
14 | qWarning("PanPopup c'tor"); | 14 | owarn << "PanPopup c'tor" << oendl; |
15 | 15 | ||
16 | m_item = item; | 16 | m_item = item; |
17 | QAction *a, *b, *c; | 17 | QAction *a, *b, *c; |
18 | 18 | ||
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index ab22fea..19deb19 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp | |||
@@ -15,12 +15,12 @@ void PopupHelper::insert( int id, popupFactory fact ) { | |||
15 | m_map.insert(id, fact ); | 15 | m_map.insert(id, fact ); |
16 | } | 16 | } |
17 | 17 | ||
18 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { | 18 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { |
19 | //qWarning("find"); | 19 | //owarn << "find" << oendl; |
20 | FactoryMap::Iterator it = m_map.find(id ); | 20 | FactoryMap::Iterator it = m_map.find(id ); |
21 | if ( it != m_map.end() ) { | 21 | if ( it != m_map.end() ) { |
22 | //qWarning("found"); | 22 | //owarn << "found" << oendl; |
23 | popupFactory fact = it.data(); | 23 | popupFactory fact = it.data(); |
24 | return (*fact)(ser, item); | 24 | return (*fact)(ser, item); |
25 | } | 25 | } |
26 | return 0l; | 26 | return 0l; |
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 78c1501..989bf45 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp | |||
@@ -55,9 +55,9 @@ void PPPDialog::connectToDevice() { | |||
55 | *pppDial << "pppd" << m_device << "call" << connectScript; | 55 | *pppDial << "pppd" << m_device << "call" << connectScript; |
56 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), | 56 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), |
57 | this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) ); | 57 | this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) ); |
58 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { | 58 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { |
59 | qWarning("could not start"); | 59 | owarn << "could not start" << oendl; |
60 | delete pppDial; | 60 | delete pppDial; |
61 | } | 61 | } |
62 | } | 62 | } |
63 | 63 | ||
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp index fc76301..4469129 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp | |||
@@ -70,9 +70,9 @@ void RfcommAssignDialog::newDevice( const QString & mac ) | |||
70 | rfcomm->setIdent( i ); | 70 | rfcomm->setIdent( i ); |
71 | rfcomm->setMac( mac ); | 71 | rfcomm->setMac( mac ); |
72 | rfcomm->setChannel( newDev->channel() ); | 72 | rfcomm->setChannel( newDev->channel() ); |
73 | rfcomm->setComment( newDev->comment() ); | 73 | rfcomm->setComment( newDev->comment() ); |
74 | qDebug( "New device set up" ); | 74 | odebug << "New device set up" << oendl; |
75 | } | 75 | } |
76 | } | 76 | } |
77 | } | 77 | } |
78 | } | 78 | } |
@@ -91,9 +91,9 @@ void RfcommAssignDialog::loadConfig() | |||
91 | QMap<QString, RfCommConfObject*>::Iterator it; | 91 | QMap<QString, RfCommConfObject*>::Iterator it; |
92 | it = confHandler->foundEntries().find( QString("%1").arg( i ) ); | 92 | it = confHandler->foundEntries().find( QString("%1").arg( i ) ); |
93 | if ( it != confHandler->foundEntries().end() ) | 93 | if ( it != confHandler->foundEntries().end() ) |
94 | { | 94 | { |
95 | qDebug( "Found key in foundEntries() " ); | 95 | odebug << "Found key in foundEntries() " << oendl; |
96 | rfcomm->setMac( it.data()->mac() ); | 96 | rfcomm->setMac( it.data()->mac() ); |
97 | rfcomm->setChannel( it.data()->channel() ); | 97 | rfcomm->setChannel( it.data()->channel() ); |
98 | rfcomm->setComment( it.data()->comment() ); | 98 | rfcomm->setComment( it.data()->comment() ); |
99 | } | 99 | } |
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp index 20453e8..2ef95ff 100644 --- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp +++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp | |||
@@ -91,24 +91,24 @@ void RfCommConfHandler::load() { | |||
91 | QString tmpLine = ( *line ).stripWhiteSpace(); | 91 | QString tmpLine = ( *line ).stripWhiteSpace(); |
92 | 92 | ||
93 | if ( tmpLine.startsWith("rfcomm") ) { | 93 | if ( tmpLine.startsWith("rfcomm") ) { |
94 | QString number = tmpLine.mid( 6,1 ); | 94 | QString number = tmpLine.mid( 6,1 ); |
95 | qDebug( tmpLine ); | 95 | odebug << tmpLine << oendl; |
96 | qDebug( "TEST " + number ); | 96 | odebug << "TEST " + number << oendl; |
97 | } else if ( tmpLine.startsWith( "}" ) ) { | 97 | } else if ( tmpLine.startsWith( "}" ) ) { |
98 | m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(), comment ) ); | 98 | m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(), comment ) ); |
99 | } else if ( tmpLine.startsWith( "device" ) ) { | 99 | } else if ( tmpLine.startsWith( "device" ) ) { |
100 | mac = tmpLine.mid( 7, 17 ); | 100 | mac = tmpLine.mid( 7, 17 ); |
101 | qDebug( "mac" + mac ); | 101 | odebug << "mac" + mac << oendl; |
102 | } else if ( tmpLine.startsWith( "channel" ) ) { | 102 | } else if ( tmpLine.startsWith( "channel" ) ) { |
103 | channel = tmpLine.mid( 8, 1 ); | 103 | channel = tmpLine.mid( 8, 1 ); |
104 | qDebug ( "Channel :" + channel ); | 104 | qDebug ( "Channel :" + channel ); |
105 | } else if ( tmpLine.startsWith( "comment" ) ) { | 105 | } else if ( tmpLine.startsWith( "comment" ) ) { |
106 | comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 ); | 106 | comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 ); |
107 | qDebug( "Comment: " + comment ); | 107 | odebug << "Comment: " + comment << oendl; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | rfCommConf.close(); | 110 | rfCommConf.close(); |
111 | } | 111 | } |
112 | save( m_foundEntries ); | 112 | save( m_foundEntries ); |
113 | qDebug( QString( "ENTries: %1").arg( m_foundEntries.count() ) ); | 113 | odebug << QString( "ENTries: %1").arg( m_foundEntries.count() ) << oendl; |
114 | } | 114 | } |
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp index 04bfe48..01ad616 100644 --- a/noncore/net/opietooth/manager/rfcpopup.cpp +++ b/noncore/net/opietooth/manager/rfcpopup.cpp | |||
@@ -16,9 +16,9 @@ using namespace OpieTooth; | |||
16 | */ | 16 | */ |
17 | RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item ) | 17 | RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item ) |
18 | : QPopupMenu() | 18 | : QPopupMenu() |
19 | { | 19 | { |
20 | qWarning("RfcCommPopup c'tor"); | 20 | owarn << "RfcCommPopup c'tor" << oendl; |
21 | 21 | ||
22 | QAction* a; | 22 | QAction* a; |
23 | 23 | ||
24 | 24 | ||
@@ -69,18 +69,18 @@ RfcCommPopup::~RfcCommPopup() | |||
69 | 69 | ||
70 | void RfcCommPopup::slotConnect() | 70 | void RfcCommPopup::slotConnect() |
71 | { | 71 | { |
72 | 72 | ||
73 | qWarning("connect"); | 73 | owarn << "connect" << oendl; |
74 | 74 | ||
75 | PPPDialog pppDialog; | 75 | PPPDialog pppDialog; |
76 | QPEApplication::execDialog( &pppDialog ); | 76 | QPEApplication::execDialog( &pppDialog ); |
77 | } | 77 | } |
78 | 78 | ||
79 | 79 | ||
80 | void RfcCommPopup::slotDisconnect() | 80 | void RfcCommPopup::slotDisconnect() |
81 | { | 81 | { |
82 | qWarning("slot disconnected"); | 82 | owarn << "slot disconnected" << oendl; |
83 | } | 83 | } |
84 | 84 | ||
85 | 85 | ||
86 | void RfcCommPopup::slotBind() | 86 | void RfcCommPopup::slotBind() |
@@ -97,7 +97,7 @@ void RfcCommPopup::slotBind() | |||
97 | 97 | ||
98 | 98 | ||
99 | void RfcCommPopup::slotBar() | 99 | void RfcCommPopup::slotBar() |
100 | { | 100 | { |
101 | qWarning("slotBar"); | 101 | owarn << "slotBar" << oendl; |
102 | }; | 102 | }; |
103 | 103 | ||
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index c8ea3e3..3b005c4 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp | |||
@@ -154,8 +154,8 @@ namespace OpieTooth { | |||
154 | /** | 154 | /** |
155 | * Cleanup | 155 | * Cleanup |
156 | */ | 156 | */ |
157 | ScanDialog::~ScanDialog() { | 157 | ScanDialog::~ScanDialog() { |
158 | qWarning("delete scan dialog"); | 158 | owarn << "delete scan dialog" << oendl; |
159 | delete localDevice; | 159 | delete localDevice; |
160 | } | 160 | } |
161 | } | 161 | } |
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index da39113..bfdb20a 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -22,9 +22,11 @@ | |||
22 | #ifdef QWS | 22 | #ifdef QWS |
23 | #include <opie2/oapplication.h> | 23 | #include <opie2/oapplication.h> |
24 | #include <opie2/oconfig.h> | 24 | #include <opie2/oconfig.h> |
25 | #include <opie2/odevice.h> | 25 | #include <opie2/odevice.h> |
26 | using namespace Opie; | 26 | #include <opie2/odebug.h> |
27 | using namespace Opie::Core; | ||
28 | using namespace Opie::Net; | ||
27 | #endif | 29 | #endif |
28 | 30 | ||
29 | /* QT */ | 31 | /* QT */ |
30 | #include <qapplication.h> | 32 | #include <qapplication.h> |
@@ -39,17 +41,11 @@ using namespace Opie; | |||
39 | #include <qtoolbutton.h> | 41 | #include <qtoolbutton.h> |
40 | #include <qspinbox.h> | 42 | #include <qspinbox.h> |
41 | #include <qtextstream.h> | 43 | #include <qtextstream.h> |
42 | 44 | ||
43 | /* POSIX */ | 45 | /* STD */ |
44 | #include <assert.h> | 46 | #include <assert.h> |
45 | 47 | ||
46 | using namespace Opie::Core; | ||
47 | using namespace Opie::Net; | ||
48 | using namespace Opie::Core; | ||
49 | using namespace Opie::Net; | ||
50 | using namespace Opie::Core; | ||
51 | using namespace Opie::Net; | ||
52 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; | 48 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; |
53 | 49 | ||
54 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) | 50 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) |
55 | :WellenreiterConfigBase( parent, name, true, f ) | 51 | :WellenreiterConfigBase( parent, name, true, f ) |
@@ -115,9 +111,9 @@ void WellenreiterConfigWindow::performAutodetection() | |||
115 | //TODO: insert modal splash screen here | 111 | //TODO: insert modal splash screen here |
116 | // and sleep a second, so that it looks | 112 | // and sleep a second, so that it looks |
117 | // like we're actually doing something fancy... ;-) | 113 | // like we're actually doing something fancy... ;-) |
118 | 114 | ||
119 | qDebug( "WellenreiterConfigWindow::performAutodetection()" ); | 115 | odebug << "WellenreiterConfigWindow::performAutodetection()" << oendl; |
120 | 116 | ||
121 | // try to guess device type | 117 | // try to guess device type |
122 | QFile m( "/proc/modules" ); | 118 | QFile m( "/proc/modules" ); |
123 | if ( m.open( IO_ReadOnly ) ) | 119 | if ( m.open( IO_ReadOnly ) ) |
@@ -136,9 +132,9 @@ void WellenreiterConfigWindow::performAutodetection() | |||
136 | if ( devicetype ) | 132 | if ( devicetype ) |
137 | { | 133 | { |
138 | deviceType->setCurrentItem( devicetype ); | 134 | deviceType->setCurrentItem( devicetype ); |
139 | _guess = devicetype; | 135 | _guess = devicetype; |
140 | qDebug( "Wellenreiter: guessed device type to be #%d", devicetype ); | 136 | odebug << "Wellenreiter: guessed device type to be #" << devicetype << "" << oendl; |
141 | } | 137 | } |
142 | } | 138 | } |
143 | } | 139 | } |
144 | 140 | ||
@@ -240,9 +236,9 @@ void WellenreiterConfigWindow::changedStationAction(int t) | |||
240 | 236 | ||
241 | void WellenreiterConfigWindow::getCaptureFileNameClicked() | 237 | void WellenreiterConfigWindow::getCaptureFileNameClicked() |
242 | { | 238 | { |
243 | QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true); | 239 | QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true); |
244 | qDebug( "name = %s", (const char*) name ); | 240 | odebug << "name = " << (const char*) name << "" << oendl; |
245 | if ( !name.isEmpty() ) | 241 | if ( !name.isEmpty() ) |
246 | { | 242 | { |
247 | captureFileName->setText( name ); | 243 | captureFileName->setText( name ); |
248 | } | 244 | } |
@@ -315,13 +311,13 @@ void WellenreiterConfigWindow::performAction( const QString& type, | |||
315 | script = newStationScript->text(); | 311 | script = newStationScript->text(); |
316 | } | 312 | } |
317 | else | 313 | else |
318 | { | 314 | { |
319 | qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type ); | 315 | owarn << "WellenreiterConfigWindow::performAction(): unknown type '" << (const char*) type << "'" << oendl; |
320 | return; | 316 | return; |
321 | } | 317 | } |
322 | 318 | ||
323 | qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script ); | 319 | odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << (const char*) script << "')" << oendl; |
324 | 320 | ||
325 | switch( action ) | 321 | switch( action ) |
326 | { | 322 | { |
327 | case 0: /* Ignore */ return; | 323 | case 0: /* Ignore */ return; |
@@ -344,11 +340,11 @@ void WellenreiterConfigWindow::performAction( const QString& type, | |||
344 | script = script.replace( QRegExp( "$MAC" ), mac ); | 340 | script = script.replace( QRegExp( "$MAC" ), mac ); |
345 | script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) ); | 341 | script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) ); |
346 | script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) ); | 342 | script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) ); |
347 | 343 | ||
348 | qDebug( "going to call script '%s'", (const char*) script ); | 344 | odebug << "going to call script '" << (const char*) script << "'" << oendl; |
349 | ::system( script ); | 345 | ::system( script ); |
350 | qDebug( "script returned." ); | 346 | odebug << "script returned." << oendl; |
351 | return; | 347 | return; |
352 | } | 348 | } |
353 | default: assert( false ); | 349 | default: assert( false ); |
354 | } | 350 | } |
@@ -360,9 +356,9 @@ void WellenreiterConfigWindow::load() | |||
360 | #ifdef Q_WS_X11 | 356 | #ifdef Q_WS_X11 |
361 | #warning Persistent Configuration not yet implemented for standalone X11 build | 357 | #warning Persistent Configuration not yet implemented for standalone X11 build |
362 | performAutodetection(); | 358 | performAutodetection(); |
363 | #else | 359 | #else |
364 | qDebug( "loading configuration settings..." ); | 360 | odebug << "loading configuration settings..." << oendl; |
365 | 361 | ||
366 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ | 362 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ |
367 | 363 | ||
368 | OConfig* c = oApp->config(); | 364 | OConfig* c = oApp->config(); |
@@ -438,9 +434,9 @@ void WellenreiterConfigWindow::save() | |||
438 | { | 434 | { |
439 | #ifdef Q_WS_X11 | 435 | #ifdef Q_WS_X11 |
440 | #warning Persistent Configuration not yet implemented for standalone X11 build | 436 | #warning Persistent Configuration not yet implemented for standalone X11 build |
441 | #else | 437 | #else |
442 | qDebug( "saving configuration settings..." ); | 438 | odebug << "saving configuration settings..." << oendl; |
443 | 439 | ||
444 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ | 440 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ |
445 | 441 | ||
446 | OConfig* c = oApp->config(); | 442 | OConfig* c = oApp->config(); |
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp index a47b4ec..bd91e35 100644 --- a/noncore/net/wellenreiter/gui/gps.cpp +++ b/noncore/net/wellenreiter/gui/gps.cpp | |||
@@ -14,8 +14,12 @@ | |||
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "gps.h" | 16 | #include "gps.h" |
17 | 17 | ||
18 | /* OPIE */ | ||
19 | #include <opie2/odebug.h> | ||
20 | using namespace Opie::Core; | ||
21 | |||
18 | /* QT */ | 22 | /* QT */ |
19 | #include <qtextstream.h> | 23 | #include <qtextstream.h> |
20 | 24 | ||
21 | /* STD */ | 25 | /* STD */ |
@@ -24,16 +28,16 @@ | |||
24 | 28 | ||
25 | GPS::GPS( QObject* parent, const char * name ) | 29 | GPS::GPS( QObject* parent, const char * name ) |
26 | :QObject( parent, name ) | 30 | :QObject( parent, name ) |
27 | { | 31 | { |
28 | qDebug( "GPS::GPS()" ); | 32 | odebug << "GPS::GPS()" << oendl; |
29 | _socket = new QSocket( this, "gpsd commsock" ); | 33 | _socket = new QSocket( this, "gpsd commsock" ); |
30 | } | 34 | } |
31 | 35 | ||
32 | 36 | ||
33 | GPS::~GPS() | 37 | GPS::~GPS() |
34 | { | 38 | { |
35 | qDebug( "GPS::~GPS()" ); | 39 | odebug << "GPS::~GPS()" << oendl; |
36 | } | 40 | } |
37 | 41 | ||
38 | 42 | ||
39 | bool GPS::open( const QString& host, int port ) | 43 | bool GPS::open( const QString& host, int port ) |
@@ -52,17 +56,17 @@ GpsLocation GPS::position() const | |||
52 | _socket->flush(); | 56 | _socket->flush(); |
53 | if ( result ) | 57 | if ( result ) |
54 | { | 58 | { |
55 | int numAvail = _socket->bytesAvailable(); | 59 | int numAvail = _socket->bytesAvailable(); |
56 | qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail ); | 60 | odebug << "GPS write succeeded, " << numAvail << " bytes available for reading..." << oendl; |
57 | if ( numAvail ) | 61 | if ( numAvail ) |
58 | { | 62 | { |
59 | int numRead = _socket->readBlock( &buf[0], sizeof buf ); | 63 | int numRead = _socket->readBlock( &buf[0], sizeof buf ); |
60 | int numScan = ::sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon); | 64 | int numScan = ::sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon); |
61 | 65 | ||
62 | if ( numRead < 7 || numScan != 2 ) | 66 | if ( numRead < 7 || numScan != 2 ) |
63 | { | 67 | { |
64 | qDebug( "GPS read %d bytes succeeded, invalid response: '%s'", numRead, &buf[0] ); | 68 | odebug << "GPS read " << numRead << " bytes succeeded, invalid response: '" << &buf[0] << "'" << oendl; |
65 | return GpsLocation( -111, -111 ); | 69 | return GpsLocation( -111, -111 ); |
66 | } | 70 | } |
67 | else | 71 | else |
68 | { | 72 | { |
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp index 1c72cf4..714a9a9 100644 --- a/noncore/net/wellenreiter/gui/logwindow.cpp +++ b/noncore/net/wellenreiter/gui/logwindow.cpp | |||
@@ -13,8 +13,14 @@ | |||
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "logwindow.h" | 16 | #include "logwindow.h" |
17 | |||
18 | /* OPIE */ | ||
19 | #include <opie2/odebug.h> | ||
20 | using namespace Opie::Core; | ||
21 | |||
22 | /* QT */ | ||
17 | #include <qmultilineedit.h> | 23 | #include <qmultilineedit.h> |
18 | #include <qdatetime.h> | 24 | #include <qdatetime.h> |
19 | 25 | ||
20 | MLogWindow* MLogWindow::_instance; | 26 | MLogWindow* MLogWindow::_instance; |
@@ -37,9 +43,9 @@ void MLogWindow::log( QString text ) | |||
37 | int col; | 43 | int col; |
38 | int row; | 44 | int row; |
39 | ledit->getCursorPosition( &col, &row ); | 45 | ledit->getCursorPosition( &col, &row ); |
40 | ledit->insertAt( line, col, row ); | 46 | ledit->insertAt( line, col, row ); |
41 | qDebug( line ); | 47 | odebug << line << oendl; |
42 | } | 48 | } |
43 | 49 | ||
44 | 50 | ||
45 | void MLogWindow::clear() | 51 | void MLogWindow::clear() |
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 6bbc39b..62db967 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp | |||
@@ -13,26 +13,29 @@ | |||
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "mainwindow.h" | 16 | #include "mainwindow.h" |
17 | |||
17 | #ifdef QWS | 18 | #ifdef QWS |
19 | #include <opie2/odebug.h> | ||
18 | #include <opie2/oapplication.h> | 20 | #include <opie2/oapplication.h> |
19 | #include <opie2/oprocess.h> | 21 | #include <opie2/oprocess.h> |
20 | #else | 22 | #else |
21 | #include <qapplication.h> | 23 | #include <qapplication.h> |
22 | #endif | 24 | #endif |
23 | 25 | ||
26 | /* QT */ | ||
24 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
25 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
26 | 29 | ||
30 | /* STD */ | ||
27 | #include <errno.h> | 31 | #include <errno.h> |
28 | #include <signal.h> | 32 | #include <signal.h> |
29 | #include <string.h> | 33 | #include <string.h> |
30 | #include <unistd.h> | 34 | #include <unistd.h> |
31 | 35 | ||
32 | using namespace Opie::Core; | 36 | using namespace Opie::Core; |
33 | using namespace Opie::Core; | 37 | |
34 | using namespace Opie::Core; | ||
35 | int main( int argc, char **argv ) | 38 | int main( int argc, char **argv ) |
36 | { | 39 | { |
37 | #ifdef QWS | 40 | #ifdef QWS |
38 | OApplication a( argc, argv, "Wellenreiter II" ); | 41 | OApplication a( argc, argv, "Wellenreiter II" ); |
@@ -54,12 +57,12 @@ int main( int argc, char **argv ) | |||
54 | 57 | ||
55 | bool check = true; | 58 | bool check = true; |
56 | for ( int i = 1; i < argc; ++i ) | 59 | for ( int i = 1; i < argc; ++i ) |
57 | { | 60 | { |
58 | qDebug( "Wellenreiter::main() parsing argument %d = '%s'", i, argv[i] ); | 61 | odebug << "Wellenreiter::main() parsing argument " << i << " = '" << argv[i] << "'" << oendl; |
59 | if ( !strcmp( "-nocheck", argv[i] ) ) | 62 | if ( !strcmp( "-nocheck", argv[i] ) ) |
60 | { | 63 | { |
61 | qDebug( "-nocheck found" ); | 64 | odebug << "-nocheck found" << oendl; |
62 | check = false; | 65 | check = false; |
63 | break; | 66 | break; |
64 | } | 67 | } |
65 | } | 68 | } |
@@ -68,9 +71,9 @@ int main( int argc, char **argv ) | |||
68 | { | 71 | { |
69 | // root check | 72 | // root check |
70 | if ( getuid() ) | 73 | if ( getuid() ) |
71 | { | 74 | { |
72 | qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) ); | 75 | owarn << QObject::tr( "Wellenreiter: trying to run as non-root!" ) << oendl; |
73 | result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", QObject::tr( "You have started Wellenreiter II\n" | 76 | result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", QObject::tr( "You have started Wellenreiter II\n" |
74 | "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ), | 77 | "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ), |
75 | QMessageBox::Yes, QMessageBox::No ); | 78 | QMessageBox::Yes, QMessageBox::No ); |
76 | if ( result == QMessageBox::No ) return -1; | 79 | if ( result == QMessageBox::No ) return -1; |
@@ -85,9 +88,9 @@ int main( int argc, char **argv ) | |||
85 | QMessageBox::Yes, QMessageBox::No ); | 88 | QMessageBox::Yes, QMessageBox::No ); |
86 | if ( result == QMessageBox::Yes ) | 89 | if ( result == QMessageBox::Yes ) |
87 | { | 90 | { |
88 | if ( -1 == ::kill( dhcpid, SIGTERM ) ) | 91 | if ( -1 == ::kill( dhcpid, SIGTERM ) ) |
89 | qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) ); | 92 | owarn << "Wellenreiter: can't kill process #" << result << " (" << strerror( errno ) << ")" << oendl; |
90 | else | 93 | else |
91 | killed = true; | 94 | killed = true; |
92 | } | 95 | } |
93 | } | 96 | } |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 7add6cd..a4b8839 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -20,8 +20,23 @@ | |||
20 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
21 | #include "wellenreiter.h" | 21 | #include "wellenreiter.h" |
22 | #include "scanlist.h" | 22 | #include "scanlist.h" |
23 | 23 | ||
24 | /* OPIE */ | ||
25 | #ifdef QWS | ||
26 | #include <qpe/resource.h> | ||
27 | #include <opie2/odebug.h> | ||
28 | #include <opie2/ofiledialog.h> | ||
29 | #else | ||
30 | #include "resource.h" | ||
31 | #include <qapplication.h> | ||
32 | #include <qfiledialog.h> | ||
33 | #endif | ||
34 | using namespace Opie::Core; | ||
35 | using namespace Opie::Net; | ||
36 | using namespace Opie::Ui; | ||
37 | |||
38 | /* QT */ | ||
24 | #include <qcombobox.h> | 39 | #include <qcombobox.h> |
25 | #include <qdatastream.h> | 40 | #include <qdatastream.h> |
26 | #include <qfile.h> | 41 | #include <qfile.h> |
27 | #include <qfileinfo.h> | 42 | #include <qfileinfo.h> |
@@ -38,25 +53,11 @@ | |||
38 | #include <qtextstream.h> | 53 | #include <qtextstream.h> |
39 | #include <qtoolbutton.h> | 54 | #include <qtoolbutton.h> |
40 | #include <qwhatsthis.h> | 55 | #include <qwhatsthis.h> |
41 | 56 | ||
42 | #ifdef QWS | 57 | /* STD */ |
43 | #include <qpe/resource.h> | ||
44 | #include <opie2/ofiledialog.h> | ||
45 | using namespace Opie; | ||
46 | #else | ||
47 | #include "resource.h" | ||
48 | #include <qapplication.h> | ||
49 | #include <qfiledialog.h> | ||
50 | #endif | ||
51 | |||
52 | #include <unistd.h> | 58 | #include <unistd.h> |
53 | 59 | ||
54 | using namespace Opie::Ui; | ||
55 | using namespace Opie::Net; | ||
56 | using namespace Opie::Ui; | ||
57 | using namespace Opie::Net; | ||
58 | using namespace Opie::Net; | ||
59 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 60 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
60 | :QMainWindow( parent, name, f ) | 61 | :QMainWindow( parent, name, f ) |
61 | { | 62 | { |
62 | cw = new WellenreiterConfigWindow( this ); | 63 | cw = new WellenreiterConfigWindow( this ); |
@@ -187,9 +188,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
187 | 188 | ||
188 | 189 | ||
189 | void WellenreiterMainWindow::showConfigure() | 190 | void WellenreiterMainWindow::showConfigure() |
190 | { | 191 | { |
191 | qDebug( "show configure..." ); | 192 | odebug << "show configure..." << oendl; |
192 | cw->setCaption( tr( "Configure" ) ); | 193 | cw->setCaption( tr( "Configure" ) ); |
193 | int result = QPEApplication::execDialog( cw ); | 194 | int result = QPEApplication::execDialog( cw ); |
194 | 195 | ||
195 | if ( result ) updateToolButtonState(); | 196 | if ( result ) updateToolButtonState(); |
@@ -230,9 +231,9 @@ void WellenreiterMainWindow::changedSniffingState() | |||
230 | 231 | ||
231 | 232 | ||
232 | WellenreiterMainWindow::~WellenreiterMainWindow() | 233 | WellenreiterMainWindow::~WellenreiterMainWindow() |
233 | { | 234 | { |
234 | qDebug( "Wellenreiter: bye." ); | 235 | odebug << "Wellenreiter: bye." << oendl; |
235 | }; | 236 | }; |
236 | 237 | ||
237 | 238 | ||
238 | void WellenreiterMainWindow::demoAddStations() | 239 | void WellenreiterMainWindow::demoAddStations() |
@@ -250,9 +251,9 @@ void WellenreiterMainWindow::demoAddStations() | |||
250 | void WellenreiterMainWindow::demoReadFromGps() | 251 | void WellenreiterMainWindow::demoReadFromGps() |
251 | { | 252 | { |
252 | WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance(); | 253 | WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance(); |
253 | GPS* gps = new GPS( this ); | 254 | GPS* gps = new GPS( this ); |
254 | qDebug( "Wellenreiter::demoReadFromGps(): url=gps://%s:%d/", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | 255 | odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; |
255 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | 256 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); |
256 | GpsLocation loc = gps->position(); | 257 | GpsLocation loc = gps->position(); |
257 | QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); | 258 | QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); |
258 | delete gps; | 259 | delete gps; |
@@ -304,13 +305,13 @@ void WellenreiterMainWindow::fileSaveLog() | |||
304 | { | 305 | { |
305 | QTextStream t( &f ); | 306 | QTextStream t( &f ); |
306 | t << mw->logWindow()->getLog(); | 307 | t << mw->logWindow()->getLog(); |
307 | f.close(); | 308 | f.close(); |
308 | qDebug( "Saved log to file '%s'", (const char*) fname ); | 309 | odebug << "Saved log to file '" << (const char*) fname << "'" << oendl; |
309 | } | 310 | } |
310 | else | 311 | else |
311 | { | 312 | { |
312 | qDebug( "Problem saving log to file '%s'", (const char*) fname ); | 313 | odebug << "Problem saving log to file '" << (const char*) fname << "'" << oendl; |
313 | } | 314 | } |
314 | } | 315 | } |
315 | } | 316 | } |
316 | 317 | ||
@@ -325,13 +326,13 @@ void WellenreiterMainWindow::fileSaveSession() | |||
325 | { | 326 | { |
326 | QDataStream t( &f ); | 327 | QDataStream t( &f ); |
327 | t << *mw->netView(); | 328 | t << *mw->netView(); |
328 | f.close(); | 329 | f.close(); |
329 | qDebug( "Saved session to file '%s'", (const char*) fname ); | 330 | odebug << "Saved session to file '" << (const char*) fname << "'" << oendl; |
330 | } | 331 | } |
331 | else | 332 | else |
332 | { | 333 | { |
333 | qDebug( "Problem saving session to file '%s'", (const char*) fname ); | 334 | odebug << "Problem saving session to file '" << (const char*) fname << "'" << oendl; |
334 | } | 335 | } |
335 | } | 336 | } |
336 | } | 337 | } |
337 | 338 | ||
@@ -347,13 +348,13 @@ void WellenreiterMainWindow::fileSaveHex() | |||
347 | { | 348 | { |
348 | QTextStream t( &f ); | 349 | QTextStream t( &f ); |
349 | t << mw->hexWindow()->getLog(); | 350 | t << mw->hexWindow()->getLog(); |
350 | f.close(); | 351 | f.close(); |
351 | qDebug( "Saved hex log to file '%s'", (const char*) fname ); | 352 | odebug << "Saved hex log to file '" << (const char*) fname << "'" << oendl; |
352 | } | 353 | } |
353 | else | 354 | else |
354 | { | 355 | { |
355 | qDebug( "Problem saving hex log to file '%s'", (const char*) fname ); | 356 | odebug << "Problem saving hex log to file '" << (const char*) fname << "'" << oendl; |
356 | } | 357 | } |
357 | } | 358 | } |
358 | */ | 359 | */ |
359 | } | 360 | } |
@@ -368,13 +369,13 @@ void WellenreiterMainWindow::fileLoadSession() | |||
368 | { | 369 | { |
369 | QDataStream t( &f ); | 370 | QDataStream t( &f ); |
370 | t >> *mw->netView(); | 371 | t >> *mw->netView(); |
371 | f.close(); | 372 | f.close(); |
372 | qDebug( "Loaded session from file '%s'", (const char*) fname ); | 373 | odebug << "Loaded session from file '" << (const char*) fname << "'" << oendl; |
373 | } | 374 | } |
374 | else | 375 | else |
375 | { | 376 | { |
376 | qDebug( "Problem loading session from file '%s'", (const char*) fname ); | 377 | odebug << "Problem loading session from file '" << (const char*) fname << "'" << oendl; |
377 | } | 378 | } |
378 | } | 379 | } |
379 | } | 380 | } |
380 | 381 | ||
@@ -437,13 +438,13 @@ void WellenreiterMainWindow::uploadSession() | |||
437 | int result = d->exec(); | 438 | int result = d->exec(); |
438 | 439 | ||
439 | if ( !result ) | 440 | if ( !result ) |
440 | { | 441 | { |
441 | qDebug( "Session upload cancelled :(" ); | 442 | odebug << "Session upload cancelled :(" << oendl; |
442 | return; | 443 | return; |
443 | } | 444 | } |
444 | 445 | ||
445 | qDebug( "Starting upload..." ); | 446 | odebug << "Starting upload..." << oendl; |
446 | 447 | ||
447 | struct sockaddr_in raddr; | 448 | struct sockaddr_in raddr; |
448 | struct hostent *rhost_info; | 449 | struct hostent *rhost_info; |
449 | int sock = -1; | 450 | int sock = -1; |
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp index 3d3aa18..4df01da 100644 --- a/noncore/net/wellenreiter/gui/packetview.cpp +++ b/noncore/net/wellenreiter/gui/packetview.cpp | |||
@@ -83,9 +83,9 @@ void PacketView::showPacket( int number ) | |||
83 | _doHexPacket( p ); | 83 | _doHexPacket( p ); |
84 | } | 84 | } |
85 | else | 85 | else |
86 | { | 86 | { |
87 | qDebug( "D'oh! No packet!" ); | 87 | odebug << "D'oh! No packet!" << oendl; |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | void PacketView::_doSubPackets( QObjectList* l, int counter ) | 91 | void PacketView::_doSubPackets( QObjectList* l, int counter ) |
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp index d98ef0b..cb17f51 100644 --- a/noncore/net/wellenreiter/gui/resource.cpp +++ b/noncore/net/wellenreiter/gui/resource.cpp | |||
@@ -28,9 +28,9 @@ QPixmap loadPixmap( const QString& pix ) | |||
28 | filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); | 28 | filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); |
29 | QPixmap pixmap( filename ); | 29 | QPixmap pixmap( filename ); |
30 | if ( pixmap.isNull() ) | 30 | if ( pixmap.isNull() ) |
31 | { | 31 | { |
32 | qDebug( "Wellenreiter::Resource: can't find pixmap " + filename ); | 32 | odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; |
33 | } | 33 | } |
34 | return pixmap; | 34 | return pixmap; |
35 | }; | 35 | }; |
36 | 36 | ||
@@ -40,9 +40,9 @@ QIconSet loadIconSet( const QString& pix ) | |||
40 | filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); | 40 | filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); |
41 | QPixmap pixmap( filename ); | 41 | QPixmap pixmap( filename ); |
42 | if ( pixmap.isNull() ) | 42 | if ( pixmap.isNull() ) |
43 | { | 43 | { |
44 | qDebug( "Wellenreiter::Resource: can't find pixmap " + filename ); | 44 | odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; |
45 | } | 45 | } |
46 | return QIconSet( pixmap ); | 46 | return QIconSet( pixmap ); |
47 | }; | 47 | }; |
48 | 48 | ||
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 3b7120a..a2be782 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -16,23 +16,28 @@ | |||
16 | #include "scanlist.h" | 16 | #include "scanlist.h" |
17 | #include "configwindow.h" | 17 | #include "configwindow.h" |
18 | #include "logwindow.h" | 18 | #include "logwindow.h" |
19 | 19 | ||
20 | #include <assert.h> | 20 | /* OPIE */ |
21 | #include <qcursor.h> | ||
22 | #include <qdatetime.h> | ||
23 | #include <qpopupmenu.h> | ||
24 | #include <qcheckbox.h> | ||
25 | |||
26 | #ifdef QWS | 21 | #ifdef QWS |
22 | #include <opie2/odebug.h> | ||
27 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
28 | #endif | ||
29 | |||
30 | #ifdef QWS | ||
31 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
32 | #else | 25 | #else |
33 | #include "resource.h" | 26 | #include "resource.h" |
34 | #endif | 27 | #endif |
28 | using namespace Opie::Core; | ||
29 | using namespace Opie::Ui; | ||
30 | using namespace Opie::Net; | ||
31 | |||
32 | /* QT */ | ||
33 | #include <qcursor.h> | ||
34 | #include <qdatetime.h> | ||
35 | #include <qpopupmenu.h> | ||
36 | #include <qcheckbox.h> | ||
37 | |||
38 | /* STD */ | ||
39 | #include <assert.h> | ||
35 | 40 | ||
36 | const int col_type = 0; | 41 | const int col_type = 0; |
37 | const int col_essid = 0; | 42 | const int col_essid = 0; |
38 | const int col_sig = 1; | 43 | const int col_sig = 1; |
@@ -45,14 +50,8 @@ const int col_manuf = 7; | |||
45 | const int col_firstseen = 8; | 50 | const int col_firstseen = 8; |
46 | const int col_lastseen = 9; | 51 | const int col_lastseen = 9; |
47 | const int col_location = 10; | 52 | const int col_location = 10; |
48 | 53 | ||
49 | using namespace Opie::Net; | ||
50 | using namespace Opie::Ui; | ||
51 | using namespace Opie::Net; | ||
52 | using namespace Opie::Ui; | ||
53 | using namespace Opie::Ui; | ||
54 | using namespace Opie::Net; | ||
55 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 54 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
56 | :OListView( parent, name ) | 55 | :OListView( parent, name ) |
57 | { | 56 | { |
58 | setFrameShape( QListView::StyledPanel ); | 57 | setFrameShape( QListView::StyledPanel ); |
@@ -105,16 +104,16 @@ OListViewItem* MScanListView::childFactory() | |||
105 | 104 | ||
106 | 105 | ||
107 | void MScanListView::serializeTo( QDataStream& s) const | 106 | void MScanListView::serializeTo( QDataStream& s) const |
108 | { | 107 | { |
109 | qDebug( "serializing MScanListView" ); | 108 | odebug << "serializing MScanListView" << oendl; |
110 | OListView::serializeTo( s ); | 109 | OListView::serializeTo( s ); |
111 | } | 110 | } |
112 | 111 | ||
113 | 112 | ||
114 | void MScanListView::serializeFrom( QDataStream& s) | 113 | void MScanListView::serializeFrom( QDataStream& s) |
115 | { | 114 | { |
116 | qDebug( "serializing MScanListView" ); | 115 | odebug << "serializing MScanListView" << oendl; |
117 | OListView::serializeFrom( s ); | 116 | OListView::serializeFrom( s ); |
118 | } | 117 | } |
119 | 118 | ||
120 | 119 | ||
@@ -142,9 +141,9 @@ void MScanListView::addNewItem( const QString& type, | |||
142 | 141 | ||
143 | while ( item && ( item->text( col_essid ) != essid ) ) | 142 | while ( item && ( item->text( col_essid ) != essid ) ) |
144 | { | 143 | { |
145 | #ifdef DEBUG | 144 | #ifdef DEBUG |
146 | qDebug( "itemtext: %s", (const char*) item->text( col_essid ) ); | 145 | odebug << "itemtext: " << (const char*) item->text( col_essid ) << "" << oendl; |
147 | #endif | 146 | #endif |
148 | item = static_cast<MScanListItem*> ( item->nextSibling() ); | 147 | item = static_cast<MScanListItem*> ( item->nextSibling() ); |
149 | } | 148 | } |
150 | if ( item ) | 149 | if ( item ) |
@@ -158,18 +157,18 @@ void MScanListView::addNewItem( const QString& type, | |||
158 | 157 | ||
159 | while ( item && ( item->text( col_ap ) != macaddr ) ) | 158 | while ( item && ( item->text( col_ap ) != macaddr ) ) |
160 | { | 159 | { |
161 | #ifdef DEBUG | 160 | #ifdef DEBUG |
162 | qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) ); | 161 | odebug << "subitemtext: " << (const char*) item->text( col_ap ) << "" << oendl; |
163 | #endif | 162 | #endif |
164 | item = static_cast<MScanListItem*> ( item->nextSibling() ); | 163 | item = static_cast<MScanListItem*> ( item->nextSibling() ); |
165 | } | 164 | } |
166 | 165 | ||
167 | if ( item ) | 166 | if ( item ) |
168 | { | 167 | { |
169 | // we have already seen this item, it's a dupe | 168 | // we have already seen this item, it's a dupe |
170 | #ifdef DEBUG | 169 | #ifdef DEBUG |
171 | qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); | 170 | odebug << "" << (const char*) macaddr << " is a dupe - ignoring..." << oendl; |
172 | #endif | 171 | #endif |
173 | item->receivedBeacon(); | 172 | item->receivedBeacon(); |
174 | return; | 173 | return; |
175 | } | 174 | } |
@@ -185,9 +184,9 @@ void MScanListView::addNewItem( const QString& type, | |||
185 | // insert new station as child from network | 184 | // insert new station as child from network |
186 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? | 185 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? |
187 | 186 | ||
188 | #ifdef DEBUG | 187 | #ifdef DEBUG |
189 | qDebug( "inserting new station %s", (const char*) macaddr ); | 188 | odebug << "inserting new station " << (const char*) macaddr << "" << oendl; |
190 | #endif | 189 | #endif |
191 | 190 | ||
192 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); | 191 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); |
193 | station->setManufacturer( mac.manufacturer() ); | 192 | station->setManufacturer( mac.manufacturer() ); |
@@ -211,18 +210,18 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& | |||
211 | 210 | ||
212 | while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) ) | 211 | while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) ) |
213 | { | 212 | { |
214 | #ifdef DEBUG | 213 | #ifdef DEBUG |
215 | qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) ); | 214 | odebug << "subitemtext: " << (const char*) subitem->text( col_ap ) << "" << oendl; |
216 | #endif | 215 | #endif |
217 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); | 216 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); |
218 | } | 217 | } |
219 | 218 | ||
220 | if ( subitem ) | 219 | if ( subitem ) |
221 | { | 220 | { |
222 | // we have already seen this item, it's a dupe | 221 | // we have already seen this item, it's a dupe |
223 | #ifdef DEBUG | 222 | #ifdef DEBUG |
224 | qDebug( "%s is a dupe - ignoring...", (const char*) addr.toString(true) ); | 223 | odebug << "" << (const char*) addr.toString(true) << " is a dupe - ignoring..." << oendl; |
225 | #endif | 224 | #endif |
226 | subitem->receivedBeacon(); //FIXME: sent data bit | 225 | subitem->receivedBeacon(); //FIXME: sent data bit |
227 | return; | 226 | return; |
228 | } | 227 | } |
@@ -245,9 +244,9 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& | |||
245 | 244 | ||
246 | 245 | ||
247 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) | 246 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) |
248 | { | 247 | { |
249 | qDebug( "WDSTraffic: %s and %s seem to form a WDS", (const char*) viaFrom.toString(), (const char*) viaTo.toString() ); | 248 | odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << (const char*) viaTo.toString() << " seem to form a WDS" << oendl; |
250 | QString s; | 249 | QString s; |
251 | MScanListItem* network; | 250 | MScanListItem* network; |
252 | 251 | ||
253 | QListViewItemIterator it( this ); | 252 | QListViewItemIterator it( this ); |
@@ -263,9 +262,9 @@ void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, | |||
263 | addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to ); | 262 | addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to ); |
264 | } | 263 | } |
265 | else | 264 | else |
266 | { | 265 | { |
267 | qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" ); | 266 | odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl; |
268 | MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" ); | 267 | MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" ); |
269 | } | 268 | } |
270 | } | 269 | } |
271 | 270 | ||
@@ -285,9 +284,9 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, | |||
285 | addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" ); | 284 | addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" ); |
286 | } | 285 | } |
287 | else | 286 | else |
288 | { | 287 | { |
289 | qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); | 288 | odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; |
290 | MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" ); | 289 | MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" ); |
291 | 290 | ||
292 | } | 291 | } |
293 | } | 292 | } |
@@ -308,24 +307,24 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t | |||
308 | addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" ); | 307 | addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" ); |
309 | } | 308 | } |
310 | else | 309 | else |
311 | { | 310 | { |
312 | qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); | 311 | odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; |
313 | MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" ); | 312 | MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" ); |
314 | } | 313 | } |
315 | } | 314 | } |
316 | 315 | ||
317 | 316 | ||
318 | void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) | 317 | void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) |
319 | { | 318 | { |
320 | qWarning( "D'oh! Not yet implemented..." ); | 319 | owarn << "D'oh! Not yet implemented..." << oendl; |
321 | MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" ); | 320 | MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" ); |
322 | } | 321 | } |
323 | 322 | ||
324 | 323 | ||
325 | void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) | 324 | void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) |
326 | { | 325 | { |
327 | qDebug( "identify %s = %s", (const char*) macaddr.toString(), (const char*) ip ); | 326 | odebug << "identify " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; |
328 | 327 | ||
329 | QListViewItemIterator it( this ); | 328 | QListViewItemIterator it( this ); |
330 | for ( ; it.current(); ++it ) | 329 | for ( ; it.current(); ++it ) |
331 | { | 330 | { |
@@ -334,17 +333,17 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) | |||
334 | it.current()->setText( col_ip, ip ); | 333 | it.current()->setText( col_ip, ip ); |
335 | return; | 334 | return; |
336 | } | 335 | } |
337 | } | 336 | } |
338 | qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" ); | 337 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; |
339 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!", | 338 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!", |
340 | (const char*) macaddr.toString(), (const char*) ip ) ); | 339 | (const char*) macaddr.toString(), (const char*) ip ) ); |
341 | } | 340 | } |
342 | 341 | ||
343 | 342 | ||
344 | void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip ) | 343 | void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip ) |
345 | { | 344 | { |
346 | qDebug( "addService '%s', Server = %s = %s", (const char*) name, (const char*) macaddr.toString(), (const char*) ip ); | 345 | odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; |
347 | 346 | ||
348 | //TODO: Refactor that out, we need it all over the place. | 347 | //TODO: Refactor that out, we need it all over the place. |
349 | // Best to do it in a more comfortable abstraction in OListView | 348 | // Best to do it in a more comfortable abstraction in OListView |
350 | // (Hmm, didn't I already start something in this direction?) | 349 | // (Hmm, didn't I already start something in this direction?) |
@@ -359,18 +358,18 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, | |||
359 | 358 | ||
360 | while ( subitem && ( subitem->text( col_essid ) != name ) ) | 359 | while ( subitem && ( subitem->text( col_essid ) != name ) ) |
361 | { | 360 | { |
362 | #ifdef DEBUG | 361 | #ifdef DEBUG |
363 | qDebug( "subitemtext: %s", (const char*) subitem->text( col_essid ) ); | 362 | odebug << "subitemtext: " << (const char*) subitem->text( col_essid ) << "" << oendl; |
364 | #endif | 363 | #endif |
365 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); | 364 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); |
366 | } | 365 | } |
367 | 366 | ||
368 | if ( subitem ) | 367 | if ( subitem ) |
369 | { | 368 | { |
370 | // we have already seen this item, it's a dupe | 369 | // we have already seen this item, it's a dupe |
371 | #ifdef DEBUG | 370 | #ifdef DEBUG |
372 | qDebug( "%s is a dupe - ignoring...", (const char*) name ); | 371 | odebug << "" << (const char*) name << " is a dupe - ignoring..." << oendl; |
373 | #endif | 372 | #endif |
374 | subitem->receivedBeacon(); //FIXME: sent data bit | 373 | subitem->receivedBeacon(); //FIXME: sent data bit |
375 | return; | 374 | return; |
376 | } | 375 | } |
@@ -382,9 +381,9 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, | |||
382 | 381 | ||
383 | return; | 382 | return; |
384 | } | 383 | } |
385 | } | 384 | } |
386 | qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" ); | 385 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; |
387 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!", | 386 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!", |
388 | (const char*) macaddr.toString(), (const char*) ip ) ); | 387 | (const char*) macaddr.toString(), (const char*) ip ) ); |
389 | } | 388 | } |
390 | 389 | ||
@@ -420,9 +419,9 @@ MScanListItem::MScanListItem( QListView* parent, const QString& type, const QStr | |||
420 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), | 419 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), |
421 | _channel( channel ), _signal( signal ), _beacons( 1 ) | 420 | _channel( channel ), _signal( signal ), _beacons( 1 ) |
422 | { | 421 | { |
423 | #ifdef DEBUG | 422 | #ifdef DEBUG |
424 | qDebug( "creating scanlist item" ); | 423 | odebug << "creating scanlist item" << oendl; |
425 | #endif | 424 | #endif |
426 | 425 | ||
427 | if ( WellenreiterConfigWindow::instance() ) | 426 | if ( WellenreiterConfigWindow::instance() ) |
428 | WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here | 427 | WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here |
@@ -434,9 +433,9 @@ MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const | |||
434 | bool wep, int channel, int signal ) | 433 | bool wep, int channel, int signal ) |
435 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) | 434 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) |
436 | { | 435 | { |
437 | #ifdef DEBUG | 436 | #ifdef DEBUG |
438 | qDebug( "creating scanlist item" ); | 437 | odebug << "creating scanlist item" << oendl; |
439 | #endif | 438 | #endif |
440 | if ( WellenreiterConfigWindow::instance() ) | 439 | if ( WellenreiterConfigWindow::instance() ) |
441 | WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here | 440 | WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here |
442 | 441 | ||
@@ -458,9 +457,9 @@ OListViewItem* MScanListItem::childFactory() | |||
458 | 457 | ||
459 | void MScanListItem::serializeTo( QDataStream& s ) const | 458 | void MScanListItem::serializeTo( QDataStream& s ) const |
460 | { | 459 | { |
461 | #ifdef DEBUG | 460 | #ifdef DEBUG |
462 | qDebug( "serializing MScanListItem" ); | 461 | odebug << "serializing MScanListItem" << oendl; |
463 | #endif | 462 | #endif |
464 | OListViewItem::serializeTo( s ); | 463 | OListViewItem::serializeTo( s ); |
465 | 464 | ||
466 | s << _type; | 465 | s << _type; |
@@ -469,9 +468,9 @@ void MScanListItem::serializeTo( QDataStream& s ) const | |||
469 | 468 | ||
470 | void MScanListItem::serializeFrom( QDataStream& s ) | 469 | void MScanListItem::serializeFrom( QDataStream& s ) |
471 | { | 470 | { |
472 | #ifdef DEBUG | 471 | #ifdef DEBUG |
473 | qDebug( "serializing MScanListItem" ); | 472 | odebug << "serializing MScanListItem" << oendl; |
474 | #endif | 473 | #endif |
475 | OListViewItem::serializeFrom( s ); | 474 | OListViewItem::serializeFrom( s ); |
476 | 475 | ||
477 | char wep; | 476 | char wep; |
@@ -555,9 +554,9 @@ void MScanListItem::setLocation( const QString& location ) | |||
555 | void MScanListItem::receivedBeacon() | 554 | void MScanListItem::receivedBeacon() |
556 | { | 555 | { |
557 | _beacons++; | 556 | _beacons++; |
558 | #ifdef DEBUG | 557 | #ifdef DEBUG |
559 | qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons ); | 558 | odebug << "MScanListItem " << (const char*) _macaddr << ": received beacon #" << _beacons << "" << oendl; |
560 | #endif | 559 | #endif |
561 | setText( col_sig, QString::number( _beacons ) ); | 560 | setText( col_sig, QString::number( _beacons ) ); |
562 | setText( col_lastseen, QTime::currentTime().toString() ); | 561 | setText( col_lastseen, QTime::currentTime().toString() ); |
563 | 562 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index fff7c35..fad6efd 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -10,10 +10,8 @@ | |||
10 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 10 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
11 | ** | 11 | ** |
12 | ***********************************************************************/ | 12 | ***********************************************************************/ |
13 | 13 | ||
14 | // Local | ||
15 | |||
16 | #include "gps.h" | 14 | #include "gps.h" |
17 | #include "wellenreiter.h" | 15 | #include "wellenreiter.h" |
18 | #include "scanlist.h" | 16 | #include "scanlist.h" |
19 | #include "logwindow.h" | 17 | #include "logwindow.h" |
@@ -22,24 +20,25 @@ | |||
22 | #include "statwindow.h" | 20 | #include "statwindow.h" |
23 | #include "graphwindow.h" | 21 | #include "graphwindow.h" |
24 | #include "protolistview.h" | 22 | #include "protolistview.h" |
25 | 23 | ||
26 | // Opie | 24 | /* OPIE */ |
27 | |||
28 | #ifdef QWS | 25 | #ifdef QWS |
29 | #include <opie2/oapplication.h> | 26 | #include <opie2/oapplication.h> |
27 | #include <opie2/odebug.h> | ||
30 | #include <opie2/odevice.h> | 28 | #include <opie2/odevice.h> |
31 | #else | 29 | #else |
32 | #include <qapplication.h> | 30 | #include <qapplication.h> |
33 | #endif | 31 | #endif |
34 | #include <opie2/omanufacturerdb.h> | 32 | #include <opie2/omanufacturerdb.h> |
35 | #include <opie2/onetwork.h> | 33 | #include <opie2/onetwork.h> |
36 | #include <opie2/opcap.h> | 34 | #include <opie2/opcap.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 35 | #include <qpe/qcopenvelope_qws.h> |
38 | using namespace Opie; | 36 | using namespace Opie::Core; |
39 | 37 | using namespace Opie::Net; | |
40 | // Qt | 38 | using namespace Opie::Ui; |
41 | 39 | ||
40 | /* QT */ | ||
42 | #include <qcheckbox.h> | 41 | #include <qcheckbox.h> |
43 | #include <qcombobox.h> | 42 | #include <qcombobox.h> |
44 | #include <qdatetime.h> | 43 | #include <qdatetime.h> |
45 | #include <qpushbutton.h> | 44 | #include <qpushbutton.h> |
@@ -51,23 +50,16 @@ using namespace Opie; | |||
51 | #include <qtimer.h> | 50 | #include <qtimer.h> |
52 | #include <qtoolbutton.h> | 51 | #include <qtoolbutton.h> |
53 | #include <qmainwindow.h> | 52 | #include <qmainwindow.h> |
54 | 53 | ||
55 | // Standard | 54 | /* STD */ |
56 | |||
57 | #include <assert.h> | 55 | #include <assert.h> |
58 | #include <errno.h> | 56 | #include <errno.h> |
59 | #include <unistd.h> | 57 | #include <unistd.h> |
60 | #include <string.h> | 58 | #include <string.h> |
61 | #include <sys/types.h> | 59 | #include <sys/types.h> |
62 | #include <stdlib.h> | 60 | #include <stdlib.h> |
63 | 61 | ||
64 | using namespace Opie::Core; | ||
65 | using namespace Opie::Net; | ||
66 | using namespace Opie::Net; | ||
67 | using namespace Opie::Core; | ||
68 | using namespace Opie::Net; | ||
69 | using namespace Opie::Core; | ||
70 | Wellenreiter::Wellenreiter( QWidget* parent ) | 62 | Wellenreiter::Wellenreiter( QWidget* parent ) |
71 | : WellenreiterBase( parent, 0, 0 ), | 63 | : WellenreiterBase( parent, 0, 0 ), |
72 | sniffing( false ), iface( 0 ), configwindow( 0 ) | 64 | sniffing( false ), iface( 0 ), configwindow( 0 ) |
73 | { | 65 | { |
@@ -105,9 +97,9 @@ Wellenreiter::~Wellenreiter() | |||
105 | 97 | ||
106 | 98 | ||
107 | void Wellenreiter::initialTimer() | 99 | void Wellenreiter::initialTimer() |
108 | { | 100 | { |
109 | qDebug( "Wellenreiter::preloading manufacturer database..." ); | 101 | odebug << "Wellenreiter::preloading manufacturer database..." << oendl; |
110 | OManufacturerDB::instance(); | 102 | OManufacturerDB::instance(); |
111 | } | 103 | } |
112 | 104 | ||
113 | 105 | ||
@@ -148,14 +140,14 @@ void Wellenreiter::handleNotification( OPacket* p ) | |||
148 | QString name = it.current()->name(); | 140 | QString name = it.current()->name(); |
149 | if ( configwindow->parsePackets->isProtocolChecked( name ) ) | 141 | if ( configwindow->parsePackets->isProtocolChecked( name ) ) |
150 | { | 142 | { |
151 | QString action = configwindow->parsePackets->protocolAction( name ); | 143 | QString action = configwindow->parsePackets->protocolAction( name ); |
152 | qDebug( "parsePacket-action for '%s' seems to be '%s'", (const char*) name, (const char*) action ); | 144 | odebug << "parsePacket-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; |
153 | doAction( action, name, p ); | 145 | doAction( action, name, p ); |
154 | } | 146 | } |
155 | else | 147 | else |
156 | { | 148 | { |
157 | qDebug( "protocol '%s' not checked in parsePackets.", (const char*) name ); | 149 | odebug << "protocol '" << (const char*) name << "' not checked in parsePackets." << oendl; |
158 | } | 150 | } |
159 | ++it; | 151 | ++it; |
160 | } | 152 | } |
161 | } | 153 | } |
@@ -165,9 +157,9 @@ void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* | |||
165 | { | 157 | { |
166 | if ( manage->managementType() == "Beacon" ) handleManagementFrameBeacon( p, manage ); | 158 | if ( manage->managementType() == "Beacon" ) handleManagementFrameBeacon( p, manage ); |
167 | else if ( manage->managementType() == "ProbeRequest" ) handleManagementFrameProbeRequest( p, manage ); | 159 | else if ( manage->managementType() == "ProbeRequest" ) handleManagementFrameProbeRequest( p, manage ); |
168 | else if ( manage->managementType() == "ProbeResponse" ) handleManagementFrameProbeResponse( p, manage ); | 160 | else if ( manage->managementType() == "ProbeResponse" ) handleManagementFrameProbeResponse( p, manage ); |
169 | else qWarning( "Wellenreiter::handleManagementFrame(): '%s' - please handle me!", (const char*) manage->managementType() ); | 161 | else owarn << "Wellenreiter::handleManagementFrame(): '" << (const char*) manage->managementType() << "' - please handle me!" << oendl; |
170 | } | 162 | } |
171 | 163 | ||
172 | 164 | ||
173 | void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* request ) | 165 | void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* request ) |
@@ -181,16 +173,16 @@ void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManage | |||
181 | GpsLocation loc( -111, -111 ); | 173 | GpsLocation loc( -111, -111 ); |
182 | if ( configwindow->enableGPS->isChecked() ) | 174 | if ( configwindow->enableGPS->isChecked() ) |
183 | { | 175 | { |
184 | // TODO: add check if GPS is working!? | 176 | // TODO: add check if GPS is working!? |
185 | qDebug( "Wellenreiter::gathering GPS data..." ); | 177 | odebug << "Wellenreiter::gathering GPS data..." << oendl; |
186 | loc = gps->position(); | 178 | loc = gps->position(); |
187 | qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() ); | 179 | odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; |
188 | } | 180 | } |
189 | 181 | ||
190 | if ( essid.length() ) | 182 | if ( essid.length() ) |
191 | netView()->addNewItem( "adhoc", essid, header->macAddress2(), false /* should check FrameControl field */, -1, 0, loc, true /* only probed */ ); | 183 | netView()->addNewItem( "adhoc", essid, header->macAddress2(), false /* should check FrameControl field */, -1, 0, loc, true /* only probed */ ); |
192 | qDebug( "Wellenreiter::invalid frame [possibly noise] detected!" ); | 184 | odebug << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; |
193 | } | 185 | } |
194 | 186 | ||
195 | 187 | ||
196 | void Wellenreiter::handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* response ) | 188 | void Wellenreiter::handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* response ) |
@@ -210,9 +202,9 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa | |||
210 | type = "managed"; | 202 | type = "managed"; |
211 | } | 203 | } |
212 | else | 204 | else |
213 | { | 205 | { |
214 | qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" ); | 206 | owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; |
215 | return; | 207 | return; |
216 | } | 208 | } |
217 | 209 | ||
218 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); | 210 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); |
@@ -225,11 +217,11 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa | |||
225 | GpsLocation loc( -111, -111 ); | 217 | GpsLocation loc( -111, -111 ); |
226 | if ( configwindow->enableGPS->isChecked() ) | 218 | if ( configwindow->enableGPS->isChecked() ) |
227 | { | 219 | { |
228 | // TODO: add check if GPS is working!? | 220 | // TODO: add check if GPS is working!? |
229 | qDebug( "Wellenreiter::gathering GPS data..." ); | 221 | odebug << "Wellenreiter::gathering GPS data..." << oendl; |
230 | loc = gps->position(); | 222 | loc = gps->position(); |
231 | qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() ); | 223 | odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; |
232 | } | 224 | } |
233 | 225 | ||
234 | netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0, loc ); | 226 | netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0, loc ); |
235 | 227 | ||
@@ -254,9 +246,9 @@ void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* contro | |||
254 | netView()->addNewItem( "adhoc", "<unknown>", header->macAddress1(), false, -1, 0, GpsLocation( -111, -111 ) ); | 246 | netView()->addNewItem( "adhoc", "<unknown>", header->macAddress1(), false, -1, 0, GpsLocation( -111, -111 ) ); |
255 | } | 247 | } |
256 | else | 248 | else |
257 | { | 249 | { |
258 | qDebug( "Wellenreiter::handleControlFrame - please handle %s in a future version! :D", (const char*) control->controlType() ); | 250 | odebug << "Wellenreiter::handleControlFrame - please handle " << (const char*) control->controlType() << " in a future version! :D" << oendl; |
259 | } | 251 | } |
260 | } | 252 | } |
261 | 253 | ||
262 | 254 | ||
@@ -303,9 +295,9 @@ void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, | |||
303 | { | 295 | { |
304 | OARPPacket* arp = (OARPPacket*) p->child( "ARP" ); | 296 | OARPPacket* arp = (OARPPacket*) p->child( "ARP" ); |
305 | if ( arp ) | 297 | if ( arp ) |
306 | { | 298 | { |
307 | qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() ); | 299 | odebug << "Received ARP traffic (type '" << (const char*) arp->type() << "'): " << oendl; |
308 | if ( arp->type() == "REQUEST" ) | 300 | if ( arp->type() == "REQUEST" ) |
309 | { | 301 | { |
310 | netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() ); | 302 | netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() ); |
311 | } | 303 | } |
@@ -324,18 +316,18 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, | |||
324 | 316 | ||
325 | ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" ); | 317 | ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" ); |
326 | if ( dhcp ) | 318 | if ( dhcp ) |
327 | { | 319 | { |
328 | qDebug( "Received DHCP '%s' packet", (const char*) dhcp->type() ); | 320 | odebug << "Received DHCP '" << (const char*) dhcp->type() << "' packet" << oendl; |
329 | if ( dhcp->type() == "OFFER" ) | 321 | if ( dhcp->type() == "OFFER" ) |
330 | { | 322 | { |
331 | qDebug( "DHCP: '%s' ('%s') seems to be a DHCP server.", (const char*) source.toString(), (const char*) dhcp->serverAddress().toString() ); | 323 | odebug << "DHCP: '" << (const char*) source.toString() << "' ('" << (const char*) dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl; |
332 | netView()->identify( source, dhcp->serverAddress().toString() ); | 324 | netView()->identify( source, dhcp->serverAddress().toString() ); |
333 | netView()->addService( "DHCP", source, dhcp->serverAddress().toString() ); | 325 | netView()->addService( "DHCP", source, dhcp->serverAddress().toString() ); |
334 | } | 326 | } |
335 | else if ( dhcp->type() == "ACK" ) | 327 | else if ( dhcp->type() == "ACK" ) |
336 | { | 328 | { |
337 | qDebug( "DHCP: '%s' ('%s') accepted the offered DHCP address.", (const char*) dhcp->clientMacAddress().toString(), (const char*) dhcp->yourAddress().toString() ); | 329 | odebug << "DHCP: '" << (const char*) dhcp->clientMacAddress().toString() << "' ('" << (const char*) dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl; |
338 | netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() ); | 330 | netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() ); |
339 | } | 331 | } |
340 | } | 332 | } |
341 | } | 333 | } |
@@ -367,18 +359,18 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) | |||
367 | QString name = it.current()->name(); | 359 | QString name = it.current()->name(); |
368 | if ( configwindow->capturePackets->isProtocolChecked( name ) ) | 360 | if ( configwindow->capturePackets->isProtocolChecked( name ) ) |
369 | { | 361 | { |
370 | QString action = configwindow->capturePackets->protocolAction( name ); | 362 | QString action = configwindow->capturePackets->protocolAction( name ); |
371 | qDebug( "capturePackets-action for '%s' seems to be '%s'", (const char*) name, (const char*) action ); | 363 | odebug << "capturePackets-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; |
372 | if ( action == "Discard" ) | 364 | if ( action == "Discard" ) |
373 | { | 365 | { |
374 | logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) ); | 366 | logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) ); |
375 | return false; | 367 | return false; |
376 | } | 368 | } |
377 | } | 369 | } |
378 | else | 370 | else |
379 | { | 371 | { |
380 | qDebug( "protocol '%s' not checked in capturePackets.", (const char*) name ); | 372 | odebug << "protocol '" << (const char*) name << "' not checked in capturePackets." << oendl; |
381 | } | 373 | } |
382 | ++it; | 374 | ++it; |
383 | } | 375 | } |
384 | return true; | 376 | return true; |
@@ -550,9 +542,9 @@ void Wellenreiter::startClicked() | |||
550 | case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break; | 542 | case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break; |
551 | case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break; | 543 | case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break; |
552 | case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break; | 544 | case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break; |
553 | case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; | 545 | case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; |
554 | case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; | 546 | case DEVTYPE_FILE: odebug << "Wellenreiter: Capturing from file '" << (const char*) interface << "'" << oendl; break; |
555 | default: assert( 0 ); // shouldn't reach this | 547 | default: assert( 0 ); // shouldn't reach this |
556 | } | 548 | } |
557 | 549 | ||
558 | // switch device into monitor mode | 550 | // switch device into monitor mode |
@@ -571,9 +563,9 @@ void Wellenreiter::startClicked() | |||
571 | 563 | ||
572 | // open GPS device | 564 | // open GPS device |
573 | if ( configwindow->enableGPS->isChecked() ) | 565 | if ( configwindow->enableGPS->isChecked() ) |
574 | { | 566 | { |
575 | qDebug( "Wellenreiter:GPS enabled @ %s:%d", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | 567 | odebug << "Wellenreiter:GPS enabled @ " << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "" << oendl; |
576 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | 568 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); |
577 | } | 569 | } |
578 | 570 | ||
579 | // open pcap and start sniffing | 571 | // open pcap and start sniffing |
@@ -595,9 +587,9 @@ void Wellenreiter::startClicked() | |||
595 | pcap->open( interface ); | 587 | pcap->open( interface ); |
596 | else | 588 | else |
597 | pcap->open( QFile( interface ) ); | 589 | pcap->open( QFile( interface ) ); |
598 | 590 | ||
599 | qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname ); | 591 | odebug << "Wellenreiter:: dumping to " << (const char*) dumpname << "" << oendl; |
600 | pcap->openDumpFile( dumpname ); | 592 | pcap->openDumpFile( dumpname ); |
601 | 593 | ||
602 | if ( !pcap->isOpen() ) | 594 | if ( !pcap->isOpen() ) |
603 | { | 595 | { |
@@ -651,9 +643,9 @@ void Wellenreiter::startClicked() | |||
651 | 643 | ||
652 | 644 | ||
653 | void Wellenreiter::timerEvent( QTimerEvent* ) | 645 | void Wellenreiter::timerEvent( QTimerEvent* ) |
654 | { | 646 | { |
655 | qDebug( "Wellenreiter::timerEvent()" ); | 647 | odebug << "Wellenreiter::timerEvent()" << oendl; |
656 | OPacket* p = pcap->next(); | 648 | OPacket* p = pcap->next(); |
657 | if ( !p ) // no more packets available | 649 | if ( !p ) // no more packets available |
658 | { | 650 | { |
659 | stopClicked(); | 651 | stopClicked(); |
@@ -714,17 +706,17 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch | |||
714 | (const char*) macaddr ); | 706 | (const char*) macaddr ); |
715 | 707 | ||
716 | QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); | 708 | QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); |
717 | int count = 3; | 709 | int count = 3; |
718 | qDebug("sending %d messages",count); | 710 | odebug << "sending " << count << " messages" << oendl; |
719 | msg << QString("count") << QString::number(count); | 711 | msg << QString("count") << QString::number(count); |
720 | qDebug("msg >%s< Mode >%s<", iface->name(),type.latin1() ); | 712 | odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; |
721 | msg << QString(iface->name()) << QString("Mode") << type; | 713 | msg << QString(iface->name()) << QString("Mode") << type; |
722 | qDebug("msg >%s< essid >%s<", iface->name(),essid.latin1()); | 714 | odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; |
723 | msg << QString(iface->name()) << QString("ESSID") << essid; | 715 | msg << QString(iface->name()) << QString("ESSID") << essid; |
724 | qDebug("msg >%s< channel >%d<", iface->name(),channel); | 716 | odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl; |
725 | msg << QString(iface->name()) << QString("Channel") << channel; | 717 | msg << QString(iface->name()) << QString("Channel") << channel; |
726 | // qDebug("msg >%s< mac >%s<", iface->name(),macaddr); | 718 | // odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl; |
727 | // msg << QString(iface->name()) << QString("MacAddr") << macaddr; | 719 | // msg << QString(iface->name()) << QString("MacAddr") << macaddr; |
728 | #else | 720 | #else |
729 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) ); | 721 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) ); |
730 | #endif | 722 | #endif |
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 58e5c71..2eccdfe 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -1,11 +1,12 @@ | |||
1 | |||
2 | #include "backuprestore.h" | 1 | #include "backuprestore.h" |
3 | #include "errordialog.h" | 2 | #include "errordialog.h" |
4 | 3 | ||
5 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <opie2/odebug.h> | ||
6 | #include <opie2/ostorageinfo.h> | 6 | #include <opie2/ostorageinfo.h> |
7 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
8 | using namespace Opie::Core; | ||
8 | 9 | ||
9 | /* QT */ | 10 | /* QT */ |
10 | #include <qapplication.h> | 11 | #include <qapplication.h> |
11 | #include <qmultilineedit.h> | 12 | #include <qmultilineedit.h> |
@@ -39,9 +40,8 @@ | |||
39 | #define EXTENSION ".bck" | 40 | #define EXTENSION ".bck" |
40 | 41 | ||
41 | const QString tempFileName = "/tmp/backup.err"; | 42 | const QString tempFileName = "/tmp/backup.err"; |
42 | 43 | ||
43 | |||
44 | BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) | 44 | BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) |
45 | : BackupAndRestoreBase(parent, name, fl) | 45 | : BackupAndRestoreBase(parent, name, fl) |
46 | { | 46 | { |
47 | backupList->header()->hide(); | 47 | backupList->header()->hide(); |
@@ -72,19 +72,19 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f | |||
72 | backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); | 72 | backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); |
73 | if ( storage.hasCf() ) | 73 | if ( storage.hasCf() ) |
74 | { | 74 | { |
75 | backupLocations.insert( "CF", storage.cfPath() ); | 75 | backupLocations.insert( "CF", storage.cfPath() ); |
76 | qDebug( "Cf Path: " + storage.cfPath() ); | 76 | odebug << "Cf Path: " + storage.cfPath() << oendl; |
77 | } | 77 | } |
78 | if ( storage.hasSd() ) | 78 | if ( storage.hasSd() ) |
79 | { | 79 | { |
80 | backupLocations.insert( "SD", storage.sdPath() ); | 80 | backupLocations.insert( "SD", storage.sdPath() ); |
81 | qDebug( " Sd Path: " + storage.sdPath() ); | 81 | odebug << " Sd Path: " + storage.sdPath() << oendl; |
82 | } | 82 | } |
83 | if ( storage.hasMmc() ) | 83 | if ( storage.hasMmc() ) |
84 | { | 84 | { |
85 | backupLocations.insert( "MMC", storage.mmcPath() ); | 85 | backupLocations.insert( "MMC", storage.mmcPath() ); |
86 | qDebug( "Mmc Path: " + storage.mmcPath() ); | 86 | odebug << "Mmc Path: " + storage.mmcPath() << oendl; |
87 | } | 87 | } |
88 | 88 | ||
89 | Config config("BackupAndRestore"); | 89 | Config config("BackupAndRestore"); |
90 | //read last locations | 90 | //read last locations |
@@ -202,9 +202,9 @@ void BackupAndRestore::scanForApplicationSettings() | |||
202 | QFileInfoListIterator it( *list ); | 202 | QFileInfoListIterator it( *list ); |
203 | QFileInfo *fi; | 203 | QFileInfo *fi; |
204 | while ( (fi=it.current()) ) | 204 | while ( (fi=it.current()) ) |
205 | { | 205 | { |
206 | //qDebug((d.path()+"/"+fi->fileName()).latin1()); | 206 | //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl; |
207 | if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) | 207 | if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) |
208 | { | 208 | { |
209 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); | 209 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); |
210 | selectItem(newItem); | 210 | selectItem(newItem); |
@@ -248,18 +248,18 @@ void BackupAndRestore::backup() | |||
248 | 248 | ||
249 | // We execute tar and compressing its output with gzip.. | 249 | // We execute tar and compressing its output with gzip.. |
250 | // The error output will be written into a temp-file which could be provided | 250 | // The error output will be written into a temp-file which could be provided |
251 | // for debugging.. | 251 | // for debugging.. |
252 | qDebug( "Storing file: %s", outputFile.latin1() ); | 252 | odebug << "Storing file: " << outputFile.latin1() << "" << oendl; |
253 | outputFile += EXTENSION; | 253 | outputFile += EXTENSION; |
254 | 254 | ||
255 | QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 Applications/backup/exclude -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) | 255 | QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 Applications/backup/exclude -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) |
256 | .arg( getExcludeFile() ) | 256 | .arg( getExcludeFile() ) |
257 | .arg( backupFiles ) | 257 | .arg( backupFiles ) |
258 | .arg( outputFile.latin1() ) | 258 | .arg( outputFile.latin1() ) |
259 | .arg( tempFileName.latin1() ); | 259 | .arg( tempFileName.latin1() ); |
260 | 260 | ||
261 | qDebug( commandLine ); | 261 | odebug << commandLine << oendl; |
262 | 262 | ||
263 | int r = system( commandLine ); | 263 | int r = system( commandLine ); |
264 | 264 | ||
265 | if(r != 0) | 265 | if(r != 0) |
@@ -271,9 +271,9 @@ void BackupAndRestore::backup() | |||
271 | + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ) | 271 | + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ) |
272 | { | 272 | { |
273 | 273 | ||
274 | case 1: | 274 | case 1: |
275 | qWarning("Details pressed !"); | 275 | owarn << "Details pressed !" << oendl; |
276 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); | 276 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); |
277 | QFile errorFile( tempFileName ); | 277 | QFile errorFile( tempFileName ); |
278 | if ( errorFile.open(IO_ReadOnly) ) | 278 | if ( errorFile.open(IO_ReadOnly) ) |
279 | { | 279 | { |
@@ -358,9 +358,9 @@ void BackupAndRestore::sourceDirChanged(int selection) | |||
358 | } | 358 | } |
359 | 359 | ||
360 | void BackupAndRestore::fileListUpdate() | 360 | void BackupAndRestore::fileListUpdate() |
361 | { | 361 | { |
362 | qWarning("void BackupAndRestore::fileListUpdate()"); | 362 | owarn << "void BackupAndRestore::fileListUpdate()" << oendl; |
363 | restoreList->clear(); | 363 | restoreList->clear(); |
364 | rescanFolder( backupLocations[restoreSource->currentText()] ); | 364 | rescanFolder( backupLocations[restoreSource->currentText()] ); |
365 | } | 365 | } |
366 | 366 | ||
@@ -370,9 +370,9 @@ void BackupAndRestore::fileListUpdate() | |||
370 | * @param directory - the directory to look in. | 370 | * @param directory - the directory to look in. |
371 | */ | 371 | */ |
372 | void BackupAndRestore::rescanFolder(QString directory) | 372 | void BackupAndRestore::rescanFolder(QString directory) |
373 | { | 373 | { |
374 | //qDebug(QString("rescanFolder: ") + directory.latin1()); | 374 | //odebug << QString("rescanFolder: ") + directory.latin1() << oendl; |
375 | QDir d(directory); | 375 | QDir d(directory); |
376 | if(!d.exists()) | 376 | if(!d.exists()) |
377 | return; | 377 | return; |
378 | 378 | ||
@@ -418,9 +418,9 @@ void BackupAndRestore::restore() | |||
418 | QString restoreFile = backupLocations[restoreSource->currentText()]; | 418 | QString restoreFile = backupLocations[restoreSource->currentText()]; |
419 | 419 | ||
420 | restoreFile += "/" + restoreItem->text(0); | 420 | restoreFile += "/" + restoreItem->text(0); |
421 | 421 | ||
422 | qDebug( restoreFile ); | 422 | odebug << restoreFile << oendl; |
423 | 423 | ||
424 | //check if backup file come from opie 1.0.x | 424 | //check if backup file come from opie 1.0.x |
425 | 425 | ||
426 | QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() ); | 426 | QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() ); |
@@ -441,9 +441,9 @@ void BackupAndRestore::restore() | |||
441 | commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir ) | 441 | commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir ) |
442 | .arg( restoreFile.latin1() ) | 442 | .arg( restoreFile.latin1() ) |
443 | .arg( tempFileName.latin1() ); | 443 | .arg( tempFileName.latin1() ); |
444 | 444 | ||
445 | qDebug( commandLine ); | 445 | odebug << commandLine << oendl; |
446 | 446 | ||
447 | r = system( commandLine ); | 447 | r = system( commandLine ); |
448 | 448 | ||
449 | //error handling | 449 | //error handling |
@@ -453,9 +453,9 @@ void BackupAndRestore::restore() | |||
453 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" | 453 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" |
454 | + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) | 454 | + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) |
455 | { | 455 | { |
456 | case 1: | 456 | case 1: |
457 | qWarning("Details pressed !"); | 457 | owarn << "Details pressed !" << oendl; |
458 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); | 458 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); |
459 | QFile errorFile( tempFileName ); | 459 | QFile errorFile( tempFileName ); |
460 | if ( errorFile.open(IO_ReadOnly) ) | 460 | if ( errorFile.open(IO_ReadOnly) ) |
461 | { | 461 | { |
diff --git a/noncore/settings/netsystemtime/settingstabwidget.cpp b/noncore/settings/netsystemtime/settingstabwidget.cpp index ad80e05..1307082 100644 --- a/noncore/settings/netsystemtime/settingstabwidget.cpp +++ b/noncore/settings/netsystemtime/settingstabwidget.cpp | |||
@@ -138,9 +138,9 @@ void SettingsTabWidget::saveSettings() | |||
138 | ntpSrvs.writeEntry( "name", edit ); | 138 | ntpSrvs.writeEntry( "name", edit ); |
139 | curSrv = 0; | 139 | curSrv = 0; |
140 | for ( int i = 1; i < srvCount; i++ ) | 140 | for ( int i = 1; i < srvCount; i++ ) |
141 | { | 141 | { |
142 | // qDebug( "ntpSrvs[%i/%i]=%s", i, srvCount, cbTimeServer->text( i ).latin1() ); | 142 | // odebug << "ntpSrvs[" << i << "/" << srvCount << "]=" << cbTimeServer->text( i ).latin1() << "" << oendl; |
143 | ntpSrvs.setGroup( QString::number( i ) ); | 143 | ntpSrvs.setGroup( QString::number( i ) ); |
144 | ntpSrvs.writeEntry( "name", cbTimeServer->text( i-1 ) ); | 144 | ntpSrvs.writeEntry( "name", cbTimeServer->text( i-1 ) ); |
145 | } | 145 | } |
146 | } | 146 | } |
diff --git a/noncore/settings/networksettings/interfaces/interface.cpp b/noncore/settings/networksettings/interfaces/interface.cpp index b00b899..d2b106a 100644 --- a/noncore/settings/networksettings/interfaces/interface.cpp +++ b/noncore/settings/networksettings/interfaces/interface.cpp | |||
@@ -136,15 +136,15 @@ bool Interface::refresh(){ | |||
136 | 136 | ||
137 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); | 137 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); |
138 | int ret = system(QString("LANG=C %1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); | 138 | int ret = system(QString("LANG=C %1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); |
139 | if(ret != 0){ | 139 | if(ret != 0){ |
140 | qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1()); | 140 | odebug << QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1() << oendl; |
141 | return false; | 141 | return false; |
142 | } | 142 | } |
143 | 143 | ||
144 | QFile file(fileName); | 144 | QFile file(fileName); |
145 | if (!file.open(IO_ReadOnly)){ | 145 | if (!file.open(IO_ReadOnly)){ |
146 | qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1()); | 146 | odebug << QString("Interface: Can't open file: %1").arg(fileName).latin1() << oendl; |
147 | return false; | 147 | return false; |
148 | } | 148 | } |
149 | 149 | ||
150 | // Set to the defaults | 150 | // Set to the defaults |
@@ -200,9 +200,9 @@ bool Interface::refresh(){ | |||
200 | } | 200 | } |
201 | 201 | ||
202 | file.setName(dhcpFile); | 202 | file.setName(dhcpFile); |
203 | if (!file.open(IO_ReadOnly)){ | 203 | if (!file.open(IO_ReadOnly)){ |
204 | qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); | 204 | odebug << QString("Interface: Can't open file: %1").arg(dhcpFile).latin1() << oendl; |
205 | return false; | 205 | return false; |
206 | } | 206 | } |
207 | 207 | ||
208 | // leaseTime and renewalTime and used if pid and deamon exe can be accessed. | 208 | // leaseTime and renewalTime and used if pid and deamon exe can be accessed. |
@@ -219,16 +219,16 @@ bool Interface::refresh(){ | |||
219 | if(line.contains("RENEWALTIME=")) | 219 | if(line.contains("RENEWALTIME=")) |
220 | renewalTime = line.mid(12, line.length()).toInt(); | 220 | renewalTime = line.mid(12, line.length()).toInt(); |
221 | } | 221 | } |
222 | file.close(); | 222 | file.close(); |
223 | //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1()); | 223 | //odebug << QString("Interface: leaseTime: %1").arg(leaseTime).latin1() << oendl; |
224 | //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1()); | 224 | //odebug << QString("Interface: renewalTime: %1").arg(renewalTime).latin1() << oendl; |
225 | 225 | ||
226 | // Get the pid of the deamond | 226 | // Get the pid of the deamond |
227 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); | 227 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); |
228 | file.setName(dhcpFile); | 228 | file.setName(dhcpFile); |
229 | if (!file.open(IO_ReadOnly)){ | 229 | if (!file.open(IO_ReadOnly)){ |
230 | qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); | 230 | odebug << QString("Interface: Can't open file: %1").arg(dhcpFile).latin1() << oendl; |
231 | return false; | 231 | return false; |
232 | } | 232 | } |
233 | 233 | ||
234 | int pid = -1; | 234 | int pid = -1; |
@@ -239,18 +239,18 @@ bool Interface::refresh(){ | |||
239 | } | 239 | } |
240 | file.close(); | 240 | file.close(); |
241 | 241 | ||
242 | if( pid == -1){ | 242 | if( pid == -1){ |
243 | qDebug("Interface: Could not get pid of dhcpc deamon."); | 243 | odebug << "Interface: Could not get pid of dhcpc deamon." << oendl; |
244 | return false; | 244 | return false; |
245 | } | 245 | } |
246 | 246 | ||
247 | // Get the start running time of the deamon | 247 | // Get the start running time of the deamon |
248 | fileName = (QString("/proc/%1/stat").arg(pid)); | 248 | fileName = (QString("/proc/%1/stat").arg(pid)); |
249 | file.setName(fileName); | 249 | file.setName(fileName); |
250 | stream.setDevice( &file ); | 250 | stream.setDevice( &file ); |
251 | if (!file.open(IO_ReadOnly)){ | 251 | if (!file.open(IO_ReadOnly)){ |
252 | qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1()); | 252 | odebug << QString("Interface: Can't open file: %1").arg(fileName).latin1() << oendl; |
253 | return false; | 253 | return false; |
254 | } | 254 | } |
255 | while ( !stream.eof() ) { | 255 | while ( !stream.eof() ) { |
256 | line = stream.readLine(); | 256 | line = stream.readLine(); |
@@ -277,14 +277,14 @@ bool Interface::refresh(){ | |||
277 | datetime = datetime.addSecs((-1*sec)); | 277 | datetime = datetime.addSecs((-1*sec)); |
278 | f.close(); | 278 | f.close(); |
279 | } | 279 | } |
280 | else{ | 280 | else{ |
281 | qDebug("Interface: Can't open /proc/uptime to retrive uptime."); | 281 | odebug << "Interface: Can't open /proc/uptime to retrive uptime." << oendl; |
282 | return false; | 282 | return false; |
283 | } | 283 | } |
284 | 284 | ||
285 | datetime = datetime.addSecs(time); | 285 | datetime = datetime.addSecs(time); |
286 | //qDebug(QString("Interface: %1 %2").arg(datetime.toString()).arg(pid).latin1()); | 286 | //odebug << QString("Interface: %1 %2").arg(datetime.toString()).arg(pid).latin1() << oendl; |
287 | 287 | ||
288 | // Calculate the start and renew times | 288 | // Calculate the start and renew times |
289 | leaseObtained= datetime.toString(); | 289 | leaseObtained= datetime.toString(); |
290 | 290 | ||
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index 6b161ae..e283926 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
@@ -23,9 +23,9 @@ Interfaces::Interfaces(QString useInterfacesFile){ | |||
23 | 23 | ||
24 | interfacesFile = useInterfacesFile; | 24 | interfacesFile = useInterfacesFile; |
25 | QFile file(interfacesFile); | 25 | QFile file(interfacesFile); |
26 | if (!file.open(IO_ReadOnly)){ | 26 | if (!file.open(IO_ReadOnly)){ |
27 | qDebug("Interfaces: Can't open file: %s for reading.", interfacesFile.latin1() ); | 27 | odebug << "Interfaces: Can't open file: " << interfacesFile.latin1() << " for reading." << oendl; |
28 | currentIface = interfaces.end(); | 28 | currentIface = interfaces.end(); |
29 | currentMapping = interfaces.end(); | 29 | currentMapping = interfaces.end(); |
30 | return; | 30 | return; |
31 | } | 31 | } |
@@ -75,9 +75,9 @@ QStringList Interfaces::getInterfaceList(){ | |||
75 | bool Interfaces::isAuto(const QString &interface) const { | 75 | bool Interfaces::isAuto(const QString &interface) const { |
76 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 76 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
77 | QStringList awi = autoLines.grep(QRegExp(interface)); | 77 | QStringList awi = autoLines.grep(QRegExp(interface)); |
78 | if(awi.count() > 1) | 78 | if(awi.count() > 1) |
79 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); | 79 | odebug << QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1() << oendl; |
80 | return awi.count() > 0; | 80 | return awi.count() > 0; |
81 | } | 81 | } |
82 | 82 | ||
83 | /** | 83 | /** |
@@ -151,9 +151,9 @@ bool Interfaces::isInterfaceSet() const { | |||
151 | * @param method for the family. see interfaces man page for family methods. | 151 | * @param method for the family. see interfaces man page for family methods. |
152 | * @return true if successful. | 152 | * @return true if successful. |
153 | */ | 153 | */ |
154 | bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){ | 154 | bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){ |
155 | qDebug("Interfaces::addInterface(%s)",interface.latin1()); | 155 | odebug << "Interfaces::addInterface(" << interface.latin1() << ")" << oendl; |
156 | if(0 == acceptedFamily.contains(family)) | 156 | if(0 == acceptedFamily.contains(family)) |
157 | return false; | 157 | return false; |
158 | QString newInterface = interface.simplifyWhiteSpace(); | 158 | QString newInterface = interface.simplifyWhiteSpace(); |
159 | newInterface = newInterface.replace(QRegExp(" "), ""); | 159 | newInterface = newInterface.replace(QRegExp(" "), ""); |
@@ -167,9 +167,9 @@ bool Interfaces::addInterface(const QString &interface, const QString &family, c | |||
167 | * @param newInterface name of the new interface. | 167 | * @param newInterface name of the new interface. |
168 | * @return bool true if successful | 168 | * @return bool true if successful |
169 | */ | 169 | */ |
170 | bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){ | 170 | bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){ |
171 | qDebug("copy interface %s to %s", interface.latin1(), newInterface.latin1()); | 171 | odebug << "copy interface " << interface.latin1() << " to " << newInterface.latin1() << "" << oendl; |
172 | if(!setInterface(interface)) | 172 | if(!setInterface(interface)) |
173 | return false; | 173 | return false; |
174 | 174 | ||
175 | // Store the old interface and bump past the stanza line. | 175 | // Store the old interface and bump past the stanza line. |
@@ -274,16 +274,16 @@ QString Interfaces::getInterfaceMethod(bool &error){ | |||
274 | * @param newName the new name of the interface. All whitespace is removed. | 274 | * @param newName the new name of the interface. All whitespace is removed. |
275 | * @return bool true if successful. | 275 | * @return bool true if successful. |
276 | */ | 276 | */ |
277 | bool Interfaces::setInterfaceName(const QString &newName){ | 277 | bool Interfaces::setInterfaceName(const QString &newName){ |
278 | qDebug("setInterfaceName %s", newName.latin1()); | 278 | odebug << "setInterfaceName " << newName.latin1() << "" << oendl; |
279 | if(currentIface == interfaces.end()) | 279 | if(currentIface == interfaces.end()) |
280 | return false; | 280 | return false; |
281 | QString name = newName.simplifyWhiteSpace(); | 281 | QString name = newName.simplifyWhiteSpace(); |
282 | name = name.replace(QRegExp(" "), ""); | 282 | name = name.replace(QRegExp(" "), ""); |
283 | bool returnValue = false; | 283 | bool returnValue = false; |
284 | QString tmp = QString("iface %1 %2 %3").arg(name).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue)); | 284 | QString tmp = QString("iface %1 %2 %3").arg(name).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue)); |
285 | qDebug("setting %s",tmp.latin1()); | 285 | odebug << "setting " << tmp.latin1() << "" << oendl; |
286 | 286 | ||
287 | (*currentIface) = tmp; | 287 | (*currentIface) = tmp; |
288 | return !returnValue; | 288 | return !returnValue; |
289 | } | 289 | } |
@@ -344,9 +344,9 @@ QString Interfaces::getInterfaceOption(const QString &option, bool &error){ | |||
344 | bool Interfaces::setInterfaceOption(const QString &option, const QString &value){ | 344 | bool Interfaces::setInterfaceOption(const QString &option, const QString &value){ |
345 | if( value.stripWhiteSpace().isEmpty() ) | 345 | if( value.stripWhiteSpace().isEmpty() ) |
346 | return removeInterfaceOption( option ); | 346 | return removeInterfaceOption( option ); |
347 | 347 | ||
348 | qDebug("iface >%s< option >%s< value >%s<", (*currentIface).latin1(), option.latin1(),value.latin1()); | 348 | odebug << "iface >" << (*currentIface).latin1() << "< option >" << option.latin1() << "< value >" << value.latin1() << "<" << oendl; |
349 | return setOption(currentIface, option, value); | 349 | return setOption(currentIface, option, value); |
350 | } | 350 | } |
351 | 351 | ||
352 | /** | 352 | /** |
@@ -485,9 +485,9 @@ bool Interfaces::setStanza(const QString &stanza, const QString &option, QString | |||
485 | valid = false; | 485 | valid = false; |
486 | } | 486 | } |
487 | if(valid){ | 487 | if(valid){ |
488 | if(found == true){ | 488 | if(found == true){ |
489 | qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1()); | 489 | odebug << QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1() << oendl; |
490 | } | 490 | } |
491 | found = true; | 491 | found = true; |
492 | iterator = it; | 492 | iterator = it; |
493 | } | 493 | } |
@@ -504,49 +504,49 @@ bool Interfaces::setStanza(const QString &stanza, const QString &option, QString | |||
504 | */ | 504 | */ |
505 | bool Interfaces::setOption(const QStringList::Iterator &start, const QString &option, const QString &value){ | 505 | bool Interfaces::setOption(const QStringList::Iterator &start, const QString &option, const QString &value){ |
506 | if(start == interfaces.end()) | 506 | if(start == interfaces.end()) |
507 | return false; | 507 | return false; |
508 | qDebug("setting option"); | 508 | odebug << "setting option" << oendl; |
509 | bool found = false; | 509 | bool found = false; |
510 | bool replaced = false; | 510 | bool replaced = false; |
511 | QStringList::Iterator insertAt = NULL; | 511 | QStringList::Iterator insertAt = NULL; |
512 | for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) { | 512 | for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) { |
513 | qDebug(" Interfaces::setOption got line >%s<",(*it).latin1()); | 513 | odebug << " Interfaces::setOption got line >" << (*it).latin1() << "<" << oendl; |
514 | // FIXME: was not completly stupid just wrong sice all options got inserted bevore the iface line | 514 | // FIXME: was not completly stupid just wrong sice all options got inserted bevore the iface line |
515 | // but since it works with an empty interfaces file I (tille) will not do anything more | 515 | // but since it works with an empty interfaces file I (tille) will not do anything more |
516 | if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)) ){ | 516 | if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)) ){ |
517 | if (found) break; | 517 | if (found) break; |
518 | // && it != start){ | 518 | // && it != start){ |
519 | // if(!found && value != ""){ | 519 | // if(!found && value != ""){ |
520 | // // Got to the end of the stanza without finding it, so append it. | 520 | // // Got to the end of the stanza without finding it, so append it. |
521 | // qDebug(" Got to the end of the stanza without finding it, so append it."); | 521 | // odebug << " Got to the end of the stanza without finding it, so append it." << oendl; |
522 | // interfaces.insert(--it, QString("\t%1 %2").arg(option).arg(value)); | 522 | // interfaces.insert(--it, QString("\t%1 %2").arg(option).arg(value)); |
523 | // } | 523 | // } |
524 | qDebug("found 1"); | 524 | odebug << "found 1" << oendl; |
525 | // interfaces.insert(++it, QString("\t%1 %2").arg(option).arg(value)); | 525 | // interfaces.insert(++it, QString("\t%1 %2").arg(option).arg(value)); |
526 | found = true; | 526 | found = true; |
527 | insertAt = it; | 527 | insertAt = it; |
528 | 528 | ||
529 | } | 529 | } |
530 | if((*it).contains(option) && it != start && (*it).at(0) != '#'){ | 530 | if((*it).contains(option) && it != start && (*it).at(0) != '#'){ |
531 | // Found it in stanza so replace it. | 531 | // Found it in stanza so replace it. |
532 | qDebug("found 2"); | 532 | odebug << "found 2" << oendl; |
533 | if(found) | 533 | if(found) |
534 | qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1()); | 534 | odebug << QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1() << oendl; |
535 | found = true; | 535 | found = true; |
536 | replaced = true; | 536 | replaced = true; |
537 | (*it) = QString("\t%1 %2").arg(option).arg(value); | 537 | (*it) = QString("\t%1 %2").arg(option).arg(value); |
538 | } | 538 | } |
539 | } | 539 | } |
540 | if(!found){ | 540 | if(!found){ |
541 | qDebug("! found insert anyway"); | 541 | odebug << "! found insert anyway" << oendl; |
542 | QStringList::Iterator p = start; | 542 | QStringList::Iterator p = start; |
543 | interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value)); | 543 | interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value)); |
544 | found = true; | 544 | found = true; |
545 | } | 545 | } |
546 | 546 | ||
547 | if(found && !replaced){ | 547 | if(found && !replaced){ |
548 | qDebug("found iface but not the option so insert it here..."); | 548 | odebug << "found iface but not the option so insert it here..." << oendl; |
549 | interfaces.insert(++insertAt, QString("\t%1 %2").arg(option).arg(value)); | 549 | interfaces.insert(++insertAt, QString("\t%1 %2").arg(option).arg(value)); |
550 | } | 550 | } |
551 | return found; | 551 | return found; |
552 | } | 552 | } |
@@ -581,9 +581,9 @@ bool Interfaces::removeOption(const QStringList::Iterator &start, const QString | |||
581 | } | 581 | } |
582 | if((*it).contains(option) && it != start && (*it).at(0) != '#'){ | 582 | if((*it).contains(option) && it != start && (*it).at(0) != '#'){ |
583 | // Found it in stanza so replace it. | 583 | // Found it in stanza so replace it. |
584 | if(found) | 584 | if(found) |
585 | qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1()); | 585 | odebug << QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1() << oendl; |
586 | found = true; | 586 | found = true; |
587 | it = interfaces.remove( it ); // we really want to remove the line | 587 | it = interfaces.remove( it ); // we really want to remove the line |
588 | --it; // we do ++it later in the head of the for loop | 588 | --it; // we do ++it later in the head of the for loop |
589 | } | 589 | } |
@@ -609,9 +609,9 @@ bool Interfaces::removeOption(const QStringList::Iterator &start, const QString | |||
609 | } | 609 | } |
610 | if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){ | 610 | if((*it).contains(option) && (*it).contains(value) && it != start && (*it).at(0) != '#'){ |
611 | // Found it in stanza so replace it. | 611 | // Found it in stanza so replace it. |
612 | if(found) | 612 | if(found) |
613 | qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1()); | 613 | odebug << QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1() << oendl; |
614 | found = true; | 614 | found = true; |
615 | it = interfaces.remove( it ); // we really want to remove the line | 615 | it = interfaces.remove( it ); // we really want to remove the line |
616 | --it; // we do ++it later in the head of the for loop | 616 | --it; // we do ++it later in the head of the for loop |
617 | } | 617 | } |
@@ -662,9 +662,9 @@ QString Interfaces::getOption(const QStringList::Iterator &start, const QString | |||
662 | break; | 662 | break; |
663 | } | 663 | } |
664 | if((*it).contains(option) && (*it).at(0) != '#'){ | 664 | if((*it).contains(option) && (*it).at(0) != '#'){ |
665 | if(found) | 665 | if(found) |
666 | qDebug(QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); | 666 | odebug << QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1() << oendl; |
667 | found = true; | 667 | found = true; |
668 | QString line = (*it).simplifyWhiteSpace(); | 668 | QString line = (*it).simplifyWhiteSpace(); |
669 | int space = line.find(" ", option.length()); | 669 | int space = line.find(" ", option.length()); |
670 | if(space != -1){ | 670 | if(space != -1){ |
@@ -686,9 +686,9 @@ bool Interfaces::write(){ | |||
686 | QFile::remove(interfacesFile); | 686 | QFile::remove(interfacesFile); |
687 | QFile file(interfacesFile); | 687 | QFile file(interfacesFile); |
688 | 688 | ||
689 | if (!file.open(IO_ReadWrite)){ | 689 | if (!file.open(IO_ReadWrite)){ |
690 | qDebug(QString("Interfaces: Can't open file: %1 for writing.").arg(interfacesFile).latin1()); | 690 | odebug << QString("Interfaces: Can't open file: %1 for writing.").arg(interfacesFile).latin1() << oendl; |
691 | return false; | 691 | return false; |
692 | } | 692 | } |
693 | QTextStream stream( &file ); | 693 | QTextStream stream( &file ); |
694 | int whiteSpaceCount = 0; | 694 | int whiteSpaceCount = 0; |
@@ -699,9 +699,9 @@ bool Interfaces::write(){ | |||
699 | whiteSpaceCount++; | 699 | whiteSpaceCount++; |
700 | else | 700 | else |
701 | whiteSpaceCount = 0; | 701 | whiteSpaceCount = 0; |
702 | if(whiteSpaceCount < 2){ | 702 | if(whiteSpaceCount < 2){ |
703 | qDebug((*it).latin1()); | 703 | odebug << (*it).latin1() << oendl; |
704 | stream << (*it) << '\n'; | 704 | stream << (*it) << '\n'; |
705 | } | 705 | } |
706 | } | 706 | } |
707 | file.close(); | 707 | file.close(); |
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index 7c2f85c..ec3bad3 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -45,9 +45,9 @@ InterfaceSetupImp::~InterfaceSetupImp(){ | |||
45 | */ | 45 | */ |
46 | bool InterfaceSetupImp::saveChanges(){ | 46 | bool InterfaceSetupImp::saveChanges(){ |
47 | bool error; | 47 | bool error; |
48 | QString iface = interfaces->getInterfaceName(error); | 48 | QString iface = interfaces->getInterfaceName(error); |
49 | qDebug("InterfaceSetupImp::saveChanges saves interface %s", iface.latin1() ); | 49 | odebug << "InterfaceSetupImp::saveChanges saves interface " << iface.latin1() << "" << oendl; |
50 | if(!saveSettings()) | 50 | if(!saveSettings()) |
51 | return false; | 51 | return false; |
52 | 52 | ||
53 | interfaces->write(); | 53 | interfaces->write(); |
@@ -71,9 +71,9 @@ bool InterfaceSetupImp::saveChanges(){ | |||
71 | owait->show(); | 71 | owait->show(); |
72 | qApp->processEvents(); | 72 | qApp->processEvents(); |
73 | 73 | ||
74 | if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) { | 74 | if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) { |
75 | qWarning("unstable to spawn ifdown/ifup"); | 75 | owarn << "unstable to spawn ifdown/ifup" << oendl; |
76 | } | 76 | } |
77 | 77 | ||
78 | owait->hide(); | 78 | owait->hide(); |
79 | delete owait; | 79 | delete owait; |
@@ -156,9 +156,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
156 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); | 156 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); |
157 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 157 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
158 | interfaces->addMapping(interface->getInterfaceName()); | 158 | interfaces->addMapping(interface->getInterfaceName()); |
159 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 159 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
160 | qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface."); | 160 | odebug << "InterfaceSetupImp: Added Mapping, but still can't setInterface." << oendl; |
161 | return; | 161 | return; |
162 | } | 162 | } |
163 | } | 163 | } |
164 | interfaces->setMap("map", newInterfaceName); | 164 | interfaces->setMap("map", newInterfaceName); |
@@ -166,9 +166,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
166 | } | 166 | } |
167 | else{ | 167 | else{ |
168 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); | 168 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); |
169 | if(!interfaces->setInterface(newInterfaceName)){ | 169 | if(!interfaces->setInterface(newInterfaceName)){ |
170 | qDebug("InterfaceSetupImp: Added interface, but still can't setInterface."); | 170 | odebug << "InterfaceSetupImp: Added interface, but still can't setInterface." << oendl; |
171 | return; | 171 | return; |
172 | } | 172 | } |
173 | } | 173 | } |
174 | } | 174 | } |
@@ -184,9 +184,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
184 | 184 | ||
185 | // IP Information | 185 | // IP Information |
186 | autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); | 186 | autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); |
187 | QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); | 187 | QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); |
188 | qDebug("dns >%s<",dns.latin1()); | 188 | odebug << "dns >" << dns.latin1() << "<" << oendl; |
189 | if(dns.contains(" ")){ | 189 | if(dns.contains(" ")){ |
190 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); | 190 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); |
191 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); | 191 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); |
192 | }else firstDNSLineEdit->setText(dns); | 192 | }else firstDNSLineEdit->setText(dns); |
@@ -198,10 +198,10 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
198 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); | 198 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); |
199 | 199 | ||
200 | 200 | ||
201 | 201 | ||
202 | qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1()); | 202 | owarn << "InterfaceSetupImp::setProfile(" << profile.latin1() << ")\n" << oendl; |
203 | qWarning("InterfaceSetupImp::setProfile: iface is %s\n", interfaces->getInterfaceName(error).latin1()); | 203 | owarn << "InterfaceSetupImp::setProfile: iface is " << interfaces->getInterfaceName(error).latin1() << "\n" << oendl; |
204 | 204 | ||
205 | } | 205 | } |
206 | 206 | ||
207 | // interfacesetup.cpp | 207 | // interfacesetup.cpp |
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 1e16b97..3e1a650 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -78,9 +78,9 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi | |||
78 | * we need to ignore it as well | 78 | * we need to ignore it as well |
79 | */ | 79 | */ |
80 | if (m_handledIfaces.contains( *ni) ) | 80 | if (m_handledIfaces.contains( *ni) ) |
81 | { | 81 | { |
82 | qDebug("Not up iface handled by module"); | 82 | odebug << "Not up iface handled by module" << oendl; |
83 | continue; | 83 | continue; |
84 | } | 84 | } |
85 | bool found = false; | 85 | bool found = false; |
86 | for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ) | 86 | for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ) |
@@ -218,9 +218,9 @@ void MainWindowImp::getAllInterfaces() | |||
218 | { | 218 | { |
219 | int flags = 0; | 219 | int flags = 0; |
220 | if ( m_handledIfaces.contains( (*it) ) ) | 220 | if ( m_handledIfaces.contains( (*it) ) ) |
221 | { | 221 | { |
222 | qDebug(" %s is handled by a module", (*it).latin1() ); | 222 | odebug << " " << (*it).latin1() << " is handled by a module" << oendl; |
223 | continue; | 223 | continue; |
224 | } | 224 | } |
225 | // int family; | 225 | // int family; |
226 | i = NULL; | 226 | i = NULL; |
@@ -248,9 +248,9 @@ void MainWindowImp::getAllInterfaces() | |||
248 | i->setHardwareName("Loopback"); | 248 | i->setHardwareName("Loopback"); |
249 | else | 249 | else |
250 | i->setHardwareName("Unknown"); | 250 | i->setHardwareName("Unknown"); |
251 | 251 | ||
252 | qWarning("Adding interface %s to interfaceNames\n", ifr.ifr_name); | 252 | owarn << "Adding interface " << ifr.ifr_name << " to interfaceNames\n" << oendl; |
253 | interfaceNames.insert(i->getInterfaceName(), i); | 253 | interfaceNames.insert(i->getInterfaceName(), i); |
254 | updateInterface(i); | 254 | updateInterface(i); |
255 | connect(i, SIGNAL(updateInterface(Interface*)), | 255 | connect(i, SIGNAL(updateInterface(Interface*)), |
256 | this, SLOT(updateInterface(Interface*))); | 256 | this, SLOT(updateInterface(Interface*))); |
@@ -264,9 +264,9 @@ void MainWindowImp::getAllInterfaces() | |||
264 | { | 264 | { |
265 | ilist = it.key()->getInterfaces(); | 265 | ilist = it.key()->getInterfaces(); |
266 | for( i = ilist.first(); i != 0; i = ilist.next() ) | 266 | for( i = ilist.first(); i != 0; i = ilist.next() ) |
267 | { | 267 | { |
268 | qWarning("Adding interface %s to interfaceNames\n", i->getInterfaceName().latin1() ); | 268 | owarn << "Adding interface " << i->getInterfaceName().latin1() << " to interfaceNames\n" << oendl; |
269 | interfaceNames.insert(i->getInterfaceName(), i); | 269 | interfaceNames.insert(i->getInterfaceName(), i); |
270 | updateInterface(i); | 270 | updateInterface(i); |
271 | connect(i, SIGNAL(updateInterface(Interface*)), | 271 | connect(i, SIGNAL(updateInterface(Interface*)), |
272 | this, SLOT(updateInterface(Interface*))); | 272 | this, SLOT(updateInterface(Interface*))); |
@@ -282,9 +282,9 @@ void MainWindowImp::getAllInterfaces() | |||
282 | */ | 282 | */ |
283 | void MainWindowImp::loadModules(const QString &path) | 283 | void MainWindowImp::loadModules(const QString &path) |
284 | { | 284 | { |
285 | #ifdef DEBUG | 285 | #ifdef DEBUG |
286 | qDebug("MainWindowImp::loadModules: %s", path.latin1()); | 286 | odebug << "MainWindowImp::loadModules: " << path.latin1() << "" << oendl; |
287 | #endif | 287 | #endif |
288 | QDir d(path); | 288 | QDir d(path); |
289 | if(!d.exists()) | 289 | if(!d.exists()) |
290 | return; | 290 | return; |
@@ -303,9 +303,9 @@ void MainWindowImp::loadModules(const QString &path) | |||
303 | if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")) | 303 | if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")) |
304 | { | 304 | { |
305 | #endif | 305 | #endif |
306 | loadPlugin(path + "/" + fi->fileName()); | 306 | loadPlugin(path + "/" + fi->fileName()); |
307 | qDebug("loaded plugin: >%s< ",QString(path + "/" + fi->fileName()).latin1()); | 307 | odebug << "loaded plugin: >" << QString(path + "/" + fi->fileName()).latin1() << "< " << oendl; |
308 | } | 308 | } |
309 | ++it; | 309 | ++it; |
310 | } | 310 | } |
311 | } | 311 | } |
@@ -318,17 +318,17 @@ void MainWindowImp::loadModules(const QString &path) | |||
318 | */ | 318 | */ |
319 | Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString) | 319 | Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString) |
320 | { | 320 | { |
321 | #ifdef DEBUG | 321 | #ifdef DEBUG |
322 | qDebug("MainWindowImp::loadPlugin: %s: resolving %s", pluginFileName.latin1(), resolveString.latin1()); | 322 | odebug << "MainWindowImp::loadPlugin: " << pluginFileName.latin1() << ": resolving " << resolveString.latin1() << "" << oendl; |
323 | #endif | 323 | #endif |
324 | #ifdef QWS | 324 | #ifdef QWS |
325 | QLibrary *lib = new QLibrary(pluginFileName); | 325 | QLibrary *lib = new QLibrary(pluginFileName); |
326 | void *functionPointer = lib->resolve(resolveString); | 326 | void *functionPointer = lib->resolve(resolveString); |
327 | if( !functionPointer ) | 327 | if( !functionPointer ) |
328 | { | 328 | { |
329 | #ifdef DEBUG | 329 | #ifdef DEBUG |
330 | qDebug("MainWindowImp::loadPlugin: Warning: %s is not a plugin", pluginFileName.latin1()); | 330 | odebug << "MainWindowImp::loadPlugin: Warning: " << pluginFileName.latin1() << " is not a plugin" << oendl; |
331 | #endif | 331 | #endif |
332 | delete lib; | 332 | delete lib; |
333 | return NULL; | 333 | return NULL; |
334 | } | 334 | } |
@@ -336,9 +336,9 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & | |||
336 | Module *object = ((Module* (*)()) functionPointer)(); | 336 | Module *object = ((Module* (*)()) functionPointer)(); |
337 | if(object == NULL) | 337 | if(object == NULL) |
338 | { | 338 | { |
339 | #ifdef DEBUG | 339 | #ifdef DEBUG |
340 | qDebug("MainWindowImp: Couldn't create object, but did load library!"); | 340 | odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl; |
341 | #endif | 341 | #endif |
342 | delete lib; | 342 | delete lib; |
343 | return NULL; | 343 | return NULL; |
344 | } | 344 | } |
@@ -351,22 +351,22 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & | |||
351 | #else | 351 | #else |
352 | QLibrary *lib = loader->library(pluginFileName); | 352 | QLibrary *lib = loader->library(pluginFileName); |
353 | if( !lib || !lib->hasSymbol(resolveString) ) | 353 | if( !lib || !lib->hasSymbol(resolveString) ) |
354 | { | 354 | { |
355 | qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); | 355 | odebug << QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1() << oendl; |
356 | return NULL; | 356 | return NULL; |
357 | } | 357 | } |
358 | // Try to get an object. | 358 | // Try to get an object. |
359 | Module *object = ((Module* (*)()) lib->symbol(resolveString))(); | 359 | Module *object = ((Module* (*)()) lib->symbol(resolveString))(); |
360 | if(object == NULL) | 360 | if(object == NULL) |
361 | { | 361 | { |
362 | #ifdef DEBUG | 362 | #ifdef DEBUG |
363 | qDebug("MainWindowImp: Couldn't create object, but did load library!"); | 363 | odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl; |
364 | #endif | 364 | #endif |
365 | return NULL; | 365 | return NULL; |
366 | } | 366 | } |
367 | #ifdef DEBUG | 367 | #ifdef DEBUG |
368 | qDebug("MainWindowImp::loadPlugin:: Found object, storing."); | 368 | odebug << "MainWindowImp::loadPlugin:: Found object, storing." << oendl; |
369 | #endif | 369 | #endif |
370 | // Store for deletion later | 370 | // Store for deletion later |
371 | libraries.insert(object, lib); | 371 | libraries.insert(object, lib); |
372 | return object; | 372 | return object; |
@@ -410,9 +410,9 @@ void MainWindowImp::addClicked() | |||
410 | { | 410 | { |
411 | Interface *i = (it.key())->addNewInterface(item->text(0)); | 411 | Interface *i = (it.key())->addNewInterface(item->text(0)); |
412 | if(i) | 412 | if(i) |
413 | { | 413 | { |
414 | qDebug("iface name %s",i->getInterfaceName().latin1()); | 414 | odebug << "iface name " << i->getInterfaceName().latin1() << "" << oendl; |
415 | interfaceNames.insert(i->getInterfaceName(), i); | 415 | interfaceNames.insert(i->getInterfaceName(), i); |
416 | updateInterface(i); | 416 | updateInterface(i); |
417 | } | 417 | } |
418 | } | 418 | } |
@@ -512,9 +512,9 @@ void MainWindowImp::informationClicked() | |||
512 | if(moduleInformation != NULL) | 512 | if(moduleInformation != NULL) |
513 | { | 513 | { |
514 | QPEApplication::showWidget( moduleInformation ); | 514 | QPEApplication::showWidget( moduleInformation ); |
515 | #ifdef DEBUG | 515 | #ifdef DEBUG |
516 | qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed."); | 516 | odebug << "MainWindowImp::informationClicked:: Module owner has created, we showed." << oendl; |
517 | #endif | 517 | #endif |
518 | return; | 518 | return; |
519 | } | 519 | } |
520 | } | 520 | } |
@@ -649,9 +649,9 @@ void MainWindowImp::removeProfile() | |||
649 | QMap<Interface*, QListViewItem*>::Iterator it; | 649 | QMap<Interface*, QListViewItem*>::Iterator it; |
650 | for( it = items.begin(); it != items.end(); ++it ) | 650 | for( it = items.begin(); it != items.end(); ++it ) |
651 | { | 651 | { |
652 | QString interfaceName = it.key()->getInterfaceName(); | 652 | QString interfaceName = it.key()->getInterfaceName(); |
653 | qDebug(interfaceName.latin1()); | 653 | odebug << interfaceName.latin1() << oendl; |
654 | if(interfaces.setInterface(interfaceName + "_" + profileToRemove)) | 654 | if(interfaces.setInterface(interfaceName + "_" + profileToRemove)) |
655 | { | 655 | { |
656 | interfaces.removeInterface(); | 656 | interfaces.removeInterface(); |
657 | if(interfaces.setMapping(interfaceName)) | 657 | if(interfaces.setMapping(interfaceName)) |
@@ -718,9 +718,9 @@ void MainWindowImp::makeChannel() | |||
718 | 718 | ||
719 | void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) | 719 | void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) |
720 | { | 720 | { |
721 | bool found = false; | 721 | bool found = false; |
722 | qDebug("MainWindowImp::receive QCop msg >"+msg+"<"); | 722 | odebug << "MainWindowImp::receive QCop msg >"+msg+"<" << oendl; |
723 | if (msg == "raise") | 723 | if (msg == "raise") |
724 | { | 724 | { |
725 | raise(); | 725 | raise(); |
726 | return; | 726 | return; |
@@ -728,14 +728,14 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) | |||
728 | 728 | ||
729 | QString dest = msg.left(msg.find("(")); | 729 | QString dest = msg.left(msg.find("(")); |
730 | QCString param = msg.right(msg.length() - msg.find("(") - 1); | 730 | QCString param = msg.right(msg.length() - msg.find("(") - 1); |
731 | param = param.left( param.length() - 1 ); | 731 | param = param.left( param.length() - 1 ); |
732 | qDebug("dest >%s< param >"+param+"<",dest.latin1()); | 732 | odebug << "dest >" << dest.latin1() << "< param >"+param+"<" << oendl; |
733 | 733 | ||
734 | QMap<Module*, QLibrary*>::Iterator it; | 734 | QMap<Module*, QLibrary*>::Iterator it; |
735 | for( it = libraries.begin(); it != libraries.end(); ++it ) | 735 | for( it = libraries.begin(); it != libraries.end(); ++it ) |
736 | { | 736 | { |
737 | qDebug("plugin >%s<", it.key()->type().latin1() ); | 737 | odebug << "plugin >" << it.key()->type().latin1() << "<" << oendl; |
738 | if(it.key()->type() == dest) | 738 | if(it.key()->type() == dest) |
739 | { | 739 | { |
740 | it.key()->receive( param, arg ); | 740 | it.key()->receive( param, arg ); |
741 | found = true; | 741 | found = true; |
@@ -743,6 +743,6 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) | |||
743 | } | 743 | } |
744 | 744 | ||
745 | 745 | ||
746 | if (found) QPEApplication::setKeepRunning(); | 746 | if (found) QPEApplication::setKeepRunning(); |
747 | else qDebug("Huh what do ya want"); | 747 | else odebug << "Huh what do ya want" << oendl; |
748 | } | 748 | } |
diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp index b8a1925a..aedc0b9 100644 --- a/noncore/settings/networksettings/ppp/accounts.cpp +++ b/noncore/settings/networksettings/ppp/accounts.cpp | |||
@@ -117,9 +117,9 @@ void AccountWidget::create() | |||
117 | 117 | ||
118 | int result; | 118 | int result; |
119 | if (_pppdata->newaccount() == -1) | 119 | if (_pppdata->newaccount() == -1) |
120 | { | 120 | { |
121 | qDebug("_pppdata->newaccount() == -1"); | 121 | odebug << "_pppdata->newaccount() == -1" << oendl; |
122 | return; | 122 | return; |
123 | } | 123 | } |
124 | result = doTab(); | 124 | result = doTab(); |
125 | 125 | ||
diff --git a/noncore/settings/networksettings/ppp/authwidget.cpp b/noncore/settings/networksettings/ppp/authwidget.cpp index fa2b164..f3d842f 100644 --- a/noncore/settings/networksettings/ppp/authwidget.cpp +++ b/noncore/settings/networksettings/ppp/authwidget.cpp | |||
@@ -141,18 +141,18 @@ void AuthWidget::save() | |||
141 | } | 141 | } |
142 | 142 | ||
143 | void AuthWidget::authChanged( const QString &authStr ) | 143 | void AuthWidget::authChanged( const QString &authStr ) |
144 | { | 144 | { |
145 | qDebug("AuthWidget::authChanged( %s )", authStr.latin1() ); | 145 | odebug << "AuthWidget::authChanged( " << authStr.latin1() << " )" << oendl; |
146 | if ( authStr.contains( tr("Script-based") ) ){ | 146 | if ( authStr.contains( tr("Script-based") ) ){ |
147 | showUsernamePassword( false ); | 147 | showUsernamePassword( false ); |
148 | showScriptWindow( true ); | 148 | showScriptWindow( true ); |
149 | } else if ( authStr.contains( tr("PAP") ) || | 149 | } else if ( authStr.contains( tr("PAP") ) || |
150 | authStr.contains( tr("CHAP") ) ){ | 150 | authStr.contains( tr("CHAP") ) ){ |
151 | showUsernamePassword( true ); | 151 | showUsernamePassword( true ); |
152 | showScriptWindow( false ); | 152 | showScriptWindow( false ); |
153 | } else { | 153 | } else { |
154 | qDebug("do not really know how to handle"); | 154 | odebug << "do not really know how to handle" << oendl; |
155 | showUsernamePassword( false ); | 155 | showUsernamePassword( false ); |
156 | showScriptWindow( false ); | 156 | showScriptWindow( false ); |
157 | } | 157 | } |
158 | } | 158 | } |
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp index e3fab24..b75410c 100644 --- a/noncore/settings/networksettings/ppp/connect.cpp +++ b/noncore/settings/networksettings/ppp/connect.cpp | |||
@@ -471,9 +471,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
471 | if((unsigned) scriptindex < comlist->count()) { | 471 | if((unsigned) scriptindex < comlist->count()) { |
472 | scriptCommand = *(comlist->at(scriptindex)); | 472 | scriptCommand = *(comlist->at(scriptindex)); |
473 | scriptArgument = *(arglist->at(scriptindex)); | 473 | scriptArgument = *(arglist->at(scriptindex)); |
474 | } else { | 474 | } else { |
475 | qDebug( "End of script" ); | 475 | odebug << "End of script" << oendl; |
476 | vmain = 10; | 476 | vmain = 10; |
477 | return; | 477 | return; |
478 | } | 478 | } |
479 | 479 | ||
@@ -837,9 +837,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
837 | 837 | ||
838 | killTimer( main_timer_ID ); | 838 | killTimer( main_timer_ID ); |
839 | 839 | ||
840 | if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000); | 840 | if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000); |
841 | qDebug( "started if timeout timer with %i", _ifaceppp->data()->pppdTimeout()*1000); | 841 | odebug << "started if timeout timer with " << _ifaceppp->data()->pppdTimeout()*1000 << "" << oendl; |
842 | 842 | ||
843 | // find out PPP interface and notify the stats module | 843 | // find out PPP interface and notify the stats module |
844 | // stats->setUnit(pppInterfaceNumber()); | 844 | // stats->setUnit(pppInterfaceNumber()); |
845 | 845 | ||
@@ -847,9 +847,9 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
847 | semaphore = true; | 847 | semaphore = true; |
848 | result = execppp(); | 848 | result = execppp(); |
849 | 849 | ||
850 | emit debugMessage(QObject::tr("Starting pppd...")); | 850 | emit debugMessage(QObject::tr("Starting pppd...")); |
851 | qDebug("execppp() returned with return-code %i", result ); | 851 | odebug << "execppp() returned with return-code " << result << "" << oendl; |
852 | 852 | ||
853 | if(result) { | 853 | if(result) { |
854 | if(!_ifaceppp->data()->autoDNS()) | 854 | if(!_ifaceppp->data()->autoDNS()) |
855 | adddns( _ifaceppp ); | 855 | adddns( _ifaceppp ); |
@@ -1063,9 +1063,9 @@ void ConnectWidget::setExpect(const QString &n) { | |||
1063 | 1063 | ||
1064 | void ConnectWidget::if_waiting_timed_out() { | 1064 | void ConnectWidget::if_waiting_timed_out() { |
1065 | if_timer->stop(); | 1065 | if_timer->stop(); |
1066 | if_timeout_timer->stop(); | 1066 | if_timeout_timer->stop(); |
1067 | qDebug("if_waiting_timed_out()"); | 1067 | odebug << "if_waiting_timed_out()" << oendl; |
1068 | 1068 | ||
1069 | _ifaceppp->data()->setpppdError(E_IF_TIMEOUT); | 1069 | _ifaceppp->data()->setpppdError(E_IF_TIMEOUT); |
1070 | 1070 | ||
1071 | // let's kill the stuck pppd | 1071 | // let's kill the stuck pppd |
@@ -1270,9 +1270,9 @@ bool ConnectWidget::execppp() { | |||
1270 | 1270 | ||
1271 | return false; // nonsensically long command which would bust my buffer buf. | 1271 | return false; // nonsensically long command which would bust my buffer buf. |
1272 | } | 1272 | } |
1273 | 1273 | ||
1274 | qWarning("Command IS: %s",command.latin1() ); | 1274 | owarn << "Command IS: " << command.latin1() << "" << oendl; |
1275 | 1275 | ||
1276 | qApp->flushX(); | 1276 | qApp->flushX(); |
1277 | 1277 | ||
1278 | return _ifaceppp->modem()->execPPPDaemon(command); | 1278 | return _ifaceppp->modem()->execPPPDaemon(command); |
diff --git a/noncore/settings/networksettings/ppp/devices.cpp b/noncore/settings/networksettings/ppp/devices.cpp index 9da090d..350ff32 100644 --- a/noncore/settings/networksettings/ppp/devices.cpp +++ b/noncore/settings/networksettings/ppp/devices.cpp | |||
@@ -71,13 +71,13 @@ DevicesWidget::DevicesWidget( InterfacePPP* ip, QWidget *parent, const char *nam | |||
71 | copy_b->setEnabled( false ); //FIXME | 71 | copy_b->setEnabled( false ); //FIXME |
72 | // delete_b->setEnabled( false ); //FIXME | 72 | // delete_b->setEnabled( false ); //FIXME |
73 | 73 | ||
74 | QStringList tmp = _pppdata->getDevicesNamesList(); | 74 | QStringList tmp = _pppdata->getDevicesNamesList(); |
75 | qDebug("DevicesWidget::DevicesWidget got devices %s",tmp.join("--").latin1()); | 75 | odebug << "DevicesWidget::DevicesWidget got devices " << tmp.join("--").latin1() << "" << oendl; |
76 | listListbox->insertStringList(tmp); | 76 | listListbox->insertStringList(tmp); |
77 | 77 | ||
78 | for (uint i = 0; i < listListbox->count(); i++){ | 78 | for (uint i = 0; i < listListbox->count(); i++){ |
79 | qDebug("listListbox->text(i) %s == _pppdata->devname() %s",listListbox->text(i).latin1(), _pppdata->devname().latin1()); | 79 | odebug << "listListbox->text(i) " << listListbox->text(i).latin1() << " == _pppdata->devname() " << _pppdata->devname().latin1() << "" << oendl; |
80 | if ( listListbox->text(i) == _pppdata->devname() ) | 80 | if ( listListbox->text(i) == _pppdata->devname() ) |
81 | listListbox->setCurrentItem( i ); | 81 | listListbox->setCurrentItem( i ); |
82 | } | 82 | } |
83 | } | 83 | } |
diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp index 81dab38..69bb682 100644 --- a/noncore/settings/networksettings/ppp/general.cpp +++ b/noncore/settings/networksettings/ppp/general.cpp | |||
@@ -334,9 +334,9 @@ bool ModemWidget::save() | |||
334 | if(modemname->text().isEmpty() || | 334 | if(modemname->text().isEmpty() || |
335 | !_pppdata->isUniqueDevname(modemname->text())) | 335 | !_pppdata->isUniqueDevname(modemname->text())) |
336 | return false; | 336 | return false; |
337 | 337 | ||
338 | qDebug("ModemWidget::save saving modem1 data"); | 338 | odebug << "ModemWidget::save saving modem1 data" << oendl; |
339 | _pppdata->setDevname( modemname->text() ); | 339 | _pppdata->setDevname( modemname->text() ); |
340 | _pppdata->setModemDevice( modemdevice->currentText() ); | 340 | _pppdata->setModemDevice( modemdevice->currentText() ); |
341 | _pppdata->setFlowcontrol(flowcontrol->currentText()); | 341 | _pppdata->setFlowcontrol(flowcontrol->currentText()); |
342 | _pppdata->setFlowcontrol(flowcontrol->currentText()); | 342 | _pppdata->setFlowcontrol(flowcontrol->currentText()); |
diff --git a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp index 6b158b9..5a76293 100644 --- a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp +++ b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp | |||
@@ -19,9 +19,9 @@ | |||
19 | */ | 19 | */ |
20 | InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f) | 20 | InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f) |
21 | :InterfaceInformationImp(parent, name, i, Qt::WStyle_ContextHelp) | 21 | :InterfaceInformationImp(parent, name, i, Qt::WStyle_ContextHelp) |
22 | { | 22 | { |
23 | qDebug("InterfaceInformationPPP::InterfaceInformationPPP %s", name); | 23 | odebug << "InterfaceInformationPPP::InterfaceInformationPPP " << name << "" << oendl; |
24 | con = new ConnectWidget( (InterfacePPP*)i, this, "con" ); | 24 | con = new ConnectWidget( (InterfacePPP*)i, this, "con" ); |
25 | con->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, | 25 | con->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, |
26 | QSizePolicy::Fixed) ); | 26 | QSizePolicy::Fixed) ); |
27 | 27 | ||
diff --git a/noncore/settings/networksettings/ppp/interfaceppp.cpp b/noncore/settings/networksettings/ppp/interfaceppp.cpp index f443f3c..5cc6f70 100644 --- a/noncore/settings/networksettings/ppp/interfaceppp.cpp +++ b/noncore/settings/networksettings/ppp/interfaceppp.cpp | |||
@@ -13,15 +13,15 @@ InterfacePPP::InterfacePPP(QObject *parent, const char *name, bool status) | |||
13 | : Interface(parent, name, status), | 13 | : Interface(parent, name, status), |
14 | _modemPtr(0), | 14 | _modemPtr(0), |
15 | _dataPtr(0) | 15 | _dataPtr(0) |
16 | { | 16 | { |
17 | qDebug("InterfacePPP::InterfacePPP("); | 17 | odebug << "InterfacePPP::InterfacePPP(" << oendl; |
18 | } | 18 | } |
19 | 19 | ||
20 | PPPData* InterfacePPP::data()const | 20 | PPPData* InterfacePPP::data()const |
21 | { | 21 | { |
22 | if (!_dataPtr){ | 22 | if (!_dataPtr){ |
23 | qDebug("creating new Data obj"); | 23 | odebug << "creating new Data obj" << oendl; |
24 | _dataPtr = new PPPData(); | 24 | _dataPtr = new PPPData(); |
25 | _dataPtr->setDevice( getInterfaceName() ); | 25 | _dataPtr->setDevice( getInterfaceName() ); |
26 | _dataPtr->setAccount( getHardwareName() ); | 26 | _dataPtr->setAccount( getHardwareName() ); |
27 | } | 27 | } |
@@ -30,17 +30,17 @@ PPPData* InterfacePPP::data()const | |||
30 | 30 | ||
31 | Modem* InterfacePPP::modem()const | 31 | Modem* InterfacePPP::modem()const |
32 | { | 32 | { |
33 | if (!_modemPtr){ | 33 | if (!_modemPtr){ |
34 | qDebug("creating new modem obj"); | 34 | odebug << "creating new modem obj" << oendl; |
35 | _modemPtr = new Modem( data() ); | 35 | _modemPtr = new Modem( data() ); |
36 | } | 36 | } |
37 | return _modemPtr; | 37 | return _modemPtr; |
38 | } | 38 | } |
39 | 39 | ||
40 | bool InterfacePPP::refresh() | 40 | bool InterfacePPP::refresh() |
41 | { | 41 | { |
42 | qDebug("InterfacePPP::refresh()"); | 42 | odebug << "InterfacePPP::refresh()" << oendl; |
43 | QString old = getInterfaceName(); | 43 | QString old = getInterfaceName(); |
44 | setInterfaceName( modem()->pppDevice() ); | 44 | setInterfaceName( modem()->pppDevice() ); |
45 | 45 | ||
46 | (void)Interface::refresh(); | 46 | (void)Interface::refresh(); |
@@ -52,9 +52,9 @@ bool InterfacePPP::refresh() | |||
52 | } | 52 | } |
53 | 53 | ||
54 | void InterfacePPP::start() | 54 | void InterfacePPP::start() |
55 | { | 55 | { |
56 | qDebug("InterfacePPP::start"); | 56 | odebug << "InterfacePPP::start" << oendl; |
57 | 57 | ||
58 | if (data()->password().isEmpty() && !data()->storedUsername().isEmpty() ) { | 58 | if (data()->password().isEmpty() && !data()->storedUsername().isEmpty() ) { |
59 | 59 | ||
60 | QDialog mb( 0, "Dialog", true ); | 60 | QDialog mb( 0, "Dialog", true ); |
@@ -142,14 +142,14 @@ void InterfacePPP::start() | |||
142 | // emit updateInterface((Interface*) this); | 142 | // emit updateInterface((Interface*) this); |
143 | 143 | ||
144 | emit begin_connect(); | 144 | emit begin_connect(); |
145 | 145 | ||
146 | qDebug("InterfacePPP::start END"); | 146 | odebug << "InterfacePPP::start END" << oendl; |
147 | } | 147 | } |
148 | 148 | ||
149 | void InterfacePPP::stop() | 149 | void InterfacePPP::stop() |
150 | { | 150 | { |
151 | qDebug("InterfacePPP::stop"); | 151 | odebug << "InterfacePPP::stop" << oendl; |
152 | // emit hangup_now(); | 152 | // emit hangup_now(); |
153 | status = false; // not connected | 153 | status = false; // not connected |
154 | setStatus( false ); | 154 | setStatus( false ); |
155 | emit hangup_now(); | 155 | emit hangup_now(); |
diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp index e21bbc7..fd09332 100644 --- a/noncore/settings/networksettings/ppp/kpppwidget.cpp +++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp | |||
@@ -73,15 +73,15 @@ KPPPWidget::KPPPWidget(PPPData*pd, Interface *i, QWidget *parent, const char *na | |||
73 | p_kppp = this; | 73 | p_kppp = this; |
74 | // before doing anything else, run a few tests | 74 | // before doing anything else, run a few tests |
75 | if (!_pppdata->setModemDevice( i->getInterfaceName() )) | 75 | if (!_pppdata->setModemDevice( i->getInterfaceName() )) |
76 | _pppdata->setModemDevice("/dev/modem"); | 76 | _pppdata->setModemDevice("/dev/modem"); |
77 | qDebug("PPPConfigWidget::PPPConfigWidget"); | 77 | odebug << "PPPConfigWidget::PPPConfigWidget" << oendl; |
78 | qDebug(" interface->getHardwareName >%s<", i->getHardwareName().latin1()); | 78 | odebug << " interface->getHardwareName >" << i->getHardwareName().latin1() << "<" << oendl; |
79 | if (!_pppdata->setAccount( i->getHardwareName() )) | 79 | if (!_pppdata->setAccount( i->getHardwareName() )) |
80 | _pppdata->setAccount( 0 ); | 80 | _pppdata->setAccount( 0 ); |
81 | 81 | ||
82 | qDebug(" _pppdata->accname >%s<",_pppdata->accname().latin1()); | 82 | odebug << " _pppdata->accname >" << _pppdata->accname().latin1() << "<" << oendl; |
83 | qDebug(" _pppdata->currentAccountID() >%i<",_pppdata->currentAccountID()); | 83 | odebug << " _pppdata->currentAccountID() >" << _pppdata->currentAccountID() << "<" << oendl; |
84 | 84 | ||
85 | int result = runTests(); | 85 | int result = runTests(); |
86 | if(result == TEST_CRITICAL) | 86 | if(result == TEST_CRITICAL) |
87 | exit(4); | 87 | exit(4); |
@@ -304,9 +304,9 @@ KPPPWidget::~KPPPWidget() | |||
304 | // bool KPPPWidget::eventFilter(QObject *o, QEvent *e) { | 304 | // bool KPPPWidget::eventFilter(QObject *o, QEvent *e) { |
305 | // if(e->type() == QEvent::User) { | 305 | // if(e->type() == QEvent::User) { |
306 | // switch(((SignalEvent*)e)->sigType()) { | 306 | // switch(((SignalEvent*)e)->sigType()) { |
307 | // case SIGINT: | 307 | // case SIGINT: |
308 | // qDebug( "Received a SIGINT" ); | 308 | // odebug << "Received a SIGINT" << oendl; |
309 | // interruptConnection(); | 309 | // interruptConnection(); |
310 | // break; | 310 | // break; |
311 | // case SIGCHLD: | 311 | // case SIGCHLD: |
312 | // sigChld(); | 312 | // sigChld(); |
@@ -422,15 +422,15 @@ void KPPPWidget::interruptConnection() { | |||
422 | } | 422 | } |
423 | 423 | ||
424 | 424 | ||
425 | void KPPPWidget::sigPPPDDied() { | 425 | void KPPPWidget::sigPPPDDied() { |
426 | qDebug( "Received a SIGUSR1" ); | 426 | odebug << "Received a SIGUSR1" << oendl; |
427 | 427 | ||
428 | // if we are not connected pppdpid is -1 so have have to check for that | 428 | // if we are not connected pppdpid is -1 so have have to check for that |
429 | // in the followin line to make sure that we don't raise a false alarm | 429 | // in the followin line to make sure that we don't raise a false alarm |
430 | // such as would be the case when the log file viewer exits. | 430 | // such as would be the case when the log file viewer exits. |
431 | if(_pppdata->pppdRunning() || _pppdata->pppdError()) { | 431 | if(_pppdata->pppdRunning() || _pppdata->pppdError()) { |
432 | qDebug( "It was pppd that died" ); | 432 | odebug << "It was pppd that died" << oendl; |
433 | 433 | ||
434 | // when we killpppd() on Cancel in ConnectWidget | 434 | // when we killpppd() on Cancel in ConnectWidget |
435 | // we set pppid to -1 so we won't | 435 | // we set pppid to -1 so we won't |
436 | // enter this block | 436 | // enter this block |
@@ -441,9 +441,9 @@ void KPPPWidget::sigPPPDDied() { | |||
441 | Modem::modem->removeSecret(AUTH_CHAP); | 441 | Modem::modem->removeSecret(AUTH_CHAP); |
442 | 442 | ||
443 | _pppdata->setpppdRunning(false); | 443 | _pppdata->setpppdRunning(false); |
444 | 444 | ||
445 | qDebug( "Executing command on disconnect since pppd has died." ); | 445 | odebug << "Executing command on disconnect since pppd has died." << oendl; |
446 | QApplication::flushX(); | 446 | QApplication::flushX(); |
447 | execute_command(_pppdata->command_on_disconnect()); | 447 | execute_command(_pppdata->command_on_disconnect()); |
448 | 448 | ||
449 | // stopAccounting(); | 449 | // stopAccounting(); |
@@ -488,9 +488,9 @@ void KPPPWidget::sigPPPDDied() { | |||
488 | // if(QMessageBox::warning(0, msg, QObject::tr("Error"), QObject::tr("&OK"), QObject::tr("&Details...")) == QMessageBox::No) | 488 | // if(QMessageBox::warning(0, msg, QObject::tr("Error"), QObject::tr("&OK"), QObject::tr("&Details...")) == QMessageBox::No) |
489 | // // PPPL_ShowLog(); | 489 | // // PPPL_ShowLog(); |
490 | // } else { /* reconnect on disconnect */ | 490 | // } else { /* reconnect on disconnect */ |
491 | if (false){ | 491 | if (false){ |
492 | qDebug( "Trying to reconnect... " ); | 492 | odebug << "Trying to reconnect... " << oendl; |
493 | 493 | ||
494 | if(_pppdata->authMethod() == AUTH_PAP || | 494 | if(_pppdata->authMethod() == AUTH_PAP || |
495 | _pppdata->authMethod() == AUTH_CHAP || | 495 | _pppdata->authMethod() == AUTH_CHAP || |
496 | _pppdata->authMethod() == AUTH_PAPCHAP) | 496 | _pppdata->authMethod() == AUTH_PAPCHAP) |
@@ -510,9 +510,9 @@ void KPPPWidget::sigPPPDDied() { | |||
510 | } | 510 | } |
511 | } | 511 | } |
512 | 512 | ||
513 | // void KPPPWidget::sigChld() { | 513 | // void KPPPWidget::sigChld() { |
514 | // qDebug( "sigchld()" ); | 514 | // odebug << "sigchld()" << oendl; |
515 | // // pid_t id = wait(0L); | 515 | // // pid_t id = wait(0L); |
516 | // // if(id == helperPid && helperPid != -1) { | 516 | // // if(id == helperPid && helperPid != -1) { |
517 | // // kdDebug(5002) << "It was the setuid child that died" << endl; | 517 | // // kdDebug(5002) << "It was the setuid child that died" << endl; |
518 | // // helperPid = -1; | 518 | // // helperPid = -1; |
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp index 3dbc8c3..f3f2639 100644 --- a/noncore/settings/networksettings/ppp/modem.cpp +++ b/noncore/settings/networksettings/ppp/modem.cpp | |||
@@ -54,9 +54,9 @@ | |||
54 | #define qError qDebug | 54 | #define qError qDebug |
55 | 55 | ||
56 | 56 | ||
57 | #define MY_ASSERT(x) if (!(x)) { \ | 57 | #define MY_ASSERT(x) if (!(x)) { \ |
58 | qFatal( "ASSERT: \"%s\" in %s (%d)\n",#x,__FILE__,__LINE__); \ | 58 | ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl; \ |
59 | exit(1); } | 59 | exit(1); } |
60 | 60 | ||
61 | 61 | ||
62 | static sigjmp_buf jmp_buffer; | 62 | static sigjmp_buf jmp_buffer; |
@@ -164,9 +164,9 @@ bool Modem::opentty() { | |||
164 | //begin if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) { | 164 | //begin if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) { |
165 | close(modemfd); | 165 | close(modemfd); |
166 | device = _pppdata->modemDevice(); | 166 | device = _pppdata->modemDevice(); |
167 | if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) { | 167 | if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) { |
168 | qDebug("error opening modem device !"); | 168 | odebug << "error opening modem device !" << oendl; |
169 | errmsg = QObject::tr("Unable to open modem."); | 169 | errmsg = QObject::tr("Unable to open modem."); |
170 | return false; | 170 | return false; |
171 | } | 171 | } |
172 | //bend if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) { | 172 | //bend if((modemfd = Requester::rq->openModem(gpppdata.modemDevice()))<0) { |
@@ -305,11 +305,11 @@ void Modem::startNotifier() { | |||
305 | if(modemfd >= 0) { | 305 | if(modemfd >= 0) { |
306 | if(sn == 0) { | 306 | if(sn == 0) { |
307 | sn = new QSocketNotifier(modemfd, QSocketNotifier::Read, this); | 307 | sn = new QSocketNotifier(modemfd, QSocketNotifier::Read, this); |
308 | connect(sn, SIGNAL(activated(int)), SLOT(readtty(int))); | 308 | connect(sn, SIGNAL(activated(int)), SLOT(readtty(int))); |
309 | qDebug("QSocketNotifier started!"); | 309 | odebug << "QSocketNotifier started!" << oendl; |
310 | } else { | 310 | } else { |
311 | qDebug("QSocketNotifier re-enabled!"); | 311 | odebug << "QSocketNotifier re-enabled!" << oendl; |
312 | sn->setEnabled(true); | 312 | sn->setEnabled(true); |
313 | } | 313 | } |
314 | } | 314 | } |
315 | } | 315 | } |
@@ -320,9 +320,9 @@ void Modem::stopNotifier() { | |||
320 | sn->setEnabled(false); | 320 | sn->setEnabled(false); |
321 | disconnect(sn); | 321 | disconnect(sn); |
322 | delete sn; | 322 | delete sn; |
323 | sn = 0; | 323 | sn = 0; |
324 | qDebug( "QSocketNotifier stopped!" ); | 324 | odebug << "QSocketNotifier stopped!" << oendl; |
325 | } | 325 | } |
326 | } | 326 | } |
327 | 327 | ||
328 | 328 | ||
@@ -336,9 +336,9 @@ bool Modem::writeChar(unsigned char c) { | |||
336 | int s; | 336 | int s; |
337 | do { | 337 | do { |
338 | s = write(modemfd, &c, 1); | 338 | s = write(modemfd, &c, 1); |
339 | if (s < 0) { | 339 | if (s < 0) { |
340 | qError( "write() in Modem::writeChar failed" ); | 340 | oerr << "write() in Modem::writeChar failed" << oendl; |
341 | return false; | 341 | return false; |
342 | } | 342 | } |
343 | } while(s == 0); | 343 | } while(s == 0); |
344 | 344 | ||
@@ -364,9 +364,9 @@ bool Modem::writeLine(const char *buf) { | |||
364 | while(l) { | 364 | while(l) { |
365 | int wr = write(modemfd, &b[len-l], l); | 365 | int wr = write(modemfd, &b[len-l], l); |
366 | if(wr < 0) { | 366 | if(wr < 0) { |
367 | // TODO do something meaningful with the error code (or ignore it | 367 | // TODO do something meaningful with the error code (or ignore it |
368 | qError( "write() in Modem::writeLine failed" ); | 368 | oerr << "write() in Modem::writeLine failed" << oendl; |
369 | delete[] b; | 369 | delete[] b; |
370 | return false; | 370 | return false; |
371 | } | 371 | } |
372 | l -= wr; | 372 | l -= wr; |
@@ -473,9 +473,9 @@ QString Modem::parseModemSpeed(const QString &s) { | |||
473 | int tx = -1; | 473 | int tx = -1; |
474 | int i; | 474 | int i; |
475 | QString result; | 475 | QString result; |
476 | 476 | ||
477 | qDebug( "Modem reported result string: %s", s.latin1()); | 477 | odebug << "Modem reported result string: " << s.latin1() << "" << oendl; |
478 | 478 | ||
479 | const int RXMAX = 7; | 479 | const int RXMAX = 7; |
480 | const int TXMAX = 2; | 480 | const int TXMAX = 2; |
481 | QRegExp rrx[RXMAX] = { | 481 | QRegExp rrx[RXMAX] = { |
@@ -559,9 +559,9 @@ QString Modem::parseModemSpeed(const QString &s) { | |||
559 | result.setNum(tx); | 559 | result.setNum(tx); |
560 | else | 560 | else |
561 | result.sprintf("%d/%d", rx, tx); | 561 | result.sprintf("%d/%d", rx, tx); |
562 | 562 | ||
563 | qDebug( "The parsed result is: %s", result.latin1()); | 563 | odebug << "The parsed result is: " << result.latin1() << "" << oendl; |
564 | 564 | ||
565 | return result; | 565 | return result; |
566 | } | 566 | } |
567 | 567 | ||
@@ -572,9 +572,9 @@ int Modem::lockdevice() { | |||
572 | int fd; | 572 | int fd; |
573 | char newlock[80]=""; // safe | 573 | char newlock[80]=""; // safe |
574 | 574 | ||
575 | if(!_pppdata->modemLockFile()) { | 575 | if(!_pppdata->modemLockFile()) { |
576 | qDebug("The user doesn't want a lockfile."); | 576 | odebug << "The user doesn't want a lockfile." << oendl; |
577 | return 0; | 577 | return 0; |
578 | } | 578 | } |
579 | 579 | ||
580 | if (modem_is_locked) | 580 | if (modem_is_locked) |
@@ -594,9 +594,9 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) { | |||
594 | if (sz <= 0) | 594 | if (sz <= 0) |
595 | return 1; | 595 | return 1; |
596 | oldlock[sz] = '\0'; | 596 | oldlock[sz] = '\0'; |
597 | 597 | ||
598 | qDebug( "Device is locked by: %s", oldlock); | 598 | odebug << "Device is locked by: " << oldlock << "" << oendl; |
599 | 599 | ||
600 | int oldpid; | 600 | int oldpid; |
601 | int match = sscanf(oldlock, "%d", &oldpid); | 601 | int match = sscanf(oldlock, "%d", &oldpid); |
602 | 602 | ||
@@ -607,16 +607,16 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) { | |||
607 | // check if process exists | 607 | // check if process exists |
608 | if (kill((pid_t)oldpid, 0) == 0 || errno != ESRCH) | 608 | if (kill((pid_t)oldpid, 0) == 0 || errno != ESRCH) |
609 | return 1; | 609 | return 1; |
610 | 610 | ||
611 | qDebug( "lockfile is stale" ); | 611 | odebug << "lockfile is stale" << oendl; |
612 | } | 612 | } |
613 | } | 613 | } |
614 | 614 | ||
615 | fd = openLockfile(_pppdata->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT); | 615 | fd = openLockfile(_pppdata->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT); |
616 | if(fd >= 0) { | 616 | if(fd >= 0) { |
617 | sprintf(newlock,"%010d\n", getpid()); | 617 | sprintf(newlock,"%010d\n", getpid()); |
618 | qDebug("Locking Device: %s", newlock); | 618 | odebug << "Locking Device: " << newlock << "" << oendl; |
619 | 619 | ||
620 | write(fd, newlock, strlen(newlock)); | 620 | write(fd, newlock, strlen(newlock)); |
621 | close(fd); | 621 | close(fd); |
622 | modem_is_locked=true; | 622 | modem_is_locked=true; |
@@ -631,9 +631,9 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) { | |||
631 | 631 | ||
632 | // UnLock modem device | 632 | // UnLock modem device |
633 | void Modem::unlockdevice() { | 633 | void Modem::unlockdevice() { |
634 | if (modem_is_locked) { | 634 | if (modem_is_locked) { |
635 | qDebug( "UnLocking Modem Device" ); | 635 | odebug << "UnLocking Modem Device" << oendl; |
636 | close(modemfd); | 636 | close(modemfd); |
637 | modemfd = -1; | 637 | modemfd = -1; |
638 | unlink(lockfile); | 638 | unlink(lockfile); |
639 | lockfile[0] = '\0'; | 639 | lockfile[0] = '\0'; |
@@ -653,9 +653,9 @@ int Modem::openLockfile( QString lockfile, int flags) | |||
653 | 653 | ||
654 | lockfile = LOCK_DIR; | 654 | lockfile = LOCK_DIR; |
655 | lockfile += "/LCK.."; | 655 | lockfile += "/LCK.."; |
656 | lockfile += device.right( device.length() - device.findRev("/") -1 ); | 656 | lockfile += device.right( device.length() - device.findRev("/") -1 ); |
657 | qDebug("lockfile >%s<",lockfile.latin1()); | 657 | odebug << "lockfile >" << lockfile.latin1() << "<" << oendl; |
658 | // TODO: | 658 | // TODO: |
659 | // struct stat st; | 659 | // struct stat st; |
660 | // if(stat(lockfile.data(), &st) == -1) { | 660 | // if(stat(lockfile.data(), &st) == -1) { |
661 | // if(errno == EBADF) | 661 | // if(errno == EBADF) |
@@ -665,9 +665,9 @@ int Modem::openLockfile( QString lockfile, int flags) | |||
665 | // if(!S_ISREG(st.st_mode)) | 665 | // if(!S_ISREG(st.st_mode)) |
666 | // return -1; | 666 | // return -1; |
667 | // } | 667 | // } |
668 | if ((fd = open(lockfile, flags, mode)) == -1) { | 668 | if ((fd = open(lockfile, flags, mode)) == -1) { |
669 | qDebug("error opening lockfile!"); | 669 | odebug << "error opening lockfile!" << oendl; |
670 | lockfile = QString::null; | 670 | lockfile = QString::null; |
671 | fd = open(DEVNULL, O_RDONLY); | 671 | fd = open(DEVNULL, O_RDONLY); |
672 | } else | 672 | } else |
673 | fchown(fd, 0, 0); | 673 | fchown(fd, 0, 0); |
@@ -926,17 +926,17 @@ bool Modem::execpppd(const char *arguments) { | |||
926 | _exit(0); | 926 | _exit(0); |
927 | break; | 927 | break; |
928 | 928 | ||
929 | default: | 929 | default: |
930 | qDebug("In parent: pppd pid %d\n",pppdPid); | 930 | odebug << "In parent: pppd pid " << pppdPid << "\n" << oendl; |
931 | close(modemfd); | 931 | close(modemfd); |
932 | 932 | ||
933 | ::close( m_pppdLOG[1] ); | 933 | ::close( m_pppdLOG[1] ); |
934 | // set it to nonblocking io | 934 | // set it to nonblocking io |
935 | int flag = ::fcntl( m_pppdLOG[0], F_GETFL ); | 935 | int flag = ::fcntl( m_pppdLOG[0], F_GETFL ); |
936 | 936 | ||
937 | if ( !(flag & O_NONBLOCK) ) { | 937 | if ( !(flag & O_NONBLOCK) ) { |
938 | qDebug("Setting nonblocking io"); | 938 | odebug << "Setting nonblocking io" << oendl; |
939 | flag |= O_NONBLOCK; | 939 | flag |= O_NONBLOCK; |
940 | ::fcntl(m_pppdLOG[0], F_SETFL, flag ); | 940 | ::fcntl(m_pppdLOG[0], F_SETFL, flag ); |
941 | } | 941 | } |
942 | 942 | ||
@@ -953,17 +953,17 @@ bool Modem::execpppd(const char *arguments) { | |||
953 | } | 953 | } |
954 | 954 | ||
955 | 955 | ||
956 | bool Modem::killpppd() { | 956 | bool Modem::killpppd() { |
957 | qDebug("In killpppd and pid is %d", pppdPid ); | 957 | odebug << "In killpppd and pid is " << pppdPid << "" << oendl; |
958 | if(pppdPid > 0) { | 958 | if(pppdPid > 0) { |
959 | delete m_modemDebug; | 959 | delete m_modemDebug; |
960 | m_modemDebug = 0; | 960 | m_modemDebug = 0; |
961 | qDebug("In killpppd(): Sending SIGTERM to %d\n", pppdPid); | 961 | odebug << "In killpppd(): Sending SIGTERM to " << pppdPid << "\n" << oendl; |
962 | if(kill(pppdPid, SIGTERM) < 0) { | 962 | if(kill(pppdPid, SIGTERM) < 0) { |
963 | qDebug("Error terminating %d. Sending SIGKILL\n", pppdPid); | 963 | odebug << "Error terminating " << pppdPid << ". Sending SIGKILL\n" << oendl; |
964 | if(kill(pppdPid, SIGKILL) < 0) { | 964 | if(kill(pppdPid, SIGKILL) < 0) { |
965 | qDebug("Error killing %d\n", pppdPid); | 965 | odebug << "Error killing " << pppdPid << "\n" << oendl; |
966 | return false; | 966 | return false; |
967 | } | 967 | } |
968 | } | 968 | } |
969 | } | 969 | } |
@@ -1034,9 +1034,9 @@ int Modem::pppdExitStatus() | |||
1034 | int Modem::openResolv(int flags) | 1034 | int Modem::openResolv(int flags) |
1035 | { | 1035 | { |
1036 | int fd; | 1036 | int fd; |
1037 | if ((fd = open(_PATH_RESCONF, flags)) == -1) { | 1037 | if ((fd = open(_PATH_RESCONF, flags)) == -1) { |
1038 | qDebug("error opening resolv.conf!"); | 1038 | odebug << "error opening resolv.conf!" << oendl; |
1039 | fd = open(DEVNULL, O_RDONLY); | 1039 | fd = open(DEVNULL, O_RDONLY); |
1040 | } | 1040 | } |
1041 | return fd; | 1041 | return fd; |
1042 | } | 1042 | } |
@@ -1055,9 +1055,9 @@ void Modem::setPPPDevice( const QString& dev ) { | |||
1055 | pid_t Modem::pppPID()const { | 1055 | pid_t Modem::pppPID()const { |
1056 | return pppdPid; | 1056 | return pppdPid; |
1057 | } | 1057 | } |
1058 | void Modem::setPPPDPid( pid_t pid ) { | 1058 | void Modem::setPPPDPid( pid_t pid ) { |
1059 | qDebug("Modem setting pid"); | 1059 | odebug << "Modem setting pid" << oendl; |
1060 | _pppdExitStatus = -1; | 1060 | _pppdExitStatus = -1; |
1061 | pppdPid = pid; | 1061 | pppdPid = pid; |
1062 | modemfd = -1; | 1062 | modemfd = -1; |
1063 | } | 1063 | } |
diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp index 97baf31..a8c99fd 100644 --- a/noncore/settings/networksettings/ppp/pppconfig.cpp +++ b/noncore/settings/networksettings/ppp/pppconfig.cpp | |||
@@ -24,12 +24,12 @@ PPPConfigWidget::PPPConfigWidget( InterfacePPP* iface, QWidget *parent, | |||
24 | return; | 24 | return; |
25 | } | 25 | } |
26 | 26 | ||
27 | interface = iface; | 27 | interface = iface; |
28 | qDebug("PPPConfigWidget::PPPConfigWidget"); | 28 | odebug << "PPPConfigWidget::PPPConfigWidget" << oendl; |
29 | qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1()); | 29 | odebug << " interface->getHardwareName >" << interface->getHardwareName().latin1() << "<" << oendl; |
30 | 30 | ||
31 | qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1()); | 31 | odebug << " _pppdata->accname >" << interface->data()->accname().latin1() << "<" << oendl; |
32 | 32 | ||
33 | 33 | ||
34 | QVBoxLayout *layout = new QVBoxLayout( this ); | 34 | QVBoxLayout *layout = new QVBoxLayout( this ); |
35 | layout->setSpacing( 0 ); | 35 | layout->setSpacing( 0 ); |
@@ -57,11 +57,11 @@ PPPConfigWidget::~PPPConfigWidget() | |||
57 | } | 57 | } |
58 | 58 | ||
59 | void PPPConfigWidget::accept() | 59 | void PPPConfigWidget::accept() |
60 | { | 60 | { |
61 | qDebug("PPPConfigWidget::accept"); | 61 | odebug << "PPPConfigWidget::accept" << oendl; |
62 | qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1()); | 62 | odebug << " _pppdata->accname >" << interface->data()->accname().latin1() << "<" << oendl; |
63 | qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1()); | 63 | odebug << " interface->getHardwareName >" << interface->getHardwareName().latin1() << "<" << oendl; |
64 | interface->setInterfaceName( interface->data()->devname() ); | 64 | interface->setInterfaceName( interface->data()->devname() ); |
65 | interface->setHardwareName( interface->data()->accname() ); | 65 | interface->setHardwareName( interface->data()->accname() ); |
66 | interface->save(); | 66 | interface->save(); |
67 | QDialog::accept(); | 67 | QDialog::accept(); |
diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp index f4727c1..567ccf8 100644 --- a/noncore/settings/networksettings/ppp/pppdata.cpp +++ b/noncore/settings/networksettings/ppp/pppdata.cpp | |||
@@ -55,10 +55,10 @@ PPPData::PPPData() | |||
55 | Config cfg = config(); | 55 | Config cfg = config(); |
56 | cfg.setGroup(GENERAL_GRP); | 56 | cfg.setGroup(GENERAL_GRP); |
57 | accountList = cfg.readListEntry(ACCOUNT_LIST, ',' ); | 57 | accountList = cfg.readListEntry(ACCOUNT_LIST, ',' ); |
58 | deviceList = cfg.readListEntry(DEVICESNAMES_LIST, ',' ); | 58 | deviceList = cfg.readListEntry(DEVICESNAMES_LIST, ',' ); |
59 | qDebug("PPPData::PPPData has a accountList %s", accountList.join("---").latin1()); | 59 | odebug << "PPPData::PPPData has a accountList " << accountList.join("---").latin1() << "" << oendl; |
60 | qDebug("PPPData::PPPData has a deviceList %s", deviceList.join("---").latin1()); | 60 | odebug << "PPPData::PPPData has a deviceList " << deviceList.join("---").latin1() << "" << oendl; |
61 | 61 | ||
62 | // if (highcount > MAX_ACCOUNTS) | 62 | // if (highcount > MAX_ACCOUNTS) |
63 | // highcount = MAX_ACCOUNTS; | 63 | // highcount = MAX_ACCOUNTS; |
64 | 64 | ||
@@ -85,9 +85,9 @@ Config PPPData::config() | |||
85 | // save configuration | 85 | // save configuration |
86 | // | 86 | // |
87 | void PPPData::save() | 87 | void PPPData::save() |
88 | { | 88 | { |
89 | qDebug("PPPData saving data"); | 89 | odebug << "PPPData saving data" << oendl; |
90 | writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count()); | 90 | writeConfig(GENERAL_GRP, NUMACCOUNTS_KEY, count()); |
91 | writeConfig(GENERAL_GRP, NUMDEVICES_KEY, highcountdev + 1); | 91 | writeConfig(GENERAL_GRP, NUMDEVICES_KEY, highcountdev + 1); |
92 | QString key; | 92 | QString key; |
93 | QStringList keys; | 93 | QStringList keys; |
@@ -99,30 +99,30 @@ void PPPData::save() | |||
99 | for( QMap<QString,QString>::Iterator it = stringEntries.begin(); | 99 | for( QMap<QString,QString>::Iterator it = stringEntries.begin(); |
100 | it != stringEntries.end(); ++it ){ | 100 | it != stringEntries.end(); ++it ){ |
101 | QString val = it.data(); | 101 | QString val = it.data(); |
102 | key = it.key(); | 102 | key = it.key(); |
103 | // qDebug("saving %s -> %s", key.latin1(), val.latin1() ); | 103 | // odebug << "saving " << key.latin1() << " -> " << val.latin1() << "" << oendl; |
104 | keys = QStringList::split( "SEPARATOR", key ); | 104 | keys = QStringList::split( "SEPARATOR", key ); |
105 | //qDebug("group >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.latin1() ); | 105 | //odebug << "group >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.latin1() << "<" << oendl; |
106 | cfg.setGroup(keys[0]); | 106 | cfg.setGroup(keys[0]); |
107 | cfg.writeEntry(keys[1], val); | 107 | cfg.writeEntry(keys[1], val); |
108 | } | 108 | } |
109 | for( QMap<QString,int>::Iterator it = intEntries.begin(); | 109 | for( QMap<QString,int>::Iterator it = intEntries.begin(); |
110 | it != intEntries.end(); ++it ){ | 110 | it != intEntries.end(); ++it ){ |
111 | int val = it.data(); | 111 | int val = it.data(); |
112 | key = it.key(); | 112 | key = it.key(); |
113 | // qDebug("saving %s -> %i", key.latin1(), val ); | 113 | // odebug << "saving " << key.latin1() << " -> " << val << "" << oendl; |
114 | keys = QStringList::split( "SEPARATOR", key ); | 114 | keys = QStringList::split( "SEPARATOR", key ); |
115 | //qDebug("group >%s< key >%s< val %i", keys[0].latin1(), keys[1].latin1(), val ); | 115 | //odebug << "group >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< val " << val << "" << oendl; |
116 | cfg.setGroup(keys[0]); | 116 | cfg.setGroup(keys[0]); |
117 | cfg.writeEntry(keys[1], val); | 117 | cfg.writeEntry(keys[1], val); |
118 | } | 118 | } |
119 | for( QMap<QString,QStringList>::Iterator it = listEntries.begin(); | 119 | for( QMap<QString,QStringList>::Iterator it = listEntries.begin(); |
120 | it != listEntries.end(); ++it ){ | 120 | it != listEntries.end(); ++it ){ |
121 | QStringList val = it.data(); | 121 | QStringList val = it.data(); |
122 | key = it.key(); | 122 | key = it.key(); |
123 | QChar sep = sepEntries[key]; | 123 | QChar sep = sepEntries[key]; |
124 | // qDebug("saving %s -> %s", key.latin1(), val.join(sep).latin1() ); | 124 | // odebug << "saving " << key.latin1() << " -> " << val.join(sep).latin1() << "" << oendl; |
125 | keys = QStringList::split( "SEPARATOR", key ); | 125 | keys = QStringList::split( "SEPARATOR", key ); |
126 | cfg.setGroup(keys[0]); | 126 | cfg.setGroup(keys[0]); |
127 | cfg.writeEntry(keys[1], val, sep); | 127 | cfg.writeEntry(keys[1], val, sep); |
128 | } | 128 | } |
@@ -141,9 +141,9 @@ void PPPData::cancel() { | |||
141 | // functions to read/write date to configuration file | 141 | // functions to read/write date to configuration file |
142 | QString PPPData::readConfig(const QString &group, const QString &key, | 142 | QString PPPData::readConfig(const QString &group, const QString &key, |
143 | const QString &defvalue = "") | 143 | const QString &defvalue = "") |
144 | { | 144 | { |
145 | // qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1()); | 145 | // odebug << "PPPData::readConfig key >" << key.latin1() << "< group >" << group.latin1() << "<" << oendl; |
146 | QString idx = SEP.arg(group).arg(key); | 146 | QString idx = SEP.arg(group).arg(key); |
147 | if (stringEntries.find(idx) != stringEntries.end()) | 147 | if (stringEntries.find(idx) != stringEntries.end()) |
148 | return stringEntries[idx]; | 148 | return stringEntries[idx]; |
149 | Config cfg = config(); | 149 | Config cfg = config(); |
@@ -364,23 +364,23 @@ const QString PPPData::modemDevice() { | |||
364 | // return readConfig(modemGroup(), MODEMNAME_KEY); | 364 | // return readConfig(modemGroup(), MODEMNAME_KEY); |
365 | // } | 365 | // } |
366 | 366 | ||
367 | // bool PPPData::setModemName(const QString &n) { | 367 | // bool PPPData::setModemName(const QString &n) { |
368 | // qDebug("Setting modem name to >%s<", n.latin1()); | 368 | // odebug << "Setting modem name to >" << n.latin1() << "<" << oendl; |
369 | // _modemName = n; | 369 | // _modemName = n; |
370 | // writeConfig(cgroup, MODEMNAME_KEY, n); | 370 | // writeConfig(cgroup, MODEMNAME_KEY, n); |
371 | // return true; //FIXME | 371 | // return true; //FIXME |
372 | // } | 372 | // } |
373 | 373 | ||
374 | // bool PPPData::changeModemName(const QString &n) { | 374 | // bool PPPData::changeModemName(const QString &n) { |
375 | // qDebug("Setting modem name to >%s<", n.latin1()); | 375 | // odebug << "Setting modem name to >" << n.latin1() << "<" << oendl; |
376 | // _modemName = n; | 376 | // _modemName = n; |
377 | // writeConfig(modemGroup(), MODEMNAME_KEY, n); | 377 | // writeConfig(modemGroup(), MODEMNAME_KEY, n); |
378 | // return true; //FIXME | 378 | // return true; //FIXME |
379 | // } | 379 | // } |
380 | 380 | ||
381 | bool PPPData::setModemDevice(const QString &n) { | 381 | bool PPPData::setModemDevice(const QString &n) { |
382 | qDebug("Setting modem dev to >%s<", n.latin1()); | 382 | odebug << "Setting modem dev to >" << n.latin1() << "<" << oendl; |
383 | writeConfig(modemGroup(), MODEMDEV_KEY, n); | 383 | writeConfig(modemGroup(), MODEMDEV_KEY, n); |
384 | return true; //FIXME | 384 | return true; //FIXME |
385 | } | 385 | } |
386 | 386 | ||
@@ -738,20 +738,20 @@ int PPPData::count() const { | |||
738 | } | 738 | } |
739 | 739 | ||
740 | 740 | ||
741 | bool PPPData::setAccount(const QString &aname) { | 741 | bool PPPData::setAccount(const QString &aname) { |
742 | qDebug("setting account to >%s<", aname.latin1()); | 742 | odebug << "setting account to >" << aname.latin1() << "<" << oendl; |
743 | for ( QStringList::Iterator it = accountList.begin(); it != accountList.end(); ++it ) { | 743 | for ( QStringList::Iterator it = accountList.begin(); it != accountList.end(); ++it ) { |
744 | cgroup = *it; | 744 | cgroup = *it; |
745 | qDebug("PPPData::setAccount %s", cgroup.latin1()); | 745 | odebug << "PPPData::setAccount " << cgroup.latin1() << "" << oendl; |
746 | qDebug( "iterator %s", (*it).latin1() ); | 746 | odebug << "iterator " << (*it).latin1() << "" << oendl; |
747 | if(accname() == aname) { | 747 | if(accname() == aname) { |
748 | qDebug("SUCCESS"); | 748 | odebug << "SUCCESS" << oendl; |
749 | return true; | 749 | return true; |
750 | } | 750 | } |
751 | 751 | ||
752 | } | 752 | } |
753 | qDebug("FAILURE"); | 753 | odebug << "FAILURE" << oendl; |
754 | return false; | 754 | return false; |
755 | } | 755 | } |
756 | 756 | ||
757 | /* | 757 | /* |
@@ -771,13 +771,13 @@ bool PPPData::setAccountbyIndex(int i) { | |||
771 | bool PPPData::isUniqueAccname(const QString &n) { | 771 | bool PPPData::isUniqueAccname(const QString &n) { |
772 | QString save_cgroup = cgroup; | 772 | QString save_cgroup = cgroup; |
773 | for ( QStringList::Iterator it = accountList.begin(); it != accountList.end(); ++it ) { | 773 | for ( QStringList::Iterator it = accountList.begin(); it != accountList.end(); ++it ) { |
774 | cgroup = *it; | 774 | cgroup = *it; |
775 | qDebug("PPPData::setAccount %s", cgroup.latin1()); | 775 | odebug << "PPPData::setAccount " << cgroup.latin1() << "" << oendl; |
776 | qDebug( "%s \n", (*it).latin1() ); | 776 | odebug << "" << (*it).latin1() << " \n" << oendl; |
777 | if(accname() == n && cgroup != save_cgroup) { | 777 | if(accname() == n && cgroup != save_cgroup) { |
778 | cgroup = save_cgroup; | 778 | cgroup = save_cgroup; |
779 | qDebug("SUCCESS"); | 779 | odebug << "SUCCESS" << oendl; |
780 | return false; | 780 | return false; |
781 | } | 781 | } |
782 | 782 | ||
783 | } | 783 | } |
@@ -787,15 +787,15 @@ bool PPPData::isUniqueAccname(const QString &n) { | |||
787 | 787 | ||
788 | 788 | ||
789 | bool PPPData::isUniqueDevname(const QString &n) { | 789 | bool PPPData::isUniqueDevname(const QString &n) { |
790 | QString save_mName = _modemName; | 790 | QString save_mName = _modemName; |
791 | qDebug("PPPData::isUniqueDevname checking if %s is unique", n.latin1()); | 791 | odebug << "PPPData::isUniqueDevname checking if " << n.latin1() << " is unique" << oendl; |
792 | for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) { | 792 | for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) { |
793 | _modemName = *it; | 793 | _modemName = *it; |
794 | qDebug("PPPData::isUniqueDevname %s == %s", n.latin1() , devname().latin1()); | 794 | odebug << "PPPData::isUniqueDevname " << n.latin1() << " == " << devname().latin1() << "" << oendl; |
795 | if(devname() == n && _modemName != save_mName) { | 795 | if(devname() == n && _modemName != save_mName) { |
796 | _modemName = save_mName; | 796 | _modemName = save_mName; |
797 | qDebug("NOT UNIQUE"); | 797 | odebug << "NOT UNIQUE" << oendl; |
798 | return false; | 798 | return false; |
799 | } | 799 | } |
800 | 800 | ||
801 | } | 801 | } |
@@ -819,9 +819,9 @@ bool PPPData::deleteAccount() { | |||
819 | key = it.key(); | 819 | key = it.key(); |
820 | keys = QStringList::split( "SEPARATOR", key ); | 820 | keys = QStringList::split( "SEPARATOR", key ); |
821 | if(keys[0]==cgroup){ | 821 | if(keys[0]==cgroup){ |
822 | stringEntries.remove( it ); | 822 | stringEntries.remove( it ); |
823 | qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.latin1() ); | 823 | odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.latin1() << "<" << oendl; |
824 | } | 824 | } |
825 | } | 825 | } |
826 | for( QMap<QString,int>::Iterator it = intEntries.begin(); | 826 | for( QMap<QString,int>::Iterator it = intEntries.begin(); |
827 | it != intEntries.end(); ++it ){ | 827 | it != intEntries.end(); ++it ){ |
@@ -829,9 +829,9 @@ bool PPPData::deleteAccount() { | |||
829 | key = it.key(); | 829 | key = it.key(); |
830 | keys = QStringList::split( "SEPARATOR", key ); | 830 | keys = QStringList::split( "SEPARATOR", key ); |
831 | if(keys[0]==cgroup){ | 831 | if(keys[0]==cgroup){ |
832 | intEntries.remove( it ); | 832 | intEntries.remove( it ); |
833 | qDebug("deleting >%s< key >%s< value >%i<", keys[0].latin1(), keys[1].latin1(), val ); | 833 | odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val << "<" << oendl; |
834 | } | 834 | } |
835 | } | 835 | } |
836 | for( QMap<QString,QStringList>::Iterator it = listEntries.begin(); | 836 | for( QMap<QString,QStringList>::Iterator it = listEntries.begin(); |
837 | it != listEntries.end(); ++it ){ | 837 | it != listEntries.end(); ++it ){ |
@@ -839,9 +839,9 @@ bool PPPData::deleteAccount() { | |||
839 | key = it.key(); | 839 | key = it.key(); |
840 | if(keys[0]==cgroup){ | 840 | if(keys[0]==cgroup){ |
841 | listEntries.remove( it ); | 841 | listEntries.remove( it ); |
842 | sepEntries.remove( key ); | 842 | sepEntries.remove( key ); |
843 | qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.join("").latin1() ); | 843 | odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.join("").latin1() << "<" << oendl; |
844 | } | 844 | } |
845 | } | 845 | } |
846 | 846 | ||
847 | return true; | 847 | return true; |
@@ -859,18 +859,18 @@ bool PPPData::deleteAccount(const QString &aname) { | |||
859 | 859 | ||
860 | 860 | ||
861 | int PPPData::newaccount() { | 861 | int PPPData::newaccount() { |
862 | 862 | ||
863 | qDebug("PPPData::newaccount highcount %i/%i",highcount,MAX_ACCOUNTS); | 863 | odebug << "PPPData::newaccount highcount " << highcount << "/" << MAX_ACCOUNTS << "" << oendl; |
864 | // if(!config) open(); | 864 | // if(!config) open(); |
865 | // if (highcount >= MAX_ACCOUNTS) return -1; | 865 | // if (highcount >= MAX_ACCOUNTS) return -1; |
866 | 866 | ||
867 | 867 | ||
868 | QString tmp; | 868 | QString tmp; |
869 | tmp.sprintf("%s%i", ACCOUNT_GRP, ++highcount); | 869 | tmp.sprintf("%s%i", ACCOUNT_GRP, ++highcount); |
870 | cgroup = QString(tmp); | 870 | cgroup = QString(tmp); |
871 | accountList << tmp; | 871 | accountList << tmp; |
872 | qDebug("PPPData::newaccount() Group: >%s<",cgroup.latin1()); | 872 | odebug << "PPPData::newaccount() Group: >" << cgroup.latin1() << "<" << oendl; |
873 | setpppdArgumentDefaults(); | 873 | setpppdArgumentDefaults(); |
874 | return highcount; | 874 | return highcount; |
875 | } | 875 | } |
876 | 876 | ||
@@ -964,11 +964,11 @@ void PPPData::setStoredUsername(const QString &b) { | |||
964 | } | 964 | } |
965 | 965 | ||
966 | 966 | ||
967 | const QString PPPData::storedPassword() { | 967 | const QString PPPData::storedPassword() { |
968 | qDebug("getting stored pw"); | 968 | odebug << "getting stored pw" << oendl; |
969 | qDebug("g %s", cgroup.latin1() ); | 969 | odebug << "g " << cgroup.latin1() << "" << oendl; |
970 | qDebug("k %s", STORED_PASSWORD_KEY); | 970 | odebug << "k " << STORED_PASSWORD_KEY << "" << oendl; |
971 | return readConfig(cgroup, STORED_PASSWORD_KEY, ""); | 971 | return readConfig(cgroup, STORED_PASSWORD_KEY, ""); |
972 | } | 972 | } |
973 | 973 | ||
974 | 974 | ||
@@ -1328,12 +1328,12 @@ void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces ) | |||
1328 | for( it = ifaces.begin(); it != ifaces.end(); ++it ){ | 1328 | for( it = ifaces.begin(); it != ifaces.end(); ++it ){ |
1329 | cfg.setGroup(QString("%1_%1").arg(ACCLIST_GRP).arg(i++)); | 1329 | cfg.setGroup(QString("%1_%1").arg(ACCLIST_GRP).arg(i++)); |
1330 | cfg.writeEntry( ACOUNTS_DEV, it.key() ); | 1330 | cfg.writeEntry( ACOUNTS_DEV, it.key() ); |
1331 | cfg.writeEntry( ACOUNTS_ACC, it.data() ); | 1331 | cfg.writeEntry( ACOUNTS_ACC, it.data() ); |
1332 | qDebug("I %i",i); | 1332 | odebug << "I " << i << "" << oendl; |
1333 | } | 1333 | } |
1334 | cfg.setGroup( ACCLIST_GRP ); | 1334 | cfg.setGroup( ACCLIST_GRP ); |
1335 | qDebug("saved %i account settings", i); | 1335 | odebug << "saved " << i << " account settings" << oendl; |
1336 | cfg.writeEntry( ACCOUNTS_COUNT, i ); | 1336 | cfg.writeEntry( ACCOUNTS_COUNT, i ); |
1337 | 1337 | ||
1338 | } | 1338 | } |
1339 | 1339 | ||
@@ -1371,9 +1371,9 @@ QStringList PPPData::getAccountList() | |||
1371 | 1371 | ||
1372 | const QString PPPData::devname() | 1372 | const QString PPPData::devname() |
1373 | { | 1373 | { |
1374 | QString tmp = readConfig(modemGroup(), MODEMNAME_KEY ); | 1374 | QString tmp = readConfig(modemGroup(), MODEMNAME_KEY ); |
1375 | qDebug("PPPData::devname() of %s is %s", modemGroup().latin1(), tmp.latin1()); | 1375 | odebug << "PPPData::devname() of " << modemGroup().latin1() << " is " << tmp.latin1() << "" << oendl; |
1376 | return tmp; | 1376 | return tmp; |
1377 | } | 1377 | } |
1378 | 1378 | ||
1379 | void PPPData::setDevname(const QString &n) { | 1379 | void PPPData::setDevname(const QString &n) { |
@@ -1389,22 +1389,22 @@ void PPPData::setDevname(const QString &n) { | |||
1389 | 1389 | ||
1390 | 1390 | ||
1391 | bool PPPData::setDevice(const QString &dev ) | 1391 | bool PPPData::setDevice(const QString &dev ) |
1392 | { | 1392 | { |
1393 | qDebug("setting device to >%s<", dev.latin1()); | 1393 | odebug << "setting device to >" << dev.latin1() << "<" << oendl; |
1394 | QString save_mName = _modemName; | 1394 | QString save_mName = _modemName; |
1395 | for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) { | 1395 | for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) { |
1396 | _modemName = *it; | 1396 | _modemName = *it; |
1397 | qDebug("PPPData::setDevice %s is named %s", _modemName.latin1(), devname().latin1() ); | 1397 | odebug << "PPPData::setDevice " << _modemName.latin1() << " is named " << devname().latin1() << "" << oendl; |
1398 | qDebug( "iterator %s", (*it).latin1() ); | 1398 | odebug << "iterator " << (*it).latin1() << "" << oendl; |
1399 | if(devname() == dev) { | 1399 | if(devname() == dev) { |
1400 | qDebug("SUCCESS"); | 1400 | odebug << "SUCCESS" << oendl; |
1401 | return true; | 1401 | return true; |
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | } | 1404 | } |
1405 | _modemName = save_mName; | 1405 | _modemName = save_mName; |
1406 | qDebug("FAILURE"); | 1406 | odebug << "FAILURE" << oendl; |
1407 | return false; | 1407 | return false; |
1408 | } | 1408 | } |
1409 | 1409 | ||
1410 | bool PPPData::deleteDevice() | 1410 | bool PPPData::deleteDevice() |
@@ -1423,9 +1423,9 @@ bool PPPData::deleteDevice() | |||
1423 | key = it.key(); | 1423 | key = it.key(); |
1424 | keys = QStringList::split( "SEPARATOR", key ); | 1424 | keys = QStringList::split( "SEPARATOR", key ); |
1425 | if(keys[0]==modemGroup()){ | 1425 | if(keys[0]==modemGroup()){ |
1426 | stringEntries.remove( it ); | 1426 | stringEntries.remove( it ); |
1427 | qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.latin1() ); | 1427 | odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.latin1() << "<" << oendl; |
1428 | } | 1428 | } |
1429 | } | 1429 | } |
1430 | for( QMap<QString,int>::Iterator it = intEntries.begin(); | 1430 | for( QMap<QString,int>::Iterator it = intEntries.begin(); |
1431 | it != intEntries.end(); ++it ){ | 1431 | it != intEntries.end(); ++it ){ |
@@ -1433,9 +1433,9 @@ bool PPPData::deleteDevice() | |||
1433 | key = it.key(); | 1433 | key = it.key(); |
1434 | keys = QStringList::split( "SEPARATOR", key ); | 1434 | keys = QStringList::split( "SEPARATOR", key ); |
1435 | if(keys[0]==modemGroup()){ | 1435 | if(keys[0]==modemGroup()){ |
1436 | intEntries.remove( it ); | 1436 | intEntries.remove( it ); |
1437 | qDebug("deleting >%s< key >%s< value >%i<", keys[0].latin1(), keys[1].latin1(), val ); | 1437 | odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val << "<" << oendl; |
1438 | } | 1438 | } |
1439 | } | 1439 | } |
1440 | for( QMap<QString,QStringList>::Iterator it = listEntries.begin(); | 1440 | for( QMap<QString,QStringList>::Iterator it = listEntries.begin(); |
1441 | it != listEntries.end(); ++it ){ | 1441 | it != listEntries.end(); ++it ){ |
@@ -1443,9 +1443,9 @@ bool PPPData::deleteDevice() | |||
1443 | key = it.key(); | 1443 | key = it.key(); |
1444 | if(keys[0]==modemGroup()){ | 1444 | if(keys[0]==modemGroup()){ |
1445 | listEntries.remove( it ); | 1445 | listEntries.remove( it ); |
1446 | sepEntries.remove( key ); | 1446 | sepEntries.remove( key ); |
1447 | qDebug("deleting >%s< key >%s< value >%s<", keys[0].latin1(), keys[1].latin1(), val.join("").latin1() ); | 1447 | odebug << "deleting >" << keys[0].latin1() << "< key >" << keys[1].latin1() << "< value >" << val.join("").latin1() << "<" << oendl; |
1448 | } | 1448 | } |
1449 | } | 1449 | } |
1450 | 1450 | ||
1451 | return true; | 1451 | return true; |
@@ -1462,16 +1462,16 @@ bool PPPData::deleteDevice(const QString &dev) | |||
1462 | 1462 | ||
1463 | int PPPData::newdevice() | 1463 | int PPPData::newdevice() |
1464 | { | 1464 | { |
1465 | 1465 | ||
1466 | qDebug("PPPData::newdevice highcount %i",highcountdev); | 1466 | odebug << "PPPData::newdevice highcount " << highcountdev << "" << oendl; |
1467 | 1467 | ||
1468 | 1468 | ||
1469 | QString tmp; | 1469 | QString tmp; |
1470 | tmp.sprintf("%s%i", MODEM_GRP, ++highcountdev); | 1470 | tmp.sprintf("%s%i", MODEM_GRP, ++highcountdev); |
1471 | _modemName = QString(tmp); | 1471 | _modemName = QString(tmp); |
1472 | deviceList << tmp; | 1472 | deviceList << tmp; |
1473 | qDebug("PPPData::newdevice() Group: >%s<",cgroup.latin1()); | 1473 | odebug << "PPPData::newdevice() Group: >" << cgroup.latin1() << "<" << oendl; |
1474 | return highcountdev; | 1474 | return highcountdev; |
1475 | } | 1475 | } |
1476 | 1476 | ||
1477 | int PPPData::copydevice(const QString&) | 1477 | int PPPData::copydevice(const QString&) |
@@ -1483,12 +1483,12 @@ int PPPData::copydevice(const QString&) | |||
1483 | QStringList PPPData::getDevicesNamesList() | 1483 | QStringList PPPData::getDevicesNamesList() |
1484 | { | 1484 | { |
1485 | QStringList list; | 1485 | QStringList list; |
1486 | QString save_mName = _modemName; | 1486 | QString save_mName = _modemName; |
1487 | qDebug("PPPData::getDevicesNamesList has %s", deviceList.join("---").latin1()); | 1487 | odebug << "PPPData::getDevicesNamesList has " << deviceList.join("---").latin1() << "" << oendl; |
1488 | for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) { | 1488 | for ( QStringList::Iterator it = deviceList.begin(); it != deviceList.end(); ++it ) { |
1489 | _modemName = *it; | 1489 | _modemName = *it; |
1490 | qDebug("PPPData::getDevicesNamesList adding %s as %s",_modemName.latin1(), devname().latin1()); | 1490 | odebug << "PPPData::getDevicesNamesList adding " << _modemName.latin1() << " as " << devname().latin1() << "" << oendl; |
1491 | list << devname(); | 1491 | list << devname(); |
1492 | } | 1492 | } |
1493 | _modemName = save_mName; | 1493 | _modemName = save_mName; |
1494 | return list; | 1494 | return list; |
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index a7caffe..2291e8a 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp | |||
@@ -59,20 +59,20 @@ PPPModule::PPPModule() : Module() | |||
59 | 59 | ||
60 | QMap<QString,QString> ifaces = PPPData::getConfiguredInterfaces(); | 60 | QMap<QString,QString> ifaces = PPPData::getConfiguredInterfaces(); |
61 | QMap<QString,QString>::Iterator it; | 61 | QMap<QString,QString>::Iterator it; |
62 | InterfacePPP *iface; | 62 | InterfacePPP *iface; |
63 | qDebug("getting interfaces"); | 63 | odebug << "getting interfaces" << oendl; |
64 | for( it = ifaces.begin(); it != ifaces.end(); ++it ) | 64 | for( it = ifaces.begin(); it != ifaces.end(); ++it ) |
65 | { | 65 | { |
66 | qDebug("ifaces %s %s", it.key().latin1(), it.data().latin1() ); | 66 | odebug << "ifaces " << it.key().latin1() << " " << it.data().latin1() << "" << oendl; |
67 | iface = new InterfacePPP( 0, it.key() ); | 67 | iface = new InterfacePPP( 0, it.key() ); |
68 | iface->setHardwareName( it.data() ); | 68 | iface->setHardwareName( it.data() ); |
69 | list.append( (Interface*)iface ); | 69 | list.append( (Interface*)iface ); |
70 | 70 | ||
71 | // check if (*it) is one of the running ifaces | 71 | // check if (*it) is one of the running ifaces |
72 | if ( running.contains( it.data() ) ) | 72 | if ( running.contains( it.data() ) ) |
73 | { | 73 | { |
74 | qDebug("iface is running %s", it.key().latin1() ); | 74 | odebug << "iface is running " << it.key().latin1() << "" << oendl; |
75 | handledInterfaceNames << running[it.data()].device; | 75 | handledInterfaceNames << running[it.data()].device; |
76 | iface->setStatus( true ); | 76 | iface->setStatus( true ); |
77 | iface->setPPPDpid( running[it.data()].pid ); | 77 | iface->setPPPDpid( running[it.data()].pid ); |
78 | iface->modem()->setPPPDevice( running[it.data()].device ); | 78 | iface->modem()->setPPPDevice( running[it.data()].device ); |
@@ -87,18 +87,18 @@ PPPModule::PPPModule() : Module() | |||
87 | * Delete any interfaces that we own. | 87 | * Delete any interfaces that we own. |
88 | */ | 88 | */ |
89 | PPPModule::~PPPModule() | 89 | PPPModule::~PPPModule() |
90 | { | 90 | { |
91 | qDebug("PPPModule::~PPPModule() " ); | 91 | odebug << "PPPModule::~PPPModule() " << oendl; |
92 | QMap<QString,QString> ifaces; | 92 | QMap<QString,QString> ifaces; |
93 | InterfaceKeeper keeper; | 93 | InterfaceKeeper keeper; |
94 | Interface *i; | 94 | Interface *i; |
95 | for ( i=list.first(); i != 0; i=list.next() ) | 95 | for ( i=list.first(); i != 0; i=list.next() ) |
96 | { | 96 | { |
97 | /* if online save the state */ | 97 | /* if online save the state */ |
98 | if ( i->getStatus() ) | 98 | if ( i->getStatus() ) |
99 | { | 99 | { |
100 | qDebug("Iface %s is still up", i->getHardwareName().latin1() ); | 100 | odebug << "Iface " << i->getHardwareName().latin1() << " is still up" << oendl; |
101 | InterfacePPP* ppp = static_cast<InterfacePPP*>(i); | 101 | InterfacePPP* ppp = static_cast<InterfacePPP*>(i); |
102 | keeper.addInterface( ppp->pppPID(), ppp->pppDev(), ppp->getHardwareName() ); | 102 | keeper.addInterface( ppp->pppPID(), ppp->pppDev(), ppp->getHardwareName() ); |
103 | } | 103 | } |
104 | ifaces.insert( i->getInterfaceName(), i->getHardwareName() ); | 104 | ifaces.insert( i->getInterfaceName(), i->getHardwareName() ); |
@@ -140,9 +140,9 @@ bool PPPModule::isOwner(Interface *i) | |||
140 | * @return QWidget* pointer to this modules configure. | 140 | * @return QWidget* pointer to this modules configure. |
141 | */ | 141 | */ |
142 | QWidget *PPPModule::configure(Interface *i) | 142 | QWidget *PPPModule::configure(Interface *i) |
143 | { | 143 | { |
144 | qDebug("return ModemWidget"); | 144 | odebug << "return ModemWidget" << oendl; |
145 | PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, | 145 | PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, |
146 | 0, "PPPConfig", false, | 146 | 0, "PPPConfig", false, |
147 | (Qt::WDestructiveClose | Qt::WStyle_ContextHelp)); | 147 | (Qt::WDestructiveClose | Qt::WStyle_ContextHelp)); |
148 | return pppconfig; | 148 | return pppconfig; |
@@ -167,9 +167,9 @@ QWidget *PPPModule::information(Interface *i) | |||
167 | */ | 167 | */ |
168 | QList<Interface> PPPModule::getInterfaces() | 168 | QList<Interface> PPPModule::getInterfaces() |
169 | { | 169 | { |
170 | // List all of the files in the peer directory | 170 | // List all of the files in the peer directory |
171 | qDebug("PPPModule::getInterfaces"); | 171 | odebug << "PPPModule::getInterfaces" << oendl; |
172 | return list; | 172 | return list; |
173 | } | 173 | } |
174 | 174 | ||
175 | /** | 175 | /** |
@@ -260,9 +260,9 @@ namespace | |||
260 | cfg.setGroup( (*it) ); | 260 | cfg.setGroup( (*it) ); |
261 | con.name = (*it); | 261 | con.name = (*it); |
262 | con.pid = cfg.readNumEntry("pid"); | 262 | con.pid = cfg.readNumEntry("pid"); |
263 | con.device = cfg.readEntry("device"); | 263 | con.device = cfg.readEntry("device"); |
264 | qDebug(" %s %s %d", con.name.latin1(), con.device.latin1(), con.pid ); | 264 | odebug << " " << con.name.latin1() << " " << con.device.latin1() << " " << con.pid << "" << oendl; |
265 | 265 | ||
266 | if ( con.pid != -1 && isAvailable( con.pid ) ) | 266 | if ( con.pid != -1 && isAvailable( con.pid ) ) |
267 | ifaces.insert( con.name, con ); | 267 | ifaces.insert( con.name, con ); |
268 | } | 268 | } |
@@ -271,13 +271,13 @@ namespace | |||
271 | bool InterfaceKeeper::isAvailable( pid_t p)const | 271 | bool InterfaceKeeper::isAvailable( pid_t p)const |
272 | { | 272 | { |
273 | if (::kill(p, 0 ) == 0 || errno != ESRCH ) | 273 | if (::kill(p, 0 ) == 0 || errno != ESRCH ) |
274 | { | 274 | { |
275 | qDebug("isAvailable %d", p); | 275 | odebug << "isAvailable " << p << "" << oendl; |
276 | return true; | 276 | return true; |
277 | } | 277 | } |
278 | 278 | ||
279 | qDebug("notAvailable %d", p); | 279 | odebug << "notAvailable " << p << "" << oendl; |
280 | return false; | 280 | return false; |
281 | } | 281 | } |
282 | 282 | ||
283 | } | 283 | } |
diff --git a/noncore/settings/networksettings/wlan/infoimp.cpp b/noncore/settings/networksettings/wlan/infoimp.cpp index bd56678..c558f5e 100644 --- a/noncore/settings/networksettings/wlan/infoimp.cpp +++ b/noncore/settings/networksettings/wlan/infoimp.cpp | |||
@@ -12,9 +12,9 @@ | |||
12 | WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInfo(parent, name, fl){ | 12 | WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInfo(parent, name, fl){ |
13 | WExtensions *wExtensions = new WExtensions(name); | 13 | WExtensions *wExtensions = new WExtensions(name); |
14 | if(!wExtensions->doesHaveWirelessExtensions()){ | 14 | if(!wExtensions->doesHaveWirelessExtensions()){ |
15 | delete wExtensions; | 15 | delete wExtensions; |
16 | qDebug("WlanInfoImp::No wireless extension"); | 16 | odebug << "WlanInfoImp::No wireless extension" << oendl; |
17 | return; | 17 | return; |
18 | } | 18 | } |
19 | delete wExtensions; | 19 | delete wExtensions; |
20 | timer = new QTimer( this ); | 20 | timer = new QTimer( this ); |
@@ -27,9 +27,9 @@ WlanInfoImp::WlanInfoImp( QWidget* parent, const char* name, WFlags fl): WlanInf | |||
27 | */ | 27 | */ |
28 | void WlanInfoImp::update(){ | 28 | void WlanInfoImp::update(){ |
29 | WExtensions *wExtensions = new WExtensions(this->name()); | 29 | WExtensions *wExtensions = new WExtensions(this->name()); |
30 | if(!wExtensions->doesHaveWirelessExtensions()){ | 30 | if(!wExtensions->doesHaveWirelessExtensions()){ |
31 | qDebug("No extension"); | 31 | odebug << "No extension" << oendl; |
32 | delete wExtensions; | 32 | delete wExtensions; |
33 | timer->stop(); | 33 | timer->stop(); |
34 | return; | 34 | return; |
35 | } | 35 | } |
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp index d1fff88..9c64323 100644 --- a/noncore/settings/networksettings/wlan/wextensions.cpp +++ b/noncore/settings/networksettings/wlan/wextensions.cpp | |||
@@ -111,9 +111,9 @@ int WExtensions::channel(){ | |||
111 | return channel; | 111 | return channel; |
112 | left += 0.005; | 112 | left += 0.005; |
113 | right += 0.005; | 113 | right += 0.005; |
114 | } | 114 | } |
115 | qDebug(QString("Unknown frequency: %1, returning -1 for the channel.").arg(num).latin1()); | 115 | odebug << QString("Unknown frequency: %1, returning -1 for the channel.").arg(num).latin1() << oendl; |
116 | return -1; | 116 | return -1; |
117 | } | 117 | } |
118 | 118 | ||
119 | /*** | 119 | /*** |
@@ -176,22 +176,22 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){ | |||
176 | while(!wstream.atEnd()){ | 176 | while(!wstream.atEnd()){ |
177 | wstream >> name >> status >> quality >> c >> signal >> c >> noise; | 177 | wstream >> name >> status >> quality >> c >> signal >> c >> noise; |
178 | if(name == QString("%1:").arg(interface)){ | 178 | if(name == QString("%1:").arg(interface)){ |
179 | if ( quality > 92 ) | 179 | if ( quality > 92 ) |
180 | qDebug( "WIFIAPPLET: D'oh! Quality %d > estimated max!\n", quality ); | 180 | odebug << "WIFIAPPLET: D'oh! Quality " << quality << " > estimated max!\n" << oendl; |
181 | if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) ) | 181 | if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) ) |
182 | qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal ); | 182 | odebug << "WIFIAPPLET: Doh! Strength " << signal << " > estimated max!\n" << oendl; |
183 | if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) ) | 183 | if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) ) |
184 | qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise ); | 184 | odebug << "WIFIAPPLET: Doh! Noise " << noise << " > estimated max!\n" << oendl; |
185 | //qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1()); | 185 | //odebug << QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1() << oendl; |
186 | signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER; | 186 | signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER; |
187 | noise = ( ( noise-IW_LOWER ) * 100 ) / IW_UPPER; | 187 | noise = ( ( noise-IW_LOWER ) * 100 ) / IW_UPPER; |
188 | quality = ( quality*100 ) / 92; | 188 | quality = ( quality*100 ) / 92; |
189 | return true; | 189 | return true; |
190 | } | 190 | } |
191 | } | 191 | } |
192 | 192 | ||
193 | qDebug("WExtensions::statsCard no longer present."); | 193 | odebug << "WExtensions::statsCard no longer present." << oendl; |
194 | quality = -1; | 194 | quality = -1; |
195 | signal = IW_LOWER; | 195 | signal = IW_LOWER; |
196 | noise = IW_LOWER; | 196 | noise = IW_LOWER; |
197 | return false; | 197 | return false; |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 80a9927..fe7941d 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -44,9 +44,9 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
44 | settingsFileText = QStringList::split("\n", line, true); | 44 | settingsFileText = QStringList::split("\n", line, true); |
45 | parseSettingFile(); | 45 | parseSettingFile(); |
46 | } | 46 | } |
47 | else | 47 | else |
48 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); | 48 | odebug << QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1() << oendl; |
49 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); | 49 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); |
50 | } | 50 | } |
51 | 51 | ||
52 | void WLANImp::typeChanged(int mod){ | 52 | void WLANImp::typeChanged(int mod){ |
@@ -145,9 +145,9 @@ void WLANImp::changeAndSaveSettingFile(){ | |||
145 | QFile::remove(wlanFile); | 145 | QFile::remove(wlanFile); |
146 | QFile file(wlanFile); | 146 | QFile file(wlanFile); |
147 | 147 | ||
148 | if (!file.open(IO_ReadWrite)){ | 148 | if (!file.open(IO_ReadWrite)){ |
149 | qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1()); | 149 | odebug << QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1() << oendl; |
150 | return; | 150 | return; |
151 | } | 151 | } |
152 | 152 | ||
153 | QTextStream stream( &file ); | 153 | QTextStream stream( &file ); |
@@ -235,9 +235,9 @@ void WLANImp::accept(){ | |||
235 | insert << "-c"; | 235 | insert << "-c"; |
236 | insert << "cardctl eject && cardctl insert"; | 236 | insert << "cardctl eject && cardctl insert"; |
237 | 237 | ||
238 | if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) { | 238 | if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) { |
239 | qWarning("could not start cardctl"); | 239 | owarn << "could not start cardctl" << oendl; |
240 | } | 240 | } |
241 | 241 | ||
242 | // Close out the dialog | 242 | // Close out the dialog |
243 | QDialog::accept(); | 243 | QDialog::accept(); |
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp index eeebe7f..e483efe 100644 --- a/noncore/settings/networksettings/wlan/wlanimp2.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp | |||
@@ -51,9 +51,9 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
51 | 51 | ||
52 | // Check sanity - the existance of the wireless-tools if-pre-up script | 52 | // Check sanity - the existance of the wireless-tools if-pre-up script |
53 | QFile file(QString(PREUP)); | 53 | QFile file(QString(PREUP)); |
54 | if (file.exists()) { | 54 | if (file.exists()) { |
55 | qWarning(QString("WLANImp: Unable to open /etc/network/if-pre-up.d/wireless-tools")); | 55 | owarn << QString("WLANImp: Unable to open /etc/network/if-pre-up.d/wireless-tools") << oendl; |
56 | } | 56 | } |
57 | 57 | ||
58 | connect( rescanButton, SIGNAL( clicked() ), this, SLOT( rescanNeighbourhood() ) ); | 58 | connect( rescanButton, SIGNAL( clicked() ), this, SLOT( rescanNeighbourhood() ) ); |
59 | connect( netView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( selectNetwork(QListViewItem*) ) ); | 59 | connect( netView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( selectNetwork(QListViewItem*) ) ); |
@@ -232,9 +232,9 @@ void WLANImp::writeOpts() { | |||
232 | return; | 232 | return; |
233 | } | 233 | } |
234 | bool error = false; | 234 | bool error = false; |
235 | 235 | ||
236 | qDebug("setting wlan interface %s", interfaces->getInterfaceName( error ).latin1() ); | 236 | odebug << "setting wlan interface " << interfaces->getInterfaceName( error ).latin1() << "" << oendl; |
237 | 237 | ||
238 | if (error) QMessageBox::warning(0,"Inface not set","should not happen!!!"); | 238 | if (error) QMessageBox::warning(0,"Inface not set","should not happen!!!"); |
239 | 239 | ||
240 | interfaces->setInterfaceOption(QString("wireless_mode"), mode->currentText()); | 240 | interfaces->setInterfaceOption(QString("wireless_mode"), mode->currentText()); |
@@ -306,9 +306,9 @@ void WLANImp::writeOpts() { | |||
306 | 306 | ||
307 | void WLANImp::rescanNeighbourhood() | 307 | void WLANImp::rescanNeighbourhood() |
308 | { | 308 | { |
309 | QString name = interface->getInterfaceName(); | 309 | QString name = interface->getInterfaceName(); |
310 | qDebug( "rescanNeighbourhood via '%s'", (const char*) name ); | 310 | odebug << "rescanNeighbourhood via '" << (const char*) name << "'" << oendl; |
311 | 311 | ||
312 | OWirelessNetworkInterface* wiface = static_cast<OWirelessNetworkInterface*>( ONetwork::instance()->interface( name ) ); | 312 | OWirelessNetworkInterface* wiface = static_cast<OWirelessNetworkInterface*>( ONetwork::instance()->interface( name ) ); |
313 | assert( wiface ); | 313 | assert( wiface ); |
314 | 314 | ||
@@ -329,14 +329,14 @@ void WLANImp::rescanNeighbourhood() | |||
329 | } | 329 | } |
330 | } | 330 | } |
331 | if ( devicetype.isEmpty() ) | 331 | if ( devicetype.isEmpty() ) |
332 | { | 332 | { |
333 | qWarning( "rescanNeighbourhood(): couldn't guess device type :(" ); | 333 | owarn << "rescanNeighbourhood(): couldn't guess device type :(" << oendl; |
334 | return; | 334 | return; |
335 | } | 335 | } |
336 | else | 336 | else |
337 | { | 337 | { |
338 | qDebug( "rescanNeighbourhood(): device type seems to be '%s'", (const char*) devicetype ); | 338 | odebug << "rescanNeighbourhood(): device type seems to be '" << (const char*) devicetype << "'" << oendl; |
339 | } | 339 | } |
340 | 340 | ||
341 | // configure interface to receive 802.11 management frames | 341 | // configure interface to receive 802.11 management frames |
342 | 342 | ||
@@ -348,25 +348,25 @@ void WLANImp::rescanNeighbourhood() | |||
348 | else if ( devicetype == "wlan-ng" ) wiface->setMonitoring( new OWlanNGMonitoringInterface( wiface, false ) ); | 348 | else if ( devicetype == "wlan-ng" ) wiface->setMonitoring( new OWlanNGMonitoringInterface( wiface, false ) ); |
349 | else if ( devicetype == "orinoco" ) wiface->setMonitoring( new OOrinocoMonitoringInterface( wiface, false ) ); | 349 | else if ( devicetype == "orinoco" ) wiface->setMonitoring( new OOrinocoMonitoringInterface( wiface, false ) ); |
350 | else | 350 | else |
351 | { | 351 | { |
352 | qDebug( "rescanNeighbourhood(): unsupported device type for monitoring :(" ); | 352 | odebug << "rescanNeighbourhood(): unsupported device type for monitoring :(" << oendl; |
353 | return; | 353 | return; |
354 | } | 354 | } |
355 | 355 | ||
356 | wiface->setMode( "monitor" ); | 356 | wiface->setMode( "monitor" ); |
357 | if ( wiface->mode() != "monitor" ) | 357 | if ( wiface->mode() != "monitor" ) |
358 | { | 358 | { |
359 | qWarning( "rescanNeighbourhood(): Unable to bring device into monitor mode (%s).", strerror( errno ) ); | 359 | owarn << "rescanNeighbourhood(): Unable to bring device into monitor mode (" << strerror( errno ) << ")." << oendl; |
360 | return; | 360 | return; |
361 | } | 361 | } |
362 | 362 | ||
363 | // open a packet capturer | 363 | // open a packet capturer |
364 | OPacketCapturer* cap = new OPacketCapturer(); | 364 | OPacketCapturer* cap = new OPacketCapturer(); |
365 | cap->open( name ); | 365 | cap->open( name ); |
366 | if ( !cap->isOpen() ) | 366 | if ( !cap->isOpen() ) |
367 | { | 367 | { |
368 | qWarning( "rescanNeighbourhood(): Unable to open libpcap (%s).", strerror( errno ) ); | 368 | owarn << "rescanNeighbourhood(): Unable to open libpcap (" << strerror( errno ) << ")." << oendl; |
369 | return; | 369 | return; |
370 | } | 370 | } |
371 | 371 | ||
372 | // display splash screen | 372 | // display splash screen |
@@ -397,17 +397,17 @@ void WLANImp::rescanNeighbourhood() | |||
397 | { | 397 | { |
398 | wiface->setChannel( i ); | 398 | wiface->setChannel( i ); |
399 | pb->setProgress( i ); | 399 | pb->setProgress( i ); |
400 | qApp->processEvents(); | 400 | qApp->processEvents(); |
401 | qDebug( "rescanNeighbourhood(): listening on channel %d...", i ); | 401 | odebug << "rescanNeighbourhood(): listening on channel " << i << "..." << oendl; |
402 | OPacket* p = cap->next( 1000 ); | 402 | OPacket* p = cap->next( 1000 ); |
403 | if ( !p ) | 403 | if ( !p ) |
404 | { | 404 | { |
405 | qDebug( "rescanNeighbourhood(): nothing received on channel %d", i ); | 405 | odebug << "rescanNeighbourhood(): nothing received on channel " << i << "" << oendl; |
406 | } | 406 | } |
407 | else | 407 | else |
408 | { | 408 | { |
409 | qDebug( "rescanNeighbourhood(): TADAA - something came in on channel %d", i ); | 409 | odebug << "rescanNeighbourhood(): TADAA - something came in on channel " << i << "" << oendl; |
410 | handlePacket( p ); | 410 | handlePacket( p ); |
411 | } | 411 | } |
412 | } | 412 | } |
413 | 413 | ||
@@ -438,9 +438,9 @@ void WLANImp::handlePacket( OPacket* p ) | |||
438 | type = "managed"; | 438 | type = "managed"; |
439 | } | 439 | } |
440 | else | 440 | else |
441 | { | 441 | { |
442 | qWarning( "handlePacket(): invalid frame [possibly noise] detected!" ); | 442 | owarn << "handlePacket(): invalid frame [possibly noise] detected!" << oendl; |
443 | return; | 443 | return; |
444 | } | 444 | } |
445 | 445 | ||
446 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); | 446 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 74d7f8e..886af10 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -121,55 +121,55 @@ bool WLANModule::remove(Interface*){ | |||
121 | } | 121 | } |
122 | 122 | ||
123 | void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | 123 | void WLANModule::receive(const QCString ¶m, const QByteArray &arg) |
124 | { | 124 | { |
125 | qDebug("WLANModule::receive "+param); | 125 | odebug << "WLANModule::receive "+param << oendl; |
126 | QStringList params = QStringList::split(",",param); | 126 | QStringList params = QStringList::split(",",param); |
127 | int count = params.count(); | 127 | int count = params.count(); |
128 | qDebug("WLANModule got %i params", count ); | 128 | odebug << "WLANModule got " << count << " params" << oendl; |
129 | if (count < 2){ | 129 | if (count < 2){ |
130 | qDebug("Erorr less than 2 parameter"); | 130 | odebug << "Erorr less than 2 parameter" << oendl; |
131 | qDebug("RETURNING"); | 131 | odebug << "RETURNING" << oendl; |
132 | return; | 132 | return; |
133 | } | 133 | } |
134 | 134 | ||
135 | QDataStream stream(arg,IO_ReadOnly); | 135 | QDataStream stream(arg,IO_ReadOnly); |
136 | QString interface; | 136 | QString interface; |
137 | QString action; | 137 | QString action; |
138 | int countMsgs = 0; | 138 | int countMsgs = 0; |
139 | stream >> interface; | 139 | stream >> interface; |
140 | qDebug("got count? >%s<",interface.latin1()); | 140 | odebug << "got count? >" << interface.latin1() << "<" << oendl; |
141 | if (interface == "count"){ | 141 | if (interface == "count"){ |
142 | qDebug("got count"); | 142 | odebug << "got count" << oendl; |
143 | stream >> action; | 143 | stream >> action; |
144 | qDebug("Got count num >%s<", action.latin1()); | 144 | odebug << "Got count num >" << action.latin1() << "<" << oendl; |
145 | countMsgs = action.toInt(); | 145 | countMsgs = action.toInt(); |
146 | } | 146 | } |
147 | 147 | ||
148 | QDialog *toShow; | 148 | QDialog *toShow; |
149 | //while (! stream.atEnd() ){ | 149 | //while (! stream.atEnd() ){ |
150 | for (int i = 0; i < countMsgs; i++){ | 150 | for (int i = 0; i < countMsgs; i++){ |
151 | qDebug("start stream %d/%d",i,countMsgs); | 151 | odebug << "start stream " << i << "/" << countMsgs << "" << oendl; |
152 | if (stream.atEnd()){ | 152 | if (stream.atEnd()){ |
153 | qDebug("end of stream"); | 153 | odebug << "end of stream" << oendl; |
154 | return; | 154 | return; |
155 | } | 155 | } |
156 | stream >> interface; | 156 | stream >> interface; |
157 | qDebug("got iface"); | 157 | odebug << "got iface" << oendl; |
158 | stream >> action; | 158 | stream >> action; |
159 | qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1()); | 159 | odebug << "WLANModule got interface " << interface.latin1() << " and acion " << action.latin1() << "" << oendl; |
160 | // find interfaces | 160 | // find interfaces |
161 | Interface *ifa=0; | 161 | Interface *ifa=0; |
162 | for ( Interface *i=list.first(); i != 0; i=list.next() ){ | 162 | for ( Interface *i=list.first(); i != 0; i=list.next() ){ |
163 | if (i->getInterfaceName() == interface){ | 163 | if (i->getInterfaceName() == interface){ |
164 | qDebug("WLANModule found interface %s",interface.latin1()); | 164 | odebug << "WLANModule found interface " << interface.latin1() << "" << oendl; |
165 | ifa = i; | 165 | ifa = i; |
166 | } | 166 | } |
167 | } | 167 | } |
168 | 168 | ||
169 | if (ifa == 0){ | 169 | if (ifa == 0){ |
170 | qDebug("WLANModule Did not find %s",interface.latin1()); | 170 | odebug << "WLANModule Did not find " << interface.latin1() << "" << oendl; |
171 | qDebug("skipping"); | 171 | odebug << "skipping" << oendl; |
172 | count = 0; | 172 | count = 0; |
173 | } | 173 | } |
174 | 174 | ||
175 | if (count == 2){ | 175 | if (count == 2){ |
@@ -194,11 +194,11 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
194 | toShow = (QDialog*) wlanconfigWiget; | 194 | toShow = (QDialog*) wlanconfigWiget; |
195 | } | 195 | } |
196 | QPEApplication::showWidget( wlanconfigWiget ); | 196 | QPEApplication::showWidget( wlanconfigWiget ); |
197 | stream >> value; | 197 | stream >> value; |
198 | qDebug("WLANModule (build 4) is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); | 198 | odebug << "WLANModule (build 4) is setting " << action.latin1() << " of " << interface.latin1() << " to " << value.latin1() << "" << oendl; |
199 | if (value.isEmpty()){ | 199 | if (value.isEmpty()){ |
200 | qDebug("value is empty!!!\nreturning"); | 200 | odebug << "value is empty!!!\nreturning" << oendl; |
201 | return; | 201 | return; |
202 | } | 202 | } |
203 | if ( action.contains("ESSID") ){ | 203 | if ( action.contains("ESSID") ){ |
204 | QComboBox *combo = wlanconfigWiget->essid; | 204 | QComboBox *combo = wlanconfigWiget->essid; |
@@ -217,39 +217,39 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | |||
217 | } | 217 | } |
218 | 218 | ||
219 | }else if (action.contains("Channel")){ | 219 | }else if (action.contains("Channel")){ |
220 | bool ok; | 220 | bool ok; |
221 | qDebug("converting channel"); | 221 | odebug << "converting channel" << oendl; |
222 | int chan = value.toInt( &ok ); | 222 | int chan = value.toInt( &ok ); |
223 | if (ok){ | 223 | if (ok){ |
224 | qDebug("ok setting channel"); | 224 | odebug << "ok setting channel" << oendl; |
225 | wlanconfigWiget->specifyChan->setChecked( true ); | 225 | wlanconfigWiget->specifyChan->setChecked( true ); |
226 | wlanconfigWiget->networkChannel->setValue( chan ); | 226 | wlanconfigWiget->networkChannel->setValue( chan ); |
227 | } | 227 | } |
228 | }else if (action.contains("MacAddr")){ | 228 | }else if (action.contains("MacAddr")){ |
229 | wlanconfigWiget->specifyAp->setChecked( true ); | 229 | wlanconfigWiget->specifyAp->setChecked( true ); |
230 | wlanconfigWiget->macEdit->setText( value ); | 230 | wlanconfigWiget->macEdit->setText( value ); |
231 | }else | 231 | }else |
232 | qDebug("wlan plugin has no clue"); | 232 | odebug << "wlan plugin has no clue" << oendl; |
233 | } | 233 | } |
234 | qDebug("next stream"); | 234 | odebug << "next stream" << oendl; |
235 | }// while stream | 235 | }// while stream |
236 | qDebug("end of stream"); | 236 | odebug << "end of stream" << oendl; |
237 | if (toShow) toShow->exec(); | 237 | if (toShow) toShow->exec(); |
238 | qDebug("returning"); | 238 | odebug << "returning" << oendl; |
239 | } | 239 | } |
240 | 240 | ||
241 | QWidget *WLANModule::getInfo( Interface *i) | 241 | QWidget *WLANModule::getInfo( Interface *i) |
242 | { | 242 | { |
243 | qDebug("WLANModule::getInfo start"); | 243 | odebug << "WLANModule::getInfo start" << oendl; |
244 | WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); | 244 | WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); |
245 | InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); | 245 | InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); |
246 | info->tabWidget->insertTab(information, "TCP/IP", 0); | 246 | info->tabWidget->insertTab(information, "TCP/IP", 0); |
247 | info->tabWidget->setCurrentPage( 0 ); | 247 | info->tabWidget->setCurrentPage( 0 ); |
248 | info->tabWidget->showPage( information ); | 248 | info->tabWidget->showPage( information ); |
249 | if (info->tabWidget->currentPage() == information ) qDebug("infotab OK"); | 249 | if (info->tabWidget->currentPage() == information ) odebug << "infotab OK" << oendl; |
250 | else qDebug("infotab NOT OK"); | 250 | else odebug << "infotab NOT OK" << oendl; |
251 | qDebug("current idx %d", info->tabWidget->currentPageIndex()); | 251 | odebug << "current idx " << info->tabWidget->currentPageIndex() << "" << oendl; |
252 | qDebug("WLANModule::getInfo return"); | 252 | odebug << "WLANModule::getInfo return" << oendl; |
253 | return info; | 253 | return info; |
254 | } | 254 | } |
255 | 255 | ||
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index a3804c3..58e94f3 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro | |||
@@ -1,10 +1,9 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = soundsettings.h soundsettingsbase.h | 2 | HEADERS = soundsettings.h soundsettingsbase.h |
3 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp | 3 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp |
4 | #INTERFACES = soundsettingsbase.ui | ||
5 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 | 6 | LIBS += -lqpe -lopiecore2 |
8 | TARGET = sound | 7 | TARGET = sound |
9 | 8 | ||
10 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 8ad0a3f..d55a751 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -20,22 +20,26 @@ | |||
20 | // parts copyright 2002 L.J. Potter | 20 | // parts copyright 2002 L.J. Potter |
21 | 21 | ||
22 | #include "soundsettings.h" | 22 | #include "soundsettings.h" |
23 | 23 | ||
24 | /* OPIE */ | ||
25 | #include <opie2/odebug.h> | ||
24 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
26 | #include <qpe/qcopenvelope_qws.h> | 28 | #include <qpe/qcopenvelope_qws.h> |
27 | #include <qpe/storage.h> | 29 | #include <qpe/storage.h> |
30 | using namespace Opie::Core; | ||
28 | 31 | ||
32 | /* QT */ | ||
29 | #include <qcheckbox.h> | 33 | #include <qcheckbox.h> |
30 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
31 | #include <qlabel.h> | 35 | #include <qlabel.h> |
32 | 36 | ||
37 | /* STD */ | ||
33 | #include <sys/utsname.h> | 38 | #include <sys/utsname.h> |
34 | #include <sys/time.h> | 39 | #include <sys/time.h> |
35 | #include <sys/types.h> | 40 | #include <sys/types.h> |
36 | #include <unistd.h> | 41 | #include <unistd.h> |
37 | #include <stdio.h> | ||
38 | #include <sys/stat.h> | 42 | #include <sys/stat.h> |
39 | 43 | ||
40 | 44 | ||
41 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | 45 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) |
@@ -72,9 +76,9 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
72 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 76 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
73 | if (uname(&name) != -1) {// TODO change this here,... | 77 | if (uname(&name) != -1) {// TODO change this here,... |
74 | QString release=name.release; | 78 | QString release=name.release; |
75 | if( release.find("embedix",0,TRUE) != -1) { | 79 | if( release.find("embedix",0,TRUE) != -1) { |
76 | qDebug("IS System Zaurus"); | 80 | odebug << "IS System Zaurus" << oendl; |
77 | systemZaurus=TRUE; | 81 | systemZaurus=TRUE; |
78 | } | 82 | } |
79 | } | 83 | } |
80 | if(!systemZaurus) { | 84 | if(!systemZaurus) { |
@@ -84,9 +88,9 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
84 | sixteenBitCheckBox->setEnabled(FALSE); | 88 | sixteenBitCheckBox->setEnabled(FALSE); |
85 | #else | 89 | #else |
86 | #endif | 90 | #endif |
87 | int sRate=cfg.readNumEntry("SizeLimit", 30); | 91 | int sRate=cfg.readNumEntry("SizeLimit", 30); |
88 | qDebug("%d",sRate); | 92 | odebug << "" << sRate << "" << oendl; |
89 | 93 | ||
90 | if(sRate ==30) | 94 | if(sRate ==30) |
91 | timeLimitComboBox->setCurrentItem(0); | 95 | timeLimitComboBox->setCurrentItem(0); |
92 | else if(sRate==20) | 96 | else if(sRate==20) |
@@ -142,26 +146,26 @@ void SoundSettings::updateStorageCombo() { | |||
142 | QListIterator<FileSystem> it ( fs ); | 146 | QListIterator<FileSystem> it ( fs ); |
143 | for( ; it.current(); ++it ){ | 147 | for( ; it.current(); ++it ){ |
144 | const QString name = (*it)->name(); | 148 | const QString name = (*it)->name(); |
145 | const QString path = (*it)->path(); | 149 | const QString path = (*it)->path(); |
146 | qDebug("storage name "+name +" storage path is "+path); | 150 | odebug << "storage name "+name +" storage path is "+path << oendl; |
147 | list << name + ": " +path; | 151 | list << name + ": " +path; |
148 | if( loc.find( path,0,TRUE) != -1) | 152 | if( loc.find( path,0,TRUE) != -1) |
149 | set = i; | 153 | set = i; |
150 | // if(dit.current()->file().find(path) != -1 ) storage=name; | 154 | // if(dit.current()->file().find(path) != -1 ) storage=name; |
151 | i++; | 155 | i++; |
152 | } | 156 | } |
153 | 157 | ||
154 | LocationComboBox->insertStringList(list); | 158 | LocationComboBox->insertStringList(list); |
155 | qDebug("set item %d", set); | 159 | odebug << "set item " << set << "" << oendl; |
156 | LocationComboBox->setCurrentItem(set); | 160 | LocationComboBox->setCurrentItem(set); |
157 | } | 161 | } |
158 | 162 | ||
159 | void SoundSettings::setLocation(const QString & string) { | 163 | void SoundSettings::setLocation(const QString & string) { |
160 | Config config( "Vmemo" ); | 164 | Config config( "Vmemo" ); |
161 | config.setGroup( "System" ); | 165 | config.setGroup( "System" ); |
162 | config.writeEntry("RecLocation",string); | 166 | config.writeEntry("RecLocation",string); |
163 | qDebug("set location "+string); | 167 | odebug << "set location "+string << oendl; |
164 | config.write(); | 168 | config.write(); |
165 | } | 169 | } |
166 | 170 | ||
167 | void SoundSettings::cleanUp() { | 171 | void SoundSettings::cleanUp() { |
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index 96bcdfc..4163fb2 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp | |||
@@ -18,15 +18,18 @@ | |||
18 | 18 | ||
19 | #include "benchmarkinfo.h" | 19 | #include "benchmarkinfo.h" |
20 | 20 | ||
21 | /* OPIE */ | 21 | /* OPIE */ |
22 | #include <opie2/odebug.h> | ||
22 | #include <opie2/ostorageinfo.h> | 23 | #include <opie2/ostorageinfo.h> |
23 | #include <opie2/olistview.h> | 24 | #include <opie2/olistview.h> |
24 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 26 | #include <qpe/qcopenvelope_qws.h> |
26 | #include <qpe/qpedecoration_qws.h> | 27 | #include <qpe/qpedecoration_qws.h> |
27 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
28 | #include <qpe/config.h> | 29 | #include <qpe/config.h> |
30 | using namespace Opie::Core; | ||
31 | using namespace Opie::Ui; | ||
29 | 32 | ||
30 | /* QT */ | 33 | /* QT */ |
31 | #include <qclipboard.h> | 34 | #include <qclipboard.h> |
32 | #include <qcolor.h> | 35 | #include <qcolor.h> |
@@ -50,12 +53,9 @@ | |||
50 | #if defined (__GNUC__) && (__GNUC__ < 3) | 53 | #if defined (__GNUC__) && (__GNUC__ < 3) |
51 | #define round qRound | 54 | #define round qRound |
52 | #endif | 55 | #endif |
53 | 56 | ||
54 | using namespace Opie::Ui; | ||
55 | using namespace Opie::Core; | ||
56 | extern "C" | 57 | extern "C" |
57 | |||
58 | { | 58 | { |
59 | void BenchFFT( void ); | 59 | void BenchFFT( void ); |
60 | double dhry_main( int ); | 60 | double dhry_main( int ); |
61 | } | 61 | } |
@@ -147,9 +147,9 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
147 | QTextStream ts( &f ); | 147 | QTextStream ts( &f ); |
148 | while( !ts.eof() ) | 148 | while( !ts.eof() ) |
149 | { | 149 | { |
150 | QString machline = ts.readLine(); | 150 | QString machline = ts.readLine(); |
151 | qDebug( "sysinfo: parsing benchmark results for '%s'", (const char*) machline ); | 151 | odebug << "sysinfo: parsing benchmark results for '" << (const char*) machline << "'" << oendl; |
152 | QString resline = ts.readLine(); | 152 | QString resline = ts.readLine(); |
153 | machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) ); | 153 | machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) ); |
154 | machineCombo->insertItem( machline ); | 154 | machineCombo->insertItem( machline ); |
155 | } | 155 | } |
@@ -172,9 +172,9 @@ void BenchmarkInfo::machineActivated( int index ) | |||
172 | { | 172 | { |
173 | QStringList* results = machines[ machineCombo->text( index ) ]; | 173 | QStringList* results = machines[ machineCombo->text( index ) ]; |
174 | if ( !results ) | 174 | if ( !results ) |
175 | { | 175 | { |
176 | qDebug( "sysinfo: no results available." ); | 176 | odebug << "sysinfo: no results available." << oendl; |
177 | return; | 177 | return; |
178 | } | 178 | } |
179 | QStringList::Iterator it = results->begin(); | 179 | QStringList::Iterator it = results->begin(); |
180 | test_alu->setText( 2, *(it++) ); | 180 | test_alu->setText( 2, *(it++) ); |
diff --git a/noncore/settings/tabmanager/tabmanager.cpp b/noncore/settings/tabmanager/tabmanager.cpp index 15aeaf5..4274203 100644 --- a/noncore/settings/tabmanager/tabmanager.cpp +++ b/noncore/settings/tabmanager/tabmanager.cpp | |||
@@ -62,9 +62,9 @@ TabManager::~TabManager(){ | |||
62 | * @param parent - the parent to place any new tabs or apps into. If parent is | 62 | * @param parent - the parent to place any new tabs or apps into. If parent is |
63 | * NULL then the item is a tab and should be placed as a child of the window. | 63 | * NULL then the item is a tab and should be placed as a child of the window. |
64 | */ | 64 | */ |
65 | void TabManager::rescanFolder(QString directory, QListViewItem* parent){ | 65 | void TabManager::rescanFolder(QString directory, QListViewItem* parent){ |
66 | //qDebug(QString("rescanFolder: ") + directory.latin1()); | 66 | //odebug << QString("rescanFolder: ") + directory.latin1() << oendl; |
67 | 67 | ||
68 | QDir d; | 68 | QDir d; |
69 | d.setPath(directory); | 69 | d.setPath(directory); |
70 | // Show hidden files for .directories | 70 | // Show hidden files for .directories |
@@ -206,9 +206,9 @@ void TabManager::removeItem(){ | |||
206 | } | 206 | } |
207 | 207 | ||
208 | // If removing failed. | 208 | // If removing failed. |
209 | if(!removeSuccessful){ | 209 | if(!removeSuccessful){ |
210 | qDebug((QString("removeItem: ") + location).latin1()); | 210 | odebug << (QString("removeItem: ") + location).latin1() << oendl; |
211 | QMessageBox::critical(this, tr("Message"), tr("Can't remove."), tr("Ok") ); | 211 | QMessageBox::critical(this, tr("Message"), tr("Can't remove."), tr("Ok") ); |
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | 214 | ||
@@ -243,9 +243,9 @@ void TabManager::editItem( QListViewItem * item){ | |||
243 | return; | 243 | return; |
244 | 244 | ||
245 | TabAppLnk app(itemList[item]); | 245 | TabAppLnk app(itemList[item]); |
246 | if(!app.isValid()){ | 246 | if(!app.isValid()){ |
247 | qDebug(QString("editItem: Not a valid applnk file: ") + itemList[item].latin1()); | 247 | odebug << QString("editItem: Not a valid applnk file: ") + itemList[item].latin1() << oendl; |
248 | return; | 248 | return; |
249 | } | 249 | } |
250 | 250 | ||
251 | // Fill with all of the icons | 251 | // Fill with all of the icons |
@@ -272,9 +272,9 @@ void TabManager::editItem( QListViewItem * item){ | |||
272 | foo = foo.smoothScale(16,16); | 272 | foo = foo.smoothScale(16,16); |
273 | imageOfFile.convertFromImage(foo); | 273 | imageOfFile.convertFromImage(foo); |
274 | application->iconLineEdit->insertItem(imageOfFile,fileName); | 274 | application->iconLineEdit->insertItem(imageOfFile,fileName); |
275 | } | 275 | } |
276 | //qDebug(fi->fileName().latin1()); | 276 | //odebug << fi->fileName().latin1() << oendl; |
277 | ++it; | 277 | ++it; |
278 | } | 278 | } |
279 | waitDialog.hide(); | 279 | waitDialog.hide(); |
280 | } | 280 | } |
@@ -401,10 +401,10 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){ | |||
401 | if(!r.rename(itemList[item], newFolder)){ | 401 | if(!r.rename(itemList[item], newFolder)){ |
402 | QMessageBox::critical(this, tr("Message"), "Can't move application.", tr("Ok") ); | 402 | QMessageBox::critical(this, tr("Message"), "Can't move application.", tr("Ok") ); |
403 | return; | 403 | return; |
404 | } | 404 | } |
405 | //qDebug((QString("moveApplication: ") + itemList[item]).latin1()); | 405 | //odebug << (QString("moveApplication: ") + itemList[item]).latin1() << oendl; |
406 | //qDebug((QString("moveApplication: ") + newFolder).latin1()); | 406 | //odebug << (QString("moveApplication: ") + newFolder).latin1() << oendl; |
407 | 407 | ||
408 | // Move in the gui | 408 | // Move in the gui |
409 | item->parent()->takeItem(item); | 409 | item->parent()->takeItem(item); |
410 | newGroup->insertItem(item); | 410 | newGroup->insertItem(item); |
@@ -414,9 +414,9 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){ | |||
414 | QString installedAppFile; | 414 | QString installedAppFile; |
415 | if(findInstalledApplication(desktopFile, installedAppFile)) | 415 | if(findInstalledApplication(desktopFile, installedAppFile)) |
416 | swapInstalledLocation(installedAppFile, desktopFile, newFolder); | 416 | swapInstalledLocation(installedAppFile, desktopFile, newFolder); |
417 | else | 417 | else |
418 | qDebug("moveApplication: No installed app found for dekstop file"); | 418 | odebug << "moveApplication: No installed app found for dekstop file" << oendl; |
419 | 419 | ||
420 | // Move application type | 420 | // Move application type |
421 | AppLnk app(newFolder); | 421 | AppLnk app(newFolder); |
422 | app.setType(folderName); | 422 | app.setType(folderName); |
@@ -463,9 +463,9 @@ bool TabManager::findInstalledApplication(QString desktopFile, QString &installe | |||
463 | } | 463 | } |
464 | file.close(); | 464 | file.close(); |
465 | } | 465 | } |
466 | else | 466 | else |
467 | qDebug((QString("findInstalledApplication: Can't open file") + HOME_APP_INSTALL_DIR + "/" + fi->fileName()).latin1()); | 467 | odebug << (QString("findInstalledApplication: Can't open file") + HOME_APP_INSTALL_DIR + "/" + fi->fileName()).latin1() << oendl; |
468 | ++it; // goto next list element | 468 | ++it; // goto next list element |
469 | } | 469 | } |
470 | return false; | 470 | return false; |
471 | } | 471 | } |
@@ -478,9 +478,9 @@ bool TabManager::findInstalledApplication(QString desktopFile, QString &installe | |||
478 | */ | 478 | */ |
479 | void TabManager::swapInstalledLocation( QString installedAppFile, QString desktopFile, QString newLocation ){ | 479 | void TabManager::swapInstalledLocation( QString installedAppFile, QString desktopFile, QString newLocation ){ |
480 | QFile file(installedAppFile); | 480 | QFile file(installedAppFile); |
481 | if ( !file.open(IO_ReadOnly) ){ | 481 | if ( !file.open(IO_ReadOnly) ){ |
482 | qDebug(QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1()); | 482 | odebug << QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1() << oendl; |
483 | return; | 483 | return; |
484 | } | 484 | } |
485 | 485 | ||
486 | QTextStream stream( &file ); // use a text stream | 486 | QTextStream stream( &file ); // use a text stream |
@@ -495,9 +495,9 @@ void TabManager::swapInstalledLocation( QString installedAppFile, QString deskto | |||
495 | } | 495 | } |
496 | file.close(); | 496 | file.close(); |
497 | 497 | ||
498 | if ( !file.open(IO_ReadWrite) ){ | 498 | if ( !file.open(IO_ReadWrite) ){ |
499 | qDebug(QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1()); | 499 | odebug << QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1() << oendl; |
500 | return; | 500 | return; |
501 | } | 501 | } |
502 | QTextStream streamOut( &file ); | 502 | QTextStream streamOut( &file ); |
503 | streamOut << allLines; | 503 | streamOut << allLines; |
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp index 5854fe0..3616507 100644 --- a/noncore/settings/usermanager/userdialog.cpp +++ b/noncore/settings/usermanager/userdialog.cpp | |||
@@ -10,10 +10,13 @@ | |||
10 | #include "userdialog.h" | 10 | #include "userdialog.h" |
11 | #include "passwd.h" | 11 | #include "passwd.h" |
12 | 12 | ||
13 | /* OPIE */ | 13 | /* OPIE */ |
14 | #include <opie2/odebug.h> | ||
14 | #include <opie2/odevice.h> | 15 | #include <opie2/odevice.h> |
15 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
17 | using namespace Opie::Core; | ||
18 | using namespace Opie::Ui; | ||
16 | 19 | ||
17 | /* QT */ | 20 | /* QT */ |
18 | #include <qlayout.h> | 21 | #include <qlayout.h> |
19 | #include <qlabel.h> | 22 | #include <qlabel.h> |
@@ -25,17 +28,12 @@ | |||
25 | #include <sys/wait.h> | 28 | #include <sys/wait.h> |
26 | #include <unistd.h> | 29 | #include <unistd.h> |
27 | #include <signal.h> | 30 | #include <signal.h> |
28 | 31 | ||
29 | |||
30 | using namespace Opie::Core; | ||
31 | |||
32 | |||
33 | /** | 32 | /** |
34 | * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups. | 33 | * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups. |
35 | * | 34 | * |
36 | */ | 35 | */ |
37 | using namespace Opie::Ui; | ||
38 | UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) | 36 | UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) |
39 | { | 37 | { |
40 | vm=viewmode; | 38 | vm=viewmode; |
41 | QVBoxLayout *layout = new QVBoxLayout(this); | 39 | QVBoxLayout *layout = new QVBoxLayout(this); |
@@ -244,9 +242,9 @@ bool UserDialog::addUser(int uid, int gid) | |||
244 | if((adduserDialog->groupComboBox->currentItem()!=0)) | 242 | if((adduserDialog->groupComboBox->currentItem()!=0)) |
245 | { | 243 | { |
246 | accounts->findGroup(adduserDialog->groupComboBox->currentText()); | 244 | accounts->findGroup(adduserDialog->groupComboBox->currentText()); |
247 | adduserDialog->groupID=accounts->gr_gid; | 245 | adduserDialog->groupID=accounts->gr_gid; |
248 | qWarning(QString::number(accounts->gr_gid)); | 246 | owarn << QString::number(accounts->gr_gid) << oendl; |
249 | } | 247 | } |
250 | if(!(accounts->addUser(adduserDialog->loginLineEdit->text(), adduserDialog->passwordLineEdit->text(), | 248 | if(!(accounts->addUser(adduserDialog->loginLineEdit->text(), adduserDialog->passwordLineEdit->text(), |
251 | adduserDialog->uidLineEdit->text().toInt(), adduserDialog->groupID, adduserDialog->gecosLineEdit->text(), | 249 | adduserDialog->uidLineEdit->text().toInt(), adduserDialog->groupID, adduserDialog->gecosLineEdit->text(), |
252 | QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText()))) | 250 | QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText()))) |
@@ -373,9 +371,9 @@ bool UserDialog::editUser(const char *username) | |||
373 | QRegExp userRegExp(QString("[:,]%1$").arg(username)); // The end of line variant. | 371 | QRegExp userRegExp(QString("[:,]%1$").arg(username)); // The end of line variant. |
374 | QStringList tempList=accounts->groupStringList.grep(userRegExp); // Find all entries in the group database, that the user is a member of. | 372 | QStringList tempList=accounts->groupStringList.grep(userRegExp); // Find all entries in the group database, that the user is a member of. |
375 | for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) | 373 | for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) |
376 | { // Iterate over all of them. | 374 | { // Iterate over all of them. |
377 | qWarning(*it); | 375 | owarn << *it << oendl; |
378 | QListViewItemIterator lvit( edituserDialog->groupsListView ); // Compare to all groups. | 376 | QListViewItemIterator lvit( edituserDialog->groupsListView ); // Compare to all groups. |
379 | for ( ; lvit.current(); ++lvit ) | 377 | for ( ; lvit.current(); ++lvit ) |
380 | { | 378 | { |
381 | if(lvit.current()->text(0)==(*it).left((*it).find(":"))) | 379 | if(lvit.current()->text(0)==(*it).left((*it).find(":"))) |
@@ -388,9 +386,9 @@ bool UserDialog::editUser(const char *username) | |||
388 | userRegExp=QRegExp(QString("[:,]%1,").arg(username)); // And the other one. (not end of line.) | 386 | userRegExp=QRegExp(QString("[:,]%1,").arg(username)); // And the other one. (not end of line.) |
389 | tempList=accounts->groupStringList.grep(userRegExp); // Find all entries in the group database, that the user is a member of. | 387 | tempList=accounts->groupStringList.grep(userRegExp); // Find all entries in the group database, that the user is a member of. |
390 | for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) | 388 | for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) |
391 | { // Iterate over all of them. | 389 | { // Iterate over all of them. |
392 | qWarning(*it); | 390 | owarn << *it << oendl; |
393 | QListViewItemIterator lvit( edituserDialog->groupsListView ); // Compare to all groups. | 391 | QListViewItemIterator lvit( edituserDialog->groupsListView ); // Compare to all groups. |
394 | for ( ; lvit.current(); ++lvit ) | 392 | for ( ; lvit.current(); ++lvit ) |
395 | { | 393 | { |
396 | if(lvit.current()->text(0)==(*it).left((*it).find(":"))) | 394 | if(lvit.current()->text(0)==(*it).left((*it).find(":"))) |
diff --git a/noncore/settings/usermanager/usermanager.cpp b/noncore/settings/usermanager/usermanager.cpp index a1130d4..1d345ee 100644 --- a/noncore/settings/usermanager/usermanager.cpp +++ b/noncore/settings/usermanager/usermanager.cpp | |||
@@ -8,14 +8,17 @@ | |||
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | 9 | ||
10 | #include "usermanager.h" | 10 | #include "usermanager.h" |
11 | 11 | ||
12 | #include <qlayout.h> | 12 | /* OPIE */ |
13 | #include <opie2/odebug.h> | ||
14 | #include <qpe/resource.h> | ||
15 | using namespace Opie::Core; | ||
13 | 16 | ||
17 | /* QT */ | ||
18 | #include <qlayout.h> | ||
14 | #include <qmessagebox.h> | 19 | #include <qmessagebox.h> |
15 | #include <qfile.h> | 20 | #include <qfile.h> |
16 | #include <qpe/resource.h> | ||
17 | |||
18 | #include <qregexp.h> | 21 | #include <qregexp.h> |
19 | 22 | ||
20 | /** | 23 | /** |
21 | * The mainwindow constructor. | 24 | * The mainwindow constructor. |
@@ -252,6 +255,6 @@ void UserConfig::delGroup() { | |||
252 | } | 255 | } |
253 | 256 | ||
254 | void UserConfig::showUserMenu(QListViewItem *item) { | 257 | void UserConfig::showUserMenu(QListViewItem *item) { |
255 | //userPopupMenu.exec(item->mapToGlobal(QPoint(0,0))); | 258 | //userPopupMenu.exec(item->mapToGlobal(QPoint(0,0))); |
256 | qWarning("Pressed!"); | 259 | owarn << "Pressed!" << oendl; |
257 | } | 260 | } |
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro index d0647dd..31f52a6 100644 --- a/noncore/settings/usermanager/usermanager.pro +++ b/noncore/settings/usermanager/usermanager.pro | |||
@@ -1,10 +1,9 @@ | |||
1 | #CONFIG = qt warn_on | 1 | CONFIG = qt warn_on quick-app |
2 | CONFIG = qt warn_on quick-app | ||
3 | HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h | 2 | HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h |
4 | SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp | 3 | SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 -lopieui2 -lcrypt | 6 | LIBS += -lqpe -lopiecore2 -lopieui2 -lcrypt |
8 | TARGET = usermanager | 7 | TARGET = usermanager |
9 | 8 | ||
10 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/styles/liquid/config.in b/noncore/styles/liquid/config.in index 23f8637..cffdb39 100644 --- a/noncore/styles/liquid/config.in +++ b/noncore/styles/liquid/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config LIQUID | 1 | config LIQUID |
2 | boolean "opie-liquid (Mosfet's well known Liquid GUI style from KDE)" | 2 | boolean "opie-liquid (Mosfet's well known Liquid GUI style from KDE)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX && LIBOPIE2CORE |
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index bac882c..51814e7 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp | |||
@@ -10,14 +10,21 @@ | |||
10 | #ifndef INCLUDE_MENUITEM_DEF | 10 | #ifndef INCLUDE_MENUITEM_DEF |
11 | #define INCLUDE_MENUITEM_DEF | 11 | #define INCLUDE_MENUITEM_DEF |
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #include <qmenudata.h> | ||
15 | #include "liquid.h" | 14 | #include "liquid.h" |
16 | //#include "liquiddeco.h" | 15 | #include "effects.h" |
17 | #include <qapplication.h> | 16 | #include "htmlmasks.h" |
17 | #include "embeddata.h" | ||
18 | |||
19 | /* OPIE */ | ||
20 | #include <opie2/odebug.h> | ||
18 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
19 | #include "effects.h" | 22 | using namespace Opie::Core; |
23 | |||
24 | /* QT */ | ||
25 | #include <qmenudata.h> | ||
26 | #include <qapplication.h> | ||
20 | #include <qpalette.h> | 27 | #include <qpalette.h> |
21 | #include <qbitmap.h> | 28 | #include <qbitmap.h> |
22 | #include <qtabbar.h> | 29 | #include <qtabbar.h> |
23 | #include <qpopupmenu.h> | 30 | #include <qpopupmenu.h> |
@@ -30,19 +37,17 @@ | |||
30 | #include <qdrawutil.h> | 37 | #include <qdrawutil.h> |
31 | #include <qwidgetlist.h> | 38 | #include <qwidgetlist.h> |
32 | #include <qtoolbutton.h> | 39 | #include <qtoolbutton.h> |
33 | #include <qheader.h> | 40 | #include <qheader.h> |
34 | #include <unistd.h> | ||
35 | #include <qmenubar.h> | 41 | #include <qmenubar.h> |
36 | #include <qprogressbar.h> | 42 | #include <qprogressbar.h> |
37 | #include <qlineedit.h> | 43 | #include <qlineedit.h> |
38 | #include <qlistbox.h> | 44 | #include <qlistbox.h> |
39 | 45 | ||
46 | /* STD */ | ||
47 | #include <unistd.h> | ||
40 | #include <stdio.h> | 48 | #include <stdio.h> |
41 | 49 | ||
42 | #include "htmlmasks.h" | ||
43 | #include "embeddata.h" | ||
44 | |||
45 | 50 | ||
46 | typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *, | 51 | typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *, |
47 | QColorGroup &, bool, bool); | 52 | QColorGroup &, bool, bool); |
48 | 53 | ||
@@ -148,9 +153,9 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) | |||
148 | } | 153 | } |
149 | else if(ev->type() == QEvent::Hide){ | 154 | else if(ev->type() == QEvent::Hide){ |
150 | if(type == TransStippleBg || type == TransStippleBtn || | 155 | if(type == TransStippleBg || type == TransStippleBtn || |
151 | type == Custom){ | 156 | type == Custom){ |
152 | // qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); | 157 | // owarn << "Deleting menu pixmap, width " << pixDict.find(p->winId())->width() << "" << oendl; |
153 | 158 | ||
154 | pixDict.remove(p->winId()); | 159 | pixDict.remove(p->winId()); |
155 | if ( !p->inherits("QPopupMenu")) | 160 | if ( !p->inherits("QPopupMenu")) |
156 | p->setBackgroundMode(QWidget::PaletteBackground); | 161 | p->setBackgroundMode(QWidget::PaletteBackground); |
@@ -493,9 +498,9 @@ QPixmap* LiquidStyle::processEmbedded(const char *label, int h, int s, int v, | |||
493 | { | 498 | { |
494 | QImage img(qembed_findImage(label)); | 499 | QImage img(qembed_findImage(label)); |
495 | img.detach(); | 500 | img.detach(); |
496 | if(img.isNull()){ // shouldn't happen, been tested | 501 | if(img.isNull()){ // shouldn't happen, been tested |
497 | qWarning("Invalid embedded label %s", label); | 502 | owarn << "Invalid embedded label " << label << "" << oendl; |
498 | return(NULL); | 503 | return(NULL); |
499 | } | 504 | } |
500 | if(img.depth() != 32) | 505 | if(img.depth() != 32) |
501 | img = img.convertDepth(32); | 506 | img = img.convertDepth(32); |
@@ -859,9 +864,9 @@ void LiquidStyle::polish(QWidget *w) | |||
859 | } | 864 | } |
860 | 865 | ||
861 | if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> | 866 | if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> |
862 | palette().active().brush(QColorGroup::Background).pixmap()){ | 867 | palette().active().brush(QColorGroup::Background).pixmap()){ |
863 | qWarning("No parent pixmap for child widget %s", w->className()); | 868 | owarn << "No parent pixmap for child widget " << w->className() << "" << oendl; |
864 | return; | 869 | return; |
865 | } | 870 | } |
866 | if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && | 871 | if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && |
867 | !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) { | 872 | !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) { |
diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro index 7fe2829..767007f 100644 --- a/noncore/styles/liquid/liquid.pro +++ b/noncore/styles/liquid/liquid.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG = qt plugin embedded warn_on | 2 | CONFIG = qt plugin embedded warn_on |
3 | SOURCES = liquid.cpp \ | 3 | SOURCES = liquid.cpp \ |
4 | effects.cpp \ | 4 | effects.cpp \ |
5 | liquidset.cpp \ | 5 | liquidset.cpp \ |
6 | plugin.cpp | 6 | plugin.cpp |
@@ -9,11 +9,11 @@ HEADERS = liquid.h \ | |||
9 | effects.h \ | 9 | effects.h \ |
10 | liquidset.h \ | 10 | liquidset.h \ |
11 | plugin.h | 11 | plugin.h |
12 | 12 | ||
13 | LIBS += -lqpe -lqtaux2 | 13 | LIBS += -lqpe -lqtaux2 -lopiecore2 |
14 | INCLUDEPATH += $(OPIEDIR)/include | 14 | INCLUDEPATH += $(OPIEDIR)/include |
15 | DESTDIR = $(OPIEDIR)/plugins/styles | 15 | DESTDIR = $(OPIEDIR)/plugins/styles |
16 | TARGET = liquid | 16 | TARGET = liquid |
17 | VERSION = 1.0.0 | 17 | VERSION = 1.0.1 |
18 | 18 | ||
19 | include ( $(OPIEDIR)/include.pro ) | 19 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp index 62b3a11..7ce4e5a 100644 --- a/noncore/styles/theme/othemebase.cpp +++ b/noncore/styles/theme/othemebase.cpp | |||
@@ -14,26 +14,28 @@ | |||
14 | along with this library; see the file COPYING.LIB. If not, write to | 14 | along with this library; see the file COPYING.LIB. If not, write to |
15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
16 | Boston, MA 02111-1307, USA. | 16 | Boston, MA 02111-1307, USA. |
17 | */ | 17 | */ |
18 | |||
18 | #include "othemebase.h" | 19 | #include "othemebase.h" |
19 | #include "ogfxeffect.h" | 20 | #include "ogfxeffect.h" |
21 | |||
22 | /* OPIE */ | ||
23 | #include <opie2/odebug.h> | ||
20 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
21 | //#include <kdebug.h> | 25 | #include <qpe/config.h> |
22 | //#include <klocale.h> | 26 | using namespace Opie::Core; |
23 | #include <qpe/config.h> | 27 | |
24 | //#include <kglobal.h> | 28 | /* QT */ |
25 | //#include <kglobalsettings.h> | ||
26 | //#include <kstddirs.h> | ||
27 | #include <qfile.h> | 29 | #include <qfile.h> |
28 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
29 | #include <qdir.h> | 31 | #include <qdir.h> |
30 | #include <qpainter.h> | 32 | #include <qpainter.h> |
31 | #include <qbitmap.h> | 33 | #include <qbitmap.h> |
32 | #include <stdlib.h> | ||
33 | #include <qstringlist.h> | 34 | #include <qstringlist.h> |
34 | 35 | ||
35 | #include <stdio.h> | 36 | /* STD */ |
37 | #include <stdlib.h> | ||
36 | 38 | ||
37 | 39 | ||
38 | template class QIntCache<OThemePixmap> | 40 | template class QIntCache<OThemePixmap> |
39 | ; | 41 | ; |
@@ -261,29 +263,23 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ ) | |||
261 | configFileName = cfg. readEntry ( "Theme", "default" ); | 263 | configFileName = cfg. readEntry ( "Theme", "default" ); |
262 | } | 264 | } |
263 | Config config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File ); | 265 | Config config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File ); |
264 | 266 | ||
265 | //printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii()); | ||
266 | |||
267 | // Are we initalized? | 267 | // Are we initalized? |
268 | applyMiscResourceGroup( &config ); | 268 | applyMiscResourceGroup( &config ); |
269 | for ( i = 0; i < INHERIT_ITEMS; ++i ) { | 269 | for ( i = 0; i < INHERIT_ITEMS; ++i ) { |
270 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 270 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |
271 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); | ||
272 | } | 271 | } |
273 | for ( ; i < INHERIT_ITEMS*2; ++i ) { | 272 | for ( ; i < INHERIT_ITEMS*2; ++i ) { |
274 | if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) { | 273 | if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) { |
275 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 274 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |
276 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); | ||
277 | } | 275 | } |
278 | else { | 276 | else { |
279 | copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ]; | 277 | copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ]; |
280 | // printf ( "%d [%s]: copy=%s\n", i, widgetEntries [i], copyfrom [i].latin1()); | ||
281 | } | 278 | } |
282 | } | 279 | } |
283 | for ( ; i < WIDGETS; ++i ) { | 280 | for ( ; i < WIDGETS; ++i ) { |
284 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 281 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |
285 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); | ||
286 | } | 282 | } |
287 | 283 | ||
288 | // initalize defaults that may not be read | 284 | // initalize defaults that may not be read |
289 | for ( i = 0; i < WIDGETS; ++i ) | 285 | for ( i = 0; i < WIDGETS; ++i ) |
@@ -294,9 +290,8 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ ) | |||
294 | splitterWidth = 10; | 290 | splitterWidth = 10; |
295 | 291 | ||
296 | for ( i = 0; i < WIDGETS; ++i ) { | 292 | for ( i = 0; i < WIDGETS; ++i ) { |
297 | readResourceGroup( i, copyfrom, pixnames, brdnames, loaded ); | 293 | readResourceGroup( i, copyfrom, pixnames, brdnames, loaded ); |
298 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s, colors=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1(), (colors[i]?colors[i]->background().name().latin1():"<none)" )); | ||
299 | } | 294 | } |
300 | 295 | ||
301 | // misc items | 296 | // misc items |
302 | readMiscResourceGroup(); | 297 | readMiscResourceGroup(); |
@@ -406,9 +401,9 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget ) | |||
406 | if ( pixmaps[ widget ] ) | 401 | if ( pixmaps[ widget ] ) |
407 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, | 402 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, |
408 | widget ); | 403 | widget ); |
409 | else | 404 | else |
410 | qDebug( "We would have inserted a null pixmap!\n" ); | 405 | odebug << "We would have inserted a null pixmap!\n" << oendl; |
411 | pixmaps[ widget ] = cachePix; | 406 | pixmaps[ widget ] = cachePix; |
412 | } | 407 | } |
413 | else { | 408 | else { |
414 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget ); | 409 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget ); |
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro index 2e4b4b3..74c60b1 100644 --- a/noncore/todayplugins/fortune/fortune.pro +++ b/noncore/todayplugins/fortune/fortune.pro | |||
@@ -1,6 +1,5 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG -= moc | ||
3 | CONFIG += qt plugin | 2 | CONFIG += qt plugin |
4 | 3 | ||
5 | # Input | 4 | # Input |
6 | HEADERS = fortuneplugin.h fortunepluginimpl.h \ | 5 | HEADERS = fortuneplugin.h fortunepluginimpl.h \ |
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.cpp b/noncore/todayplugins/fortune/fortunepluginwidget.cpp index c3ee546..c147567 100644 --- a/noncore/todayplugins/fortune/fortunepluginwidget.cpp +++ b/noncore/todayplugins/fortune/fortunepluginwidget.cpp | |||
@@ -15,20 +15,23 @@ | |||
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include "fortunepluginwidget.h" | 17 | #include "fortunepluginwidget.h" |
18 | 18 | ||
19 | /* OPIE */ | ||
20 | #include <opie2/odebug.h> | ||
19 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
20 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | using namespace Opie::Core; | ||
24 | using namespace Opie::Ui; | ||
21 | 25 | ||
26 | /* QT */ | ||
22 | #include <qvaluelist.h> | 27 | #include <qvaluelist.h> |
23 | #include <qtl.h> | 28 | #include <qtl.h> |
24 | #include <qstring.h> | 29 | #include <qstring.h> |
25 | #include <qscrollview.h> | 30 | #include <qscrollview.h> |
26 | #include <qobject.h> | 31 | #include <qobject.h> |
27 | #include <qlayout.h> | 32 | #include <qlayout.h> |
28 | 33 | ||
29 | using namespace Opie::Core; | ||
30 | using namespace Opie::Ui; | ||
31 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) | 34 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) |
32 | : QWidget( parent, name ) | 35 | : QWidget( parent, name ) |
33 | { | 36 | { |
34 | 37 | ||
@@ -66,9 +69,9 @@ void FortunePluginWidget::getFortune() { | |||
66 | connect(fortuneProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), | 69 | connect(fortuneProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), |
67 | this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 70 | this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
68 | 71 | ||
69 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 72 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
70 | qWarning("could not start :("); | 73 | owarn << "could not start :(" << oendl; |
71 | fortune->setText( QString("Failed to obtain fortune.") ); | 74 | fortune->setText( QString("Failed to obtain fortune.") ); |
72 | delete fortuneProcess; | 75 | delete fortuneProcess; |
73 | fortuneProcess = 0; | 76 | fortuneProcess = 0; |
74 | } | 77 | } |
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp index ce35256..ae219d7 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp | |||
@@ -1,6 +1,13 @@ | |||
1 | #include "inputDialog.h" | 1 | #include "inputDialog.h" |
2 | #include "helpwindow.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | #include <qpe/config.h> | ||
7 | using namespace Opie::Core; | ||
2 | 8 | ||
9 | /* QT */ | ||
3 | #include <qapplication.h> | 10 | #include <qapplication.h> |
4 | #include <qlayout.h> | 11 | #include <qlayout.h> |
5 | #include <qcheckbox.h> | 12 | #include <qcheckbox.h> |
6 | #include <qlineedit.h> | 13 | #include <qlineedit.h> |
@@ -8,18 +15,13 @@ | |||
8 | #include <qpushbutton.h> | 15 | #include <qpushbutton.h> |
9 | #include <qwhatsthis.h> | 16 | #include <qwhatsthis.h> |
10 | #include <qlabel.h> | 17 | #include <qlabel.h> |
11 | #include <qlayout.h> | 18 | #include <qlayout.h> |
12 | #include <qpe/config.h> | ||
13 | #include <qstringlist.h> | 19 | #include <qstringlist.h> |
14 | using namespace Opie::Core; | ||
15 | using namespace Opie::Core; | ||
16 | #include <qmainwindow.h> | 20 | #include <qmainwindow.h> |
17 | #include "helpwindow.h" | ||
18 | 21 | ||
22 | /* STD */ | ||
19 | #include <stdlib.h> | 23 | #include <stdlib.h> |
20 | // #include <sys/stat.h> | ||
21 | // #include <unistd.h> | ||
22 | 24 | ||
23 | InputDialog::InputDialog( ) | 25 | InputDialog::InputDialog( ) |
24 | : QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) { | 26 | : QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) { |
25 | setCaption( tr("Symbol Lookup")); | 27 | setCaption( tr("Symbol Lookup")); |
@@ -53,9 +55,9 @@ void InputDialog::doLookup() { | |||
53 | 55 | ||
54 | QString url = "\"http://finance.yahoo.com/l?m=&s="+LineEdit1->text()+"\""; | 56 | QString url = "\"http://finance.yahoo.com/l?m=&s="+LineEdit1->text()+"\""; |
55 | QString tempHtml = "/tmp/stockticker.html"; | 57 | QString tempHtml = "/tmp/stockticker.html"; |
56 | QString cmd = "wget -O "+tempHtml+" "+url; | 58 | QString cmd = "wget -O "+tempHtml+" "+url; |
57 | qDebug(cmd); | 59 | odebug << cmd << oendl; |
58 | 60 | ||
59 | 61 | ||
60 | /* | 62 | /* |
61 | OProcess proc; | 63 | OProcess proc; |
@@ -75,9 +77,9 @@ void InputDialog::doLookup() { | |||
75 | 77 | ||
76 | } | 78 | } |
77 | 79 | ||
78 | void InputDialog::showBrowser(OProcess*) { | 80 | void InputDialog::showBrowser(OProcess*) { |
79 | qDebug("BLAH"); | 81 | odebug << "BLAH" << oendl; |
80 | QString tempHtml = "/tmp/stockticker.html"; | 82 | QString tempHtml = "/tmp/stockticker.html"; |
81 | 83 | ||
82 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); | 84 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); |
83 | StockLookup->setCaption("Symbol"); | 85 | StockLookup->setCaption("Symbol"); |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/config.in b/noncore/todayplugins/stockticker/stocktickerlib/config.in index 4d589f9..7dbe03a 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/config.in +++ b/noncore/todayplugins/stockticker/stocktickerlib/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY_STOCKTICKERLIB | 1 | config TODAY_STOCKTICKERLIB |
2 | boolean | 2 | boolean |
3 | default "y" if TODAY_STOCKTICKER | 3 | default "y" if TODAY_STOCKTICKER |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2PIM && TODAY | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro index e70d1c0..6dcf945 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro | |||
@@ -1,6 +1,5 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | ||
3 | CONFIG += qt plugin | 2 | CONFIG += qt plugin |
4 | 3 | ||
5 | HEADERS = stocktickerplugin.h stocktickerpluginimpl.h stocktickerpluginwidget.h stocktickerconfig.h \ | 4 | HEADERS = stocktickerplugin.h stocktickerpluginimpl.h stocktickerpluginwidget.h stocktickerconfig.h \ |
6 | ../libstocks/csv.h \ | 5 | ../libstocks/csv.h \ |
@@ -19,10 +18,10 @@ INCLUDEPATH += $(OPIEDIR)/include \ | |||
19 | ../ ../library | 18 | ../ ../library |
20 | DEPENDPATH += $(OPIEDIR)/include \ | 19 | DEPENDPATH += $(OPIEDIR)/include \ |
21 | ../ ../library | 20 | ../ ../library |
22 | 21 | ||
23 | LIBS+= -lqpe -lopieui2 -lopiepim2 -lpthread | 22 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lpthread |
24 | TMAKE_CFLAGS += -D__UNIX__ | 23 | DEFINES += __UNIX__ |
25 | 24 | ||
26 | DESTDIR = $(OPIEDIR)/plugins/today | 25 | DESTDIR = $(OPIEDIR)/plugins/today |
27 | TARGET = todaystocktickerplugin | 26 | TARGET = todaystocktickerplugin |
28 | 27 | ||
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp index aaeb5ee..4855ac6 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp | |||
@@ -44,9 +44,9 @@ void getStocks(char *blah) { | |||
44 | stock *stocks_tmp; | 44 | stock *stocks_tmp; |
45 | stock_liste = blah; | 45 | stock_liste = blah; |
46 | ::free ( blah ); | 46 | ::free ( blah ); |
47 | // char *stock_liste = (char *)blah->latin1(); | 47 | // char *stock_liste = (char *)blah->latin1(); |
48 | // qDebug("%s", stock_liste.data() ); | 48 | // odebug << "" << stock_liste.data() << "" << oendl; |
49 | output = ""; | 49 | output = ""; |
50 | QString tempString; | 50 | QString tempString; |
51 | libstocks_return_code error; | 51 | libstocks_return_code error; |
52 | 52 | ||
@@ -277,9 +277,9 @@ void getStocks(char *blah) { | |||
277 | checkConnection(); | 277 | checkConnection(); |
278 | } | 278 | } |
279 | 279 | ||
280 | void StockTickerPluginWidget::checkConnection() { | 280 | void StockTickerPluginWidget::checkConnection() { |
281 | // qDebug("checking connection"); | 281 | // odebug << "checking connection" << oendl; |
282 | // Sock = new QSocket( this ); | 282 | // Sock = new QSocket( this ); |
283 | 283 | ||
284 | // if( wasError) | 284 | // if( wasError) |
285 | // stocktickerTicker->setText("Checking connection"); | 285 | // stocktickerTicker->setText("Checking connection"); |
@@ -288,24 +288,24 @@ void getStocks(char *blah) { | |||
288 | // Sock->connectToHost("finance.yahoo.com", 80); | 288 | // Sock->connectToHost("finance.yahoo.com", 80); |
289 | // connect( Sock, SIGNAL( error(int) ), SLOT(socketError(int)) ); | 289 | // connect( Sock, SIGNAL( error(int) ), SLOT(socketError(int)) ); |
290 | // connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) ); | 290 | // connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) ); |
291 | // } else { | 291 | // } else { |
292 | // qDebug("State is not Idle"); | 292 | // odebug << "State is not Idle" << oendl; |
293 | isConnected(); | 293 | isConnected(); |
294 | // } | 294 | // } |
295 | } | 295 | } |
296 | 296 | ||
297 | void StockTickerPluginWidget::isConnected() { | 297 | void StockTickerPluginWidget::isConnected() { |
298 | // qDebug("We connect, so ok to grab stocks"); | 298 | // odebug << "We connect, so ok to grab stocks" << oendl; |
299 | if(this->isVisible()) | 299 | if(this->isVisible()) |
300 | doStocks(); | 300 | doStocks(); |
301 | 301 | ||
302 | Config cfg( "stockticker"); | 302 | Config cfg( "stockticker"); |
303 | cfg.setGroup("Timer"); | 303 | cfg.setGroup("Timer"); |
304 | timerDelay= cfg.readNumEntry("Delay",0); | 304 | timerDelay= cfg.readNumEntry("Delay",0); |
305 | if(timerDelay > 0) | 305 | if(timerDelay > 0) |
306 | startTimer(timerDelay*60000); | 306 | startTimer(timerDelay*60000); |
307 | // qDebug("timer set for %d",(timerDelay*60000)/60000); | 307 | // odebug << "timer set for " << (timerDelay*60000)/60000 << "" << oendl; |
308 | wasError = false; | 308 | wasError = false; |
309 | 309 | ||
310 | // Sock->close(); | 310 | // Sock->close(); |
311 | } | 311 | } |
diff --git a/noncore/tools/calc2/engine.cpp b/noncore/tools/calc2/engine.cpp index a9a47c4..e843e29 100644 --- a/noncore/tools/calc2/engine.cpp +++ b/noncore/tools/calc2/engine.cpp | |||
@@ -100,9 +100,9 @@ void Engine::pushValue (char v) | |||
100 | num.i=displayString.toInt(&ok, calcBase()); | 100 | num.i=displayString.toInt(&ok, calcBase()); |
101 | }; | 101 | }; |
102 | if (!ok) { | 102 | if (!ok) { |
103 | state = sError; | 103 | state = sError; |
104 | qDebug("pushValue() - num->string conversion"); | 104 | odebug << "pushValue() - num->string conversion" << oendl; |
105 | } else { | 105 | } else { |
106 | const QString constString = displayString; | 106 | const QString constString = displayString; |
107 | emit(display(constString)); | 107 | emit(display(constString)); |
108 | }; | 108 | }; |
@@ -126,18 +126,18 @@ void Engine::del () | |||
126 | displayString.truncate(displayString.length()); | 126 | displayString.truncate(displayString.length()); |
127 | num.dbl=displayString.toDouble(&ok); | 127 | num.dbl=displayString.toDouble(&ok); |
128 | break; | 128 | break; |
129 | case rFraction: | 129 | case rFraction: |
130 | qDebug("not available"); | 130 | odebug << "not available" << oendl; |
131 | break; | 131 | break; |
132 | default: | 132 | default: |
133 | displayString.truncate(displayString.length()); | 133 | displayString.truncate(displayString.length()); |
134 | num.i = displayString.toInt(&ok, calcBase()); | 134 | num.i = displayString.toInt(&ok, calcBase()); |
135 | }; | 135 | }; |
136 | 136 | ||
137 | if (!ok) { | 137 | if (!ok) { |
138 | state = sError; | 138 | state = sError; |
139 | qDebug("del() - num->string conversion"); | 139 | odebug << "del() - num->string conversion" << oendl; |
140 | } else { | 140 | } else { |
141 | const QString constString = displayString; | 141 | const QString constString = displayString; |
142 | emit(display(constString)); | 142 | emit(display(constString)); |
143 | }; | 143 | }; |
@@ -148,9 +148,9 @@ void Engine::displayData(Data d) { | |||
148 | case rDouble: | 148 | case rDouble: |
149 | displayString.setNum(d.dbl); | 149 | displayString.setNum(d.dbl); |
150 | break; | 150 | break; |
151 | case rFraction: | 151 | case rFraction: |
152 | qDebug("fractional display not yet impl"); | 152 | odebug << "fractional display not yet impl" << oendl; |
153 | break; | 153 | break; |
154 | default: | 154 | default: |
155 | displayString.setNum(d.i, calcBase()); | 155 | displayString.setNum(d.i, calcBase()); |
156 | break; | 156 | break; |
@@ -171,9 +171,9 @@ int Engine::calcBase () { | |||
171 | case rHex: | 171 | case rHex: |
172 | return 16; | 172 | return 16; |
173 | default: | 173 | default: |
174 | state = sError; | 174 | state = sError; |
175 | qDebug("Error - attempt to calc base for non-integer"); | 175 | odebug << "Error - attempt to calc base for non-integer" << oendl; |
176 | return 10; | 176 | return 10; |
177 | }; | 177 | }; |
178 | } | 178 | } |
179 | 179 | ||
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro index ae6a666..78d4519 100644 --- a/noncore/tools/calculator/calculator.pro +++ b/noncore/tools/calculator/calculator.pro | |||
@@ -1,9 +1,9 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | HEADERS = calculatorimpl.h | 2 | HEADERS = calculatorimpl.h |
3 | SOURCES = calculatorimpl.cpp \ | 3 | SOURCES = calculatorimpl.cpp \ |
4 | main.cpp | 4 | main.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 | 7 | LIBS += -lqpe -lopiecore2 |
8 | INTERFACES= calculator.ui | 8 | INTERFACES= calculator.ui |
9 | TARGET = calculator | 9 | TARGET = calculator |
diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp index dead03d..05cb9b5 100644 --- a/noncore/tools/calculator/calculatorimpl.cpp +++ b/noncore/tools/calculator/calculatorimpl.cpp | |||
@@ -25,12 +25,16 @@ | |||
25 | // Sat 03-09-2002 L.J. Potter added the inlined pixmaps here | 25 | // Sat 03-09-2002 L.J. Potter added the inlined pixmaps here |
26 | 26 | ||
27 | #include "calculatorimpl.h" | 27 | #include "calculatorimpl.h" |
28 | 28 | ||
29 | /* OPIE */ | ||
30 | #include <opie2/odebug.h> | ||
29 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
30 | #include <qpe/qmath.h> | 32 | #include <qpe/qmath.h> |
31 | #include <qpe/qpeapplication.h> | 33 | #include <qpe/qpeapplication.h> |
34 | using namespace Opie::Core; | ||
32 | 35 | ||
36 | /* QT */ | ||
33 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
34 | #include <qcombobox.h> | 38 | #include <qcombobox.h> |
35 | #include <qlabel.h> | 39 | #include <qlabel.h> |
36 | #include <qfont.h> | 40 | #include <qfont.h> |
@@ -38,9 +42,12 @@ | |||
38 | #include <qstringlist.h> | 42 | #include <qstringlist.h> |
39 | #include <qfile.h> | 43 | #include <qfile.h> |
40 | #include <qtextstream.h> | 44 | #include <qtextstream.h> |
41 | #include <qmessagebox.h> | 45 | #include <qmessagebox.h> |
46 | |||
47 | /* STD */ | ||
42 | #include <math.h> | 48 | #include <math.h> |
49 | |||
43 | /* XPM */ | 50 | /* XPM */ |
44 | static char *oneoverx_xpm[] = { | 51 | static char *oneoverx_xpm[] = { |
45 | /* width height num_colors chars_per_pixel */ | 52 | /* width height num_colors chars_per_pixel */ |
46 | " 13 11 2 1", | 53 | " 13 11 2 1", |
@@ -232,9 +239,9 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | |||
232 | QString tmp = QPEApplication::qpeDir(); | 239 | QString tmp = QPEApplication::qpeDir(); |
233 | tmp += "etc/unit_conversion.dat"; | 240 | tmp += "etc/unit_conversion.dat"; |
234 | QFile myfile(tmp); | 241 | QFile myfile(tmp); |
235 | if ( !myfile.open( IO_Translate | IO_ReadOnly ) ) { | 242 | if ( !myfile.open( IO_Translate | IO_ReadOnly ) ) { |
236 | qDebug("Data file unit_conversion.dat not found\nNo conversion features will be available\n"+tmp); | 243 | odebug << "Data file unit_conversion.dat not found\nNo conversion features will be available\n"+tmp << oendl; |
237 | // disable the f button if no conv file available | 244 | // disable the f button if no conv file available |
238 | ComboBoxFunction->setEnabled(FALSE); | 245 | ComboBoxFunction->setEnabled(FALSE); |
239 | } | 246 | } |
240 | else { | 247 | else { |
@@ -506,9 +513,9 @@ void CalculatorImpl::execOp( Operation i ) | |||
506 | if ( numOpenBraces == 0 ) | 513 | if ( numOpenBraces == 0 ) |
507 | return; | 514 | return; |
508 | processStack( oAdd ); | 515 | processStack( oAdd ); |
509 | if ( operationStack.top().operation != oOpenBrace ) | 516 | if ( operationStack.top().operation != oOpenBrace ) |
510 | qDebug( "Calculator: internal Error" ); | 517 | odebug << "Calculator: internal Error" << oendl; |
511 | operationStack.pop(); | 518 | operationStack.pop(); |
512 | state = sNewNumber; | 519 | state = sNewNumber; |
513 | numOpenBraces--; | 520 | numOpenBraces--; |
514 | break; | 521 | break; |
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp index 4204d73..642196e 100644 --- a/noncore/tools/formatter/formatter.cpp +++ b/noncore/tools/formatter/formatter.cpp | |||
@@ -10,15 +10,16 @@ | |||
10 | #include "inputDialog.h" | 10 | #include "inputDialog.h" |
11 | #include "output.h" | 11 | #include "output.h" |
12 | 12 | ||
13 | /* OPIE */ | 13 | /* OPIE */ |
14 | #include <qtoolbar.h> | 14 | #include <opie2/odebug.h> |
15 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
18 | #include <qpe/mimetype.h> | 18 | #include <qpe/mimetype.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
20 | #include <qpe/storage.h> | 20 | #include <qpe/storage.h> |
21 | using namespace Opie::Core; | ||
21 | 22 | ||
22 | /* QT */ | 23 | /* QT */ |
23 | #include <qmenubar.h> | 24 | #include <qmenubar.h> |
24 | #include <qmultilineedit.h> | 25 | #include <qmultilineedit.h> |
@@ -34,8 +35,9 @@ | |||
34 | #include <qregexp.h> | 35 | #include <qregexp.h> |
35 | #include <qlabel.h> | 36 | #include <qlabel.h> |
36 | #include <qlineedit.h> | 37 | #include <qlineedit.h> |
37 | #include <qpushbutton.h> | 38 | #include <qpushbutton.h> |
39 | #include <qtoolbar.h> | ||
38 | #include <qtabwidget.h> | 40 | #include <qtabwidget.h> |
39 | #include <qwidget.h> | 41 | #include <qwidget.h> |
40 | #include <qlayout.h> | 42 | #include <qlayout.h> |
41 | #include <qvariant.h> | 43 | #include <qvariant.h> |
@@ -237,14 +239,14 @@ void FormatterApp::doFormat() | |||
237 | outDlg->OutputEdit->append( tr("Trying to umount %1.").arg( currentText) ); | 239 | outDlg->OutputEdit->append( tr("Trying to umount %1.").arg( currentText) ); |
238 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); | 240 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); |
239 | 241 | ||
240 | sleep(1); | 242 | sleep(1); |
241 | qDebug("Command is "+umountS); | 243 | odebug << "Command is "+umountS << oendl; |
242 | fp = popen( (const char *) umountS, "r"); | 244 | fp = popen( (const char *) umountS, "r"); |
243 | // qDebug("%d", fp); | 245 | // odebug << "" << fp << "" << oendl; |
244 | if ( !fp ) | 246 | if ( !fp ) |
245 | { | 247 | { |
246 | qDebug("Could not execute '" + umountS + "'! err=%d\n" +(QString)strerror(errno), err); | 248 | odebug << "Could not execute '" + umountS + "'! err=" << err << "\n" +(QString)strerror(errno) << oendl; |
247 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); | 249 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); |
248 | pclose(fp); | 250 | pclose(fp); |
249 | return; | 251 | return; |
250 | } | 252 | } |
@@ -255,9 +257,9 @@ void FormatterApp::doFormat() | |||
255 | while ( fgets( line, sizeof line, fp)) | 257 | while ( fgets( line, sizeof line, fp)) |
256 | { | 258 | { |
257 | if( ((QString)line).find("busy",0,TRUE) != -1) | 259 | if( ((QString)line).find("busy",0,TRUE) != -1) |
258 | { | 260 | { |
259 | qDebug("Could not find '" + umountS); | 261 | odebug << "Could not find '" + umountS << oendl; |
260 | QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") ); | 262 | QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") ); |
261 | pclose(fp); | 263 | pclose(fp); |
262 | return; | 264 | return; |
263 | } | 265 | } |
@@ -271,18 +273,18 @@ void FormatterApp::doFormat() | |||
271 | } | 273 | } |
272 | } | 274 | } |
273 | pclose(fp); | 275 | pclose(fp); |
274 | 276 | ||
275 | qDebug("Command would be: "+cmd); | 277 | odebug << "Command would be: "+cmd << oendl; |
276 | outDlg->OutputEdit->append( tr("Trying to format.") ); | 278 | outDlg->OutputEdit->append( tr("Trying to format.") ); |
277 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); | 279 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); |
278 | 280 | ||
279 | fp = popen( (const char *) cmd, "r"); | 281 | fp = popen( (const char *) cmd, "r"); |
280 | while ( fgets( line, sizeof line, fp)) | 282 | while ( fgets( line, sizeof line, fp)) |
281 | { | 283 | { |
282 | if( ((QString)line).find("No such device",0,TRUE) != -1) | 284 | if( ((QString)line).find("No such device",0,TRUE) != -1) |
283 | { | 285 | { |
284 | qDebug("No such device '" + umountS); | 286 | odebug << "No such device '" + umountS << oendl; |
285 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); | 287 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); |
286 | pclose(fp); | 288 | pclose(fp); |
287 | // outDlg->OutputEdit->append("No such device"); | 289 | // outDlg->OutputEdit->append("No such device"); |
288 | // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); | 290 | // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); |
@@ -304,9 +306,9 @@ void FormatterApp::doFormat() | |||
304 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); | 306 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); |
305 | fp = popen( (const char *) remountS, "r"); | 307 | fp = popen( (const char *) remountS, "r"); |
306 | if ( !fp) | 308 | if ( !fp) |
307 | { | 309 | { |
308 | qDebug("Could not execute '" + remountS + "'! err=%d\n" +(QString)strerror(errno), err); | 310 | odebug << "Could not execute '" + remountS + "'! err=" << err << "\n" +(QString)strerror(errno) << oendl; |
309 | QMessageBox::warning( this, tr("Formatter"), tr("Card mount failed!"), tr("&OK") ); | 311 | QMessageBox::warning( this, tr("Formatter"), tr("Card mount failed!"), tr("&OK") ); |
310 | 312 | ||
311 | } | 313 | } |
312 | else | 314 | else |
@@ -379,9 +381,9 @@ void FormatterApp::storageComboSelected(int index ) | |||
379 | TextLabel4->setText( tr( "Storage Type: %1").arg( nameS) ); | 381 | TextLabel4->setText( tr( "Storage Type: %1").arg( nameS) ); |
380 | currentText = currentText.right( currentText.length() - currentText.find(" -> ",0,TRUE) - 4); | 382 | currentText = currentText.right( currentText.length() - currentText.find(" -> ",0,TRUE) - 4); |
381 | 383 | ||
382 | QString fsType = getFileSystemType((const QString &) currentText); | 384 | QString fsType = getFileSystemType((const QString &) currentText); |
383 | // qDebug(fsType); | 385 | // odebug << fsType << oendl; |
384 | for(int i = 0; i < fileSystemsCombo->count(); i++) | 386 | for(int i = 0; i < fileSystemsCombo->count(); i++) |
385 | { | 387 | { |
386 | if( fsType == fileSystemsCombo->text(i)) | 388 | if( fsType == fileSystemsCombo->text(i)) |
387 | fileSystemsCombo->setCurrentItem(i); | 389 | fileSystemsCombo->setCurrentItem(i); |
@@ -463,9 +465,9 @@ void FormatterApp::parsetab(const QString &fileName) | |||
463 | & filesystemType.find("cramfs",0,TRUE) == -1 | 465 | & filesystemType.find("cramfs",0,TRUE) == -1 |
464 | & filesystemType.find("auto",0,TRUE) == -1) | 466 | & filesystemType.find("auto",0,TRUE) == -1) |
465 | fsList << filesystemType; | 467 | fsList << filesystemType; |
466 | deviceList << deviceName; | 468 | deviceList << deviceName; |
467 | qDebug(deviceName+"::"+filesystemType); | 469 | odebug << deviceName+"::"+filesystemType << oendl; |
468 | fileSystemTypeList << deviceName+"::"+filesystemType; | 470 | fileSystemTypeList << deviceName+"::"+filesystemType; |
469 | } | 471 | } |
470 | } | 472 | } |
471 | } | 473 | } |
@@ -505,9 +507,9 @@ QString FormatterApp::getFileSystemType(const QString ¤tText) | |||
505 | QString temp = (*it); | 507 | QString temp = (*it); |
506 | if( temp.find( currentText,0,TRUE) != -1) | 508 | if( temp.find( currentText,0,TRUE) != -1) |
507 | { | 509 | { |
508 | return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); | 510 | return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); |
509 | // qDebug(fsType); | 511 | // odebug << fsType << oendl; |
510 | } | 512 | } |
511 | } | 513 | } |
512 | return ""; | 514 | return ""; |
513 | } | 515 | } |
@@ -532,9 +534,9 @@ bool FormatterApp::doFsck() | |||
532 | // #endif | 534 | // #endif |
533 | 535 | ||
534 | QString fsType = getFileSystemType((const QString &)selectedDevice); | 536 | QString fsType = getFileSystemType((const QString &)selectedDevice); |
535 | QString cmd; | 537 | QString cmd; |
536 | qDebug( selectedDevice +" "+ fsType); | 538 | odebug << selectedDevice +" "+ fsType << oendl; |
537 | if(fsType == "vfat") cmd = "dosfsck -vy "; | 539 | if(fsType == "vfat") cmd = "dosfsck -vy "; |
538 | if(fsType == "ext2") cmd = "e2fsck -cpvy "; | 540 | if(fsType == "ext2") cmd = "e2fsck -cpvy "; |
539 | cmd += selectedDevice + " 2>&1"; | 541 | cmd += selectedDevice + " 2>&1"; |
540 | 542 | ||
@@ -546,14 +548,14 @@ bool FormatterApp::doFsck() | |||
546 | outDlg->OutputEdit->append( tr("Trying to umount.")); | 548 | outDlg->OutputEdit->append( tr("Trying to umount.")); |
547 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); | 549 | outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); |
548 | 550 | ||
549 | sleep(1); | 551 | sleep(1); |
550 | // qDebug("Command is "+umountS); | 552 | // odebug << "Command is "+umountS << oendl; |
551 | fp = popen( (const char *) umountS, "r"); | 553 | fp = popen( (const char *) umountS, "r"); |
552 | // qDebug("%d", fp); | 554 | // odebug << "" << fp << "" << oendl; |
553 | if ( !fp ) | 555 | if ( !fp ) |
554 | { | 556 | { |
555 | qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno)); | 557 | odebug << "Could not execute '" + umountS + "'!\n" +(QString)strerror(errno) << oendl; |
556 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); | 558 | QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); |
557 | pclose(fp); | 559 | pclose(fp); |
558 | return false; | 560 | return false; |
559 | } | 561 | } |
@@ -564,9 +566,9 @@ bool FormatterApp::doFsck() | |||
564 | while ( fgets( line, sizeof line, fp)) | 566 | while ( fgets( line, sizeof line, fp)) |
565 | { | 567 | { |
566 | if( ((QString)line).find("busy",0,TRUE) != -1) | 568 | if( ((QString)line).find("busy",0,TRUE) != -1) |
567 | { | 569 | { |
568 | qDebug("Could not find '" + umountS); | 570 | odebug << "Could not find '" + umountS << oendl; |
569 | QMessageBox::warning( this, tr("Formatter"), | 571 | QMessageBox::warning( this, tr("Formatter"), |
570 | tr("Could not umount.\nDevice is busy!"), tr("&OK") ); | 572 | tr("Could not umount.\nDevice is busy!"), tr("&OK") ); |
571 | pclose(fp); | 573 | pclose(fp); |
572 | return false; | 574 | return false; |
@@ -586,9 +588,9 @@ bool FormatterApp::doFsck() | |||
586 | while ( fgets( line, sizeof line, fp)) | 588 | while ( fgets( line, sizeof line, fp)) |
587 | { | 589 | { |
588 | if( ((QString)line).find("No such device",0,TRUE) != -1) | 590 | if( ((QString)line).find("No such device",0,TRUE) != -1) |
589 | { | 591 | { |
590 | qDebug("No such device '" + umountS); | 592 | odebug << "No such device '" + umountS << oendl; |
591 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); | 593 | QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); |
592 | pclose(fp); | 594 | pclose(fp); |
593 | // outDlg->OutputEdit->append("No such device"); | 595 | // outDlg->OutputEdit->append("No such device"); |
594 | // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); | 596 | // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); |
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro index 913cca8..f6d34c7 100644 --- a/noncore/tools/formatter/formatter.pro +++ b/noncore/tools/formatter/formatter.pro | |||
@@ -1,9 +1,9 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = formatter.h inputDialog.h output.h | 2 | HEADERS = formatter.h inputDialog.h output.h |
3 | SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp | 3 | SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp |
4 | TARGET = formatter | 4 | TARGET = formatter |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 | 7 | LIBS += -lqpe -lopiecore2 |
8 | 8 | ||
9 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(OPIEDIR)/include.pro ) |