diff options
author | Rym Bouabid <rym.bouabid@qt.io> | 2023-09-18 16:15:37 +0200 |
---|---|---|
committer | Rym Bouabid <rym.bouabid@qt.io> | 2023-09-22 20:21:22 +0200 |
commit | 00d8d566c65209130cce2c2cb710bebc4beaf438 (patch) | |
tree | c54dbd23db8793e334aa1ba08934de8b0cd5040e | |
parent | 81857ad5c3587de8ca3a622f8286fff2504ea333 (diff) |
Revamp MIME Type Browser Ex: Fix includes
Fix include order to respect the Coding Conventions.
Remove QT_{BEGIN,END}_NAMESPACE because these are private Qt macros that
should not be used in the examples.
Task-number: QTBUG-117146
Pick-to: 6.6 6.5
Change-Id: Iba7a4726180ec97d9654ed3b934baca8c1df0b5c
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
4 files changed, 10 insertions, 19 deletions
diff --git a/examples/corelib/mimetypes/mimetypebrowser/main.cpp b/examples/corelib/mimetypes/mimetypebrowser/main.cpp index 9aaad7b836..03c905e6af 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/main.cpp +++ b/examples/corelib/mimetypes/mimetypebrowser/main.cpp @@ -4,10 +4,8 @@ #include "mainwindow.h" #include <QApplication> -#include <QScreen> - #include <QCommandLineParser> -#include <QCommandLineOption> +#include <QScreen> int main(int argc, char *argv[]) { diff --git a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp index 7ee25c5184..0163fec574 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp +++ b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp @@ -4,23 +4,18 @@ #include "mainwindow.h" #include "mimetypemodel.h" -#include <QAction> #include <QApplication> #include <QFileDialog> +#include <QFileInfo> #include <QInputDialog> +#include <QItemSelectionModel> #include <QMenu> #include <QMenuBar> #include <QMessageBox> -#include <QPlainTextEdit> -#include <QSplitter> -#include <QStatusBar> -#include <QTextEdit> -#include <QTreeView> - -#include <QFileInfo> -#include <QItemSelectionModel> #include <QMimeDatabase> #include <QMimeType> +#include <QSplitter> +#include <QStatusBar> MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) diff --git a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.h b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.h index 4554d0873d..04827529fa 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/mainwindow.h +++ b/examples/corelib/mimetypes/mimetypebrowser/mainwindow.h @@ -4,12 +4,11 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H +#include <QAction> #include <QMainWindow> #include <QModelIndexList> - -QT_FORWARD_DECLARE_CLASS(QAction) -QT_FORWARD_DECLARE_CLASS(QTextEdit) -QT_FORWARD_DECLARE_CLASS(QTreeView) +#include <QTextEdit> +#include <QTreeView> class MimetypeModel; diff --git a/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h index b1c84a7797..95451a35a6 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h +++ b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h @@ -4,10 +4,9 @@ #ifndef MIMETYPEMODEL_H #define MIMETYPEMODEL_H -#include <QStandardItemModel> #include <QHash> - -QT_FORWARD_DECLARE_CLASS(QMimeType) +#include <QMimeType> +#include <QStandardItemModel> class MimetypeModel : public QStandardItemModel { |