Commit df3d22ef authored by hjk's avatar hjk

Utils: Move MacroExpander to file pair of its own

Change-Id: I777accd58dafca39a0d3e50541af325277c49c6b
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent b3f3c96b
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "macroexpander.h"
namespace Utils {
MacroExpander::MacroExpander(const MacroExpander::Resolver &resolver)
: m_resolver(resolver)
{}
bool MacroExpander::resolveMacro(const QString &name, QString *ret)
{
return m_resolver(name, ret);
}
} // namespace Utils
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef UTILS_MACROEXPANDER_H
#define UTILS_MACROEXPANDER_H
#include "stringutils.h"
#include <functional>
namespace Utils {
class QTCREATOR_UTILS_EXPORT MacroExpander : public AbstractMacroExpander
{
public:
typedef std::function<bool(const QString &name, QString *ret)> Resolver;
explicit MacroExpander(const Resolver &resolver);
bool resolveMacro(const QString &name, QString *ret);
private:
Resolver m_resolver;
};
} // namespace Utils
#endif // UTILS_MACROEXPANDER_H
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include "utils_global.h" #include "utils_global.h"
#include <functional>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QStringList; class QStringList;
QT_END_NAMESPACE QT_END_NAMESPACE
...@@ -77,19 +75,6 @@ private: ...@@ -77,19 +75,6 @@ private:
bool expandNestedMacros(const QString &str, int *pos, QString *ret); bool expandNestedMacros(const QString &str, int *pos, QString *ret);
}; };
class QTCREATOR_UTILS_EXPORT MacroExpander : public AbstractMacroExpander
{
public:
typedef std::function<bool(const QString &name, QString *ret)> Resolver;
explicit MacroExpander(const Resolver &resolver) : m_resolver(resolver) {}
bool resolveMacro(const QString &name, QString *ret) { return m_resolver(name, ret); }
private:
Resolver m_resolver;
};
QTCREATOR_UTILS_EXPORT void expandMacros(QString *str, AbstractMacroExpander *mx); QTCREATOR_UTILS_EXPORT void expandMacros(QString *str, AbstractMacroExpander *mx);
QTCREATOR_UTILS_EXPORT QString expandMacros(const QString &str, AbstractMacroExpander *mx); QTCREATOR_UTILS_EXPORT QString expandMacros(const QString &str, AbstractMacroExpander *mx);
......
...@@ -90,7 +90,8 @@ SOURCES += $$PWD/environment.cpp \ ...@@ -90,7 +90,8 @@ SOURCES += $$PWD/environment.cpp \
$$PWD/winutils.cpp \ $$PWD/winutils.cpp \
$$PWD/itemviews.cpp \ $$PWD/itemviews.cpp \
$$PWD/treeviewcombobox.cpp \ $$PWD/treeviewcombobox.cpp \
$$PWD/proxycredentialsdialog.cpp $$PWD/proxycredentialsdialog.cpp \
$$PWD/macroexpander.cpp
win32:SOURCES += $$PWD/consoleprocess_win.cpp win32:SOURCES += $$PWD/consoleprocess_win.cpp
else:SOURCES += $$PWD/consoleprocess_unix.cpp else:SOURCES += $$PWD/consoleprocess_unix.cpp
...@@ -185,7 +186,8 @@ HEADERS += \ ...@@ -185,7 +186,8 @@ HEADERS += \
$$PWD/scopedswap.h \ $$PWD/scopedswap.h \
$$PWD/algorithm.h \ $$PWD/algorithm.h \
$$PWD/QtConcurrentTools \ $$PWD/QtConcurrentTools \
$$PWD/proxycredentialsdialog.h $$PWD/proxycredentialsdialog.h \
$$PWD/macroexpander.h
FORMS += $$PWD/filewizardpage.ui \ FORMS += $$PWD/filewizardpage.ui \
$$PWD/projectintropage.ui \ $$PWD/projectintropage.ui \
......
...@@ -105,6 +105,8 @@ QtcLibrary { ...@@ -105,6 +105,8 @@ QtcLibrary {
"linecolumnlabel.cpp", "linecolumnlabel.cpp",
"linecolumnlabel.h", "linecolumnlabel.h",
"listutils.h", "listutils.h",
"macroexpander.cpp",
"macroexpander.h",
"multitask.h", "multitask.h",
"navigationtreeview.cpp", "navigationtreeview.cpp",
"navigationtreeview.h", "navigationtreeview.h",
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <projectexplorer/kitinformationmacroexpander.h> #include <projectexplorer/kitinformationmacroexpander.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/macroexpander.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QFileInfo> #include <QFileInfo>
......
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/macroexpander.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/winutils.h> #include <utils/winutils.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
......
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