diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index 1e9affd09fd..357ca1f85b9 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -10,7 +10,6 @@ add_qtc_library(Utils ansiescapecodehandler.cpp ansiescapecodehandler.h appinfo.cpp appinfo.h appmainwindow.cpp appmainwindow.h - archive.cpp archive.h aspects.cpp aspects.h async.cpp async.h basetreeview.cpp basetreeview.h @@ -186,6 +185,7 @@ add_qtc_library(Utils transientscroll.cpp transientscroll.h treemodel.cpp treemodel.h treeviewcombobox.cpp treeviewcombobox.h + unarchiver.cpp unarchiver.h uncommentselection.cpp uncommentselection.h uniqueobjectptr.h unixutils.cpp unixutils.h diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/unarchiver.cpp similarity index 99% rename from src/libs/utils/archive.cpp rename to src/libs/utils/unarchiver.cpp index 5086ce5358b..b7a43017178 100644 --- a/src/libs/utils/archive.cpp +++ b/src/libs/utils/unarchiver.cpp @@ -1,7 +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 -#include "archive.h" +#include "unarchiver.h" #include "algorithm.h" #include "mimeutils.h" diff --git a/src/libs/utils/archive.h b/src/libs/utils/unarchiver.h similarity index 100% rename from src/libs/utils/archive.h rename to src/libs/utils/unarchiver.h diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index f9e22e82bfd..da82da0608c 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -47,8 +47,6 @@ Project { "appinfo.h", "appmainwindow.cpp", "appmainwindow.h", - "archive.cpp", - "archive.h", "aspects.cpp", "aspects.h", "async.cpp", @@ -333,6 +331,8 @@ Project { "treeviewcombobox.h", "headerviewstretcher.cpp", "headerviewstretcher.h", + "unarchiver.cpp", + "unarchiver.h", "uncommentselection.cpp", "uncommentselection.h", "uniqueobjectptr.h", diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp index 8f2821160da..4e465514622 100644 --- a/src/plugins/android/androidsdkdownloader.cpp +++ b/src/plugins/android/androidsdkdownloader.cpp @@ -7,9 +7,9 @@ #include -#include #include #include +#include #include diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp index 9aa067a45ca..d58e02e7518 100644 --- a/src/plugins/coreplugin/plugininstallwizard.cpp +++ b/src/plugins/coreplugin/plugininstallwizard.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include #include @@ -20,6 +19,7 @@ #include #include #include +#include #include #include diff --git a/src/plugins/qmldesigner/utils/fileextractor.cpp b/src/plugins/qmldesigner/utils/fileextractor.cpp index bbea7edc2cb..11827fca021 100644 --- a/src/plugins/qmldesigner/utils/fileextractor.cpp +++ b/src/plugins/qmldesigner/utils/fileextractor.cpp @@ -8,9 +8,9 @@ #include #include -#include #include #include +#include using namespace Utils; diff --git a/src/plugins/studiowelcome/examplecheckout.cpp b/src/plugins/studiowelcome/examplecheckout.cpp index c22156a91c7..52ad72ce8a8 100644 --- a/src/plugins/studiowelcome/examplecheckout.cpp +++ b/src/plugins/studiowelcome/examplecheckout.cpp @@ -11,10 +11,10 @@ #include #include -#include #include #include #include +#include #include