1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revamp MIME Type Browser Ex: Fix includes

Browse Source 
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.5
Change-Id: Iba7a4726180ec97d9654ed3b934baca8c1df0b5c
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 00d8d566c65209130cce2c2cb710bebc4beaf438)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Rym Bouabid 2023-09-18 16:15:37 +02:00 committed by Qt Cherry-pick Bot
parent 77f336ab7f
commit 2b5c7b2e25
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/corelib/mimetypes/mimetypebrowser/main.cpp
View File

@ -4,10 +4,8 @@
#include "mainwindow.h" #include "mainwindow.h"
#include <QApplication> #include <QApplication>
#include <QScreen>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCommandLineOption> #include <QScreen>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

13
examples/corelib/mimetypes/mimetypebrowser/mainwindow.cpp
View File

@ -4,23 +4,18 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "mimetypemodel.h" #include "mimetypemodel.h"
#include <QAction>
#include <QApplication> #include <QApplication>
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo>
#include <QInputDialog> #include <QInputDialog>
#include <QItemSelectionModel>
#include <QMenu> #include <QMenu>
#include <QMenuBar> #include <QMenuBar>
#include <QMessageBox> #include <QMessageBox>
#include <QPlainTextEdit>
#include <QSplitter>
#include <QStatusBar>
#include <QTextEdit>
#include <QTreeView>
#include <QFileInfo>
#include <QItemSelectionModel>
#include <QMimeDatabase> #include <QMimeDatabase>
#include <QMimeType> #include <QMimeType>
#include <QSplitter>
#include <QStatusBar>
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)

7
examples/corelib/mimetypes/mimetypebrowser/mainwindow.h
View File

@ -4,12 +4,11 @@
#ifndef MAINWINDOW_H #ifndef MAINWINDOW_H
#define MAINWINDOW_H #define MAINWINDOW_H
#include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QModelIndexList> #include <QModelIndexList>
#include <QTextEdit>
QT_FORWARD_DECLARE_CLASS(QAction) #include <QTreeView>
QT_FORWARD_DECLARE_CLASS(QTextEdit)
QT_FORWARD_DECLARE_CLASS(QTreeView)
class MimetypeModel; class MimetypeModel;

5
examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.h
View File

@ -4,10 +4,9 @@
#ifndef MIMETYPEMODEL_H #ifndef MIMETYPEMODEL_H
#define MIMETYPEMODEL_H #define MIMETYPEMODEL_H
#include <QStandardItemModel>
#include <QHash> #include <QHash>
#include <QMimeType>
QT_FORWARD_DECLARE_CLASS(QMimeType) #include <QStandardItemModel>
class MimetypeModel : public QStandardItemModel class MimetypeModel : public QStandardItemModel
{ {