Issue #77 Move GlobalIndex enum from CPropertyIndex to CPropertyIndexRef

This commit is contained in:
Mat Sutcliffe
2020-11-01 20:12:55 +00:00
parent 0971c8ce68
commit 363758e8ea
92 changed files with 210 additions and 211 deletions

View File

@@ -84,7 +84,7 @@ namespace BlackGui
CColumn CColumn::emptyColumn()
{
CColumn col = CColumn("", "", CPropertyIndex::GlobalIndexEmpty, new CEmptyFormatter());
CColumn col = CColumn("", "", CPropertyIndexRef::GlobalIndexEmpty, new CEmptyFormatter());
col.setWidthPercentage(1);
return col;
}
@@ -276,7 +276,7 @@ namespace BlackGui
{
if (m_columns.isEmpty()) { return false; }
const CColumn c = m_columns.last();
return c.getPropertyIndex() == CPropertyIndex::GlobalIndexEmpty;
return c.getPropertyIndex() == CPropertyIndexRef::GlobalIndexEmpty;
}
const CDefaultFormatter *CColumns::getFormatter(const QModelIndex &index) const

View File

@@ -119,7 +119,7 @@ namespace BlackGui
static CColumn standardString(const QString &headerName, const QString &toolTip, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignDefault());
//! Get a standard string object formatted column
static CColumn orderColumn(const BlackMisc::CPropertyIndex &propertyIndex = BlackMisc::CPropertyIndex::GlobalIndexIOrderable, int alignment = CDefaultFormatter::alignRightVCenter());
static CColumn orderColumn(const BlackMisc::CPropertyIndex &propertyIndex = BlackMisc::CPropertyIndexRef::GlobalIndexIOrderable, int alignment = CDefaultFormatter::alignRightVCenter());
//! Get a standard integer value formatted column
static CColumn standardInteger(const QString &headerName, const QString &toolTip, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignRightVCenter());

View File

@@ -107,8 +107,8 @@ namespace BlackGui
// special cases
switch (propertyIndexFront)
{
case CPropertyIndex::GlobalIndexLineNumber: return QVariant::fromValue(row + 1);
case CPropertyIndex::GlobalIndexEmpty: return {};
case CPropertyIndexRef::GlobalIndexLineNumber: return QVariant::fromValue(row + 1);
case CPropertyIndexRef::GlobalIndexEmpty: return {};
default: break; // continue here
}

View File

@@ -26,7 +26,7 @@ namespace BlackGui
//! Properties by index
enum ColumnIndex
{
IndexInRangeOnly = BlackMisc::CPropertyIndex::GlobalIndexCAtcStationsSettings,
IndexInRangeOnly = BlackMisc::CPropertyIndexRef::GlobalIndexCAtcStationsSettings,
IndexValidFrequencyOnly
};

View File

@@ -33,7 +33,7 @@ namespace BlackGui
//! Properties by index
enum ColumnIndex
{
IndexFloatingMargins = BlackMisc::CPropertyIndex::GlobalIndexCDockWidgetSettings,
IndexFloatingMargins = BlackMisc::CPropertyIndexRef::GlobalIndexCDockWidgetSettings,
IndexFloatingFramelessMargins,
IndexDockedMargins,
IndexFrameless,

View File

@@ -30,7 +30,7 @@ namespace BlackGui
//! Properties by index
enum ColumnIndex
{
IndexWidgetStyle = BlackMisc::CPropertyIndex::GlobalIndexCGeneralGuiSettings,
IndexWidgetStyle = BlackMisc::CPropertyIndexRef::GlobalIndexCGeneralGuiSettings,
IndexPreferredSelection
};

View File

@@ -32,7 +32,7 @@ namespace BlackGui
//! Properties by index
enum ColumnIndex
{
IndexMargins = BlackMisc::CPropertyIndex::GlobalIndexCNavigatorSettings,
IndexMargins = BlackMisc::CPropertyIndexRef::GlobalIndexCNavigatorSettings,
IndexFrameless,
IndexColumns
};

View File

@@ -32,7 +32,7 @@ namespace BlackGui
//! Properties by index
enum ColumnIndex
{
IndexPopupPrivateMessages = BlackMisc::CPropertyIndex::GlobalIndexCTextMessageSettings,
IndexPopupPrivateMessages = BlackMisc::CPropertyIndexRef::GlobalIndexCTextMessageSettings,
IndexPopupSupervisorMessages,
IndexPopupFrequencyMessages,
IndexPopupAllMessages,

View File

@@ -33,7 +33,7 @@ namespace BlackGui
//! Properties by index
enum ColumnIndex
{
IndexAtc = BlackMisc::CPropertyIndex::GlobalIndexCViewUpdateSettings,
IndexAtc = BlackMisc::CPropertyIndexRef::GlobalIndexCViewUpdateSettings,
IndexAircraft,
IndexRendering,
IndexUser