Changed BLACK_FALLTHROUGH to Q_FALLTHROUGH().

This commit is contained in:
Mat Sutcliffe
2019-01-03 23:24:44 +00:00
parent 0c5442d59c
commit 1f83d677f3
7 changed files with 9 additions and 50 deletions

View File

@@ -30,7 +30,6 @@
#include "blackgui/shortcut.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/livery.h"
#include "blackmisc/fallthrough.h"
#include "blackmisc/icons.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/network/authenticateduser.h"
@@ -614,8 +613,8 @@ namespace BlackGui
{
// fall thru intended
this->formatVPilotView();
BLACK_FALLTHROUGH;
}
Q_FALLTHROUGH();
default:
{
ui->frp_Editors->setVisible(true);

View File

@@ -10,7 +10,6 @@
#include "blackgui/models/aircraftmodellistmodel.h"
#include "blackgui/models/columnformatters.h"
#include "blackgui/models/columns.h"
#include "blackmisc/fallthrough.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/livery.h"
@@ -77,7 +76,7 @@ namespace BlackGui
case OwnModelSet:
// intentional fall thru
m_columns.addColumn(CColumn::orderColumn());
BLACK_FALLTHROUGH;
Q_FALLTHROUGH();
case OwnAircraftModelMappingTool:
case StashModel:

View File

@@ -7,7 +7,6 @@
* contained in the LICENSE file.
*/
#include "blackmisc/fallthrough.h"
#include "blackgui/models/columns.h"
#include "blackgui/models/distributorlistmodel.h"
#include "blackmisc/db/datastore.h"
@@ -47,7 +46,7 @@ namespace BlackGui
{
case NormalWithOrder:
m_columns.addColumn(CColumn::orderColumn());
BLACK_FALLTHROUGH;
Q_FALLTHROUGH();
case NotSet:
case Normal:
{
@@ -66,7 +65,7 @@ namespace BlackGui
case MinimalWithOrder:
m_columns.addColumn(CColumn::orderColumn());
BLACK_FALLTHROUGH;
Q_FALLTHROUGH();
case Minimal:
{
m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey));