Header order

src/debug.h

@@ -47,11 +47,11 @@ class Debug : public QObject
     inline Debug& operator<<(QLatin1String t) { WARN << t; emit message(QString(t)); return *this; }
     inline Debug& operator<<(const QByteArray& t) { WARN << t; emit message(QString(t)); return *this; }
 
+public slots:
+
 signals:
     void message(const QString message);
 
-public slots:
-
 private:
     // Yes, a singleton
     inline explicit Debug() : QObject() {}

src/notification.h

@@ -10,10 +10,10 @@ class Notification : public QSystemTrayIcon
 public:
     explicit Notification(QSystemTrayIcon *parent = nullptr);
 
-signals:
-
 public slots:
     void displayNotification(QString message);
+
+signals:
 };
 
 #endif // NOTIFICATION_H

src/persistentmodel/archive.h

@@ -58,13 +58,13 @@ class Archive : public QObject, public PersistentObject
     void purge();
     bool findObjectWithKey(QString key);
 
+public slots:
+    QString archiveStats();
+
 signals:
     void changed();
     void purged();
 
-public slots:
-    QString archiveStats();
-
 private:
     QString    _name;
     QDateTime  _timestamp;

src/persistentmodel/journal.h

@@ -19,10 +19,6 @@ class Journal : public QObject, public PersistentObject
     explicit Journal(QObject *parent = nullptr);
     ~Journal();
 
-signals:
-    void logEntry(LogEntry log);
-    void journal(QVector<LogEntry> _log);
-
 public slots:
     void getJournal() { emit journal(_log); }
     void log(QString message);
@@ -37,6 +33,10 @@ public slots:
         return false;
     }
 
+signals:
+    void logEntry(LogEntry log);
+    void journal(QVector<LogEntry> _log);
+
 private:
     QVector<LogEntry> _log;
 };

src/tarsnapaccount.h

@@ -14,15 +14,15 @@ class TarsnapAccount : public QDialog
 public:
     explicit TarsnapAccount(QWidget *parent = nullptr);
 
+public slots:
+    void getAccountInfo(bool displayActivity        = false,
+                        bool displayMachineActivity = false);
+
 signals:
     void accountCredit(qreal credit, QDate date);
     void lastMachineActivity(QStringList activityFields);
     void getKeyId(QString key);
 
-public slots:
-    void getAccountInfo(bool displayActivity        = false,
-                        bool displayMachineActivity = false);
-
 protected slots:
     void parseCredit(QString csv);
     void parseLastMachineActivity(QString csv);

src/taskmanager.h

@@ -25,23 +25,6 @@ class TaskManager : public QObject
     TaskManager();
     ~TaskManager();
 
-signals:
-    // Tarsnap task notifications
-    void idle(bool status); // signal if we are working on tasks or not
-    void tarsnapVersion(QString versionString);
-    void registerMachineStatus(TaskStatus status, QString reason);
-    void fsckStatus(TaskStatus status, QString reason);
-    void archiveList(QList<ArchivePtr> archives, bool fromRemote = false);
-    void overallStats(quint64 sizeTotal, quint64 sizeCompressed,
-                      quint64 sizeUniqueTotal, quint64 sizeUniqueCompressed,
-                      quint64 archiveCount);
-    void jobsList(QMap<QString, JobPtr> jobs);
-    void message(QString msg, QString detail = "");
-    void displayNotification(QString message);
-    void taskInfo(bool backupTaskRunning, int runningTasks, int queuedTasks);
-    void error(TarsnapError error);
-    void keyId(QString key, int id);
-
 public slots:
     void loadSettings();
     void runScheduledJobs();
@@ -69,6 +52,23 @@ public slots:
     void getKeyId(QString key);
     void initializeCache();
 
+signals:
+    // Tarsnap task notifications
+    void idle(bool status); // signal if we are working on tasks or not
+    void tarsnapVersion(QString versionString);
+    void registerMachineStatus(TaskStatus status, QString reason);
+    void fsckStatus(TaskStatus status, QString reason);
+    void archiveList(QList<ArchivePtr> archives, bool fromRemote = false);
+    void overallStats(quint64 sizeTotal, quint64 sizeCompressed,
+                      quint64 sizeUniqueTotal, quint64 sizeUniqueCompressed,
+                      quint64 archiveCount);
+    void jobsList(QMap<QString, JobPtr> jobs);
+    void message(QString msg, QString detail = "");
+    void displayNotification(QString message);
+    void taskInfo(bool backupTaskRunning, int runningTasks, int queuedTasks);
+    void error(TarsnapError error);
+    void keyId(QString key, int id);
+
 private slots:
     // post Tarsnap task processing
     void getTarsnapVersionFinished(QVariant data, int exitCode, QString output);
@@ -99,7 +99,6 @@ private slots:
                            ArchivePtr archive);
     QString makeTarsnapCommand(QString cmd);
 
-private:
     QString _tarsnapDir;
     QString _tarsnapCacheDir;
     QString _tarsnapKeyFile;

src/widgets/archivelistwidget.h

@@ -23,6 +23,9 @@ public slots:
     void inspectSelectedItem();
     void restoreSelectedItem();
 
+protected:
+    void keyReleaseEvent(QKeyEvent *event);
+
 private slots:
     void removeItem();
     void inspectItem();
@@ -34,9 +37,6 @@ private slots:
     void inspectArchive(ArchivePtr archive);
     void restoreArchive(ArchivePtr archive, ArchiveRestoreOptions options);
     void displayJobDetails(QString jobRef);
