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

CppEditor: Check <include path>/QSomething

Browse Source 
For the quick fix AddIncludeForUndefinedIdentifier, if no class is found
via the locator, check the "Qt include paths" for a header file with the
same name as the class name.

Task-number: QTCREATORBUG-9538
Change-Id: I13c86844c2ff653fa479dc91eb109af2a6d76fae
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Nikolai Kosjar
2013-06-14 14:02:17 +02:00
parent 18dcac7ad0
commit 8180f695f1
5 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -344,18 +344,25 @@ private:
const QString m_include;
};
QString includeBaseDirectory()
{
return QLatin1String(SRCDIR)
+ QLatin1String("/../../../tests/auto/cplusplus/preprocessor/data/include-data");
}
QString globalQtCoreIncludePath()
{
return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/QtCore"));
}
QString globalIncludePath()
{
const QString path = QLatin1String(SRCDIR)
+ QLatin1String("/../../../tests/auto/cplusplus/preprocessor/data/include-data/global");
return QDir::cleanPath(path);
return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/global"));
}
QString directoryOfTestFile()
{
const QString path = QLatin1String(SRCDIR)
+ QLatin1String("/../../../tests/auto/cplusplus/preprocessor/data/include-data/local");
return QDir::cleanPath(path);
return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/local"));
}
} // anonymous namespace
@@ -1741,6 +1748,32 @@ void CppEditorPlugin::test_quickfix_AddIncludeForUndefinedIdentifier_veryFirstIn
data.run(&factory);
}
/// Check: If a "Qt Class" was not found by the locator, check the header files in the Qt
/// include paths
void CppEditorPlugin::test_quickfix_AddIncludeForUndefinedIdentifier_checkQSomethingInQtIncludePaths()
{
QList<TestDocumentPtr> testFiles;
QByteArray original;
QByteArray expected;
original =
"@QDir dir;\n"
;
expected =
"#include <QDir>\n"
"\n"
"QDir dir;\n"
"\n"
;
testFiles << TestDocument::create(original, expected, directoryOfTestFile() + QLatin1Char('/')
+ QLatin1String("file.cpp"));
AddIncludeForUndefinedIdentifier factory;
TestCase data(testFiles, QStringList(globalQtCoreIncludePath()));
data.run(&factory);
}
/// Check: Move definition from header to cpp.
void CppEditorPlugin::test_quickfix_MoveFuncDefOutside_MemberFuncToCpp()
{