[cfe-commits] r93801 - in /cfe/trunk: include/clang-c/Index.h tools/CIndex/CIndex.cpp tools/CIndex/CIndex.exports

[Douglas Gregor]

Author: dgregor
Date: Mon Jan 18 16:48:04 2010
New Revision: 93801

URL: http://llvm.org/viewvc/llvm-project?rev=93801&view=rev
Log:
Now that a reasonable deprecation cycle has passed, kill
clang_getCursorLine(), clang_getCursorColumn(),
clang_getCursorSource(), and clang_getCursorSourceFile() outright.

Modified:
    cfe/trunk/include/clang-c/Index.h
    cfe/trunk/tools/CIndex/CIndex.cpp
    cfe/trunk/tools/CIndex/CIndex.exports

Modified: cfe/trunk/include/clang-c/Index.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=93801&r1=93800&r2=93801&view=diff

==============================================================================
--- cfe/trunk/include/clang-c/Index.h (original)
+++ cfe/trunk/include/clang-c/Index.h Mon Jan 18 16:48:04 2010
@@ -395,11 +395,6 @@
 
 CINDEX_LINKAGE CXString clang_getCursorSpelling(CXCursor);
 
-CINDEX_LINKAGE unsigned clang_getCursorLine(CXCursor); /* deprecate */
-CINDEX_LINKAGE unsigned clang_getCursorColumn(CXCursor); /* deprecate */
-CINDEX_LINKAGE const char *clang_getCursorSource(CXCursor); /* deprecate */
-CINDEX_LINKAGE CXFile clang_getCursorSourceFile(CXCursor); /* deprecate */
-
 /**
  * \brief Retrieve the physical location of the source constructor referenced
  * by the given cursor.

Modified: cfe/trunk/tools/CIndex/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.cpp?rev=93801&r1=93800&r2=93801&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.cpp (original)
+++ cfe/trunk/tools/CIndex/CIndex.cpp Mon Jan 18 16:48:04 2010
@@ -950,22 +950,6 @@
   return 0;
 }
 
-unsigned clang_getCursorLine(CXCursor C) {
-  return clang_getCursorLocation(C).line;
-}
-  
-unsigned clang_getCursorColumn(CXCursor C) {
-  return clang_getCursorLocation(C).column;
-}
-
-const char *clang_getCursorSource(CXCursor C) {
-  return clang_getFileName(clang_getCursorLocation(C).file);
-}
-
-CXFile clang_getCursorSourceFile(CXCursor C) {
-  return clang_getCursorLocation(C).file;
-}
-
 CXSourceLocation clang_getCursorLocation(CXCursor C) {
   if (clang_isReference(C.kind)) {
     // FIXME: Return the location of the reference, not of the underlying

Modified: cfe/trunk/tools/CIndex/CIndex.exports
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.exports?rev=93801&r1=93800&r2=93801&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.exports (original)
+++ cfe/trunk/tools/CIndex/CIndex.exports Mon Jan 18 16:48:04 2010
@@ -12,15 +12,11 @@
 _clang_getCompletionChunkKind
 _clang_getCompletionChunkText
 _clang_getCursor
-_clang_getCursorColumn
 _clang_getCursorDecl
 _clang_getCursorFromDecl
 _clang_getCursorKind
 _clang_getCursorKindSpelling
-_clang_getCursorLine
 _clang_getCursorLocation
-_clang_getCursorSource
-_clang_getCursorSourceFile
 _clang_getCursorSpelling
 _clang_getCursorUSR
 _clang_getDeclColumn