mirror of
https://github.com/OpenMW/openmw.git
synced 2025-04-01 07:36:41 +00:00
Fixed typo in updateSubViewIndices. Changed 0 to NULL for pointers.
This commit is contained in:
parent
bf9aa2e131
commit
9539925f3e
4 changed files with 8 additions and 8 deletions
|
@ -47,7 +47,7 @@ void CSVDoc::SubView::setUniversalId (const CSMWorld::UniversalId& id)
|
||||||
|
|
||||||
void CSVDoc::SubView::closeEvent (QCloseEvent *event)
|
void CSVDoc::SubView::closeEvent (QCloseEvent *event)
|
||||||
{
|
{
|
||||||
emit updateSubViewIndicies (this);
|
emit updateSubViewIndices (this);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CSVDoc::SubView::getTitle() const
|
std::string CSVDoc::SubView::getTitle() const
|
||||||
|
|
|
@ -64,7 +64,7 @@ namespace CSVDoc
|
||||||
|
|
||||||
void updateTitle();
|
void updateTitle();
|
||||||
|
|
||||||
void updateSubViewIndicies (SubView *view = 0);
|
void updateSubViewIndices (SubView *view = NULL);
|
||||||
|
|
||||||
void universalIdChanged (const CSMWorld::UniversalId& universalId);
|
void universalIdChanged (const CSMWorld::UniversalId& universalId);
|
||||||
|
|
||||||
|
|
|
@ -343,7 +343,7 @@ void CSVDoc::View::updateTitle()
|
||||||
setWindowTitle (QString::fromUtf8(stream.str().c_str()));
|
setWindowTitle (QString::fromUtf8(stream.str().c_str()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSVDoc::View::updateSubViewIndicies(SubView *view)
|
void CSVDoc::View::updateSubViewIndices(SubView *view)
|
||||||
{
|
{
|
||||||
CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
|
CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
|
||||||
|
|
||||||
|
@ -574,7 +574,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
|
||||||
|
|
||||||
mSubViewWindow.addDockWidget (Qt::TopDockWidgetArea, view);
|
mSubViewWindow.addDockWidget (Qt::TopDockWidgetArea, view);
|
||||||
|
|
||||||
updateSubViewIndicies();
|
updateSubViewIndices();
|
||||||
|
|
||||||
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&)));
|
||||||
|
@ -583,8 +583,8 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
|
||||||
|
|
||||||
connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
|
connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
|
||||||
|
|
||||||
connect (view, SIGNAL (updateSubViewIndicies (SubView *)),
|
connect (view, SIGNAL (updateSubViewIndices (SubView *)),
|
||||||
this, SLOT (updateSubViewIndicies (SubView *)));
|
this, SLOT (updateSubViewIndices (SubView *)));
|
||||||
|
|
||||||
view->show();
|
view->show();
|
||||||
|
|
||||||
|
@ -606,7 +606,7 @@ void CSVDoc::View::moveScrollBarToEnd(int min, int max)
|
||||||
void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
|
void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
|
||||||
{
|
{
|
||||||
if (*setting=="Windows/hide-subview")
|
if (*setting=="Windows/hide-subview")
|
||||||
updateSubViewIndicies (0);
|
updateSubViewIndices (NULL);
|
||||||
else if (*setting=="Windows/mainwindow-scrollbar")
|
else if (*setting=="Windows/mainwindow-scrollbar")
|
||||||
{
|
{
|
||||||
if (setting->toString()!="Grow Only")
|
if (setting->toString()!="Grow Only")
|
||||||
|
|
|
@ -143,7 +143,7 @@ namespace CSVDoc
|
||||||
void updateTitle();
|
void updateTitle();
|
||||||
|
|
||||||
// called when subviews are added or removed
|
// called when subviews are added or removed
|
||||||
void updateSubViewIndicies (SubView *view = 0);
|
void updateSubViewIndices (SubView *view = NULL);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue