Move RemoveFileDialog to Utils

Change-Id: I88892fc8d43ca3f59598b5b44e0daac0bfb439b5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

9 files changed, 24 insertions, 22 deletions

diff --git a/src/plugins/coreplugin/removefiledialog.cpp b/src/libs/utils/removefiledialog.cpp
index b7e6af6942..0d2208cff8 100644
--- a/src/plugins/coreplugin/removefiledialog.cpp
+++ b/src/libs/utils/removefiledialog.cpp
@@ -28,7 +28,7 @@
 
 #include <QDir>
 
-using namespace Core;
+namespace Utils {
 
 RemoveFileDialog::RemoveFileDialog(const QString &filePath, QWidget *parent) :
     QDialog(parent),
@@ -55,3 +55,5 @@ bool RemoveFileDialog::isDeleteFileChecked() const
 {
     return m_ui->deleteFileCheckBox->isChecked();
 }
+
+} // Utils
diff --git a/src/plugins/coreplugin/removefiledialog.h b/src/libs/utils/removefiledialog.h
index f79dc82e02..459917e1f8 100644
--- a/src/plugins/coreplugin/removefiledialog.h
+++ b/src/libs/utils/removefiledialog.h
@@ -25,15 +25,15 @@
 
 #pragma once
 
-#include "core_global.h"
+#include "utils_global.h"
 
 #include <QDialog>
 
-namespace Core {
+namespace Utils {
 
 namespace Ui { class RemoveFileDialog; }
 
-class CORE_EXPORT RemoveFileDialog : public QDialog
+class QTCREATOR_UTILS_EXPORT RemoveFileDialog : public QDialog
 {
     Q_OBJECT
 
@@ -48,4 +48,4 @@ private:
     Ui::RemoveFileDialog *m_ui;
 };
 
-} // namespace Core
+} // namespace Utils
diff --git a/src/plugins/coreplugin/removefiledialog.ui b/src/libs/utils/removefiledialog.ui
index 1c89bc6e36..88314065b8 100644
--- a/src/plugins/coreplugin/removefiledialog.ui
+++ b/src/libs/utils/removefiledialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Core::RemoveFileDialog</class>
- <widget class="QDialog" name="Core::RemoveFileDialog">
+ <class>Utils::RemoveFileDialog</class>
+ <widget class="QDialog" name="Utils::RemoveFileDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -107,7 +107,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>Core::RemoveFileDialog</receiver>
+   <receiver>Utils::RemoveFileDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -123,7 +123,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>Core::RemoveFileDialog</receiver>
+   <receiver>Utils::RemoveFileDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 268ab2597d..e64adf9c90 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -120,7 +120,8 @@ SOURCES += \
     $$PWD/textutils.cpp \
     $$PWD/url.cpp \
     $$PWD/filecrumblabel.cpp \
-    $$PWD/fixedsizeclicklabel.cpp
+    $$PWD/fixedsizeclicklabel.cpp \
+    $$PWD/removefiledialog.cpp
 
 win32:SOURCES += $$PWD/consoleprocess_win.cpp
 else:SOURCES += $$PWD/consoleprocess_unix.cpp
@@ -256,12 +257,14 @@ HEADERS += \
     $$PWD/filecrumblabel.h \
     $$PWD/linecolumn.h \
     $$PWD/link.h \
-    $$PWD/fixedsizeclicklabel.h
+    $$PWD/fixedsizeclicklabel.h \
+    $$PWD/removefiledialog.h
 
 FORMS += $$PWD/filewizardpage.ui \
-    $$PWD/projectintropage.ui \
     $$PWD/newclasswidget.ui \
