Merge branch '2.7-rc'

Includes full code reformat.

# Conflicts:
#	src/aomusicplayer.cpp
#	src/path_functions.cpp

1 files changed, 7 insertions, 6 deletions

diff --git a/include/aocaseannouncerdialog.h b/include/aocaseannouncerdialog.h
index da26fab0..89080def 100644
--- a/include/aocaseannouncerdialog.h
+++ b/include/aocaseannouncerdialog.h
@@ -4,20 +4,21 @@
 #include "aoapplication.h"
 #include "courtroom.h"
 
-#include <QtWidgets/QDialog>
 #include <QDialogButtonBox>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QFormLayout>
 #include <QtWidgets/QCheckBox>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QFormLayout>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
+#include <QtWidgets/QVBoxLayout>
 
-class AOCaseAnnouncerDialog : public QDialog
-{
+class AOCaseAnnouncerDialog : public QDialog {
   Q_OBJECT
 
 public:
-  explicit AOCaseAnnouncerDialog(QWidget *parent = nullptr, AOApplication *p_ao_app = nullptr, Courtroom *p_court = nullptr);
+  explicit AOCaseAnnouncerDialog(QWidget *parent = nullptr,
+                                 AOApplication *p_ao_app = nullptr,
+                                 Courtroom *p_court = nullptr);
 
 private:
   AOApplication *ao_app;