From e3ae6c31d659c3599c6b260d29c70db6b7302917 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 13 Feb 2013 23:32:18 -0600 Subject: Fix additional references to KIO --- sip/tdeio/global.sip | 30 ++++++++++++++-------------- sip/tdeio/jobclasses.sip | 4 ++-- sip/tdeio/renamedlg.sip | 2 +- sip/tdeio/scheduler.sip | 2 +- sip/tdeio/tdefileitem.sip | 2 +- sip/tdeio/tdesycoca.sip | 50 +++++++++++++++++++++++------------------------ 6 files changed, 45 insertions(+), 45 deletions(-) (limited to 'sip') diff --git a/sip/tdeio/global.sip b/sip/tdeio/global.sip index 2618179..5426bc6 100644 --- a/sip/tdeio/global.sip +++ b/sip/tdeio/global.sip @@ -455,17 +455,17 @@ enum CacheControl }; // namespace TDEIO //force -TDEIO::UDSEntry testKIOUDSEntry (TDEIO::UDSEntry); +TDEIO::UDSEntry testTDEIOUDSEntry (TDEIO::UDSEntry); %MethodCode -//takes list | (KIO.UDSEntry) -//returns (KIO.UDSEntry) +//takes list | (_TDEIO.UDSEntry) +//returns (_TDEIO.UDSEntry) sipRes = a0; %End -TDEIO::UDSEntryList testKIOUDSEntryList (TDEIO::UDSEntryList); +TDEIO::UDSEntryList testTDEIOUDSEntryList (TDEIO::UDSEntryList); %MethodCode -//takes list | (KIO.UDSEntryList) -//returns (KIO.UDSEntryList) +//takes list | (_TDEIO.UDSEntryList) +//returns (_TDEIO.UDSEntryList) sipRes = a0; %End @@ -473,10 +473,10 @@ TDEIO::UDSEntryList testKIOUDSEntryList (TDEIO::UDSEntryList); #include %End -TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); +TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); %MethodCode -//takes dict | (KIO.MetaData) -//returns (KIO.MetaData) +//takes dict | (_TDEIO.MetaData) +//returns (_TDEIO.MetaData) sipRes = a0; %End @@ -484,7 +484,7 @@ TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); %MappedType TDEIO::UDSEntry -//converts a Python list of KIO.UDSAtom +//converts a Python list of _TDEIO.UDSAtom { %TypeHeaderCode #include @@ -507,7 +507,7 @@ TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEIO::UDSAtom(*it), sipType_KIO_UDSAtom, NULL)) == NULL) + if (((inst = sipConvertFromNewType(new TDEIO::UDSAtom(*it), sipType_TDEIO_UDSAtom, NULL)) == NULL) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); @@ -532,7 +532,7 @@ TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEIO::UDSAtom *)sipForceConvertToType(elem, sipType_KIO_UDSAtom, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::UDSAtom *)sipForceConvertToType(elem, sipType_TDEIO_UDSAtom, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { @@ -552,7 +552,7 @@ TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); %MappedType TDEIO::UDSEntryList -//converts a Python list of KIO.UDSEntry +//converts a Python list of _TDEIO.UDSEntry { %TypeHeaderCode #include @@ -576,7 +576,7 @@ TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); for( it = cpplist->begin(); it != cpplist->end(); ++it ) { TDEIO::UDSEntry cpp = *it; - inst = sipConvertFromType(&cpp, sipType_KIO_UDSEntry, sipTransferObj); + inst = sipConvertFromType(&cpp, sipType_TDEIO_UDSEntry, sipTransferObj); if (PyList_Append (pylist, inst) < 0) { @@ -602,7 +602,7 @@ TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEIO::UDSEntry *)sipForceConvertToType(elem, sipType_KIO_UDSEntry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::UDSEntry *)sipForceConvertToType(elem, sipType_TDEIO_UDSEntry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { diff --git a/sip/tdeio/jobclasses.sip b/sip/tdeio/jobclasses.sip index 9b54be2..d1e2474 100644 --- a/sip/tdeio/jobclasses.sip +++ b/sip/tdeio/jobclasses.sip @@ -702,7 +702,7 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEIO::CopyInfo(*it), sipType_KIO_CopyInfo, NULL)) == NULL) + if (((inst = sipConvertFromNewType(new TDEIO::CopyInfo(*it), sipType_TDEIO_CopyInfo, NULL)) == NULL) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); @@ -727,7 +727,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEIO::CopyInfo *)sipForceConvertToType(elem, sipType_KIO_CopyInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::CopyInfo *)sipForceConvertToType(elem, sipType_TDEIO_CopyInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { diff --git a/sip/tdeio/renamedlg.sip b/sip/tdeio/renamedlg.sip index e490a87..9c19eb5 100644 --- a/sip/tdeio/renamedlg.sip +++ b/sip/tdeio/renamedlg.sip @@ -57,7 +57,7 @@ enum RenameDlg_Result //ig class RenameDlg : TQDialog; -//ig TDEIO::RenameDlg_Result open_RenameDlg (const TQString&, const TQString&, const TQString&, TDEIO::RenameDlg_Mode, TQString&, TDEIO::filesize_t = (KIO ::filesize_t )-1 , TDEIO::filesize_t = (KIO ::filesize_t )-1 , time_t = -1 , time_t = -1 , time_t = -1 , time_t = -1 ); +//ig TDEIO::RenameDlg_Result open_RenameDlg (const TQString&, const TQString&, const TQString&, TDEIO::RenameDlg_Mode, TQString&, TDEIO::filesize_t = (TDEIO ::filesize_t )-1 , TDEIO::filesize_t = (TDEIO ::filesize_t )-1 , time_t = -1 , time_t = -1 , time_t = -1 , time_t = -1 ); %If ( - KDE_3_1_5 ) //ig TDEIO::RenameDlg_Result open_RenameDlg (const TQString&, const TQString&, const TQString&, TDEIO::RenameDlg_Mode, TQString&, ulong = -1, ulong = -1, time_t = -1, time_t = -1, time_t = -1, time_t = -1); diff --git a/sip/tdeio/scheduler.sip b/sip/tdeio/scheduler.sip index 6142746..771fb20 100644 --- a/sip/tdeio/scheduler.sip +++ b/sip/tdeio/scheduler.sip @@ -43,7 +43,7 @@ public: static void removeSlaveOnHold (); static void publishSlaveOnHold (); //doc -// There is no default value for config (KIO.MetaData) - pass an +// There is no default value for config (_TDEIO.MetaData) - pass an // empty Python dict if you need the default value //end static TDEIO::Slave* getConnectedSlave (const KURL&, const TDEIO::MetaData&); diff --git a/sip/tdeio/tdefileitem.sip b/sip/tdeio/tdefileitem.sip index 1f7f35c..b8c9ed9 100644 --- a/sip/tdeio/tdefileitem.sip +++ b/sip/tdeio/tdefileitem.sip @@ -95,7 +95,7 @@ public: time_t time (uint, bool& /Out/) const /PyName=timeAndHasTime/; %End - TQString timeString (uint = KIO ::UDS_MODIFICATION_TIME ) const; + TQString timeString (uint = TDEIO ::UDS_MODIFICATION_TIME ) const; bool isLocalFile () const; const TQString& text () const; const TQString& name (bool = 0) const; diff --git a/sip/tdeio/tdesycoca.sip b/sip/tdeio/tdesycoca.sip index dd11e72..f5e12d3 100644 --- a/sip/tdeio/tdesycoca.sip +++ b/sip/tdeio/tdesycoca.sip @@ -109,16 +109,16 @@ protected: // must be sorted by name. static sipStringTypeClassMap map[] = { - {sipName_ChmodJob, &sipClass_KIO_ChmodJob}, - {sipName_Connection, &sipClass_KIO_Connection}, - {sipName_CopyJob, &sipClass_KIO_CopyJob}, + {sipName_ChmodJob, &sipClass_TDEIO_ChmodJob}, + {sipName_Connection, &sipClass_TDEIO_Connection}, + {sipName_CopyJob, &sipClass_TDEIO_CopyJob}, #if TDE_VERSION >= 0x030100 - {sipName_DavJob, &sipClass_KIO_DavJob}, + {sipName_DavJob, &sipClass_TDEIO_DavJob}, #endif - {sipName_DefaultProgress, &sipClass_KIO_DefaultProgress}, - {sipName_DeleteJob, &sipClass_KIO_DeleteJob}, - {sipName_FileCopyJob, &sipClass_KIO_FileCopyJob}, - {sipName_Job, &sipClass_KIO_Job}, + {sipName_DefaultProgress, &sipClass_TDEIO_DefaultProgress}, + {sipName_DeleteJob, &sipClass_TDEIO_DeleteJob}, + {sipName_FileCopyJob, &sipClass_TDEIO_FileCopyJob}, + {sipName_Job, &sipClass_TDEIO_Job}, {sipName_KAutoMount, &sipClass_KAutoMount}, {sipName_KAutoUnmount, &sipClass_KAutoUnmount}, {sipName_KDataTool, &sipClass_KDataTool}, @@ -140,27 +140,27 @@ protected: {sipName_TDETrader, &sipClass_TDETrader}, {sipName_KURIFilterPlugin, &sipClass_KURIFilterPlugin}, {sipName_KURLCompletion, &sipClass_KURLCompletion}, - {sipName_ListJob, &sipClass_KIO_ListJob}, + {sipName_ListJob, &sipClass_TDEIO_ListJob}, #if TDE_VERSION >= 0x030100 - {sipName_MetaInfoJob, &sipClass_KIO_MetaInfoJob}, + {sipName_MetaInfoJob, &sipClass_TDEIO_MetaInfoJob}, #endif - {sipName_MimetypeJob, &sipClass_KIO_MimetypeJob}, - {sipName_MultiGetJob, &sipClass_KIO_MultiGetJob}, - {sipName_NetAccess, &sipClass_KIO_NetAccess}, + {sipName_MimetypeJob, &sipClass_TDEIO_MimetypeJob}, + {sipName_MultiGetJob, &sipClass_TDEIO_MultiGetJob}, + {sipName_NetAccess, &sipClass_TDEIO_NetAccess}, {sipName_Observer, &sipClass_Observer}, - {sipName_PasswordDialog, &sipClass_KIO_PasswordDialog}, - {sipName_PreviewJob, &sipClass_KIO_PreviewJob}, - {sipName_ProgressBase, &sipClass_KIO_ProgressBase}, + {sipName_PasswordDialog, &sipClass_TDEIO_PasswordDialog}, + {sipName_PreviewJob, &sipClass_TDEIO_PreviewJob}, + {sipName_ProgressBase, &sipClass_TDEIO_ProgressBase}, {sipName_RenameDlgPlugin, &sipClass_RenameDlgPlugin}, - {sipName_Scheduler, &sipClass_KIO_Scheduler}, - {sipName_SessionData, &sipClass_KIO_SessionData}, - {sipName_SimpleJob, &sipClass_KIO_SimpleJob}, - {sipName_Slave, &sipClass_KIO_Slave}, - {sipName_SlaveConfig, &sipClass_KIO_SlaveConfig}, - {sipName_SlaveInterface, &sipClass_KIO_SlaveInterface}, - {sipName_StatJob, &sipClass_KIO_StatJob}, - {sipName_StatusbarProgress, &sipClass_KIO_StatusbarProgress}, - {sipName_TransferJob, &sipClass_KIO_TransferJob}, + {sipName_Scheduler, &sipClass_TDEIO_Scheduler}, + {sipName_SessionData, &sipClass_TDEIO_SessionData}, + {sipName_SimpleJob, &sipClass_TDEIO_SimpleJob}, + {sipName_Slave, &sipClass_TDEIO_Slave}, + {sipName_SlaveConfig, &sipClass_TDEIO_SlaveConfig}, + {sipName_SlaveInterface, &sipClass_TDEIO_SlaveInterface}, + {sipName_StatJob, &sipClass_TDEIO_StatJob}, + {sipName_StatusbarProgress, &sipClass_TDEIO_StatusbarProgress}, + {sipName_TransferJob, &sipClass_TDEIO_TransferJob}, }; sipClass = sipMapStringToClass(sipCpp -> className(),map,sizeof (map)/sizeof (map[0])); -- cgit v1.2.1