diff options
| author | con <qtc-committer@nokia.com> | 2009-10-05 17:26:13 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-10-05 17:26:13 +0200 |
| commit | ddb78427611dabebadba8ecb401d633ebe986f94 (patch) | |
| tree | b1089cad97a1042b1f27e9f9ada9d947402affee /src/plugins/cpptools/cppfindreferences.h | |
| parent | 44e2704bc151cfe508b449969a4a47a2b749cbd9 (diff) | |
| parent | fa2ca2dee15084af3dfaec5284fc0757e9de4a10 (diff) | |
| download | qt-creator-ddb78427611dabebadba8ecb401d633ebe986f94.tar.gz | |
Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3
Conflicts:
src/plugins/cpptools/cppfindreferences.cpp
src/plugins/cpptools/cpptoolsplugin.cpp
src/plugins/texteditor/basefilefind.cpp
Diffstat (limited to 'src/plugins/cpptools/cppfindreferences.h')
| -rw-r--r-- | src/plugins/cpptools/cppfindreferences.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h index 78bbf33838..429a945e2c 100644 --- a/src/plugins/cpptools/cppfindreferences.h +++ b/src/plugins/cpptools/cppfindreferences.h @@ -63,7 +63,8 @@ Q_SIGNALS: void changed(); public: - void findAll(CPlusPlus::Symbol *symbol); + void findUsages(CPlusPlus::Symbol *symbol); + void renameUsages(CPlusPlus::Symbol *symbol); private Q_SLOTS: void displayResult(int); @@ -71,9 +72,12 @@ private Q_SLOTS: void openEditor(const Find::SearchResultItem &item); private: + void findAll_helper(CPlusPlus::Symbol *symbol); + +private: QPointer<CppModelManager> _modelManager; Find::SearchResultWindow *_resultWindow; - QFutureWatcher<Core::Utils::FileSearchResult> m_watcher; + QFutureWatcher<Utils::FileSearchResult> m_watcher; }; } // end of namespace Internal |