Integrate merge-request #567 into branch 'master'

Christian Hoenig (1):
      Implement CppCurrentDocumentFilter for symbols in current document

Request-url: http://gitorious.org/qt-creator/qt-creator/merge_requests/567
Reviewed-by: con <qtc-committer@nokia.com>

src/plugins/cpptools/cpptools.pro

@@ -11,6 +11,7 @@ DEFINES += CPPTOOLS_LIBRARY
 HEADERS += completionsettingspage.h \
     cppclassesfilter.h \
     cppcodecompletion.h \
+    cppcurrentdocumentfilter.h \
     cppfunctionsfilter.h \
     cppmodelmanager.h \
     cppmodelmanagerinterface.h \
@@ -27,6 +28,7 @@ HEADERS += completionsettingspage.h \
 SOURCES += completionsettingspage.cpp \
     cppclassesfilter.cpp \
     cppcodecompletion.cpp \
+    cppcurrentdocumentfilter.cpp \
     cppfunctionsfilter.cpp \
     cppmodelmanager.cpp \
     cppquickopenfilter.cpp \