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

Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3

Browse Source 
Conflicts:
	src/plugins/cpptools/cppfindreferences.cpp
	src/plugins/cpptools/cpptoolsplugin.cpp
	src/plugins/texteditor/basefilefind.cpp
This commit is contained in:
con
2009-10-05 17:26:13 +02:00
parent 44e2704bc1 fa2ca2dee1
commit ddb7842761
272 changed files with 1240 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cpptoolsplugin.h
View File

@@ -85,7 +85,7 @@ protected Q_SLOTS:
private:
QPointer<CppModelManager> _modelManager;
Find::SearchResultWindow *_resultWindow;
QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
QFutureWatcher<Utils::FileSearchResult> m_watcher;
};
class FindFunctionCalls: public Find::IFindFilter // ### share code with FindClassDeclarations
@@ -110,7 +110,7 @@ protected Q_SLOTS:
private:
QPointer<CppModelManager> _modelManager;
Find::SearchResultWindow *_resultWindow;
QFutureWatcher<Core::Utils::FileSearchResult> m_watcher;
QFutureWatcher<Utils::FileSearchResult> m_watcher;
};
class CppToolsPlugin : public ExtensionSystem::IPlugin