From ac32a7adcf39c1b60e7476d658ad2584ed9698e4 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Wed, 24 Feb 2016 17:30:49 +0100
Subject: [PATCH] Renamed SQLiteDatabase to SqliteDatabase
---
catalogue/CMakeLists.txt | 2 +-
catalogue/{SQLiteDatabase.cpp => SqliteDatabase.cpp} | 10 +++++-----
catalogue/{SQLiteDatabase.hpp => SqliteDatabase.hpp} | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
rename catalogue/{SQLiteDatabase.cpp => SqliteDatabase.cpp} (85%)
rename catalogue/{SQLiteDatabase.hpp => SqliteDatabase.hpp} (91%)
diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt
index 6b697726a1..43cf8af1d2 100644
--- a/catalogue/CMakeLists.txt
+++ b/catalogue/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 2.6)
set (CATALOGUE_LIB_SRC_FILES
Catalogue.cpp
DummyCatalogue.cpp
- SQLiteDatabase.cpp)
+ SqliteDatabase.cpp)
add_library (ctacatalogue
${CATALOGUE_LIB_SRC_FILES})
diff --git a/catalogue/SQLiteDatabase.cpp b/catalogue/SqliteDatabase.cpp
similarity index 85%
rename from catalogue/SQLiteDatabase.cpp
rename to catalogue/SqliteDatabase.cpp
index ad85c60202..d9c93f90cc 100644
--- a/catalogue/SQLiteDatabase.cpp
+++ b/catalogue/SqliteDatabase.cpp
@@ -16,18 +16,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "catalogue/SQLiteDatabase.hpp"
+#include "catalogue/SqliteDatabase.hpp"
#include "common/exception/Exception.hpp"
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-cta::catalogue::SQLiteDatabase::SQLiteDatabase(const std::string &filename) {
+cta::catalogue::SqliteDatabase::SqliteDatabase(const std::string &filename) {
m_dbHandle = NULL;
if(sqlite3_open(filename.c_str(), &m_dbHandle)) {
sqlite3_close(m_dbHandle);
exception::Exception ex;
- ex.getMessage() << "Failed to construct SQLiteDatabase: sqlite3_open failed"
+ ex.getMessage() << "Failed to construct SqliteDatabase: sqlite3_open failed"
": " << sqlite3_errmsg(m_dbHandle);
throw(ex);
}
@@ -36,13 +36,13 @@ cta::catalogue::SQLiteDatabase::SQLiteDatabase(const std::string &filename) {
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
-cta::catalogue::SQLiteDatabase::~SQLiteDatabase() {
+cta::catalogue::SqliteDatabase::~SqliteDatabase() {
sqlite3_close(m_dbHandle);
}
//------------------------------------------------------------------------------
// getHandle
//------------------------------------------------------------------------------
-sqlite3 *cta::catalogue::SQLiteDatabase::getHandle() {
+sqlite3 *cta::catalogue::SqliteDatabase::getHandle() {
return m_dbHandle;
}
diff --git a/catalogue/SQLiteDatabase.hpp b/catalogue/SqliteDatabase.hpp
similarity index 91%
rename from catalogue/SQLiteDatabase.hpp
rename to catalogue/SqliteDatabase.hpp
index a72676626f..f8a016aa4b 100644
--- a/catalogue/SQLiteDatabase.hpp
+++ b/catalogue/SqliteDatabase.hpp
@@ -27,7 +27,7 @@ namespace catalogue {
/**
* A C++ wrapper around an SQLite database handle.
*/
-class SQLiteDatabase {
+class SqliteDatabase {
public:
/**
@@ -35,12 +35,12 @@ public:
*
* @param filename The filename to be passed to the sqlit3_open() function.
*/
- SQLiteDatabase(const std::string &filename);
+ SqliteDatabase(const std::string &filename);
/**
* Destructor.
*/
- ~SQLiteDatabase();
+ ~SqliteDatabase();
/**
* Returns the underlying database handle.
@@ -52,7 +52,7 @@ public:
private:
/**
- * SQLite database handle.
+ * The database handle.
*/
sqlite3 *m_dbHandle;
--
GitLab