diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/courtroom.h | 22 | ||||
| -rw-r--r-- | include/lobby.h | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/include/courtroom.h b/include/courtroom.h index 1c739b8f..f6124127 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -58,6 +58,7 @@ #include <QThread> #include <QThreadPool> #include <QFuture> +#include <QMetaObject> #include <stack> class AOApplication; @@ -81,6 +82,15 @@ public: QString current_char = ""; int current_emote = 0; AOApplication *ao_app; + //abstract widget to hold char buttons + QWidget *ui_char_buttons; + QVector<char_type> char_list; + QVector<evi_type> evidence_list; + QVector<QString> music_list; + QVector<QString> area_list; + QSignalMapper *char_button_mapper; + QVector<AOCharButton*> ui_char_button_list; + QVector<AOCharButton*> ui_char_button_list_filtered; void mt_pre_framegetter(int frameNumber); void mt_framegetter(int frameNumber); void reset_music_list() @@ -280,18 +290,11 @@ private: // The offset this user has given if they want to appear alongside someone. int offset_with_pair = 0; - QVector<char_type> char_list; - QVector<evi_type> evidence_list; - QVector<QString> music_list; - QVector<QString> area_list; - QVector<int> arup_players; QVector<QString> arup_statuses; 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. @@ -534,11 +537,6 @@ private: AOImage *ui_char_select_background; - //abstract widget to hold char buttons - QWidget *ui_char_buttons; - - QVector<AOCharButton*> ui_char_button_list; - QVector<AOCharButton*> ui_char_button_list_filtered; AOImage *ui_selector; AOButton *ui_back_to_lobby; diff --git a/include/lobby.h b/include/lobby.h index 19276a7d..3a34fb8e 100644 --- a/include/lobby.h +++ b/include/lobby.h @@ -76,7 +76,8 @@ private: AOButton *ui_cancel; void set_size_and_pos(QWidget *p_widget, QString p_identifier); - +public slots: + void fucking_threading_goddamn_it(QString fuckshitassgoddamnfuck); private slots: void on_public_servers_clicked(); void on_favorites_clicked(); |