anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct indentation. This was postponed from the previous commit r29530 for clarity.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29531 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-05-04 11:50:55 +00:00
parent 2b21cd2f4e
commit 0842e988e7
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/frontends/qt4/GuiView.cpp
View File

@ -536,66 +536,67 @@ void GuiView::closeEvent(QCloseEvent * close_event)
setCurrentWorkArea(currentMainWorkArea()); setCurrentWorkArea(currentMainWorkArea());
int splitter_count = d.splitter_->count(); int splitter_count = d.splitter_->count();
for (; splitter_count > 0; --splitter_count) { for (; splitter_count; --splitter_count) {
TabWorkArea * twa = d.tabWorkArea(0); TabWorkArea * twa = d.tabWorkArea(0);
int twa_count = twa->count(); int twa_count = twa->count();
for (; twa_count > 0; --twa_count) { for (; twa_count; --twa_count) {
twa->setCurrentIndex(0); twa->setCurrentIndex(0);
GuiWorkArea * wa = twa->currentWorkArea(); GuiWorkArea * wa = twa->currentWorkArea();
Buffer * b = &wa->bufferView().buffer(); Buffer * b = &wa->bufferView().buffer();
if (b->parent()) { if (b->parent()) {
// This is a child document, just close the tab // This is a child document, just close the tab
// after saving but keep the file loaded. // after saving but keep the file loaded.
if (!closeBuffer(*b, true)) { if (!closeBuffer(*b, true)) {
closing_ = false; closing_ = false;
close_event->ignore(); close_event->ignore();
return; return;
} }
continue;
}
vector<Buffer *> clist = b->getChildren();
for (vector<Buffer *>::const_iterator it = clist.begin();
it != clist.end(); ++it) {
if ((*it)->isClean())
continue; continue;
Buffer * c = *it; }
// If a child is dirty, do not close
// without user intervention vector<Buffer *> clist = b->getChildren();
if (!closeBuffer(*c, false)) { for (vector<Buffer *>::const_iterator it = clist.begin();
it != clist.end(); ++it) {
if ((*it)->isClean())
continue;
Buffer * c = *it;
// If a child is dirty, do not close
// without user intervention
if (!closeBuffer(*c, false)) {
closing_ = false;
close_event->ignore();
return;
}
}
QList<int> const ids = guiApp->viewIds();
for (int i = 0; i != ids.size(); ++i) {
if (id_ == ids[i])
continue;
if (guiApp->view(ids[i]).workArea(*b)) {
// FIXME 1: should we put an alert box here
// that the buffer is viewed elsewhere?
// FIXME 2: should we try to save this buffer in any case?
//saveBuffer(b);
// This buffer is also opened in another view, so
// close the associated work area...
removeWorkArea(wa);
// ... but don't close the buffer.
b = 0;
break;
}
}
// closeBuffer() needs buffer workArea still alive and
// set as currrent one, and destroys it
if (b && !closeBuffer(*b, true)) {
closing_ = false; closing_ = false;
close_event->ignore(); close_event->ignore();
return; return;
} }
} }
QList<int> const ids = guiApp->viewIds();
for (int i = 0; i != ids.size(); ++i) {
if (id_ == ids[i])
continue;
if (guiApp->view(ids[i]).workArea(*b)) {
// FIXME 1: should we put an alert box here that the buffer
// is viewed elsewhere?
// FIXME 2: should we try to save this buffer in any case?
//saveBuffer(b);
// This buffer is also opened in another view, so
// close the associated work area...
removeWorkArea(wa);
// ... but don't close the buffer.
b = 0;
break;
}
}
// closeBuffer() needs buffer workArea still alive and set as currrent one, and destroys it
if (b && !closeBuffer(*b, true)) {
closing_ = false;
close_event->ignore();
return;
}
}
} }
// Make sure that nothing will use this close to be closed View. // Make sure that nothing will use this close to be closed View.
guiApp->unregisterView(this); guiApp->unregisterView(this);