From b83736be05e8ba4bcc586ff276ce81f992e0ef76 Mon Sep 17 00:00:00 2001 From: Rym Bouabid Date: Wed, 13 Sep 2023 17:12:20 +0200 Subject: [PATCH] Revamp Local Fortune Client Example: Fix include order Fix include order to respect the Coding Conventions. Include individual headers instead of "generic" headers. Remove QT_{BEGIN,END}_NAMESPACE because these are private Qt macros that should not be used in the examples. Task-number: QTBUG-117036 Pick-to: 6.6 6.5 Change-Id: I33f9c54098824bfcfacac7c2f624554e105a291a Reviewed-by: Ivan Solovev --- examples/corelib/ipc/localfortuneclient/client.cpp | 9 ++++++--- examples/corelib/ipc/localfortuneclient/client.h | 11 ++++------- examples/corelib/ipc/localfortuneclient/main.cpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/corelib/ipc/localfortuneclient/client.cpp b/examples/corelib/ipc/localfortuneclient/client.cpp index 31f8cf475bb..44981400d03 100644 --- a/examples/corelib/ipc/localfortuneclient/client.cpp +++ b/examples/corelib/ipc/localfortuneclient/client.cpp @@ -1,11 +1,14 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include -#include - #include "client.h" +#include +#include +#include +#include +#include + Client::Client(QWidget *parent) : QDialog(parent), hostLineEdit(new QLineEdit("fortune")), diff --git a/examples/corelib/ipc/localfortuneclient/client.h b/examples/corelib/ipc/localfortuneclient/client.h index c7275252fef..b4c949a21a1 100644 --- a/examples/corelib/ipc/localfortuneclient/client.h +++ b/examples/corelib/ipc/localfortuneclient/client.h @@ -4,15 +4,12 @@ #ifndef CLIENT_H #define CLIENT_H -#include #include +#include +#include +#include #include - -QT_BEGIN_NAMESPACE -class QLabel; -class QLineEdit; -class QPushButton; -QT_END_NAMESPACE +#include class Client : public QDialog { diff --git a/examples/corelib/ipc/localfortuneclient/main.cpp b/examples/corelib/ipc/localfortuneclient/main.cpp index 3c2a7b284ca..f52807ec48b 100644 --- a/examples/corelib/ipc/localfortuneclient/main.cpp +++ b/examples/corelib/ipc/localfortuneclient/main.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include - #include "client.h" +#include + int main(int argc, char *argv[]) { QApplication app(argc, argv);