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

17
src/libs/qmljs/qmljsimportdependencies.cpp
View File

@@ -32,7 +32,6 @@
#include "qmljsqrcparser.h"
#include <utils/qtcassert.h>
#include <utils/function.h>
#include <QCryptographicHash>
@@ -616,7 +615,7 @@ CoreImport ImportDependencies::coreImport(const QString &importId) const
void ImportDependencies::iterateOnCandidateImports(
const ImportKey &key, const ViewerContext &vContext,
Utils::function<bool (const ImportMatchStrength &,const Export &,const CoreImport &)>
std::function<bool (const ImportMatchStrength &,const Export &,const CoreImport &)>
const &iterF) const
{
switch (key.type) {
@@ -817,7 +816,7 @@ void ImportDependencies::removeExport(const QString &importId, const ImportKey &
void ImportDependencies::iterateOnCoreImports(
const ViewerContext &vContext,
Utils::function<bool (const CoreImport &)> const &iterF) const
std::function<bool (const CoreImport &)> const &iterF) const
{
QMapIterator<QString, CoreImport> i(m_coreImports);
while (i.hasNext()) {
@@ -829,9 +828,9 @@ void ImportDependencies::iterateOnCoreImports(
void ImportDependencies::iterateOnLibraryImports(
const ViewerContext &vContext,
Utils::function<bool (const ImportMatchStrength &,
const Export &,
const CoreImport &)> const &iterF) const
std::function<bool (const ImportMatchStrength &,
const Export &,
const CoreImport &)> const &iterF) const
{
typedef QMap<ImportKey, QStringList>::const_iterator iter_t;
ImportKey firstLib;
@@ -865,9 +864,9 @@ void ImportDependencies::iterateOnLibraryImports(
void ImportDependencies::iterateOnSubImports(
const ImportKey &baseKey,
const ViewerContext &vContext,
Utils::function<bool (const ImportMatchStrength &,
const Export &,
const CoreImport &)> const &iterF) const
std::function<bool (const ImportMatchStrength &,
const Export &,
const CoreImport &)> const &iterF) const
{
typedef QMap<ImportKey, QStringList>::const_iterator iter_t;
iter_t i = m_importCache.lowerBound(baseKey);