summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-17 16:37:22 (UTC)
committer zecke <zecke>2004-07-17 16:37:22 (UTC)
commitff046ffbe3d08ea07b08b914c81529f86b006b7f (patch) (side-by-side diff)
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) (show 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,34 +1,35 @@
TEMPLATE = lib
CONFIG += qt warn_on
DESTDIR = $(OPIEDIR)/lib
HEADERS = osqlbackend.h \
osqldriver.h \
osqlerror.h \
osqlmanager.h \
osqlquery.h \
osqlresult.h \
osqltable.h \
osqlbackendmanager.h \
osqlitedriver.h
+
SOURCES = osqlbackend.cpp \
osqldriver.cpp \
osqlerror.cpp \
osqlmanager.cpp \
osqlquery.cpp \
osqlresult.cpp \
osqltable.cpp \
osqlbackendmanager.cpp \
osqlitedriver.cpp
-INTERFACES =
+
TARGET = opiedb2
VERSION = 1.9.0
INCLUDEPATH = $(OPIEDIR)/include
DEPENDPATH = $(OPIEDIR)/include
LIBS += -lopiecore2 -lqpe -lsqlite
!contains( platform, x11 ) {
include ( $(OPIEDIR)/include.pro )
}
contains( platform, x11 ) {
LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
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,16 +1,17 @@
#include "osqlbackend.h"
-using namespace Opie::DB;
+namespace Opie {
+namespace DB {
OSQLBackEnd::OSQLBackEnd( const QString& name,
const QString& vendor,
const QString& license,
const QCString& lib )
: m_name( name), m_vendor( vendor), m_license( license ), m_lib( lib )
{
m_default = false;
m_pref = -1;
}
OSQLBackEnd::OSQLBackEnd( const OSQLBackEnd& back ) {
@@ -64,12 +65,16 @@ void OSQLBackEnd::setVendor( const QString& vendor ) {
void OSQLBackEnd::setLicense( const QString & license ) {
m_license = license;
}
void OSQLBackEnd::setLibrary( const QCString& lib ) {
m_lib = lib;
}
void OSQLBackEnd::setDefault( bool def) {
m_default = def;
}
void OSQLBackEnd::setPreference( int pref ) {
m_pref = pref;
}
+
+
+}
+} \ 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,20 +1,21 @@
#include <stdlib.h>
#include "osqlmanager.h"
#include "osqlbackendmanager.h"
#include "osqlitedriver.h"
-using namespace Opie::DB;
+namespace Opie {
+namespace DB {
OSQLManager::OSQLManager() {
}
OSQLBackEnd::ValueList OSQLManager::queryBackEnd() {
m_list.clear();
QString opie = QString::fromLatin1( getenv("OPIEDIR") );
QString qpe = QString::fromLatin1( getenv("QPEDIR") );
if ( !m_path.contains(opie) && !opie.isEmpty() )
m_path << opie;
if ( !m_path.contains(qpe) && !qpe.isEmpty() )
m_path << qpe;
@@ -72,12 +73,16 @@ bool OSQLManager::unregisterPath( const QString& path ) {
m_path.remove( path );
return true;
}
OSQLBackEnd::ValueList OSQLManager::builtIn()const {
OSQLBackEnd::ValueList list;
// create the OSQLiteBackend
OSQLBackEnd back("SQLite","Opie e.V.","GPL", "builtin" );
back.setDefault( true );
back.setPreference( 50 );
list.append( back );
return list;
}
+
+
+}
+}