1 files changed, 40 insertions, 27 deletions

diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index c3c213c..bcce11f 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -1,65 +1,83 @@
-/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-**********************************************************************/
+/*
+                             This file is part of the Opie Project
+                             (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include "omanufacturerdb.h"
 
+/* OPIE CORE */
+#include <opie2/odebug.h>
+
 /* QT */
 #include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 OManufacturerDB* OManufacturerDB::_instance = 0;
 
 OManufacturerDB* OManufacturerDB::instance()
 {
     if ( !OManufacturerDB::_instance )
     {
-        qDebug( "OManufacturerDB::instance(): creating OManufacturerDB..." );
+        odebug << "OManufacturerDB::instance(): creating OManufacturerDB..." << oendl;
        _instance = new OManufacturerDB();
     }
     return _instance;
 }
 
 
 OManufacturerDB::OManufacturerDB()
 {
     QString filename( "/etc/manufacturers" );
-    qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+    odebug << "OManufacturerDB: trying to read " << filename << oendl;
     if ( !QFile::exists( filename ) )
     {
         filename = "/opt/QtPalmtop/etc/manufacturers";
-        qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+        odebug << "OManufacturerDB: trying to read " << filename << oendl;
         if ( !QFile::exists( filename ) )
         {
             filename = "/usr/share/wellenreiter/manufacturers";
-            qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+            odebug << "OManufacturerDB: trying to read " << filename << oendl;
         }
     }
 
     QFile file( filename );
     bool hasFile = file.open( IO_ReadOnly );
     if (!hasFile)
     {
-        qWarning( "OManufacturerDB: no valid manufacturer list found.", (const char*) filename );
+        owarn << "OManufacturerDB: no valid manufacturer list found." << oendl;
     }
     else
     {
-        qDebug( "OManufacturerDB: found manufacturer list in '%s'...", (const char*) filename );
+        odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl;
         QTextStream s( &file );
         QString addr;
         QString manu;
         QString extManu;
         while (!s.atEnd())
         {
@@ -78,24 +96,19 @@ OManufacturerDB::OManufacturerDB()
             s.skipWhiteSpace();
             s >> extManu;
             if ( extManu[0] == '#' ) // we have an extended manufacturer
             {
                 s.skipWhiteSpace();
                 extManu = s.readLine();
-                #ifdef DEBUG
-                qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu );
-                #endif
+                odebug << "OManufacturerDB: read " << extManu << " as extended manufacturer string" << oendl;
                 manufacturersExt.insert( addr, extManu );
             }
             else
                 s.readLine();
-            #ifdef DEBUG
-            qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu );
-            #endif
+            odebug << "OManufacturerDB: read tuple " << addr << ", " << manu << oendl;
             manufacturers.insert( addr, manu );
-
         }
     }
 
 }