From 44e5ee4da662d44362da5193c6ac92ea2d5c1109 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 22 Apr 2017 15:55:18 +0200 Subject: [PATCH] fix clang warning: -Wunused-private-field --- src/Gui/Widgets.cpp | 4 ++-- src/Gui/Widgets.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp index f8eb90ca6e..e4ce770e5c 100644 --- a/src/Gui/Widgets.cpp +++ b/src/Gui/Widgets.cpp @@ -442,7 +442,7 @@ void AccelLineEdit::keyPressEvent ( QKeyEvent * e) #if QT_VERSION >= 0x050200 ClearLineEdit::ClearLineEdit (QWidget * parent) - : QLineEdit(parent), clearButton(nullptr) + : QLineEdit(parent) { clearAction = this->addAction(QIcon(QString::fromLatin1(":/icons/edit-cleartext.svg")), QLineEdit::TrailingPosition); @@ -462,7 +462,7 @@ void ClearLineEdit::updateClearButton(const QString& text) } #else ClearLineEdit::ClearLineEdit (QWidget * parent) - : QLineEdit(parent), clearAction(nullptr) + : QLineEdit(parent) { clearButton = new QToolButton(this); QPixmap pixmap(BitmapFactory().pixmapFromSvg(":/icons/edit-cleartext.svg", QSize(18, 18))); diff --git a/src/Gui/Widgets.h b/src/Gui/Widgets.h index 4d71f9cafe..d99c27d714 100644 --- a/src/Gui/Widgets.h +++ b/src/Gui/Widgets.h @@ -153,8 +153,11 @@ private Q_SLOTS: void updateClearButton(const QString &text); private: +#if QT_VERSION >= 0x050200 QAction *clearAction; +#else QToolButton *clearButton; +#endif }; // ------------------------------------------------------------------------------