summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlmanager.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/libopie2/opiedb/osqlmanager.cpp b/libopie2/opiedb/osqlmanager.cpp
index f093766..c472f6b 100644
--- a/libopie2/opiedb/osqlmanager.cpp
+++ b/libopie2/opiedb/osqlmanager.cpp
@@ -1,45 +1,42 @@
1
2#include <stdlib.h>
3
4#include "osqlmanager.h" 1#include "osqlmanager.h"
5#include "osqlbackendmanager.h" 2#include "osqlbackendmanager.h"
6#include "osqlitedriver.h" 3#include "osqlitedriver.h"
7 4
5
6
8namespace Opie { 7namespace Opie {
9namespace DB { 8namespace DB {
10 9
11OSQLManager::OSQLManager() { 10OSQLManager::OSQLManager() {
12} 11}
13OSQLBackEnd::ValueList OSQLManager::queryBackEnd() { 12OSQLBackEnd::ValueList OSQLManager::queryBackEnd() {
14 m_list.clear(); 13 m_list.clear();
15 QString opie = QString::fromLatin1( getenv("OPIEDIR") ); 14 QString opie = QString::fromLatin1( getenv("OPIEDIR") );
16 QString qpe = QString::fromLatin1( getenv("QPEDIR") );
17 15
18 if ( !m_path.contains(opie) && !opie.isEmpty() ) 16 if ( !m_path.contains(opie) && !opie.isEmpty() )
19 m_path << opie; 17 m_path << opie;
20 if ( !m_path.contains(qpe) && !qpe.isEmpty() ) 18
21 m_path << qpe;
22 19
23 OSQLBackEndManager mng( m_path ); 20 OSQLBackEndManager mng( m_path );
24 m_list = mng.scan(); 21 m_list = mng.scan();
25 m_list += builtIn(); 22 m_list += builtIn();
26 23
27 return m_list; 24 return m_list;
28} 25}
29/* 26/*
30 * loading dso's is currently not enabled due problems with QLibrary 27 * loading dso's is currently not enabled due problems with QLibrary
31 * beeing in libqpe and not libqte 28 * beeing in libqpe and not libqte
32 */ 29 */
33OSQLDriver* OSQLManager::load( const QString& name ) { 30OSQLDriver* OSQLManager::load( const QString& name ) {
34 OSQLDriver* driver = 0l; 31 OSQLDriver* driver = 0l;
35 32
36 if ( name == "SQLite" ) { 33 if ( name == "SQLite" ) {
37 driver = new Opie::DB::Internal::OSQLiteDriver; 34 driver = new Opie::DB::Internal::OSQLiteDriver;
38 } 35 }
39 return driver; 36 return driver;
40} 37}
41/* 38/*
42 * same as above 39 * same as above
43 */ 40 */
44OSQLDriver* OSQLManager::load( const OSQLBackEnd& end) { 41OSQLDriver* OSQLManager::load( const OSQLBackEnd& end) {
45 OSQLDriver *driver = 0l; 42 OSQLDriver *driver = 0l;