-
-protected:
-    void keyReleaseEvent(QKeyEvent *event);
 };
 
 #endif // ARCHIVELISTWIDGET_H

src/widgets/backuplistitem.h

@@ -31,14 +31,14 @@ class BackupListItem : public QObject, public QListWidgetItem
     quint64 size() const;
     void setSize(const quint64 &size);
 
-signals:
-    void requestDelete();
-    void requestUpdate();
-
 public slots:
     void browseUrl();
     void updateDirDetail(quint64 size, quint64 count);
 
+signals:
+    void requestDelete();
+    void requestUpdate();
+
 private:
     Ui::BackupItemWidget _ui;
     QWidget             *_widget;

src/widgets/joblistitem.h

@@ -25,15 +25,15 @@ class JobListItem : public QObject, public QListWidgetItem
     JobPtr job() const;
     void setJob(const JobPtr &job);
 
+public slots:
+    void update();
+
 signals:
     void requestBackup();
     void requestInspect();
     void requestRestore();
     void requestDelete();
 
-public slots:
-    void update();
-
 private:
     Ui::JobItemWidget _ui;
     QWidget          *_widget;

src/widgets/joblistwidget.h

@@ -14,12 +14,6 @@ class JobListWidget : public QListWidget
     explicit JobListWidget(QWidget *parent = nullptr);
     ~JobListWidget();
 
-signals:
-    void displayJobDetails(JobPtr job);
-    void backupJob(BackupTaskPtr backup);
-    void restoreArchive(ArchivePtr archive, ArchiveRestoreOptions options);
-    void deleteJob(JobPtr job, bool purgeArchives);
-
 public slots:
     void addJobs(QMap<QString, JobPtr> jobs);
     void backupSelectedItems();
@@ -31,6 +25,15 @@ public slots:
     void restoreSelectedItem();
     void deleteSelectedItem();
 
+signals:
+    void displayJobDetails(JobPtr job);
+    void backupJob(BackupTaskPtr backup);
+    void restoreArchive(ArchivePtr archive, ArchiveRestoreOptions options);
+    void deleteJob(JobPtr job, bool purgeArchives);
+
+protected:
+    void keyReleaseEvent(QKeyEvent *event);
+
 private slots:
     void backupItem();
     void inspectItem();
@@ -39,9 +42,6 @@ private slots:
 
 private:
     void execDeleteJob(JobListItem *jobItem);
-
-protected:
-    void keyReleaseEvent(QKeyEvent *event);
 };
 
 #endif // JOBLISTWIDGET_H

src/widgets/mainwindow.h

@@ -22,6 +22,25 @@ class MainWindow : public QWidget
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
+public slots:
+    void loadSettings();
+    void initialize();
+    void updateStatusMessage(QString message, QString detail = "");
+    void updateLoadingAnimation(bool idle);
+    void updateSettingsSummary(quint64 sizeTotal, quint64 sizeCompressed,
+                               quint64 sizeUniqueTotal,
+                               quint64 sizeUniqueCompressed,
+                               quint64 archiveCount);
+    void updateTarsnapVersion(QString versionString);
+    void notificationRaise();
+    void displayStopTasks(bool backupTaskRunning, int runningTasks,
+                          int queuedTasks);
+    void tarsnapError(TarsnapError error);
+    void appendToJournalLog(LogEntry log);
+    void appendToConsoleLog(const QString &log);
+    void setJournal(QVector<LogEntry> _log);
+    void saveKeyId(QString key, int id);
+
 signals:
     void backupNow(BackupTaskPtr backupTask);
     void getArchives();
@@ -51,25 +70,6 @@ class MainWindow : public QWidget
     void keyReleaseEvent(QKeyEvent *event);
     void closeEvent(QCloseEvent *event);
 
-public slots:
-    void loadSettings();
-    void initialize();
-    void updateStatusMessage(QString message, QString detail = "");
-    void updateLoadingAnimation(bool idle);
-    void updateSettingsSummary(quint64 sizeTotal, quint64 sizeCompressed,
-                               quint64 sizeUniqueTotal,
-                               quint64 sizeUniqueCompressed,
-                               quint64 archiveCount);
-    void updateTarsnapVersion(QString versionString);
-    void notificationRaise();
-    void displayStopTasks(bool backupTaskRunning, int runningTasks,
-                          int queuedTasks);
-    void tarsnapError(TarsnapError error);
-    void appendToJournalLog(LogEntry log);
-    void appendToConsoleLog(const QString &log);
-    void setJournal(QVector<LogEntry> _log);
-    void saveKeyId(QString key, int id);
-
 private slots:
     void updateBackupItemTotals(quint64 count, quint64 size);
     void displayInspectArchive(ArchivePtr archive);

src/widgets/textlabel.h

@@ -36,18 +36,18 @@ public slots:
     //! Clears all contents, including the full text.
     void clear();
 
-protected:
-    //! Recalculates the amount of elided text to display.
-    void resizeEvent(QResizeEvent *event);
-    //! Used for detecting whether to emit \ref clicked.
-    void mouseReleaseEvent(QMouseEvent *event);
-
 signals:
     //! Emitted when the elide mode was changed.
     void elideChanged(Qt::TextElideMode elide);
     //! Emitted when this widget was clicked.
     void clicked();
 
+protected:
+    //! Recalculates the amount of elided text to display.
+    void resizeEvent(QResizeEvent *event);
+    //! Used for detecting whether to emit \ref clicked.
+    void mouseReleaseEvent(QMouseEvent *event);
+
 private:
     Qt::TextElideMode _elide;
     QString           _fullText;