Rename CPDFSDK_Annot::GetType to CPDFSDK_Annot::GetAnnotSubtype.

fpdfsdk/include/cba_annotiterator.h

Index: fpdfsdk/include/cba_annotiterator.h
diff --git a/fpdfsdk/include/cba_annotiterator.h b/fpdfsdk/include/cba_annotiterator.h
index 6161cbc8147e0d8d423c2f393dfc4cc45409d59a..0cf6e6a0ef8b476194132930f5344ac53bb48267 100644
--- a/fpdfsdk/include/cba_annotiterator.h
+++ b/fpdfsdk/include/cba_annotiterator.h
@@ -20,8 +20,7 @@ class CBA_AnnotIterator {
   enum TabOrder { STRUCTURE = 0, ROW, COLUMN };
 
   CBA_AnnotIterator(CPDFSDK_PageView* pPageView,
-                    const CFX_ByteString& sType,
-                    const CFX_ByteString& sSubType);
+                    const CFX_ByteString& sAnnotSubtype);
   ~CBA_AnnotIterator();
 
   CPDFSDK_Annot* GetFirstAnnot();
@@ -41,8 +40,7 @@ class CBA_AnnotIterator {
 
   TabOrder m_eTabOrder;
   CPDFSDK_PageView* m_pPageView;
-  CFX_ByteString m_sType;
-  CFX_ByteString m_sSubType;
+  CFX_ByteString m_sAnnotSubtype;
   std::vector<CPDFSDK_Annot*> m_Annots;
 };