forked from qt-creator/qt-creator
ClangCodeModel: Replace nested ClangCodeModel::Utils namespace
... by the customary ::Internal. It adds only noise on the user side and conflicts regularly with the top-level ::Utils namespace. Remove a (now) duplicated definition of setLastSentDocumentRevision(). Plus minor namespace related fixes. There are still minor conflicts between Utils::Text and ClangCodeModel::Text Change-Id: I2e8df6b3c6c3599192774032822ee7e778355bba Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -41,14 +41,10 @@ class CppEditorDocumentHandle;
|
||||
class ProjectInfo;
|
||||
}
|
||||
|
||||
namespace Utils {
|
||||
class FilePath;
|
||||
}
|
||||
|
||||
namespace ClangBackEnd { class TokenInfoContainer; }
|
||||
|
||||
namespace ClangCodeModel {
|
||||
namespace Utils {
|
||||
namespace Internal {
|
||||
|
||||
CppTools::CppEditorDocumentHandle *cppDocument(const QString &filePath);
|
||||
void setLastSentDocumentRevision(const QString &filePath, uint revision);
|
||||
@@ -68,7 +64,7 @@ QString currentCppEditorDocumentFilePath();
|
||||
|
||||
QString diagnosticCategoryPrefixRemoved(const QString &text);
|
||||
|
||||
::Utils::CodeModelIcon::Type iconTypeForToken(const ClangBackEnd::TokenInfoContainer &token);
|
||||
Utils::CodeModelIcon::Type iconTypeForToken(const ClangBackEnd::TokenInfoContainer &token);
|
||||
|
||||
class GenerateCompilationDbResult
|
||||
{
|
||||
@@ -101,8 +97,6 @@ private:
|
||||
const int m_squareBracketStartIndex;
|
||||
};
|
||||
|
||||
namespace Text {
|
||||
|
||||
template <class CharacterProvider>
|
||||
void moveToPreviousChar(CharacterProvider &provider, QTextCursor &cursor)
|
||||
{
|
||||
@@ -148,6 +142,5 @@ bool matchPreviousWord(CharacterProvider &provider, QTextCursor cursor, QString
|
||||
return pattern.isEmpty();
|
||||
}
|
||||
|
||||
} // namespace Text
|
||||
} // namespace Utils
|
||||
} // namespace Internal
|
||||
} // namespace Clang
|
||||
|
||||
Reference in New Issue
Block a user