Formatting, fixed includes, minor tweaks

This commit is contained in:
Klaus Basan
2015-09-23 18:07:48 +02:00
committed by Mathew Sutcliffe
parent 5223d2fbd8
commit fd8cd9a42a
11 changed files with 13 additions and 5 deletions

View File

@@ -22,6 +22,7 @@
#include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/callsign.h"
#include <QObject> #include <QObject>
#include <QHash> #include <QHash>
#include <QReadWriteLock>
namespace BlackCore namespace BlackCore
{ {

View File

@@ -14,6 +14,8 @@
#include <QDir> #include <QDir>
#include <QDirIterator> #include <QDirIterator>
#include <QLibrary> #include <QLibrary>
#include <QPluginLoader>
#include <QStringBuilder>
using namespace BlackMisc; using namespace BlackMisc;

View File

@@ -9,6 +9,7 @@
#include "plugin_manager_simulator.h" #include "plugin_manager_simulator.h"
#include "simulator.h" #include "simulator.h"
#include <QStringBuilder>
namespace BlackCore namespace BlackCore
{ {

View File

@@ -7,6 +7,8 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
//! \file
#ifndef BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H #ifndef BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H
#define BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H #define BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H

View File

@@ -17,7 +17,6 @@
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QDBusConnection>
namespace BlackGui namespace BlackGui
{ {
@@ -26,7 +25,6 @@ namespace BlackGui
//! ATC list model //! ATC list model
class BLACKGUI_EXPORT CAtcStationListModel : public CListModelBase<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList> class BLACKGUI_EXPORT CAtcStationListModel : public CListModelBase<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>
{ {
public: public:
//! What kind of stations //! What kind of stations
enum AtcStationMode enum AtcStationMode

View File

@@ -51,7 +51,7 @@ namespace BlackGui
CSimulatedAircraft aircraft(selectedObject()); CSimulatedAircraft aircraft(selectedObject());
Q_ASSERT(!aircraft.getCallsign().isEmpty()); Q_ASSERT(!aircraft.getCallsign().isEmpty());
menu.addAction(CIcons::appTextMessages16(), "Show text messages", this, SLOT(ps_requestTextMessage())); menu.addAction(CIcons::appTextMessages16(), "Show text messages", this, SLOT(ps_requestTextMessage()));
if (m_withMenuEnable) { menu.addAction(CIcons::appAircrafts16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", this, SLOT(ps_enableAircraft())); } if (m_withMenuEnable) { menu.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", this, SLOT(ps_enableAircraft())); }
if (m_withMenuHighlight) { menu.addAction(CIcons::appSimulator16(), "Highlight in simulator", this, SLOT(ps_highlightInSimulator())); } if (m_withMenuHighlight) { menu.addAction(CIcons::appSimulator16(), "Highlight in simulator", this, SLOT(ps_highlightInSimulator())); }
if (m_withMenuFastPosition) { menu.addAction(CIcons::globe16(), aircraft.fastPositionUpdates() ? "Normal updates" : "Fast position updates", this, SLOT(ps_fastPositionUpdates())); } if (m_withMenuFastPosition) { menu.addAction(CIcons::globe16(), aircraft.fastPositionUpdates() ? "Normal updates" : "Fast position updates", this, SLOT(ps_fastPositionUpdates())); }
menu.addSeparator(); menu.addSeparator();

View File

@@ -10,6 +10,9 @@
#include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/callsign.h"
#include "blackmisc/iconlist.h" #include "blackmisc/iconlist.h"
#include <QThreadStorage>
#include <QRegularExpression>
namespace BlackMisc namespace BlackMisc
{ {
namespace Aviation namespace Aviation

View File

@@ -18,6 +18,8 @@
#include <QObject> #include <QObject>
#include <QMap> #include <QMap>
#include <QPointer> #include <QPointer>
#include <QThread>
#include <QMetaMethod>
namespace BlackMisc namespace BlackMisc
{ {

View File

@@ -11,7 +11,6 @@
namespace BlackMisc namespace BlackMisc
{ {
QString CSampleUtils::selectDirectory(const QStringList &directoryOptions, QTextStream &streamOut, QTextStream &streamIn) QString CSampleUtils::selectDirectory(const QStringList &directoryOptions, QTextStream &streamOut, QTextStream &streamIn)
{ {
Q_ASSERT(!directoryOptions.isEmpty()); Q_ASSERT(!directoryOptions.isEmpty());

View File

@@ -8,6 +8,7 @@
*/ */
#include "airspaceaircraftsnapshot.h" #include "airspaceaircraftsnapshot.h"
#include <QThread>
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::PhysicalQuantities;

View File

@@ -25,7 +25,6 @@ namespace BlackMisc
//! Those are set up at runtime and represent information about the simulator (like a small registry) //! Those are set up at runtime and represent information about the simulator (like a small registry)
class BLACKMISC_EXPORT CSimulatorSetup : public CValueObject<CSimulatorSetup> class BLACKMISC_EXPORT CSimulatorSetup : public CValueObject<CSimulatorSetup>
{ {
public: public:
//! Specific values //! Specific values
enum ColumnIndex enum ColumnIndex