Skip to content

Commit 95b4969

Browse files
committed
Review includes
Clear all include-what-you-use warnings.
1 parent 4dedb23 commit 95b4969

40 files changed

+1740
-138
lines changed

iwyu-main.imp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[
2+
{ ref: "iwyu-qt.imp" },
3+
4+
{ include: [ "<ext/alloc_traits.h>", "private", "<memory>", "public" ] },
5+
]

iwyu-qt.imp

Lines changed: 1116 additions & 0 deletions
Large diffs are not rendered by default.

src/club.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,26 @@
2020

2121
#include "club.h"
2222

23-
#include "assert.h"
23+
#include <cassert>
24+
#include <cstddef>
25+
#include <utility>
2426

27+
#include <QAbstractItemView>
28+
#include <QFile>
2529
#include <QHeaderView>
30+
#include <QIODevice>
2631
#include <QSortFilterProxyModel>
27-
#include <QFile>
28-
#include <QXmlStreamWriter>
32+
#include <QStringRef>
33+
#include <QXmlStreamAttributes>
2934
#include <QXmlStreamReader>
35+
#include <QXmlStreamWriter>
3036

31-
#include "location.h"
32-
#include "util.h"
3337
#include "config.h"
38+
#include "location.h"
3439
#include "runner.h"
3540
#include "scoring.h"
3641
#include "seriesScoring.h"
42+
#include "util.h"
3743

3844
const int COLUMN_COUNT = 3;
3945

src/club.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,21 @@
2121
#ifndef CUPCALCULATOR_CLUB_H
2222
#define CUPCALCULATOR_CLUB_H
2323

24-
#include <QString>
24+
#include <vector>
25+
#include <map>
26+
#include <QVariant>
27+
28+
#include <Qt>
29+
#include <QtGlobal>
2530
#include <QAbstractTableModel>
31+
#include <QModelIndex>
32+
#include <QObject>
33+
#include <QString>
2634
#include <QTableView>
27-
#include <vector>
35+
36+
QT_BEGIN_NAMESPACE
37+
class QModelIndex;
38+
QT_END_NAMESPACE
2839

2940
class Location;
3041
class QSortFilterProxyModel;

src/clubDialog.cpp

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,35 @@
2020

2121
#include "clubDialog.h"
2222

23-
#include <QtWidgets>
24-
#include <assert.h>
23+
#include <cassert>
24+
25+
#include <Qt>
26+
#include <QAbstractItemModel>
27+
#include <QApplication>
28+
#include <QCloseEvent>
29+
#include <QHBoxLayout>
30+
#include <QHeaderView>
31+
#include <QIcon>
32+
#include <QItemSelection>
33+
#include <QItemSelectionModel>
34+
#include <QLabel>
35+
#include <QLineEdit>
36+
#include <QMessageBox>
37+
#include <QModelIndex>
38+
#include <QPushButton>
39+
#include <QSortFilterProxyModel>
40+
#include <QTreeView>
41+
#include <QVBoxLayout>
42+
#include <QVariant>
2543

26-
#include "location.h"
2744
#include "club.h"
2845
#include "config.h"
29-
#include "util.h"
46+
#include "location.h"
47+
48+
QT_BEGIN_NAMESPACE
49+
class QHBoxLayout;
50+
class QVBoxLayout;
51+
QT_END_NAMESPACE
3052

3153
ClubDialog::ClubDialog(Club* _club, QWidget* parent) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint), club(_club)
3254
{

src/clubDialog.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@
2222
#define CUPCALCULATOR_CLUBDIALOG_H
2323

2424
#include <QDialog>
25+
#include <QObject>
26+
#include <QString>
27+
#include <QtGlobal>
2528

2629
QT_BEGIN_NAMESPACE
30+
class QCloseEvent;
31+
class QLabel;
2732
class QLineEdit;
33+
class QPushButton;
2834
class QTreeView;
29-
class QLabel;
35+
class QWidget;
3036
QT_END_NAMESPACE
3137

3238
class Club;

src/comboBoxDelegate.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020

2121
#include "comboBoxDelegate.h"
2222

23+
#include <Qt>
24+
#include <QAbstractItemModel>
2325
#include <QComboBox>
26+
#include <QModelIndex>
27+
#include <QVariant>
28+
#include <QWidget>
2429

2530
ComboBoxDelegate::ComboBoxDelegate(QAbstractItemModel* _model, int _model_column, QObject* parent)
2631
: QItemDelegate(parent), model(_model), model_column(_model_column)

src/comboBoxDelegate.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,18 @@
2121
#ifndef CUPCALCULATOR_COMBOBOXDELEGATE_H
2222
#define CUPCALCULATOR_COMBOBOXDELEGATE_H
2323

24+
#include <QtGlobal>
2425
#include <QItemDelegate>
26+
#include <QObject>
27+
#include <QString>
28+
#include <QStyleOptionViewItem>
29+
30+
QT_BEGIN_NAMESPACE
31+
class QAbstractItemModel;
32+
class QModelIndex;
33+
class QStyleOptionViewItem;
34+
class QWidget;
35+
QT_END_NAMESPACE
2536

2637
class ComboBoxDelegate : public QItemDelegate
2738
{

src/csvFile.cpp

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,27 @@
2020

2121
#include "csvFile.h"
2222

23-
#include "assert.h"
23+
#include <utility>
24+
#include <cstddef>
2425

25-
#include <QtWidgets>
26+
#include <Qt>
27+
#include <QCheckBox>
2628
#include <QFile>
27-
#include <QTextStream>
29+
#include <QGridLayout>
30+
#include <QHBoxLayout>
31+
#include <QIODevice>
32+
#include <QIcon>
33+
#include <QLabel>
34+
#include <QLineEdit>
35+
#include <QList>
36+
#include <QMessageBox>
37+
#include <QPushButton>
2838
#include <QStringList>
39+
#include <QTextStream>
40+
41+
QT_BEGIN_NAMESPACE
42+
class QHBoxLayout;
43+
QT_END_NAMESPACE
2944

3045
CSVFile::CSVFile(const QString& path, const QChar _separator, const QChar _stringDelimiter, bool escape_minus)
3146
{

src/csvFile.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@
2121
#ifndef CUPCALCULATOR_CSVFILE_H
2222
#define CUPCALCULATOR_CSVFILE_H
2323

24+
#include <map>
2425
#include <vector>
2526

26-
#include <QString>
27-
#include <map>
27+
#include <QtGlobal>
28+
#include <QChar>
2829
#include <QDialog>
30+
#include <QObject>
31+
#include <QString>
32+
#include <QStringList>
2933

3034
QT_BEGIN_NAMESPACE
3135
class QFile;

0 commit comments

Comments
 (0)