diff options
| author | Rym Bouabid <rym.bouabid@qt.io> | 2023-09-13 17:12:20 +0200 |
|---|---|---|
| committer | Rym Bouabid <rym.bouabid@qt.io> | 2023-09-20 20:36:31 +0200 |
| commit | b83736be05e8ba4bcc586ff276ce81f992e0ef76 (patch) | |
| tree | e3143bc44dff1c0250c03ce9fff827e2d863ae64 | |
| parent | fedb1f5b76ea2c5961f21e7ab1e2cf07c71f2a9d (diff) | |
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 <ivan.solovev@qt.io>
| -rw-r--r-- | examples/corelib/ipc/localfortuneclient/client.cpp | 9 | ||||
| -rw-r--r-- | examples/corelib/ipc/localfortuneclient/client.h | 11 | ||||
| -rw-r--r-- | 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 31f8cf475b..44981400d0 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 <QtWidgets> -#include <QtNetwork> - #include "client.h" +#include <QDialogButtonBox> +#include <QGridLayout> +#include <QGuiApplication> +#include <QMessageBox> +#include <QTimer> + 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 c7275252fe..b4c949a21a 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 <QDialog> #include <QDataStream> +#include <QDialog> +#include <QLabel> +#include <QLineEdit> #include <QLocalSocket> - -QT_BEGIN_NAMESPACE -class QLabel; -class QLineEdit; -class QPushButton; -QT_END_NAMESPACE +#include <QPushButton> class Client : public QDialog { diff --git a/examples/corelib/ipc/localfortuneclient/main.cpp b/examples/corelib/ipc/localfortuneclient/main.cpp index 3c2a7b284c..f52807ec48 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 <QApplication> - #include "client.h" +#include <QApplication> + int main(int argc, char *argv[]) { QApplication app(argc, argv); |