diff options
131 files changed, 186 insertions, 125 deletions
diff --git a/project2/basics/functions/dates.cpp b/project2/basics/functions/dates.cpp index f2dcb20..0c795c2 100644 --- a/project2/basics/functions/dates.cpp +++ b/project2/basics/functions/dates.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <variables.h> #include <scriptLoader.h> #include <scriptStorage.h> diff --git a/project2/basics/functions/strings.cpp b/project2/basics/functions/strings.cpp index d4ba7b7..f98c6a0 100644 --- a/project2/basics/functions/strings.cpp +++ b/project2/basics/functions/strings.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <variables.h> #include <scriptLoader.h> #include <scriptStorage.h> diff --git a/project2/basics/tests/compoundTest.cpp b/project2/basics/tests/compoundTest.cpp index b361db5..a55fc9a 100644 --- a/project2/basics/tests/compoundTest.cpp +++ b/project2/basics/tests/compoundTest.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "compoundTest.h" #include <scriptLoader.h> #include <boost/foreach.hpp> diff --git a/project2/basics/tests/compoundTest.h b/project2/basics/tests/compoundTest.h index f65e954..cc213c3 100644 --- a/project2/basics/tests/compoundTest.h +++ b/project2/basics/tests/compoundTest.h @@ -2,6 +2,7 @@ #define IF_H #include <test.h> +#include "scriptStorage.h" class CompoundTest : public Test { public: diff --git a/project2/basics/tests/equals.cpp b/project2/basics/tests/equals.cpp index ba8c695..b3d0e7e 100644 --- a/project2/basics/tests/equals.cpp +++ b/project2/basics/tests/equals.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <test.h> #include <scriptLoader.h> #include <rowProcessor.h> diff --git a/project2/basics/tests/isdistinct.cpp b/project2/basics/tests/isdistinct.cpp index 06d887e..923924e 100644 --- a/project2/basics/tests/isdistinct.cpp +++ b/project2/basics/tests/isdistinct.cpp @@ -1,7 +1,8 @@ -#include <pch.hpp> +#include "pch.hpp" #include <test.h> #include <scriptLoader.h> #include <iHaveParameters.h> +#include <boost/foreach.hpp> #include <rowProcessor.h> class IsDistinct : public Test, IHaveParameters { diff --git a/project2/basics/tests/isuniq.cpp b/project2/basics/tests/isuniq.cpp index 548be14..52c5b3b 100644 --- a/project2/basics/tests/isuniq.cpp +++ b/project2/basics/tests/isuniq.cpp @@ -1,7 +1,8 @@ -#include <pch.hpp> +#include "pch.hpp" #include <test.h> #include <scriptLoader.h> #include <iHaveParameters.h> +#include <boost/foreach.hpp> #include <rowProcessor.h> class IsUniq : public Test, IHaveParameters { diff --git a/project2/basics/tests/validDateCheck.cpp b/project2/basics/tests/validDateCheck.cpp index 8dffd9d..6d60c97 100644 --- a/project2/basics/tests/validDateCheck.cpp +++ b/project2/basics/tests/validDateCheck.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <logger.h> #include <scriptLoader.h> #include <commonObjects.h> diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp index 985789b..d8871ca 100644 --- a/project2/cgi/cgiAppEngine.cpp +++ b/project2/cgi/cgiAppEngine.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiResult.h" #include <cgicc/Cgicc.h> diff --git a/project2/cgi/cgiCommon.cpp b/project2/cgi/cgiCommon.cpp index ea4694e..92725c1 100644 --- a/project2/cgi/cgiCommon.cpp +++ b/project2/cgi/cgiCommon.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiCommon.h" #include "logger.h" #include <glibmm/exception.h> diff --git a/project2/cgi/cgiContentNegotiate.cpp b/project2/cgi/cgiContentNegotiate.cpp index 8e265a8..176441e 100644 --- a/project2/cgi/cgiContentNegotiate.cpp +++ b/project2/cgi/cgiContentNegotiate.cpp @@ -1,6 +1,8 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include <boost/tokenizer.hpp> +#include <boost/bind.hpp> +#include <boost/foreach.hpp> class ContentNegotiateLoader : public PresenterLoader { public: diff --git a/project2/cgi/cgiEnvironment.cpp b/project2/cgi/cgiEnvironment.cpp index 048f7d7..618548c 100644 --- a/project2/cgi/cgiEnvironment.cpp +++ b/project2/cgi/cgiEnvironment.cpp @@ -1,5 +1,6 @@ -#include <pch.hpp> -#include <boost/version.hpp> +#include "pch.hpp" +#include <boost/bind.hpp> +#include <boost/foreach.hpp> #include <boost/algorithm/string.hpp> #include "cgiEnvironment.h" #include "appEngine.h" diff --git a/project2/cgi/cgiHttpHeader.cpp b/project2/cgi/cgiHttpHeader.cpp index 28dcec9..6b7a736 100644 --- a/project2/cgi/cgiHttpHeader.cpp +++ b/project2/cgi/cgiHttpHeader.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiHttpHeader.h" #include <boost/foreach.hpp> diff --git a/project2/cgi/cgiProgRouter.cpp b/project2/cgi/cgiProgRouter.cpp index 15a8856..d094598 100644 --- a/project2/cgi/cgiProgRouter.cpp +++ b/project2/cgi/cgiProgRouter.cpp @@ -1,7 +1,11 @@ -#include <pch.hpp> +#include "pch.hpp" +#include <boost/foreach.hpp> #include <boost/algorithm/string/predicate.hpp> #include "cgiEnvironment.h" +#include "presenter.h" #include "safeMapFind.h" +#include "scriptStorage.h" +#include "rowSet.h" #include "exceptions.h" typedef std::map<std::string, std::string> VarMap; diff --git a/project2/cgi/cgiRequestID.cpp b/project2/cgi/cgiRequestID.cpp index 6f4d01e..1d674f8 100644 --- a/project2/cgi/cgiRequestID.cpp +++ b/project2/cgi/cgiRequestID.cpp @@ -1,5 +1,6 @@ -#include <pch.hpp> +#include "pch.hpp" #include <variables.h> +#include "cgiEnvironment.h" #include <scriptLoader.h> #include <scriptStorage.h> #include <appEngine.h> diff --git a/project2/cgi/cgiResultStatic.cpp b/project2/cgi/cgiResultStatic.cpp index b5fecd7..5d8e442 100644 --- a/project2/cgi/cgiResultStatic.cpp +++ b/project2/cgi/cgiResultStatic.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <time.h> #include "cgiResult.h" diff --git a/project2/cgi/cgiResultWritable.cpp b/project2/cgi/cgiResultWritable.cpp index ea17d3b..981f70c 100644 --- a/project2/cgi/cgiResultWritable.cpp +++ b/project2/cgi/cgiResultWritable.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiResult.h" class WritableToCgiResult : public TransformImpl<WritableContent, CgiResult> { diff --git a/project2/cgi/cgiStageCacheHit.cpp b/project2/cgi/cgiStageCacheHit.cpp index d398e8f..5d094ce 100644 --- a/project2/cgi/cgiStageCacheHit.cpp +++ b/project2/cgi/cgiStageCacheHit.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageCustomError.cpp b/project2/cgi/cgiStageCustomError.cpp index 56739fd..1e10c71 100644 --- a/project2/cgi/cgiStageCustomError.cpp +++ b/project2/cgi/cgiStageCustomError.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageCustomNotFound.cpp b/project2/cgi/cgiStageCustomNotFound.cpp index 872da77..81394be 100644 --- a/project2/cgi/cgiStageCustomNotFound.cpp +++ b/project2/cgi/cgiStageCustomNotFound.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp index b8f0b4b..9589c14 100644 --- a/project2/cgi/cgiStageDefaultError.cpp +++ b/project2/cgi/cgiStageDefaultError.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiHttpHeader.h" #include "logger.h" diff --git a/project2/cgi/cgiStageDefaultNotFound.cpp b/project2/cgi/cgiStageDefaultNotFound.cpp index 5b68bc6..15e0af8 100644 --- a/project2/cgi/cgiStageDefaultNotFound.cpp +++ b/project2/cgi/cgiStageDefaultNotFound.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageFail.cpp b/project2/cgi/cgiStageFail.cpp index 019ab8e..b75c183 100644 --- a/project2/cgi/cgiStageFail.cpp +++ b/project2/cgi/cgiStageFail.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <boost/lexical_cast.hpp> #include "cgiAppEngine.h" #include "cgiEnvironment.h" diff --git a/project2/cgi/cgiStageInitial.cpp b/project2/cgi/cgiStageInitial.cpp index 1fe4820..03a4bcd 100644 --- a/project2/cgi/cgiStageInitial.cpp +++ b/project2/cgi/cgiStageInitial.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "exceptions.h" diff --git a/project2/cgi/cgiStagePresent.cpp b/project2/cgi/cgiStagePresent.cpp index 90299fe..fb2f3d8 100644 --- a/project2/cgi/cgiStagePresent.cpp +++ b/project2/cgi/cgiStagePresent.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageRedirect.cpp b/project2/cgi/cgiStageRedirect.cpp index 4a4cd02..c7f8a8b 100644 --- a/project2/cgi/cgiStageRedirect.cpp +++ b/project2/cgi/cgiStageRedirect.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp index 8fa06bf..8266072 100644 --- a/project2/cgi/cgiStageRequest.cpp +++ b/project2/cgi/cgiStageRequest.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiUriParam.cpp b/project2/cgi/cgiUriParam.cpp index 04a2c36..fe74038 100644 --- a/project2/cgi/cgiUriParam.cpp +++ b/project2/cgi/cgiUriParam.cpp @@ -1,4 +1,5 @@ -#include <pch.hpp> +#include "pch.hpp" +#include "cgiEnvironment.h" #include <variables.h> #include <scriptLoader.h> #include <scriptStorage.h> diff --git a/project2/common/appEngine.cpp b/project2/common/appEngine.cpp index c6d3e92..e1b938b 100644 --- a/project2/common/appEngine.cpp +++ b/project2/common/appEngine.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "appEngine.h" #include "logger.h" #include "presenter.h" diff --git a/project2/common/cache.cpp b/project2/common/cache.cpp index 9be5845..eb342c5 100644 --- a/project2/common/cache.cpp +++ b/project2/common/cache.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cache.h" #include "rowSet.h" #include "rowProcessor.h" diff --git a/project2/common/check.cpp b/project2/common/check.cpp index c284c8d..339a413 100644 --- a/project2/common/check.cpp +++ b/project2/common/check.cpp @@ -1,6 +1,7 @@ -#include <pch.hpp> +#include "pch.hpp" #include "check.h" #include "scriptLoader.h" +#include "scriptStorage.h" DECLARE_LOADER("check", Check); StaticMessageException(NoTestsToPerform, "No tests to perform"); diff --git a/project2/common/checkHost.cpp b/project2/common/checkHost.cpp index 49533a9..2200c75 100644 --- a/project2/common/checkHost.cpp +++ b/project2/common/checkHost.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "checkHost.h" #include "appEngine.h" #include <boost/foreach.hpp> diff --git a/project2/common/columns.cpp b/project2/common/columns.cpp index 268a59d..c3f8e7e 100644 --- a/project2/common/columns.cpp +++ b/project2/common/columns.cpp @@ -1,5 +1,6 @@ -#include <pch.hpp> +#include "pch.hpp" #include "columns.h" +#include "scripts.h" Column::Column(unsigned int i, ScriptNodePtr p) : idx(i), diff --git a/project2/common/commonObjects.cpp b/project2/common/commonObjects.cpp index 9b45baa..ca5cec3 100644 --- a/project2/common/commonObjects.cpp +++ b/project2/common/commonObjects.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "commonObjects.h" #include "safeMapFind.h" #include "appEngine.h" diff --git a/project2/common/dataSource.cpp b/project2/common/dataSource.cpp index cd03300..d00ebf1 100644 --- a/project2/common/dataSource.cpp +++ b/project2/common/dataSource.cpp @@ -1,5 +1,6 @@ -#include <pch.hpp> +#include "pch.hpp" #include "dataSource.h" +#include "scripts.h" DataSource::DataSource(ScriptNodePtr p) : SourceObject(p) diff --git a/project2/common/definedColumns.cpp b/project2/common/definedColumns.cpp index cc88939..a0c86d2 100644 --- a/project2/common/definedColumns.cpp +++ b/project2/common/definedColumns.cpp @@ -1,6 +1,8 @@ -#include <pch.hpp> +#include "pch.hpp" #include "definedColumns.h" +#include "scripts.h" #include <boost/function.hpp> +#include <boost/foreach.hpp> DefinedColumns::DefinedColumns(ScriptNodePtr p, const Glib::ustring & colPath, const ColCreator & func) { diff --git a/project2/common/environment.cpp b/project2/common/environment.cpp index b13a1c0..57665f0 100644 --- a/project2/common/environment.cpp +++ b/project2/common/environment.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "environment.h" #include "optionsSource.h" #include "logger.h" diff --git a/project2/common/exceptions.cpp b/project2/common/exceptions.cpp index 4f061ab..b6dd5ba 100644 --- a/project2/common/exceptions.cpp +++ b/project2/common/exceptions.cpp @@ -1,7 +1,9 @@ -#include <pch.hpp> +#include "pch.hpp" #include "exceptions.h" +#include "logger.h" #include <stdlib.h> #include <stdio.h> +#include <error.h> numeric_error::numeric_error(int e) : err(e), diff --git a/project2/common/fileStrmVarWriter.cpp b/project2/common/fileStrmVarWriter.cpp index caaf908..f3cf666 100644 --- a/project2/common/fileStrmVarWriter.cpp +++ b/project2/common/fileStrmVarWriter.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "fileStrmVarWriter.h" #include "rowSet.h" #include "scriptLoader.h" diff --git a/project2/common/iHaveParameters.cpp b/project2/common/iHaveParameters.cpp index f880944..37e478c 100644 --- a/project2/common/iHaveParameters.cpp +++ b/project2/common/iHaveParameters.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "iHaveParameters.h" #include "exceptions.h" #include "safeMapFind.h" diff --git a/project2/common/iHaveSubTasks.cpp b/project2/common/iHaveSubTasks.cpp index 78868aa..5c9d801 100644 --- a/project2/common/iHaveSubTasks.cpp +++ b/project2/common/iHaveSubTasks.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "iHaveSubTasks.h" #include <boost/foreach.hpp> diff --git a/project2/common/if.cpp b/project2/common/if.cpp index c7f790e..cc2f216 100644 --- a/project2/common/if.cpp +++ b/project2/common/if.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "if.h" #include "logger.h" #include "scriptLoader.h" diff --git a/project2/common/iterate.cpp b/project2/common/iterate.cpp index 037261d..20694a3 100644 --- a/project2/common/iterate.cpp +++ b/project2/common/iterate.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "iterate.h" #include "logger.h" #include <boost/foreach.hpp> diff --git a/project2/common/library.cpp b/project2/common/library.cpp index b53a6b0..911d428 100644 --- a/project2/common/library.cpp +++ b/project2/common/library.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <dlfcn.h> #include "scriptStorage.h" #include "exceptions.h" diff --git a/project2/common/logger.cpp b/project2/common/logger.cpp index 8140155..7f8981f 100644 --- a/project2/common/logger.cpp +++ b/project2/common/logger.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #define SYSLOG_NAMES 1 // Enables the definition of names in syslog.h #include "logger.h" diff --git a/project2/common/logger.h b/project2/common/logger.h index c333123..5a4809d 100644 --- a/project2/common/logger.h +++ b/project2/common/logger.h @@ -3,6 +3,7 @@ #include <map> #include <stdarg.h> +#include <stdlib.h> #include <syslog.h> // Pulled in for easy client lookups of LOG_* priorties #include <boost/intrusive_ptr.hpp> #include <boost/format.hpp> diff --git a/project2/common/memoryCache.cpp b/project2/common/memoryCache.cpp index 8c85127..4e5f276 100644 --- a/project2/common/memoryCache.cpp +++ b/project2/common/memoryCache.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "logger.h" #include "cache.h" #include <boost/foreach.hpp> diff --git a/project2/common/noOutputExecute.cpp b/project2/common/noOutputExecute.cpp index 02c8f71..52a4982 100644 --- a/project2/common/noOutputExecute.cpp +++ b/project2/common/noOutputExecute.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "noOutputExecute.h" #include <boost/foreach.hpp> diff --git a/project2/common/options.cpp b/project2/common/options.cpp index 60fd7cd..13e189b 100644 --- a/project2/common/options.cpp +++ b/project2/common/options.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "options.h" #include "environment.h" #include <boost/foreach.hpp> diff --git a/project2/common/presenter.cpp b/project2/common/presenter.cpp index 1e5bbf2..e273471 100644 --- a/project2/common/presenter.cpp +++ b/project2/common/presenter.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "presenter.h" #include "dataSource.h" #include "appEngine.h" diff --git a/project2/common/rowProcessor.cpp b/project2/common/rowProcessor.cpp index 4e3bf1d..aa2a56a 100644 --- a/project2/common/rowProcessor.cpp +++ b/project2/common/rowProcessor.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "rowProcessor.h" #include "logger.h" #include "commonObjects.h" diff --git a/project2/common/rowSet.cpp b/project2/common/rowSet.cpp index 0378b51..99aed50 100644 --- a/project2/common/rowSet.cpp +++ b/project2/common/rowSet.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "rowSet.h" #include "commonObjects.h" #include "scopeObject.h" diff --git a/project2/common/rowView.cpp b/project2/common/rowView.cpp index c0e5cae..e8ad53f 100644 --- a/project2/common/rowView.cpp +++ b/project2/common/rowView.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "rowView.h" #include "presenter.h" #include "scopeObject.h" diff --git a/project2/common/scopeObject.cpp b/project2/common/scopeObject.cpp index e28e642..b51287c 100644 --- a/project2/common/scopeObject.cpp +++ b/project2/common/scopeObject.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "scopeObject.h" #include "logger.h" diff --git a/project2/common/scriptLoader.cpp b/project2/common/scriptLoader.cpp index 1f5243e..e4f31da 100644 --- a/project2/common/scriptLoader.cpp +++ b/project2/common/scriptLoader.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "scopeObject.h" #include "scriptLoader.h" #include "scriptStorage.h" diff --git a/project2/common/session.cpp b/project2/common/session.cpp index 66d93a5..f956d03 100644 --- a/project2/common/session.cpp +++ b/project2/common/session.cpp @@ -1,6 +1,7 @@ -#include <pch.hpp> +#include "pch.hpp" #include "session.h" #include "safeMapFind.h" +#include <boost/foreach.hpp> Session::Session() { diff --git a/project2/common/sessionClearTask.cpp b/project2/common/sessionClearTask.cpp index b3b1000..7430d37 100644 --- a/project2/common/sessionClearTask.cpp +++ b/project2/common/sessionClearTask.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <boost/foreach.hpp> #include "scriptLoader.h" #include "sessionClearTask.h" diff --git a/project2/common/sessionContainer.cpp b/project2/common/sessionContainer.cpp index ed36fb3..1366fc7 100644 --- a/project2/common/sessionContainer.cpp +++ b/project2/common/sessionContainer.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sessionContainer.h" #include "environment.h" diff --git a/project2/common/sessionSetTask.cpp b/project2/common/sessionSetTask.cpp index aca5b26..7efdd53 100644 --- a/project2/common/sessionSetTask.cpp +++ b/project2/common/sessionSetTask.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <boost/foreach.hpp> #include "scriptLoader.h" #include "sessionSetTask.h" diff --git a/project2/common/singleton.cpp b/project2/common/singleton.cpp index 76b99d4..d056001 100644 --- a/project2/common/singleton.cpp +++ b/project2/common/singleton.cpp @@ -1,8 +1,9 @@ -#include <pch.hpp> +#include "pch.hpp" #include "view.h" #include "iHaveParameters.h" #include "presenter.h" #include "scopeObject.h" +#include <boost/foreach.hpp> class Singleton : public View { public: diff --git a/project2/common/sourceObject.cpp b/project2/common/sourceObject.cpp index 6f5bcc5..f63a727 100644 --- a/project2/common/sourceObject.cpp +++ b/project2/common/sourceObject.cpp @@ -1,7 +1,8 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sourceObject.h" #include "exceptions.h" #include "safeMapFind.h" +#include "scripts.h" unsigned int SourceObject::loadOrder = 1; SimpleMessageException(ComponentNotFound); diff --git a/project2/common/structExceptHandling.cpp b/project2/common/structExceptHandling.cpp index 0881d6d..b2c7c83 100644 --- a/project2/common/structExceptHandling.cpp +++ b/project2/common/structExceptHandling.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "structExceptHandling.h" #include "scriptLoader.h" #include "scriptStorage.h" diff --git a/project2/common/task.cpp b/project2/common/task.cpp index c4275f8..c285d3f 100644 --- a/project2/common/task.cpp +++ b/project2/common/task.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "task.h" #include <boost/foreach.hpp> diff --git a/project2/common/taskHost.cpp b/project2/common/taskHost.cpp index cbfe7c3..322db35 100644 --- a/project2/common/taskHost.cpp +++ b/project2/common/taskHost.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "taskHost.h" #include "noOutputExecute.h" #include "dataSource.h" diff --git a/project2/common/transform.cpp b/project2/common/transform.cpp index fc68855..46ca42e 100644 --- a/project2/common/transform.cpp +++ b/project2/common/transform.cpp @@ -1,7 +1,8 @@ -#include <pch.hpp> +#include "pch.hpp" #include "transform.h" #include "logger.h" #include "ostreamWrapper.h" +#include "scriptStorage.h" #include <boost/foreach.hpp> class TransformTargetStorer : public Storer { diff --git a/project2/common/variableConvert.cpp b/project2/common/variableConvert.cpp index d0363f5..8fd906f 100644 --- a/project2/common/variableConvert.cpp +++ b/project2/common/variableConvert.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "variables.h" #include "exceptions.h" #include <boost/lexical_cast.hpp> diff --git a/project2/common/variableType.cpp b/project2/common/variableType.cpp index 710296a..5eab163 100644 --- a/project2/common/variableType.cpp +++ b/project2/common/variableType.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "variableType.h" #include "logger.h" #include <boost/date_time/posix_time/posix_time.hpp> diff --git a/project2/common/variables.cpp b/project2/common/variables.cpp index 6f62dc1..a6619b1 100644 --- a/project2/common/variables.cpp +++ b/project2/common/variables.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "logger.h" #include "variables.h" #include "variables/fixed.h" diff --git a/project2/common/variables/config.cpp b/project2/common/variables/config.cpp index 51759d5..5b38713 100644 --- a/project2/common/variables/config.cpp +++ b/project2/common/variables/config.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "../pch.hpp" #include "../variables.h" #include "../scriptLoader.h" #include "../scriptStorage.h" diff --git a/project2/common/variables/localparam.cpp b/project2/common/variables/localparam.cpp index 1b789a7..2f09b08 100644 --- a/project2/common/variables/localparam.cpp +++ b/project2/common/variables/localparam.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "../pch.hpp" #include "../variables.h" #include "../scriptLoader.h" #include "../scriptStorage.h" diff --git a/project2/common/variables/lookup.cpp b/project2/common/variables/lookup.cpp index 892968e..41326c2 100644 --- a/project2/common/variables/lookup.cpp +++ b/project2/common/variables/lookup.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "../pch.hpp" #include "../variables.h" #include "../safeMapFind.h" #include "../logger.h" diff --git a/project2/common/variables/param.cpp b/project2/common/variables/param.cpp index 7292b0a..c985868 100644 --- a/project2/common/variables/param.cpp +++ b/project2/common/variables/param.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "../pch.hpp" #include "../variables.h" #include "../scriptLoader.h" #include "../scriptStorage.h" diff --git a/project2/common/variables/session.cpp b/project2/common/variables/session.cpp index fc33d8e..2e26a12 100644 --- a/project2/common/variables/session.cpp +++ b/project2/common/variables/session.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "../pch.hpp" #include "../variables.h" #include "../scriptLoader.h" #include "../scriptStorage.h" diff --git a/project2/common/view.cpp b/project2/common/view.cpp index 30a6491..ddbf157 100644 --- a/project2/common/view.cpp +++ b/project2/common/view.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "view.h" View::View(ScriptNodePtr p) : diff --git a/project2/common/viewHost.cpp b/project2/common/viewHost.cpp index 04e0d88..4b6a6af 100644 --- a/project2/common/viewHost.cpp +++ b/project2/common/viewHost.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "viewHost.h" #include "commonObjects.h" #include "transform.h" diff --git a/project2/console/claOptions.cpp b/project2/console/claOptions.cpp index 4660134..be60144 100644 --- a/project2/console/claOptions.cpp +++ b/project2/console/claOptions.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <stdio.h> #include <boost/foreach.hpp> #include "../common/optionsSource.h" diff --git a/project2/console/consoleAppEngine.cpp b/project2/console/consoleAppEngine.cpp index 9179c64..122de2e 100644 --- a/project2/console/consoleAppEngine.cpp +++ b/project2/console/consoleAppEngine.cpp @@ -1,8 +1,10 @@ -#include <pch.hpp> +#include "pch.hpp" #include <glibmm/exception.h> #include <cxxabi.h> #include "consoleAppEngine.h" #include "consoleEnvironment.h" +#include "consolePresenter.h" +#include "logger.h" #include "safeMapFind.h" #include "iterate.h" #include "scriptLoader.h" diff --git a/project2/console/consoleEnvironment.cpp b/project2/console/consoleEnvironment.cpp index 3fcaf7d..2420e35 100644 --- a/project2/console/consoleEnvironment.cpp +++ b/project2/console/consoleEnvironment.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "consoleEnvironment.h" #include <sys/utsname.h> #include <errno.h> diff --git a/project2/console/consolePresenter.cpp b/project2/console/consolePresenter.cpp index 52bface..a67155f 100644 --- a/project2/console/consolePresenter.cpp +++ b/project2/console/consolePresenter.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <stdio.h> #include "consolePresenter.h" diff --git a/project2/console/p2consoleMain.cpp b/project2/console/p2consoleMain.cpp index f0f82d4..a7dee1a 100644 --- a/project2/console/p2consoleMain.cpp +++ b/project2/console/p2consoleMain.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "consoleEnvironment.h" #include "consoleAppEngine.h" #include "scriptLoader.h" diff --git a/project2/files/fileStream.cpp b/project2/files/fileStream.cpp index f6a1124..d01ce27 100644 --- a/project2/files/fileStream.cpp +++ b/project2/files/fileStream.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "logger.h" #include "scopeObject.h" #include "stream.h" diff --git a/project2/files/fsFilterMaxDepth.cpp b/project2/files/fsFilterMaxDepth.cpp index f0d685e..76068da 100644 --- a/project2/files/fsFilterMaxDepth.cpp +++ b/project2/files/fsFilterMaxDepth.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "fsRows.h" #include "scripts.h" #include <boost/lexical_cast.hpp> diff --git a/project2/files/fsFilterName.cpp b/project2/files/fsFilterName.cpp index cc1104f..ca0bd72 100644 --- a/project2/files/fsFilterName.cpp +++ b/project2/files/fsFilterName.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "fsRows.h" #include "scripts.h" diff --git a/project2/files/fsFilterType.cpp b/project2/files/fsFilterType.cpp index 0d0b27b..959a6e8 100644 --- a/project2/files/fsFilterType.cpp +++ b/project2/files/fsFilterType.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "fsRows.h" #include "scripts.h" diff --git a/project2/files/fsRows.cpp b/project2/files/fsRows.cpp index 6fa9fef..9f8b11a 100644 --- a/project2/files/fsRows.cpp +++ b/project2/files/fsRows.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "fsRows.h" #include "logger.h" #include "scriptLoader.h" diff --git a/project2/files/functions/pwd.cpp b/project2/files/functions/pwd.cpp index 6915bb6..519038a 100644 --- a/project2/files/functions/pwd.cpp +++ b/project2/files/functions/pwd.cpp @@ -1,6 +1,7 @@ -#include <pch.hpp> +#include "pch.hpp" #include <variables.h> #include <scriptLoader.h> +#include <scripts.h> #include <boost/filesystem/operations.hpp> /// Variable implementation to access session contents diff --git a/project2/files/optionsSource.cpp b/project2/files/optionsSource.cpp index 50e924d..46d9cc1 100644 --- a/project2/files/optionsSource.cpp +++ b/project2/files/optionsSource.cpp @@ -1,4 +1,5 @@ -#include <pch.hpp> +#include "pch.hpp" +#include <sys/stat.h> #include "optionsSource.h" #include <glibmm/iochannel.h> #include <glibmm/fileutils.h> diff --git a/project2/json/conversion.cpp b/project2/json/conversion.cpp index 1fae0d3..0f5a2fa 100644 --- a/project2/json/conversion.cpp +++ b/project2/json/conversion.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "conversion.h" #include <boost/date_time/posix_time/posix_time.hpp> diff --git a/project2/json/couchSession.cpp b/project2/json/couchSession.cpp index a6c49e9..7045113 100644 --- a/project2/json/couchSession.cpp +++ b/project2/json/couchSession.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "curlHelper.h" #include "safeMapFind.h" #include "exceptions.h" diff --git a/project2/json/json.h b/project2/json/json.h index 23eeac2..0954612 100644 --- a/project2/json/json.h +++ b/project2/json/json.h @@ -4,6 +4,7 @@ #include <glibmm/ustring.h> #include <boost/shared_ptr.hpp> #include <variables.h> +#include <list> namespace json { typedef Glib::ustring String; diff --git a/project2/json/parse.cpp b/project2/json/parse.cpp index cb41dd2..d9da9e9 100644 --- a/project2/json/parse.cpp +++ b/project2/json/parse.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "json.h" #include <stdio.h> diff --git a/project2/json/presenter-p.cpp b/project2/json/presenter-p.cpp index 3cb5bf8..b501a8a 100644 --- a/project2/json/presenter-p.cpp +++ b/project2/json/presenter-p.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "presenter.h" class Json_P_Presenter : public JsonPresenter { diff --git a/project2/json/presenter.cpp b/project2/json/presenter.cpp index 111ae5c..40859e2 100644 --- a/project2/json/presenter.cpp +++ b/project2/json/presenter.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "../common/presenter.h" #include "json.h" #include "conversion.h" diff --git a/project2/json/serialize.cpp b/project2/json/serialize.cpp index a1ba1f6..390d45e 100644 --- a/project2/json/serialize.cpp +++ b/project2/json/serialize.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "json.h" #include <stdio.h> #include <boost/foreach.hpp> diff --git a/project2/sql/rdbmsDataSource.cpp b/project2/sql/rdbmsDataSource.cpp index 8bdacdf..f13fbc6 100644 --- a/project2/sql/rdbmsDataSource.cpp +++ b/project2/sql/rdbmsDataSource.cpp @@ -1,8 +1,9 @@ -#include <pch.hpp> +#include "pch.hpp" #include "rdbmsDataSource.h" #include "connectionLoader.h" #include <sys/utsname.h> #include "logger.h" +#include "scripts.h" #include <errno.h> #include <boost/foreach.hpp> diff --git a/project2/sql/sqlBulkLoad.cpp b/project2/sql/sqlBulkLoad.cpp index b26b0c8..73cd5e0 100644 --- a/project2/sql/sqlBulkLoad.cpp +++ b/project2/sql/sqlBulkLoad.cpp @@ -1,5 +1,7 @@ -#include <pch.hpp> +#include "pch.hpp" #include "task.h" +#include <commonObjects.h> +#include "rdbmsDataSource.h" #include "scopeObject.h" #include "stream.h" diff --git a/project2/sql/sqlCache.cpp b/project2/sql/sqlCache.cpp index 7fe0408..bb8adb1 100644 --- a/project2/sql/sqlCache.cpp +++ b/project2/sql/sqlCache.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cache.h" #include "sqlVariableBinder.h" #include "sqlHandleAsVariableType.h" diff --git a/project2/sql/sqlHandleAsVariableType.cpp b/project2/sql/sqlHandleAsVariableType.cpp index e628c29..a635feb 100644 --- a/project2/sql/sqlHandleAsVariableType.cpp +++ b/project2/sql/sqlHandleAsVariableType.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sqlHandleAsVariableType.h" #include <boost/date_time/posix_time/posix_time.hpp> diff --git a/project2/sql/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp index 0b19c5e..2876bce 100644 --- a/project2/sql/sqlMergeTask.cpp +++ b/project2/sql/sqlMergeTask.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sqlMergeTask.h" #include "columns.h" #include "commonObjects.h" diff --git a/project2/sql/sqlMergeTask.h b/project2/sql/sqlMergeTask.h index e90cda5..b63c277 100644 --- a/project2/sql/sqlMergeTask.h +++ b/project2/sql/sqlMergeTask.h @@ -9,6 +9,7 @@ #include "task.h" #include "iterate.h" #include "variables.h" +#include "sqlWriter.h" #include <string> #include <set> #include <map> diff --git a/project2/sql/sqlRows.cpp b/project2/sql/sqlRows.cpp index 83763dd..867d5cf 100644 --- a/project2/sql/sqlRows.cpp +++ b/project2/sql/sqlRows.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sqlRows.h" #include "sqlHandleAsVariableType.h" #include "rowProcessor.h" diff --git a/project2/sql/sqlTask.cpp b/project2/sql/sqlTask.cpp index 03f67de..d50f6dc 100644 --- a/project2/sql/sqlTask.cpp +++ b/project2/sql/sqlTask.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sqlTask.h" #include <boost/foreach.hpp> #include "scriptLoader.h" diff --git a/project2/sql/sqlTest.cpp b/project2/sql/sqlTest.cpp index f45b2c9..a4375f1 100644 --- a/project2/sql/sqlTest.cpp +++ b/project2/sql/sqlTest.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sqlTest.h" #include "scriptLoader.h" #include "selectcommand.h" diff --git a/project2/sql/sqlVariableBinder.cpp b/project2/sql/sqlVariableBinder.cpp index c56047c..cc2d98b 100644 --- a/project2/sql/sqlVariableBinder.cpp +++ b/project2/sql/sqlVariableBinder.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sqlVariableBinder.h" #include "command.h" #include "variables.h" diff --git a/project2/sql/sqlVariableBinder.h b/project2/sql/sqlVariableBinder.h index 476c63b..4bbee9f 100644 --- a/project2/sql/sqlVariableBinder.h +++ b/project2/sql/sqlVariableBinder.h @@ -1,15 +1,11 @@ #ifndef SQLVARIABLEBINDER_H #define SQLVARIABLEBINDER_H -#include <boost/variant.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/date_time/posix_time/ptime.hpp> -#include <glibmm/ustring.h> +#include <variableType.h> namespace DB { class Command; } -class Null; class SqlVariableBinder : public boost::static_visitor<> { public: SqlVariableBinder(DB::Command * c, unsigned int i); diff --git a/project2/sql/sqlWriter.cpp b/project2/sql/sqlWriter.cpp index f67eb1c..1dcdf05 100644 --- a/project2/sql/sqlWriter.cpp +++ b/project2/sql/sqlWriter.cpp @@ -1,6 +1,8 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sqlWriter.h" +#include "scripts.h" #include <boost/foreach.hpp> +#include <boost/bind.hpp> #include "sqlVariableBinder.h" DynamicSql::SqlWriter::SqlWriter() diff --git a/project2/sql/tablepatch.cpp b/project2/sql/tablepatch.cpp index 8d61b66..3cad0d8 100644 --- a/project2/sql/tablepatch.cpp +++ b/project2/sql/tablepatch.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "tablepatch.h" #include <stdio.h> #include <misc.h> diff --git a/project2/sql/tablepatch.h b/project2/sql/tablepatch.h index 515c8bd..6903dc1 100644 --- a/project2/sql/tablepatch.h +++ b/project2/sql/tablepatch.h @@ -7,6 +7,7 @@ #include <connection.h> #include <modifycommand.h> #include <selectcommand.h> +#include <buffer.h> class TablePatch { public: diff --git a/project2/streams/streamNvpRows.cpp b/project2/streams/streamNvpRows.cpp index 2577ffa..5f9ccf2 100644 --- a/project2/streams/streamNvpRows.cpp +++ b/project2/streams/streamNvpRows.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "variables.h" #include "scopeObject.h" #include "stream.h" diff --git a/project2/streams/streamRows.cpp b/project2/streams/streamRows.cpp index 78f6963..711fbf0 100644 --- a/project2/streams/streamRows.cpp +++ b/project2/streams/streamRows.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "variables.h" #include "scopeObject.h" #include "stream.h" diff --git a/project2/streams/textReader.cpp b/project2/streams/textReader.cpp index 8a10d4f..7cd8a6d 100644 --- a/project2/streams/textReader.cpp +++ b/project2/streams/textReader.cpp @@ -1,5 +1,6 @@ -#include <pch.hpp> +#include "pch.hpp" #include "textReader.h" +#include "exceptions.h" SimpleSysCallException(ReallocFail); diff --git a/project2/streams/textReader.h b/project2/streams/textReader.h index 898d4ed..b101272 100644 --- a/project2/streams/textReader.h +++ b/project2/streams/textReader.h @@ -1,4 +1,8 @@ +#ifndef TEXTREADER_H +#define TEXTREADER_H +#include <boost/function.hpp> +#include <glib.h> class TextReader { public: @@ -17,3 +21,5 @@ class TextReader { size_t bufLen; }; +#endif + diff --git a/project2/xml/mutators/copy.cpp b/project2/xml/mutators/copy.cpp index d7170e6..2d05da9 100644 --- a/project2/xml/mutators/copy.cpp +++ b/project2/xml/mutators/copy.cpp @@ -1,5 +1,7 @@ #include "../pch.hpp" #include "../xmlPresenter.h" +#include <boost/foreach.hpp> +#include <libxml++/document.h> class Copy : public XmlDocMutator { public: diff --git a/project2/xml/mutators/copyToAttr.cpp b/project2/xml/mutators/copyToAttr.cpp index c8b32d5..47afc50 100644 --- a/project2/xml/mutators/copyToAttr.cpp +++ b/project2/xml/mutators/copyToAttr.cpp @@ -1,5 +1,7 @@ #include "../pch.hpp" #include "../xmlPresenter.h" +#include <boost/foreach.hpp> +#include <libxml++/document.h> class CopyToAttr : public XmlDocMutator { public: diff --git a/project2/xml/mutators/create.cpp b/project2/xml/mutators/create.cpp index 812da24..3dccea5 100644 --- a/project2/xml/mutators/create.cpp +++ b/project2/xml/mutators/create.cpp @@ -1,5 +1,7 @@ #include "../pch.hpp" #include "../xmlPresenter.h" +#include <libxml++/document.h> +#include <boost/foreach.hpp> class Create : public XmlDocMutator { public: diff --git a/project2/xml/mutators/delete.cpp b/project2/xml/mutators/delete.cpp index 8cc3a94..16ccae7 100644 --- a/project2/xml/mutators/delete.cpp +++ b/project2/xml/mutators/delete.cpp @@ -1,5 +1,7 @@ #include "../pch.hpp" #include "../xmlPresenter.h" +#include <libxml++/document.h> +#include <boost/foreach.hpp> class Delete : public XmlDocMutator { public: diff --git a/project2/xml/mutators/rename.cpp b/project2/xml/mutators/rename.cpp index ceb7627..c8a03b9 100644 --- a/project2/xml/mutators/rename.cpp +++ b/project2/xml/mutators/rename.cpp @@ -1,5 +1,7 @@ #include "../pch.hpp" #include "../xmlPresenter.h" +#include <boost/foreach.hpp> +#include <libxml++/document.h> class Rename : public XmlDocMutator { public: diff --git a/project2/xml/rawView.cpp b/project2/xml/rawView.cpp index 5226caf..053ac23 100644 --- a/project2/xml/rawView.cpp +++ b/project2/xml/rawView.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "exceptions.h" #include "xml.h" #include "presenter.h" diff --git a/project2/xml/sessionXml.cpp b/project2/xml/sessionXml.cpp index db34b52..7e2644c 100644 --- a/project2/xml/sessionXml.cpp +++ b/project2/xml/sessionXml.cpp @@ -1,8 +1,9 @@ -#include <pch.hpp> +#include "pch.hpp" #include "sessionXml.h" #include "uuid.h" #include <libxml++/nodes/element.h> #include <libxml++/parsers/domparser.h> +#include <boost/bind.hpp> #include <boost/foreach.hpp> #include <boost/filesystem/convenience.hpp> #include <boost/lexical_cast.hpp> diff --git a/project2/xml/transformHtml.cpp b/project2/xml/transformHtml.cpp index 7c784bd..c08d7f8 100644 --- a/project2/xml/transformHtml.cpp +++ b/project2/xml/transformHtml.cpp @@ -1,5 +1,6 @@ -#include <pch.hpp> +#include "pch.hpp" #include "transformHtml.h" +#include "scripts.h" #include <libxml++/document.h> #include <libxslt/xsltutils.h> #include <libxslt/transform.h> diff --git a/project2/xml/transformText.cpp b/project2/xml/transformText.cpp index 43dcab6..2ea755f 100644 --- a/project2/xml/transformText.cpp +++ b/project2/xml/transformText.cpp @@ -1,5 +1,7 @@ -#include <pch.hpp> +#include "pch.hpp" +#include "scripts.h" #include "transformText.h" +#include "options.h" #include <libxml++/document.h> #include "transformHtml.h" #include <sys/wait.h> diff --git a/project2/xml/transformText.h b/project2/xml/transformText.h index 071eadf..3523473 100644 --- a/project2/xml/transformText.h +++ b/project2/xml/transformText.h @@ -2,7 +2,8 @@ #define TEXTDOCUMENT_H #include "transform.h" -#include <string> +#include <glibmm/ustring.h> +#include <variables.h> class TextDocument : public SourceOf<TextDocument>, public WritableContent, public SourceOf<WritableContent> { public: diff --git a/project2/xml/xmlCache.cpp b/project2/xml/xmlCache.cpp index c3a8cc7..7224cba 100644 --- a/project2/xml/xmlCache.cpp +++ b/project2/xml/xmlCache.cpp @@ -1,6 +1,7 @@ -#include <pch.hpp> +#include "pch.hpp" #include "cache.h" #include "logger.h" +#include "environment.h" #include "scriptLoader.h" #include "iHaveParameters.h" #include "xmlRawRows.h" diff --git a/project2/xml/xmlDocumentCache.cpp b/project2/xml/xmlDocumentCache.cpp index cbc13ed..3a7c35d 100644 --- a/project2/xml/xmlDocumentCache.cpp +++ b/project2/xml/xmlDocumentCache.cpp @@ -1,8 +1,10 @@ -#include <pch.hpp> +#include "pch.hpp" #include <scriptLoader.h> #include "xmlDocumentCache.h" #include <string.h> +#include <logger.h> #include <libxml/HTMLparser.h> +#include <boost/bind.hpp> #include "exceptions.h" #include "curlHelper.h" #include "safeMapFind.h" diff --git a/project2/xml/xmlDocumentCache.h b/project2/xml/xmlDocumentCache.h index e6a0b29..fe1725d 100644 --- a/project2/xml/xmlDocumentCache.h +++ b/project2/xml/xmlDocumentCache.h @@ -1,12 +1,12 @@ #ifndef XMLDOCUMENTROWSCACHE_H #define XMLDOCUMENTROWSCACHE_H -#include <libxml/tree.h> #include <boost/shared_ptr.hpp> #include <map> #include <set> #include <curlHelper.h> #include <glibmm/ustring.h> +#include <libxml++/document.h> class XmlDocumentCache { public: diff --git a/project2/xml/xmlDocumentPrefetch.cpp b/project2/xml/xmlDocumentPrefetch.cpp index 64b236e..6dc2b64 100644 --- a/project2/xml/xmlDocumentPrefetch.cpp +++ b/project2/xml/xmlDocumentPrefetch.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "xmlDocumentPrefetch.h" #include "scriptLoader.h" diff --git a/project2/xml/xmlPresenter.cpp b/project2/xml/xmlPresenter.cpp index ddb1e03..48f5752 100644 --- a/project2/xml/xmlPresenter.cpp +++ b/project2/xml/xmlPresenter.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include <boost/date_time.hpp> #include "xmlPresenter.h" #include "scriptLoader.h" @@ -8,6 +8,7 @@ #include <libxml++/document.h> #include <boost/date_time/posix_time/time_formatters.hpp> #include <boost/date_time/gregorian/formatters.hpp> +#include <boost/foreach.hpp> class XmlPresenterLoader : public PresenterLoader::For<XmlPresenter> { public: diff --git a/project2/xml/xmlRawRows.cpp b/project2/xml/xmlRawRows.cpp index af550bb..6f43720 100644 --- a/project2/xml/xmlRawRows.cpp +++ b/project2/xml/xmlRawRows.cpp @@ -1,5 +1,6 @@ -#include <pch.hpp> +#include "pch.hpp" #include "xmlRawRows.h" +#include "environment.h" #include <boost/foreach.hpp> #include <libxml++/parsers/domparser.h> #include <libxml++/nodes/textnode.h> diff --git a/project2/xml/xmlRows.cpp b/project2/xml/xmlRows.cpp index 01e626f..4feeafd 100644 --- a/project2/xml/xmlRows.cpp +++ b/project2/xml/xmlRows.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "xmlRows.h" #include "rowProcessor.h" #include "xml.h" diff --git a/project2/xml/xmlScriptParser.cpp b/project2/xml/xmlScriptParser.cpp index abdffdd..35fc509 100644 --- a/project2/xml/xmlScriptParser.cpp +++ b/project2/xml/xmlScriptParser.cpp @@ -1,9 +1,11 @@ -#include <pch.hpp> +#include "pch.hpp" #include "xmlScriptParser.h" +#include "environment.h" #include "scripts.h" #include "commonObjects.h" #include "variables/literal.h" #include <boost/filesystem/convenience.hpp> +#include <boost/foreach.hpp> static const std::string XIncludeNS("http://www.w3.org/2001/XInclude"); static const std::string XIncludeInclude("include"); diff --git a/project2/xml/xpathRows.cpp b/project2/xml/xpathRows.cpp index eedfa8e..e7de84c 100644 --- a/project2/xml/xpathRows.cpp +++ b/project2/xml/xpathRows.cpp @@ -1,4 +1,4 @@ -#include <pch.hpp> +#include "pch.hpp" #include "xpathRows.h" #include "safeMapFind.h" #include "rowProcessor.h" |