From 7cba5fc48222b3bd34a0aa77261a7fc452006f35 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 8 Dec 2017 13:42:19 +0100 Subject: [PATCH] Move RemoveFileDialog to Utils Change-Id: I88892fc8d43ca3f59598b5b44e0daac0bfb439b5 Reviewed-by: Tobias Hunger --- .../coreplugin => libs/utils}/removefiledialog.cpp | 4 +++- .../coreplugin => libs/utils}/removefiledialog.h | 8 ++++---- .../coreplugin => libs/utils}/removefiledialog.ui | 8 ++++---- src/libs/utils/utils-lib.pri | 11 +++++++---- src/libs/utils/utils.qbs | 1 + src/plugins/coreplugin/coreplugin.pro | 3 --- src/plugins/coreplugin/coreplugin.qbs | 1 - src/plugins/projectexplorer/projectexplorer.cpp | 6 +++--- src/plugins/resourceeditor/qrceditor/resourcefile.cpp | 4 ++-- 9 files changed, 24 insertions(+), 22 deletions(-) rename src/{plugins/coreplugin => libs/utils}/removefiledialog.cpp (98%) rename src/{plugins/coreplugin => libs/utils}/removefiledialog.h (92%) rename src/{plugins/coreplugin => libs/utils}/removefiledialog.ui (94%) diff --git a/src/plugins/coreplugin/removefiledialog.cpp b/src/libs/utils/removefiledialog.cpp similarity index 98% rename from src/plugins/coreplugin/removefiledialog.cpp rename to src/libs/utils/removefiledialog.cpp index b7e6af6942e..0d2208cff86 100644 --- a/src/plugins/coreplugin/removefiledialog.cpp +++ b/src/libs/utils/removefiledialog.cpp @@ -28,7 +28,7 @@ #include -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 similarity index 92% rename from src/plugins/coreplugin/removefiledialog.h rename to src/libs/utils/removefiledialog.h index f79dc82e025..459917e1f85 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 -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 similarity index 94% rename from src/plugins/coreplugin/removefiledialog.ui rename to src/libs/utils/removefiledialog.ui index 1c89bc6e366..88314065b8f 100644 --- a/src/plugins/coreplugin/removefiledialog.ui +++ b/src/libs/utils/removefiledialog.ui @@ -1,7 +1,7 @@ - Core::RemoveFileDialog - + Utils::RemoveFileDialog + 0 @@ -107,7 +107,7 @@ buttonBox accepted() - Core::RemoveFileDialog + Utils::RemoveFileDialog accept() @@ -123,7 +123,7 @@ buttonBox rejected() - Core::RemoveFileDialog + Utils::RemoveFileDialog reject() diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 268ab2597db..e64adf9c90d 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 5606c114ba3..61895256cf2 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 5e6e934b762..dd6f03bdaa7 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 02ae8a768d5..eabf668df71 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 a8e98d32a67..31054027fb5 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -113,7 +113,6 @@ #include #include #include -#include #include #include #include @@ -128,6 +127,7 @@ #include #include #include +#include #include #include @@ -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 5e17105cfa6..a38a94da52a 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -28,10 +28,10 @@ #include #include #include -#include #include #include #include +#include #include #include @@ -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());