From a12344ce61954bb0819f3c507b9ee5fa52e8d722 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 5 Nov 2014 10:36:33 +0100 Subject: [PATCH] MacroExpander: Minor interface cosmetics Change-Id: Id6963a6ef29478db85c92c4d557f823502e173a5 Reviewed-by: Orgad Shaneh --- src/libs/utils/macroexpander.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h index 6c6007f4ffb..25194ee8563 100644 --- a/src/libs/utils/macroexpander.h +++ b/src/libs/utils/macroexpander.h @@ -50,14 +50,15 @@ typedef QVector MacroExpanders; class QTCREATOR_UTILS_EXPORT MacroExpander { Q_DECLARE_TR_FUNCTIONS("MacroExpander") + Q_DISABLE_COPY(MacroExpander) public: explicit MacroExpander(); - virtual ~MacroExpander(); + ~MacroExpander(); - virtual bool resolveMacro(const QString &name, QString *ret) const; + bool resolveMacro(const QString &name, QString *ret) const; - virtual QString value(const QByteArray &variable, bool *found = 0) const; + QString value(const QByteArray &variable, bool *found = 0) const; QString expand(const QString &stringWithVariables) const; QByteArray expand(const QByteArray &stringWithVariables) const; @@ -98,9 +99,6 @@ public: void setAccumulating(bool on); private: - MacroExpander(const MacroExpander &) Q_DECL_EQ_DELETE; - void operator=(const MacroExpander &) Q_DECL_EQ_DELETE; - friend class Internal::MacroExpanderPrivate; Internal::MacroExpanderPrivate *d; };