From 13155e5f71c8dd4132a9c182e932a5a9c9fae6c0 Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Wed, 4 Sep 2019 09:40:51 +0200 Subject: [PATCH] Make view settings in TableBrowser class static See issue #1972. --- src/TableBrowser.cpp | 3 +++ src/TableBrowser.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp index 17f8e004..f41ca16c 100644 --- a/src/TableBrowser.cpp +++ b/src/TableBrowser.cpp @@ -19,6 +19,9 @@ #include #include +QMap TableBrowser::browseTableSettings; +QString TableBrowser::defaultBrowseTableEncoding; + TableBrowser::TableBrowser(QWidget* parent) : QWidget(parent), ui(new Ui::TableBrowser), diff --git a/src/TableBrowser.h b/src/TableBrowser.h index 595b98b8..9968c8d1 100644 --- a/src/TableBrowser.h +++ b/src/TableBrowser.h @@ -164,8 +164,8 @@ private: /// re-initialized when switching to another table) SqliteTableModel* m_browseTableModel; - QMap browseTableSettings; // TODO This probably wants to be static as soon as we have multiple instances of this class - QString defaultBrowseTableEncoding; + static QMap browseTableSettings; // This is static, so settings are shared between instances + static QString defaultBrowseTableEncoding; Palette m_condFormatPalette; };