commit f857950d391d06d490e2ecf014678b4dee24003f
author Dmitri Gribenko <gribozavr@gmail.com> Sat Jan 12 19:30:44 2013 +0000
committer Dmitri Gribenko <gribozavr@gmail.com> Sat Jan 12 19:30:44 2013 +0000
tree d060768928a8f51bce2bffa2c1ef9ca20b5cc740
parent 5ea0349ef59288bb239036b87bbcfcb41e3f62e8

Remove useless 'llvm::' qualifier from names like StringRef and others that are
brought into 'clang' namespace by clang/Basic/LLVM.h

llvm-svn: 172323

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 83be79e..8ca0a82 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -1321,7 +1321,7 @@
          I != E; ++I) {
       const UnwrappedLine &TheLine = *I;
       if (touchesRanges(TheLine)) {
-        llvm::OwningPtr<TokenAnnotator> AnnotatedLine(
+        OwningPtr<TokenAnnotator> AnnotatedLine(
             new TokenAnnotator(TheLine, Style, SourceMgr, Lex));
         if (!AnnotatedLine->annotate())
           break;
@@ -1359,7 +1359,7 @@
   ///
   /// Returns whether the resulting \c Line can fit in a single line.
   bool tryFitMultipleLinesInOne(unsigned Indent, UnwrappedLine &Line,
-                                llvm::OwningPtr<TokenAnnotator> &AnnotatedLine,
+                                OwningPtr<TokenAnnotator> &AnnotatedLine,
                                 std::vector<UnwrappedLine>::iterator &I,
                                 std::vector<UnwrappedLine>::iterator E) {
     unsigned Limit = Style.ColumnLimit - (I->InPPDirective ? 1 : 0) - Indent;
@@ -1410,7 +1410,7 @@
       return FitsOnALine;
     Last->Children.push_back(*Next);
 
-    llvm::OwningPtr<TokenAnnotator> CombinedAnnotator(
+    OwningPtr<TokenAnnotator> CombinedAnnotator(
         new TokenAnnotator(Combined, Style, SourceMgr, Lex));
     if (CombinedAnnotator->annotate() &&
         fitsIntoLimit(CombinedAnnotator->getRootToken(), Limit)) {
@@ -1506,7 +1506,7 @@
   TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), &*DiagOpts);
   DiagnosticPrinter.BeginSourceFile(Lex.getLangOpts(), Lex.getPP());
   DiagnosticsEngine Diagnostics(
-      llvm::IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
+      IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
       &DiagnosticPrinter, false);
   Diagnostics.setSourceManager(&SourceMgr);
   Formatter formatter(Diagnostics, Style, Lex, SourceMgr, Ranges);