diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp index f975ecbd589..a4c8c9eff60 100644 --- a/src/plugins/android/androidsdkdownloader.cpp +++ b/src/plugins/android/androidsdkdownloader.cpp @@ -16,12 +16,9 @@ using namespace Utils; -namespace { -Q_LOGGING_CATEGORY(sdkDownloaderLog, "qtc.android.sdkDownloader", QtWarningMsg) -} +namespace { Q_LOGGING_CATEGORY(sdkDownloaderLog, "qtc.android.sdkDownloader", QtWarningMsg) } -namespace Android { -namespace Internal { +namespace Android::Internal { /** * @class SdkDownloader * @brief Download Android SDK tools package from within Qt Creator. @@ -194,5 +191,4 @@ void AndroidSdkDownloader::downloadFinished(QNetworkReply *reply) reply->deleteLater(); } -} // Internal -} // Android +} // namespace Android::Internal diff --git a/src/plugins/android/androidsdkdownloader.h b/src/plugins/android/androidsdkdownloader.h index ac1eef76070..3f14622ec5d 100644 --- a/src/plugins/android/androidsdkdownloader.h +++ b/src/plugins/android/androidsdkdownloader.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#ifndef ANDROIDSDKDOWNLOADER_H -#define ANDROIDSDKDOWNLOADER_H +#pragma once #include "androidconfigurations.h" @@ -15,8 +14,7 @@ class Archive; class FilePath; } -namespace Android { -namespace Internal { +namespace Android::Internal { class AndroidSdkDownloader : public QObject { @@ -57,7 +55,4 @@ private: std::unique_ptr m_archive; }; -} // Internal -} // Android - -#endif // ANDROIDSDKDOWNLOADER_H +} // namespace Android::Internal