diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-08-25 17:28:59 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-09-03 16:54:03 +0200 |
| commit | b8b2568ae6ecd6c44e624ef4aa70aaa06529eb93 (patch) | |
| tree | 70f98797b775e971dca331ed224538adb5444dc1 /src | |
| parent | ae37f7679ec0ec6c50f8804e5c99d0a2f03d01a8 (diff) | |
| download | qt-creator-b8b2568ae6ecd6c44e624ef4aa70aaa06529eb93.tar.gz | |
Core: Export PromptOverwriteDialog
This is necessary since the JsonWizard will need to trigger this dialog, too.
Change-Id: Ic8eebc77282a620b13c227890b5f1861a31a2b20
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/coreplugin/basefilewizardfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/coreplugin/dialogs/promptoverwritedialog.h | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp index c4c5bc1cae..d60ee34f24 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.cpp +++ b/src/plugins/coreplugin/basefilewizardfactory.cpp @@ -420,7 +420,7 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge return OverwriteError; } // Prompt to overwrite existing files. - Internal::PromptOverwriteDialog overwriteDialog; + PromptOverwriteDialog overwriteDialog; // Scripts cannot handle overwrite overwriteDialog.setFiles(existingFiles); foreach (const GeneratedFile &file, *files) diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp index fae5f0d210..6c71481f1a 100644 --- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp +++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp @@ -57,7 +57,6 @@ static inline QString fileNameOfItem(const QStandardItem *item) } namespace Core { -namespace Internal { PromptOverwriteDialog::PromptOverwriteDialog(QWidget *parent) : QDialog(parent), @@ -157,5 +156,4 @@ bool PromptOverwriteDialog::isFileChecked(const QString &f) const return false; } -} // namespace Internal } // namespace Core diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h index efc09d9ebe..d3905eda7a 100644 --- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h +++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h @@ -30,6 +30,8 @@ #ifndef PROMPTOVERWRITEDIALOG_H #define PROMPTOVERWRITEDIALOG_H +#include "../core_global.h" + #include <QDialog> QT_BEGIN_NAMESPACE @@ -40,10 +42,9 @@ class QLabel; QT_END_NAMESPACE namespace Core { -namespace Internal { // Documentation inside. -class PromptOverwriteDialog : public QDialog +class CORE_EXPORT PromptOverwriteDialog : public QDialog { Q_OBJECT public: @@ -69,7 +70,6 @@ private: QStandardItemModel *m_model; }; -} // namespace Internal } // namespace Core #endif // PROMPTOVERWRITEDIALOG_H |