summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/composemail.cpp26
-rw-r--r--noncore/net/opietooth/manager/hciconfwrapper.cpp18
-rw-r--r--noncore/net/opietooth/manager/rfcommconfhandler.cpp12
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp17
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp9
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,5 +1,12 @@
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>
@@ -7,12 +14,9 @@
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
17using namespace Opie::Core; 21using namespace Opie::Core;
18using namespace Opie::Ui; 22using namespace Opie::Ui;
@@ -184,12 +188,12 @@ void ComposeMail::removeAttachment()
184void ComposeMail::accept() 188void 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
@@ -257,7 +261,7 @@ void ComposeMail::reject()
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! */
@@ -293,7 +297,7 @@ 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() );
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
@@ -23,7 +23,7 @@ namespace OpieTooth {
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
@@ -77,16 +77,16 @@ namespace OpieTooth {
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
@@ -101,11 +101,11 @@ namespace OpieTooth {
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
@@ -122,13 +122,13 @@ namespace OpieTooth {
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
@@ -137,6 +137,6 @@ namespace OpieTooth {
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
@@ -94,23 +94,23 @@ void RfCommConfHandler::load() {
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
@@ -129,8 +129,9 @@ void MScanListView::addNewItem( const QString& type,
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
@@ -394,8 +395,8 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in
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 {
@@ -489,11 +490,9 @@ void MScanListItem::serializeFrom( QDataStream& s )
489void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) 490void 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
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
@@ -742,12 +742,9 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
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;