summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-17 16:37:22 (UTC)
committer zecke <zecke>2004-07-17 16:37:22 (UTC)
commitff046ffbe3d08ea07b08b914c81529f86b006b7f (patch) (unidiff)
treea1b57319a5a2f3075d883622cca88be38bf86e22
parentf02993238f76eb8975bb4138f213d2211710afa4 (diff)
downloadopie-ff046ffbe3d08ea07b08b914c81529f86b006b7f.zip
opie-ff046ffbe3d08ea07b08b914c81529f86b006b7f.tar.gz
opie-ff046ffbe3d08ea07b08b914c81529f86b006b7f.tar.bz2
Cosmetic changes
using namespace Opie::DB -> namespace Opie { namespace DB {
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/opiedb.pro3
-rw-r--r--libopie2/opiedb/osqlbackend.cpp7
-rw-r--r--libopie2/opiedb/osqlmanager.cpp7
3 files changed, 14 insertions, 3 deletions
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index e5b1ac9..8432674 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -1,38 +1,39 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = osqlbackend.h \ 4HEADERS = osqlbackend.h \
5 osqldriver.h \ 5 osqldriver.h \
6 osqlerror.h \ 6 osqlerror.h \
7 osqlmanager.h \ 7 osqlmanager.h \
8 osqlquery.h \ 8 osqlquery.h \
9 osqlresult.h \ 9 osqlresult.h \
10 osqltable.h \ 10 osqltable.h \
11 osqlbackendmanager.h \ 11 osqlbackendmanager.h \
12 osqlitedriver.h 12 osqlitedriver.h
13
13SOURCES = osqlbackend.cpp \ 14SOURCES = osqlbackend.cpp \
14 osqldriver.cpp \ 15 osqldriver.cpp \
15 osqlerror.cpp \ 16 osqlerror.cpp \
16 osqlmanager.cpp \ 17 osqlmanager.cpp \
17 osqlquery.cpp \ 18 osqlquery.cpp \
18 osqlresult.cpp \ 19 osqlresult.cpp \
19 osqltable.cpp \ 20 osqltable.cpp \
20 osqlbackendmanager.cpp \ 21 osqlbackendmanager.cpp \
21 osqlitedriver.cpp 22 osqlitedriver.cpp
22INTERFACES = 23
23TARGET = opiedb2 24TARGET = opiedb2
24VERSION = 1.9.0 25VERSION = 1.9.0
25INCLUDEPATH = $(OPIEDIR)/include 26INCLUDEPATH = $(OPIEDIR)/include
26DEPENDPATH = $(OPIEDIR)/include 27DEPENDPATH = $(OPIEDIR)/include
27LIBS += -lopiecore2 -lqpe -lsqlite 28LIBS += -lopiecore2 -lqpe -lsqlite
28 29
29!contains( platform, x11 ) { 30!contains( platform, x11 ) {
30 include ( $(OPIEDIR)/include.pro ) 31 include ( $(OPIEDIR)/include.pro )
31} 32}
32 33
33contains( platform, x11 ) { 34contains( platform, x11 ) {
34 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 35 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
35} 36}
36 37
37!isEmpty( LIBSQLITE_INC_DIR ) { 38!isEmpty( LIBSQLITE_INC_DIR ) {
38 INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH 39 INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH
diff --git a/libopie2/opiedb/osqlbackend.cpp b/libopie2/opiedb/osqlbackend.cpp
index 6e5159f..aede7c1 100644
--- a/libopie2/opiedb/osqlbackend.cpp
+++ b/libopie2/opiedb/osqlbackend.cpp
@@ -1,20 +1,21 @@
1 1
2#include "osqlbackend.h" 2#include "osqlbackend.h"
3 3
4using namespace Opie::DB; 4namespace Opie {
5namespace DB {
5 6
6 7
7OSQLBackEnd::OSQLBackEnd( const QString& name, 8OSQLBackEnd::OSQLBackEnd( const QString& name,
8 const QString& vendor, 9 const QString& vendor,
9 const QString& license, 10 const QString& license,
10 const QCString& lib ) 11 const QCString& lib )
11 : m_name( name), m_vendor( vendor), m_license( license ), m_lib( lib ) 12 : m_name( name), m_vendor( vendor), m_license( license ), m_lib( lib )
12{ 13{
13 m_default = false; 14 m_default = false;
14 m_pref = -1; 15 m_pref = -1;
15} 16}
16OSQLBackEnd::OSQLBackEnd( const OSQLBackEnd& back ) { 17OSQLBackEnd::OSQLBackEnd( const OSQLBackEnd& back ) {
17 (*this) = back; 18 (*this) = back;
18} 19}
19OSQLBackEnd::~OSQLBackEnd() { 20OSQLBackEnd::~OSQLBackEnd() {
20} 21}
@@ -60,16 +61,20 @@ void OSQLBackEnd::setName( const QString& name ) {
60} 61}
61void OSQLBackEnd::setVendor( const QString& vendor ) { 62void OSQLBackEnd::setVendor( const QString& vendor ) {
62 m_vendor = vendor; 63 m_vendor = vendor;
63} 64}
64void OSQLBackEnd::setLicense( const QString & license ) { 65void OSQLBackEnd::setLicense( const QString & license ) {
65 m_license = license; 66 m_license = license;
66} 67}
67void OSQLBackEnd::setLibrary( const QCString& lib ) { 68void OSQLBackEnd::setLibrary( const QCString& lib ) {
68 m_lib = lib; 69 m_lib = lib;
69} 70}
70void OSQLBackEnd::setDefault( bool def) { 71void OSQLBackEnd::setDefault( bool def) {
71 m_default = def; 72 m_default = def;
72} 73}
73void OSQLBackEnd::setPreference( int pref ) { 74void OSQLBackEnd::setPreference( int pref ) {
74 m_pref = pref; 75 m_pref = pref;
75} 76}
77
78
79}
80} \ No newline at end of file
diff --git a/libopie2/opiedb/osqlmanager.cpp b/libopie2/opiedb/osqlmanager.cpp
index a6498df..f093766 100644
--- a/libopie2/opiedb/osqlmanager.cpp
+++ b/libopie2/opiedb/osqlmanager.cpp
@@ -1,24 +1,25 @@
1 1
2#include <stdlib.h> 2#include <stdlib.h>
3 3
4#include "osqlmanager.h" 4#include "osqlmanager.h"
5#include "osqlbackendmanager.h" 5#include "osqlbackendmanager.h"
6#include "osqlitedriver.h" 6#include "osqlitedriver.h"
7 7
8using namespace Opie::DB; 8namespace Opie {
9namespace DB {
9 10
10OSQLManager::OSQLManager() { 11OSQLManager::OSQLManager() {
11} 12}
12OSQLBackEnd::ValueList OSQLManager::queryBackEnd() { 13OSQLBackEnd::ValueList OSQLManager::queryBackEnd() {
13 m_list.clear(); 14 m_list.clear();
14 QString opie = QString::fromLatin1( getenv("OPIEDIR") ); 15 QString opie = QString::fromLatin1( getenv("OPIEDIR") );
15 QString qpe = QString::fromLatin1( getenv("QPEDIR") ); 16 QString qpe = QString::fromLatin1( getenv("QPEDIR") );
16 17
17 if ( !m_path.contains(opie) && !opie.isEmpty() ) 18 if ( !m_path.contains(opie) && !opie.isEmpty() )
18 m_path << opie; 19 m_path << opie;
19 if ( !m_path.contains(qpe) && !qpe.isEmpty() ) 20 if ( !m_path.contains(qpe) && !qpe.isEmpty() )
20 m_path << qpe; 21 m_path << qpe;
21 22
22 OSQLBackEndManager mng( m_path ); 23 OSQLBackEndManager mng( m_path );
23 m_list = mng.scan(); 24 m_list = mng.scan();
24 m_list += builtIn(); 25 m_list += builtIn();
@@ -68,16 +69,20 @@ OSQLDriver* OSQLManager::standard() {
68void OSQLManager::registerPath( const QString& path ) { 69void OSQLManager::registerPath( const QString& path ) {
69 m_path << path; 70 m_path << path;
70} 71}
71bool OSQLManager::unregisterPath( const QString& path ) { 72bool OSQLManager::unregisterPath( const QString& path ) {
72 m_path.remove( path ); 73 m_path.remove( path );
73 return true; 74 return true;
74} 75}
75OSQLBackEnd::ValueList OSQLManager::builtIn()const { 76OSQLBackEnd::ValueList OSQLManager::builtIn()const {
76 OSQLBackEnd::ValueList list; 77 OSQLBackEnd::ValueList list;
77 // create the OSQLiteBackend 78 // create the OSQLiteBackend
78 OSQLBackEnd back("SQLite","Opie e.V.","GPL", "builtin" ); 79 OSQLBackEnd back("SQLite","Opie e.V.","GPL", "builtin" );
79 back.setDefault( true ); 80 back.setDefault( true );
80 back.setPreference( 50 ); 81 back.setPreference( 50 );
81 list.append( back ); 82 list.append( back );
82 return list; 83 return list;
83} 84}
85
86
87}
88}