From 9a95d2a936748c057db94a3083c4b9e6587eea0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 3 Sep 2007 20:28:26 +0000 Subject: [PATCH] rename a few view functions from foo() to fooView() git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20024 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Dialogs.cpp | 2 +- src/frontends/controllers/ControlExternal.cpp | 2 +- src/frontends/controllers/ControlGraphics.cpp | 2 +- .../controllers/ControlSpellchecker.cpp | 4 ++-- src/frontends/controllers/ControlTabular.cpp | 4 ++-- src/frontends/controllers/Dialog.cpp | 24 +++++++++---------- src/frontends/controllers/Dialog.h | 18 +++++++------- src/frontends/qt4/DockView.h | 13 +++++----- src/frontends/qt4/GuiAbout.h | 2 +- src/frontends/qt4/GuiBibitem.cpp | 2 +- src/frontends/qt4/GuiBibitem.h | 2 +- src/frontends/qt4/GuiBibtex.cpp | 2 +- src/frontends/qt4/GuiBibtex.h | 2 +- src/frontends/qt4/GuiBox.cpp | 2 +- src/frontends/qt4/GuiBox.h | 2 +- src/frontends/qt4/GuiBranch.cpp | 2 +- src/frontends/qt4/GuiBranch.h | 2 +- src/frontends/qt4/GuiBranches.cpp | 12 +++++----- src/frontends/qt4/GuiBranches.h | 2 +- src/frontends/qt4/GuiChanges.h | 2 +- src/frontends/qt4/GuiCharacter.cpp | 2 +- src/frontends/qt4/GuiCharacter.h | 2 +- src/frontends/qt4/GuiCitation.cpp | 20 ++++++++-------- src/frontends/qt4/GuiCitation.h | 12 +++++----- src/frontends/qt4/GuiDelimiter.h | 2 +- src/frontends/qt4/GuiDialog.cpp | 2 +- src/frontends/qt4/GuiDialogView.cpp | 10 ++++---- src/frontends/qt4/GuiDialogView.h | 8 +++---- src/frontends/qt4/GuiDocument.cpp | 4 ++-- src/frontends/qt4/GuiDocument.h | 2 +- src/frontends/qt4/GuiERT.cpp | 2 +- src/frontends/qt4/GuiERT.h | 2 +- src/frontends/qt4/GuiEmbeddedFiles.cpp | 2 +- src/frontends/qt4/GuiEmbeddedFiles.h | 2 +- src/frontends/qt4/GuiErrorList.cpp | 2 +- src/frontends/qt4/GuiErrorList.h | 2 +- src/frontends/qt4/GuiExternal.cpp | 5 ++-- src/frontends/qt4/GuiExternal.h | 4 ++-- src/frontends/qt4/GuiFloat.cpp | 2 +- src/frontends/qt4/GuiFloat.h | 2 +- src/frontends/qt4/GuiFontLoader.cpp | 3 ++- src/frontends/qt4/GuiGraphics.cpp | 4 ++-- src/frontends/qt4/GuiGraphics.h | 4 ++-- src/frontends/qt4/GuiInclude.cpp | 4 ++-- src/frontends/qt4/GuiInclude.h | 4 ++-- src/frontends/qt4/GuiIndex.cpp | 2 +- src/frontends/qt4/GuiIndex.h | 2 +- src/frontends/qt4/GuiListings.cpp | 2 +- src/frontends/qt4/GuiListings.h | 2 +- src/frontends/qt4/GuiLog.cpp | 2 +- src/frontends/qt4/GuiLog.h | 2 +- src/frontends/qt4/GuiMathMatrix.h | 2 +- src/frontends/qt4/GuiMenubar.h | 2 +- src/frontends/qt4/GuiNomencl.cpp | 4 ++-- src/frontends/qt4/GuiNomencl.h | 4 ++-- src/frontends/qt4/GuiNote.cpp | 2 +- src/frontends/qt4/GuiNote.h | 2 +- src/frontends/qt4/GuiParagraph.cpp | 2 +- src/frontends/qt4/GuiParagraph.h | 2 +- src/frontends/qt4/GuiPopupMenu.cpp | 2 +- src/frontends/qt4/GuiPopupMenu.h | 2 +- src/frontends/qt4/GuiPrefs.cpp | 20 ++++++++-------- src/frontends/qt4/GuiPrefs.h | 6 ++--- src/frontends/qt4/GuiPrint.cpp | 2 +- src/frontends/qt4/GuiPrint.h | 2 +- src/frontends/qt4/GuiRef.cpp | 4 ++-- src/frontends/qt4/GuiRef.h | 4 ++-- src/frontends/qt4/GuiSearch.cpp | 2 +- src/frontends/qt4/GuiSearch.h | 4 ++-- src/frontends/qt4/GuiSelectionManager.cpp | 2 +- src/frontends/qt4/GuiSelectionManager.h | 6 ++--- src/frontends/qt4/GuiSendto.cpp | 2 +- src/frontends/qt4/GuiSendto.h | 2 +- src/frontends/qt4/GuiShowFile.h | 2 +- src/frontends/qt4/GuiSpellchecker.cpp | 2 +- src/frontends/qt4/GuiSpellchecker.h | 2 +- src/frontends/qt4/GuiTabular.h | 2 +- src/frontends/qt4/GuiTabularCreate.cpp | 2 +- src/frontends/qt4/GuiTabularCreate.h | 2 +- src/frontends/qt4/GuiTexinfo.cpp | 2 +- src/frontends/qt4/GuiTexinfo.h | 4 ++-- src/frontends/qt4/GuiThesaurus.h | 2 +- src/frontends/qt4/GuiToc.cpp | 4 ++-- src/frontends/qt4/GuiToc.h | 2 +- src/frontends/qt4/GuiURL.cpp | 2 +- src/frontends/qt4/GuiURL.h | 2 +- src/frontends/qt4/GuiVSpace.cpp | 2 +- src/frontends/qt4/GuiVSpace.h | 2 +- src/frontends/qt4/GuiView.cpp | 2 +- src/frontends/qt4/GuiView.h | 2 +- src/frontends/qt4/GuiViewSource.cpp | 2 +- src/frontends/qt4/GuiViewSource.h | 2 +- src/frontends/qt4/GuiWorkArea.h | 4 ---- src/frontends/qt4/GuiWrap.cpp | 2 +- src/frontends/qt4/GuiWrap.h | 2 +- src/frontends/qt4/TocWidget.cpp | 2 +- src/frontends/qt4/TocWidget.h | 3 ++- 97 files changed, 177 insertions(+), 181 deletions(-) diff --git a/src/frontends/Dialogs.cpp b/src/frontends/Dialogs.cpp index 610c20fb8c..a26ed15883 100644 --- a/src/frontends/Dialogs.cpp +++ b/src/frontends/Dialogs.cpp @@ -181,7 +181,7 @@ void Dialogs::updateBufferDependent(bool switched) const Dialog * dialog = it->second.get(); if (switched && dialog->controller().isBufferDependent()) { if (dialog->isVisible() && dialog->controller().initialiseParams("")) - dialog->view().update(); + dialog->view().updateView(); else dialog->hide(); } else { diff --git a/src/frontends/controllers/ControlExternal.cpp b/src/frontends/controllers/ControlExternal.cpp index deeb8b6e90..89b564431c 100644 --- a/src/frontends/controllers/ControlExternal.cpp +++ b/src/frontends/controllers/ControlExternal.cpp @@ -92,7 +92,7 @@ void ControlExternal::editExternal() { BOOST_ASSERT(params_.get()); - dialog().view().apply(); + dialog().view().applyView(); string const lfun = InsetExternalMailer::params2string(params(), kernel().buffer()); kernel().dispatch(FuncRequest(LFUN_EXTERNAL_EDIT, lfun)); diff --git a/src/frontends/controllers/ControlGraphics.cpp b/src/frontends/controllers/ControlGraphics.cpp index c6285ea2c0..93d3c354d0 100644 --- a/src/frontends/controllers/ControlGraphics.cpp +++ b/src/frontends/controllers/ControlGraphics.cpp @@ -142,7 +142,7 @@ void ControlGraphics::editGraphics() { BOOST_ASSERT(params_.get()); - dialog().view().apply(); + dialog().view().applyView(); string const lfun = InsetGraphicsMailer::params2string(params(), kernel().buffer()); kernel().dispatch(FuncRequest(LFUN_GRAPHICS_EDIT, lfun)); diff --git a/src/frontends/controllers/ControlSpellchecker.cpp b/src/frontends/controllers/ControlSpellchecker.cpp index d1954c8498..34ad420c4e 100644 --- a/src/frontends/controllers/ControlSpellchecker.cpp +++ b/src/frontends/controllers/ControlSpellchecker.cpp @@ -233,7 +233,7 @@ void ControlSpellchecker::check() LYXERR(Debug::GUI) << "Updating spell progress." << endl; oldval_ = newvalue_; // set progress bar - dialog().view().partialUpdate(SPELL_PROGRESSED); + dialog().view().partialUpdateView(SPELL_PROGRESSED); } // speller might be dead ... @@ -261,7 +261,7 @@ void ControlSpellchecker::check() // set suggestions if (res != SpellBase::OK && res != SpellBase::IGNORED_WORD) { LYXERR(Debug::GUI) << "Found a word needing checking." << endl; - dialog().view().partialUpdate(SPELL_FOUND_WORD); + dialog().view().partialUpdateView(SPELL_FOUND_WORD); } } diff --git a/src/frontends/controllers/ControlTabular.cpp b/src/frontends/controllers/ControlTabular.cpp index 4a2bec268a..46d79761eb 100644 --- a/src/frontends/controllers/ControlTabular.cpp +++ b/src/frontends/controllers/ControlTabular.cpp @@ -142,14 +142,14 @@ void ControlTabular::setWidth(string const & width) else set(Tabular::SET_PWIDTH, width); - dialog().view().update(); + dialog().view().updateView(); } void ControlTabular::toggleMultiColumn() { set(Tabular::MULTICOLUMN); - dialog().view().update(); + dialog().view().updateView(); } diff --git a/src/frontends/controllers/Dialog.cpp b/src/frontends/controllers/Dialog.cpp index aae5975acd..bbebbbd45e 100644 --- a/src/frontends/controllers/Dialog.cpp +++ b/src/frontends/controllers/Dialog.cpp @@ -34,7 +34,7 @@ Dialog::~Dialog() {} -void Dialog::setButtonsValid(bool valid) +void Dialog::setButtonsValid(bool /*valid*/) {} @@ -51,7 +51,7 @@ void Dialog::show(string const & data) } preShow(); - view().show(); + view().showView(); postShow(); } @@ -68,7 +68,7 @@ void Dialog::update(string const & data) } preUpdate(); - view().update(); + view().updateView(); postUpdate(); } @@ -80,11 +80,11 @@ void Dialog::checkStatus() void Dialog::hide() { - if (!view().isVisible()) + if (!view().isVisibleView()) return; controller().clearParams(); - view().hide(); + view().hideView(); kernel().disconnect(name()); } @@ -98,26 +98,26 @@ void Dialog::apply() return; } - view().apply(); + view().applyView(); controller().dispatchParams(); if (controller().disconnectOnApply() && !is_closing_) { kernel().disconnect(name()); controller().initialiseParams(string()); - view().update(); + view().updateView(); } } bool Dialog::isVisible() const { - return view().isVisible(); + return view().isVisibleView(); } void Dialog::redraw() { - view().redraw(); + view().redrawView(); } @@ -168,19 +168,19 @@ Dialog::View & Dialog::view() const } -void Dialog::View::setTitle(docstring const & newtitle) +void Dialog::View::setViewTitle(docstring const & newtitle) { title_ = newtitle; } -docstring const & Dialog::View::getTitle() const +docstring const & Dialog::View::getViewTitle() const { return title_; } -void Dialog::View::partialUpdate(int) +void Dialog::View::partialUpdateView(int) {} } // namespace frontend diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/controllers/Dialog.h index 89d93a0f7c..86122ff5bb 100644 --- a/src/frontends/controllers/Dialog.h +++ b/src/frontends/controllers/Dialog.h @@ -243,22 +243,22 @@ public: * accompanying Controller in preparation for their dispatch to * the LyX kernel. */ - virtual void apply() = 0; + virtual void applyView() = 0; /// Hide the dialog from sight - virtual void hide() = 0; + virtual void hideView() = 0; /// Redraw the dialog (e.g. if the colors have been remapped). - virtual void redraw() {} + virtual void redrawView() {} /// Create the dialog if necessary, update it and display it. - virtual void show() = 0; + virtual void showView() = 0; /// Update the display of the dialog whilst it is still visible. - virtual void update() = 0; + virtual void updateView() = 0; /// \return true if the dialog is visible. - virtual bool isVisible() const = 0; + virtual bool isVisibleView() const = 0; //@} /** Defaults to nothing. Can be used by the Controller, however, to @@ -266,12 +266,12 @@ public: * dialog therefore needs updating. * \param id identifies what should be updated. */ - virtual void partialUpdate(int id); + virtual void partialUpdateView(int id); /// sets the title of the dialog (window caption) - void setTitle(docstring const &); + void setViewTitle(docstring const &); /// gets the title of the dialog (window caption) - docstring const & getTitle() const; + docstring const & getViewTitle() const; /** \name View Access * Enable the derived classes to access the other parts of the whole. diff --git a/src/frontends/qt4/DockView.h b/src/frontends/qt4/DockView.h index d83b75814b..6113077362 100644 --- a/src/frontends/qt4/DockView.h +++ b/src/frontends/qt4/DockView.h @@ -50,13 +50,12 @@ public: /// Dialog::View inherited methods //@{ - void apply() {} - void hide() { QDockWidget::hide(); } - void show() { QDockWidget::show(); } - bool isVisible() const - { return QDockWidget::isVisible(); } - void redraw() {} - void update() + void applyView() {} + void hideView() { QDockWidget::hide(); } + void showView() { QDockWidget::show(); } + bool isVisibleView() const { return QDockWidget::isVisible(); } + void redrawView() {} + void updateView() { widget_->update(); QDockWidget::update(); diff --git a/src/frontends/qt4/GuiAbout.h b/src/frontends/qt4/GuiAbout.h index 27ed42ed79..d75f9a8602 100644 --- a/src/frontends/qt4/GuiAbout.h +++ b/src/frontends/qt4/GuiAbout.h @@ -45,7 +45,7 @@ public: { return static_cast(this->getController()); } private: /// not needed - virtual void apply() {} + virtual void applyView() {} /// not needed virtual void update_contents() {} // build the dialog diff --git a/src/frontends/qt4/GuiBibitem.cpp b/src/frontends/qt4/GuiBibitem.cpp index 3f9412640a..83b488dc16 100644 --- a/src/frontends/qt4/GuiBibitem.cpp +++ b/src/frontends/qt4/GuiBibitem.cpp @@ -85,7 +85,7 @@ void GuiBibitem::update_contents() } -void GuiBibitem::apply() +void GuiBibitem::applyView() { controller().params()["key"] = qstring_to_ucs4(dialog_->keyED->text()); controller().params()["label"] = qstring_to_ucs4(dialog_->labelED->text()); diff --git a/src/frontends/qt4/GuiBibitem.h b/src/frontends/qt4/GuiBibitem.h index 57b536f16f..d5bfe816b6 100644 --- a/src/frontends/qt4/GuiBibitem.h +++ b/src/frontends/qt4/GuiBibitem.h @@ -54,7 +54,7 @@ protected: private: friend class GuiBibitemDialog; /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp index 0dba536ab4..aacca6a257 100644 --- a/src/frontends/qt4/GuiBibtex.cpp +++ b/src/frontends/qt4/GuiBibtex.cpp @@ -331,7 +331,7 @@ void GuiBibtex::update_contents() } -void GuiBibtex::apply() +void GuiBibtex::applyView() { docstring dbs(qstring_to_ucs4(dialog_->databaseLW->item(0)->text())); diff --git a/src/frontends/qt4/GuiBibtex.h b/src/frontends/qt4/GuiBibtex.h index 30afc2ba5e..f18dfa339a 100644 --- a/src/frontends/qt4/GuiBibtex.h +++ b/src/frontends/qt4/GuiBibtex.h @@ -82,7 +82,7 @@ protected: virtual bool isValid(); private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp index 3b06509ce3..eee87f8790 100644 --- a/src/frontends/qt4/GuiBox.cpp +++ b/src/frontends/qt4/GuiBox.cpp @@ -256,7 +256,7 @@ void GuiBox::update_contents() } -void GuiBox::apply() +void GuiBox::applyView() { controller().params().type = ids_[dialog_->typeCO->currentIndex()]; diff --git a/src/frontends/qt4/GuiBox.h b/src/frontends/qt4/GuiBox.h index 1cd65f96c5..cba4d4b45d 100644 --- a/src/frontends/qt4/GuiBox.h +++ b/src/frontends/qt4/GuiBox.h @@ -62,7 +62,7 @@ private: /// friend class GuiBoxDialog; /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp index 78af17f9f6..17d53df241 100644 --- a/src/frontends/qt4/GuiBranch.cpp +++ b/src/frontends/qt4/GuiBranch.cpp @@ -100,7 +100,7 @@ void GuiBranch::update_contents() } -void GuiBranch::apply() +void GuiBranch::applyView() { docstring const type = qstring_to_ucs4(dialog_->branchCO->currentText()); controller().params().branch = type; diff --git a/src/frontends/qt4/GuiBranch.h b/src/frontends/qt4/GuiBranch.h index 2bf448d46c..c2edce47ad 100644 --- a/src/frontends/qt4/GuiBranch.h +++ b/src/frontends/qt4/GuiBranch.h @@ -53,7 +53,7 @@ private: friend class GuiBranchDialog; /// Apply changes - virtual void apply(); + virtual void applyView(); /// Build the dialog virtual void build_dialog(); /// Update dialog before showing it diff --git a/src/frontends/qt4/GuiBranches.cpp b/src/frontends/qt4/GuiBranches.cpp index 1529a7880d..dd3cdba6cf 100644 --- a/src/frontends/qt4/GuiBranches.cpp +++ b/src/frontends/qt4/GuiBranches.cpp @@ -48,10 +48,10 @@ GuiBranches::GuiBranches(QWidget * parent, Qt::WFlags f) void GuiBranches::update(BufferParams const & params) { branchlist_ = params.branchlist(); - update(); + updateView(); } -void GuiBranches::update() +void GuiBranches::updateView() { // store the selected branch QTreeWidgetItem * item = branchesTW->currentItem(); @@ -100,7 +100,7 @@ void GuiBranches::on_addBranchPB_pressed() if (!new_branch.isEmpty()) { branchlist_.add(qstring_to_ucs4(new_branch)); newBranchLE->clear(); - update(); + updateView(); } } @@ -115,7 +115,7 @@ void GuiBranches::on_removePB_pressed() if (!sel_branch.isEmpty()) { branchlist_.remove(qstring_to_ucs4(sel_branch)); newBranchLE->clear(); - update(); + updateView(); } } @@ -146,7 +146,7 @@ void GuiBranches::toggleBranch(QTreeWidgetItem * item) Branch * branch = branchlist_.find(qstring_to_ucs4(sel_branch)); if (branch && branch->setSelected(!selected)) { newBranchLE->clear(); - update(); + updateView(); } } } @@ -177,7 +177,7 @@ void GuiBranches::toggleColor(QTreeWidgetItem * item) // add the color to the branchlist branch->setColor(fromqstr(ncol.name())); newBranchLE->clear(); - update(); + updateView(); } } } diff --git a/src/frontends/qt4/GuiBranches.h b/src/frontends/qt4/GuiBranches.h index e77dc25a3f..7e36a120ee 100644 --- a/src/frontends/qt4/GuiBranches.h +++ b/src/frontends/qt4/GuiBranches.h @@ -45,7 +45,7 @@ Q_SIGNALS: protected: void toggleBranch(QTreeWidgetItem *); void toggleColor(QTreeWidgetItem *); - void update(); + void updateView(); protected Q_SLOTS: void on_addBranchPB_pressed(); diff --git a/src/frontends/qt4/GuiChanges.h b/src/frontends/qt4/GuiChanges.h index 19efd6e31d..54e3611066 100644 --- a/src/frontends/qt4/GuiChanges.h +++ b/src/frontends/qt4/GuiChanges.h @@ -64,7 +64,7 @@ public: private: friend class GuiChangesDialog; /// Apply changes - virtual void apply() {}; + virtual void applyView() {}; /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index 369486cd60..e49e5c3328 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -192,7 +192,7 @@ void GuiCharacter::update_contents() } -void GuiCharacter::apply() +void GuiCharacter::applyView() { ControlCharacter & ctrl = controller(); diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h index 519901dcd6..5f0145c066 100644 --- a/src/frontends/qt4/GuiCharacter.h +++ b/src/frontends/qt4/GuiCharacter.h @@ -53,7 +53,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp index 94ce988001..f932d1efac 100644 --- a/src/frontends/qt4/GuiCitation.cpp +++ b/src/frontends/qt4/GuiCitation.cpp @@ -79,7 +79,7 @@ GuiCitationDialog::GuiCitationDialog(Dialog & dialog, GuiCitation * form) { setupUi(this); - setWindowTitle(toqstr("LyX: " + getTitle())); + setWindowTitle(toqstr("LyX: " + getViewTitle())); connect(citationStyleCO, SIGNAL(activated(int)), this, SLOT(changed())); @@ -129,7 +129,7 @@ void GuiCitationDialog::closeEvent(QCloseEvent * e) } -void GuiCitationDialog::apply() +void GuiCitationDialog::applyView() { int const choice = std::max(0, citationStyleCO->currentIndex()); style_ = choice; @@ -143,14 +143,14 @@ void GuiCitationDialog::apply() } -void GuiCitationDialog::hide() +void GuiCitationDialog::hideView() { form_->clearParams(); accept(); } -void GuiCitationDialog::show() +void GuiCitationDialog::showView() { findLE->clear(); availableLV->setFocus(); @@ -160,7 +160,7 @@ void GuiCitationDialog::show() } -bool GuiCitationDialog::isVisible() const +bool GuiCitationDialog::isVisibleView() const { return QDialog::isVisible(); } @@ -168,9 +168,9 @@ bool GuiCitationDialog::isVisible() const void GuiCitationDialog::on_okPB_clicked() { - apply(); + applyView(); form_->clearSelection(); - hide(); + hideView(); } @@ -183,7 +183,7 @@ void GuiCitationDialog::on_cancelPB_clicked() void GuiCitationDialog::on_applyPB_clicked() { - apply(); + applyView(); } @@ -194,7 +194,7 @@ void GuiCitationDialog::on_restorePB_clicked() } -void GuiCitationDialog::update() +void GuiCitationDialog::updateView() { fillFields(); fillEntries(); @@ -356,7 +356,7 @@ bool GuiCitationDialog::isSelected(const QModelIndex & idx) void GuiCitationDialog::setButtons() { - selectionManager->update(); + selectionManager->updateView(); int const srows = selectedLV->model()->rowCount(); applyPB->setEnabled(srows > 0); okPB->setEnabled(srows > 0); diff --git a/src/frontends/qt4/GuiCitation.h b/src/frontends/qt4/GuiCitation.h index 7de1d472ed..c2ba5ebd0d 100644 --- a/src/frontends/qt4/GuiCitation.h +++ b/src/frontends/qt4/GuiCitation.h @@ -40,23 +40,23 @@ public: virtual ~GuiCitationDialog(); - virtual void apply(); + virtual void applyView(); /// Hide the dialog from sight - void hide(); + void hideView(); /// Redraw the dialog (e.g. if the colors have been remapped). - void redraw() {} + void redrawView() {} /// Create the dialog if necessary, update it and display it. - void show(); + void showView(); /// \return true if the dialog is visible. - bool isVisible() const; + bool isVisibleView() const; public Q_SLOTS: /// Update the display of the dialog whilst it is still visible. - void update(); + void updateView(); protected: void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt4/GuiDelimiter.h b/src/frontends/qt4/GuiDelimiter.h index b57b1c2734..67ffdb7165 100644 --- a/src/frontends/qt4/GuiDelimiter.h +++ b/src/frontends/qt4/GuiDelimiter.h @@ -62,7 +62,7 @@ public: ControlMath const & controller() const { return static_cast(this->getController()); } private: - virtual void apply() {} + virtual void applyView() {} virtual void update_contents() {} /// Build the dialog. virtual void build_dialog(); diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp index 581ac333c3..a46c9ce1ea 100644 --- a/src/frontends/qt4/GuiDialog.cpp +++ b/src/frontends/qt4/GuiDialog.cpp @@ -56,7 +56,7 @@ void GuiDialog::RestoreButton() { // Tell the kernel that a request to refresh the dialog's contents // has been received. It's up to the kernel to supply the necessary - // info by calling GuiDialog::update(). + // info by calling GuiDialog::updateView(). kernel().updateDialog(name_); bc().restore(); } diff --git a/src/frontends/qt4/GuiDialogView.cpp b/src/frontends/qt4/GuiDialogView.cpp index 716aef5f68..b9e16c4778 100644 --- a/src/frontends/qt4/GuiDialogView.cpp +++ b/src/frontends/qt4/GuiDialogView.cpp @@ -28,7 +28,7 @@ ButtonController & GuiDialogView::bc() } -bool GuiDialogView::isVisible() const +bool GuiDialogView::isVisibleView() const { return form() && form()->isVisible(); } @@ -40,7 +40,7 @@ bool GuiDialogView::readOnly() const } -void GuiDialogView::show() +void GuiDialogView::showView() { if (!form()) build(); @@ -49,11 +49,11 @@ void GuiDialogView::show() if (sizeHint.height() >= 0 && sizeHint.width() >= 0) form()->setMinimumSize(sizeHint); - update(); // make sure its up-to-date + updateView(); // make sure its up-to-date if (dialog().controller().exitEarly()) return; - form()->setWindowTitle(toqstr("LyX: " + getTitle())); + form()->setWindowTitle(toqstr("LyX: " + getViewTitle())); if (form()->isVisible()) { form()->raise(); @@ -66,7 +66,7 @@ void GuiDialogView::show() } -void GuiDialogView::hide() +void GuiDialogView::hideView() { if (form() && form()->isVisible()) form()->hide(); diff --git a/src/frontends/qt4/GuiDialogView.h b/src/frontends/qt4/GuiDialogView.h index 8da53c57d3..73b5b0627d 100644 --- a/src/frontends/qt4/GuiDialogView.h +++ b/src/frontends/qt4/GuiDialogView.h @@ -48,13 +48,13 @@ protected: /// Build the dialog virtual void build(); /// Hide the dialog. - virtual void hide(); + virtual void hideView(); /// Create the dialog if necessary, update it and display it. - virtual void show(); + virtual void showView(); /// update the dialog's contents virtual void update_contents() = 0; /// - virtual bool isVisible() const; + virtual bool isVisibleView() const; /// is the dialog currently valid ? virtual bool isValid(); @@ -91,7 +91,7 @@ protected: virtual ~GuiView() {} /// update the dialog - virtual void update() { + virtual void updateView() { dialog_->setUpdatesEnabled(false); // protect the BC from unwarranted state transitions diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 9119b22501..5486867ead 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1417,7 +1417,7 @@ void GuiDocument::showPreamble() } -void GuiDocument::apply() +void GuiDocument::applyView() { if (!dialog_.get()) return; @@ -1437,7 +1437,7 @@ void GuiDocument::update_contents() void GuiDocument::saveDocDefault() { // we have to apply the params first - apply(); + applyView(); controller().saveAsDefault(); } diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h index 296e0140d6..3607b8fc45 100644 --- a/src/frontends/qt4/GuiDocument.h +++ b/src/frontends/qt4/GuiDocument.h @@ -134,7 +134,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - void apply(); + void applyView(); /// update void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiERT.cpp b/src/frontends/qt4/GuiERT.cpp index a8648c9792..394a4fc7a6 100644 --- a/src/frontends/qt4/GuiERT.cpp +++ b/src/frontends/qt4/GuiERT.cpp @@ -73,7 +73,7 @@ void GuiERT::build_dialog() } -void GuiERT::apply() +void GuiERT::applyView() { if (dialog_->openRB->isChecked()) controller().setStatus(Inset::Open); diff --git a/src/frontends/qt4/GuiERT.h b/src/frontends/qt4/GuiERT.h index e95b734f0a..d49f9d5ef2 100644 --- a/src/frontends/qt4/GuiERT.h +++ b/src/frontends/qt4/GuiERT.h @@ -51,7 +51,7 @@ public: private: friend class GuiERTDialog; /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiEmbeddedFiles.cpp b/src/frontends/qt4/GuiEmbeddedFiles.cpp index 49ebc9427f..0b88b4200f 100644 --- a/src/frontends/qt4/GuiEmbeddedFiles.cpp +++ b/src/frontends/qt4/GuiEmbeddedFiles.cpp @@ -83,7 +83,7 @@ void GuiEmbeddedFilesDialog::on_filesLW_itemDoubleClicked() } -void GuiEmbeddedFilesDialog::update() +void GuiEmbeddedFilesDialog::updateView() { filesLW->clear(); diff --git a/src/frontends/qt4/GuiEmbeddedFiles.h b/src/frontends/qt4/GuiEmbeddedFiles.h index edbebb0007..e5c5c0615a 100644 --- a/src/frontends/qt4/GuiEmbeddedFiles.h +++ b/src/frontends/qt4/GuiEmbeddedFiles.h @@ -32,7 +32,7 @@ public Q_SLOTS: /// void on_filesLW_itemDoubleClicked(); /// - void update(); + void updateView(); /// void on_enableCB_toggled(bool enable); /// diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp index 526f299688..8630ffd8ef 100644 --- a/src/frontends/qt4/GuiErrorList.cpp +++ b/src/frontends/qt4/GuiErrorList.cpp @@ -90,7 +90,7 @@ void GuiErrorList::select(QListWidgetItem * wi) void GuiErrorList::update_contents() { - setTitle(from_utf8(controller().name())); + setViewTitle(from_utf8(controller().name())); dialog_->errorsLW->clear(); dialog_->descriptionTB->setPlainText(QString()); diff --git a/src/frontends/qt4/GuiErrorList.h b/src/frontends/qt4/GuiErrorList.h index 2ed5f72da7..8f64962f72 100644 --- a/src/frontends/qt4/GuiErrorList.h +++ b/src/frontends/qt4/GuiErrorList.h @@ -56,7 +56,7 @@ private: /// select an entry void select(QListWidgetItem *); /// required apply - virtual void apply() {} + virtual void applyView() {} /// build dialog virtual void build_dialog(); /// update contents diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp index 44ffefd58a..0def0d943c 100644 --- a/src/frontends/qt4/GuiExternal.cpp +++ b/src/frontends/qt4/GuiExternal.cpp @@ -129,13 +129,12 @@ GuiExternalDialog::GuiExternalDialog(GuiExternal * form) } -void GuiExternalDialog::show() +void GuiExternalDialog::showView() { QDialog::show(); } - bool GuiExternalDialog::activateAspectratio() const { if (widthUnitCO->currentIndex() == 0) @@ -651,7 +650,7 @@ void GuiExternal::updateTemplate() } -void GuiExternal::apply() +void GuiExternal::applyView() { InsetExternalParams params = controller().params(); diff --git a/src/frontends/qt4/GuiExternal.h b/src/frontends/qt4/GuiExternal.h index 7eb372a80b..63168d599a 100644 --- a/src/frontends/qt4/GuiExternal.h +++ b/src/frontends/qt4/GuiExternal.h @@ -32,7 +32,7 @@ class GuiExternalDialog : public QDialog, public Ui::ExternalUi public: GuiExternalDialog(GuiExternal * form); - virtual void show(); + virtual void showView(); protected Q_SLOTS: virtual void bbChanged(); virtual void browseClicked(); @@ -69,7 +69,7 @@ public: typedef std::map MapType; private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiFloat.cpp b/src/frontends/qt4/GuiFloat.cpp index 95430d91b5..c107bf09a7 100644 --- a/src/frontends/qt4/GuiFloat.cpp +++ b/src/frontends/qt4/GuiFloat.cpp @@ -83,7 +83,7 @@ void GuiFloat::update_contents() } -void GuiFloat::apply() +void GuiFloat::applyView() { InsetFloatParams & params = controller().params(); diff --git a/src/frontends/qt4/GuiFloat.h b/src/frontends/qt4/GuiFloat.h index 7ef8c0fdfd..b5915bbe24 100644 --- a/src/frontends/qt4/GuiFloat.h +++ b/src/frontends/qt4/GuiFloat.h @@ -54,7 +54,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp index 1114d44192..87e43978ee 100644 --- a/src/frontends/qt4/GuiFontLoader.cpp +++ b/src/frontends/qt4/GuiFontLoader.cpp @@ -199,13 +199,14 @@ GuiFontLoader::GuiFontLoader() void GuiFontLoader::update() { - for (int i1 = 0; i1 < Font::NUM_FAMILIES; ++i1) + for (int i1 = 0; i1 < Font::NUM_FAMILIES; ++i1) { for (int i2 = 0; i2 < 2; ++i2) for (int i3 = 0; i3 < 4; ++i3) for (int i4 = 0; i4 < 10; ++i4) { delete fontinfo_[i1][i2][i3][i4]; fontinfo_[i1][i2][i3][i4] = 0; } + } } diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp index d9a8280c3c..1add51bffc 100644 --- a/src/frontends/qt4/GuiGraphics.cpp +++ b/src/frontends/qt4/GuiGraphics.cpp @@ -176,7 +176,7 @@ GuiGraphicsDialog::GuiGraphicsDialog(GuiGraphics * form) } -void GuiGraphicsDialog::show() +void GuiGraphicsDialog::showView() { QDialog::show(); } @@ -576,7 +576,7 @@ void GuiGraphics::update_contents() } -void GuiGraphics::apply() +void GuiGraphics::applyView() { InsetGraphicsParams & igp = controller().params(); diff --git a/src/frontends/qt4/GuiGraphics.h b/src/frontends/qt4/GuiGraphics.h index bb2675c1d0..b77defde42 100644 --- a/src/frontends/qt4/GuiGraphics.h +++ b/src/frontends/qt4/GuiGraphics.h @@ -34,7 +34,7 @@ class GuiGraphicsDialog : public QDialog, public Ui::GraphicsUi public: GuiGraphicsDialog(GuiGraphics * form); virtual void setAutoText(); - virtual void show(); + virtual void showView(); protected Q_SLOTS: virtual void change_adaptor(); virtual void change_bb(); @@ -70,7 +70,7 @@ protected: virtual bool isValid(); private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp index 1cfc42ca69..60f2d4e4e7 100644 --- a/src/frontends/qt4/GuiInclude.cpp +++ b/src/frontends/qt4/GuiInclude.cpp @@ -68,7 +68,7 @@ GuiIncludeDialog::GuiIncludeDialog(GuiInclude * form) } -void GuiIncludeDialog::show() +void GuiIncludeDialog::showView() { QDialog::show(); } @@ -275,7 +275,7 @@ void GuiInclude::update_contents() } -void GuiInclude::apply() +void GuiInclude::applyView() { InsetCommandParams params = controller().params(); diff --git a/src/frontends/qt4/GuiInclude.h b/src/frontends/qt4/GuiInclude.h index f1873bcca3..dbed834854 100644 --- a/src/frontends/qt4/GuiInclude.h +++ b/src/frontends/qt4/GuiInclude.h @@ -30,7 +30,7 @@ public: void updateLists(); - virtual void show(); + virtual void showView(); /// validate listings parameters and return an error message, if any docstring validate_listings_params(); protected Q_SLOTS: @@ -67,7 +67,7 @@ protected: virtual bool isValid(); private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiIndex.cpp b/src/frontends/qt4/GuiIndex.cpp index a567a9ce7b..c7e3409239 100644 --- a/src/frontends/qt4/GuiIndex.cpp +++ b/src/frontends/qt4/GuiIndex.cpp @@ -116,7 +116,7 @@ void GuiIndex::update_contents() } -void GuiIndex::apply() +void GuiIndex::applyView() { controller().params()["name"] = qstring_to_ucs4(dialog_->keywordED->text()); } diff --git a/src/frontends/qt4/GuiIndex.h b/src/frontends/qt4/GuiIndex.h index b745d6295a..a149750588 100644 --- a/src/frontends/qt4/GuiIndex.h +++ b/src/frontends/qt4/GuiIndex.h @@ -55,7 +55,7 @@ protected: virtual bool isValid(); private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp index ea4de2e9ea..993fd676bf 100644 --- a/src/frontends/qt4/GuiListings.cpp +++ b/src/frontends/qt4/GuiListings.cpp @@ -427,7 +427,7 @@ void GuiListings::build_dialog() } -void GuiListings::apply() +void GuiListings::applyView() { InsetListingsParams & params = controller().params(); params.setInline(dialog_->inlineCB->isChecked()); diff --git a/src/frontends/qt4/GuiListings.h b/src/frontends/qt4/GuiListings.h index 092dcfa7b5..f3a41328b4 100644 --- a/src/frontends/qt4/GuiListings.h +++ b/src/frontends/qt4/GuiListings.h @@ -66,7 +66,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp index 274ad265fe..eb56985b40 100644 --- a/src/frontends/qt4/GuiLog.cpp +++ b/src/frontends/qt4/GuiLog.cpp @@ -129,7 +129,7 @@ void GuiLog::build_dialog() void GuiLog::update_contents() { - setTitle(controller().title()); + setViewTitle(controller().title()); std::ostringstream ss; controller().getContents(ss); diff --git a/src/frontends/qt4/GuiLog.h b/src/frontends/qt4/GuiLog.h index 8259afe37f..efdddde7e6 100644 --- a/src/frontends/qt4/GuiLog.h +++ b/src/frontends/qt4/GuiLog.h @@ -56,7 +56,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply() {} + virtual void applyView() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiMathMatrix.h b/src/frontends/qt4/GuiMathMatrix.h index 42d1cb906e..ac1448c194 100644 --- a/src/frontends/qt4/GuiMathMatrix.h +++ b/src/frontends/qt4/GuiMathMatrix.h @@ -55,7 +55,7 @@ public: ControlMath const & controller() const { return static_cast(this->getController()); } private: - virtual void apply() {} + virtual void applyView() {} virtual void update_contents() {} /// Build the dialog. virtual void build_dialog(); diff --git a/src/frontends/qt4/GuiMenubar.h b/src/frontends/qt4/GuiMenubar.h index b0c4b256f8..959668ab7d 100644 --- a/src/frontends/qt4/GuiMenubar.h +++ b/src/frontends/qt4/GuiMenubar.h @@ -50,7 +50,7 @@ public: QMenuBar * menuBar() const; /// update the state of the menuitems - not needed - void update(); + void updateView(); private: /// Initialize specific MACOS X menubar diff --git a/src/frontends/qt4/GuiNomencl.cpp b/src/frontends/qt4/GuiNomencl.cpp index ff5f27f7e3..13abbeaa77 100644 --- a/src/frontends/qt4/GuiNomencl.cpp +++ b/src/frontends/qt4/GuiNomencl.cpp @@ -51,7 +51,7 @@ GuiNomenclDialog::GuiNomenclDialog(GuiNomencl * form) } -void GuiNomenclDialog::show() +void GuiNomenclDialog::showView() { QDialog::show(); } @@ -113,7 +113,7 @@ void GuiNomencl::update_contents() } -void GuiNomencl::apply() +void GuiNomencl::applyView() { controller().params()["prefix"] = qstring_to_ucs4(dialog_->prefixED->text()); controller().params()["symbol"] = qstring_to_ucs4(dialog_->symbolED->text()); diff --git a/src/frontends/qt4/GuiNomencl.h b/src/frontends/qt4/GuiNomencl.h index 14911641d7..3e78c943fe 100644 --- a/src/frontends/qt4/GuiNomencl.h +++ b/src/frontends/qt4/GuiNomencl.h @@ -31,7 +31,7 @@ class GuiNomenclDialog : public QDialog, public Ui::NomenclUi Q_OBJECT public: GuiNomenclDialog(GuiNomencl * form); - virtual void show(); + virtual void showView(); protected Q_SLOTS: virtual void change_adaptor(); virtual void reject(); @@ -58,7 +58,7 @@ protected: virtual bool isValid(); private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiNote.cpp b/src/frontends/qt4/GuiNote.cpp index c83c44c0e0..12b34458c6 100644 --- a/src/frontends/qt4/GuiNote.cpp +++ b/src/frontends/qt4/GuiNote.cpp @@ -101,7 +101,7 @@ void GuiNote::update_contents() } -void GuiNote::apply() +void GuiNote::applyView() { InsetNoteParams::Type type; diff --git a/src/frontends/qt4/GuiNote.h b/src/frontends/qt4/GuiNote.h index a541f6a12f..649b37bb9f 100644 --- a/src/frontends/qt4/GuiNote.h +++ b/src/frontends/qt4/GuiNote.h @@ -54,7 +54,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// Build the dialog virtual void build_dialog(); /// Update dialog before showing it diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp index 8b40befb6b..8cc07ab250 100644 --- a/src/frontends/qt4/GuiParagraph.cpp +++ b/src/frontends/qt4/GuiParagraph.cpp @@ -180,7 +180,7 @@ void GuiParagraph::build_dialog() } -void GuiParagraph::apply() +void GuiParagraph::applyView() { ParagraphParameters & params = controller().params(); diff --git a/src/frontends/qt4/GuiParagraph.h b/src/frontends/qt4/GuiParagraph.h index 7be6505640..7255241faf 100644 --- a/src/frontends/qt4/GuiParagraph.h +++ b/src/frontends/qt4/GuiParagraph.h @@ -68,7 +68,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiPopupMenu.cpp b/src/frontends/qt4/GuiPopupMenu.cpp index 9b479fc7d4..03c95d5b33 100644 --- a/src/frontends/qt4/GuiPopupMenu.cpp +++ b/src/frontends/qt4/GuiPopupMenu.cpp @@ -49,7 +49,7 @@ GuiPopupMenu::GuiPopupMenu(GuiMenubar * owner, } -void GuiPopupMenu::update() +void GuiPopupMenu::updateView() { LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION << endl; LYXERR(Debug::GUI) << "\tTriggered menu: " << to_utf8(name_) << endl; diff --git a/src/frontends/qt4/GuiPopupMenu.h b/src/frontends/qt4/GuiPopupMenu.h index a454b105d7..34e04f5d77 100644 --- a/src/frontends/qt4/GuiPopupMenu.h +++ b/src/frontends/qt4/GuiPopupMenu.h @@ -37,7 +37,7 @@ public: public Q_SLOTS: /// populate the toplevel menu and all children - void update(); + void updateView(); private: /// Get a Menu item label from the menu backend diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 5dab09eb74..398b03ea14 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -1138,11 +1138,11 @@ void PrefCopiers::apply(LyXRC & /*rc*/) const void PrefCopiers::update(LyXRC const & /*rc*/) { - update(); + updateView(); } -void PrefCopiers::update() +void PrefCopiers::updateView() { // The choice widget // save current selection @@ -1312,7 +1312,7 @@ void PrefCopiers::new_copier() form_->movers().set(fmt->name(), command); - update(); + updateView(); int const last = AllCopiersLW->count() - 1; AllCopiersLW->setCurrentRow(last); @@ -1331,7 +1331,7 @@ void PrefCopiers::modify_copier() string const command = fromqstr(copierED->text()); form_->movers().set(fmt->name(), command); - update(); + updateView(); updateButtons(); } @@ -1347,7 +1347,7 @@ void PrefCopiers::remove_copier() string const & fmt_name = fmt->name(); form_->movers().set(fmt_name, string()); - update(); + updateView(); updateButtons(); } @@ -1404,11 +1404,11 @@ void PrefFileformats::apply(LyXRC & /*rc*/) const void PrefFileformats::update(LyXRC const & /*rc*/) { - update(); + updateView(); } -void PrefFileformats::update() +void PrefFileformats::updateView() { // save current selection QString current = guiNameED->text(); @@ -1531,7 +1531,7 @@ void PrefFileformats::new_format() form_->formats().sort(); form_->converters().update(form_->formats()); - update(); + updateView(); updateButtons(); formatsChanged(); } @@ -1561,7 +1561,7 @@ void PrefFileformats::remove_format() form_->formats().erase(current_text); form_->converters().update(form_->formats()); - update(); + updateView(); updateButtons(); formatsChanged(); } @@ -2038,7 +2038,7 @@ void GuiPrefs::build_dialog() dialog_.reset(new GuiPrefsDialog(this)); } -void GuiPrefs::apply() +void GuiPrefs::applyView() { dialog_->apply(controller().rc()); } diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h index 493bef3999..774442e0f6 100644 --- a/src/frontends/qt4/GuiPrefs.h +++ b/src/frontends/qt4/GuiPrefs.h @@ -242,7 +242,7 @@ public: void apply(LyXRC & rc) const; void update(LyXRC const & rc); - void update(); + void updateView(); private Q_SLOTS: void switch_copierLB(int nr); @@ -266,7 +266,7 @@ public: void apply(LyXRC & rc) const; void update(LyXRC const & rc); - void update(); + void updateView(); Q_SIGNALS: void formatsChanged(); private: @@ -374,7 +374,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update (do we need this?) virtual void update_contents(); diff --git a/src/frontends/qt4/GuiPrint.cpp b/src/frontends/qt4/GuiPrint.cpp index aa861ab843..ee23476be9 100644 --- a/src/frontends/qt4/GuiPrint.cpp +++ b/src/frontends/qt4/GuiPrint.cpp @@ -157,7 +157,7 @@ void GuiPrint::update_contents() } -void GuiPrint::apply() +void GuiPrint::applyView() { PrinterParams::Target t = PrinterParams::PRINTER; if (dialog_->fileRB->isChecked()) diff --git a/src/frontends/qt4/GuiPrint.h b/src/frontends/qt4/GuiPrint.h index 494654a17e..e66ec29b1a 100644 --- a/src/frontends/qt4/GuiPrint.h +++ b/src/frontends/qt4/GuiPrint.h @@ -55,7 +55,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp index ab3a971073..1367fa997b 100644 --- a/src/frontends/qt4/GuiRef.cpp +++ b/src/frontends/qt4/GuiRef.cpp @@ -73,7 +73,7 @@ GuiRefDialog::GuiRefDialog(GuiRef * form) setFocusProxy(refsLW); } -void GuiRefDialog::show() +void GuiRefDialog::showView() { QDialog::show(); } @@ -244,7 +244,7 @@ void GuiRef::update_contents() } -void GuiRef::apply() +void GuiRef::applyView() { InsetCommandParams & params = controller().params(); diff --git a/src/frontends/qt4/GuiRef.h b/src/frontends/qt4/GuiRef.h index 5d22ca336e..9fc20136b5 100644 --- a/src/frontends/qt4/GuiRef.h +++ b/src/frontends/qt4/GuiRef.h @@ -32,7 +32,7 @@ class GuiRefDialog : public QDialog, public Ui::RefUi { public: GuiRefDialog(GuiRef * form); - virtual void show(); + virtual void showView(); public Q_SLOTS: void changed_adaptor(); @@ -70,7 +70,7 @@ protected: private: /// apply changes - virtual void apply(); + virtual void applyView(); /// build dialog virtual void build_dialog(); /// update dialog diff --git a/src/frontends/qt4/GuiSearch.cpp b/src/frontends/qt4/GuiSearch.cpp index 42a74587b4..1e59cd793d 100644 --- a/src/frontends/qt4/GuiSearch.cpp +++ b/src/frontends/qt4/GuiSearch.cpp @@ -57,7 +57,7 @@ GuiSearchDialog::GuiSearchDialog(GuiSearch * form) } -void GuiSearchDialog::show() +void GuiSearchDialog::showView() { QDialog::show(); findCO->lineEdit()->setSelection(0, findCO->lineEdit()->text().length()); diff --git a/src/frontends/qt4/GuiSearch.h b/src/frontends/qt4/GuiSearch.h index d36b33b62a..25e5663b8c 100644 --- a/src/frontends/qt4/GuiSearch.h +++ b/src/frontends/qt4/GuiSearch.h @@ -30,7 +30,7 @@ class GuiSearchDialog : public QDialog, public Ui::SearchUi { public: GuiSearchDialog(GuiSearch * form); - virtual void show(); + virtual void showView(); protected Q_SLOTS: void findChanged(); void findClicked(); @@ -59,7 +59,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply() {} + virtual void applyView() {} /// update virtual void update_contents() {} /// build the dialog diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp index d4c1fe233e..72ba407c3e 100644 --- a/src/frontends/qt4/GuiSelectionManager.cpp +++ b/src/frontends/qt4/GuiSelectionManager.cpp @@ -67,7 +67,7 @@ GuiSelectionManager::GuiSelectionManager( } -void GuiSelectionManager::update() +void GuiSelectionManager::updateView() { int const arows = availableLV->model()->rowCount(); QModelIndexList const availSels = diff --git a/src/frontends/qt4/GuiSelectionManager.h b/src/frontends/qt4/GuiSelectionManager.h index 9392a1c99d..f97dba29bb 100644 --- a/src/frontends/qt4/GuiSelectionManager.h +++ b/src/frontends/qt4/GuiSelectionManager.h @@ -49,7 +49,7 @@ class GuiSelectionManager : public QObject { /// Sets the state of the various push buttons, depending upon the /// state of the widgets. (E.g., "delete" is enabled only if the /// selection is non-empty.) - virtual void update(); + virtual void updateView(); /// Not strictly a matter of focus, which may be elsewhere, but /// whether selectedLV is `more focused' than availableLV. Intended @@ -65,9 +65,9 @@ class GuiSelectionManager : public QObject { ///dialog to want to update---the focused subwidget or selected item. ///(Specifically, it is emitted by *_PB_clicked() and *_LV_clicked.) ///NOTE: No automatic update of the button state is done here. If you - ///just want to do that, connect updateHook() to update(). Much of the + ///just want to do that, connect updateHook() to updateView(). Much of the ///time, though, you will want to do a bit more processing first, so - ///you can connect to some other function that itself calls update(). + ///you can connect to some other function that itself calls updateView(). void updateHook(); ///Emitted on Ctrl-Enter in the availableLV. Intended to be connected ///to an "OK" event in the parent dialog. diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp index e635272be0..c466505710 100644 --- a/src/frontends/qt4/GuiSendto.cpp +++ b/src/frontends/qt4/GuiSendto.cpp @@ -120,7 +120,7 @@ void GuiSendto::update_contents() } -void GuiSendto::apply() +void GuiSendto::applyView() { int const line(dialog_->formatLW->currentRow()); diff --git a/src/frontends/qt4/GuiSendto.h b/src/frontends/qt4/GuiSendto.h index 8fd9faf32a..bbba5e6b44 100644 --- a/src/frontends/qt4/GuiSendto.h +++ b/src/frontends/qt4/GuiSendto.h @@ -64,7 +64,7 @@ protected: virtual bool isValid(); private: /// Apply from dialog - virtual void apply(); + virtual void applyView(); /// Update the dialog virtual void update_contents(); /// Build the dialog diff --git a/src/frontends/qt4/GuiShowFile.h b/src/frontends/qt4/GuiShowFile.h index 5a219dd9a2..7e2fadadfe 100644 --- a/src/frontends/qt4/GuiShowFile.h +++ b/src/frontends/qt4/GuiShowFile.h @@ -50,7 +50,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply() {} + virtual void applyView() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp index ddf0af2e62..2e83dba9d0 100644 --- a/src/frontends/qt4/GuiSpellchecker.cpp +++ b/src/frontends/qt4/GuiSpellchecker.cpp @@ -142,7 +142,7 @@ void GuiSpellchecker::build_dialog() void GuiSpellchecker::update_contents() { - if (isVisible() || controller().exitEarly()) + if (isVisibleView() || controller().exitEarly()) controller().check(); } diff --git a/src/frontends/qt4/GuiSpellchecker.h b/src/frontends/qt4/GuiSpellchecker.h index cce38ec91d..e0e9e5e647 100644 --- a/src/frontends/qt4/GuiSpellchecker.h +++ b/src/frontends/qt4/GuiSpellchecker.h @@ -72,7 +72,7 @@ private: void replace(); /// Apply changes - virtual void apply() {} + virtual void applyView() {} /// virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiTabular.h b/src/frontends/qt4/GuiTabular.h index 7339d5c60b..b27f5d2380 100644 --- a/src/frontends/qt4/GuiTabular.h +++ b/src/frontends/qt4/GuiTabular.h @@ -96,7 +96,7 @@ protected: private: /// We can't use this ... - virtual void apply() {} + virtual void applyView() {} /// update borders virtual void update_borders(); /// update diff --git a/src/frontends/qt4/GuiTabularCreate.cpp b/src/frontends/qt4/GuiTabularCreate.cpp index 0f9a1a48fa..bde12658bd 100644 --- a/src/frontends/qt4/GuiTabularCreate.cpp +++ b/src/frontends/qt4/GuiTabularCreate.cpp @@ -78,7 +78,7 @@ void GuiTabularCreate::build_dialog() } -void GuiTabularCreate::apply() +void GuiTabularCreate::applyView() { controller().params().first = dialog_->rowsSB->value(); controller().params().second = dialog_->columnsSB->value(); diff --git a/src/frontends/qt4/GuiTabularCreate.h b/src/frontends/qt4/GuiTabularCreate.h index 75056ca1fe..d946f9f543 100644 --- a/src/frontends/qt4/GuiTabularCreate.h +++ b/src/frontends/qt4/GuiTabularCreate.h @@ -51,7 +51,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents() {} /// build the dialog diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp index 2efa10b37a..8fe2a443b5 100644 --- a/src/frontends/qt4/GuiTexinfo.cpp +++ b/src/frontends/qt4/GuiTexinfo.cpp @@ -88,7 +88,7 @@ void GuiTexinfoDialog::viewClicked() } -void GuiTexinfoDialog::update() +void GuiTexinfoDialog::updateView() { switch (whatStyleCO->currentIndex()) { case 0: diff --git a/src/frontends/qt4/GuiTexinfo.h b/src/frontends/qt4/GuiTexinfo.h index 649b6644f2..08e46ee9fe 100644 --- a/src/frontends/qt4/GuiTexinfo.h +++ b/src/frontends/qt4/GuiTexinfo.h @@ -32,7 +32,7 @@ class GuiTexinfoDialog : public QDialog, public Ui::TexinfoUi public: GuiTexinfoDialog(GuiTexinfo * form); public Q_SLOTS: - virtual void update(); + virtual void updateView(); protected Q_SLOTS: virtual void change_adaptor(); virtual void rescanClicked(); @@ -61,7 +61,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply() {} + virtual void applyView() {} /// update (do we need this?) virtual void update_contents() {} /// build the dialog diff --git a/src/frontends/qt4/GuiThesaurus.h b/src/frontends/qt4/GuiThesaurus.h index 2a008be672..48bbce8bcf 100644 --- a/src/frontends/qt4/GuiThesaurus.h +++ b/src/frontends/qt4/GuiThesaurus.h @@ -65,7 +65,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply() {} + virtual void applyView() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp index 3749d117c7..3f524f91d4 100644 --- a/src/frontends/qt4/GuiToc.cpp +++ b/src/frontends/qt4/GuiToc.cpp @@ -114,13 +114,13 @@ bool GuiToc::initialiseParams(std::string const & data) { if (!ControlToc::initialiseParams(data)) return false; - update(); + updateView(); modelReset(); return true; } -void GuiToc::update() +void GuiToc::updateView() { toc_models_.clear(); TocList::const_iterator it = tocs().begin(); diff --git a/src/frontends/qt4/GuiToc.h b/src/frontends/qt4/GuiToc.h index 7f0599bd9a..0b2dbe54bd 100644 --- a/src/frontends/qt4/GuiToc.h +++ b/src/frontends/qt4/GuiToc.h @@ -37,7 +37,7 @@ public: /// \c ControlToc inherited method. virtual bool initialiseParams(std::string const & data); /// - void update(); + void updateView(); /// bool canOutline(int type) const; diff --git a/src/frontends/qt4/GuiURL.cpp b/src/frontends/qt4/GuiURL.cpp index 40761fb49f..5351f0fb65 100644 --- a/src/frontends/qt4/GuiURL.cpp +++ b/src/frontends/qt4/GuiURL.cpp @@ -84,7 +84,7 @@ void UrlView::update_contents() } -void UrlView::apply() +void UrlView::applyView() { InsetCommandParams & params = controller().params(); diff --git a/src/frontends/qt4/GuiURL.h b/src/frontends/qt4/GuiURL.h index 4015ae40e9..042a1c6630 100644 --- a/src/frontends/qt4/GuiURL.h +++ b/src/frontends/qt4/GuiURL.h @@ -52,7 +52,7 @@ protected: virtual bool isValid(); private: /// apply dialog - virtual void apply(); + virtual void applyView(); /// build dialog virtual void build_dialog(); /// update dialog diff --git a/src/frontends/qt4/GuiVSpace.cpp b/src/frontends/qt4/GuiVSpace.cpp index df7c13da94..568fc50709 100644 --- a/src/frontends/qt4/GuiVSpace.cpp +++ b/src/frontends/qt4/GuiVSpace.cpp @@ -209,7 +209,7 @@ void GuiVSpace::build_dialog() } -void GuiVSpace::apply() +void GuiVSpace::applyView() { // spacing // If a vspace choice is "Length" but there's no text in diff --git a/src/frontends/qt4/GuiVSpace.h b/src/frontends/qt4/GuiVSpace.h index 708ffdd92a..163ee1eb78 100644 --- a/src/frontends/qt4/GuiVSpace.h +++ b/src/frontends/qt4/GuiVSpace.h @@ -61,7 +61,7 @@ private: /// Build the dialog virtual void build_dialog(); /// Apply from dialog - virtual void apply(); + virtual void applyView(); /// Update the dialog virtual void update_contents(); }; diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 9562a84bc0..d3e53325ad 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -751,7 +751,7 @@ bool GuiViewBase::focusNextPrevChild(bool /*next*/) } -void GuiViewBase::show() +void GuiViewBase::showView() { QMainWindow::setWindowTitle(qt_("LyX")); QMainWindow::show(); diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index 17836a57ed..98e499ce5f 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -73,7 +73,7 @@ public: void openMenu(docstring const &); /// show - display the top-level window - void show(); + void showView(); /// menu item has been selected void activated(FuncRequest const &); diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp index 1ea2214125..0a6d13544f 100644 --- a/src/frontends/qt4/GuiViewSource.cpp +++ b/src/frontends/qt4/GuiViewSource.cpp @@ -59,7 +59,7 @@ GuiViewSourceDialog::GuiViewSourceDialog(GuiViewSource * form) } -void GuiViewSourceDialog::update() +void GuiViewSourceDialog::updateView() { if (autoUpdateCB->isChecked()) form_->update(viewFullSourceCB->isChecked()); diff --git a/src/frontends/qt4/GuiViewSource.h b/src/frontends/qt4/GuiViewSource.h index 9345936023..a1fe2ff826 100644 --- a/src/frontends/qt4/GuiViewSource.h +++ b/src/frontends/qt4/GuiViewSource.h @@ -53,7 +53,7 @@ public: public Q_SLOTS: // update content - void update(); + void updateView(); private: GuiViewSource * form_; diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h index 05903003ba..2bafbeb5b3 100644 --- a/src/frontends/qt4/GuiWorkArea.h +++ b/src/frontends/qt4/GuiWorkArea.h @@ -36,9 +36,6 @@ class QPaintEvent; namespace lyx { namespace frontend { -class GuiView; -class QLPainter; - /// for emulating triple click class double_click { public: @@ -116,7 +113,6 @@ public: virtual void removeCursor(); private: - void doGreyOut(QLPainter & pain); /// void focusInEvent(QFocusEvent *); /// diff --git a/src/frontends/qt4/GuiWrap.cpp b/src/frontends/qt4/GuiWrap.cpp index d6718eae43..313be7f093 100644 --- a/src/frontends/qt4/GuiWrap.cpp +++ b/src/frontends/qt4/GuiWrap.cpp @@ -95,7 +95,7 @@ void GuiWrap::build_dialog() } -void GuiWrap::apply() +void GuiWrap::applyView() { double const value = convert(fromqstr(dialog_->widthED->text())); Length::UNIT unit = dialog_->unitsLC->currentLengthItem(); diff --git a/src/frontends/qt4/GuiWrap.h b/src/frontends/qt4/GuiWrap.h index 2956f7ddcf..20510448a2 100644 --- a/src/frontends/qt4/GuiWrap.h +++ b/src/frontends/qt4/GuiWrap.h @@ -51,7 +51,7 @@ public: { return static_cast(this->getController()); } private: /// Apply changes - virtual void apply(); + virtual void applyView(); /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index 3394726c91..f21d0fbbd4 100644 --- a/src/frontends/qt4/TocWidget.cpp +++ b/src/frontends/qt4/TocWidget.cpp @@ -231,7 +231,7 @@ void TocWidget::enableControls(bool enable) void TocWidget::update() { - LYXERR(Debug::GUI) << "In TocWidget::update()" << endl; + LYXERR(Debug::GUI) << "In TocWidget::updateView()" << endl; select(form_->getCurrentIndex(typeCO->currentIndex())); QWidget::update(); } diff --git a/src/frontends/qt4/TocWidget.h b/src/frontends/qt4/TocWidget.h index 3334f175af..cb38ee70af 100644 --- a/src/frontends/qt4/TocWidget.h +++ b/src/frontends/qt4/TocWidget.h @@ -22,7 +22,8 @@ namespace frontend { class GuiToc; -class TocWidget : public QWidget, public Ui::TocUi { +class TocWidget : public QWidget, public Ui::TocUi +{ Q_OBJECT public: TocWidget(GuiToc * form, QWidget * parent = 0); -- 2.39.2