diff options
-rw-r--r-- | libodbcpp/Jamfile.jam | 2 | ||||
-rw-r--r-- | libodbcpp/client.h | 7 | ||||
-rw-r--r-- | libodbcpp/odbc-bind.cpp (renamed from libodbcpp/bind.cpp) | 2 | ||||
-rw-r--r-- | libodbcpp/odbc-bind.h (renamed from libodbcpp/bind.h) | 0 | ||||
-rw-r--r-- | libodbcpp/odbc-client.h | 7 | ||||
-rw-r--r-- | libodbcpp/odbc-column.cpp (renamed from libodbcpp/column.cpp) | 8 | ||||
-rw-r--r-- | libodbcpp/odbc-column.h (renamed from libodbcpp/column.h) | 4 | ||||
-rw-r--r-- | libodbcpp/odbc-command.cpp (renamed from libodbcpp/command.cpp) | 6 | ||||
-rw-r--r-- | libodbcpp/odbc-command.h (renamed from libodbcpp/command.h) | 2 | ||||
-rw-r--r-- | libodbcpp/odbc-connection.cpp (renamed from libodbcpp/connection.cpp) | 6 | ||||
-rw-r--r-- | libodbcpp/odbc-connection.h (renamed from libodbcpp/connection.h) | 4 | ||||
-rw-r--r-- | libodbcpp/odbc-dsn.cpp (renamed from libodbcpp/dsn.cpp) | 2 | ||||
-rw-r--r-- | libodbcpp/odbc-dsn.h (renamed from libodbcpp/dsn.h) | 0 | ||||
-rw-r--r-- | libodbcpp/odbc-error.cpp (renamed from libodbcpp/error.cpp) | 2 | ||||
-rw-r--r-- | libodbcpp/odbc-error.h (renamed from libodbcpp/error.h) | 0 | ||||
-rw-r--r-- | libodbcpp/odbc-mock.cpp (renamed from libodbcpp/mock.cpp) | 4 | ||||
-rw-r--r-- | libodbcpp/odbc-mock.h (renamed from libodbcpp/mock.h) | 0 | ||||
-rw-r--r-- | libodbcpp/odbc-modifycommand.cpp (renamed from libodbcpp/modifycommand.cpp) | 4 | ||||
-rw-r--r-- | libodbcpp/odbc-modifycommand.h (renamed from libodbcpp/modifycommand.h) | 2 | ||||
-rw-r--r-- | libodbcpp/odbc-param.cpp (renamed from libodbcpp/param.cpp) | 6 | ||||
-rw-r--r-- | libodbcpp/odbc-param.h (renamed from libodbcpp/param.h) | 2 | ||||
-rw-r--r-- | libodbcpp/odbc-selectcommand.cpp (renamed from libodbcpp/selectcommand.cpp) | 6 | ||||
-rw-r--r-- | libodbcpp/odbc-selectcommand.h (renamed from libodbcpp/selectcommand.h) | 2 | ||||
-rw-r--r-- | libodbcpp/unittests/testodbc.cpp | 2 |
24 files changed, 40 insertions, 40 deletions
diff --git a/libodbcpp/Jamfile.jam b/libodbcpp/Jamfile.jam index 7dd6a35..4121da7 100644 --- a/libodbcpp/Jamfile.jam +++ b/libodbcpp/Jamfile.jam @@ -23,5 +23,5 @@ lib dbpp-odbc : build-project unittests ; -package.install install : <install-source-root>. : : dbpp-odbc : [ glob *.h ] ; +package.install install : <install-source-root>. : : dbpp-odbc : [ glob odbc-*.h ] ; diff --git a/libodbcpp/client.h b/libodbcpp/client.h deleted file mode 100644 index ac76b3f..0000000 --- a/libodbcpp/client.h +++ /dev/null @@ -1,7 +0,0 @@ -#include "column.h" -#include "command.h" -#include "connection.h" -#include "dsn.h" -#include "modifycommand.h" -#include "param.h" -#include "selectcommand.h" diff --git a/libodbcpp/bind.cpp b/libodbcpp/odbc-bind.cpp index d29fce8..1575fd0 100644 --- a/libodbcpp/bind.cpp +++ b/libodbcpp/odbc-bind.cpp @@ -1,4 +1,4 @@ -#include "bind.h" +#include "odbc-bind.h" ODBC::Bind::Bind() { diff --git a/libodbcpp/bind.h b/libodbcpp/odbc-bind.h index 356723b..356723b 100644 --- a/libodbcpp/bind.h +++ b/libodbcpp/odbc-bind.h diff --git a/libodbcpp/odbc-client.h b/libodbcpp/odbc-client.h new file mode 100644 index 0000000..3fb94aa --- /dev/null +++ b/libodbcpp/odbc-client.h @@ -0,0 +1,7 @@ +#include "odbc-column.h" +#include "odbc-command.h" +#include "odbc-connection.h" +#include "odbc-dsn.h" +#include "odbc-modifycommand.h" +#include "odbc-param.h" +#include "odbc-selectcommand.h" diff --git a/libodbcpp/column.cpp b/libodbcpp/odbc-column.cpp index da31ed0..20c68f0 100644 --- a/libodbcpp/column.cpp +++ b/libodbcpp/odbc-column.cpp @@ -1,10 +1,10 @@ #include <sqlext.h> #include <stdio.h> #include <stdlib.h> -#include "column.h" -#include "command.h" -#include "selectcommand.h" -#include "error.h" +#include "odbc-column.h" +#include "odbc-command.h" +#include "odbc-selectcommand.h" +#include "odbc-error.h" ODBC::Column::Column(SelectCommand * sc, const Glib::ustring & s, unsigned int i) : DB::Column(s, i), diff --git a/libodbcpp/column.h b/libodbcpp/odbc-column.h index c39a0f2..d80ec63 100644 --- a/libodbcpp/column.h +++ b/libodbcpp/odbc-column.h @@ -5,8 +5,8 @@ #include <typeinfo> #include <glibmm/ustring.h> #include <algorithm> -#include "bind.h" -#include "param.h" +#include "odbc-bind.h" +#include "odbc-param.h" namespace ODBC { class SelectCommand; diff --git a/libodbcpp/command.cpp b/libodbcpp/odbc-command.cpp index 801060f..d96234d 100644 --- a/libodbcpp/command.cpp +++ b/libodbcpp/odbc-command.cpp @@ -1,6 +1,6 @@ -#include "command.h" -#include "error.h" -#include "param.h" +#include "odbc-command.h" +#include "odbc-error.h" +#include "odbc-param.h" #include <sqlext.h> ODBC::Command::Command(const Connection & c, const std::string & s) : diff --git a/libodbcpp/command.h b/libodbcpp/odbc-command.h index 14b2cbb..d7173e3 100644 --- a/libodbcpp/command.h +++ b/libodbcpp/odbc-command.h @@ -3,7 +3,7 @@ #include <command.h> #include <vector> -#include "connection.h" +#include "odbc-connection.h" #include <glibmm/ustring.h> namespace ODBC { diff --git a/libodbcpp/connection.cpp b/libodbcpp/odbc-connection.cpp index 7e71b94..a6fa2bd 100644 --- a/libodbcpp/connection.cpp +++ b/libodbcpp/odbc-connection.cpp @@ -3,9 +3,9 @@ #include <syslog.h> #include <stdio.h> #include <string.h> -#include "connection.h" -#include "selectcommand.h" -#include "modifycommand.h" +#include "odbc-connection.h" +#include "odbc-selectcommand.h" +#include "odbc-modifycommand.h" #include "error.h" NAMEDFACTORY("odbc", ODBC::Connection, DB::ConnectionFactory); diff --git a/libodbcpp/connection.h b/libodbcpp/odbc-connection.h index bc05b63..d927b70 100644 --- a/libodbcpp/connection.h +++ b/libodbcpp/odbc-connection.h @@ -3,8 +3,8 @@ #include <connection.h> #include <error.h> -#include "dsn.h" -#include "error.h" +#include "odbc-dsn.h" +#include "odbc-error.h" #include <sql.h> namespace ODBC { diff --git a/libodbcpp/dsn.cpp b/libodbcpp/odbc-dsn.cpp index 337319b..766b0ac 100644 --- a/libodbcpp/dsn.cpp +++ b/libodbcpp/odbc-dsn.cpp @@ -1,4 +1,4 @@ -#include "dsn.h" +#include "odbc-dsn.h" ODBC::DSN::DSN(const std::string & d, const std::string & u, const std::string & p) : dsn(d), diff --git a/libodbcpp/dsn.h b/libodbcpp/odbc-dsn.h index 6be7e3b..6be7e3b 100644 --- a/libodbcpp/dsn.h +++ b/libodbcpp/odbc-dsn.h diff --git a/libodbcpp/error.cpp b/libodbcpp/odbc-error.cpp index 7707401..182c022 100644 --- a/libodbcpp/error.cpp +++ b/libodbcpp/odbc-error.cpp @@ -4,7 +4,7 @@ #include <malloc.h> #include <time.h> #include <string.h> -#include "error.h" +#include "odbc-error.h" static void diff --git a/libodbcpp/error.h b/libodbcpp/odbc-error.h index 0348980..0348980 100644 --- a/libodbcpp/error.h +++ b/libodbcpp/odbc-error.h diff --git a/libodbcpp/mock.cpp b/libodbcpp/odbc-mock.cpp index 58d5afd..71c4c56 100644 --- a/libodbcpp/mock.cpp +++ b/libodbcpp/odbc-mock.cpp @@ -1,5 +1,5 @@ -#include "connection.h" -#include "mock.h" +#include "odbc-connection.h" +#include "odbc-mock.h" #include <buffer.h> namespace ODBC { diff --git a/libodbcpp/mock.h b/libodbcpp/odbc-mock.h index d2bcbfe..d2bcbfe 100644 --- a/libodbcpp/mock.h +++ b/libodbcpp/odbc-mock.h diff --git a/libodbcpp/modifycommand.cpp b/libodbcpp/odbc-modifycommand.cpp index 7a39be5..5d483c5 100644 --- a/libodbcpp/modifycommand.cpp +++ b/libodbcpp/odbc-modifycommand.cpp @@ -1,5 +1,5 @@ -#include "modifycommand.h" -#include "error.h" +#include "odbc-modifycommand.h" +#include "odbc-error.h" ODBC::ModifyCommand::ModifyCommand(const ODBC::Connection & c, const std::string & sql) : DB::Command(sql), diff --git a/libodbcpp/modifycommand.h b/libodbcpp/odbc-modifycommand.h index 24fb960..5b2a4f4 100644 --- a/libodbcpp/modifycommand.h +++ b/libodbcpp/odbc-modifycommand.h @@ -2,7 +2,7 @@ #define ODBC_MODIFYCOMMAND_H #include <modifycommand.h> -#include "command.h" +#include "odbc-command.h" namespace ODBC { class ModifyCommand : public Command, public DB::ModifyCommand { diff --git a/libodbcpp/param.cpp b/libodbcpp/odbc-param.cpp index b91c07e..cd78940 100644 --- a/libodbcpp/param.cpp +++ b/libodbcpp/odbc-param.cpp @@ -1,7 +1,7 @@ #include <sqlext.h> -#include "param.h" -#include "command.h" -#include "error.h" +#include "odbc-param.h" +#include "odbc-command.h" +#include "odbc-error.h" #include <string.h> ODBC::Param::Param() : diff --git a/libodbcpp/param.h b/libodbcpp/odbc-param.h index d695391..ca49c46 100644 --- a/libodbcpp/param.h +++ b/libodbcpp/odbc-param.h @@ -4,7 +4,7 @@ #include <malloc.h> #include <sqlext.h> #include <glibmm/ustring.h> -#include "bind.h" +#include "odbc-bind.h" #include <boost/date_time/posix_time/posix_time_types.hpp> namespace ODBC { diff --git a/libodbcpp/selectcommand.cpp b/libodbcpp/odbc-selectcommand.cpp index 744c2c2..52a45ad 100644 --- a/libodbcpp/selectcommand.cpp +++ b/libodbcpp/odbc-selectcommand.cpp @@ -1,6 +1,6 @@ -#include "selectcommand.h" -#include "error.h" -#include "column.h" +#include "odbc-selectcommand.h" +#include "odbc-error.h" +#include "odbc-column.h" #include <sqlext.h> #include <stdio.h> #include <string.h> diff --git a/libodbcpp/selectcommand.h b/libodbcpp/odbc-selectcommand.h index 51dba87..1fb2220 100644 --- a/libodbcpp/selectcommand.h +++ b/libodbcpp/odbc-selectcommand.h @@ -2,7 +2,7 @@ #define ODBC_SELECTCOMMAND_H #include <selectcommand.h> -#include "command.h" +#include "odbc-command.h" namespace ODBC { class Column; diff --git a/libodbcpp/unittests/testodbc.cpp b/libodbcpp/unittests/testodbc.cpp index 301168c..aa36460 100644 --- a/libodbcpp/unittests/testodbc.cpp +++ b/libodbcpp/unittests/testodbc.cpp @@ -6,7 +6,7 @@ #include <dbpp/selectcommand.h> #include <dbpp/column.h> #include <dbpp/error.h> -#include <mock.h> +#include <odbc-mock.h> #include <testCore.h> #include <definedDirs.h> #include <boost/date_time/posix_time/posix_time.hpp> |