Fix several clazy issues:
* Q_PROPERTY should have either NOTIFY or CONSTANT [-Wclazy-qproperty-without-notify] * Use Q_ENUM instead of Q_ENUMS [-Wclazy-qenums] * Add missing a Q_OBJECT macro [-Wclazy-missing-qobject-macro] * Signal/Slot arguments need to be fully-qualified [-Wclazy-fully-qualified-moc-types]
This commit is contained in:
@@ -33,6 +33,7 @@
|
||||
#include <QDialog>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QMessageBox>
|
||||
#include <FCGlobal.h>
|
||||
|
||||
namespace Gui {
|
||||
namespace Dialog {
|
||||
@@ -46,13 +47,13 @@ struct DlgCheckableMessageBoxPrivate;
|
||||
class GuiExport DlgCheckableMessageBox : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
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 text READ text WRITE setText) // clazy:exclude=qproperty-without-notify
|
||||
Q_PROPERTY(QPixmap iconPixmap READ iconPixmap WRITE setIconPixmap) // clazy:exclude=qproperty-without-notify
|
||||
Q_PROPERTY(bool isChecked READ isChecked WRITE setChecked) // clazy:exclude=qproperty-without-notify
|
||||
//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)
|
||||
Q_PROPERTY(QString checkBoxText READ checkBoxText WRITE setCheckBoxText) // clazy:exclude=qproperty-without-notify
|
||||
Q_PROPERTY(QDialogButtonBox::StandardButtons buttons READ standardButtons WRITE setStandardButtons) // clazy:exclude=qproperty-without-notify
|
||||
Q_PROPERTY(QDialogButtonBox::StandardButton defaultButton READ defaultButton WRITE setDefaultButton) // clazy:exclude=qproperty-without-notify
|
||||
public:
|
||||
explicit DlgCheckableMessageBox(QWidget *parent);
|
||||
virtual ~DlgCheckableMessageBox();
|
||||
@@ -82,40 +83,40 @@ public:
|
||||
QString checkBoxText() const;
|
||||
void setCheckBoxText(const QString &);
|
||||
|
||||
QDialogButtonBox::StandardButtons standardButtons() const;
|
||||
void setStandardButtons(QDialogButtonBox::StandardButtons s);
|
||||
QDialogButtonBox::StandardButtons standardButtons() const;
|
||||
void setStandardButtons(QDialogButtonBox::StandardButtons s);
|
||||
|
||||
QDialogButtonBox::StandardButton defaultButton() const;
|
||||
void setDefaultButton(QDialogButtonBox::StandardButton s);
|
||||
QDialogButtonBox::StandardButton defaultButton() const;
|
||||
void setDefaultButton(QDialogButtonBox::StandardButton s);
|
||||
|
||||
// see static QMessageBox::standardPixmap()
|
||||
QPixmap iconPixmap() const;
|
||||
void setIconPixmap (const QPixmap &p);
|
||||
|
||||
// Query the result
|
||||
QAbstractButton *clickedButton() const;
|
||||
QDialogButtonBox::StandardButton clickedStandardButton() const;
|
||||
// Query the result
|
||||
QAbstractButton *clickedButton() const;
|
||||
QDialogButtonBox::StandardButton clickedStandardButton() const;
|
||||
|
||||
// Conversion convenience
|
||||
static QMessageBox::StandardButton dialogButtonBoxToMessageBoxButton(QDialogButtonBox::StandardButton);
|
||||
// Conversion convenience
|
||||
static QMessageBox::StandardButton dialogButtonBoxToMessageBoxButton(QDialogButtonBox::StandardButton);
|
||||
|
||||
/// convenient show method
|
||||
/// It shows a dialog with header and message provided and a checkbox in check state with the message provided.
|
||||
/// It uses a parameter in path "User parameter:BaseApp/CheckMessages" derived from the header test, defaulting to false,
|
||||
/// to store the status of the checkbox, when the user exits the modal dialog.
|
||||
static void showMessage(const QString& header, const QString& message, bool check = false, const QString& checkText = QString::fromLatin1("Don't show me again"));
|
||||
/// convenient show method
|
||||
/// It shows a dialog with header and message provided and a checkbox in check state with the message provided.
|
||||
/// It uses a parameter in path "User parameter:BaseApp/CheckMessages" derived from the header test, defaulting to false,
|
||||
/// to store the status of the checkbox, when the user exits the modal dialog.
|
||||
static void showMessage(const QString& header, const QString& message, bool check = false, const QString& checkText = QString::fromLatin1("Don't show me again"));
|
||||
|
||||
/// Same as showMessage above, but it checks the specific preference path and parameter provided, defaulting to entryDefault value if the parameter is not present.
|
||||
static void showMessage(const QString& header, const QString& message, const QString& prefPath, const QString& paramEntry, bool entryDefault = false,
|
||||
bool check = false, const QString& checkText = QString::fromLatin1("Don't show me again"));
|
||||
/// Same as showMessage above, but it checks the specific preference path and parameter provided, defaulting to entryDefault value if the parameter is not present.
|
||||
static void showMessage(const QString& header, const QString& message, const QString& prefPath, const QString& paramEntry, bool entryDefault = false,
|
||||
bool check = false, const QString& checkText = QString::fromLatin1("Don't show me again"));
|
||||
|
||||
private Q_SLOTS:
|
||||
void slotClicked(QAbstractButton *b);
|
||||
void slotClicked(QAbstractButton *b);
|
||||
|
||||
private:
|
||||
DlgCheckableMessageBoxPrivate *m_d;
|
||||
QByteArray paramEntry;
|
||||
QString prefPath;
|
||||
DlgCheckableMessageBoxPrivate *m_d;
|
||||
QByteArray paramEntry;
|
||||
QString prefPath;
|
||||
};
|
||||
|
||||
} // namespace Dialog
|
||||
|
||||
Reference in New Issue
Block a user