Reindentation and code style update

.clang-format

@@ -1,3 +1,4 @@
+# vim: set syntax=yaml :
 AccessModifierOffset: -4
 AlignEscapedNewlinesLeft: false
 AlignTrailingComments: true
@@ -24,7 +25,7 @@ IndentFunctionDeclarationAfterType: false
 IndentWidth: 4
 Language: Cpp
 MaxEmptyLinesToKeep: 2
-NamespaceIndentation: None
+NamespaceIndentation: All
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakBeforeFirstCallParameter: 100

src/aboutbox.hpp

@@ -4,7 +4,7 @@
 #include <QDialog>
 
 namespace Ui {
-class AboutBox;
+    class AboutBox;
 }
 
 class AboutBox : public QDialog {

src/cropeditor/settings/brushpenselection.hpp

@@ -5,7 +5,7 @@
 #include <cropeditor/cropscene.hpp>
 
 namespace Ui {
-class BrushPenSelection;
+    class BrushPenSelection;
 }
 
 class BrushPenSelection : public QDialog {

src/formats.hpp

@@ -4,14 +4,14 @@
 #include <QString>
 
 namespace formats {
-enum class Normal { PNG, JPG, None };
+    enum class Normal { PNG, JPG, None };
-QString normalFormatName(Normal format);
+    QString normalFormatName(Normal format);
-Normal normalFormatFromName(QString format);
+    Normal normalFormatFromName(QString format);
-QString normalFormatMIME(Normal format);
+    QString normalFormatMIME(Normal format);
 
-enum class Recording { GIF, WebM, MP4, None };
+    enum class Recording { GIF, WebM, MP4, None };
-QString recordingFormatName(Recording format);
+    QString recordingFormatName(Recording format);
-Recording recordingFormatFromName(QString format);
+    Recording recordingFormatFromName(QString format);
-QString recordingFormatMIME(Recording format);
+    QString recordingFormatMIME(Recording format);
 }
 #endif // FORMATS_HPP

src/formatter.hpp

@@ -6,7 +6,7 @@
 #include <QString>
 
 namespace formatter {
-QString format(QString toFormat, QString ext, QMap<QString, QString> variables = QMap<QString, QString>());
+    QString format(QString toFormat, QString ext, QMap<QString, QString> variables = QMap<QString, QString>());
 }
 
 #endif // FORMATTER_HPP

src/hotkeying.hpp

@@ -6,10 +6,10 @@
 #include <functional>
 
 namespace hotkeying {
-void hotkey(QString seqName, QKeySequence seq, std::function<void()> func);
+    void hotkey(QString seqName, QKeySequence seq, std::function<void()> func);
-bool valid(QString seq);
+    bool valid(QString seq);
-void load(QString seqName, std::function<void()> func, QString def = QString());
+    void load(QString seqName, std::function<void()> func, QString def = QString());
-QString sequence(QString seqName);
+    QString sequence(QString seqName);
 }
 
 #endif // HOTKEYING_HPP

src/hotkeyinputdialog.hpp

@@ -4,7 +4,7 @@
 #include <QDialog>
 
 namespace Ui {
-class HotkeyInputDialog;
+    class HotkeyInputDialog;
 }
 
 class HotkeyInputDialog : public QDialog {

src/io/ioutils.hpp

@@ -8,23 +8,25 @@
 #include <functional>
 
 namespace ioutils {
-extern QNetworkAccessManager networkManager;
+    extern QNetworkAccessManager networkManager;
-void getJson(QUrl target, QList<QPair<QString, QString>> headers, std::function<void(QJsonDocument, QByteArray, QNetworkReply *)> callback);
+    void getJson(QUrl target,
-void postJson(QUrl target,
+                 QList<QPair<QString, QString>> headers,
-              QList<QPair<QString, QString>> headers,
+                 std::function<void(QJsonDocument, QByteArray, QNetworkReply *)> callback);
-              QByteArray body,
+    void postJson(QUrl target,
-              std::function<void(QJsonDocument, QByteArray, QNetworkReply *)> callback);
+                  QList<QPair<QString, QString>> headers,
-void getData(QUrl target, QList<QPair<QString, QString>> headers, std::function<void(QByteArray, QNetworkReply *)> callback);
+                  QByteArray body,
-void postData(QUrl target, QList<QPair<QString, QString>> headers, QByteArray body, std::function<void(QByteArray, QNetworkReply *)> callback);
+                  std::function<void(QJsonDocument, QByteArray, QNetworkReply *)> callback);
-void postMultipart(QUrl target,
+    void getData(QUrl target, QList<QPair<QString, QString>> headers, std::function<void(QByteArray, QNetworkReply *)> callback);
-                   QList<QPair<QString, QString>> headers,
+    void postData(QUrl target, QList<QPair<QString, QString>> headers, QByteArray body, std::function<void(QByteArray, QNetworkReply *)> callback);
-                   QHttpMultiPart *body,
+    void postMultipart(QUrl target,
-                   std::function<void(QJsonDocument, QByteArray, QNetworkReply *)> callback);
-void postMultipartData(QUrl target,
                        QList<QPair<QString, QString>> headers,
                        QHttpMultiPart *body,
-                       std::function<void(QByteArray, QNetworkReply *)> callback);
+                       std::function<void(QJsonDocument, QByteArray, QNetworkReply *)> callback);
-QString methodString(QNetworkAccessManager::Operation operation);
+    void postMultipartData(QUrl target,
+                           QList<QPair<QString, QString>> headers,
+                           QHttpMultiPart *body,
+                           std::function<void(QByteArray, QNetworkReply *)> callback);
+    QString methodString(QNetworkAccessManager::Operation operation);
 }
 
 #endif // IOUTILS_HPP

src/logs/historydialog.hpp

@@ -4,7 +4,7 @@
 #include <QDialog>
 
 namespace Ui {
-class HistoryDialog;
+    class HistoryDialog;
 }
 
 class HistoryDialog : public QDialog {

src/logs/requestlogging.hpp

@@ -7,40 +7,40 @@
 
 
 namespace requestlogging {
-struct RequestContext {
+    struct RequestContext {
-    QByteArray response;
+        QByteArray response;
-    QNetworkReply *reply;
+        QNetworkReply *reply;
-};
+    };
 
-class LoggedRequest {
+    class LoggedRequest {
-    friend QList<LoggedRequest> getRequests();
+        friend QList<LoggedRequest> getRequests();
 
-public:
+    public:
-    QString getUrl() {
+        QString getUrl() {
-        return url;
+            return url;
-    }
+        }
-    QString getType() {
+        QString getType() {
-        return type;
+            return type;
-    }
+        }
-    QString getTime() {
+        QString getTime() {
-        return time;
+            return time;
-    }
+        }
-    int getResponseCode() {
+        int getResponseCode() {
-        return responseCode;
+            return responseCode;
-    }
+        }
-    QByteArray getResponse() {
+        QByteArray getResponse() {
-        return QFile(settings::dir().absoluteFilePath("responses/" + time)).readAll();
+            return QFile(settings::dir().absoluteFilePath("responses/" + time)).readAll();
-    }
+        }
 
-private:
+    private:
-    QString url;
+        QString url;
-    QString type;
+        QString type;
-    QString time;
+        QString time;
-    int responseCode;
+        int responseCode;
-};
+    };
 
-QList<LoggedRequest> getRequests();
+    QList<LoggedRequest> getRequests();
-void addEntry(RequestContext context);
+    void addEntry(RequestContext context);
 }
 
 #endif // REQUESTLOGGING_HPP

src/mainwindow.hpp

@@ -11,7 +11,7 @@
 #include <uploaders/uploader.hpp>
 
 namespace Ui {
-class MainWindow;
+    class MainWindow;
 }
 
 class MainWindow : public QMainWindow {

src/monospacetextdialog.hpp

@@ -4,7 +4,7 @@
 #include <QDialog>
 
 namespace Ui {
-class MonospaceTextDialog;
+    class MonospaceTextDialog;
 }
 
 class MonospaceTextDialog : public QDialog {

src/notifications.hpp

@@ -5,8 +5,8 @@
 #include <QSystemTrayIcon>
 
 namespace notifications {
-void notify(QString title, QString body, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information);
+    void notify(QString title, QString body, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information);
-void notifyNolog(QString title, QString body, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information);
+    void notifyNolog(QString title, QString body, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information);
 }
 
 #endif // NOTIFICATIONS_HPP

src/recording/encoders/encodersettingsdialog.hpp

@@ -4,7 +4,7 @@
 #include <QDialog>
 
 namespace Ui {
-class EncoderSettingsDialog;
+    class EncoderSettingsDialog;
 }
 
 class EncoderSettingsDialog : public QDialog {

src/screenshotter.hpp

@@ -2,14 +2,14 @@
 #define SCREENSHOTTER_HPP
 
 namespace screenshotter {
-void fullscreen();
+    void fullscreen();
-void fullscreenDelayed();
+    void fullscreenDelayed();
 
-void area();
+    void area();
-void areaDelayed();
+    void areaDelayed();
 
-void activeDelayed();
+    void activeDelayed();
-void active();
+    void active();
 }
 
 #endif // SCREENSHOTTER_HPP

src/screenshotutil.hpp

@@ -5,12 +5,13 @@
 #include <QWidget>
 
 namespace screenshotutil {
-QPixmap fullscreen(bool cursor = true);
+    QPixmap fullscreen(bool cursor = true);
-QPixmap fullscreenArea(bool cursor = true, qreal x = 0, qreal y = 0, qreal w = -1, qreal h = -1);
+    QPixmap fullscreenArea(bool cursor = true, qreal x = 0, qreal y = 0, qreal w = -1, qreal h = -1);
-QPixmap window(WId wid, QScreen *w = QApplication::primaryScreen());
+    QPixmap window(WId wid, QScreen *w = QApplication::primaryScreen());
-void toClipboard(QString value);
+    void toClipboard(QString value);
-QPoint smallestScreenCoordinate();
+    QPoint smallestScreenCoordinate();
-QPixmap renderText(QString toRender, int padding = 5, QColor background = Qt::transparent, QColor pen = Qt::white, QFont font = QFont());
+    QPixmap
+    renderText(QString toRender, int padding = 5, QColor background = Qt::transparent, QColor pen = Qt::white, QFont font = QFont());
 }
 
 #endif // SCREENSHOTUTIL_HPP

src/settings.hpp

@@ -5,8 +5,8 @@
 #include <QSettings>
 
 namespace settings {
-QSettings &settings();
+    QSettings &settings();
-QDir dir();
+    QDir dir();
 }
 
 #endif // SETTINGS_HPP

src/settingsdialog.hpp

@@ -6,7 +6,7 @@
 #include <uploaders/uploader.hpp>
 
 namespace Ui {
-class SettingsDialog;
+    class SettingsDialog;
 }
 
 class SettingsDialog : public QDialog {

src/uploaders/default/imgursettingsdialog.hpp

@@ -4,7 +4,7 @@
 #include <QDialog>
 
 namespace Ui {
-class ImgurSettingsDialog;
+    class ImgurSettingsDialog;
 }
 
 class ImgurSettingsDialog : public QDialog {