commit aab58fed6b140e1629d7c4c4f7becbf5b3e74160
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Jan 12 15:41:27 2018 +0100
Use qt4-compatible connect() syntax.
Signed-off-by: Juergen Spitzmueller <[email protected]>
---
src/frontends/qt4/GuiWorkArea.cpp | 6 ++++--
src/frontends/qt4/GuiWorkArea.h | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/frontends/qt4/GuiWorkArea.cpp
b/src/frontends/qt4/GuiWorkArea.cpp
index be1b4d4..e82fea7 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -1039,9 +1039,11 @@ CompressorProxy::CompressorProxy(GuiWorkArea * wa) :
QObject(wa)
{
qRegisterMetaType<KeySymbol>("KeySymbol");
qRegisterMetaType<KeyModifier>("KeyModifier");
- connect(wa, &GuiWorkArea::compressKeySym, this, &CompressorProxy::slot,
+ connect(wa, SIGNAL(compressKeySym(KeySymbol, KeyModifier, bool)),
+ this, SLOT(slot(KeySymbol, KeyModifier, bool)),
Qt::QueuedConnection);
- connect(this, &CompressorProxy::signal, wa,
&GuiWorkArea::processKeySym);
+ connect(this, SIGNAL(signal(KeySymbol, KeyModifier)),
+ wa, SLOT(processKeySym(KeySymbol, KeyModifier)));
}
diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index 806aefd..39d2054 100644
--- a/src/frontends/qt4/GuiWorkArea.h
+++ b/src/frontends/qt4/GuiWorkArea.h
@@ -68,9 +68,6 @@ public:
/// return true if the key is part of a shortcut
bool queryKeySym(KeySymbol const & key, KeyModifier mod) const;
- /// Process Key pressed event.
- /// This needs to be public because it is accessed externally by
GuiView.
- void processKeySym(KeySymbol const & key, KeyModifier mod);
bool inDialogMode() const;
void setDialogMode(bool mode);
@@ -86,6 +83,9 @@ public:
double pixelRatio() const;
public Q_SLOTS:
+ /// Process Key pressed event.
+ /// This needs to be public because it is accessed externally by
GuiView.
+ void processKeySym(KeySymbol const & key, KeyModifier mod);
///
void stopBlinkingCaret();
///