Skip to content

Commit 73fc5a2

Browse files
svettersvetter
committed
Clean up QSet<X* const> to QSet<X*>
For #191
1 parent 163bdc4 commit 73fc5a2

9 files changed

+30
-30
lines changed

‎src/comp_tables/breadcrumbs.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ Breadcrumbs::Breadcrumbs(std::initializer_list<Breadcrumb> initList) :
174174
*
175175
* @return A set of all base table columns used as breadcrumbs.
176176
*/
177-
const QSet<Column* const> Breadcrumbs::getColumnSet() const
177+
const QSet<Column*> Breadcrumbs::getColumnSet() const
178178
{
179-
QSet<Column* const> result = QSet<Column* const>();
179+
QSet<Column*> result = QSet<Column*>();
180180
for (const auto& [firstColumn, secondColumn] : list) {
181181
result.insert(firstColumn);
182182
result.insert(secondColumn);

‎src/comp_tables/breadcrumbs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Breadcrumbs
7171
Breadcrumbs(std::initializer_list<Breadcrumb> initList);
7272
Breadcrumbs(const QList<Breadcrumb>& initList);
7373

74-
const QSet<Column* const> getColumnSet() const;
74+
const QSet<Column*> getColumnSet() const;
7575
const Table* getTargetTable() const;
7676
bool isEmpty() const;
7777
int length() const;

‎src/comp_tables/composite_column.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ QVariant DirectCompositeColumn::computeValueAt(BufferRowIndex rowIndex) const
450450
*
451451
* @return A set of all base table columns which are used to compute contents of this column.
452452
*/
453-
const QSet<Column* const> DirectCompositeColumn::getAllUnderlyingColumns() const
453+
const QSet<Column*> DirectCompositeColumn::getAllUnderlyingColumns() const
454454
{
455455
return { contentColumn };
456456
}
@@ -505,9 +505,9 @@ QVariant ReferenceCompositeColumn::computeValueAt(BufferRowIndex rowIndex) const
505505
*
506506
* @return A set of all base table columns which are used to compute contents of this column.
507507
*/
508-
const QSet<Column* const> ReferenceCompositeColumn::getAllUnderlyingColumns() const
508+
const QSet<Column*> ReferenceCompositeColumn::getAllUnderlyingColumns() const
509509
{
510-
QSet<Column* const> result = { contentColumn };
510+
QSet<Column*> result = { contentColumn };
511511
result.unite(breadcrumbs.getColumnSet());
512512
return result;
513513
}
@@ -582,7 +582,7 @@ QVariant DifferenceCompositeColumn::computeValueAt(BufferRowIndex rowIndex) cons
582582
*
583583
* @return A set of all base table columns which are used to compute contents of this column.
584584
*/
585-
const QSet<Column* const> DifferenceCompositeColumn::getAllUnderlyingColumns() const
585+
const QSet<Column*> DifferenceCompositeColumn::getAllUnderlyingColumns() const
586586
{
587587
return { minuendColumn, subtrahendColumn };
588588
}
@@ -643,7 +643,7 @@ QVariant DependentEnumCompositeColumn::computeValueAt(BufferRowIndex rowIndex) c
643643
*
644644
* @return A set of all base table columns which are used to compute contents of this column.
645645
*/
646-
const QSet<Column* const> DependentEnumCompositeColumn::getAllUnderlyingColumns() const
646+
const QSet<Column*> DependentEnumCompositeColumn::getAllUnderlyingColumns() const
647647
{
648648
return { discerningEnumColumn, displayedEnumColumn };
649649
}
@@ -742,9 +742,9 @@ QList<BufferRowIndex> IndexCompositeColumn::getRowIndexOrderList() const
742742
*
743743
* @return A set of all base table columns which are used to compute contents of this column.
744744
*/
745-
const QSet<Column* const> IndexCompositeColumn::getAllUnderlyingColumns() const
745+
const QSet<Column*> IndexCompositeColumn::getAllUnderlyingColumns() const
746746
{
747-
QSet<Column* const> columns = QSet<Column* const>();
747+
QSet<Column*> columns = QSet<Column*>();
748748
for (const auto& [column, order] : sortingPasses) {
749749
columns += column;
750750
}

‎src/comp_tables/composite_column.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class CompositeColumn {
114114
*
115115
* @return A set of all base table columns which are used to compute contents of this column.
116116
*/
117-
virtual const QSet<Column* const> getAllUnderlyingColumns() const = 0;
117+
virtual const QSet<Column*> getAllUnderlyingColumns() const = 0;
118118

119119
protected:
120120
ProjectSettings* getProjectSettings() const;
@@ -134,7 +134,7 @@ class DirectCompositeColumn : public CompositeColumn {
134134

135135
virtual QVariant computeValueAt(BufferRowIndex rowIndex) const override;
136136

137-
virtual const QSet<Column* const> getAllUnderlyingColumns() const override;
137+
virtual const QSet<Column*> getAllUnderlyingColumns() const override;
138138
};
139139

140140

@@ -154,7 +154,7 @@ class ReferenceCompositeColumn : public CompositeColumn {
154154

155155
virtual QVariant computeValueAt(BufferRowIndex rowIndex) const override;
156156

157-
virtual const QSet<Column* const> getAllUnderlyingColumns() const override;
157+
virtual const QSet<Column*> getAllUnderlyingColumns() const override;
158158
};
159159

160160

@@ -174,7 +174,7 @@ class DifferenceCompositeColumn : public CompositeColumn {
174174

175175
virtual QVariant computeValueAt(BufferRowIndex rowIndex) const override;
176176

177-
virtual const QSet<Column* const> getAllUnderlyingColumns() const override;
177+
virtual const QSet<Column*> getAllUnderlyingColumns() const override;
178178
};
179179

180180

@@ -194,7 +194,7 @@ class DependentEnumCompositeColumn : public CompositeColumn {
194194

195195
virtual QVariant computeValueAt(BufferRowIndex rowIndex) const override;
196196

197-
virtual const QSet<Column* const> getAllUnderlyingColumns() const override;
197+
virtual const QSet<Column*> getAllUnderlyingColumns() const override;
198198
};
199199

200200

@@ -223,7 +223,7 @@ class IndexCompositeColumn : public CompositeColumn {
223223
QList<QVariant> computeWholeColumn() const override;
224224
QList<BufferRowIndex> getRowIndexOrderList() const;
225225

226-
virtual const QSet<Column* const> getAllUnderlyingColumns() const override;
226+
virtual const QSet<Column*> getAllUnderlyingColumns() const override;
227227
};
228228

229229
/**

‎src/comp_tables/composite_table.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void CompositeTable::addColumn(const CompositeColumn* column)
8080
columns.append(column);
8181

8282
// Register as change listener at all underlying columns
83-
const QSet<Column* const> underlyingColumns = column->getAllUnderlyingColumns();
83+
const QSet<Column*> underlyingColumns = column->getAllUnderlyingColumns();
8484
for (Column* underlyingColumn : underlyingColumns) {
8585
underlyingColumn->registerChangeListener(new ColumnChangeListenerCompositeColumn(column));
8686
}
@@ -112,7 +112,7 @@ void CompositeTable::addFilterColumn(const CompositeColumn* column)
112112
columns.append(column);
113113

114114
// Register as change listener at all underlying columns
115-
const QSet<Column* const> underlyingColumns = column->getAllUnderlyingColumns();
115+
const QSet<Column*> underlyingColumns = column->getAllUnderlyingColumns();
116116
for (Column* underlyingColumn : underlyingColumns) {
117117
underlyingColumn->registerChangeListener(new ColumnChangeListenerCompositeColumn(column));
118118
}

‎src/comp_tables/fold_composite_column.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ FoldCompositeColumn::FoldCompositeColumn(CompositeTable* table, QString name, QS
5252
*
5353
* @return A set of all base table columns which are used to compute contents of this column.
5454
*/
55-
const QSet<Column* const> FoldCompositeColumn::getAllUnderlyingColumns() const
55+
const QSet<Column*> FoldCompositeColumn::getAllUnderlyingColumns() const
5656
{
57-
QSet<Column* const> result = breadcrumbs.getColumnSet();
57+
QSet<Column*> result = breadcrumbs.getColumnSet();
5858
if (contentColumn) result.insert(contentColumn);
5959
return result;
6060
}

‎src/comp_tables/fold_composite_column.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class FoldCompositeColumn : public CompositeColumn {
4848
public:
4949
FoldCompositeColumn(CompositeTable* table, QString name, QString uiName, DataType contentType, bool isStatistical, QString suffix, const Breadcrumbs breadcrumbs, Column* contentColumn = nullptr, const QStringList* enumNames = nullptr);
5050

51-
virtual const QSet<Column* const> getAllUnderlyingColumns() const override;
51+
virtual const QSet<Column*> getAllUnderlyingColumns() const override;
5252
};
5353

5454

‎src/stats/stats_engine.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ GeneralStatsEngine::GeneralStatsEngine(Database* db, QVBoxLayout** const statist
136136
assert(statisticsTabLayoutPtr);
137137

138138
// Create and register change listeners
139-
const QSet<Column* const> underlyingColumns = getUsedColumnSet();
140-
for (Column* const underlyingColumn : underlyingColumns) {
139+
const QSet<Column*> underlyingColumns = getUsedColumnSet();
140+
for (Column* underlyingColumn : underlyingColumns) {
141141
underlyingColumn->registerChangeListener(new ColumnChangeListenerGeneralStatsEngine(this));
142142
}
143143
}
@@ -286,9 +286,9 @@ void GeneralStatsEngine::updateCharts()
286286
*
287287
* @return The set of columns used by this GeneralStatsEngine.
288288
*/
289-
QSet<Column* const> GeneralStatsEngine::getUsedColumnSet() const
289+
QSet<Column*> GeneralStatsEngine::getUsedColumnSet() const
290290
{
291-
QSet<Column* const> underlyingColumns = QSet<Column* const>();
291+
QSet<Column*> underlyingColumns = QSet<Column*>();
292292

293293
underlyingColumns.insert(db->ascentsTable->dateColumn);
294294
underlyingColumns.insert(db->ascentsTable->timeColumn);
@@ -340,7 +340,7 @@ ItemStatsEngine::ItemStatsEngine(Database* db, PALItemType itemType, const Norma
340340
assert(statsLayout);
341341

342342
// Create and register change listeners
343-
const QSet<Column* const> underlyingColumns = getUsedColumnSet();
343+
const QSet<Column*> underlyingColumns = getUsedColumnSet();
344344
for (Column* const underlyingColumn : underlyingColumns) {
345345
underlyingColumn->registerChangeListener(new ColumnChangeListenerItemStatsEngine(this));
346346
}
@@ -902,9 +902,9 @@ QString ItemStatsEngine::getItemLabelFor(const BufferRowIndex& bufferIndex) cons
902902
*
903903
* @return The set of columns used by this ItemStatsEngine.
904904
*/
905-
QSet<Column* const> ItemStatsEngine::getUsedColumnSet() const
905+
QSet<Column*> ItemStatsEngine::getUsedColumnSet() const
906906
{
907-
QSet<Column* const> underlyingColumns = QSet<Column* const>();
907+
QSet<Column*> underlyingColumns = QSet<Column*>();
908908

909909
underlyingColumns.unite(ascentCrumbs.getColumnSet());
910910
underlyingColumns.unite(peakCrumbs.getColumnSet());

‎src/stats/stats_engine.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class GeneralStatsEngine : public StatsEngine
9898
virtual void updateCharts();
9999

100100
protected:
101-
QSet<Column* const> getUsedColumnSet() const;
101+
QSet<Column*> getUsedColumnSet() const;
102102
};
103103

104104

@@ -190,7 +190,7 @@ class ItemStatsEngine : public StatsEngine
190190

191191
QString getItemLabelFor(const BufferRowIndex& bufferIndex) const;
192192
protected:
193-
QSet<Column* const> getUsedColumnSet() const;
193+
QSet<Column*> getUsedColumnSet() const;
194194
};
195195

196196

0 commit comments

Comments
 (0)