aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-10-12 17:57:18 +0300
committerCrystalwarrior <varsash@gmail.com>2019-10-12 17:57:18 +0300
commita9a0f65ddb351797d8805b28fe18b1e5114dd708 (patch)
tree6ff7e37256aa7b93e5f8d8e2760a2a6df389c987 /include
parent330aa9755095cd4f12f028452d268c50311d3710 (diff)
Allow area list to contain metadata (as well as categories for future expansion)
Fix backwards compatibility breaking when you join a server that doesn't support effects after previously joining a server that does
Diffstat (limited to 'include')
-rw-r--r--include/courtroom.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/courtroom.h b/include/courtroom.h
index 590fa0f..ea84122 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -288,10 +288,6 @@ private:
QVector<chatlogpiece> ic_chatlog_history;
- // These map music row items and area row items to their actual IDs.
- QVector<int> music_row_to_number;
- QVector<int> area_row_to_number;
-
//triggers ping_server() every 60 seconds
QTimer *keepalive_timer;
@@ -470,7 +466,7 @@ private:
AOTextArea *ui_server_chatlog;
QListWidget *ui_mute_list;
- QListWidget *ui_area_list;
+ QTreeWidget *ui_area_list;
QTreeWidget *ui_music_list;
ScrollText *ui_music_name;
@@ -651,7 +647,7 @@ private slots:
void music_synchronize(bool toggle);
void music_list_expand_all();
void music_list_collapse_all();
- void on_area_list_double_clicked(QModelIndex p_model);
+ void on_area_list_double_clicked(QTreeWidgetItem *p_item, int column);
void select_emote(int p_id);