From df3d22ef1c68f39c7ca0688955f8a44350ebc657 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 13 Oct 2014 10:24:29 +0200 Subject: [PATCH] Utils: Move MacroExpander to file pair of its own Change-Id: I777accd58dafca39a0d3e50541af325277c49c6b Reviewed-by: Tobias Hunger --- src/libs/utils/macroexpander.cpp | 43 +++++++++++++++ src/libs/utils/macroexpander.h | 54 +++++++++++++++++++ src/libs/utils/stringutils.h | 15 ------ src/libs/utils/utils-lib.pri | 6 ++- src/libs/utils/utils.qbs | 2 + .../debugger/debuggerkitinformation.cpp | 1 + src/plugins/qtsupport/baseqtversion.cpp | 2 +- 7 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 src/libs/utils/macroexpander.cpp create mode 100644 src/libs/utils/macroexpander.h diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp new file mode 100644 index 00000000000..2c257d06616 --- /dev/null +++ b/src/libs/utils/macroexpander.cpp @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** 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 diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h new file mode 100644 index 00000000000..20af9732dac --- /dev/null +++ b/src/libs/utils/macroexpander.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** 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 + +namespace Utils { + +class QTCREATOR_UTILS_EXPORT MacroExpander : public AbstractMacroExpander +{ +public: + typedef std::function Resolver; + + explicit MacroExpander(const Resolver &resolver); + + bool resolveMacro(const QString &name, QString *ret); + +private: + Resolver m_resolver; +}; + +} // namespace Utils + +#endif // UTILS_MACROEXPANDER_H diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h index 958d56976c4..97d47d64e4d 100644 --- a/src/libs/utils/stringutils.h +++ b/src/libs/utils/stringutils.h @@ -32,8 +32,6 @@ #include "utils_global.h" -#include - QT_BEGIN_NAMESPACE class QStringList; QT_END_NAMESPACE @@ -77,19 +75,6 @@ private: bool expandNestedMacros(const QString &str, int *pos, QString *ret); }; -class QTCREATOR_UTILS_EXPORT MacroExpander : public AbstractMacroExpander -{ -public: - typedef std::function 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 QString expandMacros(const QString &str, AbstractMacroExpander *mx); diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 4647b5f1cce..68c007a3640 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -90,7 +90,8 @@ SOURCES += $$PWD/environment.cpp \ $$PWD/winutils.cpp \ $$PWD/itemviews.cpp \ $$PWD/treeviewcombobox.cpp \ - $$PWD/proxycredentialsdialog.cpp + $$PWD/proxycredentialsdialog.cpp \ + $$PWD/macroexpander.cpp win32:SOURCES += $$PWD/consoleprocess_win.cpp else:SOURCES += $$PWD/consoleprocess_unix.cpp @@ -185,7 +186,8 @@ HEADERS += \ $$PWD/scopedswap.h \ $$PWD/algorithm.h \ $$PWD/QtConcurrentTools \ - $$PWD/proxycredentialsdialog.h + $$PWD/proxycredentialsdialog.h \ + $$PWD/macroexpander.h FORMS += $$PWD/filewizardpage.ui \ $$PWD/projectintropage.ui \ diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 3e100f31298..9abcf48d2ad 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -105,6 +105,8 @@ QtcLibrary { "linecolumnlabel.cpp", "linecolumnlabel.h", "listutils.h", + "macroexpander.cpp", + "macroexpander.h", "multitask.h", "navigationtreeview.cpp", "navigationtreeview.h", diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index bebc29a3d77..cc563e2e4bf 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -37,6 +37,7 @@ #include #include +#include #include #include diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 6254dcab0a6..ba51c1773c0 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -47,9 +47,9 @@ #include #include +#include #include #include -#include #include #include #include