summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/omanufacturerdb.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index 3003e12..32bae0a 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -27,20 +27,23 @@
27*/ 27*/
28 28
29#include "omanufacturerdb.h" 29#include "omanufacturerdb.h"
30 30
31#define OPIE_IMPROVE_GUI_LATENCY 1 31#define OPIE_IMPROVE_GUI_LATENCY 1
32 32
33/* OPIE */ 33/* OPIE */
34#include <opie2/odebug.h> 34#include <opie2/odebug.h>
35#include <qpe/qpeapplication.h>
35#ifdef OPIE_IMPROVE_GUI_LATENCY 36#ifdef OPIE_IMPROVE_GUI_LATENCY
36#include <qpe/global.h> 37#include <qpe/global.h>
37#endif 38#endif
38 39
40
41
39/* QT */ 42/* QT */
40#include <qapplication.h> 43#include <qapplication.h>
41#include <qfile.h> 44#include <qfile.h>
42#include <qtextstream.h> 45#include <qtextstream.h>
43 46
44using namespace Opie::Core; 47using namespace Opie::Core;
45namespace Opie { 48namespace Opie {
46namespace Net { 49namespace Net {
@@ -62,17 +65,17 @@ OManufacturerDB::OManufacturerDB()
62{ 65{
63 #ifdef OPIE_IMPROVE_GUI_LATENCY 66 #ifdef OPIE_IMPROVE_GUI_LATENCY
64 Global::statusMessage( "Reading Manufacturers..." ); 67 Global::statusMessage( "Reading Manufacturers..." );
65 #endif 68 #endif
66 QString filename( "/etc/manufacturers" ); 69 QString filename( "/etc/manufacturers" );
67 odebug << "OManufacturerDB: trying to read " << filename << oendl; 70 odebug << "OManufacturerDB: trying to read " << filename << oendl;
68 if ( !QFile::exists( filename ) ) 71 if ( !QFile::exists( filename ) )
69 { 72 {
70 filename = "/opt/QtPalmtop/etc/manufacturers"; 73 filename = QPEApplication::qpeDir()+"/etc/manufacturers";
71 odebug << "OManufacturerDB: trying to read " << filename << oendl; 74 odebug << "OManufacturerDB: trying to read " << filename << oendl;
72 if ( !QFile::exists( filename ) ) 75 if ( !QFile::exists( filename ) )
73 { 76 {
74 filename = "/usr/share/wellenreiter/manufacturers"; 77 filename = "/usr/share/wellenreiter/manufacturers";
75 odebug << "OManufacturerDB: trying to read " << filename << oendl; 78 odebug << "OManufacturerDB: trying to read " << filename << oendl;
76 } 79 }
77 } 80 }
78 81