author | ar <ar> | 2004-05-12 21:05:31 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-12 21:05:31 (UTC) |
commit | 0a35373310b1e8dc1967db71b6bf5673d832bb13 (patch) (unidiff) | |
tree | a50e61a142f213e678f0077894c7435ddd1a0776 /noncore | |
parent | 4b9dcabe79d0d3e73d638981ea045c4969bf21fc (diff) | |
download | opie-0a35373310b1e8dc1967db71b6bf5673d832bb13.zip opie-0a35373310b1e8dc1967db71b6bf5673d832bb13.tar.gz opie-0a35373310b1e8dc1967db71b6bf5673d832bb13.tar.bz2 |
- convert qDebug to odebug
-rw-r--r-- | noncore/net/mail/composemail.cpp | 26 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/hciconfwrapper.cpp | 18 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcommconfhandler.cpp | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 17 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 9 |
5 files changed, 41 insertions, 41 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index b15e692..449fdf1 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -1,23 +1,27 @@ | |||
1 | #include <qt.h> | ||
2 | 1 | ||
2 | #include "composemail.h" | ||
3 | |||
4 | #include <libmailwrapper/smtpwrapper.h> | ||
5 | #include <libmailwrapper/storemail.h> | ||
6 | #include <libmailwrapper/abstractmail.h> | ||
7 | #include <libmailwrapper/mailtypes.h> | ||
8 | |||
9 | /* OPIE */ | ||
3 | #include <opie2/ofiledialog.h> | 10 | #include <opie2/ofiledialog.h> |
4 | #include <opie2/odebug.h> | 11 | #include <opie2/odebug.h> |
5 | #include <qpe/resource.h> | 12 | #include <qpe/resource.h> |
6 | #include <qpe/config.h> | 13 | #include <qpe/config.h> |
7 | #include <qpe/global.h> | 14 | #include <qpe/global.h> |
8 | #include <qpe/contact.h> | 15 | #include <qpe/contact.h> |
9 | 16 | ||
10 | #include "composemail.h" | 17 | /* QT */ |
18 | #include <qt.h> | ||
11 | 19 | ||
12 | #include <libmailwrapper/smtpwrapper.h> | ||
13 | #include <libmailwrapper/storemail.h> | ||
14 | #include <libmailwrapper/abstractmail.h> | ||
15 | #include <libmailwrapper/mailtypes.h> | ||
16 | 20 | ||
17 | using namespace Opie::Core; | 21 | using namespace Opie::Core; |
18 | using namespace Opie::Ui; | 22 | using namespace Opie::Ui; |
19 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 23 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
20 | : ComposeMailUI( parent, name, modal, flags ) | 24 | : ComposeMailUI( parent, name, modal, flags ) |
21 | { | 25 | { |
22 | settings = s; | 26 | settings = s; |
23 | m_replyid = ""; | 27 | m_replyid = ""; |
@@ -179,22 +183,22 @@ void ComposeMail::removeAttachment() | |||
179 | } else { | 183 | } else { |
180 | attList->takeItem( attList->currentItem() ); | 184 | attList->takeItem( attList->currentItem() ); |
181 | } | 185 | } |
182 | } | 186 | } |
183 | 187 | ||
184 | void ComposeMail::accept() | 188 | void ComposeMail::accept() |
185 | { | 189 | { |
186 | if ( checkBoxLater->isChecked() ) { | 190 | if ( checkBoxLater->isChecked() ) { |
187 | odebug << "Send later" << oendl; | 191 | odebug << "Send later" << oendl; |
188 | } | 192 | } |
189 | 193 | ||
190 | #if 0 | 194 | #if 0 |
191 | qDebug( "Sending Mail with " + | 195 | odebug << "Sending Mail with " |
192 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); | 196 | << smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() << oendl; |
193 | #endif | 197 | #endif |
194 | Opie::Core::OSmartPointer<Mail> mail=new Mail; | 198 | Opie::Core::OSmartPointer<Mail> mail=new Mail; |
195 | 199 | ||
196 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 200 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
197 | mail->setMail(fromBox->currentText()); | 201 | mail->setMail(fromBox->currentText()); |
198 | 202 | ||
199 | if ( !toLine->text().isEmpty() ) { | 203 | if ( !toLine->text().isEmpty() ) { |
200 | mail->setTo( toLine->text() ); | 204 | mail->setTo( toLine->text() ); |
@@ -252,17 +256,17 @@ void ComposeMail::reject() | |||
252 | ids.append(m_replyid); | 256 | ids.append(m_replyid); |
253 | mail->setInreply(ids); | 257 | mail->setInreply(ids); |
254 | } | 258 | } |
255 | QString txt = message->text(); | 259 | QString txt = message->text(); |
256 | if ( !sigMultiLine->text().isEmpty() ) { | 260 | if ( !sigMultiLine->text().isEmpty() ) { |
257 | txt.append( "\n--\n" ); | 261 | txt.append( "\n--\n" ); |
258 | txt.append( sigMultiLine->text() ); | 262 | txt.append( sigMultiLine->text() ); |
259 | } | 263 | } |
260 | odebug << txt << oendl; | 264 | odebug << txt << oendl; |
261 | mail->setMessage( txt ); | 265 | mail->setMessage( txt ); |
262 | 266 | ||
263 | /* only use the default drafts folder name! */ | 267 | /* only use the default drafts folder name! */ |
264 | Storemail wrapper(AbstractMail::draftFolder()); | 268 | Storemail wrapper(AbstractMail::draftFolder()); |
265 | wrapper.storeMail(mail); | 269 | wrapper.storeMail(mail); |
266 | 270 | ||
267 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 271 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
268 | /* attachments we will ignore! */ | 272 | /* attachments we will ignore! */ |
@@ -288,16 +292,16 @@ void ComposeMail::reEditMail(const RecMailP¤t) | |||
288 | bccLine->setText(data->Bcc().join(",")); | 292 | bccLine->setText(data->Bcc().join(",")); |
289 | replyLine->setText(data->Replyto()); | 293 | replyLine->setText(data->Replyto()); |
290 | } | 294 | } |
291 | 295 | ||
292 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | 296 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) |
293 | : QListViewItem( parent ) | 297 | : QListViewItem( parent ) |
294 | { | 298 | { |
295 | attachment = att; | 299 | attachment = att; |
296 | odebug << att->getMimeType() << oendl; | 300 | odebug << att->getMimeType() << oendl; |
297 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? | 301 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? |
298 | Resource::loadPixmap( "UnknownDocument-14" ) : | 302 | Resource::loadPixmap( "UnknownDocument-14" ) : |
299 | attachment->getDocLnk().pixmap() ); | 303 | attachment->getDocLnk().pixmap() ); |
300 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); | 304 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); |
301 | setText( 1, QString::number( att->getSize() ) ); | 305 | setText( 1, QString::number( att->getSize() ) ); |
302 | } | 306 | } |
303 | 307 | ||
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp index ca2e7bd..47e170e 100644 --- a/noncore/net/opietooth/manager/hciconfwrapper.cpp +++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp | |||
@@ -18,17 +18,17 @@ namespace OpieTooth { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | 20 | ||
21 | void HciConfWrapper::setPinHelper( const QString& app ) { | 21 | void HciConfWrapper::setPinHelper( const QString& app ) { |
22 | setValue( "pin_helper" , app ); | 22 | setValue( "pin_helper" , app ); |
23 | } | 23 | } |
24 | 24 | ||
25 | void HciConfWrapper::setName( const QString &name ) { | 25 | void HciConfWrapper::setName( const QString &name ) { |
26 | qDebug ("NAME : " + name); | 26 | odebug << "NAME : " << name << oendl; |
27 | setValue( "name" , "\"" + name + "\"" ); | 27 | setValue( "name" , "\"" + name + "\"" ); |
28 | } | 28 | } |
29 | 29 | ||
30 | void HciConfWrapper::setIscan( bool enable) { | 30 | void HciConfWrapper::setIscan( bool enable) { |
31 | 31 | ||
32 | if ( enable ) { | 32 | if ( enable ) { |
33 | setValue( "iscan" , "enable" ); | 33 | setValue( "iscan" , "enable" ); |
34 | } else { | 34 | } else { |
@@ -72,71 +72,71 @@ namespace OpieTooth { | |||
72 | return; | 72 | return; |
73 | 73 | ||
74 | QStringList::Iterator it; | 74 | QStringList::Iterator it; |
75 | 75 | ||
76 | QString str; | 76 | QString str; |
77 | for (it = m_file.begin(); it != m_file.end(); ++it ) { | 77 | for (it = m_file.begin(); it != m_file.end(); ++it ) { |
78 | str = (*it); | 78 | str = (*it); |
79 | if( (str.contains(key)) > 0 ) { | 79 | if( (str.contains(key)) > 0 ) { |
80 | odebug << "Found" << oendl; | 80 | odebug << "Found" << oendl; |
81 | // still need to look if its commented out!!! | 81 | // still need to look if its commented out!!! |
82 | str.simplifyWhiteSpace(); | 82 | str.simplifyWhiteSpace(); |
83 | odebug << key << oendl; | 83 | odebug << key << oendl; |
84 | if (str.startsWith("#")) { | 84 | if (str.startsWith("#")) { |
85 | str = (key + " " + value + ";"); | 85 | str = (key + " " + value + ";"); |
86 | } else { | 86 | } else { |
87 | str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";"); | 87 | str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";"); |
88 | } | 88 | } |
89 | odebug << str << oendl; | 89 | odebug << str << oendl; |
90 | it = m_file.remove( it ); | 90 | it = m_file.remove( it ); |
91 | it = m_file.insert( it, str ); | 91 | it = m_file.insert( it, str ); |
92 | //return; the regexp is too wide -zecke // all set | 92 | //return; the regexp is too wide -zecke // all set |
93 | } | 93 | } |
94 | } | 94 | } |
95 | 95 | ||
96 | 96 | ||
97 | } | 97 | } |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * This loads the config file and stores it inside | 100 | * This loads the config file and stores it inside |
101 | * the m_file | 101 | * the m_file |
102 | */ | 102 | */ |
103 | void HciConfWrapper::load() { | 103 | void HciConfWrapper::load() { |
104 | owarn << "loaded" << oendl; | 104 | owarn << "loaded" << oendl; |
105 | m_file.clear(); | 105 | m_file.clear(); |
106 | QFile file( m_fileName ); | 106 | QFile file( m_fileName ); |
107 | if (!file.open( IO_ReadOnly ) ) { | 107 | if (!file.open( IO_ReadOnly ) ) { |
108 | odebug << "Could not open" << oendl; | 108 | odebug << "Could not open" << oendl; |
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | 111 | ||
112 | /** | 112 | /** |
113 | * readAll() into a QByteArray | 113 | * readAll() into a QByteArray |
114 | * QStringList::split('\n', array ) | 114 | * QStringList::split('\n', array ) |
115 | * would this be faster? -zecke | 115 | * would this be faster? -zecke |
116 | */ | 116 | */ |
117 | QTextStream stream(&file ); | 117 | QTextStream stream(&file ); |
118 | QString tmp; | 118 | QString tmp; |
119 | while ( !stream.atEnd() ) { | 119 | while ( !stream.atEnd() ) { |
120 | tmp = stream.readLine(); | 120 | tmp = stream.readLine(); |
121 | m_file.append( tmp ); | 121 | m_file.append( tmp ); |
122 | } | 122 | } |
123 | } | 123 | } |
124 | void HciConfWrapper::save() { | 124 | void HciConfWrapper::save() { |
125 | owarn << "save" << oendl; | 125 | owarn << "save" << oendl; |
126 | if (m_file.isEmpty() ) // load first | 126 | if (m_file.isEmpty() ) // load first |
127 | return; | 127 | return; |
128 | 128 | ||
129 | QFile file( m_fileName ); | 129 | QFile file( m_fileName ); |
130 | if ( !file.open(IO_WriteOnly ) ) { | 130 | if ( !file.open(IO_WriteOnly ) ) { |
131 | owarn << "could not open " << m_fileName.latin1() << "" << oendl; | 131 | owarn << "could not open " << m_fileName.latin1() << "" << oendl; |
132 | return; | 132 | return; |
133 | } | 133 | } |
134 | 134 | ||
135 | QTextStream stream(&file ); | 135 | QTextStream stream(&file ); |
136 | QStringList::Iterator it; | 136 | QStringList::Iterator it; |
137 | for ( it = m_file.begin(); it != m_file.end(); ++it ) { | 137 | for ( it = m_file.begin(); it != m_file.end(); ++it ) { |
138 | stream << (*it) << endl; | 138 | stream << (*it) << endl; |
139 | } | 139 | } |
140 | owarn << "saved" << oendl; | 140 | owarn << "saved" << oendl; |
141 | }; | 141 | }; |
142 | } | 142 | } |
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp index 1f7ba65..f82d2c8 100644 --- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp +++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp | |||
@@ -89,28 +89,28 @@ void RfCommConfHandler::load() { | |||
89 | QString comment; | 89 | QString comment; |
90 | 90 | ||
91 | for ( QStringList::Iterator line=list.begin(); line != list.end(); line++ ) { | 91 | for ( QStringList::Iterator line=list.begin(); line != list.end(); line++ ) { |
92 | 92 | ||
93 | QString tmpLine = ( *line ).stripWhiteSpace(); | 93 | QString tmpLine = ( *line ).stripWhiteSpace(); |
94 | 94 | ||
95 | if ( tmpLine.startsWith("rfcomm") ) { | 95 | if ( tmpLine.startsWith("rfcomm") ) { |
96 | QString number = tmpLine.mid( 6,1 ); | 96 | QString number = tmpLine.mid( 6,1 ); |
97 | odebug << tmpLine << oendl; | 97 | odebug << tmpLine << oendl; |
98 | odebug << "TEST " + number << oendl; | 98 | odebug << "TEST " + number << oendl; |
99 | } else if ( tmpLine.startsWith( "}" ) ) { | 99 | } else if ( tmpLine.startsWith( "}" ) ) { |
100 | m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(), comment ) ); | 100 | m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(), comment ) ); |
101 | } else if ( tmpLine.startsWith( "device" ) ) { | 101 | } else if ( tmpLine.startsWith( "device" ) ) { |
102 | mac = tmpLine.mid( 7, 17 ); | 102 | mac = tmpLine.mid( 7, 17 ); |
103 | odebug << "mac" + mac << oendl; | 103 | odebug << "mac" + mac << oendl; |
104 | } else if ( tmpLine.startsWith( "channel" ) ) { | 104 | } else if ( tmpLine.startsWith( "channel" ) ) { |
105 | channel = tmpLine.mid( 8, 1 ); | 105 | channel = tmpLine.mid( 8, 1 ); |
106 | qDebug ( "Channel :" + channel ); | 106 | odebug << "Channel :" << channel << oendl; |
107 | } else if ( tmpLine.startsWith( "comment" ) ) { | 107 | } else if ( tmpLine.startsWith( "comment" ) ) { |
108 | comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 ); | 108 | comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 ); |
109 | odebug << "Comment: " + comment << oendl; | 109 | odebug << "Comment: " + comment << oendl; |
110 | } | 110 | } |
111 | } | 111 | } |
112 | rfCommConf.close(); | 112 | rfCommConf.close(); |
113 | } | 113 | } |
114 | save( m_foundEntries ); | 114 | save( m_foundEntries ); |
115 | odebug << QString( "ENTries: %1").arg( m_foundEntries.count() ) << oendl; | 115 | odebug << QString( "ENTries: %1").arg( m_foundEntries.count() ) << oendl; |
116 | } | 116 | } |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index c605111..9e8aa72 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -124,18 +124,19 @@ void MScanListView::addNewItem( const QString& type, | |||
124 | int channel, | 124 | int channel, |
125 | int signal, | 125 | int signal, |
126 | const GpsLocation& loc, | 126 | const GpsLocation& loc, |
127 | bool probe ) | 127 | bool probe ) |
128 | { | 128 | { |
129 | QString macaddr = mac.toString(true); | 129 | QString macaddr = mac.toString(true); |
130 | 130 | ||
131 | #ifdef DEBUG | 131 | #ifdef DEBUG |
132 | qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type, | 132 | odebug << "MScanList::addNewItem( " << (const char*) type << " / " |
133 | (const char*) essid, (const char*) macaddr, channel ); | 133 | << (const char*) essid << " / " << (const char*) macaddr |
134 | << " [" << channel << "]" << oendl; | ||
134 | #endif | 135 | #endif |
135 | 136 | ||
136 | // search, if we already have seen this net | 137 | // search, if we already have seen this net |
137 | 138 | ||
138 | QString s; | 139 | QString s; |
139 | MScanListItem* network; | 140 | MScanListItem* network; |
140 | MScanListItem* item = static_cast<MScanListItem*> ( firstChild() ); | 141 | MScanListItem* item = static_cast<MScanListItem*> ( firstChild() ); |
141 | 142 | ||
@@ -389,18 +390,18 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, | |||
389 | 390 | ||
390 | 391 | ||
391 | void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col ) | 392 | void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col ) |
392 | { | 393 | { |
393 | if ( !item ) return; | 394 | if ( !item ) return; |
394 | 395 | ||
395 | MScanListItem* itm = static_cast<MScanListItem*>( item ); | 396 | MScanListItem* itm = static_cast<MScanListItem*>( item ); |
396 | 397 | ||
397 | qDebug( "contextMenuRequested on item '%s' (%s) in column: '%d'", | 398 | odebug << "contextMenuRequested on item '" << (const char*) itm->text(0) << "' (" |
398 | (const char*) itm->text(0), (const char*) itm->type, col ); | 399 | << (const char*) itm->type << ") in column: '" << col << "'" << oendl; |
399 | 400 | ||
400 | if ( itm->type == "adhoc" || itm->type == "managed" ) | 401 | if ( itm->type == "adhoc" || itm->type == "managed" ) |
401 | { | 402 | { |
402 | QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() ); | 403 | QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() ); |
403 | 404 | ||
404 | QPopupMenu m( this ); | 405 | QPopupMenu m( this ); |
405 | m.insertItem( entry, 37773, 0 ); | 406 | m.insertItem( entry, 37773, 0 ); |
406 | int result = m.exec( QCursor::pos() ); | 407 | int result = m.exec( QCursor::pos() ); |
@@ -484,21 +485,19 @@ void MScanListItem::serializeFrom( QDataStream& s ) | |||
484 | if ( _wep ) | 485 | if ( _wep ) |
485 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | 486 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! |
486 | listView()->triggerUpdate(); | 487 | listView()->triggerUpdate(); |
487 | } | 488 | } |
488 | 489 | ||
489 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) | 490 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) |
490 | { | 491 | { |
491 | #ifdef DEBUG | 492 | #ifdef DEBUG |
492 | qDebug( "decorating scanlist item %s / %s / %s [%d]", | 493 | odebug << "decorating scanlist item " << (const char*) type << " / " |
493 | (const char*) type, | 494 | << (const char*) essid << " / " << (const char*) macaddr |
494 | (const char*) essid, | 495 | << "[" << channel << "]" << oendl; |
495 | (const char*) macaddr, | ||
496 | channel ); | ||
497 | #endif | 496 | #endif |
498 | 497 | ||
499 | // set icon for managed or adhoc mode | 498 | // set icon for managed or adhoc mode |
500 | QString name; | 499 | QString name; |
501 | name.sprintf( "wellenreiter/%s", (const char*) type ); | 500 | name.sprintf( "wellenreiter/%s", (const char*) type ); |
502 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 501 | setPixmap( col_type, Resource::loadPixmap( name ) ); |
503 | 502 | ||
504 | // special case for probed networks FIXME: This is ugly at present | 503 | // special case for probed networks FIXME: This is ugly at present |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 2f85790..e801ce7 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -737,22 +737,19 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch | |||
737 | } | 737 | } |
738 | 738 | ||
739 | if ( sniffing ) | 739 | if ( sniffing ) |
740 | { | 740 | { |
741 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) ); | 741 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) ); |
742 | return; | 742 | return; |
743 | } | 743 | } |
744 | 744 | ||
745 | qDebug( "joinNetwork() with Interface %s: %s, %s, %d, %s", | 745 | odebug << "joinNetwork() with Interface " << (const char*) iface->name() |
746 | (const char*) iface->name(), | 746 | << ": " << (const char*) type << ", " << (const char*) essid |
747 | (const char*) type, | 747 | << ", " << channel << ", " << (const char*) macaddr << oendl; |
748 | (const char*) essid, | ||
749 | channel, | ||
750 | (const char*) macaddr ); | ||
751 | 748 | ||
752 | QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); | 749 | QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); |
753 | int count = 3; | 750 | int count = 3; |
754 | odebug << "sending " << count << " messages" << oendl; | 751 | odebug << "sending " << count << " messages" << oendl; |
755 | msg << QString("count") << QString::number(count); | 752 | msg << QString("count") << QString::number(count); |
756 | odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; | 753 | odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; |
757 | msg << QString(iface->name()) << QString("Mode") << type; | 754 | msg << QString(iface->name()) << QString("Mode") << type; |
758 | odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; | 755 | odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; |