From 3e6a3b040735c1334e0b2f6b8fc0270bc01d365a Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Thu, 5 Oct 2017 19:21:52 +0200 Subject: [PATCH] Reindentation and code style update --- .clang-format | 3 +- src/aboutbox.hpp | 2 +- src/cropeditor/settings/brushpenselection.hpp | 2 +- src/formats.hpp | 16 ++--- src/formatter.hpp | 2 +- src/hotkeying.hpp | 8 +-- src/hotkeyinputdialog.hpp | 2 +- src/io/ioutils.hpp | 32 +++++----- src/logs/historydialog.hpp | 2 +- src/logs/requestlogging.hpp | 60 +++++++++---------- src/mainwindow.hpp | 2 +- src/monospacetextdialog.hpp | 2 +- src/notifications.hpp | 4 +- .../encoders/encodersettingsdialog.hpp | 2 +- src/screenshotter.hpp | 12 ++-- src/screenshotutil.hpp | 13 ++-- src/settings.hpp | 4 +- src/settingsdialog.hpp | 2 +- src/uploaders/default/imgursettingsdialog.hpp | 2 +- 19 files changed, 88 insertions(+), 84 deletions(-) diff --git a/.clang-format b/.clang-format index ec84205..4fbd279 100644 --- a/.clang-format +++ b/.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 diff --git a/src/aboutbox.hpp b/src/aboutbox.hpp index d0d9df1..878a9c6 100644 --- a/src/aboutbox.hpp +++ b/src/aboutbox.hpp @@ -4,7 +4,7 @@ #include namespace Ui { -class AboutBox; + class AboutBox; } class AboutBox : public QDialog { diff --git a/src/cropeditor/settings/brushpenselection.hpp b/src/cropeditor/settings/brushpenselection.hpp index eaad6e4..ac0ae90 100644 --- a/src/cropeditor/settings/brushpenselection.hpp +++ b/src/cropeditor/settings/brushpenselection.hpp @@ -5,7 +5,7 @@ #include namespace Ui { -class BrushPenSelection; + class BrushPenSelection; } class BrushPenSelection : public QDialog { diff --git a/src/formats.hpp b/src/formats.hpp index 8d46706..c4c5646 100644 --- a/src/formats.hpp +++ b/src/formats.hpp @@ -4,14 +4,14 @@ #include namespace formats { -enum class Normal { PNG, JPG, None }; -QString normalFormatName(Normal format); -Normal normalFormatFromName(QString format); -QString normalFormatMIME(Normal format); + enum class Normal { PNG, JPG, None }; + QString normalFormatName(Normal format); + Normal normalFormatFromName(QString format); + QString normalFormatMIME(Normal format); -enum class Recording { GIF, WebM, MP4, None }; -QString recordingFormatName(Recording format); -Recording recordingFormatFromName(QString format); -QString recordingFormatMIME(Recording format); + enum class Recording { GIF, WebM, MP4, None }; + QString recordingFormatName(Recording format); + Recording recordingFormatFromName(QString format); + QString recordingFormatMIME(Recording format); } #endif // FORMATS_HPP diff --git a/src/formatter.hpp b/src/formatter.hpp index e76bc44..3bf8b0f 100644 --- a/src/formatter.hpp +++ b/src/formatter.hpp @@ -6,7 +6,7 @@ #include namespace formatter { -QString format(QString toFormat, QString ext, QMap variables = QMap()); + QString format(QString toFormat, QString ext, QMap variables = QMap()); } #endif // FORMATTER_HPP diff --git a/src/hotkeying.hpp b/src/hotkeying.hpp index 696a680..4ff102c 100644 --- a/src/hotkeying.hpp +++ b/src/hotkeying.hpp @@ -6,10 +6,10 @@ #include namespace hotkeying { -void hotkey(QString seqName, QKeySequence seq, std::function func); -bool valid(QString seq); -void load(QString seqName, std::function func, QString def = QString()); -QString sequence(QString seqName); + void hotkey(QString seqName, QKeySequence seq, std::function func); + bool valid(QString seq); + void load(QString seqName, std::function func, QString def = QString()); + QString sequence(QString seqName); } #endif // HOTKEYING_HPP diff --git a/src/hotkeyinputdialog.hpp b/src/hotkeyinputdialog.hpp index 155aca4..f25b929 100644 --- a/src/hotkeyinputdialog.hpp +++ b/src/hotkeyinputdialog.hpp @@ -4,7 +4,7 @@ #include namespace Ui { -class HotkeyInputDialog; + class HotkeyInputDialog; } class HotkeyInputDialog : public QDialog { diff --git a/src/io/ioutils.hpp b/src/io/ioutils.hpp index 4bef7a3..c133d63 100644 --- a/src/io/ioutils.hpp +++ b/src/io/ioutils.hpp @@ -8,23 +8,25 @@ #include namespace ioutils { -extern QNetworkAccessManager networkManager; -void getJson(QUrl target, QList> headers, std::function callback); -void postJson(QUrl target, - QList> headers, - QByteArray body, - std::function callback); -void getData(QUrl target, QList> headers, std::function callback); -void postData(QUrl target, QList> headers, QByteArray body, std::function callback); -void postMultipart(QUrl target, - QList> headers, - QHttpMultiPart *body, - std::function callback); -void postMultipartData(QUrl target, + extern QNetworkAccessManager networkManager; + void getJson(QUrl target, + QList> headers, + std::function callback); + void postJson(QUrl target, + QList> headers, + QByteArray body, + std::function callback); + void getData(QUrl target, QList> headers, std::function callback); + void postData(QUrl target, QList> headers, QByteArray body, std::function callback); + void postMultipart(QUrl target, QList> headers, QHttpMultiPart *body, - std::function callback); -QString methodString(QNetworkAccessManager::Operation operation); + std::function callback); + void postMultipartData(QUrl target, + QList> headers, + QHttpMultiPart *body, + std::function callback); + QString methodString(QNetworkAccessManager::Operation operation); } #endif // IOUTILS_HPP diff --git a/src/logs/historydialog.hpp b/src/logs/historydialog.hpp index a3d3d36..eb10901 100644 --- a/src/logs/historydialog.hpp +++ b/src/logs/historydialog.hpp @@ -4,7 +4,7 @@ #include namespace Ui { -class HistoryDialog; + class HistoryDialog; } class HistoryDialog : public QDialog { diff --git a/src/logs/requestlogging.hpp b/src/logs/requestlogging.hpp index 87202ef..48922f2 100644 --- a/src/logs/requestlogging.hpp +++ b/src/logs/requestlogging.hpp @@ -7,40 +7,40 @@ namespace requestlogging { -struct RequestContext { - QByteArray response; - QNetworkReply *reply; -}; + struct RequestContext { + QByteArray response; + QNetworkReply *reply; + }; -class LoggedRequest { - friend QList getRequests(); + class LoggedRequest { + friend QList getRequests(); -public: - QString getUrl() { - return url; - } - QString getType() { - return type; - } - QString getTime() { - return time; - } - int getResponseCode() { - return responseCode; - } - QByteArray getResponse() { - return QFile(settings::dir().absoluteFilePath("responses/" + time)).readAll(); - } + public: + QString getUrl() { + return url; + } + QString getType() { + return type; + } + QString getTime() { + return time; + } + int getResponseCode() { + return responseCode; + } + QByteArray getResponse() { + return QFile(settings::dir().absoluteFilePath("responses/" + time)).readAll(); + } -private: - QString url; - QString type; - QString time; - int responseCode; -}; + private: + QString url; + QString type; + QString time; + int responseCode; + }; -QList getRequests(); -void addEntry(RequestContext context); + QList getRequests(); + void addEntry(RequestContext context); } #endif // REQUESTLOGGING_HPP diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp index 9cf807e..49b4a98 100644 --- a/src/mainwindow.hpp +++ b/src/mainwindow.hpp @@ -11,7 +11,7 @@ #include namespace Ui { -class MainWindow; + class MainWindow; } class MainWindow : public QMainWindow { diff --git a/src/monospacetextdialog.hpp b/src/monospacetextdialog.hpp index d2b6463..39012e0 100644 --- a/src/monospacetextdialog.hpp +++ b/src/monospacetextdialog.hpp @@ -4,7 +4,7 @@ #include namespace Ui { -class MonospaceTextDialog; + class MonospaceTextDialog; } class MonospaceTextDialog : public QDialog { diff --git a/src/notifications.hpp b/src/notifications.hpp index 137d31a..5e31597 100644 --- a/src/notifications.hpp +++ b/src/notifications.hpp @@ -5,8 +5,8 @@ #include namespace notifications { -void notify(QString title, QString body, QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information); -void notifyNolog(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); } #endif // NOTIFICATIONS_HPP diff --git a/src/recording/encoders/encodersettingsdialog.hpp b/src/recording/encoders/encodersettingsdialog.hpp index 0891c16..06f419c 100644 --- a/src/recording/encoders/encodersettingsdialog.hpp +++ b/src/recording/encoders/encodersettingsdialog.hpp @@ -4,7 +4,7 @@ #include namespace Ui { -class EncoderSettingsDialog; + class EncoderSettingsDialog; } class EncoderSettingsDialog : public QDialog { diff --git a/src/screenshotter.hpp b/src/screenshotter.hpp index 4c6be91..3932e25 100644 --- a/src/screenshotter.hpp +++ b/src/screenshotter.hpp @@ -2,14 +2,14 @@ #define SCREENSHOTTER_HPP namespace screenshotter { -void fullscreen(); -void fullscreenDelayed(); + void fullscreen(); + void fullscreenDelayed(); -void area(); -void areaDelayed(); + void area(); + void areaDelayed(); -void activeDelayed(); -void active(); + void activeDelayed(); + void active(); } #endif // SCREENSHOTTER_HPP diff --git a/src/screenshotutil.hpp b/src/screenshotutil.hpp index 91a7965..717e3f5 100644 --- a/src/screenshotutil.hpp +++ b/src/screenshotutil.hpp @@ -5,12 +5,13 @@ #include namespace screenshotutil { -QPixmap fullscreen(bool cursor = true); -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()); -void toClipboard(QString value); -QPoint smallestScreenCoordinate(); -QPixmap renderText(QString toRender, int padding = 5, QColor background = Qt::transparent, QColor pen = Qt::white, QFont font = QFont()); + QPixmap fullscreen(bool cursor = true); + 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()); + void toClipboard(QString value); + QPoint smallestScreenCoordinate(); + QPixmap + renderText(QString toRender, int padding = 5, QColor background = Qt::transparent, QColor pen = Qt::white, QFont font = QFont()); } #endif // SCREENSHOTUTIL_HPP diff --git a/src/settings.hpp b/src/settings.hpp index e363b84..e22ff91 100644 --- a/src/settings.hpp +++ b/src/settings.hpp @@ -5,8 +5,8 @@ #include namespace settings { -QSettings &settings(); -QDir dir(); + QSettings &settings(); + QDir dir(); } #endif // SETTINGS_HPP diff --git a/src/settingsdialog.hpp b/src/settingsdialog.hpp index 3b8b0d8..59cf62d 100644 --- a/src/settingsdialog.hpp +++ b/src/settingsdialog.hpp @@ -6,7 +6,7 @@ #include namespace Ui { -class SettingsDialog; + class SettingsDialog; } class SettingsDialog : public QDialog { diff --git a/src/uploaders/default/imgursettingsdialog.hpp b/src/uploaders/default/imgursettingsdialog.hpp index 2d47c1b..9e4054a 100644 --- a/src/uploaders/default/imgursettingsdialog.hpp +++ b/src/uploaders/default/imgursettingsdialog.hpp @@ -4,7 +4,7 @@ #include namespace Ui { -class ImgurSettingsDialog; + class ImgurSettingsDialog; } class ImgurSettingsDialog : public QDialog {