summaryrefslogtreecommitdiff
path: root/noncore/net/opietooth
authorar <ar>2004-05-12 21:05:31 (UTC)
committer ar <ar>2004-05-12 21:05:31 (UTC)
commit0a35373310b1e8dc1967db71b6bf5673d832bb13 (patch) (unidiff)
treea50e61a142f213e678f0077894c7435ddd1a0776 /noncore/net/opietooth
parent4b9dcabe79d0d3e73d638981ea045c4969bf21fc (diff)
downloadopie-0a35373310b1e8dc1967db71b6bf5673d832bb13.zip
opie-0a35373310b1e8dc1967db71b6bf5673d832bb13.tar.gz
opie-0a35373310b1e8dc1967db71b6bf5673d832bb13.tar.bz2
- convert qDebug to odebug
Diffstat (limited to 'noncore/net/opietooth') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/hciconfwrapper.cpp18
-rw-r--r--noncore/net/opietooth/manager/rfcommconfhandler.cpp12
2 files changed, 15 insertions, 15 deletions
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
@@ -20,13 +20,13 @@ namespace OpieTooth {
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 ) {
@@ -74,22 +74,22 @@ namespace OpieTooth {
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
@@ -98,17 +98,17 @@ namespace OpieTooth {
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 )
@@ -119,24 +119,24 @@ namespace OpieTooth {
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
@@ -91,26 +91,26 @@ void RfCommConfHandler::load() {
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}