Rename apt_pkg.PackageIndexFile to apt_pkg.IndexFile.

7 files changed, 41 insertions, 41 deletions

diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index 56594c61..df443c10 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -545,7 +545,7 @@ static struct _PyAptPkgAPIStruct API = {
    &PyMetaIndex_Type,         // metaindex_type
    &PyPackage_Type,           // package_type
    &PyPackageFile_Type,       // packagefile_type
-   &PyPackageIndexFile_Type,  // packageindexfile_type
+   &PyIndexFile_Type,  // packageindexfile_type
    &PyPackageList_Type,       // packagelist_type
    &PyPackageManager_Type,    // packagemanager_type
    &PyPackageRecords_Type,    // packagerecords_type
@@ -638,7 +638,7 @@ extern "C" void initapt_pkg()
    ADDTYPE(Module,"DepCache",&PyDepCache_Type);
    ADDTYPE(Module,"ProblemResolver",&PyProblemResolver_Type);
    /* ========================= indexfile.cc ========================= */
-   ADDTYPE(Module,"PackageIndexFile",&PyPackageIndexFile_Type); // NO __new__()
+   ADDTYPE(Module,"IndexFile",&PyIndexFile_Type); // NO __new__()
    /* ========================= metaindex.cc ========================= */
    ADDTYPE(Module,"MetaIndex",&PyMetaIndex_Type); // NO __new__()
    /* ========================= pkgmanager.cc ========================= */
diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h
index 97ba05a7..bc2f747b 100644
--- a/python/apt_pkgmodule.h
+++ b/python/apt_pkgmodule.h
@@ -103,7 +103,7 @@ extern PyTypeObject PySourceList_Type;
 PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args);
 
 // pkgSourceList
-extern PyTypeObject PyPackageIndexFile_Type;
+extern PyTypeObject PyIndexFile_Type;
 
 // metaIndex
 extern PyTypeObject PyMetaIndex_Type;
diff --git a/python/indexfile.cc b/python/indexfile.cc
index a6f8904e..7accaa50 100644
--- a/python/indexfile.cc
+++ b/python/indexfile.cc
@@ -15,7 +15,7 @@
 
 #include <Python.h>
 
-static PyObject *PackageIndexFileArchiveURI(PyObject *Self,PyObject *Args)
+static PyObject *IndexFileArchiveURI(PyObject *Self,PyObject *Args)
 {
    pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
    char *path;
@@ -25,38 +25,38 @@ static PyObject *PackageIndexFileArchiveURI(PyObject *Self,PyObject *Args)
    return HandleErrors(Safe_FromString(File->ArchiveURI(path).c_str()));
 }
 
-static PyMethodDef PackageIndexFileMethods[] =
+static PyMethodDef IndexFileMethods[] =
 {
-   {"archive_uri",PackageIndexFileArchiveURI,METH_VARARGS,"Returns the ArchiveURI"},
+   {"archive_uri",IndexFileArchiveURI,METH_VARARGS,"Returns the ArchiveURI"},
    #ifdef COMPAT_0_7
-   {"ArchiveURI",PackageIndexFileArchiveURI,METH_VARARGS,"Returns the ArchiveURI"},
+   {"ArchiveURI",IndexFileArchiveURI,METH_VARARGS,"Returns the ArchiveURI"},
    #endif
    {}
 };
 
 #define File (GetCpp<pkgIndexFile*>(Self))
