From df6eb69f56de9db37d340c8b0a126de15c6c1e8c Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 13 Apr 2016 17:16:32 +0200 Subject: [PATCH] + fix reported Qt warning --- src/Gui/DlgCheckableMessageBox.cpp | 17 ++++++++--------- src/Gui/DlgCheckableMessageBox.h | 8 ++++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Gui/DlgCheckableMessageBox.cpp b/src/Gui/DlgCheckableMessageBox.cpp index 5dbba1f9d..47c457984 100644 --- a/src/Gui/DlgCheckableMessageBox.cpp +++ b/src/Gui/DlgCheckableMessageBox.cpp @@ -48,16 +48,15 @@ namespace Gui { namespace Dialog { QByteArray toParamEntry(QString name) { - QString tmp = QString::fromLatin1(name.toLatin1()); - name.replace(QString::fromLatin1(" "),QString::fromLatin1("_")); + name.replace(QString::fromLatin1(" "), QString::fromLatin1("_")); return name.toLatin1(); } -void DlgCheckableMessageBox::showMessage(QString header, QString message, bool check,QString checkText ) +void DlgCheckableMessageBox::showMessage(const QString& header, const QString& message, bool check, const QString& checkText) { bool checked = App::GetApplication().GetParameterGroupByPath( QByteArray("User parameter:BaseApp/CheckMessages"))->GetBool(toParamEntry(header)); - if(!checked){ + if (!checked) { DlgCheckableMessageBox *mb = new DlgCheckableMessageBox(Gui::getMainWindow()); mb->setWindowTitle(header); mb->setIconPixmap(QMessageBox::standardIcon(QMessageBox::Warning)); @@ -97,11 +96,11 @@ DlgCheckableMessageBox::~DlgCheckableMessageBox() delete m_d; } -void DlgCheckableMessageBox::setPrefEntry( const QString& entry ) +void DlgCheckableMessageBox::setPrefEntry(const QString& entry) { - paramEntry = toParamEntry(entry); - bool checked = App::GetApplication().GetParameterGroupByPath( QByteArray("User parameter:BaseApp/CheckMessages"))->GetBool(paramEntry); - setChecked(checked); + paramEntry = toParamEntry(entry); + bool checked = App::GetApplication().GetParameterGroupByPath(QByteArray("User parameter:BaseApp/CheckMessages"))->GetBool(paramEntry); + setChecked(checked); } @@ -236,4 +235,4 @@ QMessageBox::StandardButton DlgCheckableMessageBox::dialogButtonBoxToMessageBoxB } // namespace Dialog } // namespace Gui -#include "moc_DlgCheckableMessageBox.cpp" \ No newline at end of file +#include "moc_DlgCheckableMessageBox.cpp" diff --git a/src/Gui/DlgCheckableMessageBox.h b/src/Gui/DlgCheckableMessageBox.h index 9c42a2a28..a7ccee5b3 100644 --- a/src/Gui/DlgCheckableMessageBox.h +++ b/src/Gui/DlgCheckableMessageBox.h @@ -51,7 +51,7 @@ class GuiExport DlgCheckableMessageBox : public QDialog Q_PROPERTY(QString text READ text WRITE setText) Q_PROPERTY(QPixmap iconPixmap READ iconPixmap WRITE setIconPixmap) Q_PROPERTY(bool isChecked READ isChecked WRITE setChecked) - Q_PROPERTY(QString prefEntry WRITE setPrefEntry) + //Q_PROPERTY(QString prefEntry WRITE setPrefEntry) // Must have a READ accessor! Q_PROPERTY(QString checkBoxText READ checkBoxText WRITE setCheckBoxText) Q_PROPERTY(QDialogButtonBox::StandardButtons buttons READ standardButtons WRITE setStandardButtons) Q_PROPERTY(QDialogButtonBox::StandardButton defaultButton READ defaultButton WRITE setDefaultButton) @@ -71,7 +71,7 @@ public: QString text() const; void setText(const QString &); - void setPrefEntry( const QString& entry ); + void setPrefEntry(const QString& entry); virtual void accept(); virtual void reject(); @@ -99,8 +99,8 @@ public: // Conversion convenience static QMessageBox::StandardButton dialogButtonBoxToMessageBoxButton(QDialogButtonBox::StandardButton); - // conviniant show method - static void showMessage(QString haeder, QString message, bool check=false,QString checkText = QString::fromLatin1("Don't show me again")); + // convenient show method + static void showMessage(const QString& haeder, const QString& message, bool check=false, const QString& checkText = QString::fromLatin1("Don't show me again")); private Q_SLOTS: void slotClicked(QAbstractButton *b);