From 9008ec8d9d41e8ce523ecad5ad310fed2dfb3d8c Mon Sep 17 00:00:00 2001
From: oldmud0 <3421260-oldmud0@users.noreply.gitlab.com>
Date: Mon, 21 Jan 2019 02:49:00 +0000
Subject: Remove constexpr from aoapplication.h

---
 include/aoapplication.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 44aef7a..e698030 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -94,9 +94,9 @@ public:
 
   //////////////////versioning///////////////
 
-  constexpr int get_release() const { return RELEASE; }
-  constexpr int get_major_version() const { return MAJOR_VERSION; }
-  constexpr int get_minor_version() const { return MINOR_VERSION; }
+  int get_release() const { return RELEASE; }
+  int get_major_version() const { return MAJOR_VERSION; }
+  int get_minor_version() const { return MINOR_VERSION; }
   QString get_version_string();
 
   ///////////////////////////////////////////
-- 
cgit 


From 2e4f0117b067c6d795a7d42fe23162d41260ff74 Mon Sep 17 00:00:00 2001
From: Cerapter <cerap@protonmail.com>
Date: Thu, 9 May 2019 23:49:20 +0200
Subject: Text is now advanced based on graphemes, rather than bytes.

---
 include/courtroom.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/courtroom.h b/include/courtroom.h
index ec9f9ef..cc08f65 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -48,6 +48,7 @@
 #include <QFont>
 #include <QInputDialog>
 #include <QFileDialog>
+#include <QTextBoundaryFinder>
 
 #include <stack>
 
-- 
cgit 


From 5eccabcad15a52691228aded1d9c1fd5074fb70e Mon Sep 17 00:00:00 2001
From: David Skoland <davidskoland@gmail.com>
Date: Fri, 12 Jul 2019 23:00:25 +0000
Subject: Less insane debugging; minor refactoring (!75)

---
 include/aoapplication.h    |  1 +
 include/aoevidencebutton.h |  2 ++
 include/courtroom.h        | 12 ++++--------
 include/networkmanager.h   |  7 ++++---
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/aoapplication.h b/include/aoapplication.h
index e698030..60856ee 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -22,6 +22,7 @@
 #include <QTextStream>
 #include <QStringList>
 #include <QColor>
+#include <QScreen>
 
 class NetworkManager;
 class Lobby;
diff --git a/include/aoevidencebutton.h b/include/aoevidencebutton.h
index 27fb84b..80b747c 100644
--- a/include/aoevidencebutton.h
+++ b/include/aoevidencebutton.h
@@ -35,8 +35,10 @@ protected:
   void enterEvent(QEvent *e);
   void leaveEvent(QEvent *e);
   void mouseDoubleClickEvent(QMouseEvent *e);
+  /*
   void dragLeaveEvent(QMouseEvent *e);
   void dragEnterEvent(QMouseEvent *e);
+  */
 
 signals:
   void evidence_clicked(int p_id);
diff --git a/include/courtroom.h b/include/courtroom.h
index cc08f65..99a090b 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -35,7 +35,6 @@
 #include <QSlider>
 #include <QVector>
 #include <QCloseEvent>
-#include <QSignalMapper>
 #include <QMap>
 #include <QTextBrowser>
 #include <QSpinBox>
@@ -273,8 +272,6 @@ private:
   QVector<QString> arup_cms;
   QVector<QString> arup_locks;
 
-  QSignalMapper *char_button_mapper;
-
   QVector<chatlogpiece> ic_chatlog_history;
 
   // These map music row items and area row items to their actual IDs.
@@ -538,6 +535,7 @@ private:
   void construct_char_select();
   void set_char_select();
   void set_char_select_page();
+  void char_clicked(int n_char);
   void put_button_in_place(int starting, int chars_on_this_page);
   void filter_character_list();
 
@@ -652,14 +650,12 @@ private slots:
 
   void on_char_select_left_clicked();
   void on_char_select_right_clicked();
-  void on_char_search_changed(const QString& newtext);
-  void on_char_taken_clicked(int newstate);
-  void on_char_passworded_clicked(int newstate);
+  void on_char_search_changed();
+  void on_char_taken_clicked();
+  void on_char_passworded_clicked();
 
   void on_spectator_clicked();
 
-  void char_clicked(int n_char);
-
   void on_switch_area_music_clicked();
 
   void on_casing_clicked();
diff --git a/include/networkmanager.h b/include/networkmanager.h
index e28abfd..f26e658 100644
--- a/include/networkmanager.h
+++ b/include/networkmanager.h
@@ -44,13 +44,14 @@ public:
   QString ms_nosrv_hostname = "master.aceattorneyonline.com";
 #endif
 
-  const int ms_port = 27016;
+  const quint16 ms_port = 27016;
   const int timeout_milliseconds = 2000;
 
-  const int ms_reconnect_delay_ms = 7000;
+  // in seconds
+  const int ms_reconnect_delay = 7;
 
   // kind of arbitrary max buffer size
-  const size_t buffer_max_size = 16384;
+  #define BUFFER_MAX_SIZE 16384
 
   bool ms_partial_packet = false;
   QString ms_temp_packet = "";
-- 
cgit