refs #899, formatting, renaming, include guard names

This commit is contained in:
Klaus Basan
2017-03-06 02:30:22 +01:00
committed by Mathew Sutcliffe
parent 8cc683386f
commit f71e717ec1
12 changed files with 49 additions and 56 deletions

View File

@@ -73,21 +73,21 @@ namespace BlackGui
void CAtcStationView::ps_tuneInAtcCom1()
{
CAtcStation s(this->selectedObject());
const CAtcStation s(this->selectedObject());
if (s.getCallsign().isEmpty()) { return; }
emit this->requestComFrequency(s.getFrequency(), CComSystem::Com1);
}
void CAtcStationView::ps_tuneInAtcCom2()
{
CAtcStation s(this->selectedObject());
const CAtcStation s(this->selectedObject());
if (s.getCallsign().isEmpty()) { return; }
emit this->requestComFrequency(s.getFrequency(), CComSystem::Com2);
}
void CAtcStationView::ps_requestTextMessage()
{
CAtcStation s(this->selectedObject());
const CAtcStation s(this->selectedObject());
if (s.getCallsign().isEmpty()) { return; }
emit this->requestTextMessageWidget(s.getCallsign());
}

View File

@@ -27,11 +27,9 @@ class QAction;
class QWidget;
namespace BlackMisc { namespace Aviation { class CCallsign; } }
namespace BlackGui
{
namespace Menus { class CMenuActions; }
namespace Views
{
//! ATC stations view

View File

@@ -94,6 +94,5 @@ namespace BlackGui
if (aircraft.getCallsign().isEmpty()) { return; }
emit requestHighlightInSimulator(aircraft);
}
} // ns
} // ns

View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKGUI_SIMULATEDAIRCRAFTVIEW_H
#define BLACKGUI_SIMULATEDAIRCRAFTVIEW_H
#ifndef BLACKGUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H
#define BLACKGUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H
#include "blackgui/blackguiexport.h"
#include "blackgui/models/simulatedaircraftlistmodel.h"

View File

@@ -9,7 +9,20 @@
#include "blackgui/menus/menuaction.h"
#include "blackgui/views/viewdbobjects.h"
#include "blackgui/models/aircrafticaolistmodel.h"
#include "blackgui/models/aircraftmodellistmodel.h"
#include "blackgui/models/airlineicaolistmodel.h"
#include "blackgui/models/countrylistmodel.h"
#include "blackgui/models/distributorlistmodel.h"
#include "blackgui/models/liverylistmodel.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/airlineicaocodelist.h"
#include "blackmisc/aviation/liverylist.h"
#include "blackmisc/icons.h"
#include "blackmisc/countrylist.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/distributor.h"
#include "blackmisc/simulation/distributorlist.h"
#include <QAction>
#include <QIntValidator>

View File

@@ -9,24 +9,10 @@
//! \file
#ifndef BLACKGUI_VIEWDBOBJECTS_H
#define BLACKGUI_VIEWDBOBJECTS_H
#ifndef BLACKGUI_VIEWS_VIEWDBOBJECTS_H
#define BLACKGUI_VIEWS_VIEWDBOBJECTS_H
#include "blackgui/models/aircrafticaolistmodel.h"
#include "blackgui/models/aircraftmodellistmodel.h"
#include "blackgui/models/airlineicaolistmodel.h"
#include "blackgui/models/countrylistmodel.h"
#include "blackgui/models/distributorlistmodel.h"
#include "blackgui/models/liverylistmodel.h"
#include "blackgui/views/viewbase.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/airlineicaocodelist.h"
#include "blackmisc/aviation/liverylist.h"
#include "blackmisc/countrylist.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/distributor.h"
#include "blackmisc/simulation/distributorlist.h"
#include <QSet>
#include <QObject>
#include <QString>
@@ -34,6 +20,7 @@
class QAction;
class QIntValidator;
class QFrame;
class QLineEdit;
class QWidget;