From 689997e3f182de43662d027cebec3aa3e2029d81 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 24 Aug 2020 15:17:53 +0100 Subject: [PATCH] Issue #77 Move class to sampleblackmiscsim because it is only used there --- samples/blackmiscsim/samplesfscommon.cpp | 2 +- samples/blackmiscsim/samplesmodelmapping.cpp | 2 +- .../blackmiscsim}/sampleutils.cpp | 4 +++- .../blackmisc => samples/blackmiscsim}/sampleutils.h | 12 +++++------- 4 files changed, 10 insertions(+), 10 deletions(-) rename {src/blackmisc => samples/blackmiscsim}/sampleutils.cpp (95%) rename {src/blackmisc => samples/blackmiscsim}/sampleutils.h (79%) diff --git a/samples/blackmiscsim/samplesfscommon.cpp b/samples/blackmiscsim/samplesfscommon.cpp index de5b20b04..ad2969655 100644 --- a/samples/blackmiscsim/samplesfscommon.cpp +++ b/samples/blackmiscsim/samplesfscommon.cpp @@ -10,7 +10,7 @@ //! \ingroup sampleblackmiscsim #include "samplesfscommon.h" -#include "blackmisc/sampleutils.h" +#include "sampleutils.h" #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" #include "blackmisc/simulation/fscommon/aircraftcfgparser.h" #include "blackmisc/simulation/settings/simulatorsettings.h" diff --git a/samples/blackmiscsim/samplesmodelmapping.cpp b/samples/blackmiscsim/samplesmodelmapping.cpp index 9838c2b6a..c122c44e1 100644 --- a/samples/blackmiscsim/samplesmodelmapping.cpp +++ b/samples/blackmiscsim/samplesmodelmapping.cpp @@ -10,10 +10,10 @@ //! \ingroup sampleblackmiscsim #include "samplesmodelmapping.h" +#include "sampleutils.h" #include "blackcore/aircraftmatcher.h" #include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/airlineicaocode.h" -#include "blackmisc/sampleutils.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/aircraftmodelloader.h" #include "blackmisc/simulation/settings/simulatorsettings.h" diff --git a/src/blackmisc/sampleutils.cpp b/samples/blackmiscsim/sampleutils.cpp similarity index 95% rename from src/blackmisc/sampleutils.cpp rename to samples/blackmiscsim/sampleutils.cpp index ff3458e9c..5cf94ad0d 100644 --- a/src/blackmisc/sampleutils.cpp +++ b/samples/blackmiscsim/sampleutils.cpp @@ -6,8 +6,10 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/sampleutils.h" +#include "sampleutils.h" +#include +#include #include #include diff --git a/src/blackmisc/sampleutils.h b/samples/blackmiscsim/sampleutils.h similarity index 79% rename from src/blackmisc/sampleutils.h rename to samples/blackmiscsim/sampleutils.h index 97de9f16e..fccd0fdd3 100644 --- a/src/blackmisc/sampleutils.h +++ b/samples/blackmiscsim/sampleutils.h @@ -8,19 +8,17 @@ //! \file -#ifndef BLACKMISC_SAMPLEUTILS_H -#define BLACKMISC_SAMPLEUTILS_H - -#include "blackmisc/blackmiscexport.h" -#include -#include +#ifndef BLACKSAMPLE_SAMPLEUTILS_H +#define BLACKSAMPLE_SAMPLEUTILS_H +class QString; +class QStringList; class QTextStream; namespace BlackMisc { //! Utils for sample programms - class BLACKMISC_EXPORT CSampleUtils + class CSampleUtils { public: //! Select directory among given ones