Commit a12344ce authored by hjk's avatar hjk
Browse files

MacroExpander: Minor interface cosmetics



Change-Id: Id6963a6ef29478db85c92c4d557f823502e173a5
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent b93ba85c
...@@ -50,14 +50,15 @@ typedef QVector<MacroExpander *> MacroExpanders; ...@@ -50,14 +50,15 @@ typedef QVector<MacroExpander *> MacroExpanders;
class QTCREATOR_UTILS_EXPORT MacroExpander class QTCREATOR_UTILS_EXPORT MacroExpander
{ {
Q_DECLARE_TR_FUNCTIONS("MacroExpander") Q_DECLARE_TR_FUNCTIONS("MacroExpander")
Q_DISABLE_COPY(MacroExpander)
public: public:
explicit MacroExpander(); 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; QString expand(const QString &stringWithVariables) const;
QByteArray expand(const QByteArray &stringWithVariables) const; QByteArray expand(const QByteArray &stringWithVariables) const;
...@@ -98,9 +99,6 @@ public: ...@@ -98,9 +99,6 @@ public:
void setAccumulating(bool on); void setAccumulating(bool on);
private: private:
MacroExpander(const MacroExpander &) Q_DECL_EQ_DELETE;
void operator=(const MacroExpander &) Q_DECL_EQ_DELETE;
friend class Internal::MacroExpanderPrivate; friend class Internal::MacroExpanderPrivate;
Internal::MacroExpanderPrivate *d; Internal::MacroExpanderPrivate *d;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment