Factorize closeEvent() for GuiDialog based dialogs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23045 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiBibitem.cpp b/src/frontends/qt4/GuiBibitem.cpp
index 3f9cab69230e2262d9eada9ec78dc8182d87e3f4..0e13e49426f1499307ca02d8e2c4d202a84ed1bb 100644 (file)
--- a/src/frontends/qt4/GuiBibitem.cpp
+++ b/src/frontends/qt4/GuiBibitem.cpp
@@ -14,7 +14,6 @@
 #include "qt_helpers.h"
 #include "FuncRequest.h"
 
-#include <QCloseEvent>
 #include <QLineEdit>
 #include <QPushButton>
 
@@ -50,13 +49,6 @@ void GuiBibitem::change_adaptor()
 }
 
 
-void GuiBibitem::closeEvent(QCloseEvent *e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiBibitem::updateContents()
 {
        keyED->setText(toqstr(params_["key"]));

diff --git a/src/frontends/qt4/GuiBibitem.h b/src/frontends/qt4/GuiBibitem.h
index dfc18a1d1bd0a19a8802bb8b5cbd94ba1bcbb1be..8d7ea4faa666f9dcfbbfd0c0be00b044accbda99 100644 (file)
--- a/src/frontends/qt4/GuiBibitem.h
+++ b/src/frontends/qt4/GuiBibitem.h
@@ -31,10 +31,6 @@ public:
 private Q_SLOTS:
        void change_adaptor();
 
-private:
-       ///
-       void closeEvent(QCloseEvent * e);
-
 private:
        ///
        bool isValid();

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 8d1cac783bc752d5afb765293ed542ffdfbede5a..8487f6bf1cb5aba1acafb35bb6d22e83ff745f7d 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -278,13 +278,6 @@ void GuiBibtex::availableChanged()
 }
 
 
-void GuiBibtex::closeEvent(QCloseEvent *e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiBibtex::updateContents()
 {
        bool bibtopic = usingBibtopic();

diff --git a/src/frontends/qt4/GuiBibtex.h b/src/frontends/qt4/GuiBibtex.h
index c2df10317bdee2ad383ef1aa5bef641c4860e1c7..9bac17bc450e00004a91fdeba778cb2d0933c99f 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.h
+++ b/src/frontends/qt4/GuiBibtex.h
@@ -59,9 +59,6 @@ private Q_SLOTS:
        void availableChanged();
        void bibEDChanged();
 
-private:
-       void closeEvent(QCloseEvent * e);
-
 private:
        ///
        bool isValid();

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 9bd62817df4998415dc1e758ff975ba95975de20..849a235a5b38efbb67e9976c6038bb8ec272f684 100644 (file)
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -144,13 +144,6 @@ GuiBox::GuiBox(GuiView & lv)
 }
 
 
-void GuiBox::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiBox::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiBox.h b/src/frontends/qt4/GuiBox.h
index 230d46439aa5bbb4dc44a957b3438b90a4e9a3e3..a6b093193694cd7f01ecb28503a06a437e46a89a 100644 (file)
--- a/src/frontends/qt4/GuiBox.h
+++ b/src/frontends/qt4/GuiBox.h
@@ -38,9 +38,6 @@ private Q_SLOTS:
        void pagebreakClicked();
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
-
        /// add and remove special lengths
        void setSpecial(bool ibox);
        /// only show valid inner box items

diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp
index 4c09892c0a89d20edbb362c9310c3253c648392b..95c52ac014019160d1a8be879fe56f116b134b3b 100644 (file)
--- a/src/frontends/qt4/GuiBranch.cpp
+++ b/src/frontends/qt4/GuiBranch.cpp
@@ -47,13 +47,6 @@ GuiBranch::GuiBranch(GuiView & lv)
 }
 
 
-void GuiBranch::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiBranch::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiBranch.h b/src/frontends/qt4/GuiBranch.h
index e33e151a73c7ec221ffbf4d7a6e3b80744e38e09..fd2f371df8668dc0e29439d95367f603d83f5cdb 100644 (file)
--- a/src/frontends/qt4/GuiBranch.h
+++ b/src/frontends/qt4/GuiBranch.h
@@ -33,8 +33,6 @@ private Q_SLOTS:
        void change_adaptor();
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
        ///  Apply changes
        void applyView();
        /// Update dialog before showing it

diff --git a/src/frontends/qt4/GuiChanges.cpp b/src/frontends/qt4/GuiChanges.cpp
index 63b3533885e5846d261fd56bbec696b4f6bf74b7..f4a700089bc5ff8941e2accf4d2ef29ff62ab0d1 100644 (file)
--- a/src/frontends/qt4/GuiChanges.cpp
+++ b/src/frontends/qt4/GuiChanges.cpp
@@ -54,13 +54,6 @@ GuiChanges::GuiChanges(GuiView & lv)
 }
 
 
