summaryrefslogtreecommitdiff
path: root/src/plugins/designer
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/designer')
-rw-r--r--src/plugins/designer/formeditorplugin.cpp6
-rw-r--r--src/plugins/designer/formwindowfile.cpp38
-rw-r--r--src/plugins/designer/formwindowfile.h8
-rw-r--r--src/plugins/designer/qtcreatorintegration.cpp2
4 files changed, 27 insertions, 27 deletions
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 9a912ac68e..05e46e23a4 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -106,9 +106,9 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
const QString locale = ICore::userInterfaceLanguage();
if (!locale.isEmpty()) {
auto qtr = new QTranslator(this);
- const QString &creatorTrPath = ICore::resourcePath() + "/translations";
- const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
- const QString &trFile = "designer_" + locale;
+ const QString creatorTrPath = ICore::resourcePath("translations").toString();
+ const QString qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+ const QString trFile = "designer_" + locale;
if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
QCoreApplication::installTranslator(qtr);
}
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index 7e85f13e47..5744256813 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -65,51 +65,51 @@ FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *pare
m_resourceHandler, &ResourceHandler::updateResources);
}
-Core::IDocument::OpenResult FormWindowFile::open(QString *errorString, const QString &fileName,
- const QString &realFileName)
+Core::IDocument::OpenResult FormWindowFile::open(QString *errorString,
+ const Utils::FilePath &filePath,
+ const Utils::FilePath &realFilePath)
{
if (Designer::Constants::Internal::debug)
- qDebug() << "FormWindowFile::open" << fileName;
+ qDebug() << "FormWindowFile::open" << filePath.toUserOutput();
QDesignerFormWindowInterface *form = formWindow();
QTC_ASSERT(form, return OpenResult::CannotHandle);
- if (fileName.isEmpty())
+ if (filePath.isEmpty())
return OpenResult::ReadError;
- const QFileInfo fi(fileName);
- const QString absfileName = fi.absoluteFilePath();
-
QString contents;
- Utils::TextFileFormat::ReadResult readResult = read(absfileName, &contents, errorString);
+ Utils::TextFileFormat::ReadResult readResult = read(filePath.absoluteFilePath(),
+ &contents,
+ errorString);
if (readResult == Utils::TextFileFormat::ReadEncodingError)
return OpenResult::CannotHandle;
if (readResult != Utils::TextFileFormat::ReadSuccess)
return OpenResult::ReadError;
- form->setFileName(absfileName);
+ form->setFileName(filePath.absoluteFilePath().toString());
const QByteArray contentsBA = contents.toUtf8();
QBuffer str;
str.setData(contentsBA);
str.open(QIODevice::ReadOnly);
if (!form->setContents(&str, errorString))
return OpenResult::CannotHandle;
- form->setDirty(fileName != realFileName);
+ form->setDirty(filePath != realFilePath);
syncXmlFromFormWindow();
- setFilePath(Utils::FilePath::fromString(absfileName));
+ setFilePath(filePath.absoluteFilePath());
setShouldAutoSave(false);
resourceHandler()->updateProjectResources();
return OpenResult::Success;
}
-bool FormWindowFile::save(QString *errorString, const QString &name, bool autoSave)
+bool FormWindowFile::save(QString *errorString, const FilePath &filePath, bool autoSave)
{
- const FilePath actualName = name.isEmpty() ? filePath() : FilePath::fromString(name);
+ const FilePath &actualName = filePath.isEmpty() ? this->filePath() : filePath;
if (Designer::Constants::Internal::debug)
- qDebug() << Q_FUNC_INFO << name << "->" << actualName;
+ qDebug() << Q_FUNC_INFO << filePath << "->" << actualName;
QTC_ASSERT(m_formWindow, return false);
@@ -119,7 +119,7 @@ bool FormWindowFile::save(QString *errorString, const QString &name, bool autoSa
const QString oldFormName = m_formWindow->fileName();
if (!autoSave)
m_formWindow->setFileName(actualName.toString());
- const bool writeOK = writeFile(actualName.toString(), errorString);
+ const bool writeOK = writeFile(actualName, errorString);
m_shouldAutoSave = false;
if (autoSave)
return writeOK;
@@ -228,7 +228,7 @@ bool FormWindowFile::reload(QString *errorString, ReloadFlag flag, ChangeType ty
} else {
emit aboutToReload();
const bool success
- = (open(errorString, filePath().toString(), filePath().toString()) == OpenResult::Success);
+ = (open(errorString, filePath(), filePath()) == OpenResult::Success);
emit reloadFinished(success);
return success;
}
@@ -247,11 +247,11 @@ QString FormWindowFile::fallbackSaveAsFileName() const
return m_suggestedName;
}
-bool FormWindowFile::writeFile(const QString &fn, QString *errorString) const
+bool FormWindowFile::writeFile(const Utils::FilePath &filePath, QString *errorString) const
{
if (Designer::Constants::Internal::debug)
- qDebug() << Q_FUNC_INFO << filePath() << fn;
- return write(fn, format(), m_formWindow->contents(), errorString);
+ qDebug() << Q_FUNC_INFO << this->filePath() << filePath;
+ return write(filePath, format(), m_formWindow->contents(), errorString);
}
QDesignerFormWindowInterface *FormWindowFile::formWindow() const
diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h
index d5791e7461..ca0ad50b3f 100644
--- a/src/plugins/designer/formwindowfile.h
+++ b/src/plugins/designer/formwindowfile.h
@@ -48,9 +48,9 @@ public:
~FormWindowFile() override { }
// IDocument
- OpenResult open(QString *errorString, const QString &fileName,
- const QString &realFileName) override;
- bool save(QString *errorString, const QString &fileName, bool autoSave) override;
+ OpenResult open(QString *errorString, const Utils::FilePath &filePath,
+ const Utils::FilePath &realFilePath) override;
+ bool save(QString *errorString, const Utils::FilePath &filePath, bool autoSave) override;
QByteArray contents() const override;
bool setContents(const QByteArray &contents) override;
bool shouldAutoSave() const override;
@@ -62,7 +62,7 @@ public:
// Internal
void setFallbackSaveAsFileName(const QString &fileName);
- bool writeFile(const QString &fileName, QString *errorString) const;
+ bool writeFile(const Utils::FilePath &filePath, QString *errorString) const;
QDesignerFormWindowInterface *formWindow() const;
void syncXmlFromFormWindow();
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 9ab38d9b08..c11756674c 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -409,7 +409,7 @@ static Document::Ptr getParsedDocument(const QString &fileName,
src = workingCopy.source(fileName);
} else {
Utils::FileReader reader;
- if (reader.fetch(fileName)) // ### FIXME error reporting
+ if (reader.fetch(Utils::FilePath::fromString(fileName))) // ### FIXME error reporting
src = QString::fromLocal8Bit(reader.data()).toUtf8();
}
View Lorry Controller Status