Merge branch 'master' into 'bass-optional'

# Conflicts:
#   Attorney_Online.pro
#   include/aoapplication.h

4 files changed, 12 insertions, 11 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 6c8039c..78982f1 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 ec9f9ef..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>
@@ -48,6 +47,7 @@
 #include <QFont>
 #include <QInputDialog>
 #include <QFileDialog>
+#include <QTextBoundaryFinder>
 
 #include <stack>
 
@@ -272,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.
@@ -537,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();
 
@@ -651,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 = "";