-void GuiChanges::closeEvent(QCloseEvent *e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiChanges::updateContents()
 {
        docstring text;

diff --git a/src/frontends/qt4/GuiChanges.h b/src/frontends/qt4/GuiChanges.h
index a1579a5ee8a6ddd8cf9abd16d2442b47bdab28c0..2579145ba1ce7e4a34b410372744e84083c71ae9 100644 (file)
--- a/src/frontends/qt4/GuiChanges.h
+++ b/src/frontends/qt4/GuiChanges.h
@@ -37,7 +37,7 @@ protected Q_SLOTS:
        void nextChange();
 
 private:
-       void closeEvent(QCloseEvent * e);
+       ///
        void updateContents();
 
        /// Nothing to initialise in this case.

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 14bb54f136af72a01ad610d44b6b7383e029b45e..94ef29957b9ab9dfeed89806838a4e5b0627fb6d 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -377,13 +377,6 @@ void GuiCharacter::change_adaptor()
 }
 
 
-void GuiCharacter::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       GuiDialog::closeEvent(e);
-}
-
-
 template<class A, class B>
 static int findPos2nd(vector<pair<A, B> > const & vec, B const & val)
 {

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index faf9716f4c0161aa1167c8c6e07cfe744aa219de..bf5d92fb90a1412d761b135838245740dd67a509 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -57,7 +57,6 @@ protected Q_SLOTS:
        void change_adaptor();
 
 private:
-       void closeEvent(QCloseEvent * e);
        /// Apply changes
        void applyView();
        /// update

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 5b668f0b34c337c6c8537a21869f104924be2ed5..1135d54aa4f5e14f102836cb082cff725c76daf4 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -119,7 +119,7 @@ void GuiCitation::closeEvent(QCloseEvent * e)
 {
        clearSelection();
        clearParams();
-       GuiDialog::closeEvent(e);
+       e->accept();
 }
 
 

diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index 56708941434a49d91b7a36a02b0b2433637af03a..67b250374fedde6df453c525ed825dd0113254b5 100644 (file)
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -31,6 +31,13 @@ GuiDialog::GuiDialog(GuiView & lv, string const & name, QString const & title)
 {}
 
 
+void GuiDialog::closeEvent(QCloseEvent *e)
+{
+       slotClose();
+       e->accept();
+}
+
+
 void GuiDialog::setButtonsValid(bool valid)
 {
        bc().setValid(valid);

diff --git a/src/frontends/qt4/GuiDialog.h b/src/frontends/qt4/GuiDialog.h
index 7ade39cd6e7c615e274d12e1d53939b5312c88f7..9f91385e30cb448593f9329dc9404d0fca489160 100644 (file)
--- a/src/frontends/qt4/GuiDialog.h
+++ b/src/frontends/qt4/GuiDialog.h
@@ -58,6 +58,8 @@ public Q_SLOTS:
        void slotApply();
        // Close button clicked or closed from WindowManager
        void slotClose();
+       ///
+       void closeEvent(QCloseEvent * e);
 
 public:
        /** Check whether we may apply our data.

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 6f020c3acdb68ab2760917c2de172c041d8a0111..1fa4f93050da970c5dcdff29558630de8c397264 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1034,13 +1034,6 @@ void GuiDocument::set_listings_msg()
 }
 
 
-void GuiDocument::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiDocument::setLSpacing(int item)
 {
        textLayoutModule->lspacingLE->setEnabled(item == 3);

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index b379687ec07b2b77bca623800064e169ea51c244..5f4d6ef2518c7b8d869a7288b3f4407f22927e9e 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -141,9 +141,6 @@ private Q_SLOTS:
        void classChanged();
        void updateModuleInfo();
        void updateEmbeddedFileList();
-       
-private:
-       void closeEvent(QCloseEvent * e);
 
 private:
        UiWidget<Ui::TextLayoutUi> *textLayoutModule;

diff --git a/src/frontends/qt4/GuiERT.cpp b/src/frontends/qt4/GuiERT.cpp
index 289e809d8fdbfba097c9cae2a7057c57b3f22cf8..e91fc294bae2e8507a8e24121701819016d5cceb 100644 (file)
--- a/src/frontends/qt4/GuiERT.cpp
+++ b/src/frontends/qt4/GuiERT.cpp
@@ -41,13 +41,6 @@ GuiERT::GuiERT(GuiView & lv)
 }
 
 
-void GuiERT::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiERT::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiERT.h b/src/frontends/qt4/GuiERT.h
index aad5f1246417eddd3de6c972d9e33fddda674c32..09debfeb182ee2746a237fa82867fbd49b865d5a 100644 (file)
--- a/src/frontends/qt4/GuiERT.h
+++ b/src/frontends/qt4/GuiERT.h
@@ -30,7 +30,6 @@ private Q_SLOTS:
        void change_adaptor();
 
 private:
-       void closeEvent(QCloseEvent * e);
        /// Apply changes
        void applyView();
        /// update

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index 4e3ab938dd7406d38986c8a27056a49f596eaab8..007e30fcfd0993e32a18f09d70760cc416de19b3 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -49,13 +49,6 @@ GuiErrorList::GuiErrorList(GuiView & lv)
 }
 
 
-void GuiErrorList::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiErrorList::showEvent(QShowEvent * e)
 {
        errorsLW->setCurrentRow(0);

diff --git a/src/frontends/qt4/GuiErrorList.h b/src/frontends/qt4/GuiErrorList.h
index cddea246aa426fe496e91ec6e94bd181aebd28f0..4472dc5a851f92bbde85d5a659d34345df32c345 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.h
+++ b/src/frontends/qt4/GuiErrorList.h
@@ -33,8 +33,6 @@ public Q_SLOTS:
        void select(QListWidgetItem *);
 
 private:
-       ///
-       void closeEvent(QCloseEvent *);
        ///
        void showEvent(QShowEvent *);
        /// update contents

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index b4bfd30e009d1faa83c59ef2a4ac961fd2b1c839..eb025be44992e156626b99ce2c5b84c20d522cca 100644 (file)
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -271,13 +271,6 @@ void GuiExternal::change_adaptor()
 }
 
 
-void GuiExternal::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiExternal::editClicked()
 {
        editExternal();

diff --git a/src/frontends/qt4/GuiExternal.h b/src/frontends/qt4/GuiExternal.h
index 36eec3ae58c06f979a94942274ac5198ae16a91f..dd591e3f1456f51e6b335c3f5d66ffc1366d928e 100644 (file)
--- a/src/frontends/qt4/GuiExternal.h
+++ b/src/frontends/qt4/GuiExternal.h
@@ -60,8 +60,7 @@ public:
        typedef std::map<std::string, QString> MapType;
 
 private:
-       void closeEvent(QCloseEvent * e);
-       //
+       ///
        bool activateAspectratio() const;
        /// Apply changes
        void applyView();

diff --git a/src/frontends/qt4/GuiFloat.cpp b/src/frontends/qt4/GuiFloat.cpp
index 14657a73f4246a2bcfeabb747a7058f431e39c85..03c059b843f4c770f97ca19f20532db9296796cc 100644 (file)
--- a/src/frontends/qt4/GuiFloat.cpp
+++ b/src/frontends/qt4/GuiFloat.cpp
@@ -59,13 +59,6 @@ void GuiFloat::change_adaptor()
 }
 
 
-void GuiFloat::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiFloat::updateContents()
 {
        floatFP->set(params_);

diff --git a/src/frontends/qt4/GuiFloat.h b/src/frontends/qt4/GuiFloat.h
index fe820f2d863024e01bad50e795fc50c65762b2d0..76a73b834de35012f4f66f558e23803058eed566 100644 (file)
--- a/src/frontends/qt4/GuiFloat.h
+++ b/src/frontends/qt4/GuiFloat.h
@@ -31,7 +31,6 @@ private Q_SLOTS:
        void change_adaptor();
 
 private:
-       void closeEvent(QCloseEvent * e);
        /// Apply changes
        void applyView();
        /// update

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index 4fa354d9dd02db52641681e5fdbe7f9466d58c00..7194868b65c000339a76b4f039f3b1f17997c16e 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -268,13 +268,6 @@ void GuiGraphics::change_bb()
 }
 
 
-void GuiGraphics::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       GuiDialog::closeEvent(e);
-}
-
-
 void GuiGraphics::on_browsePB_clicked()
 {
        docstring const str = browse(qstring_to_ucs4(filename->text()));

diff --git a/src/frontends/qt4/GuiGraphics.h b/src/frontends/qt4/GuiGraphics.h
index a80074e70b465abee079bcb3b2817476059cb41a..b544c5308c1cadc3435efbb3383f5bf4454c49a5 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.h
+++ b/src/frontends/qt4/GuiGraphics.h
@@ -53,7 +53,7 @@ private Q_SLOTS:
        void on_angle_textChanged(const QString &);
 
 private:
-       void closeEvent(QCloseEvent * e);
+       ///
        bool isValid();
        /// Apply changes
        void applyView();

diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp
index ee3cb2e9a67c15a0b511e30fd65d7e7dfc641a96..063bce724ee924c493fa2f9baaef349b4e3d927a 100644 (file)
--- a/src/frontends/qt4/GuiHyperlink.cpp
+++ b/src/frontends/qt4/GuiHyperlink.cpp
@@ -62,13 +62,6 @@ void GuiHyperlink::changed_adaptor()
 }
 
 
-void GuiHyperlink::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiHyperlink::updateContents()
 {
        targetED->setText(toqstr(params_["target"]));

diff --git a/src/frontends/qt4/GuiHyperlink.h b/src/frontends/qt4/GuiHyperlink.h
index 24d709fb4bd388524f0ef34824c3d62ccdc0986b..dd8329d78a5f794e13ae9ccac10876375c8645ef 100644 (file)
--- a/src/frontends/qt4/GuiHyperlink.h
+++ b/src/frontends/qt4/GuiHyperlink.h
@@ -31,7 +31,6 @@ public Q_SLOTS:
        void changed_adaptor();
 
 private:
-       void closeEvent(QCloseEvent *);
        ///
        bool isValid();
        /// apply dialog

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 190af32ad3536d8cce0bc4c9b5c4ebd2c9763164..fcd8ede71ca19952dcfd38227f40fe378a5d2b75 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -127,13 +127,6 @@ void GuiInclude::set_listings_msg()
 }
 
 
-void GuiInclude::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiInclude::typeChanged(int v)
 {
        switch (v) {

diff --git a/src/frontends/qt4/GuiInclude.h b/src/frontends/qt4/GuiInclude.h
index 91383900ed897c8c11892c6d9dc40173da766d8d..df33c26ee2424e686dc63c9e1e3d0e5aa83e76a6 100644 (file)
--- a/src/frontends/qt4/GuiInclude.h
+++ b/src/frontends/qt4/GuiInclude.h
@@ -60,8 +60,6 @@ private:
                LISTINGS,
        };
        ///
-       void closeEvent(QCloseEvent * e);
-       ///
        void updateLists();
        /// validate listings parameters and return an error message, if any
        docstring validate_listings_params();

diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 08974c54f299d69f8fd8ec03311f3dcdf4ac2216..d6894d0f62b8a690b930c681e85ffdfec08e5007 100644 (file)
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -238,13 +238,6 @@ GuiListings::GuiListings(GuiView & lv)
 }
 
 
-void GuiListings::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiListings::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiListings.h b/src/frontends/qt4/GuiListings.h
index 653fbcd7600a79ebf493ef36f8781db6ad91e3af..22541997688c277d247b3a15ab15f42bf222b92d 100644 (file)
--- a/src/frontends/qt4/GuiListings.h
+++ b/src/frontends/qt4/GuiListings.h
@@ -44,7 +44,6 @@ private Q_SLOTS:
        /// show dialect when language is chosen
        void on_languageCO_currentIndexChanged(int);
 private:
-       void closeEvent(QCloseEvent * e);
        /// return false if validate_listings_params returns error
        bool isValid();
        /// Apply changes

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 4d748916fc046489792581e4df4aff7570852060..9cc479d614470be59f834e2309e73a8fd6fa363f 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -120,13 +120,6 @@ GuiLog::GuiLog(GuiView & lv)
 }
 
 
-void GuiLog::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiLog::updateContents()
 {
        setTitle(toqstr(title()));

diff --git a/src/frontends/qt4/GuiLog.h b/src/frontends/qt4/GuiLog.h
index 3e4de5abbb6ff6b910c71b0241ec35bd99b8c34e..f7829c73f9d93572a5dd45a5b65ca2ae4c4a3f75 100644 (file)
--- a/src/frontends/qt4/GuiLog.h
+++ b/src/frontends/qt4/GuiLog.h
@@ -37,7 +37,6 @@ private Q_SLOTS:
        void on_copyPB_clicked();
 
 private:
-       void closeEvent(QCloseEvent * e);
        /// Apply changes
        void applyView() {}
 

diff --git a/src/frontends/qt4/GuiNomencl.cpp b/src/frontends/qt4/GuiNomencl.cpp
index 4516e5450ae38973271cf5da9e588e0280471c31..cd6a04326bb45b72514899530139e83ce5643284 100644 (file)
--- a/src/frontends/qt4/GuiNomencl.cpp
+++ b/src/frontends/qt4/GuiNomencl.cpp
@@ -63,13 +63,6 @@ void GuiNomenclature::reject()
 }
 
 
-void GuiNomenclature::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiNomenclature::updateContents()
 {
        prefixED->setText(toqstr(params_["prefix"]));

diff --git a/src/frontends/qt4/GuiNomencl.h b/src/frontends/qt4/GuiNomencl.h
index c9fa2cb825bebd81ddcdcee8abe187f5f02f7fc4..f5c3ac6af19beb2dc25f1ba63293556fb3013c8b 100644 (file)
--- a/src/frontends/qt4/GuiNomencl.h
+++ b/src/frontends/qt4/GuiNomencl.h
@@ -32,8 +32,6 @@ private Q_SLOTS:
        void reject();
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
        ///
        bool isValid();
        /// Apply changes

diff --git a/src/frontends/qt4/GuiNote.cpp b/src/frontends/qt4/GuiNote.cpp
index 6c3eff5fc61a068478f70c01301aa678267277fc..f21dfb7fc3abf2b8a94c25dba3c25ae26a270a60 100644 (file)
--- a/src/frontends/qt4/GuiNote.cpp
+++ b/src/frontends/qt4/GuiNote.cpp
@@ -42,13 +42,6 @@ GuiNote::GuiNote(GuiView & lv)
 }
 
 
-void GuiNote::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiNote::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiNote.h b/src/frontends/qt4/GuiNote.h
index 25525e3a6cbd7bdfe21a02db7b0e3a01ece58483..21fb2a87a6e7ea457382ee115874d25af763165c 100644 (file)
--- a/src/frontends/qt4/GuiNote.h
+++ b/src/frontends/qt4/GuiNote.h
@@ -27,7 +27,6 @@ public:
 private Q_SLOTS:
        void change_adaptor();
 private:
-       void closeEvent(QCloseEvent * e);
        /// Apply changes
        void applyView();
        /// Update dialog before showing it

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 6946811992d0e296adf63fc18e1c93343895fc2b..cce2399110a42f1bc059666dd8d78e5ce4e4e85d 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2211,13 +2211,6 @@ void GuiPreferences::add(PrefModule * module)
 }
 
 
-void GuiPreferences::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiPreferences::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 50202e5dd2d58f22fcb52b94f29ad97c9d02ab41..ec37c76a607967dfac899b5cddaa48b45ff0eb9a 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -436,8 +436,6 @@ public Q_SLOTS:
        void change_adaptor();
 
 public:
-       //
-       void closeEvent(QCloseEvent * e);
        ///
        void add(PrefModule * module);
        /// Apply changes

diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index df032c00a32bd3cf11fb778903cbbe6f405159f5..759b668d01fc695115b1b4bd202192e18b1cf831 100644 (file)
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -180,7 +180,7 @@ void GuiRef::closeEvent(QCloseEvent * e)
 {
        slotClose();
        reset_dialog();
-       GuiDialog::closeEvent(e);
+       e->accept();
 }
 
 

diff --git a/src/frontends/qt4/GuiSearch.cpp b/src/frontends/qt4/GuiSearch.cpp
index b6c7cc74006c8a30a7aa6545c6a919ada5be8f33..7cfe5af6470c6d30dcd76e3a9de1e0a2cf6e8045 100644 (file)
--- a/src/frontends/qt4/GuiSearch.cpp
+++ b/src/frontends/qt4/GuiSearch.cpp
@@ -70,13 +70,6 @@ void GuiSearch::showEvent(QShowEvent * e)
 }
 
 
-void GuiSearch::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       GuiDialog::closeEvent(e);
-}
-
-
 void GuiSearch::findChanged()
 {
        if (findCO->currentText().isEmpty()) {

diff --git a/src/frontends/qt4/GuiSearch.h b/src/frontends/qt4/GuiSearch.h
index 85ea64843e997a79427273b784745c460078a298..b56555307456b50c33b821213939d26b62c40721 100644 (file)
--- a/src/frontends/qt4/GuiSearch.h
+++ b/src/frontends/qt4/GuiSearch.h
@@ -34,7 +34,6 @@ private Q_SLOTS:
 
 private:
        void showEvent(QShowEvent * e);
-       void closeEvent(QCloseEvent * e);
        ///
        bool initialiseParams(std::string const &) { return true; }
        void clearParams() {}

diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp
index 891d2b97217e2377881c8d85a9770439f31c61a5..0afd45723dbc80f010847a07b896d6892a0124b4 100644 (file)
--- a/src/frontends/qt4/GuiSendto.cpp
+++ b/src/frontends/qt4/GuiSendto.cpp
@@ -65,13 +65,6 @@ void GuiSendTo::changed_adaptor()
 }
 
 
-void GuiSendTo::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiSendTo::updateContents()
 {
        all_formats_ = allFormats();

diff --git a/src/frontends/qt4/GuiSendto.h b/src/frontends/qt4/GuiSendto.h
index 595f5b815a3d1bee90d8829d3942af0ac0a82278..99afaf5f71b580e0d20176d3eda1d30097bf82d5 100644 (file)
--- a/src/frontends/qt4/GuiSendto.h
+++ b/src/frontends/qt4/GuiSendto.h
@@ -39,7 +39,6 @@ private Q_SLOTS:
        void slotFormatSelected(QListWidgetItem *) {}
 
 private:
-       void closeEvent(QCloseEvent * e);
        ///
        bool isValid();
        /// Apply from dialog

diff --git a/src/frontends/qt4/GuiShowFile.cpp b/src/frontends/qt4/GuiShowFile.cpp
index 95db41b06b516293d7f7395d4535241ff2dd554b..58ea26e42f58f772a3867e292ff08dcb095cd55e 100644 (file)
--- a/src/frontends/qt4/GuiShowFile.cpp
+++ b/src/frontends/qt4/GuiShowFile.cpp
@@ -39,13 +39,6 @@ GuiShowFile::GuiShowFile(GuiView & lv)
 }
 
 
-void GuiShowFile::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiShowFile::updateContents()
 {
        setWindowTitle(toqstr(onlyFilename(filename_.absFilename())));

diff --git a/src/frontends/qt4/GuiShowFile.h b/src/frontends/qt4/GuiShowFile.h
index b8dad883b1cf4d35d3352409c3db8f030543105f..db82eae87e56cc963d13a2db1be745aa1ff20e18 100644 (file)
--- a/src/frontends/qt4/GuiShowFile.h
+++ b/src/frontends/qt4/GuiShowFile.h
@@ -29,8 +29,6 @@ public:
        GuiShowFile(GuiView & lv);
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
        /// update
        void updateContents();
        ///

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index 9c4ad163cc63f43d01baee4c4c644d4c609948bd..b147f7419ba077f98652f2a14920e66cd884b06e 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -110,13 +110,6 @@ void GuiSpellchecker::replaceChanged(const QString & str)
 }
 
 
-void GuiSpellchecker::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       GuiDialog::closeEvent(e);
-}
-
-
 void GuiSpellchecker::reject()
 {
        slotClose();

diff --git a/src/frontends/qt4/GuiSpellchecker.h b/src/frontends/qt4/GuiSpellchecker.h
index b0e6862f19cff622c84063e99f91835fd1f30c95..19186ee2117e7096a96a59d39327a42c65b0d25e 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.h
+++ b/src/frontends/qt4/GuiSpellchecker.h
@@ -47,8 +47,6 @@ private Q_SLOTS:
        void reject();
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
        /// update from controller
        void partialUpdate(int id);
        ///

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 9fff9843bcb1ee2624f09adbd909813325285cd7..982a8a3b2cf19700eb0969dd6831832cc199752f 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -161,13 +161,6 @@ void GuiTabular::change_adaptor()
 }
 
 
-void GuiTabular::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       GuiDialog::closeEvent(e);
-}
-
-
 void GuiTabular::booktabsChanged(bool)
 {
        changed();

diff --git a/src/frontends/qt4/GuiTabular.h b/src/frontends/qt4/GuiTabular.h
index e7ab37149b217f84ab71c748711355e9141e8721..b33e84933f86af7b00fcd5543df2c31c7165cbf1 100644 (file)
--- a/src/frontends/qt4/GuiTabular.h
+++ b/src/frontends/qt4/GuiTabular.h
@@ -69,8 +69,6 @@ private Q_SLOTS:
        void ltLastFooterEmpty_clicked();
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
        ///
        bool isValid() { return true; }
        /// update borders

diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp
index 4c3d48bb2dbd4d6018a3cadc1b0cabe06dd88b26..c83aab1e9f1ff2f4aa0cf2b19759338faca0888a 100644 (file)
--- a/src/frontends/qt4/GuiTexinfo.cpp
+++ b/src/frontends/qt4/GuiTexinfo.cpp
@@ -113,13 +113,6 @@ void GuiTexInfo::change_adaptor()
 }
 
 
-void GuiTexInfo::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiTexInfo::rescanClicked()
 {
        // build new *Files.lst

diff --git a/src/frontends/qt4/GuiTexinfo.h b/src/frontends/qt4/GuiTexinfo.h
index 8231f1c210d1fb79b7a14b0caa99e1e9864bb08e..f734fc6e66621530fcf5380cb989bae6433524e1 100644 (file)
--- a/src/frontends/qt4/GuiTexinfo.h
+++ b/src/frontends/qt4/GuiTexinfo.h
@@ -49,8 +49,6 @@ private Q_SLOTS:
        void enableViewPB();
 
 private:
-       ///
-       void closeEvent(QCloseEvent * e);
        ///
        void updateStyles(TexFileType);
        ///

diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp
index 782a0710549c3b97f5f7f22e623e8e41c50bf1be..5bd2d9a44b95722237f58b1bd9ce27bbea9c4c6d 100644 (file)
--- a/src/frontends/qt4/GuiThesaurus.cpp
+++ b/src/frontends/qt4/GuiThesaurus.cpp
@@ -72,13 +72,6 @@ void GuiThesaurus::change_adaptor()
 }
 
 
-void GuiThesaurus::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       GuiDialog::closeEvent(e);
-}
-
-
 void GuiThesaurus::entryChanged()
 {
        updateLists();

diff --git a/src/frontends/qt4/GuiThesaurus.h b/src/frontends/qt4/GuiThesaurus.h
index e5671fba36e756f5fee9cf7f0bb1a4c452851c3a..2d0034bbdf965ea4aa2a955934703b43ad4c7b94 100644 (file)
--- a/src/frontends/qt4/GuiThesaurus.h
+++ b/src/frontends/qt4/GuiThesaurus.h
@@ -37,7 +37,6 @@ private Q_SLOTS:
        void itemClicked(QTreeWidgetItem *, int);
 
 private:
-       void closeEvent(QCloseEvent * e);
        /// update
        void updateContents();
        ///

diff --git a/src/frontends/qt4/GuiVSpace.cpp b/src/frontends/qt4/GuiVSpace.cpp
index 8a7442a0c75ce23e768c6d1d94d8e3b934bf6b9d..2f8a1013c04c81ef67b33f67587939c7a9dbe13b 100644 (file)
--- a/src/frontends/qt4/GuiVSpace.cpp
+++ b/src/frontends/qt4/GuiVSpace.cpp
@@ -82,13 +82,6 @@ GuiVSpace::GuiVSpace(GuiView & lv)
 }
 
 
-void GuiVSpace::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiVSpace::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiVSpace.h b/src/frontends/qt4/GuiVSpace.h
index b46eecd01d057da02be8b0a718f70a753dd37353..1c28ff2c2b7a4be46a77f8f1400571c34a3f2115 100644 (file)
--- a/src/frontends/qt4/GuiVSpace.h
+++ b/src/frontends/qt4/GuiVSpace.h
@@ -33,8 +33,6 @@ private Q_SLOTS:
        ///
        void change_adaptor();
        ///
-       void closeEvent(QCloseEvent *);
-       ///
        void enableCustom(int);
 
 private:

diff --git a/src/frontends/qt4/GuiWrap.cpp b/src/frontends/qt4/GuiWrap.cpp
index 95be49f1413dccc2bf2a143d56a62de929bb64bd..14bf05c06e182afad058f78b2e7a75b705d426da 100644 (file)
--- a/src/frontends/qt4/GuiWrap.cpp
+++ b/src/frontends/qt4/GuiWrap.cpp
@@ -84,13 +84,6 @@ GuiWrap::GuiWrap(GuiView & lv)
 }
 
 
-void GuiWrap::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiWrap::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiWrap.h b/src/frontends/qt4/GuiWrap.h
index e483400eab37d2524703bbbae9ca46b9dd6d4106..dbb20edb6b754e323e5eb34b826a0d248ff2207f 100644 (file)
--- a/src/frontends/qt4/GuiWrap.h
+++ b/src/frontends/qt4/GuiWrap.h
@@ -30,7 +30,6 @@ private Q_SLOTS:
        void change_adaptor();
 
 private:
-       void closeEvent(QCloseEvent * e);
        /// Apply changes
        void applyView();
        /// update