forked from teamnwah/openmw-tes3coop
replaced the signal/slot user settings update with a regular function call
This commit is contained in:
parent
b0a7b457f7
commit
1aef9304e9
2 changed files with 7 additions and 9 deletions
|
@ -51,6 +51,8 @@ namespace CSVDoc
|
||||||
|
|
||||||
virtual std::string getTitle() const;
|
virtual std::string getTitle() const;
|
||||||
|
|
||||||
|
virtual void updateUserSetting (const QString& name, const QStringList& value);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void closeEvent (QCloseEvent *event);
|
void closeEvent (QCloseEvent *event);
|
||||||
|
@ -66,10 +68,6 @@ namespace CSVDoc
|
||||||
protected slots:
|
protected slots:
|
||||||
|
|
||||||
void closeRequest();
|
void closeRequest();
|
||||||
|
|
||||||
public slots:
|
|
||||||
virtual void updateUserSetting
|
|
||||||
(const QString &, const QStringList &);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -520,11 +520,6 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
|
||||||
connect (view, SIGNAL (focusId (const CSMWorld::UniversalId&, const std::string&)), this,
|
connect (view, SIGNAL (focusId (const CSMWorld::UniversalId&, const std::string&)), this,
|
||||||
SLOT (addSubView (const CSMWorld::UniversalId&, const std::string&)));
|
SLOT (addSubView (const CSMWorld::UniversalId&, const std::string&)));
|
||||||
|
|
||||||
connect (&CSMSettings::UserSettings::instance(),
|
|
||||||
SIGNAL (userSettingUpdated (const QString &, const QStringList &)),
|
|
||||||
view,
|
|
||||||
SLOT (updateUserSetting (const QString &, const QStringList &)));
|
|
||||||
|
|
||||||
connect (view, SIGNAL (closeRequest (SubView *)), this, SLOT (closeRequest (SubView *)));
|
connect (view, SIGNAL (closeRequest (SubView *)), this, SLOT (closeRequest (SubView *)));
|
||||||
|
|
||||||
connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
|
connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
|
||||||
|
@ -744,6 +739,11 @@ void CSVDoc::View::updateUserSetting (const QString &name, const QStringList &li
|
||||||
{
|
{
|
||||||
if (name=="window/hide-subview")
|
if (name=="window/hide-subview")
|
||||||
updateSubViewIndicies (0);
|
updateSubViewIndicies (0);
|
||||||
|
|
||||||
|
foreach (SubView *subView, mSubViews)
|
||||||
|
{
|
||||||
|
subView->updateUserSetting (name, list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSVDoc::View::toggleShowStatusBar (bool show)
|
void CSVDoc::View::toggleShowStatusBar (bool show)
|
||||||
|
|
Loading…
Reference in a new issue