author | zecke <zecke> | 2004-07-17 16:37:22 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-17 16:37:22 (UTC) |
commit | ff046ffbe3d08ea07b08b914c81529f86b006b7f (patch) (unidiff) | |
tree | a1b57319a5a2f3075d883622cca88be38bf86e22 /libopie2 | |
parent | f02993238f76eb8975bb4138f213d2211710afa4 (diff) | |
download | opie-ff046ffbe3d08ea07b08b914c81529f86b006b7f.zip opie-ff046ffbe3d08ea07b08b914c81529f86b006b7f.tar.gz opie-ff046ffbe3d08ea07b08b914c81529f86b006b7f.tar.bz2 |
Cosmetic changes
using namespace Opie::DB -> namespace Opie { namespace DB {
-rw-r--r-- | libopie2/opiedb/opiedb.pro | 3 | ||||
-rw-r--r-- | libopie2/opiedb/osqlbackend.cpp | 7 | ||||
-rw-r--r-- | libopie2/opiedb/osqlmanager.cpp | 7 |
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 | |||
@@ -5,26 +5,27 @@ HEADERS = 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 | |||
13 | SOURCES = osqlbackend.cpp \ | 14 | SOURCES = 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 |
22 | INTERFACES = | 23 | |
23 | TARGET = opiedb2 | 24 | TARGET = opiedb2 |
24 | VERSION = 1.9.0 | 25 | VERSION = 1.9.0 |
25 | INCLUDEPATH = $(OPIEDIR)/include | 26 | INCLUDEPATH = $(OPIEDIR)/include |
26 | DEPENDPATH = $(OPIEDIR)/include | 27 | DEPENDPATH = $(OPIEDIR)/include |
27 | LIBS += -lopiecore2 -lqpe -lsqlite | 28 | LIBS += -lopiecore2 -lqpe -lsqlite |
28 | 29 | ||
29 | !contains( platform, x11 ) { | 30 | !contains( platform, x11 ) { |
30 | include ( $(OPIEDIR)/include.pro ) | 31 | include ( $(OPIEDIR)/include.pro ) |
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,12 +1,13 @@ | |||
1 | 1 | ||
2 | #include "osqlbackend.h" | 2 | #include "osqlbackend.h" |
3 | 3 | ||
4 | using namespace Opie::DB; | 4 | namespace Opie { |
5 | namespace DB { | ||
5 | 6 | ||
6 | 7 | ||
7 | OSQLBackEnd::OSQLBackEnd( const QString& name, | 8 | OSQLBackEnd::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 | { |
@@ -68,8 +69,12 @@ void OSQLBackEnd::setLibrary( const QCString& lib ) { | |||
68 | m_lib = lib; | 69 | m_lib = lib; |
69 | } | 70 | } |
70 | void OSQLBackEnd::setDefault( bool def) { | 71 | void OSQLBackEnd::setDefault( bool def) { |
71 | m_default = def; | 72 | m_default = def; |
72 | } | 73 | } |
73 | void OSQLBackEnd::setPreference( int pref ) { | 74 | void 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,16 +1,17 @@ | |||
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 | ||
8 | using namespace Opie::DB; | 8 | namespace Opie { |
9 | namespace DB { | ||
9 | 10 | ||
10 | OSQLManager::OSQLManager() { | 11 | OSQLManager::OSQLManager() { |
11 | } | 12 | } |
12 | OSQLBackEnd::ValueList OSQLManager::queryBackEnd() { | 13 | OSQLBackEnd::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 | ||
@@ -76,8 +77,12 @@ OSQLBackEnd::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 | } | ||