From 156a760ebab6839c53f9c613881f0937e814414a Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Fri, 22 May 2020 17:02:32 -0500
Subject: Full revert to tag 2.6.2

Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.
---
 include/aocaseannouncerdialog.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'include/aocaseannouncerdialog.h')

diff --git a/include/aocaseannouncerdialog.h b/include/aocaseannouncerdialog.h
index 89080def..a238c3f2 100644
--- a/include/aocaseannouncerdialog.h
+++ b/include/aocaseannouncerdialog.h
@@ -4,21 +4,20 @@
 #include "aoapplication.h"
 #include "courtroom.h"
 
-#include <QDialogButtonBox>
-#include <QtWidgets/QCheckBox>
 #include <QtWidgets/QDialog>
+#include <QDialogButtonBox>
+#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QFormLayout>
+#include <QtWidgets/QCheckBox>
 #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;
@@ -37,7 +36,6 @@ private:
   QCheckBox *ui_judge_needed;
   QCheckBox *ui_juror_needed;
   QCheckBox *ui_steno_needed;
-  QCheckBox *ui_witness_needed;
 
 public slots:
   void ok_pressed();
-- 
cgit