mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-03 16:31:13 +00:00
Fix warning during runtime with qt4
Do not use "on_" as a prefix for functions unless the use of auto-connect is intended.
This commit is contained in:
parent
0220c58ef3
commit
dc5d056dd5
@ -265,7 +265,7 @@ protected:
|
|||||||
///
|
///
|
||||||
virtual void apply();
|
virtual void apply();
|
||||||
/// To be called when the buffer view has changed
|
/// To be called when the buffer view has changed
|
||||||
virtual void on_bufferViewChanged() = 0;
|
virtual void onBufferViewChanged() = 0;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/** The Dialog's name is the means by which a dialog identifies
|
/** The Dialog's name is the means by which a dialog identifies
|
||||||
|
@ -21,7 +21,7 @@ DialogView::DialogView(GuiView & lv, QString const & name, QString const & title
|
|||||||
: QDialog(&lv), Dialog(lv, name, "LyX: " + title)
|
: QDialog(&lv), Dialog(lv, name, "LyX: " + title)
|
||||||
{
|
{
|
||||||
connect(&lv, SIGNAL(bufferViewChanged()),
|
connect(&lv, SIGNAL(bufferViewChanged()),
|
||||||
this, SLOT(on_bufferViewChanged()));
|
this, SLOT(onBufferViewChanged()));
|
||||||
|
|
||||||
// remove question marks from Windows dialogs
|
// remove question marks from Windows dialogs
|
||||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
@ -49,7 +49,7 @@ protected:
|
|||||||
void hideEvent(QHideEvent * ev);
|
void hideEvent(QHideEvent * ev);
|
||||||
|
|
||||||
protected Q_SLOTS:
|
protected Q_SLOTS:
|
||||||
void on_bufferViewChanged() {};
|
void onBufferViewChanged() {};
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace frontend
|
} // namespace frontend
|
||||||
|
@ -27,7 +27,7 @@ DockView::DockView(GuiView & parent, QString const & name,
|
|||||||
parent.addDockWidget(area, this);
|
parent.addDockWidget(area, this);
|
||||||
hide();
|
hide();
|
||||||
connect(&parent, SIGNAL(bufferViewChanged()),
|
connect(&parent, SIGNAL(bufferViewChanged()),
|
||||||
this, SLOT(on_bufferViewChanged()));
|
this, SLOT(onBufferViewChanged()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ public:
|
|||||||
//@}
|
//@}
|
||||||
|
|
||||||
protected Q_SLOTS:
|
protected Q_SLOTS:
|
||||||
void on_bufferViewChanged() {} //override
|
void onBufferViewChanged() {} //override
|
||||||
};
|
};
|
||||||
|
|
||||||
} // frontend
|
} // frontend
|
||||||
|
@ -29,7 +29,7 @@ GuiDialog::GuiDialog(GuiView & lv, QString const & name, QString const & title)
|
|||||||
is_closing_(false)
|
is_closing_(false)
|
||||||
{
|
{
|
||||||
connect(&lv, SIGNAL(bufferViewChanged()),
|
connect(&lv, SIGNAL(bufferViewChanged()),
|
||||||
this, SLOT(on_bufferViewChanged()));
|
this, SLOT(onBufferViewChanged()));
|
||||||
|
|
||||||
// remove question marks from Windows dialogs
|
// remove question marks from Windows dialogs
|
||||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
@ -60,7 +60,7 @@ public Q_SLOTS:
|
|||||||
void closeEvent(QCloseEvent * e);
|
void closeEvent(QCloseEvent * e);
|
||||||
|
|
||||||
protected Q_SLOTS:
|
protected Q_SLOTS:
|
||||||
void on_bufferViewChanged() {};//override
|
void onBufferViewChanged() {};//override
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** Check whether we may apply our data.
|
/** Check whether we may apply our data.
|
||||||
|
@ -1457,7 +1457,7 @@ GuiDocument::GuiDocument(GuiView & lv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void GuiDocument::on_bufferViewChanged()
|
void GuiDocument::onBufferViewChanged()
|
||||||
{
|
{
|
||||||
if (isVisibleView())
|
if (isVisibleView())
|
||||||
initialiseParams("");
|
initialiseParams("");
|
||||||
|
@ -83,7 +83,7 @@ public:
|
|||||||
BufferParams const & params() const { return bp_; }
|
BufferParams const & params() const { return bp_; }
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
void on_bufferViewChanged();//override
|
void onBufferViewChanged();//override
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void updateNumbering();
|
void updateNumbering();
|
||||||
|
@ -513,7 +513,7 @@ GuiView::GuiView(int id)
|
|||||||
command_execute_(false), minibuffer_focus_(false)
|
command_execute_(false), minibuffer_focus_(false)
|
||||||
{
|
{
|
||||||
connect(this, SIGNAL(bufferViewChanged()),
|
connect(this, SIGNAL(bufferViewChanged()),
|
||||||
this, SLOT(on_bufferViewChanged()));
|
this, SLOT(onBufferViewChanged()));
|
||||||
|
|
||||||
// GuiToolbars *must* be initialised before the menu bar.
|
// GuiToolbars *must* be initialised before the menu bar.
|
||||||
normalSizedIcons(); // at least on Mac the default is 32 otherwise, which is huge
|
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();
|
structureChanged();
|
||||||
// Buffer-dependent dialogs must be updated. This is done here because
|
// Buffer-dependent dialogs must be updated. This is done here because
|
||||||
|
@ -233,7 +233,7 @@ private Q_SLOTS:
|
|||||||
///
|
///
|
||||||
void on_currentWorkAreaChanged(GuiWorkArea *);
|
void on_currentWorkAreaChanged(GuiWorkArea *);
|
||||||
///
|
///
|
||||||
void on_bufferViewChanged();
|
void onBufferViewChanged();
|
||||||
///
|
///
|
||||||
void on_lastWorkAreaRemoved();
|
void on_lastWorkAreaRemoved();
|
||||||
|
|
||||||
|
@ -423,7 +423,7 @@ GuiViewSource::GuiViewSource(GuiView & parent,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void GuiViewSource::on_bufferViewChanged()
|
void GuiViewSource::onBufferViewChanged()
|
||||||
{
|
{
|
||||||
widget_->setText();
|
widget_->setText();
|
||||||
widget_->setEnabled((bool)bufferview());
|
widget_->setEnabled((bool)bufferview());
|
||||||
|
@ -119,7 +119,7 @@ public:
|
|||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
///
|
///
|
||||||
void on_bufferViewChanged();//override
|
void onBufferViewChanged();//override
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
/// The title displayed by the dialog reflects source type.
|
/// The title displayed by the dialog reflects source type.
|
||||||
|
Loading…
Reference in New Issue
Block a user