flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-12 23:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T529, style

Browse Source
This commit is contained in:
Klaus Basan
2019-02-04 17:20:53 +01:00
committed by Mat Sutcliffe
parent f363d4f41b
commit aa47d7bb03
12 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/models/columns.cpp
View File

@@ -171,7 +171,7 @@ namespace BlackGui
bool CColumns::isSortable(int column) const
{
if (!isValidColumn(column)) return false;
if (!isValidColumn(column)) { return false; }
return m_columns.at(column).isSortable();
}

5
src/blackgui/models/distributorlistmodel.h
View File

@@ -18,10 +18,7 @@
#include <QString>
class QObject;
namespace BlackMisc { namespace Simulation { class CDistributor; } }
namespace BlackGui
{
namespace Models
@@ -47,7 +44,7 @@ namespace BlackGui
explicit CDistributorListModel(QObject *parent = nullptr);
//! Destructor
virtual ~CDistributorListModel() {}
virtual ~CDistributorListModel() override {}
//! Set mode
void setDistributorMode(DistributorMode distributorMode);

2
src/blackgui/models/listmodelbasenontemplate.cpp
View File

@@ -111,7 +111,7 @@ namespace BlackGui
}
const bool changedColumn = this->setSortColumnByPropertyIndex(propertyIndex);
const bool changedOrder = (m_sortOrder == order);
const bool changedOrder = (m_sortOrder == order);
m_sortOrder = order;
return changedColumn || changedOrder;
}

4
src/blackgui/models/statusmessagelistmodel.h
View File

@@ -12,12 +12,10 @@
#ifndef BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H
#define BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H
#include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodeltimestampobjects.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/statusmessagelist.h"
class QObject;
namespace BlackGui
{
namespace Models

2
src/blackgui/views/statusmessageview.h
View File

@@ -35,7 +35,7 @@ namespace BlackGui
explicit CStatusMessageView(QWidget *parent = nullptr);
//! Set mode
void setMode(BlackGui::Models::CStatusMessageListModel::Mode mode);
void setMode(Models::CStatusMessageListModel::Mode mode);
//! Add my own filter dialog
void addFilterDialog();

4
src/blackgui/views/viewbase.h
View File

@@ -538,7 +538,7 @@ namespace BlackGui
bool m_acceptDoubleClickSelection = false; //!< double clicked
bool m_displayAutomatically = true; //!< display directly when loaded
bool m_enableDeleteSelectedRows = false; //!< selected rows can be deleted
bool m_dropIndicator = false; //!< draw indicator
bool m_dropIndicator = false; //!< drop indicator
bool m_forceColumnsToMaxSize = true; //!< force that columns are extended to full viewport width
bool m_allowCacheFileJson = true; //!< allow Cache format JSON to be loaded
QWidget *m_filterWidget = nullptr; //!< filter widget or dialog
@@ -548,7 +548,7 @@ namespace BlackGui
CLoadIndicator *m_loadIndicator = nullptr; //!< load indicator if needed
Components::CTextEditDialog *m_textEditDialog = nullptr; //!< text edit dialog
QMap<MenuFlag, Menus::CMenuActions> m_menuFlagActions; //!< initialized actions for menu flag (enum)
QString m_saveFileName; //!< save file name (JSON)
QString m_saveFileName; //!< save file name (JSON)
BlackMisc::CDirectories::ColumnIndex m_dirSettingsIndex = BlackMisc::CDirectories::IndexDirLastViewJsonOrDefault; //!< allows to set more specialized directories //!< remember last JSON directory, having this member allows to have specific dir
BlackMisc::CSetting<BlackMisc::Settings::TDirectorySettings> m_dirSettings { this }; //!< directory for load/save
BlackMisc::CSettingReadOnly<Settings::TGeneralGui> m_guiSettings { this, &CViewBaseNonTemplate::settingsChanged }; //!< general GUI settings

2
src/blackgui/views/viewbasenontemplate.cpp
View File

@@ -695,7 +695,7 @@ namespace BlackGui
int CViewBaseNonTemplate::showLoadIndicator(int containerSizeDependent, int timeoutMs, bool processEvents)
{
if (!m_enabledLoadIndicator) { return -1; }
if (m_showingLoadIndicator) { return -1; }
if (m_showingLoadIndicator) { return -1; }
if (this->hasDockWidgetArea())
{
if (!this->isVisibleWidget()) { return -1; }