From 386e1f3b46e114b20067f38c8b31b813a74a89d0 Mon Sep 17 00:00:00 2001 From: Palakis Date: Wed, 26 Apr 2017 10:07:42 +0200 Subject: [PATCH] General: 80 columns refactor in C/C++ headers --- Config.h | 3 ++- Utils.h | 8 ++++++-- WSEvents.h | 9 ++++++--- forms/settings-dialog.cpp | 20 ++++---------------- forms/settings-dialog.h | 8 ++++---- 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/Config.h b/Config.h index 4a88b9f2..8edc611f 100644 --- a/Config.h +++ b/Config.h @@ -33,7 +33,8 @@ class Config void SetPassword(const char *password); bool CheckAuth(const char *userChallenge); const char* GenerateSalt(); - static const char* GenerateSecret(const char *password, const char *salt); + static const char* GenerateSecret( + const char *password, const char *salt); bool ServerEnabled; uint64_t ServerPort; diff --git a/Utils.h b/Utils.h index 232095af..6829ef1b 100644 --- a/Utils.h +++ b/Utils.h @@ -34,7 +34,8 @@ class Utils public: static obs_data_array_t* GetSceneItems(obs_source_t *source); static obs_data_t* GetSceneItemData(obs_scene_item *item); - static obs_sceneitem_t* GetSceneItemFromName(obs_source_t *source, const char *name); + static obs_sceneitem_t* GetSceneItemFromName( + obs_source_t *source, const char *name); static obs_source_t* GetTransitionFromName(const char *search_name); static obs_source_t* GetSceneFromNameOrCurrent(const char *scene_name); @@ -67,7 +68,10 @@ class Utils static const char* OBSVersionString(); static QSystemTrayIcon* GetTrayIcon(); - static void SysTrayNotify(QString &text, QSystemTrayIcon::MessageIcon n, QString title = QString("obs-websocket")); + static void SysTrayNotify( + QString &text, + QSystemTrayIcon::MessageIcon n, + QString title = QString("obs-websocket")); static QString FormatIPAddress(QHostAddress &addr); static const char* GetRecordingFolder(); diff --git a/WSEvents.h b/WSEvents.h index aaf0af5d..26550a83 100644 --- a/WSEvents.h +++ b/WSEvents.h @@ -31,7 +31,8 @@ class WSEvents : public QObject public: explicit WSEvents(WSServer *srv); ~WSEvents(); - static void FrontendEventHandler(enum obs_frontend_event event, void *private_data); + static void FrontendEventHandler( + enum obs_frontend_event event, void *private_data); void connectTransitionSignals(obs_source_t* transition); void connectSceneSignals(obs_source_t* scene); static WSEvents* Instance; @@ -45,7 +46,8 @@ class WSEvents : public QObject void deferredInitOperations(); void StreamStatus(); void TransitionDurationChanged(int ms); - void SelectedSceneChanged(QListWidgetItem *current, QListWidgetItem *prev); + void SelectedSceneChanged( + QListWidgetItem *current, QListWidgetItem *prev); void ModeSwitchClicked(bool checked); private: @@ -62,7 +64,8 @@ class WSEvents : public QObject uint64_t _lastBytesSent; uint64_t _lastBytesSentTime; - void broadcastUpdate(const char *updateType, obs_data_t *additionalFields); + void broadcastUpdate(const char *updateType, + obs_data_t *additionalFields); void OnSceneChange(); void OnSceneListChange(); diff --git a/forms/settings-dialog.cpp b/forms/settings-dialog.cpp index e677f175..18b25a0a 100644 --- a/forms/settings-dialog.cpp +++ b/forms/settings-dialog.cpp @@ -54,22 +54,18 @@ void SettingsDialog::showEvent(QShowEvent *event) void SettingsDialog::ToggleShowHide() { - if (!isVisible()) { + if (!isVisible()) setVisible(true); - } - else { + else setVisible(false); - } } void SettingsDialog::AuthCheckboxChanged() { - if (ui->authRequired->isChecked()) { + if (ui->authRequired->isChecked()) ui->password->setEnabled(true); - } - else { + else ui->password->setEnabled(false); - } } void SettingsDialog::FormAccepted() @@ -90,13 +86,9 @@ void SettingsDialog::FormAccepted() } if (strcmp(Config::Current()->Secret, "") != 0) - { conf->AuthRequired = true; - } else - { conf->AuthRequired = false; - } } else { @@ -106,13 +98,9 @@ void SettingsDialog::FormAccepted() conf->Save(); if (conf->ServerEnabled) - { WSServer::Instance->Start(conf->ServerPort); - } else - { WSServer::Instance->Stop(); - } } SettingsDialog::~SettingsDialog() diff --git a/forms/settings-dialog.h b/forms/settings-dialog.h index 7b3d5104..fbf87fe2 100644 --- a/forms/settings-dialog.h +++ b/forms/settings-dialog.h @@ -27,11 +27,11 @@ class SettingsDialog; class SettingsDialog : public QDialog { - Q_OBJECT + Q_OBJECT public: - explicit SettingsDialog(QWidget *parent = 0); - ~SettingsDialog(); + explicit SettingsDialog(QWidget *parent = 0); + ~SettingsDialog(); void showEvent(QShowEvent *event); void ToggleShowHide(); @@ -40,7 +40,7 @@ private Q_SLOTS: void FormAccepted(); private: - Ui::SettingsDialog *ui; + Ui::SettingsDialog *ui; }; #endif // SETTINGSDIALOG_H