-static PyObject *PackageIndexFileGetLabel(PyObject *Self,void*) {
+static PyObject *IndexFileGetLabel(PyObject *Self,void*) {
    return Safe_FromString(File->GetType()->Label);
 }
-static PyObject *PackageIndexFileGetDescribe(PyObject *Self,void*) {
+static PyObject *IndexFileGetDescribe(PyObject *Self,void*) {
    return Safe_FromString(File->Describe().c_str());
 }
-static PyObject *PackageIndexFileGetExists(PyObject *Self,void*) {
+static PyObject *IndexFileGetExists(PyObject *Self,void*) {
    return Py_BuildValue("i",(File->Exists()));
 }
-static PyObject *PackageIndexFileGetHasPackages(PyObject *Self,void*) {
+static PyObject *IndexFileGetHasPackages(PyObject *Self,void*) {
    return Py_BuildValue("i",(File->HasPackages()));
 }
-static PyObject *PackageIndexFileGetSize(PyObject *Self,void*) {
+static PyObject *IndexFileGetSize(PyObject *Self,void*) {
    return Py_BuildValue("i",(File->Size()));
 }
-static PyObject *PackageIndexFileGetIsTrusted(PyObject *Self,void*) {
+static PyObject *IndexFileGetIsTrusted(PyObject *Self,void*) {
    return Py_BuildValue("i",(File->IsTrusted()));
 }
 #undef File
 
 #define S(x) (x ? x : "")
-static PyObject *PackageIndexFileRepr(PyObject *Self)
+static PyObject *IndexFileRepr(PyObject *Self)
 {
    pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
    return PyString_FromFormat("<pkIndexFile object: "
@@ -69,28 +69,28 @@ static PyObject *PackageIndexFileRepr(PyObject *Self)
 }
 #undef S
 
-static PyGetSetDef PackageIndexFileGetSet[] = {
-    {"describe",PackageIndexFileGetDescribe},
-    {"exists",PackageIndexFileGetExists},
-    {"has_packages",PackageIndexFileGetHasPackages},
-    {"is_trusted",PackageIndexFileGetIsTrusted},
-    {"label",PackageIndexFileGetLabel},
-    {"size",PackageIndexFileGetSize},
+static PyGetSetDef IndexFileGetSet[] = {
+    {"describe",IndexFileGetDescribe},
+    {"exists",IndexFileGetExists},
+    {"has_packages",IndexFileGetHasPackages},
+    {"is_trusted",IndexFileGetIsTrusted},
+    {"label",IndexFileGetLabel},
+    {"size",IndexFileGetSize},
     #ifdef COMPAT_0_7
-    {"Describe",PackageIndexFileGetDescribe},
-    {"Exists",PackageIndexFileGetExists},
-    {"HasPackages",PackageIndexFileGetHasPackages},
-    {"IsTrusted",PackageIndexFileGetIsTrusted},
-    {"Label",PackageIndexFileGetLabel},
-    {"Size",PackageIndexFileGetSize},
+    {"Describe",IndexFileGetDescribe},
+    {"Exists",IndexFileGetExists},
+    {"HasPackages",IndexFileGetHasPackages},
+    {"IsTrusted",IndexFileGetIsTrusted},
+    {"Label",IndexFileGetLabel},
+    {"Size",IndexFileGetSize},
     #endif
     {}
 };
 
-PyTypeObject PyPackageIndexFile_Type =
+PyTypeObject PyIndexFile_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
-   "apt_pkg.PackageIndexFile",          // tp_name
+   "apt_pkg.IndexFile",          // tp_name
    sizeof(CppOwnedPyObject<pkgIndexFile*>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
@@ -100,7 +100,7 @@ PyTypeObject PyPackageIndexFile_Type =
    0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
-   PackageIndexFileRepr,                // tp_repr
+   IndexFileRepr,                // tp_repr
    0,                                   // tp_as_number
    0,                                   // tp_as_sequence
    0,                                   // tp_as_mapping
@@ -118,9 +118,9 @@ PyTypeObject PyPackageIndexFile_Type =
    0,                                   // tp_weaklistoffset
    0,                                   // tp_iter
    0,                                   // tp_iternext
-   PackageIndexFileMethods,             // tp_methods
+   IndexFileMethods,             // tp_methods
    0,                                   // tp_members
-   PackageIndexFileGetSet,              // tp_getset
+   IndexFileGetSet,              // tp_getset
 };
 
 
diff --git a/python/metaindex.cc b/python/metaindex.cc
index 4e059f0c..2c5b0bd9 100644
--- a/python/metaindex.cc
+++ b/python/metaindex.cc
@@ -38,7 +38,7 @@ static PyObject *MetaIndexGetIndexFiles(PyObject *Self,void*) {
         I != indexFiles->end(); I++)
     {
         CppOwnedPyObject<pkgIndexFile*> *Obj;
-        Obj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self, &PyPackageIndexFile_Type,*I);
+        Obj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self, &PyIndexFile_Type,*I);
         // Do not delete pkgIndexFile*, they are managed by metaIndex.
         Obj->NoDelete = true;
         PyList_Append(List,Obj);
diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 086ec8d5..0b54c2fe 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -124,7 +124,7 @@ static PyObject *PkgSrcRecordsGetIndex(PyObject *Self,void*) {
       return 0;
    const pkgIndexFile &tmp = Struct.Last->Index();
    CppOwnedPyObject<pkgIndexFile*> *PyObj;
-   PyObj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self,&PyPackageIndexFile_Type,
+   PyObj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self,&PyIndexFile_Type,
                                               (pkgIndexFile*)&tmp);
    // Do not delete the pkgIndexFile*, it is managed by PkgSrcRecords::Parser.
    PyObj->NoDelete=true;
diff --git a/python/python-apt.h b/python/python-apt.h
index 08242c08..3e413dff 100644
--- a/python/python-apt.h
+++ b/python/python-apt.h
@@ -79,7 +79,7 @@ struct _PyAptPkgAPIStruct {
 #  define PyMetaIndex_Type         *(_PyAptPkg_API->metaindex_type)
 #  define PyPackage_Type           *(_PyAptPkg_API->package_type)
 #  define PyPackageFile_Type       *(_PyAptPkg_API->packagefile_type)
-#  define PyPackageIndexFile_Type  *(_PyAptPkg_API->packageindexfile_type)
+#  define PyIndexFile_Type  *(_PyAptPkg_API->packageindexfile_type)
 #  define PyPackageList_Type       *(_PyAptPkg_API->packagelist_type)
 #  define PyPackageManager_Type    *(_PyAptPkg_API->packagemanager_type)
 #  define PyPackageRecords_Type    *(_PyAptPkg_API->packagerecords_type)
@@ -140,7 +140,7 @@ static int import_apt_pkg(void) {
 # define PyMetaIndex_Check(op)        PyObject_TypeCheck(op, &PyMetaIndex_Type)
 # define PyPackage_Check(op)          PyObject_TypeCheck(op, &PyPackage_Type)
 # define PyPackageFile_Check(op)      PyObject_TypeCheck(op, &PyPackageFile_Type)
-# define PyPackageIndexFile_Check(op) PyObject_TypeCheck(op, &PyPackageIndexFile_Type)
+# define PyIndexFile_Check(op) PyObject_TypeCheck(op, &PyIndexFile_Type)
 # define PyPackageList_Check(op)      PyObject_TypeCheck(op, &PyPackageList_Type)
 # define PyPackageManager_Check(op)   PyObject_TypeCheck(op, &PyPackageManager_Type)
 # define PyPackageRecords_Check(op)   PyObject_TypeCheck(op, &PyPackageRecords_Type)
@@ -172,7 +172,7 @@ static int import_apt_pkg(void) {
 # define PyMetaIndex_CheckExact(op)        (op->op_type == &PyMetaIndex_Type)
 # define PyPackage_CheckExact(op)          (op->op_type == &PyPackage_Type)
 # define PyPackageFile_CheckExact(op)      (op->op_type == &PyPackageFile_Type)
-# define PyPackageIndexFile_CheckExact(op) (op->op_type == &PyPackageIndexFile_Type)
+# define PyIndexFile_CheckExact(op) (op->op_type == &PyIndexFile_Type)
 # define PyPackageList_CheckExact(op)      (op->op_type == &PyPackageList_Type)
 # define PyPackageManager_CheckExact(op)   (op->op_type == &PyPackageManager_Type)
 # define PyPackageRecords_CheckExact(op)   (op->op_type == &PyPackageRecords_Type)
@@ -205,7 +205,7 @@ static int import_apt_pkg(void) {
 # define PyMetaIndex_ToCpp         GetCpp<metaIndex*>
 # define PyPackage_ToCpp           GetCpp<pkgCache::PkgIterator>
 # define PyPackageFile_ToCpp       GetCpp<pkgCache::PkgFileIterator>
-# define PyPackageIndexFile_ToCpp  GetCpp<pkgIndexFile*>
+# define PyIndexFile_ToCpp  GetCpp<pkgIndexFile*>
 //# define PyPackageList_ToCpp       GetCpp<PkgListStruct> // NOT EXPORTED.
 # define PyPackageManager_ToCpp    GetCpp<pkgPackageManager*>
 //# define PyPackageRecords_ToCpp    GetCpp<PkgRecordsStruct> // NOT EXPORTED
@@ -256,7 +256,7 @@ inline CppOwnedPyObject<Cpp> *FromCppOwned(PyTypeObject *pytype, Cpp const &obj,
 # define PyIndexRecords_FromCpp(...)     FromCpp<indexRecords*>(&PyIndexRecords_Type,##__VA_ARGS__)
 # define PyMetaIndex_FromCpp(...)        FromCppOwned<metaIndex*>(&PyMetaIndex_Type,##__VA_ARGS__)
 # define PyPackage_FromCpp(...)          FromCppOwned<pkgCache::PkgIterator>(&PyPackage_Type,##__VA_ARGS__)
-# define PyPackageIndexFile_FromCpp(...) FromCppOwned<pkgIndexFile*>(&PyPackageIndexFile_Type,##__VA_ARGS__)
+# define PyIndexFile_FromCpp(...) FromCppOwned<pkgIndexFile*>(&PyIndexFile_Type,##__VA_ARGS__)
 # define PyPackageFile_FromCpp(...)      FromCppOwned<pkgCache::PkgFileIterator>(&PyPackageFile_Type,##__VA_ARGS__)
 //# define PyPackageList_FromCpp(...)      FromCppOwned<PkgListStruct>(&PyPackageList_Type,##__VA_ARGS__)
 # define PyPackageManager_FromCpp(...)   FromCpp<pkgPackageManager*>(&PyPackageManager_Type,##__VA_ARGS__)
diff --git a/python/sourcelist.cc b/python/sourcelist.cc
index e86f7fd3..52c0e6a8 100644
--- a/python/sourcelist.cc
+++ b/python/sourcelist.cc
@@ -35,13 +35,13 @@ static PyObject *PkgSourceListFindIndex(PyObject *Self,PyObject *Args)
    pkgIndexFile *index;
    if(list->FindIndex(i, index))
    {
-      pyPkgIndexFile = CppOwnedPyObject_NEW<pkgIndexFile*>(pyPkgFileIter,&PyPackageIndexFile_Type,index);
+      pyPkgIndexFile = CppOwnedPyObject_NEW<pkgIndexFile*>(pyPkgFileIter,&PyIndexFile_Type,index);
       // Do not delete the pkgIndexFile*, it is managed by pkgSourceList.
       pyPkgIndexFile->NoDelete = true;
       return pyPkgIndexFile;
    }
 
-   //&PyPackageIndexFile_Type,&pyPkgIndexFile)
+   //&PyIndexFile_Type,&pyPkgIndexFile)
 
    Py_INCREF(Py_None);
    return Py_None;