Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fancytabwidget.cpp: reuse QSettings object

Browse Source 
avoid excessive locking by reusing a common QSettings object in
loadSettings.
This commit is contained in:
Antonio Russo 2019-09-10 17:29:48 -06:00
parent e2de5cd62e
commit c5c294ba14
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/mainwindow.cpp
View File

@ -297,7 +297,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
ui_->tabs->setBackgroundPixmap(QPixmap(":/sidebar_background.png"));
// Do this only after all default tabs have been added
ui_->tabs->loadSettings(kSettingsGroup);
ui_->tabs->loadSettings(settings_);
track_position_timer_->setInterval(kTrackPositionUpdateTimeMs);
connect(track_position_timer_, SIGNAL(timeout()),

5
src/widgets/fancytabwidget.cpp
View File

@ -290,10 +290,7 @@ FancyTabWidget::FancyTabWidget(QWidget* parent) : QTabWidget(parent),
connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
}
void FancyTabWidget::loadSettings(const char *kSettingsGroup) {
QSettings settings;
settings.beginGroup(kSettingsGroup);
void FancyTabWidget::loadSettings(const QSettings& settings) {
for (int i = 0; i < count(); i++) {
int originalIndex = tabBar()->tabData(i).toInt();
QString k = "tab_index_" + QString::number(originalIndex);

2
src/widgets/fancytabwidget.h
View File

@ -44,7 +44,7 @@ class FancyTabWidget : public QTabWidget {
void setBackgroundPixmap(const QPixmap& pixmap);
void addSpacer();
void loadSettings(const char *);
void loadSettings(const QSettings&);
void saveSettings(QSettings*);
// Values are persisted - only add to the end
enum Mode {