feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove function wrapper

Browse Source 
This was an intentional, time-limited workaround that has
served its purpose now that we require C++11.

Change-Id: I96ece9c21bd405d281fd381bd9b87edc00c5ee84
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
hjk
2014-06-27 22:11:09 +02:00
parent 24d82a86ab
commit 2cd9a97510
11 changed files with 18 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/qmljs/qmljsimportdependencies.h
View File

@@ -34,7 +34,6 @@
#include <languageutils/componentversion.h>
#include <utils/qtcoverride.h>
#include <utils/function.h>
#include <QObject>
#include <QString>
@@ -44,6 +43,8 @@
#include <QSet>
#include <QSharedPointer>
#include <functional>
QT_BEGIN_NAMESPACE
class QCryptographicHash;
QT_END_NAMESPACE
@@ -192,7 +193,7 @@ public:
CoreImport coreImport(const QString &importId) const;
void iterateOnCandidateImports(const ImportKey &key, const ViewerContext &vContext,
Utils::function<bool(const ImportMatchStrength &,
std::function<bool(const ImportMatchStrength &,
const Export &,
const CoreImport &)> const &iterF) const;
ImportElements candidateImports(const ImportKey &key, const ViewerContext &vContext) const;
@@ -209,13 +210,13 @@ public:
const QString &requiredPath);
void iterateOnCoreImports(const ViewerContext &vContext,
Utils::function<bool(const CoreImport &)> const &iterF) const;
std::function<bool(const CoreImport &)> const &iterF) const;
void iterateOnLibraryImports(const ViewerContext &vContext,
Utils::function<bool(const ImportMatchStrength &,
std::function<bool(const ImportMatchStrength &,
const Export &,
const CoreImport &)> const &iterF) const;
void iterateOnSubImports(const ImportKey &baseKey, const ViewerContext &vContext,
Utils::function<bool(const ImportMatchStrength &,
std::function<bool(const ImportMatchStrength &,
const Export &,
const CoreImport &)> const &iterF) const;