-    $$PWD/proxycredentialsdialog.ui
+    $$PWD/projectintropage.ui \
+    $$PWD/proxycredentialsdialog.ui \
+    $$PWD/removefiledialog.ui
 
 RESOURCES += $$PWD/utils.qrc
 
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 5606c114ba..61895256cf 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -193,6 +193,7 @@ Project {
             "qtcprocess.h",
             "reloadpromptutils.cpp",
             "reloadpromptutils.h",
+            "removefiledialog.cpp", "removefiledialog.h", "removefiledialog.ui",
             "runextensions.cpp",
             "runextensions.h",
             "savedaction.cpp",
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 5e6e934b76..dd6f03bdaa 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -100,7 +100,6 @@ SOURCES += corejsextensions.cpp \
     idocumentfactory.cpp \
     textdocument.cpp \
     documentmanager.cpp \
-    removefiledialog.cpp \
     iversioncontrol.cpp \
     dialogs/addtovcsdialog.cpp \
     ioutputpane.cpp \
@@ -214,7 +213,6 @@ HEADERS += corejsextensions.h \
     idocumentfactory.h \
     textdocument.h \
     documentmanager.h \
-    removefiledialog.h \
     dialogs/addtovcsdialog.h \
     patchtool.h \
     windowsupport.h \
@@ -234,7 +232,6 @@ FORMS += dialogs/newdialog.ui \
     dialogs/externaltoolconfig.ui \
     mimetypesettingspage.ui \
     mimetypemagicdialog.ui \
-    removefiledialog.ui \
     dialogs/addtovcsdialog.ui \
     systemsettings.ui
 
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 02ae8a768d..eabf668df7 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -89,7 +89,6 @@ Project {
                 "patchtool.cpp", "patchtool.h",
                 "plugindialog.cpp", "plugindialog.h",
                 "reaper.cpp", "reaper.h", "reaper_p.h",
-                "removefiledialog.cpp", "removefiledialog.h", "removefiledialog.ui",
                 "rightpane.cpp", "rightpane.h",
                 "settingsdatabase.cpp", "settingsdatabase.h",
                 "shellcommand.cpp", "shellcommand.h",
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index a8e98d32a6..31054027fb 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -113,7 +113,6 @@
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/fileutils.h>
-#include <coreplugin/removefiledialog.h>
 #include <coreplugin/diffservice.h>
 #include <texteditor/findinfiles.h>
 #include <texteditor/textdocument.h>
@@ -128,6 +127,7 @@
 #include <utils/parameteraction.h>
 #include <utils/processhandle.h>
 #include <utils/qtcassert.h>
+#include <utils/removefiledialog.h>
 #include <utils/stringutils.h>
 #include <utils/utilsicons.h>
 
@@ -3221,7 +3221,7 @@ void ProjectExplorerPluginPrivate::removeProject()
         return;
     ProjectNode *projectNode = subProjectNode->managingProject();
     if (projectNode) {
-        RemoveFileDialog removeFileDialog(subProjectNode->filePath().toString(), ICore::mainWindow());
+        Utils::RemoveFileDialog removeFileDialog(subProjectNode->filePath().toString(), ICore::mainWindow());
         removeFileDialog.setDeleteFileVisible(false);
         if (removeFileDialog.exec() == QDialog::Accepted)
             projectNode->removeSubProject(subProjectNode->filePath().toString());
@@ -3262,7 +3262,7 @@ void ProjectExplorerPluginPrivate::removeFile()
     QTC_ASSERT(currentNode && currentNode->nodeType() == NodeType::File, return);
 
     const Utils::FileName filePath = currentNode->filePath();
-    RemoveFileDialog removeFileDialog(filePath.toString(), ICore::mainWindow());
+    Utils::RemoveFileDialog removeFileDialog(filePath.toString(), ICore::mainWindow());
 
     if (removeFileDialog.exec() == QDialog::Accepted) {
         const bool deleteFile = removeFileDialog.isDeleteFileChecked();
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index 5e17105cfa..a38a94da52 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -28,10 +28,10 @@
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/fileutils.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/removefiledialog.h>
 #include <coreplugin/vcsmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/fileutils.h>
+#include <utils/removefiledialog.h>
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -1234,7 +1234,7 @@ EntryBackup * RelativeResourceModel::removeEntry(const QModelIndex &index)
             deleteItem(index);
             return new FileEntryBackup(*this, prefixIndex.row(), index.row(), fileNameBackup, aliasBackup);
         }
-        Core::RemoveFileDialog removeFileDialog(fileNameBackup, Core::ICore::mainWindow());
+        Utils::RemoveFileDialog removeFileDialog(fileNameBackup, Core::ICore::mainWindow());
         if (removeFileDialog.exec() == QDialog::Accepted) {
             deleteItem(index);
             Core::FileUtils::removeFile(fileNameBackup, removeFileDialog.isDeleteFileChecked());