From 6b4f081fdf3e11e27c955ab304ea602353b57110 Mon Sep 17 00:00:00 2001
From: tux3 <barrdetwix@gmail.com>
Date: Fri, 15 Jan 2016 17:40:12 +0100
Subject: [PATCH] dos2unix the updater

---
 updater/main.cpp                     | 208 ++++-----
 updater/update.cpp                   | 286 ++++++------
 updater/update.h                     | 120 ++---
 updater/updater.pro                  |  80 ++--
 updater/widget.cpp                   | 676 +++++++++++++--------------
 updater/widget.h                     | 134 +++---
 updater/widget.ui                    | 278 +++++------
 updater/windows/updater.exe.manifest |  22 +-
 updater/windows/updater.rc           |   2 +-
 9 files changed, 903 insertions(+), 903 deletions(-)

diff --git a/updater/main.cpp b/updater/main.cpp
index 6688f98c1..68067a60b 100644
--- a/updater/main.cpp
+++ b/updater/main.cpp
@@ -1,104 +1,104 @@
-/*
-    Copyright © 2014 by The qTox Project
-
-    This file is part of qTox, a Qt-based graphical interface for Tox.
-
-    qTox is libre software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    qTox is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with qTox.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-
-#include "widget.h"
-#include <QApplication>
-#include <QDebug>
-#include <QFile>
-#include <QMutex>
-#include <QDateTime>
-#include <QDir>
-#include <QStandardPaths>
-#include <memory>
-#include <windows.h>
-
-static std::unique_ptr<QTextStream> logFileStream {nullptr};
-static std::unique_ptr<QFile> logFileFile {nullptr};
-static QMutex mutex;
-
-void logMessageHandler(QtMsgType type, const QMessageLogContext& ctxt, const QString& msg)
-{
-    // Silence qWarning spam due to bug in QTextBrowser (trying to open a file for base64 images)
-    if (ctxt.function == QString("virtual bool QFSFileEngine::open(QIODevice::OpenMode)")
-            && msg == QString("QFSFileEngine::open: No file name specified"))
-        return;
-
-    QString LogMsg = QString("[%1] %2:%3 : ")
-            .arg(QTime::currentTime().toString("HH:mm:ss.zzz")).arg(ctxt.file).arg(ctxt.line);
-    switch (type)
-    {
-        case QtDebugMsg:
-            LogMsg += "Debug";
-            break;
-        case QtWarningMsg:
-            LogMsg += "Warning";
-            break;
-        case QtCriticalMsg:
-            LogMsg += "Critical";
-            break;
-        case QtFatalMsg:
-            LogMsg += "Fatal";
-            break;
-        default:
-            break;
-    }
-
-    LogMsg += ": " + msg + "\n";
-
-    QTextStream out(stderr, QIODevice::WriteOnly);
-    out << LogMsg;
-
-    if (!logFileStream)
-        return;
-
-    QMutexLocker locker(&mutex);
-    *logFileStream << LogMsg;
-    logFileStream->flush();
-}
-
-int main(int argc, char *argv[])
-{
-    qInstallMessageHandler(logMessageHandler);
-    QApplication a(argc, argv);
-
-    logFileStream.reset(new QTextStream);
-    logFileFile.reset(new QFile(QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QDir::separator()
-                                                + "AppData" + QDir::separator() + "Roaming" + QDir::separator() + "tox")+QDir::separator()+"qtox.log"));
-    if (logFileFile->open(QIODevice::Append))
-    {
-        logFileStream->setDevice(logFileFile.get());
-        *logFileStream << QDateTime::currentDateTime().toString("\nyyyy-MM-dd HH:mm:ss' Updater file logger starting\n'");
-    }
-    else
-    {
-        qWarning() << "Couldn't open log file!\n";
-        logFileStream.release();
-    }
-
-    long unsigned int bufsize=100;
-    char buf[100];
-    GetUserNameA(buf, &bufsize);
-    qDebug() << "Updater running as user" << buf;
-
-    Widget w;
-    w.show();
-
-    return a.exec();
-}
+/*
+    Copyright © 2014 by The qTox Project
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    qTox is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    qTox is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with qTox.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+
+#include "widget.h"
+#include <QApplication>
+#include <QDebug>
+#include <QFile>
+#include <QMutex>
+#include <QDateTime>
+#include <QDir>
+#include <QStandardPaths>
+#include <memory>
+#include <windows.h>
+
+static std::unique_ptr<QTextStream> logFileStream {nullptr};
+static std::unique_ptr<QFile> logFileFile {nullptr};
+static QMutex mutex;
+
+void logMessageHandler(QtMsgType type, const QMessageLogContext& ctxt, const QString& msg)
+{
+    // Silence qWarning spam due to bug in QTextBrowser (trying to open a file for base64 images)
+    if (ctxt.function == QString("virtual bool QFSFileEngine::open(QIODevice::OpenMode)")
+            && msg == QString("QFSFileEngine::open: No file name specified"))
+        return;
+
+    QString LogMsg = QString("[%1] %2:%3 : ")
+            .arg(QTime::currentTime().toString("HH:mm:ss.zzz")).arg(ctxt.file).arg(ctxt.line);
+    switch (type)
+    {
+        case QtDebugMsg:
+            LogMsg += "Debug";
+            break;
+        case QtWarningMsg:
+            LogMsg += "Warning";
+            break;
+        case QtCriticalMsg:
+            LogMsg += "Critical";
+            break;
+        case QtFatalMsg:
+            LogMsg += "Fatal";
+            break;
+        default:
+            break;
+    }
+
+    LogMsg += ": " + msg + "\n";
+
+    QTextStream out(stderr, QIODevice::WriteOnly);
+    out << LogMsg;
+
+    if (!logFileStream)
+        return;
+
+    QMutexLocker locker(&mutex);
+    *logFileStream << LogMsg;
+    logFileStream->flush();
+}
+
+int main(int argc, char *argv[])
+{
+    qInstallMessageHandler(logMessageHandler);
+    QApplication a(argc, argv);
+
+    logFileStream.reset(new QTextStream);
+    logFileFile.reset(new QFile(QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QDir::separator()
+                                                + "AppData" + QDir::separator() + "Roaming" + QDir::separator() + "tox")+QDir::separator()+"qtox.log"));
+    if (logFileFile->open(QIODevice::Append))
+    {
+        logFileStream->setDevice(logFileFile.get());
+        *logFileStream << QDateTime::currentDateTime().toString("\nyyyy-MM-dd HH:mm:ss' Updater file logger starting\n'");
+    }
+    else
+    {
+        qWarning() << "Couldn't open log file!\n";
+        logFileStream.release();
+    }
+
+    long unsigned int bufsize=100;
+    char buf[100];
+    GetUserNameA(buf, &bufsize);
+    qDebug() << "Updater running as user" << buf;
+
+    Widget w;
+    w.show();
+
+    return a.exec();
+}
diff --git a/updater/update.cpp b/updater/update.cpp
index 6e6e4d47b..4cd0b8978 100644
--- a/updater/update.cpp
+++ b/updater/update.cpp
@@ -1,143 +1,143 @@
-/*
-    Copyright © 2014 by The qTox Project
-
-    This file is part of qTox, a Qt-based graphical interface for Tox.
-
-    qTox is libre software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    qTox is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with qTox.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-
-#include "update.h"
-#include "serialize.h"
-#include "widget.h"
-#include <QFile>
-#include <QDebug>
-#include <QMessageBox>
-#include <QDir>
-#include <QCoreApplication>
-
-unsigned char key[crypto_sign_PUBLICKEYBYTES] =
-{
-    0x20, 0x89, 0x39, 0xaa, 0x9a, 0xe8, 0xb5, 0x21, 0x0e, 0xac, 0x02, 0xa9, 0xc4, 0x92, 0xd9, 0xa2,
-    0x17, 0x83, 0xbd, 0x78, 0x0a, 0xda, 0x33, 0xcd, 0xa5, 0xc6, 0x44, 0xc7, 0xfc, 0xed, 0x00, 0x13
-};
-
-QByteArray getLocalFlist()
-{
-    QByteArray flist;
-
-    QFile flistFile("flist");
-    if (!flistFile.open(QIODevice::ReadOnly))
-    {
-        qWarning() << "getLocalFlist: Can't open local flist";
-        return flist;
-    }
-
-    flist = flistFile.readAll();
-    flistFile.close();
-
-    return flist;
-}
-
-bool isUpToDate(UpdateFileMeta fileMeta)
-{
-    QString appDir = qApp->applicationDirPath();
-    QFile file(appDir+QDir::separator()+fileMeta.installpath);
-    if (!file.open(QIODevice::ReadOnly))
-        return false;
-
-    // If the data we have is corrupted or old, mark it for update
-    QByteArray data = file.readAll();
-    if (crypto_sign_verify_detached(fileMeta.sig, (unsigned char*)data.data(), data.size(), key) != 0)
-        return false;
-
-    return true;
-}
-
-QList<UpdateFileMeta> genUpdateDiff(QList<UpdateFileMeta> updateFlist, Widget* w)
-{
-    QList<UpdateFileMeta> diff;
-
-    float progressDiff = 45;
-    float progress = 5;
-
-    for (UpdateFileMeta file : updateFlist)
-    {
-        if (!isUpToDate(file))
-            diff += file;
-        progress += progressDiff / updateFlist.size();
-        w->setProgress(progress);
-    }
-
-    return diff;
-}
-
-QList<UpdateFileMeta> parseFlist(QByteArray flistData)
-{
-    QList<UpdateFileMeta> flist;
-
-    if (flistData.isEmpty())
-    {
-        qWarning() << "AutoUpdater::parseflist: Empty data";
-        return flist;
-    }
-
-    // Check version
-    if (flistData[0] != '1')
-    {
-        qWarning() << "AutoUpdater: parseflist: Bad version "<<(uint8_t)flistData[0];
-        return flist;
-    }
-    flistData = flistData.mid(1);
-
-    // Check signature
-    if (flistData.size() < (int)(crypto_sign_BYTES))
-    {
-        qWarning() << "AutoUpdater::parseflist: Truncated data";
-        return flist;
-    }
-    else
-    {
-        QByteArray msgData = flistData.mid(crypto_sign_BYTES);
-        unsigned char* msg = (unsigned char*)msgData.data();
-        if (crypto_sign_verify_detached((unsigned char*)flistData.data(), msg, msgData.size(), key) != 0)
-        {
-            qCritical() << "AutoUpdater: parseflist: FORGED FLIST FILE";
-            return flist;
-        }
-        flistData = flistData.mid(crypto_sign_BYTES);
-    }
-
-    // Parse. We assume no errors handling needed since the signature is valid.
-    while (!flistData.isEmpty())
-    {
-        UpdateFileMeta newFile;
-
-        memcpy(newFile.sig, flistData.data(), crypto_sign_BYTES);
-        flistData = flistData.mid(crypto_sign_BYTES);
-
-        newFile.id = dataToString(flistData);
-        flistData = flistData.mid(newFile.id.size() + getVUint32Size(flistData));
-
-        newFile.installpath = dataToString(flistData);
-        flistData = flistData.mid(newFile.installpath.size() + getVUint32Size(flistData));
-
-        newFile.size = dataToUint64(flistData);
-        flistData = flistData.mid(8);
-
-        flist += newFile;
-    }
-
-    return flist;
-}
+/*
+    Copyright © 2014 by The qTox Project
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    qTox is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    qTox is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with qTox.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+
+#include "update.h"
+#include "serialize.h"
+#include "widget.h"
+#include <QFile>
+#include <QDebug>
+#include <QMessageBox>
+#include <QDir>
+#include <QCoreApplication>
+
+unsigned char key[crypto_sign_PUBLICKEYBYTES] =
+{
+    0x20, 0x89, 0x39, 0xaa, 0x9a, 0xe8, 0xb5, 0x21, 0x0e, 0xac, 0x02, 0xa9, 0xc4, 0x92, 0xd9, 0xa2,
+    0x17, 0x83, 0xbd, 0x78, 0x0a, 0xda, 0x33, 0xcd, 0xa5, 0xc6, 0x44, 0xc7, 0xfc, 0xed, 0x00, 0x13
+};
+
+QByteArray getLocalFlist()
+{
+    QByteArray flist;
+
+    QFile flistFile("flist");
+    if (!flistFile.open(QIODevice::ReadOnly))
+    {
+        qWarning() << "getLocalFlist: Can't open local flist";
+        return flist;
+    }
+
+    flist = flistFile.readAll();
+    flistFile.close();
+
+    return flist;
+}
+
+bool isUpToDate(UpdateFileMeta fileMeta)
+{
+    QString appDir = qApp->applicationDirPath();
+    QFile file(appDir+QDir::separator()+fileMeta.installpath);
+    if (!file.open(QIODevice::ReadOnly))
+        return false;
+
+    // If the data we have is corrupted or old, mark it for update
+    QByteArray data = file.readAll();
+    if (crypto_sign_verify_detached(fileMeta.sig, (unsigned char*)data.data(), data.size(), key) != 0)
+        return false;
+
+    return true;
+}
+
+QList<UpdateFileMeta> genUpdateDiff(QList<UpdateFileMeta> updateFlist, Widget* w)
+{
+    QList<UpdateFileMeta> diff;
+
+    float progressDiff = 45;
+    float progress = 5;
+
+    for (UpdateFileMeta file : updateFlist)
+    {
+        if (!isUpToDate(file))
+            diff += file;
+        progress += progressDiff / updateFlist.size();
+        w->setProgress(progress);
+    }
+
+    return diff;
+}
+
+QList<UpdateFileMeta> parseFlist(QByteArray flistData)
+{
+    QList<UpdateFileMeta> flist;
+
+    if (flistData.isEmpty())
+    {
+        qWarning() << "AutoUpdater::parseflist: Empty data";
+        return flist;
+    }
+
+    // Check version
+    if (flistData[0] != '1')
+    {
+        qWarning() << "AutoUpdater: parseflist: Bad version "<<(uint8_t)flistData[0];
+        return flist;
+    }
+    flistData = flistData.mid(1);
+
+    // Check signature
+    if (flistData.size() < (int)(crypto_sign_BYTES))
+    {
+        qWarning() << "AutoUpdater::parseflist: Truncated data";
+        return flist;
+    }
+    else
+    {
+        QByteArray msgData = flistData.mid(crypto_sign_BYTES);
+        unsigned char* msg = (unsigned char*)msgData.data();
+        if (crypto_sign_verify_detached((unsigned char*)flistData.data(), msg, msgData.size(), key) != 0)
+        {
+            qCritical() << "AutoUpdater: parseflist: FORGED FLIST FILE";
+            return flist;
+        }
+        flistData = flistData.mid(crypto_sign_BYTES);
+    }
+
+    // Parse. We assume no errors handling needed since the signature is valid.
+    while (!flistData.isEmpty())
+    {
+        UpdateFileMeta newFile;
+
+        memcpy(newFile.sig, flistData.data(), crypto_sign_BYTES);
+        flistData = flistData.mid(crypto_sign_BYTES);
+
+        newFile.id = dataToString(flistData);
+        flistData = flistData.mid(newFile.id.size() + getVUint32Size(flistData));
+
+        newFile.installpath = dataToString(flistData);
+        flistData = flistData.mid(newFile.installpath.size() + getVUint32Size(flistData));
+
+        newFile.size = dataToUint64(flistData);
+        flistData = flistData.mid(8);
+
+        flist += newFile;
+    }
+
+    return flist;
+}
diff --git a/updater/update.h b/updater/update.h
index 13f8db17a..436d6f7d3 100644
--- a/updater/update.h
+++ b/updater/update.h
@@ -1,60 +1,60 @@
-/*
-    Copyright © 2014 by The qTox Project
-
-    This file is part of qTox, a Qt-based graphical interface for Tox.
-
-    qTox is libre software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    qTox is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with qTox.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-
-#ifndef UPDATE_H
-#define UPDATE_H
-
-#include <QByteArray>
-#include <QString>
-#include <sodium.h>
-
-class Widget;
-
-struct UpdateFileMeta
-{
-    unsigned char sig[crypto_sign_BYTES]; ///< Signature of the file (ed25519)
-    QString id; ///< Unique id of the file
-    QString installpath; ///< Local path including the file name. May be relative to qtox-updater or absolute
-    uint64_t size; ///< Size in bytes of the file
-
-    bool operator==(const UpdateFileMeta& other)
-    {
-        return (size == other.size
-                && id == other.id && installpath == other.installpath
-                && memcmp(sig, other.sig, crypto_sign_BYTES) == 0);
-    }
-};
-
-struct UpdateFile
-{
-    UpdateFileMeta metadata;
-    QByteArray data;
-};
-
-/// Gets the local flist. Returns an empty array on error
-QByteArray getLocalFlist();
-/// Parses and validates a flist file. Returns an empty list on error
-QList<UpdateFileMeta> parseFlist(QByteArray flistData);
-/// Generates a list of files we need to update
-QList<UpdateFileMeta> genUpdateDiff(QList<UpdateFileMeta> updateFlist, Widget *w);
-
-extern unsigned char key[crypto_sign_PUBLICKEYBYTES];
-
-#endif // UPDATE_H
+/*
+    Copyright © 2014 by The qTox Project
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    qTox is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    qTox is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with qTox.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+
+#ifndef UPDATE_H
+#define UPDATE_H
+
+#include <QByteArray>
+#include <QString>
+#include <sodium.h>
+
+class Widget;
+
+struct UpdateFileMeta
+{
+    unsigned char sig[crypto_sign_BYTES]; ///< Signature of the file (ed25519)
+    QString id; ///< Unique id of the file
+    QString installpath; ///< Local path including the file name. May be relative to qtox-updater or absolute
+    uint64_t size; ///< Size in bytes of the file
+
+    bool operator==(const UpdateFileMeta& other)
+    {
+        return (size == other.size
+                && id == other.id && installpath == other.installpath
+                && memcmp(sig, other.sig, crypto_sign_BYTES) == 0);
+    }
+};
+
+struct UpdateFile
+{
+    UpdateFileMeta metadata;
+    QByteArray data;
+};
+
+/// Gets the local flist. Returns an empty array on error
+QByteArray getLocalFlist();
+/// Parses and validates a flist file. Returns an empty list on error
+QList<UpdateFileMeta> parseFlist(QByteArray flistData);
+/// Generates a list of files we need to update
+QList<UpdateFileMeta> genUpdateDiff(QList<UpdateFileMeta> updateFlist, Widget *w);
+
+extern unsigned char key[crypto_sign_PUBLICKEYBYTES];
+
+#endif // UPDATE_H
diff --git a/updater/updater.pro b/updater/updater.pro
index 5373d1a72..c52a12459 100644
--- a/updater/updater.pro
+++ b/updater/updater.pro
@@ -1,40 +1,40 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-11-09T21:09:08
-#
-#-------------------------------------------------
-
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = qtox-updater
-TEMPLATE = app
-
-CONFIG += c++11
-
-QMAKE_CXXFLAGS += -fno-exceptions
-
-SOURCES += main.cpp\
-        widget.cpp \
-    update.cpp \
-    serialize.cpp
-
-HEADERS  += widget.h \
-    update.h \
-    serialize.h
-
-FORMS    += widget.ui
-
-RESOURCES += \
-    res.qrc
-
-INCLUDEPATH += libs/include
-
-RC_FILE = windows/updater.rc
-
-LIBS += -L$$PWD/libs/lib/ -lsodium
-
-win32 {
-    LIBS += -lshell32 -luuid
-}
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-11-09T21:09:08
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = qtox-updater
+TEMPLATE = app
+
+CONFIG += c++11
+
+QMAKE_CXXFLAGS += -fno-exceptions
+
+SOURCES += main.cpp\
+        widget.cpp \
+    update.cpp \
+    serialize.cpp
+
+HEADERS  += widget.h \
+    update.h \
+    serialize.h
+
+FORMS    += widget.ui
+
+RESOURCES += \
+    res.qrc
+
+INCLUDEPATH += libs/include
+
+RC_FILE = windows/updater.rc
+
+LIBS += -L$$PWD/libs/lib/ -lsodium
+
+win32 {
+    LIBS += -lshell32 -luuid
+}
diff --git a/updater/widget.cpp b/updater/widget.cpp
index bb3a86aa8..7ea863c46 100644
--- a/updater/widget.cpp
+++ b/updater/widget.cpp
@@ -1,338 +1,338 @@
-/*
-    Copyright © 2014 by The qTox Project
-
-    This file is part of qTox, a Qt-based graphical interface for Tox.
-
-    qTox is libre software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    qTox is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with qTox.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-
-#include "widget.h"
-#include "ui_widget.h"
-
-#include <QDir>
-#include <QFile>
-#include <QProcess>
-#include <QMessageBox>
-#include <QMetaObject>
-#include <QDebug>
-#include <QSettings>
-
-#include "update.h"
-
-#ifdef Q_OS_WIN
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600 // Vista for SHGetKnownFolderPath
-#include <windows.h>
-#include <shldisp.h>
-#include <shlobj.h>
-#include <exdisp.h>
-
-const bool supported = true;
-const QString QTOX_PATH = "qtox.exe";
-#else
-const bool supported = false;
-const QString QTOX_PATH;
-#endif
-const QString SETTINGS_FILE = "settings.ini";
-
-Widget::Widget(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::Widget)
-{
-    ui->setupUi(this);
-
-    // Updates only for supported platforms
-    if (!supported)
-        fatalError(tr("The qTox updater is not supported on this platform."));
-
-#ifdef Q_OS_WIN
-    // Get a primary unelevated token of the actual user
-    hPrimaryToken = nullptr;
-    HANDLE hShellProcess = nullptr, hShellProcessToken = nullptr;
-    const DWORD dwTokenRights = TOKEN_QUERY | TOKEN_IMPERSONATE | TOKEN_ASSIGN_PRIMARY
-                                | TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT | TOKEN_ADJUST_SESSIONID;
-    DWORD dwPID = 0;
-    HWND hwnd = nullptr;
-    DWORD dwLastErr = 0;
-
-    // Enable SeIncreaseQuotaPrivilege
-    HANDLE hProcessToken = NULL;
-    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hProcessToken))
-        goto unelevateFail;
-    TOKEN_PRIVILEGES tkp;
-    tkp.PrivilegeCount = 1;
-    LookupPrivilegeValueW(NULL, SE_INCREASE_QUOTA_NAME, &tkp.Privileges[0].Luid);
-    tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-    AdjustTokenPrivileges(hProcessToken, FALSE, &tkp, 0, NULL, NULL);
-    dwLastErr = GetLastError();
-    CloseHandle(hProcessToken);
-    if (ERROR_SUCCESS != dwLastErr)
-        goto unelevateFail;
-
-    // Get a primary copy of the desktop shell's token,
-    // we're assuming the shell is running as the actual user
-    hwnd = GetShellWindow();
-    if (!hwnd)
-        goto unelevateFail;
-    GetWindowThreadProcessId(hwnd, &dwPID);
-    if (!dwPID)
-        goto unelevateFail;
-    hShellProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dwPID);
-    if (!hShellProcess)
-        goto unelevateFail;
-    if (!OpenProcessToken(hShellProcess, TOKEN_DUPLICATE, &hShellProcessToken))
-        goto unelevateFail;
-
-    // Duplicate the shell's process token to get a primary token.
-    // Based on experimentation, this is the minimal set of rights required for CreateProcessWithTokenW (contrary to current documentation).
-    if (!DuplicateTokenEx(hShellProcessToken, dwTokenRights, NULL, SecurityImpersonation, TokenPrimary, &hPrimaryToken))
-        goto unelevateFail;
-
-    qDebug() << "Unelevated primary access token acquired";
-    goto unelevateCleanup;
-unelevateFail:
-    qWarning() << "Unelevate failed, couldn't get access token";
-unelevateCleanup:
-    CloseHandle(hShellProcessToken);
-    CloseHandle(hShellProcess);
-#endif
-
-    QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
-}
-
-Widget::~Widget()
-{
-#ifdef Q_OS_WIN
-    CloseHandle(hPrimaryToken);
-#endif
-    delete ui;
-}
-
-void Widget::setProgress(int value)
-{
-    ui->progress->setValue(value);
-    ui->progress->repaint();
-    qApp->processEvents();
-}
-
-void Widget::fatalError(QString message)
-{
-    qCritical() << "Update aborted with error:"<<message;
-    QMessageBox::critical(this,tr("Error"), message+'\n'+tr("qTox will restart now."));
-    deleteUpdate();
-    restoreBackups();
-    startQToxAndExit();
-}
-
-void Widget::deleteUpdate()
-{
-    QDir updateDir(getSettingsDirPath()+"/update/");
-    updateDir.removeRecursively();
-}
-
-void Widget::startQToxAndExit()
-{
-#ifdef Q_OS_WIN
-    // Try to restart qTox as the actual user with our unelevated token
-    STARTUPINFOW si;
-    PROCESS_INFORMATION pi;
-    SecureZeroMemory(&si, sizeof(si));
-    SecureZeroMemory(&pi, sizeof(pi));
-    si.cb = sizeof(si);
-
-    bool unelevateOk = true;
-
-    auto advapi32H = LoadLibrary(TEXT("advapi32.dll"));
-    if ((unelevateOk = (advapi32H != nullptr)))
-    {
-        auto CreateProcessWithTokenWH = (decltype(&CreateProcessWithTokenW))
-                                        GetProcAddress(advapi32H, "CreateProcessWithTokenW");
-        if ((unelevateOk = (CreateProcessWithTokenWH != nullptr)))
-        {
-            if (!CreateProcessWithTokenWH(hPrimaryToken, 0, QTOX_PATH.toStdWString().c_str(), 0, 0, 0, 0, &si, &pi))
-                unelevateOk = false;
-        }
-    }
-
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
-
-    if (!unelevateOk)
-    {
-        qWarning() << "Failed to start unelevated qTox";
-        QProcess::startDetached(QTOX_PATH);
-    }
-
-#else
-    QProcess::startDetached(QTOX_PATH);
-#endif
-    exit(0);
-}
-
-void Widget::deleteBackups()
-{
-    for (QString file : backups)
-        QFile(file+".bak").remove();
-}
-
-void Widget::restoreBackups()
-{
-    for (QString file : backups)
-        QFile(file+".bak").rename(file);
-}
-
-QString Widget::getSettingsDirPath()
-{
-    if (isToxPortableEnabled())
-        return ".";
-
-#ifdef Q_OS_WIN
-    wchar_t* path;
-    wchar_t pathOld[MAX_PATH];
-    bool isOld = false; // If true, we have to use pathOld and older Windows API.
-
-    auto shell32H = LoadLibrary(TEXT("shell32.dll"));
-    if (!(isOld = (shell32H == nullptr)))
-    {
-        auto SHGetKnownFolderPathH = (decltype(&SHGetKnownFolderPath))
-                                        GetProcAddress(shell32H, "SHGetKnownFolderPath");
-        if (!(isOld = (SHGetKnownFolderPathH == nullptr)))
-            SHGetKnownFolderPathH(FOLDERID_RoamingAppData, 0, hPrimaryToken, &path);
-    }
-    if (isOld)
-    {
-        qDebug() << "Falling back to legacy APIs...";
-        SHGetFolderPathW(nullptr, CSIDL_APPDATA, nullptr, 0, pathOld);
-    }
-
-    QString pathStr = QString::fromStdWString(isOld ? pathOld : path);
-    pathStr.replace("\\", "/");
-    return pathStr + "/tox";
-#else
-    return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QDir::separator() + "tox");
-#endif
-}
-
-bool Widget::isToxPortableEnabled()
-{
-    QFile portableSettings(SETTINGS_FILE);
-    if (portableSettings.exists())
-    {
-        QSettings ps(SETTINGS_FILE, QSettings::IniFormat);
-        ps.beginGroup("General");
-        return ps.value("makeToxPortable", false).toBool();
-    }
-    else
-    {
-        return false;
-    }
-}
-
-void Widget::update()
-{
-    /// 1. Find and parse the update (0-5%)
-    // Check that the dir exists
-    QString updateDirStr = getSettingsDirPath()+"/update/";
-    QDir updateDir(updateDirStr);
-    if (!updateDir.exists())
-        fatalError(tr("No update found."));
-
-    setProgress(2);
-
-    // Check that we have a flist and that every file on the diff exists
-    QFile updateFlistFile(updateDirStr+"flist");
-    if (!updateFlistFile.open(QIODevice::ReadOnly))
-        fatalError(tr("The update is incomplete."));
-
-    QByteArray updateFlistData = updateFlistFile.readAll();
-    updateFlistFile.close();
-
-    QList<UpdateFileMeta> updateFlist = parseFlist(updateFlistData);
-    setProgress(5);
-
-    /// 2. Generate a diff (5-50%)
-    QList<UpdateFileMeta> diff = genUpdateDiff(updateFlist, this);
-    for (UpdateFileMeta fileMeta : diff)
-        if (!QFile::exists(updateDirStr+fileMeta.installpath))
-            fatalError(tr("The update is incomplete."));
-
-    if (diff.size() == 0)
-       fatalError(tr("The update is empty!"));
-    setProgress(50);
-    qDebug() << "Diff generated,"<<diff.size()<<"files to update";
-
-    /// 2. Check the update (50-75%)
-    float checkProgressStep = 25.0/(float)diff.size();
-    float checkProgress = 50;
-    for (UpdateFileMeta fileMeta : diff)
-    {
-        UpdateFile file;
-        file.metadata = fileMeta;
-
-        QFile fileFile(updateDirStr+fileMeta.installpath);
-        if (!fileFile.open(QIODevice::ReadOnly))
-            fatalError(tr("Update files are unreadable."));
-
-        file.data = fileFile.readAll();
-        fileFile.close();
-
-        if (file.data.size() != (int)fileMeta.size)
-            fatalError(tr("Update files are corrupted."));
-
-        if (crypto_sign_verify_detached(file.metadata.sig, (unsigned char*)file.data.data(),
-                                        file.data.size(), key) != 0)
-            fatalError(tr("Update files are corrupted."));
-
-        checkProgress += checkProgressStep;
-        setProgress(checkProgress);
-    }
-    setProgress(75);
-    qDebug() << "Update files signature verified, installing";
-
-    /// 3. Install the update (75-95%)
-    float installProgressStep = 20.0/(float)diff.size();
-    float installProgress = 75;
-    for (UpdateFileMeta fileMeta : diff)
-    {
-        // Backup old files
-        if (QFile(fileMeta.installpath).exists())
-        {
-            QFile(fileMeta.installpath+".bak").remove();
-            QFile(fileMeta.installpath).rename(fileMeta.installpath+".bak");
-            backups.append(fileMeta.installpath);
-        }
-
-        // Install new ones
-        QDir().mkpath(QFileInfo(fileMeta.installpath).absolutePath());
-        QFile fileFile(updateDirStr+fileMeta.installpath);
-        if (!fileFile.copy(fileMeta.installpath))
-            fatalError(tr("Unable to copy the update's files from ")+(updateDirStr+fileMeta.installpath)+" to "+fileMeta.installpath);
-        installProgress += installProgressStep;
-        setProgress(installProgress);
-    }
-    setProgress(95);
-
-    /// 4. Delete the update and backups (95-100%)
-    deleteUpdate();
-    setProgress(97);
-    deleteBackups();
-    setProgress(100);
-
-    /// 5. Start qTox and exit
-    qDebug() << "Update applied, restarting qTox!";
-    startQToxAndExit();
-}
+/*
+    Copyright © 2014 by The qTox Project
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    qTox is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    qTox is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with qTox.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+
+#include "widget.h"
+#include "ui_widget.h"
+
+#include <QDir>
+#include <QFile>
+#include <QProcess>
+#include <QMessageBox>
+#include <QMetaObject>
+#include <QDebug>
+#include <QSettings>
+
+#include "update.h"
+
+#ifdef Q_OS_WIN
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0600 // Vista for SHGetKnownFolderPath
+#include <windows.h>
+#include <shldisp.h>
+#include <shlobj.h>
+#include <exdisp.h>
+
+const bool supported = true;
+const QString QTOX_PATH = "qtox.exe";
+#else
+const bool supported = false;
+const QString QTOX_PATH;
+#endif
+const QString SETTINGS_FILE = "settings.ini";
+
+Widget::Widget(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::Widget)
+{
+    ui->setupUi(this);
+
+    // Updates only for supported platforms
+    if (!supported)
+        fatalError(tr("The qTox updater is not supported on this platform."));
+
+#ifdef Q_OS_WIN
+    // Get a primary unelevated token of the actual user
+    hPrimaryToken = nullptr;
+    HANDLE hShellProcess = nullptr, hShellProcessToken = nullptr;
+    const DWORD dwTokenRights = TOKEN_QUERY | TOKEN_IMPERSONATE | TOKEN_ASSIGN_PRIMARY
+                                | TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT | TOKEN_ADJUST_SESSIONID;
+    DWORD dwPID = 0;
+    HWND hwnd = nullptr;
+    DWORD dwLastErr = 0;
+
+    // Enable SeIncreaseQuotaPrivilege
+    HANDLE hProcessToken = NULL;
+    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hProcessToken))
+        goto unelevateFail;
+    TOKEN_PRIVILEGES tkp;
+    tkp.PrivilegeCount = 1;
+    LookupPrivilegeValueW(NULL, SE_INCREASE_QUOTA_NAME, &tkp.Privileges[0].Luid);
+    tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+    AdjustTokenPrivileges(hProcessToken, FALSE, &tkp, 0, NULL, NULL);
+    dwLastErr = GetLastError();
+    CloseHandle(hProcessToken);
+    if (ERROR_SUCCESS != dwLastErr)
+        goto unelevateFail;
+
+    // Get a primary copy of the desktop shell's token,
+    // we're assuming the shell is running as the actual user
+    hwnd = GetShellWindow();
+    if (!hwnd)
+        goto unelevateFail;
+    GetWindowThreadProcessId(hwnd, &dwPID);
+    if (!dwPID)
+        goto unelevateFail;
+    hShellProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dwPID);
+    if (!hShellProcess)
+        goto unelevateFail;
+    if (!OpenProcessToken(hShellProcess, TOKEN_DUPLICATE, &hShellProcessToken))
+        goto unelevateFail;
+
+    // Duplicate the shell's process token to get a primary token.
+    // Based on experimentation, this is the minimal set of rights required for CreateProcessWithTokenW (contrary to current documentation).
+    if (!DuplicateTokenEx(hShellProcessToken, dwTokenRights, NULL, SecurityImpersonation, TokenPrimary, &hPrimaryToken))
+        goto unelevateFail;
+
+    qDebug() << "Unelevated primary access token acquired";
+    goto unelevateCleanup;
+unelevateFail:
+    qWarning() << "Unelevate failed, couldn't get access token";
+unelevateCleanup:
+    CloseHandle(hShellProcessToken);
+    CloseHandle(hShellProcess);
+#endif
+
+    QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
+}
+
+Widget::~Widget()
+{
+#ifdef Q_OS_WIN
+    CloseHandle(hPrimaryToken);
+#endif
+    delete ui;
+}
+
+void Widget::setProgress(int value)
+{
+    ui->progress->setValue(value);
+    ui->progress->repaint();
+    qApp->processEvents();
+}
+
+void Widget::fatalError(QString message)
+{
+    qCritical() << "Update aborted with error:"<<message;
+    QMessageBox::critical(this,tr("Error"), message+'\n'+tr("qTox will restart now."));
+    deleteUpdate();
+    restoreBackups();
+    startQToxAndExit();
+}
+
+void Widget::deleteUpdate()
+{
+    QDir updateDir(getSettingsDirPath()+"/update/");
+    updateDir.removeRecursively();
+}
+
+void Widget::startQToxAndExit()
+{
+#ifdef Q_OS_WIN
+    // Try to restart qTox as the actual user with our unelevated token
+    STARTUPINFOW si;
+    PROCESS_INFORMATION pi;
+    SecureZeroMemory(&si, sizeof(si));
+    SecureZeroMemory(&pi, sizeof(pi));
+    si.cb = sizeof(si);
+
+    bool unelevateOk = true;
+
+    auto advapi32H = LoadLibrary(TEXT("advapi32.dll"));
+    if ((unelevateOk = (advapi32H != nullptr)))
+    {
+        auto CreateProcessWithTokenWH = (decltype(&CreateProcessWithTokenW))
+                                        GetProcAddress(advapi32H, "CreateProcessWithTokenW");
+        if ((unelevateOk = (CreateProcessWithTokenWH != nullptr)))
+        {
+            if (!CreateProcessWithTokenWH(hPrimaryToken, 0, QTOX_PATH.toStdWString().c_str(), 0, 0, 0, 0, &si, &pi))
+                unelevateOk = false;
+        }
+    }
+
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+
+    if (!unelevateOk)
+    {
+        qWarning() << "Failed to start unelevated qTox";
+        QProcess::startDetached(QTOX_PATH);
+    }
+
+#else
+    QProcess::startDetached(QTOX_PATH);
+#endif
+    exit(0);
+}
+
+void Widget::deleteBackups()
+{
+    for (QString file : backups)
+        QFile(file+".bak").remove();
+}
+
+void Widget::restoreBackups()
+{
+    for (QString file : backups)
+        QFile(file+".bak").rename(file);
+}
+
+QString Widget::getSettingsDirPath()
+{
+    if (isToxPortableEnabled())
+        return ".";
+
+#ifdef Q_OS_WIN
+    wchar_t* path;
+    wchar_t pathOld[MAX_PATH];
+    bool isOld = false; // If true, we have to use pathOld and older Windows API.
+
+    auto shell32H = LoadLibrary(TEXT("shell32.dll"));
+    if (!(isOld = (shell32H == nullptr)))
+    {
+        auto SHGetKnownFolderPathH = (decltype(&SHGetKnownFolderPath))
+                                        GetProcAddress(shell32H, "SHGetKnownFolderPath");
+        if (!(isOld = (SHGetKnownFolderPathH == nullptr)))
+            SHGetKnownFolderPathH(FOLDERID_RoamingAppData, 0, hPrimaryToken, &path);
+    }
+    if (isOld)
+    {
+        qDebug() << "Falling back to legacy APIs...";
+        SHGetFolderPathW(nullptr, CSIDL_APPDATA, nullptr, 0, pathOld);
+    }
+
+    QString pathStr = QString::fromStdWString(isOld ? pathOld : path);
+    pathStr.replace("\\", "/");
+    return pathStr + "/tox";
+#else
+    return QDir::cleanPath(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QDir::separator() + "tox");
+#endif
+}
+
+bool Widget::isToxPortableEnabled()
+{
+    QFile portableSettings(SETTINGS_FILE);
+    if (portableSettings.exists())
+    {
+        QSettings ps(SETTINGS_FILE, QSettings::IniFormat);
+        ps.beginGroup("General");
+        return ps.value("makeToxPortable", false).toBool();
+    }
+    else
+    {
+        return false;
+    }
+}
+
+void Widget::update()
+{
+    /// 1. Find and parse the update (0-5%)
+    // Check that the dir exists
+    QString updateDirStr = getSettingsDirPath()+"/update/";
+    QDir updateDir(updateDirStr);
+    if (!updateDir.exists())
+        fatalError(tr("No update found."));
+
+    setProgress(2);
+
+    // Check that we have a flist and that every file on the diff exists
+    QFile updateFlistFile(updateDirStr+"flist");
+    if (!updateFlistFile.open(QIODevice::ReadOnly))
+        fatalError(tr("The update is incomplete."));
+
+    QByteArray updateFlistData = updateFlistFile.readAll();
+    updateFlistFile.close();
+
+    QList<UpdateFileMeta> updateFlist = parseFlist(updateFlistData);
+    setProgress(5);
+
+    /// 2. Generate a diff (5-50%)
+    QList<UpdateFileMeta> diff = genUpdateDiff(updateFlist, this);
+    for (UpdateFileMeta fileMeta : diff)
+        if (!QFile::exists(updateDirStr+fileMeta.installpath))
+            fatalError(tr("The update is incomplete."));
+
+    if (diff.size() == 0)
+       fatalError(tr("The update is empty!"));
+    setProgress(50);
+    qDebug() << "Diff generated,"<<diff.size()<<"files to update";
+
+    /// 2. Check the update (50-75%)
+    float checkProgressStep = 25.0/(float)diff.size();
+    float checkProgress = 50;
+    for (UpdateFileMeta fileMeta : diff)
+    {
+        UpdateFile file;
+        file.metadata = fileMeta;
+
+        QFile fileFile(updateDirStr+fileMeta.installpath);
+        if (!fileFile.open(QIODevice::ReadOnly))
+            fatalError(tr("Update files are unreadable."));
+
+        file.data = fileFile.readAll();
+        fileFile.close();
+
+        if (file.data.size() != (int)fileMeta.size)
+            fatalError(tr("Update files are corrupted."));
+
+        if (crypto_sign_verify_detached(file.metadata.sig, (unsigned char*)file.data.data(),
+                                        file.data.size(), key) != 0)
+            fatalError(tr("Update files are corrupted."));
+
+        checkProgress += checkProgressStep;
+        setProgress(checkProgress);
+    }
+    setProgress(75);
+    qDebug() << "Update files signature verified, installing";
+
+    /// 3. Install the update (75-95%)
+    float installProgressStep = 20.0/(float)diff.size();
+    float installProgress = 75;
+    for (UpdateFileMeta fileMeta : diff)
+    {
+        // Backup old files
+        if (QFile(fileMeta.installpath).exists())
+        {
+            QFile(fileMeta.installpath+".bak").remove();
+            QFile(fileMeta.installpath).rename(fileMeta.installpath+".bak");
+            backups.append(fileMeta.installpath);
+        }
+
+        // Install new ones
+        QDir().mkpath(QFileInfo(fileMeta.installpath).absolutePath());
+        QFile fileFile(updateDirStr+fileMeta.installpath);
+        if (!fileFile.copy(fileMeta.installpath))
+            fatalError(tr("Unable to copy the update's files from ")+(updateDirStr+fileMeta.installpath)+" to "+fileMeta.installpath);
+        installProgress += installProgressStep;
+        setProgress(installProgress);
+    }
+    setProgress(95);
+
+    /// 4. Delete the update and backups (95-100%)
+    deleteUpdate();
+    setProgress(97);
+    deleteBackups();
+    setProgress(100);
+
+    /// 5. Start qTox and exit
+    qDebug() << "Update applied, restarting qTox!";
+    startQToxAndExit();
+}
diff --git a/updater/widget.h b/updater/widget.h
index 2b5c2682a..155291ea5 100644
--- a/updater/widget.h
+++ b/updater/widget.h
@@ -1,67 +1,67 @@
-/*
-    Copyright © 2014 by The qTox Project
-
-    This file is part of qTox, a Qt-based graphical interface for Tox.
-
-    qTox is libre software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    qTox is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with qTox.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-
-#ifndef WIDGET_H
-#define WIDGET_H
-
-#include <QWidget>
-
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
-
-namespace Ui {
-class Widget;
-}
-
-class Widget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit Widget(QWidget *parent = 0);
-    ~Widget();
-
-    // Utilities
-    void deleteBackups();
-    void restoreBackups();
-    void setProgress(int value);
-    QString getSettingsDirPath();
-    bool isToxPortableEnabled();
-
-    // Noreturn
-    void fatalError(QString message); ///< Calls deleteUpdate and startQToxAndExit
-    void deleteUpdate();
-    void startQToxAndExit();
-
-public slots:
-    // Finds and applies the update
-    void update();
-
-private:
-    Ui::Widget *ui;
-    QStringList backups;
-
-#ifdef Q_OS_WIN
-    HANDLE hPrimaryToken;
-#endif
-};
-
-#endif // WIDGET_H
+/*
+    Copyright © 2014 by The qTox Project
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    qTox is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    qTox is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with qTox.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+
+#ifndef WIDGET_H
+#define WIDGET_H
+
+#include <QWidget>
+
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
+
+namespace Ui {
+class Widget;
+}
+
+class Widget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit Widget(QWidget *parent = 0);
+    ~Widget();
+
+    // Utilities
+    void deleteBackups();
+    void restoreBackups();
+    void setProgress(int value);
+    QString getSettingsDirPath();
+    bool isToxPortableEnabled();
+
+    // Noreturn
+    void fatalError(QString message); ///< Calls deleteUpdate and startQToxAndExit
+    void deleteUpdate();
+    void startQToxAndExit();
+
+public slots:
+    // Finds and applies the update
+    void update();
+
+private:
+    Ui::Widget *ui;
+    QStringList backups;
+
+#ifdef Q_OS_WIN
+    HANDLE hPrimaryToken;
+#endif
+};
+
+#endif // WIDGET_H
diff --git a/updater/widget.ui b/updater/widget.ui
index b7959ea0b..507ff9f04 100644
--- a/updater/widget.ui
+++ b/updater/widget.ui
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Widget</class>
- <widget class="QWidget" name="Widget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>401</width>
-    <height>224</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>qTox Updater</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="res.qrc">
-    <normaloff>:/res/qtox-256x256.png</normaloff>:/res/qtox-256x256.png</iconset>
-  </property>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>13</y>
-     <width>191</width>
-     <height>191</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="pixmap">
-    <pixmap resource="res.qrc">:/res/qtox-256x256.png</pixmap>
-   </property>
-   <property name="scaledContents">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QProgressBar" name="progress">
-   <property name="geometry">
-    <rect>
-     <x>206</x>
-     <y>95</y>
-     <width>171</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="minimum">
-    <number>0</number>
-   </property>
-   <property name="value">
-    <number>0</number>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="invertedAppearance">
-    <bool>false</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>205</x>
-     <y>115</y>
-     <width>171</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Updating qTox ...</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_3">
-   <property name="geometry">
-    <rect>
-     <x>201</x>
-     <y>170</y>
-     <width>181</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://tox.chat&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://tox.chat&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="openExternalLinks">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_4">
-   <property name="geometry">
-    <rect>
-     <x>200</x>
-     <y>183</y>
-     <width>181</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>&lt;a href=&quot;https://github.com/tux3/qtox&quot;&gt;https://github.com/tux3/qtox&lt;/a&gt;</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_5">
-   <property name="geometry">
-    <rect>
-     <x>195</x>
-     <y>32</y>
-     <width>191</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>14</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>qTox Update</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources>
-  <include location="res.qrc"/>
- </resources>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Widget</class>
+ <widget class="QWidget" name="Widget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>401</width>
+    <height>224</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>qTox Updater</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="res.qrc">
+    <normaloff>:/res/qtox-256x256.png</normaloff>:/res/qtox-256x256.png</iconset>
+  </property>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>13</y>
+     <width>191</width>
+     <height>191</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="res.qrc">:/res/qtox-256x256.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QProgressBar" name="progress">
+   <property name="geometry">
+    <rect>
+     <x>206</x>
+     <y>95</y>
+     <width>171</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="minimum">
+    <number>0</number>
+   </property>
+   <property name="value">
+    <number>0</number>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+   <property name="invertedAppearance">
+    <bool>false</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_2">
+   <property name="geometry">
+    <rect>
+     <x>205</x>
+     <y>115</y>
+     <width>171</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Updating qTox ...</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_3">
+   <property name="geometry">
+    <rect>
+     <x>201</x>
+     <y>170</y>
+     <width>181</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://tox.chat&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://tox.chat&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+   <property name="openExternalLinks">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_4">
+   <property name="geometry">
+    <rect>
+     <x>200</x>
+     <y>183</y>
+     <width>181</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;a href=&quot;https://github.com/tux3/qtox&quot;&gt;https://github.com/tux3/qtox&lt;/a&gt;</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_5">
+   <property name="geometry">
+    <rect>
+     <x>195</x>
+     <y>32</y>
+     <width>191</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>14</pointsize>
+    </font>
+   </property>
+   <property name="text">
+    <string>qTox Update</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources>
+  <include location="res.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/updater/windows/updater.exe.manifest b/updater/windows/updater.exe.manifest
index 626d284d9..a6e206c80 100644
--- a/updater/windows/updater.exe.manifest
+++ b/updater/windows/updater.exe.manifest
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-      <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel
-          level="requireAdministrator"
-          uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-   </trustInfo>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+      <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="requireAdministrator"
+          uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+   </trustInfo>
 </assembly>
\ No newline at end of file
diff --git a/updater/windows/updater.rc b/updater/windows/updater.rc
index e47abcc22..80d03bd3a 100644
--- a/updater/windows/updater.rc
+++ b/updater/windows/updater.rc
@@ -1,2 +1,2 @@
-ID_ICON    ICON    DISCARDABLE    "updater.ico"
+ID_ICON    ICON    DISCARDABLE    "updater.ico"
 1 24 "updater.exe.manifest"
\ No newline at end of file