diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-30 15:15:15 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-18 14:10:14 +0200 |
commit | 45c9cf7a1298feed925d18596c30ac9c6cd1dac5 (patch) | |
tree | 6f484122011b76a5f3a2f1915b7b308b1f5058ea /src/plugins/qt4projectmanager/wizards/guiappwizard.cpp | |
parent | fae7dc9584b4e2f2192f8b7a71c428fcaa2ddb70 (diff) |
add/unify i/o error handling
lots of use of Utils::FileSaver and Utils::FileReader
Task-number: QTCREATORBUG-1619
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/guiappwizard.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/wizards/guiappwizard.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp index 9a90980d12..079f69e8e8 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp @@ -41,6 +41,8 @@ #include <extensionsystem/pluginmanager.h> #include <extensionsystem/invoker.h> +#include <utils/fileutils.h> + #include <QtCore/QDir> #include <QtCore/QFile> #include <QtCore/QTextStream> @@ -258,12 +260,10 @@ bool GuiAppWizard::parametrizeTemplate(const QString &templatePath, const QStrin QString fileName = templatePath; fileName += QDir::separator(); fileName += templateName; - QFile inFile(fileName); - if (!inFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - *errorMessage = tr("The template file '%1' could not be opened for reading: %2").arg(fileName, inFile.errorString()); + Utils::FileReader reader; + if (!reader.fetch(fileName, QIODevice::Text, errorMessage)) return false; - } - QString contents = QString::fromUtf8(inFile.readAll()); + QString contents = QString::fromUtf8(reader.data()); contents.replace(QLatin1String("%QAPP_INCLUDE%"), QLatin1String("QtGui/QApplication")); contents.replace(QLatin1String("%INCLUDE%"), params.headerFileName); |