summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libsqlitepp/sqlite-command.cpp (renamed from libsqlitepp/command.cpp)4
-rw-r--r--libsqlitepp/sqlite-command.h (renamed from libsqlitepp/command.h)0
-rw-r--r--libsqlitepp/sqlite-connection.cpp (renamed from libsqlitepp/connection.cpp)8
-rw-r--r--libsqlitepp/sqlite-connection.h (renamed from libsqlitepp/connection.h)2
-rw-r--r--libsqlitepp/sqlite-error.cpp (renamed from libsqlitepp/error.cpp)2
-rw-r--r--libsqlitepp/sqlite-error.h (renamed from libsqlitepp/error.h)0
-rw-r--r--libsqlitepp/sqlite-mock.cpp (renamed from libsqlitepp/mock.cpp)4
-rw-r--r--libsqlitepp/sqlite-mock.h (renamed from libsqlitepp/mock.h)0
-rw-r--r--libsqlitepp/sqlite-modifycommand.cpp (renamed from libsqlitepp/modifycommand.cpp)6
-rw-r--r--libsqlitepp/sqlite-modifycommand.h (renamed from libsqlitepp/modifycommand.h)2
-rw-r--r--libsqlitepp/sqlite-selectcommand.cpp (renamed from libsqlitepp/selectcommand.cpp)6
-rw-r--r--libsqlitepp/sqlite-selectcommand.h (renamed from libsqlitepp/selectcommand.h)2
-rw-r--r--libsqlitepp/unittests/testsqlite.cpp4
13 files changed, 20 insertions, 20 deletions
diff --git a/libsqlitepp/command.cpp b/libsqlitepp/sqlite-command.cpp
index 4e24426..48563fa 100644
--- a/libsqlitepp/command.cpp
+++ b/libsqlitepp/sqlite-command.cpp
@@ -1,5 +1,5 @@
-#include "command.h"
-#include "connection.h"
+#include "sqlite-command.h"
+#include "sqlite-connection.h"
#include <stdlib.h>
#include <string.h>
diff --git a/libsqlitepp/command.h b/libsqlitepp/sqlite-command.h
index c66d71d..c66d71d 100644
--- a/libsqlitepp/command.h
+++ b/libsqlitepp/sqlite-command.h
diff --git a/libsqlitepp/connection.cpp b/libsqlitepp/sqlite-connection.cpp
index 3331024..5eead63 100644
--- a/libsqlitepp/connection.cpp
+++ b/libsqlitepp/sqlite-connection.cpp
@@ -1,7 +1,7 @@
-#include "connection.h"
-#include "error.h"
-#include "selectcommand.h"
-#include "modifycommand.h"
+#include "sqlite-connection.h"
+#include "sqlite-error.h"
+#include "sqlite-selectcommand.h"
+#include "sqlite-modifycommand.h"
SQLite::Connection::Connection(const std::string & str) :
txDepth(0),
diff --git a/libsqlitepp/connection.h b/libsqlitepp/sqlite-connection.h
index f5e2ec4..9398ee8 100644
--- a/libsqlitepp/connection.h
+++ b/libsqlitepp/sqlite-connection.h
@@ -2,7 +2,7 @@
#define SQLITE_CONNECTION_H
#include <connection.h>
-#include "error.h"
+#include "sqlite-error.h"
#include <sqlite3.h>
namespace SQLite {
diff --git a/libsqlitepp/error.cpp b/libsqlitepp/sqlite-error.cpp
index 9bdf80b..a0758ef 100644
--- a/libsqlitepp/error.cpp
+++ b/libsqlitepp/sqlite-error.cpp
@@ -1,4 +1,4 @@
-#include "error.h"
+#include "sqlite-error.h"
#include <string.h>
SQLite::Error::Error() :
diff --git a/libsqlitepp/error.h b/libsqlitepp/sqlite-error.h
index 3f8d32e..3f8d32e 100644
--- a/libsqlitepp/error.h
+++ b/libsqlitepp/sqlite-error.h
diff --git a/libsqlitepp/mock.cpp b/libsqlitepp/sqlite-mock.cpp
index 4748116..2f0958d 100644
--- a/libsqlitepp/mock.cpp
+++ b/libsqlitepp/sqlite-mock.cpp
@@ -1,5 +1,5 @@
-#include "mock.h"
-#include "connection.h"
+#include "sqlite-mock.h"
+#include "sqlite-connection.h"
#include <buffer.h>
#include <boost/filesystem/operations.hpp>
diff --git a/libsqlitepp/mock.h b/libsqlitepp/sqlite-mock.h
index 8bd0899..8bd0899 100644
--- a/libsqlitepp/mock.h
+++ b/libsqlitepp/sqlite-mock.h
diff --git a/libsqlitepp/modifycommand.cpp b/libsqlitepp/sqlite-modifycommand.cpp
index 1b44cf4..cb5d761 100644
--- a/libsqlitepp/modifycommand.cpp
+++ b/libsqlitepp/sqlite-modifycommand.cpp
@@ -1,7 +1,7 @@
-#include "modifycommand.h"
-#include "error.h"
+#include "sqlite-modifycommand.h"
+#include "sqlite-error.h"
#include <stdlib.h>
-#include "connection.h"
+#include "sqlite-connection.h"
SQLite::ModifyCommand::ModifyCommand(const Connection * conn, const std::string & sql) :
DB::Command(sql),
diff --git a/libsqlitepp/modifycommand.h b/libsqlitepp/sqlite-modifycommand.h
index 7f052ca..657639b 100644
--- a/libsqlitepp/modifycommand.h
+++ b/libsqlitepp/sqlite-modifycommand.h
@@ -2,7 +2,7 @@
#define SQLITE_MODIFYCOMMAND_H
#include <modifycommand.h>
-#include "command.h"
+#include "sqlite-command.h"
namespace SQLite {
class Connection;
diff --git a/libsqlitepp/selectcommand.cpp b/libsqlitepp/sqlite-selectcommand.cpp
index a79b031..30d1561 100644
--- a/libsqlitepp/selectcommand.cpp
+++ b/libsqlitepp/sqlite-selectcommand.cpp
@@ -1,6 +1,6 @@
-#include "selectcommand.h"
-#include "connection.h"
-#include "error.h"
+#include "sqlite-selectcommand.h"
+#include "sqlite-connection.h"
+#include "sqlite-error.h"
#include <string.h>
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/ordered_index.hpp>
diff --git a/libsqlitepp/selectcommand.h b/libsqlitepp/sqlite-selectcommand.h
index c3ad01d..c795018 100644
--- a/libsqlitepp/selectcommand.h
+++ b/libsqlitepp/sqlite-selectcommand.h
@@ -2,7 +2,7 @@
#define SQLITE_SELECTCOMMAND_H
#include <selectcommand.h>
-#include "command.h"
+#include "sqlite-command.h"
namespace SQLite {
class Connection;
diff --git a/libsqlitepp/unittests/testsqlite.cpp b/libsqlitepp/unittests/testsqlite.cpp
index 62764bd..9cd8de9 100644
--- a/libsqlitepp/unittests/testsqlite.cpp
+++ b/libsqlitepp/unittests/testsqlite.cpp
@@ -5,8 +5,8 @@
#include <dbpp/modifycommand.h>
#include <dbpp/selectcommand.h>
#include <dbpp/column.h>
-#include <mock.h>
-#include "testCore.h"
+#include <sqlite-mock.h>
+#include <testCore.h>
#include <boost/date_time/posix_time/posix_time.hpp>
class StandardMockDatabase : public SQLite::Mock {