From 06988ea388386828d9a452acb67f663bc160e26d Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 5 May 2023 11:10:27 +0200 Subject: [PATCH] rsslisting example: Tidy up #include usage Replace one #include with a forward-declaration - in rsslisting.h QUrl is only passed by reference to a function. Shuffle order of existing forward declarations to be alphabetic, in the process. Shuffle #include order in sources so that this example's own headers appear before the Qt ones. Task-number: QTBUG-111228 Change-Id: I69a9e091c77f9d3190c0217c8bd9262e056f66fc Reviewed-by: Marc Mutz Reviewed-by: Ivan Solovev Reviewed-by: Alex Blasche (cherry picked from commit 3cdc65c2ecc97b9149782bc2b7639d26f5074056) --- examples/corelib/serialization/rsslisting/main.cpp | 3 +-- examples/corelib/serialization/rsslisting/rsslisting.cpp | 3 +-- examples/corelib/serialization/rsslisting/rsslisting.h | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/examples/corelib/serialization/rsslisting/main.cpp b/examples/corelib/serialization/rsslisting/main.cpp index 7e0089c4681..99862bac775 100644 --- a/examples/corelib/serialization/rsslisting/main.cpp +++ b/examples/corelib/serialization/rsslisting/main.cpp @@ -7,9 +7,8 @@ main.cpp Provides the main function for the RSS news reader example. */ -#include - #include "rsslisting.h" +#include /*! Create an application and a main widget. Open the main widget for diff --git a/examples/corelib/serialization/rsslisting/rsslisting.cpp b/examples/corelib/serialization/rsslisting/rsslisting.cpp index e6667ed664d..1b9339f66ce 100644 --- a/examples/corelib/serialization/rsslisting/rsslisting.cpp +++ b/examples/corelib/serialization/rsslisting/rsslisting.cpp @@ -16,13 +16,12 @@ data to an XML reader in pieces. This allows the user to interrupt its operation, and also allows very large data sources to be read. */ +#include "rsslisting.h" #include #include #include -#include "rsslisting.h" - /* Constructs an RSSListing widget with a simple user interface, and sets up the XML reader to use a custom handler class. diff --git a/examples/corelib/serialization/rsslisting/rsslisting.h b/examples/corelib/serialization/rsslisting/rsslisting.h index 64e60eff7bc..a7fd5a857d2 100644 --- a/examples/corelib/serialization/rsslisting/rsslisting.h +++ b/examples/corelib/serialization/rsslisting/rsslisting.h @@ -8,14 +8,13 @@ #include #include #include -#include - QT_BEGIN_NAMESPACE class QLineEdit; +class QPushButton; class QTreeWidget; class QTreeWidgetItem; -class QPushButton; +class QUrl; QT_END_NAMESPACE class RSSListing : public QWidget