Application: Use shared pointers

Fixes #1239

src/utilities/fileutils.cpp

@@ -29,11 +29,14 @@
 #include <QFile>
 
 #include "core/logging.h"
+#include "core/scoped_ptr.h"
 
 #include "fileutils.h"
 
 namespace Utilities {
 
+using std::unique_ptr;
+
 QByteArray ReadDataFromFile(const QString &filename) {
 
   QFile file(filename);
@@ -56,7 +59,7 @@ bool Copy(QIODevice *source, QIODevice *destination) {
   if (!destination->open(QIODevice::WriteOnly)) return false;
 
   const qint64 bytes = source->size();
-  std::unique_ptr<char[]> data(new char[bytes]);
+  unique_ptr<char[]> data(new char[bytes]);
   qint64 pos = 0;
 
   qint64 bytes_read = 0;

src/utilities/transliterate.cpp

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <memory>
 #include <cstdio>
 #include <string>
 
@@ -32,6 +31,7 @@
 #include <QByteArray>
 #include <QString>
 
+#include "core/scoped_ptr.h"
 #include "transliterate.h"
 
 namespace Utilities {
@@ -41,7 +41,7 @@ QString Transliterate(const QString &accented_str) {
 #ifdef HAVE_ICU
 
   UErrorCode errorcode = U_ZERO_ERROR;
-  std::unique_ptr<icu::Transliterator> transliterator;
+  ScopedPtr<icu::Transliterator> transliterator;
   transliterator.reset(icu::Transliterator::createInstance("Any-Latin; Latin-ASCII;", UTRANS_FORWARD, errorcode));
 
   if (!transliterator) return accented_str;