From 1941e274acd375ff70fd09a9d458755d2a82e66e Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Mon, 6 Mar 2006 00:26:05 +0000
Subject: Cleaned up unnecessary header dependencies and fixed some
 indentations.

---
 src/dal/dataprovider.h         | 1 -
 src/dal/dataproviderfactory.h  | 7 +------
 src/dal/mysqldataprovider.cpp  | 4 +---
 src/dal/mysqldataprovider.h    | 2 +-
 src/dal/pqdataprovider.h       | 3 +--
 src/dal/recordset.cpp          | 5 +++--
 src/dal/recordset.h            | 6 ------
 src/dal/sqlitedataprovider.cpp | 3 +++
 src/dal/sqlitedataprovider.h   | 5 +----
 9 files changed, 11 insertions(+), 25 deletions(-)

(limited to 'src/dal')

diff --git a/src/dal/dataprovider.h b/src/dal/dataprovider.h
index 6687a749..fe034873 100644
--- a/src/dal/dataprovider.h
+++ b/src/dal/dataprovider.h
@@ -27,7 +27,6 @@
 
 #include <string>
 
-#include "dalexcept.h"
 #include "recordset.h"
 
 
diff --git a/src/dal/dataproviderfactory.h b/src/dal/dataproviderfactory.h
index 480f6da0..165113bd 100644
--- a/src/dal/dataproviderfactory.h
+++ b/src/dal/dataproviderfactory.h
@@ -20,20 +20,15 @@
  *  $Id$
  */
 
-
 #ifndef _TMWSERV_DATA_PROVIDER_FACTORY_H_
 #define _TMWSERV_DATA_PROVIDER_FACTORY_H_
 
 
-#include <stdexcept>
-
-#include "dataprovider.h"
-
-
 namespace tmwserv
 {
 namespace dal
 {
+    class DataProvider;
 
 
 /**
diff --git a/src/dal/mysqldataprovider.cpp b/src/dal/mysqldataprovider.cpp
index d397253c..69b4937e 100644
--- a/src/dal/mysqldataprovider.cpp
+++ b/src/dal/mysqldataprovider.cpp
@@ -20,11 +20,9 @@
  *  $Id$
  */
 
-
-#include "dalexcept.h"
-
 #include "mysqldataprovider.h"
 
+#include "dalexcept.h"
 
 namespace tmwserv
 {
diff --git a/src/dal/mysqldataprovider.h b/src/dal/mysqldataprovider.h
index 76194680..698c9fc5 100644
--- a/src/dal/mysqldataprovider.h
+++ b/src/dal/mysqldataprovider.h
@@ -25,7 +25,7 @@
 #define _TMWSERV_MYSQL_DATA_PROVIDER_H_
 
 
-#include <string>
+#include <iosfwd>
 
 #include <mysql/mysql.h>
 
diff --git a/src/dal/pqdataprovider.h b/src/dal/pqdataprovider.h
index 8b0c0bf6..73d5c8d7 100644
--- a/src/dal/pqdataprovider.h
+++ b/src/dal/pqdataprovider.h
@@ -25,8 +25,7 @@
 #define _TMWSERV_PQDATAPROVIDER_H_
 
 
-#include <string>
-
+#include <iosfwd>
 #include <libpq-fe.h>
 
 #include "dataprovider.h"
diff --git a/src/dal/recordset.cpp b/src/dal/recordset.cpp
index f404c2a2..d59447c7 100644
--- a/src/dal/recordset.cpp
+++ b/src/dal/recordset.cpp
@@ -20,11 +20,12 @@
  *  $Id$
  */
 
+#include "recordset.h"
 
 #include <sstream>
+#include <stdexcept>
 
-#include "recordset.h"
-
+#include "dalexcept.h"
 
 namespace tmwserv
 {
diff --git a/src/dal/recordset.h b/src/dal/recordset.h
index eac33cfd..0300c926 100644
--- a/src/dal/recordset.h
+++ b/src/dal/recordset.h
@@ -20,18 +20,12 @@
  *  $Id$
  */
 
-
 #ifndef _TMWSERV_RECORDSET_H_
 #define _TMWSERV_RECORDSET_H_
 
-
 #include <iostream>
-#include <stdexcept>
 #include <vector>
 
-#include "dalexcept.h"
-
-
 namespace tmwserv
 {
 namespace dal
diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp
index 2af82fcd..e0f67f55 100644
--- a/src/dal/sqlitedataprovider.cpp
+++ b/src/dal/sqlitedataprovider.cpp
@@ -23,6 +23,9 @@
 
 #include "sqlitedataprovider.h"
 
+#include <stdexcept>
+
+#include "dalexcept.h"
 
 namespace tmwserv
 {
diff --git a/src/dal/sqlitedataprovider.h b/src/dal/sqlitedataprovider.h
index 384067c5..60ac7b6e 100644
--- a/src/dal/sqlitedataprovider.h
+++ b/src/dal/sqlitedataprovider.h
@@ -20,13 +20,10 @@
  *  $Id$
  */
 
-
 #ifndef _TMWSERV_SQLITE_DATA_PROVIDER_H_
 #define _TMWSERV_SQLITE_DATA_PROVIDER_H_
 
-
-#include <string>
-
+#include <iosfwd>
 #include <sqlite3.h>
 
 #include "dataprovider.h"
-- 
cgit v1.2.3-60-g2f50