feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Reorganize ReadOnlyFilesDialog

Browse Source 
Move exported class out of namespace Internal, but expose only a minimal
interface. Use Qt 5 connections, adjust callers and surrounding code.

Change-Id: I52b4156d78cd1ec42ec6c94994775ce74f24ebdc
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-20 21:52:56 +02:00
parent 0fcca946ad
commit 111f65b518
6 changed files with 155 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

236
src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
View File

@@ -52,10 +52,30 @@ namespace Internal {
class ReadOnlyFilesDialogPrivate
{
Q_DECLARE_TR_FUNCTIONS(Core::ReadOnlyFilesDialog)
public:
ReadOnlyFilesDialogPrivate(IDocument *document = 0, bool useSaveAs = false);
ReadOnlyFilesDialogPrivate(ReadOnlyFilesDialog *parent, IDocument *document = 0, bool useSaveAs = false);
~ReadOnlyFilesDialogPrivate();
enum ReadOnlyFilesTreeColumn {
MakeWritable = ReadOnlyFilesDialog::MakeWritable,
OpenWithVCS = ReadOnlyFilesDialog::OpenWithVCS,
SaveAs = ReadOnlyFilesDialog::SaveAs,
FileName = ReadOnlyFilesDialog::FileName,
Folder = ReadOnlyFilesDialog::Folder,
NumberOfColumns
};
void initDialog(const QStringList &fileNames);
void promptFailWarning(const QStringList &files, ReadOnlyFilesDialog::ReadOnlyResult type) const;
QRadioButton *createRadioButtonForItem(QTreeWidgetItem *item, QButtonGroup *group, ReadOnlyFilesTreeColumn type);
void setAll(int index);
void updateSelectAll();
ReadOnlyFilesDialog *q;
// Buttongroups containing the operation for one file.
struct ButtonGroupForFile
{
@@ -85,17 +105,20 @@ public:
QString makeWritableText;
QString versionControlOpenText;
const QString saveAsText;
Ui::ReadOnlyFilesDialog ui;
};
ReadOnlyFilesDialogPrivate::ReadOnlyFilesDialogPrivate(IDocument *document, bool displaySaveAs)
: useSaveAs(displaySaveAs)
ReadOnlyFilesDialogPrivate::ReadOnlyFilesDialogPrivate(ReadOnlyFilesDialog *parent, IDocument *document, bool displaySaveAs)
: q(parent)
, useSaveAs(displaySaveAs)
, useVCS(false)
, showWarnings(false)
, document(document)
, mixedText(ReadOnlyFilesDialog::tr("Mixed"))
, makeWritableText(ReadOnlyFilesDialog::tr("Make Writable"))
, versionControlOpenText(ReadOnlyFilesDialog::tr("Open with VCS"))
, saveAsText(ReadOnlyFilesDialog::tr("Save As"))
, mixedText(tr("Mixed"))
, makeWritableText(tr("Make Writable"))
, versionControlOpenText(tr("Open with VCS"))
, saveAsText(tr("Save As"))
{}
ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate()
@@ -104,6 +127,10 @@ ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate()
delete groupForFile.group;
}
} // namespace Internal
using namespace Internal;
/*!
* \class ReadOnlyFilesDialog
* \brief The ReadOnlyFilesDialog class implements a dialog to show a set of
@@ -117,43 +144,38 @@ ReadOnlyFilesDialogPrivate::~ReadOnlyFilesDialogPrivate()
ReadOnlyFilesDialog::ReadOnlyFilesDialog(const QList<QString> &fileNames, QWidget *parent)
: QDialog(parent)
, d(new ReadOnlyFilesDialogPrivate)
, ui(new Ui::ReadOnlyFilesDialog)
, d(new ReadOnlyFilesDialogPrivate(this))
{
initDialog(fileNames);
d->initDialog(fileNames);
}
ReadOnlyFilesDialog::ReadOnlyFilesDialog(const QString &fileName, QWidget *parent)
: QDialog(parent)
, d(new ReadOnlyFilesDialogPrivate)
, ui(new Ui::ReadOnlyFilesDialog)
, d(new ReadOnlyFilesDialogPrivate(this))
{
initDialog(QStringList() << fileName);
d->initDialog(QStringList(fileName));
}
ReadOnlyFilesDialog::ReadOnlyFilesDialog(IDocument *document, QWidget *parent,
bool displaySaveAs)
: QDialog(parent)
, d(new ReadOnlyFilesDialogPrivate(document, displaySaveAs))
, ui(new Ui::ReadOnlyFilesDialog)
, d(new ReadOnlyFilesDialogPrivate(this, document, displaySaveAs))
{
initDialog(QStringList() << document->filePath());
d->initDialog(QStringList(document->filePath()));
}
ReadOnlyFilesDialog::ReadOnlyFilesDialog(const QList<IDocument *> &documents, QWidget *parent)
: QDialog(parent)
, d(new ReadOnlyFilesDialogPrivate)
, ui(new Ui::ReadOnlyFilesDialog)
, d(new ReadOnlyFilesDialogPrivate(this))
{
QStringList files;
foreach (IDocument *document, documents)
files << document->filePath();
initDialog(files);
d->initDialog(files);
}
ReadOnlyFilesDialog::~ReadOnlyFilesDialog()
{
delete ui;
delete d;
}
@@ -163,7 +185,7 @@ ReadOnlyFilesDialog::~ReadOnlyFilesDialog()
*/
void ReadOnlyFilesDialog::setMessage(const QString &message)
{
ui->msgLabel->setText(message);
d->ui.msgLabel->setText(message);
}
/*!
@@ -181,7 +203,7 @@ void ReadOnlyFilesDialog::setShowFailWarning(bool show, const QString &warning)
* Opens a message box with an error description according to the type.
* \internal
*/
void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyResult type) const
void ReadOnlyFilesDialogPrivate::promptFailWarning(const QStringList &files, ReadOnlyFilesDialog::ReadOnlyResult type) const
{
if (files.isEmpty())
return;
@@ -191,49 +213,48 @@ void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyRe
if (files.count() == 1) {
const QString file = files.first();
switch (type) {
case RO_OpenVCS: {
if (IVersionControl *vc = d->versionControls[file]) {
case ReadOnlyFilesDialog::RO_OpenVCS: {
if (IVersionControl *vc = versionControls[file]) {
const QString openText = vc->vcsOpenText().remove(QLatin1Char('&'));
title = tr("Failed to %1 File").arg(openText);
message = tr("%1 file %2 from version control system %3 failed.")
.arg(openText)
.arg(QDir::toNativeSeparators(file))
.arg(vc->displayName());
message += QLatin1Char('\n');
message += d->failWarning;
.arg(vc->displayName())
+ QLatin1Char('\n')
+ failWarning;
} else {
title = tr("No Version Control System Found");
message = tr("Cannot open file %1 from version control system.\n"
"No version control system found.")
.arg(QDir::toNativeSeparators(file));
message += QLatin1Char('\n');
message += d->failWarning;
.arg(QDir::toNativeSeparators(file))
+ QLatin1Char('\n')
+ failWarning;;
}
break;
}
case RO_MakeWritable:
case ReadOnlyFilesDialog::RO_MakeWritable:
title = tr("Cannot Set Permissions");
message = tr("Cannot set permissions for %1 to writable.")
.arg(QDir::toNativeSeparators(file));
message += QLatin1Char('\n');
message += d->failWarning;
.arg(QDir::toNativeSeparators(file))
+ QLatin1Char('\n')
+ failWarning;
break;
case RO_SaveAs:
case ReadOnlyFilesDialog::RO_SaveAs:
title = tr("Cannot Save File");
message = tr("Cannot save file %1").arg(QDir::toNativeSeparators(file));
message += QLatin1Char('\n');
message += d->failWarning;
message = tr("Cannot save file %1").arg(QDir::toNativeSeparators(file))
+ QLatin1Char('\n')
+ failWarning;
break;
default:
title = tr("Canceled Changing Permissions");
message = d->failWarning;
message = failWarning;
break;
}
} else {
title = tr("Could Not Change Permissions on Some Files");
message = d->failWarning;
message += QLatin1Char('\n');
message += tr("See details for a complete list of files.");
message = failWarning + QLatin1Char('\n')
+ tr("See details for a complete list of files.");
details = files.join(QLatin1Char('\n'));
}
QMessageBox msgBox(QMessageBox::Warning, title, message,
@@ -289,7 +310,7 @@ int ReadOnlyFilesDialog::exec()
}
if (!failedToMakeWritable.isEmpty()) {
if (d->showWarnings)
promptFailWarning(failedToMakeWritable, result);
d->promptFailWarning(failedToMakeWritable, result);
}
return failedToMakeWritable.isEmpty() ? result : RO_Cancel;
}
@@ -300,14 +321,14 @@ int ReadOnlyFilesDialog::exec()
* Returns the created button.
* \internal
*/
QRadioButton* ReadOnlyFilesDialog::createRadioButtonForItem(QTreeWidgetItem *item, QButtonGroup *group,
ReadOnlyFilesDialog::ReadOnlyFilesTreeColumn type)
QRadioButton *ReadOnlyFilesDialogPrivate::createRadioButtonForItem(QTreeWidgetItem *item, QButtonGroup *group,
ReadOnlyFilesTreeColumn type)
{
QRadioButton *radioButton = new QRadioButton(this);
QRadioButton *radioButton = new QRadioButton(q);
group->addButton(radioButton, type);
item->setTextAlignment(type, Qt::AlignHCenter);
ui->treeWidget->setItemWidget(item, type, radioButton);
ui.treeWidget->setItemWidget(item, type, radioButton);
return radioButton;
}
@@ -316,23 +337,23 @@ QRadioButton* ReadOnlyFilesDialog::createRadioButtonForItem(QTreeWidgetItem *ite
* per file accordingly.
* \internal
*/
void ReadOnlyFilesDialog::setAll(int index)
void ReadOnlyFilesDialogPrivate::setAll(int index)
{
// If mixed is the current index, no need to change the user selection.
if (index == d->setAllIndexForOperation[-1/*mixed*/])
if (index == setAllIndexForOperation[-1/*mixed*/])
return;
// Get the selected type from the select all combo box.
ReadOnlyFilesTreeColumn type = NumberOfColumns;
if (index == d->setAllIndexForOperation[MakeWritable])
if (index == setAllIndexForOperation[MakeWritable])
type = MakeWritable;
else if (index == d->setAllIndexForOperation[OpenWithVCS])
else if (index == setAllIndexForOperation[OpenWithVCS])
type = OpenWithVCS;
else if (index == d->setAllIndexForOperation[SaveAs])
else if (index == setAllIndexForOperation[SaveAs])
type = SaveAs;
// Check for every file if the selected operation is available and change it to the operation.
foreach (ReadOnlyFilesDialogPrivate::ButtonGroupForFile groupForFile, d->buttonGroups) {
foreach (ReadOnlyFilesDialogPrivate::ButtonGroupForFile groupForFile, buttonGroups) {
QRadioButton *radioButton = qobject_cast<QRadioButton*> (groupForFile.group->button(type));
if (radioButton)
radioButton->setChecked(true);
@@ -344,18 +365,18 @@ void ReadOnlyFilesDialog::setAll(int index)
* the tree widget.
* \internal
*/
void ReadOnlyFilesDialog::updateSelectAll()
void ReadOnlyFilesDialogPrivate::updateSelectAll()
{
int selectedOperation = -1;
foreach (ReadOnlyFilesDialogPrivate::ButtonGroupForFile groupForFile, d->buttonGroups) {
foreach (ReadOnlyFilesDialogPrivate::ButtonGroupForFile groupForFile, buttonGroups) {
if (selectedOperation == -1) {
selectedOperation = groupForFile.group->checkedId();
} else if (selectedOperation != groupForFile.group->checkedId()) {
ui->setAll->setCurrentIndex(0);
ui.setAll->setCurrentIndex(0);
return;
}
}
ui->setAll->setCurrentIndex(d->setAllIndexForOperation[selectedOperation]);
ui.setAll->setCurrentIndex(setAllIndexForOperation[selectedOperation]);
}
/*!
@@ -365,11 +386,11 @@ void ReadOnlyFilesDialog::updateSelectAll()
* dialog.
* \internal
*/
void ReadOnlyFilesDialog::initDialog(const QStringList &fileNames)
void ReadOnlyFilesDialogPrivate::initDialog(const QStringList &fileNames)
{
ui->setupUi(this);
ui->buttonBox->addButton(tr("Change &Permission"), QDialogButtonBox::AcceptRole);
ui->buttonBox->addButton(QDialogButtonBox::Cancel);
ui.setupUi(q);
ui.buttonBox->addButton(tr("Change &Permission"), QDialogButtonBox::AcceptRole);
ui.buttonBox->addButton(QDialogButtonBox::Cancel);
QString vcsOpenTextForAll;
QString vcsMakeWritableTextForAll;
@@ -380,7 +401,7 @@ void ReadOnlyFilesDialog::initDialog(const QStringList &fileNames)
const QString directory = info.absolutePath();
// Setup a default entry with filename folder and make writable radio button.
QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeWidget);
QTreeWidgetItem *item = new QTreeWidgetItem(ui.treeWidget);
item->setText(FileName, visibleName);
item->setIcon(FileName, FileIconProvider::icon(fileName));
item->setText(Folder, Utils::FileUtils::shortNativePath(Utils::FileName(QFileInfo(directory))));
@@ -397,10 +418,10 @@ void ReadOnlyFilesDialog::initDialog(const QStringList &fileNames)
versionControlForFile->vcsOpenText().remove(QLatin1Char('&'));
const QString vcsMakeWritableTextforFile =
versionControlForFile->vcsMakeWritableText().remove(QLatin1Char('&'));
if (!d->useVCS) {
if (!useVCS) {
vcsOpenTextForAll = vcsOpenTextForFile;
vcsMakeWritableTextForAll = vcsMakeWritableTextforFile;
d->useVCS = true;
useVCS = true;
} else {
// If there are different open or make writable texts choose the default one.
if (vcsOpenTextForFile != vcsOpenTextForAll)
@@ -419,86 +440,87 @@ void ReadOnlyFilesDialog::initDialog(const QStringList &fileNames)
createRadioButtonForItem(item, radioButtonGroup, MakeWritable)->setChecked(true);
}
// Add a Save As radio button if requested.
if (d->useSaveAs)
if (useSaveAs)
createRadioButtonForItem(item, radioButtonGroup, SaveAs);
// If the file is managed by a version control system save the vcs for this file.
d->versionControls[fileName] = fileManagedByVCS ? versionControlForFile : 0;
versionControls[fileName] = fileManagedByVCS ? versionControlForFile : 0;
// Also save the buttongroup for every file to get the result for each entry.
ReadOnlyFilesDialogPrivate::ButtonGroupForFile groupForFile;
groupForFile.fileName = fileName;
groupForFile.group = radioButtonGroup;
d->buttonGroups.append(groupForFile);
connect(radioButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(updateSelectAll()));
buttonGroups.append(groupForFile);
QObject::connect(radioButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
[this](int) { updateSelectAll(); });
}
// Apply the Mac file dialog style.
if (Utils::HostOsInfo::isMacHost())
ui->treeWidget->setAlternatingRowColors(true);
ui.treeWidget->setAlternatingRowColors(true);
// Do not show any options to the user if he has no choice.
if (!d->useSaveAs && (!d->useVCS || !useMakeWritable)) {
ui->treeWidget->setColumnHidden(MakeWritable, true);
ui->treeWidget->setColumnHidden(OpenWithVCS, true);
ui->treeWidget->setColumnHidden(SaveAs, true);
ui->treeWidget->resizeColumnToContents(FileName);
ui->treeWidget->resizeColumnToContents(Folder);
ui->setAll->setVisible(false);
ui->setAllLabel->setVisible(false);
ui->verticalLayout->removeItem(ui->setAllLayout);
if (d->useVCS)
ui->msgLabel->setText(tr("The following files are not checked out yet.\n"
if (!useSaveAs && (useVCS || !useMakeWritable)) {
ui.treeWidget->setColumnHidden(MakeWritable, true);
ui.treeWidget->setColumnHidden(OpenWithVCS, true);
ui.treeWidget->setColumnHidden(SaveAs, true);
ui.treeWidget->resizeColumnToContents(FileName);
ui.treeWidget->resizeColumnToContents(Folder);
ui.setAll->setVisible(false);
ui.setAllLabel->setVisible(false);
ui.verticalLayout->removeItem(ui.setAllLayout);
if (useVCS)
ui.msgLabel->setText(tr("The following files are not checked out yet.\n"
"Do you want to check them out now?"));
return;
}
// If there is just one file entry, there is no need to show the select all combo box
if (fileNames.count() < 2) {
ui->setAll->setVisible(false);
ui->setAllLabel->setVisible(false);
ui->verticalLayout->removeItem(ui->setAllLayout);
ui.setAll->setVisible(false);
ui.setAllLabel->setVisible(false);
ui.verticalLayout->removeItem(ui.setAllLayout);
}
// Add items to the Set all combo box.
ui->setAll->addItem(d->mixedText);
d->setAllIndexForOperation[-1/*mixed*/] = ui->setAll->count() - 1;
if (d->useVCS) {
ui.setAll->addItem(mixedText);
setAllIndexForOperation[-1/*mixed*/] = ui.setAll->count() - 1;
if (useVCS) {
// If the files are managed by just one version control system, the Open and Make Writable
// text for the specific system is used.
if (!vcsOpenTextForAll.isEmpty() && vcsOpenTextForAll != d->versionControlOpenText) {
d->versionControlOpenText = vcsOpenTextForAll;
ui->treeWidget->headerItem()->setText(OpenWithVCS, d->versionControlOpenText);
if (!vcsOpenTextForAll.isEmpty() && vcsOpenTextForAll != versionControlOpenText) {
versionControlOpenText = vcsOpenTextForAll;
ui.treeWidget->headerItem()->setText(OpenWithVCS, versionControlOpenText);
}
if (!vcsMakeWritableTextForAll.isEmpty() && vcsMakeWritableTextForAll != d->makeWritableText) {
d->makeWritableText = vcsMakeWritableTextForAll;
ui->treeWidget->headerItem()->setText(MakeWritable, d->makeWritableText);
if (!vcsMakeWritableTextForAll.isEmpty() && vcsMakeWritableTextForAll != makeWritableText) {
makeWritableText = vcsMakeWritableTextForAll;
ui.treeWidget->headerItem()->setText(MakeWritable, makeWritableText);
}
ui->setAll->addItem(d->versionControlOpenText);
ui->setAll->setCurrentIndex(ui->setAll->count() - 1);
d->setAllIndexForOperation[OpenWithVCS] = ui->setAll->count() - 1;
ui.setAll->addItem(versionControlOpenText);
ui.setAll->setCurrentIndex(ui.setAll->count() - 1);
setAllIndexForOperation[OpenWithVCS] = ui.setAll->count() - 1;
}
if (useMakeWritable) {
ui->setAll->addItem(d->makeWritableText);
d->setAllIndexForOperation[MakeWritable] = ui->setAll->count() - 1;
if (ui->setAll->currentIndex() == -1)
ui->setAll->setCurrentIndex(ui->setAll->count() - 1);
ui.setAll->addItem(makeWritableText);
setAllIndexForOperation[MakeWritable] = ui.setAll->count() - 1;
if (ui.setAll->currentIndex() == -1)
ui.setAll->setCurrentIndex(ui.setAll->count() - 1);
}
if (d->useSaveAs) {
ui->setAll->addItem(d->saveAsText);
d->setAllIndexForOperation[SaveAs] = ui->setAll->count() - 1;
if (useSaveAs) {
ui.setAll->addItem(saveAsText);
setAllIndexForOperation[SaveAs] = ui.setAll->count() - 1;
}
connect(ui->setAll, SIGNAL(activated(int)), this, SLOT(setAll(int)));
QObject::connect(ui.setAll, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
[this](int index) { setAll(index); });
// Filter which columns should be visible and resize them to content.
for (int i = 0; i < NumberOfColumns; ++i) {
if ((i == SaveAs && !d->useSaveAs) || (i == OpenWithVCS && !d->useVCS)
if ((i == SaveAs && !useSaveAs) || (i == OpenWithVCS && !useVCS)
|| (i == MakeWritable && !useMakeWritable)) {
ui->treeWidget->setColumnHidden(i, true);
ui.treeWidget->setColumnHidden(i, true);
continue;
}
ui->treeWidget->resizeColumnToContents(i);
ui.treeWidget->resizeColumnToContents(i);
}
}
}// namespace Internal
}// namespace Core

28
src/plugins/coreplugin/dialogs/readonlyfilesdialog.h
View File

@@ -33,21 +33,12 @@
#include <coreplugin/core_global.h>
#include <QDialog>
#include <QHash>
QT_BEGIN_NAMESPACE
class QButtonGroup;
class QTreeWidgetItem;
class QRadioButton;
QT_END_NAMESPACE
namespace Core {
class IVersionControl;
class IDocument;
namespace Internal {
namespace Ui { class ReadOnlyFilesDialog; }
namespace Internal { class ReadOnlyFilesDialogPrivate; }
class CORE_EXPORT ReadOnlyFilesDialog : public QDialog
{
@@ -89,21 +80,10 @@ public:
int exec();
private:
void initDialog(const QStringList &fileNames);
void promptFailWarning(const QStringList &files, ReadOnlyResult type) const;
QRadioButton *createRadioButtonForItem(QTreeWidgetItem *item, QButtonGroup *group,
ReadOnlyFilesDialog::ReadOnlyFilesTreeColumn type);
private slots:
void setAll(int index);
void updateSelectAll();
private:
class ReadOnlyFilesDialogPrivate *d;
Ui::ReadOnlyFilesDialog *ui;
friend class Internal::ReadOnlyFilesDialogPrivate;
Internal::ReadOnlyFilesDialogPrivate *d;
};
} // namespace Internal
} // namespace Core
#endif // READONLYFILESDIALOG_H

2
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -609,7 +609,7 @@ static bool saveModifiedFilesHelper(const QList<IDocument *> &documents,
roDialog.setShowFailWarning(true, DocumentManager::tr(
"Could not save the files.",
"error message"));
if (roDialog.exec() == Core::Internal::ReadOnlyFilesDialog::RO_Cancel) {
if (roDialog.exec() == ReadOnlyFilesDialog::RO_Cancel) {
if (cancelled)
(*cancelled) = true;
if (failedToSave)

6
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -71,6 +71,8 @@
#include <QMessageBox>
#include <utils/QtConcurrentTools>
using namespace Core;
// Static cached data in struct QmakeNodeStaticData providing information and icons
// for file types and the project. Do some magic via qAddPostRoutine()
// to make sure the icons do not outlive QApplication, triggering warnings on X11.
@@ -1072,9 +1074,9 @@ ProjectExplorer::FolderNode::AddNewInformation QmakePriFileNode::addNewInformati
bool QmakePriFileNode::priFileWritable(const QString &path)
{
Core::Internal::ReadOnlyFilesDialog roDialog(path, Core::ICore::mainWindow());
ReadOnlyFilesDialog roDialog(path, ICore::mainWindow());
roDialog.setShowFailWarning(true);
return roDialog.exec() != Core::Internal::ReadOnlyFilesDialog::RO_Cancel;
return roDialog.exec() != ReadOnlyFilesDialog::RO_Cancel;
}
bool QmakePriFileNode::saveModifiedEditors()

4
src/plugins/texteditor/basefilefind.cpp
View File

@@ -376,9 +376,9 @@ QStringList BaseFileFind::replaceAll(const QString &text,
// Query the user for permissions
if (!roFiles.isEmpty()) {
Core::Internal::ReadOnlyFilesDialog roDialog(roFiles.toList(), ICore::mainWindow());
ReadOnlyFilesDialog roDialog(roFiles.toList(), ICore::mainWindow());
roDialog.setShowFailWarning(true, tr("Aborting replace."));
if (roDialog.exec() == Core::Internal::ReadOnlyFilesDialog::RO_Cancel)
if (roDialog.exec() == ReadOnlyFilesDialog::RO_Cancel)
return QStringList();
}

28
src/plugins/texteditor/refactoringchanges.cpp
View File

@@ -43,6 +43,9 @@
#include <QDebug>
#include <QApplication>
using namespace Core;
using namespace Utils;
namespace TextEditor {
RefactoringChanges::RefactoringChanges()
@@ -93,8 +96,8 @@ bool RefactoringChanges::createFile(const QString &fileName, const QString &cont
cursor.endEditBlock();
// Write the file to disk:
Utils::TextFileFormat format;
format.codec = Core::EditorManager::defaultTextCodec();
TextFileFormat format;
format.codec = EditorManager::defaultTextCodec();
QString error;
bool saveOk = format.writeFile(fileName, document->toPlainText(), &error);
delete document;
@@ -121,15 +124,14 @@ bool RefactoringChanges::removeFile(const QString &fileName) const
BaseTextEditorWidget *RefactoringChanges::openEditor(const QString &fileName, bool activate, int line, int column)
{
Core::EditorManager::OpenEditorFlags flags = Core::EditorManager::IgnoreNavigationHistory;
EditorManager::OpenEditorFlags flags = EditorManager::IgnoreNavigationHistory;
if (!activate)
flags |= Core::EditorManager::DoNotChangeCurrentEditor;
flags |= EditorManager::DoNotChangeCurrentEditor;
if (line != -1) {
// openEditorAt uses a 1-based line and a 0-based column!
column -= 1;
}
Core::IEditor *editor = Core::EditorManager::openEditorAt(
fileName, line, column, Core::Id(), flags);
IEditor *editor = EditorManager::openEditorAt(fileName, line, column, Id(), flags);
if (editor)
return qobject_cast<BaseTextEditorWidget *>(editor->widget());
@@ -177,7 +179,7 @@ RefactoringFile::RefactoringFile(const QString &fileName, const QSharedPointer<R
, m_editorCursorPosition(-1)
, m_appliedOnce(false)
{
QList<Core::IEditor *> editors = Core::DocumentModel::editorsForFilePath(fileName);
QList<IEditor *> editors = DocumentModel::editorsForFilePath(fileName);
if (!editors.isEmpty())
m_editor = qobject_cast<BaseTextEditorWidget *>(editors.first()->widget());
}
@@ -207,12 +209,12 @@ QTextDocument *RefactoringFile::mutableDocument() const
QString fileContents;
if (!m_fileName.isEmpty()) {
QString error;
QTextCodec *defaultCodec = Core::EditorManager::defaultTextCodec();
Utils::TextFileFormat::ReadResult result = Utils::TextFileFormat::readFile(
QTextCodec *defaultCodec = EditorManager::defaultTextCodec();
TextFileFormat::ReadResult result = TextFileFormat::readFile(
m_fileName, defaultCodec,
&fileContents, &m_textFileFormat,
&error);
if (result != Utils::TextFileFormat::ReadSuccess) {
if (result != TextFileFormat::ReadSuccess) {
qWarning() << "Could not read " << m_fileName << ". Error: " << error;
m_textFileFormat.codec = 0;
}
@@ -285,7 +287,7 @@ QString RefactoringFile::textOf(const Range &range) const
return textOf(range.start, range.end);
}
void RefactoringFile::setChangeSet(const Utils::ChangeSet &changeSet)
void RefactoringFile::setChangeSet(const ChangeSet &changeSet)
{
if (m_fileName.isEmpty())
return;
@@ -321,11 +323,11 @@ void RefactoringFile::apply()
// test file permissions
if (!QFileInfo(fileName()).isWritable()) {
const QString &path = fileName();
Core::Internal::ReadOnlyFilesDialog roDialog(path, Core::ICore::mainWindow());
ReadOnlyFilesDialog roDialog(path, ICore::mainWindow());
const QString &failDetailText = QApplication::translate("RefactoringFile::apply",
"Refactoring cannot be applied.");
roDialog.setShowFailWarning(true, failDetailText);
if (roDialog.exec() == Core::Internal::ReadOnlyFilesDialog::RO_Cancel)
if (roDialog.exec() == ReadOnlyFilesDialog::RO_Cancel)
return;
}