summaryrefslogtreecommitdiff
path: root/libopie2/opienet
authormickeyl <mickeyl>2003-05-10 14:46:02 (UTC)
committer mickeyl <mickeyl>2003-05-10 14:46:02 (UTC)
commit7d97fa637bb1af225b9e5075982b32718b0f78e4 (patch) (unidiff)
treee06b9043c9fc3c0cf769986ea5e6a4983dbfe784 /libopie2/opienet
parent8bf3021bf5e86f7f6f6083606d77427adc8d13a7 (diff)
downloadopie-7d97fa637bb1af225b9e5075982b32718b0f78e4.zip
opie-7d97fa637bb1af225b9e5075982b32718b0f78e4.tar.gz
opie-7d97fa637bb1af225b9e5075982b32718b0f78e4.tar.bz2
- make oApp not return a const app object
- homogenize oconfig documentation - remove debug output
Diffstat (limited to 'libopie2/opienet') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/omanufacturerdb.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index c185fc5..c3c213c 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -10,17 +10,17 @@
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "omanufacturerdb.h" 16#include "omanufacturerdb.h"
17 17
18// Qt 18/* QT */
19#include <qstring.h> 19#include <qstring.h>
20#include <qfile.h> 20#include <qfile.h>
21#include <qtextstream.h> 21#include <qtextstream.h>
22 22
23OManufacturerDB* OManufacturerDB::_instance = 0; 23OManufacturerDB* OManufacturerDB::_instance = 0;
24 24
25OManufacturerDB* OManufacturerDB::instance() 25OManufacturerDB* OManufacturerDB::instance()
26{ 26{
@@ -76,22 +76,26 @@ OManufacturerDB::OManufacturerDB()
76 s.skipWhiteSpace(); 76 s.skipWhiteSpace();
77 s >> manu; 77 s >> manu;
78 s.skipWhiteSpace(); 78 s.skipWhiteSpace();
79 s >> extManu; 79 s >> extManu;
80 if ( extManu[0] == '#' ) // we have an extended manufacturer 80 if ( extManu[0] == '#' ) // we have an extended manufacturer
81 { 81 {
82 s.skipWhiteSpace(); 82 s.skipWhiteSpace();
83 extManu = s.readLine(); 83 extManu = s.readLine();
84 #ifdef DEBUG
84 qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu ); 85 qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu );
86 #endif
85 manufacturersExt.insert( addr, extManu ); 87 manufacturersExt.insert( addr, extManu );
86 } 88 }
87 else 89 else
88 s.readLine(); 90 s.readLine();
91 #ifdef DEBUG
89 qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu ); 92 qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu );
93 #endif
90 manufacturers.insert( addr, manu ); 94 manufacturers.insert( addr, manu );
91 95
92 } 96 }
93 } 97 }
94 98
95} 99}
96 100
97 101