Fix warning during runtime with qt4

Do not use "on_" as a prefix for functions unless the use of auto-connect is
intended.

diff --git a/src/frontends/qt4/Dialog.h b/src/frontends/qt4/Dialog.h
index bf4a313114c7c16ff293adeb0d4cfa34512f9dec..68587154e4adbd8c9095523fb8d8a757c823bcfc 100644 (file)
--- a/src/frontends/qt4/Dialog.h
+++ b/src/frontends/qt4/Dialog.h
@@ -265,7 +265,7 @@ protected:
        ///
        virtual void apply();
        /// To be called when the buffer view has changed
-       virtual void on_bufferViewChanged() = 0;
+       virtual void onBufferViewChanged() = 0;
 
 private:
        /** The Dialog's name is the means by which a dialog identifies

diff --git a/src/frontends/qt4/DialogView.cpp b/src/frontends/qt4/DialogView.cpp
index 7b9ee9c5038c443395fcb5aff44eaae00a0d2a87..9b114ec507df9966338e7dfd52a9e3f9a5f55aef 100644 (file)
--- a/src/frontends/qt4/DialogView.cpp
+++ b/src/frontends/qt4/DialogView.cpp
@@ -21,7 +21,7 @@ DialogView::DialogView(GuiView & lv, QString const & name, QString const & title
        : QDialog(&lv), Dialog(lv, name, "LyX: " + title)
 {
        connect(&lv, SIGNAL(bufferViewChanged()),
-               this, SLOT(on_bufferViewChanged()));
+               this, SLOT(onBufferViewChanged()));
 
        // remove question marks from Windows dialogs
        setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

diff --git a/src/frontends/qt4/DialogView.h b/src/frontends/qt4/DialogView.h
index 180bcb10828803b9d47b3083312f2e6ea794d4c9..aa00f64e123af45b9d141a562a4c6d76f93de503 100644 (file)
--- a/src/frontends/qt4/DialogView.h
+++ b/src/frontends/qt4/DialogView.h
@@ -49,7 +49,7 @@ protected:
        void hideEvent(QHideEvent * ev);
 
 protected Q_SLOTS:
-       void on_bufferViewChanged() {};
+       void onBufferViewChanged() {};
 };
 
 } // namespace frontend

diff --git a/src/frontends/qt4/DockView.cpp b/src/frontends/qt4/DockView.cpp
index ea385eece7d67ef4f2dabbb03da5b5b599a57a6b..c1b459bb0405e5d9feb4e4021c0816a7112dbf2c 100644 (file)
--- a/src/frontends/qt4/DockView.cpp
+++ b/src/frontends/qt4/DockView.cpp
@@ -27,7 +27,7 @@ DockView::DockView(GuiView & parent, QString const & name,
        parent.addDockWidget(area, this);
        hide();
        connect(&parent, SIGNAL(bufferViewChanged()),
-               this, SLOT(on_bufferViewChanged()));
+               this, SLOT(onBufferViewChanged()));
 }
 
 

diff --git a/src/frontends/qt4/DockView.h b/src/frontends/qt4/DockView.h
index 3c5f764522fcdaf562cf4906bad58046ba3833ea..621368bdfce306a13030d60d8152e33f5a8b5574 100644 (file)
--- a/src/frontends/qt4/DockView.h
+++ b/src/frontends/qt4/DockView.h
@@ -58,7 +58,7 @@ public:
        //@}
 
 protected Q_SLOTS:
-       void on_bufferViewChanged() {} //override
+       void onBufferViewChanged() {} //override
 };
 
 } // frontend

diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index 91ee667daba1fe37712ff0c42471260ab618a5f8..cad37e654b9d9ffcc4c01af2bfb85e07019ba50d 100644 (file)
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -29,7 +29,7 @@ GuiDialog::GuiDialog(GuiView & lv, QString const & name, QString const & title)
          is_closing_(false)
 {
        connect(&lv, SIGNAL(bufferViewChanged()),
-               this, SLOT(on_bufferViewChanged()));
+               this, SLOT(onBufferViewChanged()));
 
        // remove question marks from Windows dialogs
        setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

diff --git a/src/frontends/qt4/GuiDialog.h b/src/frontends/qt4/GuiDialog.h
index 20ffde046c2b6147e095e90e25df71fc161c7cd3..3b26943923abd09b20ebbbc3f0d2870394fa618f 100644 (file)
--- a/src/frontends/qt4/GuiDialog.h
+++ b/src/frontends/qt4/GuiDialog.h
@@ -60,7 +60,7 @@ public Q_SLOTS:
        void closeEvent(QCloseEvent * e);
 
 protected Q_SLOTS:
-       void on_bufferViewChanged() {};//override
+       void onBufferViewChanged() {};//override
 
 public:
        /** Check whether we may apply our data.

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 2a4087362e807d3362d03937bf58a5e518536f19..a69a111504e4da2ee8562ad205f2711c94ad7a7b 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1457,7 +1457,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 }
 
 
-void GuiDocument::on_bufferViewChanged()
+void GuiDocument::onBufferViewChanged()
 {
        if (isVisibleView())
                initialiseParams("");

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index c2f944dcb8b9d9c2ae1fe1e38140c59cbc3045e3..c055378429a28c03c8f255c437ba3a385a3c2980 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -83,7 +83,7 @@ public:
        BufferParams const & params() const { return bp_; }
 
 public Q_SLOTS:
-       void on_bufferViewChanged();//override
+       void onBufferViewChanged();//override
 
 private Q_SLOTS:
        void updateNumbering();

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index a714960da90c2e3635cc97ef4d164abaa5e21625..70aa5883bb2c9f22f8dc4369a23887f95310aa5c 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -513,7 +513,7 @@ GuiView::GuiView(int id)
          command_execute_(false), minibuffer_focus_(false)
 {
        connect(this, SIGNAL(bufferViewChanged()),
-               this, SLOT(on_bufferViewChanged()));
+               this, SLOT(onBufferViewChanged()));
 
        // GuiToolbars *must* be initialised before the menu bar.
        normalSizedIcons(); // at least on Mac the default is 32 otherwise, which is huge
@@ -1210,7 +1210,7 @@ void GuiView::on_currentWorkAreaChanged(GuiWorkArea * wa)
 }
 
 
-void GuiView::on_bufferViewChanged()
+void GuiView::onBufferViewChanged()
 {
        structureChanged();
        // Buffer-dependent dialogs must be updated. This is done here because

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 4beeb0ef11f3b351cd008717fc8df5bf1f5bf99b..4bc8b187a571e3500ed8a3d2b5f61bfeb41d2b96 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -233,7 +233,7 @@ private Q_SLOTS:
        ///
        void on_currentWorkAreaChanged(GuiWorkArea *);
        ///
-       void on_bufferViewChanged();
+       void onBufferViewChanged();
        ///
        void on_lastWorkAreaRemoved();
 

diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
index b413b9cf3ec230d7b11ac8c9751ebe4abfe496c6..9c0ea1d707c3e4262a7205035152ecce81ae6acd 100644 (file)
--- a/src/frontends/qt4/GuiViewSource.cpp
+++ b/src/frontends/qt4/GuiViewSource.cpp
@@ -423,7 +423,7 @@ GuiViewSource::GuiViewSource(GuiView & parent,
 }
 
 
-void GuiViewSource::on_bufferViewChanged()
+void GuiViewSource::onBufferViewChanged()
 {
        widget_->setText();
        widget_->setEnabled((bool)bufferview());

diff --git a/src/frontends/qt4/GuiViewSource.h b/src/frontends/qt4/GuiViewSource.h
index f2bc1ce062bd8e49abe3f2e9d0fb4d93259f4711..873f8dbf4f293fc1ea74dbac62f0f0c7280c1c60 100644 (file)
--- a/src/frontends/qt4/GuiViewSource.h
+++ b/src/frontends/qt4/GuiViewSource.h
@@ -119,7 +119,7 @@ public:
 
 public Q_SLOTS:
        ///
-       void on_bufferViewChanged();//override
+       void onBufferViewChanged();//override
 
 private Q_SLOTS:
        /// The title displayed by the dialog reflects source type.