fancytabwidget.cpp: reuse QSettings object
avoid excessive locking by reusing a common QSettings object in loadSettings.
This commit is contained in:
parent
e2de5cd62e
commit
c5c294ba14
|
@ -297,7 +297,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
|
||||||
ui_->tabs->setBackgroundPixmap(QPixmap(":/sidebar_background.png"));
|
ui_->tabs->setBackgroundPixmap(QPixmap(":/sidebar_background.png"));
|
||||||
|
|
||||||
// Do this only after all default tabs have been added
|
// Do this only after all default tabs have been added
|
||||||
ui_->tabs->loadSettings(kSettingsGroup);
|
ui_->tabs->loadSettings(settings_);
|
||||||
|
|
||||||
track_position_timer_->setInterval(kTrackPositionUpdateTimeMs);
|
track_position_timer_->setInterval(kTrackPositionUpdateTimeMs);
|
||||||
connect(track_position_timer_, SIGNAL(timeout()),
|
connect(track_position_timer_, SIGNAL(timeout()),
|
||||||
|
|
|
@ -290,10 +290,7 @@ FancyTabWidget::FancyTabWidget(QWidget* parent) : QTabWidget(parent),
|
||||||
connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
|
connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void FancyTabWidget::loadSettings(const char *kSettingsGroup) {
|
void FancyTabWidget::loadSettings(const QSettings& settings) {
|
||||||
QSettings settings;
|
|
||||||
settings.beginGroup(kSettingsGroup);
|
|
||||||
|
|
||||||
for (int i = 0; i < count(); i++) {
|
for (int i = 0; i < count(); i++) {
|
||||||
int originalIndex = tabBar()->tabData(i).toInt();
|
int originalIndex = tabBar()->tabData(i).toInt();
|
||||||
QString k = "tab_index_" + QString::number(originalIndex);
|
QString k = "tab_index_" + QString::number(originalIndex);
|
||||||
|
|
|
@ -44,7 +44,7 @@ class FancyTabWidget : public QTabWidget {
|
||||||
void setBackgroundPixmap(const QPixmap& pixmap);
|
void setBackgroundPixmap(const QPixmap& pixmap);
|
||||||
void addSpacer();
|
void addSpacer();
|
||||||
|
|
||||||
void loadSettings(const char *);
|
void loadSettings(const QSettings&);
|
||||||
void saveSettings(QSettings*);
|
void saveSettings(QSettings*);
|
||||||
// Values are persisted - only add to the end
|
// Values are persisted - only add to the end
|
||||||
enum Mode {
|
enum Mode {
|
||||||
|
|
Loading…
Reference in New Issue