Merge pull request #729 from Nheko-Reborn/reformat
Change indentation to 4 spaces
1 files changed, 65 insertions, 66 deletions
diff --git a/src/MainWindow.h b/src/MainWindow.h
index d9ffb9b1..eff8fbe7 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -46,93 +46,92 @@ class ReCaptcha;
class MainWindow : public QMainWindow
{
- Q_OBJECT
+ Q_OBJECT
- Q_PROPERTY(int x READ x CONSTANT)
- Q_PROPERTY(int y READ y CONSTANT)
- Q_PROPERTY(int width READ width CONSTANT)
- Q_PROPERTY(int height READ height CONSTANT)
+ Q_PROPERTY(int x READ x CONSTANT)
+ Q_PROPERTY(int y READ y CONSTANT)
+ Q_PROPERTY(int width READ width CONSTANT)
+ Q_PROPERTY(int height READ height CONSTANT)
public:
- explicit MainWindow(QWidget *parent = nullptr);
+ explicit MainWindow(QWidget *parent = nullptr);
- static MainWindow *instance() { return instance_; }
- void saveCurrentWindowSize();
+ static MainWindow *instance() { return instance_; }
+ void saveCurrentWindowSize();
- void openLeaveRoomDialog(const QString &room_id);
- void openInviteUsersDialog(std::function<void(const QStringList &invitees)> callback);
- void openCreateRoomDialog(
- std::function<void(const mtx::requests::CreateRoom &request)> callback);
- void openJoinRoomDialog(std::function<void(const QString &room_id)> callback);
- void openLogoutDialog();
+ void openLeaveRoomDialog(const QString &room_id);
+ void openInviteUsersDialog(std::function<void(const QStringList &invitees)> callback);
+ void openCreateRoomDialog(
+ std::function<void(const mtx::requests::CreateRoom &request)> callback);
+ void openJoinRoomDialog(std::function<void(const QString &room_id)> callback);
+ void openLogoutDialog();
- void hideOverlay();
- void showSolidOverlayModal(QWidget *content,
- QFlags<Qt::AlignmentFlag> flags = Qt::AlignCenter);
- void showTransparentOverlayModal(QWidget *content,
- QFlags<Qt::AlignmentFlag> flags = Qt::AlignTop |
- Qt::AlignHCenter);
+ void hideOverlay();
+ void showSolidOverlayModal(QWidget *content, QFlags<Qt::AlignmentFlag> flags = Qt::AlignCenter);
+ void showTransparentOverlayModal(QWidget *content,
+ QFlags<Qt::AlignmentFlag> flags = Qt::AlignTop |
+ Qt::AlignHCenter);
protected:
- void closeEvent(QCloseEvent *event) override;
- bool event(QEvent *event) override;
+ void closeEvent(QCloseEvent *event) override;
+ bool event(QEvent *event) override;
private slots:
- //! Handle interaction with the tray icon.
- void iconActivated(QSystemTrayIcon::ActivationReason reason);
+ //! Handle interaction with the tray icon.
+ void iconActivated(QSystemTrayIcon::ActivationReason reason);
- //! Show the welcome page in the main window.
- void showWelcomePage();
+ //! Show the welcome page in the main window.
+ void showWelcomePage();
- //! Show the login page in the main window.
- void showLoginPage();
+ //! Show the login page in the main window.
+ void showLoginPage();
- //! Show the register page in the main window.
- void showRegisterPage();
+ //! Show the register page in the main window.
+ void showRegisterPage();
- //! Show user settings page.
- void showUserSettingsPage();
+ //! Show user settings page.
+ void showUserSettingsPage();
- //! Show the chat page and start communicating with the given access token.
- void showChatPage();
+ //! Show the chat page and start communicating with the given access token.
+ void showChatPage();
- void showOverlayProgressBar();
- void removeOverlayProgressBar();
+ void showOverlayProgressBar();
+ void removeOverlayProgressBar();
- virtual void setWindowTitle(int notificationCount);
+ virtual void setWindowTitle(int notificationCount);
signals:
- void focusChanged(const bool focused);
- void reload();
+ void focusChanged(const bool focused);
+ void reload();
private:
- void showDialog(QWidget *dialog);
- bool hasActiveUser();
- void restoreWindowSize();
- //! Check if there is an open dialog.
- bool hasActiveDialogs() const;
- //! Check if the current page supports the "minimize to tray" functionality.
- bool pageSupportsTray() const;
+ void showDialog(QWidget *dialog);
+ bool hasActiveUser();
+ void restoreWindowSize();
+ //! Check if there is an open dialog.
+ bool hasActiveDialogs() const;
+ //! Check if the current page supports the "minimize to tray" functionality.
+ bool pageSupportsTray() const;
- static MainWindow *instance_;
+ static MainWindow *instance_;
- //! The initial welcome screen.
- WelcomePage *welcome_page_;
- //! The login screen.
- LoginPage *login_page_;
- //! The register page.
- RegisterPage *register_page_;
- //! A stacked widget that handles the transitions between widgets.
- QStackedWidget *pageStack_;
- //! The main chat area.
- ChatPage *chat_page_;
- UserSettingsPage *userSettingsPage_;
- QSharedPointer<UserSettings> userSettings_;
- //! Tray icon that shows the unread message count.
- TrayIcon *trayIcon_;
- //! Notifications display.
- SnackBar *snackBar_ = nullptr;
- //! Overlay modal used to project other widgets.
- OverlayModal *modal_ = nullptr;
- LoadingIndicator *spinner_ = nullptr;
+ //! The initial welcome screen.
+ WelcomePage *welcome_page_;
+ //! The login screen.
+ LoginPage *login_page_;
+ //! The register page.
+ RegisterPage *register_page_;
+ //! A stacked widget that handles the transitions between widgets.
+ QStackedWidget *pageStack_;
+ //! The main chat area.
+ ChatPage *chat_page_;
+ UserSettingsPage *userSettingsPage_;
+ QSharedPointer<UserSettings> userSettings_;
+ //! Tray icon that shows the unread message count.
+ TrayIcon *trayIcon_;
+ //! Notifications display.
+ SnackBar *snackBar_ = nullptr;
+ //! Overlay modal used to project other widgets.
+ OverlayModal *modal_ = nullptr;
+ LoadingIndicator *spinner_ = nullptr;
};
|
