add/unify i/o error handling

lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619

1 files changed, 13 insertions, 18 deletions

diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 94d64250b8..e864af5153 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -41,6 +41,8 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <utils/fileutils.h>
+
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
@@ -301,25 +303,18 @@ void CppFileSettingsWidget::setSettings(const CppFileSettings &s)
 void CppFileSettingsWidget::slotEdit()
 {
     QString path = licenseTemplatePath();
-    // Edit existing file with C++
-    if (!path.isEmpty()) {
-        Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID),
-                                                    Core::EditorManager::ModeSwitch);
-        return;
-    }
-    // Pick a file name and write new template, edit with C++
-    path = QFileDialog::getSaveFileName(this, tr("Choose Location for New License Template File"));
-    if (path.isEmpty())
-        return;
-    QFile file(path);
-    if (!file.open(QIODevice::WriteOnly|QIODevice::Text|QIODevice::Truncate)) {
-        QMessageBox::warning(this, tr("Template write error"),
-                             tr("Cannot write to %1: %2").arg(path, file.errorString()));
-        return;
+    if (path.isEmpty()) {
+        // Pick a file name and write new template, edit with C++
+        path = QFileDialog::getSaveFileName(this, tr("Choose Location for New License Template File"));
+        if (path.isEmpty())
+            return;
+        Utils::FileSaver saver(path, QIODevice::Text);
+        saver.write(tr(licenseTemplateTemplate).toUtf8());
+        if (!saver.finalize(this))
+            return;
+        setLicenseTemplatePath(path);
     }
-    file.write(tr(licenseTemplateTemplate).toUtf8());
-    file.close();
-    setLicenseTemplatePath(path);
+    // Edit (now) existing file with C++
     Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID),
                                                 Core::EditorManager::ModeSwitch);
 }