From 461474e29d06b014629ba1222f922c26903de8d5 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Tue, 8 Nov 2016 00:22:35 +0000 Subject: [PATCH] refs #800 Fixed "using namespace" in header. --- src/blackcore/db/databasewriter.cpp | 1 + src/blackgui/components/dbaircrafticaoselectorcomponent.cpp | 1 + src/blackgui/components/dbairlineicaoselectorbase.cpp | 1 + src/blackgui/components/dbairlineicaoselectorcomponent.cpp | 1 + src/blackgui/components/dbairlinenameselectorcomponent.cpp | 1 + src/blackgui/editors/aircrafticaoform.cpp | 1 + src/blackgui/models/listmodeldbobjects.cpp | 1 + src/blackmisc/aviation/airlineicaocode.cpp | 1 + src/blackmisc/aviation/livery.cpp | 1 + src/blackmisc/country.h | 4 +--- src/blackmisc/simulation/aircraftmodel.cpp | 1 + 11 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/blackcore/db/databasewriter.cpp b/src/blackcore/db/databasewriter.cpp index 2fc768e25..360ad243f 100644 --- a/src/blackcore/db/databasewriter.cpp +++ b/src/blackcore/db/databasewriter.cpp @@ -26,6 +26,7 @@ #include using namespace BlackMisc; +using namespace BlackMisc::Db; using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp index fbdd2e45e..3ebf6cbe1 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp @@ -34,6 +34,7 @@ using namespace BlackGui; using namespace BlackCore; using namespace BlackMisc; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Db; using namespace BlackMisc::Network; namespace BlackGui diff --git a/src/blackgui/components/dbairlineicaoselectorbase.cpp b/src/blackgui/components/dbairlineicaoselectorbase.cpp index a67e973d5..97a675a7c 100644 --- a/src/blackgui/components/dbairlineicaoselectorbase.cpp +++ b/src/blackgui/components/dbairlineicaoselectorbase.cpp @@ -27,6 +27,7 @@ using namespace BlackGui; using namespace BlackCore; using namespace BlackMisc; +using namespace BlackMisc::Db; using namespace BlackMisc::Network; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp index 27754d997..3645aa739 100644 --- a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp +++ b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp @@ -24,6 +24,7 @@ using namespace BlackCore; using namespace BlackGui; using namespace BlackMisc; +using namespace BlackMisc::Db; using namespace BlackMisc::Network; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/dbairlinenameselectorcomponent.cpp b/src/blackgui/components/dbairlinenameselectorcomponent.cpp index 8f68c2ee6..b9aa439d9 100644 --- a/src/blackgui/components/dbairlinenameselectorcomponent.cpp +++ b/src/blackgui/components/dbairlinenameselectorcomponent.cpp @@ -23,6 +23,7 @@ using namespace BlackCore; using namespace BlackGui; using namespace BlackMisc; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Db; namespace BlackGui { diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/blackgui/editors/aircrafticaoform.cpp index 387453f66..112ddb26e 100644 --- a/src/blackgui/editors/aircrafticaoform.cpp +++ b/src/blackgui/editors/aircrafticaoform.cpp @@ -32,6 +32,7 @@ using namespace BlackMisc; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Db; using namespace BlackGui::Components; namespace BlackGui diff --git a/src/blackgui/models/listmodeldbobjects.cpp b/src/blackgui/models/listmodeldbobjects.cpp index 0cf570721..eb05015ba 100644 --- a/src/blackgui/models/listmodeldbobjects.cpp +++ b/src/blackgui/models/listmodeldbobjects.cpp @@ -18,6 +18,7 @@ using namespace BlackMisc; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Db; namespace BlackGui { diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index 6a8f184e6..129158126 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -27,6 +27,7 @@ #include using namespace BlackMisc; +using namespace BlackMisc::Db; namespace BlackMisc { diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index e7e5299f6..362cac36f 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -26,6 +26,7 @@ #include using namespace BlackMisc; +using namespace BlackMisc::Db; using namespace BlackMisc::PhysicalQuantities; namespace BlackMisc diff --git a/src/blackmisc/country.h b/src/blackmisc/country.h index 5f1dd9a1a..50bd292ec 100644 --- a/src/blackmisc/country.h +++ b/src/blackmisc/country.h @@ -24,8 +24,6 @@ #include #include -using namespace BlackMisc::Db; - namespace BlackMisc { /*! @@ -33,7 +31,7 @@ namespace BlackMisc */ class BLACKMISC_EXPORT CCountry : public CValueObject, - public IDatastoreObjectWithStringKey + public Db::IDatastoreObjectWithStringKey { public: //! Properties by index diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index 7aaef3506..d9a4f8df2 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -29,6 +29,7 @@ using namespace BlackMisc; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Db; namespace BlackMisc {