diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:18:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:18:41 -0600 |
| commit | 352b2ef6c06332062d35211d7f49942315d2f36a (patch) | |
| tree | 842a828f1f3c6686c33cd8512d00b80d6feaefdd /sip | |
| parent | 8bd906c03534d2ad9cff2f22e957bf30987c99a9 (diff) | |
| download | pytde-352b2ef6c06332062d35211d7f49942315d2f36a.tar.gz pytde-352b2ef6c06332062d35211d7f49942315d2f36a.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'sip')
105 files changed, 863 insertions, 863 deletions
diff --git a/sip/kabc/addresslineedit.sip b/sip/kabc/addresslineedit.sip index d8ed446..5d68ba5 100644 --- a/sip/kabc/addresslineedit.sip +++ b/sip/kabc/addresslineedit.sip @@ -40,7 +40,7 @@ public: virtual void setFont (const TQFont&); %If ( KDE_3_2_0 - ) - static KConfig* config (); + static TDEConfig* config (); %End diff --git a/sip/kabc/field.sip b/sip/kabc/field.sip index 443fa2c..a7c1a85 100644 --- a/sip/kabc/field.sip +++ b/sip/kabc/field.sip @@ -65,9 +65,9 @@ public: static KABC::Field::List defaultFields (); static KABC::Field* createCustomField (const TQString&, int, const TQString&, const TQString&); static void deleteFields (); - static void saveFields (KConfig*, const TQString&, const KABC::Field::List&); + static void saveFields (TDEConfig*, const TQString&, const KABC::Field::List&); static void saveFields (const TQString&, const KABC::Field::List&); - static KABC::Field::List restoreFields (KConfig*, const TQString&); + static KABC::Field::List restoreFields (TDEConfig*, const TQString&); static KABC::Field::List restoreFields (const TQString&); protected: diff --git a/sip/kabc/ldapclient.sip b/sip/kabc/ldapclient.sip index c999c85..baf3f6d 100644 --- a/sip/kabc/ldapclient.sip +++ b/sip/kabc/ldapclient.sip @@ -106,8 +106,8 @@ public slots: void cancelQuery (); protected slots: - void slotData (KIO::Job*, const TQByteArray&); - void slotInfoMessage (KIO::Job*, const TQString&); + void slotData (TDEIO::Job*, const TQByteArray&); + void slotInfoMessage (TDEIO::Job*, const TQString&); void slotDone (); protected: diff --git a/sip/kabc/resource.sip b/sip/kabc/resource.sip index 336096b..1218fa0 100644 --- a/sip/kabc/resource.sip +++ b/sip/kabc/resource.sip @@ -58,13 +58,13 @@ public: //ig class ConstIterator; - Resource (const KConfig*); + Resource (const TDEConfig*); //ig virtual KABC::Resource::ConstIterator begin () const; //ig virtual KABC::Resource::Iterator begin (); //ig virtual KABC::Resource::ConstIterator end () const; //ig virtual KABC::Resource::Iterator end (); KABC::AddressBook* addressBook (); - virtual void writeConfig (KConfig*); + virtual void writeConfig (TDEConfig*); virtual KABC::Ticket* requestSaveTicket () = 0; virtual void releaseSaveTicket (KABC::Ticket*) = 0; virtual bool load () = 0; diff --git a/sip/kabc/resourcefile.sip b/sip/kabc/resourcefile.sip index 736545e..09943de 100644 --- a/sip/kabc/resourcefile.sip +++ b/sip/kabc/resourcefile.sip @@ -38,9 +38,9 @@ class ResourceFile : KABC::Resource public: %If ( KDE_3_3_0 - ) - ResourceFile (const KConfig*); + ResourceFile (const TDEConfig*); ResourceFile (const TQString&, const TQString& = "vcard"); - virtual void writeConfig (KConfig*); + virtual void writeConfig (TDEConfig*); virtual bool doOpen (); virtual void doClose (); @@ -91,7 +91,7 @@ public: public: %If ( - KDE_3_3_0 ) - ResourceFile (KABC::AddressBook*, const KConfig*); + ResourceFile (KABC::AddressBook*, const TDEConfig*); ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0); bool open (); void close (); @@ -129,7 +129,7 @@ class ResourceFile : KABC::Resource public: %If ( KDE_3_1_0 - ) - ResourceFile (KABC::AddressBook*, const KConfig*); + ResourceFile (KABC::AddressBook*, const TDEConfig*); ResourceFile (KABC::AddressBook*, const TQString&, KABC::FormatPlugin* = 0); bool open (); void close (); diff --git a/sip/kfile/kcombiview.sip b/sip/kfile/kcombiview.sip index 79188cb..6e44ab4 100644 --- a/sip/kfile/kcombiview.sip +++ b/sip/kfile/kcombiview.sip @@ -56,8 +56,8 @@ public: virtual void setSorting (TQDir::SortSpec); %If ( KDE_3_1_0 - ) - virtual void readConfig (KConfig*, const TQString& = TQString ::null ); - virtual void writeConfig (KConfig*, const TQString& = TQString ::null ); + virtual void readConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void writeConfig (TDEConfig*, const TQString& = TQString ::null ); %End void ensureItemVisible (const KFileItem*); diff --git a/sip/kfile/kcustommenueditor.sip b/sip/kfile/kcustommenueditor.sip index 901efcb..733d7bd 100644 --- a/sip/kfile/kcustommenueditor.sip +++ b/sip/kfile/kcustommenueditor.sip @@ -35,8 +35,8 @@ class KCustomMenuEditor : KDialogBase public: KCustomMenuEditor (TQWidget* /TransferThis/); - void load (KConfigBase*); - void save (KConfigBase*); + void load (TDEConfigBase*); + void save (TDEConfigBase*); public slots: void slotNewItem (); diff --git a/sip/kfile/kdiroperator.sip b/sip/kfile/kdiroperator.sip index 4f1693c..31ac0e2 100644 --- a/sip/kfile/kdiroperator.sip +++ b/sip/kfile/kdiroperator.sip @@ -88,20 +88,20 @@ public: KActionCollection* actionCollection () const; %If ( KDE_3_1_0 - ) - void setViewConfig (KConfig*, const TQString&); - KConfig* viewConfig (); + void setViewConfig (TDEConfig*, const TQString&); + TDEConfig* viewConfig (); TQString viewConfigGroup () const; %End - virtual void readConfig (KConfig*, const TQString& = TQString ::null ); - virtual void writeConfig (KConfig*, const TQString& = TQString ::null ); + virtual void readConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void writeConfig (TDEConfig*, const TQString& = TQString ::null ); void setOnlyDoubleClickSelectsFiles (bool); bool onlyDoubleClickSelectsFiles () const; bool mkdir (const TQString&, bool = 1); - KIO::DeleteJob* del (const KFileItemList&, bool = 1, bool = 1) /PyName=del_/; + TDEIO::DeleteJob* del (const KFileItemList&, bool = 1, bool = 1) /PyName=del_/; %If ( KDE_3_0_3 - ) - KIO::DeleteJob* del (const KFileItemList&, TQWidget* /Transfer/, bool = 1, bool = 1) /PyName=del_/; + TDEIO::DeleteJob* del (const KFileItemList&, TQWidget* /Transfer/, bool = 1, bool = 1) /PyName=del_/; %End void clearHistory (); @@ -118,7 +118,7 @@ public: void setDropOptions (int); %If ( KDE_3_4_0 - ) - KIO::CopyJob* trash (const KFileItemList&, TQWidget* /Transfer/, bool = 1, bool = 1); + TDEIO::CopyJob* trash (const KFileItemList&, TQWidget* /Transfer/, bool = 1, bool = 1); %End %End diff --git a/sip/kfile/kdirsize.sip b/sip/kfile/kdirsize.sip index 472cf86..2f0a553 100644 --- a/sip/kfile/kdirsize.sip +++ b/sip/kfile/kdirsize.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KDirSize : KIO::Job +class KDirSize : TDEIO::Job { %TypeHeaderCode #include <kdirsize.h> @@ -37,18 +37,18 @@ protected: ~KDirSize (); public: - KIO::filesize_t totalSize () const; + TDEIO::filesize_t totalSize () const; %If ( KDE_3_3_0 - ) - KIO::filesize_t totalFiles () const; - KIO::filesize_t totalSubdirs () const; + TDEIO::filesize_t totalFiles () const; + TDEIO::filesize_t totalSubdirs () const; %End static KDirSize* dirSizeJob (const KURL&); static KDirSize* dirSizeJob (const KFileItemList&); %If ( KDE_3_1_2 - ) - static KIO::filesize_t dirSize (const KURL&); + static TDEIO::filesize_t dirSize (const KURL&); %End @@ -57,8 +57,8 @@ protected: void startNextJob (const KURL&); protected slots: - virtual void slotResult (KIO::Job*); - void slotEntries (KIO::Job*, const KIO::UDSEntryList&); + virtual void slotResult (TDEIO::Job*); + void slotEntries (TDEIO::Job*, const TDEIO::UDSEntryList&); void processList (); protected: diff --git a/sip/kfile/kfiledetailview.sip b/sip/kfile/kfiledetailview.sip index daf72fd..0b7e13e 100644 --- a/sip/kfile/kfiledetailview.sip +++ b/sip/kfile/kfiledetailview.sip @@ -87,8 +87,8 @@ public: TQScrollView* scrollWidget () const; %If ( KDE_3_2_0 - ) - virtual void readConfig (KConfig*, const TQString& = TQString ::null ); - virtual void writeConfig (KConfig*, const TQString& = TQString ::null ); + virtual void readConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void writeConfig (TDEConfig*, const TQString& = TQString ::null ); %End diff --git a/sip/kfile/kfiledialog.sip b/sip/kfile/kfiledialog.sip index 946deb1..9b68e13 100644 --- a/sip/kfile/kfiledialog.sip +++ b/sip/kfile/kfiledialog.sip @@ -134,10 +134,10 @@ protected: virtual void initGUI (); void multiSelectionChanged (); - virtual void readConfig (KConfig*, const TQString& = TQString ::null ); - virtual void writeConfig (KConfig*, const TQString& = TQString ::null ); - virtual void readRecentFiles (KConfig*); - virtual void saveRecentFiles (KConfig*); + virtual void readConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void writeConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void readRecentFiles (TDEConfig*); + virtual void saveRecentFiles (TDEConfig*); KURL::List tokenize (const TQString&) const; %If ( KDE_3_2_0 - ) @@ -158,7 +158,7 @@ protected slots: void slotFilterChanged (); void fileHighlighted (const KFileItem*); void fileSelected (const KFileItem*); - void slotStatResult (KIO::Job*); + void slotStatResult (TDEIO::Job*); void slotLoadingFinished (); void fileCompletion (const TQString&); diff --git a/sip/kfile/kfileiconview.sip b/sip/kfile/kfileiconview.sip index 3a97013..e7717ae 100644 --- a/sip/kfile/kfileiconview.sip +++ b/sip/kfile/kfileiconview.sip @@ -81,8 +81,8 @@ public: int iconSize () const; void ensureItemVisible (const KFileItem*); virtual void setSorting (TQDir::SortSpec); - virtual void readConfig (KConfig*, const TQString& = TQString ::null ); - virtual void writeConfig (KConfig*, const TQString& = TQString ::null ); + virtual void readConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void writeConfig (TDEConfig*, const TQString& = TQString ::null ); void mimeTypeDeterminationFinished (); void determineIcon (KFileIconViewItem*); TQScrollView* scrollWidget () const; diff --git a/sip/kfile/kfilepreview.sip b/sip/kfile/kfilepreview.sip index dd8df53..6d2095e 100644 --- a/sip/kfile/kfilepreview.sip +++ b/sip/kfile/kfilepreview.sip @@ -58,8 +58,8 @@ public: virtual void setSorting (TQDir::SortSpec); %If ( KDE_3_1_0 - ) - virtual void readConfig (KConfig*, const TQString& = TQString ::null ); - virtual void writeConfig (KConfig*, const TQString& = TQString ::null ); + virtual void readConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void writeConfig (TDEConfig*, const TQString& = TQString ::null ); %End virtual KActionCollection* actionCollection () const; diff --git a/sip/kfile/kfilereader.sip b/sip/kfile/kfilereader.sip index dfd4244..8f4a5d6 100644 --- a/sip/kfile/kfilereader.sip +++ b/sip/kfile/kfilereader.sip @@ -38,7 +38,7 @@ public: bool isReadable () const; protected: - virtual KFileItem* createFileItem (const KIO::UDSEntry&, const KURL&, bool); + virtual KFileItem* createFileItem (const TDEIO::UDSEntry&, const KURL&, bool); private: KFileReader (const KFileReader&); diff --git a/sip/kfile/kfileview.sip b/sip/kfile/kfileview.sip index f0f0979..b29fe7e 100644 --- a/sip/kfile/kfileview.sip +++ b/sip/kfile/kfileview.sip @@ -117,8 +117,8 @@ public: bool updateNumbers (const KFileItem*); virtual KActionCollection* actionCollection () const; KFileViewSignaler* signaler () const; - virtual void readConfig (KConfig*, const TQString& = TQString ::null ); - virtual void writeConfig (KConfig*, const TQString& = TQString ::null ); + virtual void readConfig (TDEConfig*, const TQString& = TQString ::null ); + virtual void writeConfig (TDEConfig*, const TQString& = TQString ::null ); %If ( KDE_3_2_0 - ) @@ -132,7 +132,7 @@ public: %End static TQString sortingKey (const TQString&, bool, int); - static TQString sortingKey (KIO::filesize_t, bool, int); + static TQString sortingKey (TDEIO::filesize_t, bool, int); %If ( KDE_3_2_0 - ) static int autoOpenDelay (); diff --git a/sip/kfile/kfileviewitem.sip b/sip/kfile/kfileviewitem.sip index 0ff97c1..4193b3a 100644 --- a/sip/kfile/kfileviewitem.sip +++ b/sip/kfile/kfileviewitem.sip @@ -32,7 +32,7 @@ class KFileViewItem : KFileItem public: - KFileViewItem (const KURL&, const KIO::UDSEntry&); + KFileViewItem (const KURL&, const TDEIO::UDSEntry&); KFileViewItem (mode_t, mode_t, const KURL&, bool); KFileViewItem (const KFileViewItem&); bool isFile () const; diff --git a/sip/kfile/kimagefilepreview.sip b/sip/kfile/kimagefilepreview.sip index 3909afa..808b307 100644 --- a/sip/kfile/kimagefilepreview.sip +++ b/sip/kfile/kimagefilepreview.sip @@ -48,7 +48,7 @@ protected slots: protected: virtual void resizeEvent (TQResizeEvent*); - virtual KIO::PreviewJob* createJob (const KURL&, int, int); + virtual TDEIO::PreviewJob* createJob (const KURL&, int, int); protected: //igx virtual void virtual_hook (int, void*); diff --git a/sip/kfile/kpropertiesdialog.sip b/sip/kfile/kpropertiesdialog.sip index fb84071..5229058 100644 --- a/sip/kfile/kpropertiesdialog.sip +++ b/sip/kfile/kpropertiesdialog.sip @@ -144,14 +144,14 @@ protected slots: void slotEditFileType (); %End - void slotCopyFinished (KIO::Job*); - void slotFileRenamed (KIO::Job*, const KURL&, const KURL&); + void slotCopyFinished (TDEIO::Job*); + void slotFileRenamed (TDEIO::Job*, const KURL&, const KURL&); %If ( KDE_3_2_0 - ) void slotDirSizeUpdate (); %End - void slotDirSizeFinished (KIO::Job*); + void slotDirSizeFinished (TDEIO::Job*); void slotFoundMountPoint (const TQString&, ulong, ulong, ulong); void slotSizeStop (); void slotSizeDetermine (); diff --git a/sip/kfile/kpropsdlg.sip b/sip/kfile/kpropsdlg.sip index f94a1d1..81d697f 100644 --- a/sip/kfile/kpropsdlg.sip +++ b/sip/kfile/kpropsdlg.sip @@ -100,9 +100,9 @@ public: void postApplyChanges (); protected slots: - void slotCopyFinished (KIO::Job*); - void slotFileRenamed (KIO::Job*, const KURL&, const KURL&); - void slotDirSizeFinished (KIO::Job*); + void slotCopyFinished (TDEIO::Job*); + void slotFileRenamed (TDEIO::Job*, const KURL&, const KURL&); + void slotDirSizeFinished (TDEIO::Job*); void slotFoundMountPoint (const TQString&, ulong, ulong, ulong); void slotSizeStop (); void slotSizeDetermine (); diff --git a/sip/kfile/kurlbar.sip b/sip/kfile/kurlbar.sip index b8582d8..d6e92f9 100644 --- a/sip/kfile/kurlbar.sip +++ b/sip/kfile/kurlbar.sip @@ -96,10 +96,10 @@ public: virtual void clear (); virtual TQSize sizeHint () const; virtual TQSize minimumSizeHint () const; - virtual void readConfig (KConfig*, const TQString&); - virtual void writeConfig (KConfig*, const TQString&); - virtual void readItem (int, KConfig*, bool); - virtual void writeItem (KURLBarItem*, int, KConfig*, bool); + virtual void readConfig (TDEConfig*, const TQString&); + virtual void writeConfig (TDEConfig*, const TQString&); + virtual void readItem (int, TDEConfig*, bool); + virtual void writeItem (KURLBarItem*, int, TDEConfig*, bool); KURLBarItem* currentItem () const; KURL currentURL () const; bool isModified () const; diff --git a/sip/khtml/khtml_part.sip b/sip/khtml/khtml_part.sip index 1f2615a..711ebac 100644 --- a/sip/khtml/khtml_part.sip +++ b/sip/khtml/khtml_part.sip @@ -43,7 +43,7 @@ public: KHTMLPart (KHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); virtual bool openURL (const KURL&); virtual bool closeURL (); - virtual void showError (KIO::Job*); + virtual void showError (TDEIO::Job*); DOM::HTMLDocument htmlDocument () const; DOM::Document document () const; DOM::Node activeNode () const; diff --git a/sip/khtml/khtml_part.sip.323 b/sip/khtml/khtml_part.sip.323 index f4b39b1..b338cc6 100644 --- a/sip/khtml/khtml_part.sip.323 +++ b/sip/khtml/khtml_part.sip.323 @@ -43,7 +43,7 @@ public: KHTMLPart (KHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); virtual bool openURL (const KURL&); virtual bool closeURL (); - virtual void showError (KIO::Job*); + virtual void showError (TDEIO::Job*); DOM::HTMLDocument htmlDocument () const; DOM::Document document () const; DOM::Node activeNode () const; diff --git a/sip/khtml/khtml_part.sip.330 b/sip/khtml/khtml_part.sip.330 index 1f2615a..711ebac 100644 --- a/sip/khtml/khtml_part.sip.330 +++ b/sip/khtml/khtml_part.sip.330 @@ -43,7 +43,7 @@ public: KHTMLPart (KHTMLView*, TQObject* /TransferThis/ = 0, const char* = 0, KHTMLPart::GUIProfile = DefaultGUI ); virtual bool openURL (const KURL&); virtual bool closeURL (); - virtual void showError (KIO::Job*); + virtual void showError (TDEIO::Job*); DOM::HTMLDocument htmlDocument () const; DOM::Document document () const; DOM::Node activeNode () const; diff --git a/sip/khtml/khtml_settings.sip b/sip/khtml/khtml_settings.sip index f6b8ab8..686d7b7 100644 --- a/sip/khtml/khtml_settings.sip +++ b/sip/khtml/khtml_settings.sip @@ -92,7 +92,7 @@ public: KHTMLSettings (); KHTMLSettings (const KHTMLSettings&); void init (); - void init (KConfig*, bool = 1); + void init (TDEConfig*, bool = 1); bool changeCursor (); bool underlineLink (); bool hoverLink (); @@ -181,7 +181,7 @@ public: static const char* adviceToStr (KHTMLSettings::KJavaScriptAdvice); %If ( KDE_3_2_0 - ) -//ig void readDomainSettings (KConfig*, bool, bool, KPerDomainSettings&); +//ig void readDomainSettings (TDEConfig*, bool, bool, KPerDomainSettings&); %End TQString settingsToCSS () const; diff --git a/sip/kio/authinfo.sip b/sip/kio/authinfo.sip index 33531f4..71ca01c 100644 --- a/sip/kio/authinfo.sip +++ b/sip/kio/authinfo.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class AuthInfo @@ -35,7 +35,7 @@ class AuthInfo public: AuthInfo (); - AuthInfo (const KIO::AuthInfo&); + AuthInfo (const TDEIO::AuthInfo&); bool isModified () const; void setModified (bool); KURL url; @@ -57,8 +57,8 @@ protected: %If ( KDE_3_1_4 - ) -//igx TQDataStream& operator << (TQDataStream&, const KIO::AuthInfo&); -//igx TQDataStream& operator >> (TQDataStream&, KIO::AuthInfo&); +//igx TQDataStream& operator << (TQDataStream&, const TDEIO::AuthInfo&); +//igx TQDataStream& operator >> (TQDataStream&, TDEIO::AuthInfo&); %End @@ -93,8 +93,8 @@ public: public: - static KIO::NetRC* self (); - bool lookup (const KURL&, KIO::NetRC::AutoLogin&, bool = 0, TQString = TQString ::null , int = 6); + static TDEIO::NetRC* self (); + bool lookup (const KURL&, TDEIO::NetRC::AutoLogin&, bool = 0, TQString = TQString ::null , int = 6); void reload (); protected: @@ -119,7 +119,7 @@ protected: }; // class NetRC -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/chmodjob.sip b/sip/kio/chmodjob.sip index df93c7a..b977552 100644 --- a/sip/kio/chmodjob.sip +++ b/sip/kio/chmodjob.sip @@ -23,10 +23,10 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { -class ChmodJob : KIO::Job +class ChmodJob : TDEIO::Job { %TypeHeaderCode #include <jobclasses.h> @@ -41,8 +41,8 @@ protected: void chmodNextFile (); protected slots: - virtual void slotResult (KIO::Job*); - void slotEntries (KIO::Job*, const KIO::UDSEntryList&); + virtual void slotResult (TDEIO::Job*); + void slotEntries (TDEIO::Job*, const TDEIO::UDSEntryList&); void processList (); protected: @@ -50,6 +50,6 @@ protected: }; // class ChmodJob -KIO::ChmodJob* chmod (const KFileItemList&, int, int, TQString, TQString, bool, bool = 1); -}; // namespace KIO +TDEIO::ChmodJob* chmod (const KFileItemList&, int, int, TQString, TQString, bool, bool = 1); +}; // namespace TDEIO diff --git a/sip/kio/connection.sip b/sip/kio/connection.sip index 4b35123..aef53cc 100644 --- a/sip/kio/connection.sip +++ b/sip/kio/connection.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class Task @@ -49,7 +49,7 @@ class Connection : TQObject public: Connection (); - void init (KSocket*); + void init (TDESocket*); void init (int, int); void connect (TQObject* = 0, const char* = 0); void close (); @@ -68,5 +68,5 @@ protected slots: }; // class Connection -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/davjob.sip b/sip/kio/davjob.sip index 3336f86..ed50fa5 100644 --- a/sip/kio/davjob.sip +++ b/sip/kio/davjob.sip @@ -25,10 +25,10 @@ %If ( KDE_3_1_0 - ) -namespace KIO +namespace TDEIO { -class DavJob : KIO::TransferJob +class DavJob : TDEIO::TransferJob { %TypeHeaderCode #include <davjob.h> @@ -47,10 +47,10 @@ protected: }; // class DavJob -KIO::DavJob* davPropFind (const KURL&, const TQDomDocument&, TQString, bool = 1); -KIO::DavJob* davPropPatch (const KURL&, const TQDomDocument&, bool = 1); -KIO::DavJob* davSearch (const KURL&, const TQString&, const TQString&, const TQString&, bool = 1); -}; // namespace KIO +TDEIO::DavJob* davPropFind (const KURL&, const TQDomDocument&, TQString, bool = 1); +TDEIO::DavJob* davPropPatch (const KURL&, const TQDomDocument&, bool = 1); +TDEIO::DavJob* davSearch (const KURL&, const TQString&, const TQString&, const TQString&, bool = 1); +}; // namespace TDEIO %End diff --git a/sip/kio/defaultprogress.sip b/sip/kio/defaultprogress.sip index aedaa56..25893b8 100644 --- a/sip/kio/defaultprogress.sip +++ b/sip/kio/defaultprogress.sip @@ -23,10 +23,10 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { -class DefaultProgress : KIO::ProgressBase +class DefaultProgress : TDEIO::ProgressBase { %TypeHeaderCode #include <defaultprogress.h> @@ -43,7 +43,7 @@ public: bool keepOpen () const; %If ( KDE_3_4_0 - ) - static TQString makePercentString (ulong, KIO::filesize_t, ulong); + static TQString makePercentString (ulong, TDEIO::filesize_t, ulong); %End %End @@ -52,28 +52,28 @@ public: public slots: - virtual void slotTotalSize (KIO::Job*, KIO::filesize_t); - virtual void slotTotalFiles (KIO::Job*, ulong); - virtual void slotTotalDirs (KIO::Job*, ulong); - virtual void slotProcessedSize (KIO::Job*, KIO::filesize_t); - virtual void slotProcessedFiles (KIO::Job*, ulong); - virtual void slotProcessedDirs (KIO::Job*, ulong); - virtual void slotSpeed (KIO::Job*, ulong); - virtual void slotPercent (KIO::Job*, ulong); - virtual void slotInfoMessage (KIO::Job*, const TQString&); - virtual void slotCopying (KIO::Job*, const KURL&, const KURL&); - virtual void slotMoving (KIO::Job*, const KURL&, const KURL&); - virtual void slotDeleting (KIO::Job*, const KURL&); + virtual void slotTotalSize (TDEIO::Job*, TDEIO::filesize_t); + virtual void slotTotalFiles (TDEIO::Job*, ulong); + virtual void slotTotalDirs (TDEIO::Job*, ulong); + virtual void slotProcessedSize (TDEIO::Job*, TDEIO::filesize_t); + virtual void slotProcessedFiles (TDEIO::Job*, ulong); + virtual void slotProcessedDirs (TDEIO::Job*, ulong); + virtual void slotSpeed (TDEIO::Job*, ulong); + virtual void slotPercent (TDEIO::Job*, ulong); + virtual void slotInfoMessage (TDEIO::Job*, const TQString&); + virtual void slotCopying (TDEIO::Job*, const KURL&, const KURL&); + virtual void slotMoving (TDEIO::Job*, const KURL&, const KURL&); + virtual void slotDeleting (TDEIO::Job*, const KURL&); %If ( KDE_3_1_0 - ) - void slotTransferring (KIO::Job*, const KURL&); + void slotTransferring (TDEIO::Job*, const KURL&); %End - virtual void slotCreatingDir (KIO::Job*, const KURL&); - virtual void slotStating (KIO::Job*, const KURL&); - virtual void slotMounting (KIO::Job*, const TQString&, const TQString&); - virtual void slotUnmounting (KIO::Job*, const TQString&); - virtual void slotCanResume (KIO::Job*, KIO::filesize_t); + virtual void slotCreatingDir (TDEIO::Job*, const KURL&); + virtual void slotStating (TDEIO::Job*, const KURL&); + virtual void slotMounting (TDEIO::Job*, const TQString&, const TQString&); + virtual void slotUnmounting (TDEIO::Job*, const TQString&); + virtual void slotCanResume (TDEIO::Job*, TDEIO::filesize_t); %If ( KDE_3_1_0 - ) void slotClean (); @@ -99,5 +99,5 @@ protected: }; // class DefaultProgress -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/forwardingslavebase.sip b/sip/kio/forwardingslavebase.sip index 18ea824..65dca49 100644 --- a/sip/kio/forwardingslavebase.sip +++ b/sip/kio/forwardingslavebase.sip @@ -25,10 +25,10 @@ %If ( KDE_3_4_0 - ) -namespace KIO +namespace TDEIO { -class ForwardingSlaveBase : TQObject, KIO::SlaveBase +class ForwardingSlaveBase : TQObject, TDEIO::SlaveBase { %TypeHeaderCode #include <forwardingslavebase.h> @@ -51,13 +51,13 @@ public: protected: virtual bool rewriteURL (const KURL&, KURL&) = 0; - virtual void prepareUDSEntry (KIO::UDSEntry&, bool = 0) const; + virtual void prepareUDSEntry (TDEIO::UDSEntry&, bool = 0) const; KURL processedURL () const; KURL requestedURL () const; }; // class ForwardingSlaveBase -}; // namespace KIO +}; // namespace TDEIO %End diff --git a/sip/kio/global.sip b/sip/kio/global.sip index 8fb1e3f..6ba32e2 100644 --- a/sip/kio/global.sip +++ b/sip/kio/global.sip @@ -27,26 +27,26 @@ #include <kio/global.h> %End -namespace KIO +namespace TDEIO { typedef long long fileoffset_t; typedef unsigned long long filesize_t; -TQString convertSize (KIO::filesize_t); +TQString convertSize (TDEIO::filesize_t); %If ( KDE_3_5_0 - ) -TQString convertSizeWithBytes (KIO::filesize_t); +TQString convertSizeWithBytes (TDEIO::filesize_t); %End -TQString number (KIO::filesize_t); -TQString convertSizeFromKB (KIO::filesize_t); +TQString number (TDEIO::filesize_t); +TQString convertSizeFromKB (TDEIO::filesize_t); %If ( KDE_3_4_0 - ) -uint calculateRemainingSeconds (KIO::filesize_t, KIO::filesize_t, KIO::filesize_t); +uint calculateRemainingSeconds (TDEIO::filesize_t, TDEIO::filesize_t, TDEIO::filesize_t); TQString convertSeconds (uint); %End -TQTime calculateRemaining (KIO::filesize_t, KIO::filesize_t, KIO::filesize_t); -TQString itemsSummaryString (uint, uint, uint, KIO::filesize_t, bool); +TQTime calculateRemaining (TDEIO::filesize_t, TDEIO::filesize_t, TDEIO::filesize_t); +TQString itemsSummaryString (uint, uint, uint, TDEIO::filesize_t, bool); TQString encodeFileName (const TQString&); TQString decodeFileName (const TQString&); @@ -214,8 +214,8 @@ enum CacheControl %End -KIO::CacheControl parseCacheControl (const TQString&); -TQString getCacheControlString (KIO::CacheControl); +TDEIO::CacheControl parseCacheControl (const TQString&); +TQString getCacheControlString (TDEIO::CacheControl); TQString findDeviceMountPoint (const TQString&); TQString findPathMountPoint (const TQString&); bool probably_slow_mounted (const TQString&); @@ -234,7 +234,7 @@ enum FileSystemFlag CaseInsensitive }; -bool testFileSystemFlag (const TQString&, KIO::FileSystemFlag); +bool testFileSystemFlag (const TQString&, TDEIO::FileSystemFlag); %End %End @@ -254,8 +254,8 @@ public: }; // class UDSAtom -//ig typedef TQValueList<KIO::UDSAtom> UDSEntry; -//ig typedef TQValueList<KIO::UDSEntry> UDSEntryList; +//ig typedef TQValueList<TDEIO::UDSAtom> UDSEntry; +//ig typedef TQValueList<TDEIO::UDSEntry> UDSEntryList; //ig typedef TQValueListIterator<UDSEntry> UDSEntryListIterator; //ig typedef TQValueListConstIterator<UDSEntry> UDSEntryListConstIterator; @@ -452,17 +452,17 @@ enum CacheControl //force //ig typedef TQMap<TQString,TQString> MetaData; //end -}; // namespace KIO +}; // namespace TDEIO //force -KIO::UDSEntry testKIOUDSEntry (KIO::UDSEntry); +TDEIO::UDSEntry testKIOUDSEntry (TDEIO::UDSEntry); %MethodCode //takes list | (KIO.UDSEntry) //returns (KIO.UDSEntry) sipRes = a0; %End -KIO::UDSEntryList testKIOUDSEntryList (KIO::UDSEntryList); +TDEIO::UDSEntryList testKIOUDSEntryList (TDEIO::UDSEntryList); %MethodCode //takes list | (KIO.UDSEntryList) //returns (KIO.UDSEntryList) @@ -473,7 +473,7 @@ KIO::UDSEntryList testKIOUDSEntryList (KIO::UDSEntryList); #include <tqmap.h> %End -KIO::MetaData testKIOMetaData (KIO::MetaData); +TDEIO::MetaData testKIOMetaData (TDEIO::MetaData); %MethodCode //takes dict | (KIO.MetaData) //returns (KIO.MetaData) @@ -483,7 +483,7 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); //end -%MappedType KIO::UDSEntry +%MappedType TDEIO::UDSEntry //converts a Python list of KIO.UDSAtom { %TypeHeaderCode @@ -500,14 +500,14 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); if ((pylist = PyList_New(0)) == NULL) return NULL; - TQValueList<KIO::UDSAtom> *cpplist = (TQValueList<KIO::UDSAtom> *)sipCpp; + TQValueList<TDEIO::UDSAtom> *cpplist = (TQValueList<TDEIO::UDSAtom> *)sipCpp; PyObject *inst; // Get it. - TQValueList<KIO::UDSAtom>::Iterator it; + TQValueList<TDEIO::UDSAtom>::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new KIO::UDSAtom(*it), sipType_KIO_UDSAtom, NULL)) == NULL) + if (((inst = sipConvertFromNewType(new TDEIO::UDSAtom(*it), sipType_KIO_UDSAtom, NULL)) == NULL) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); @@ -523,16 +523,16 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); if (sipIsErr == NULL) return PyList_Check(sipPy); - TQValueList<KIO::UDSAtom> *cpplist = new TQValueList<KIO::UDSAtom>; + TQValueList<TDEIO::UDSAtom> *cpplist = new TQValueList<TDEIO::UDSAtom>; PyObject *elem; - KIO::UDSAtom *cpp; + TDEIO::UDSAtom *cpp; int iserr = 0; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KIO::UDSAtom *)sipForceConvertToType(elem, sipType_KIO_UDSAtom, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::UDSAtom *)sipForceConvertToType(elem, sipType_KIO_UDSAtom, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { @@ -551,7 +551,7 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); }; -%MappedType KIO::UDSEntryList +%MappedType TDEIO::UDSEntryList //converts a Python list of KIO.UDSEntry { %TypeHeaderCode @@ -568,14 +568,14 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); if ((pylist = PyList_New(0)) == NULL) return NULL; - TQValueList<KIO::UDSEntry> *cpplist = (TQValueList<KIO::UDSEntry> *)sipCpp; + TQValueList<TDEIO::UDSEntry> *cpplist = (TQValueList<TDEIO::UDSEntry> *)sipCpp; PyObject *inst; // Get it. - TQValueList<KIO::UDSEntry>::Iterator it; + TQValueList<TDEIO::UDSEntry>::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - KIO::UDSEntry cpp = *it; + TDEIO::UDSEntry cpp = *it; inst = sipConvertFromType(&cpp, sipType_KIO_UDSEntry, sipTransferObj); if (PyList_Append (pylist, inst) < 0) @@ -593,16 +593,16 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); if (sipIsErr == NULL) return PyList_Check(sipPy); - TQValueList<KIO::UDSEntry> *cpplist = new TQValueList<KIO::UDSEntry>; + TQValueList<TDEIO::UDSEntry> *cpplist = new TQValueList<TDEIO::UDSEntry>; PyObject *elem; - KIO::UDSEntry *cpp; + TDEIO::UDSEntry *cpp; int iserr = 0; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KIO::UDSEntry *)sipForceConvertToType(elem, sipType_KIO_UDSEntry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::UDSEntry *)sipForceConvertToType(elem, sipType_KIO_UDSEntry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { @@ -621,7 +621,7 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); }; -%MappedType KIO::MetaData +%MappedType TDEIO::MetaData //converts a Python dict of TQString, TQString { %TypeHeaderCode @@ -705,7 +705,7 @@ KIO::MetaData testKIOMetaData (KIO::MetaData); sipReleaseType(bcpp, sipType_TQString, bcpp_state); } - *sipCppPtr = (KIO::MetaData *)cppmap; + *sipCppPtr = (TDEIO::MetaData *)cppmap; return 1; %End diff --git a/sip/kio/job.sip b/sip/kio/job.sip index 511b625..dc6f887 100644 --- a/sip/kio/job.sip +++ b/sip/kio/job.sip @@ -23,51 +23,51 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { -KIO::SimpleJob* mkdir (const KURL&, int = -1); -KIO::SimpleJob* rmdir (const KURL&); -KIO::SimpleJob* chmod (const KURL&, int); -KIO::SimpleJob* rename (const KURL&, const KURL&, bool); -KIO::SimpleJob* symlink (const TQString&, const KURL&, bool, bool = 1); -KIO::SimpleJob* special (const KURL&, const TQByteArray&, bool = 1); -KIO::SimpleJob* mount (bool, const char*, const TQString&, const TQString&, bool = 1); -KIO::SimpleJob* unmount (const TQString&, bool = 1); -KIO::SimpleJob* http_update_cache (const KURL&, bool, time_t); -KIO::StatJob* stat (const KURL&, bool = 1); -KIO::StatJob* stat (const KURL&, bool, short, bool = 1); -KIO::TransferJob* get (const KURL&, bool = 0, bool = 1); -KIO::TransferJob* put (const KURL&, int, bool, bool, bool = 1); -KIO::TransferJob* http_post (const KURL&, const TQByteArray&, bool = 1); +TDEIO::SimpleJob* mkdir (const KURL&, int = -1); +TDEIO::SimpleJob* rmdir (const KURL&); +TDEIO::SimpleJob* chmod (const KURL&, int); +TDEIO::SimpleJob* rename (const KURL&, const KURL&, bool); +TDEIO::SimpleJob* symlink (const TQString&, const KURL&, bool, bool = 1); +TDEIO::SimpleJob* special (const KURL&, const TQByteArray&, bool = 1); +TDEIO::SimpleJob* mount (bool, const char*, const TQString&, const TQString&, bool = 1); +TDEIO::SimpleJob* unmount (const TQString&, bool = 1); +TDEIO::SimpleJob* http_update_cache (const KURL&, bool, time_t); +TDEIO::StatJob* stat (const KURL&, bool = 1); +TDEIO::StatJob* stat (const KURL&, bool, short, bool = 1); +TDEIO::TransferJob* get (const KURL&, bool = 0, bool = 1); +TDEIO::TransferJob* put (const KURL&, int, bool, bool, bool = 1); +TDEIO::TransferJob* http_post (const KURL&, const TQByteArray&, bool = 1); %If ( KDE_3_3_0 - ) -KIO::StoredTransferJob* storedGet (const KURL&, bool = 0, bool = 1); -KIO::StoredTransferJob* storedPut (const TQByteArray&, const KURL&, int, bool, bool, bool = 1); +TDEIO::StoredTransferJob* storedGet (const KURL&, bool = 0, bool = 1); +TDEIO::StoredTransferJob* storedPut (const TQByteArray&, const KURL&, int, bool, bool, bool = 1); %End -KIO::MultiGetJob* multi_get (long, const KURL&, const KIO::MetaData&); -KIO::MimetypeJob* mimetype (const KURL&, bool = 1); -KIO::FileCopyJob* file_copy (const KURL&, const KURL&, int = -1, bool = 0, bool = 0, bool = 1); -KIO::FileCopyJob* file_move (const KURL&, const KURL&, int = -1, bool = 0, bool = 0, bool = 1); -KIO::SimpleJob* file_delete (const KURL&, bool = 1); -KIO::ListJob* listDir (const KURL&, bool = 1, bool = 1); -KIO::ListJob* listRecursive (const KURL&, bool = 1, bool = 1); -KIO::CopyJob* copy (const KURL&, const KURL&, bool = 1); -KIO::CopyJob* copyAs (const KURL&, const KURL&, bool = 1); -KIO::CopyJob* copy (const KURL::List&, const KURL&, bool = 1); -KIO::CopyJob* move (const KURL&, const KURL&, bool = 1); -KIO::CopyJob* moveAs (const KURL&, const KURL&, bool = 1); -KIO::CopyJob* move (const KURL::List&, const KURL&, bool = 1); -KIO::CopyJob* link (const KURL&, const KURL&, bool = 1); -KIO::CopyJob* link (const KURL::List&, const KURL&, bool = 1); -KIO::CopyJob* linkAs (const KURL&, const KURL&, bool = 1); +TDEIO::MultiGetJob* multi_get (long, const KURL&, const TDEIO::MetaData&); +TDEIO::MimetypeJob* mimetype (const KURL&, bool = 1); +TDEIO::FileCopyJob* file_copy (const KURL&, const KURL&, int = -1, bool = 0, bool = 0, bool = 1); +TDEIO::FileCopyJob* file_move (const KURL&, const KURL&, int = -1, bool = 0, bool = 0, bool = 1); +TDEIO::SimpleJob* file_delete (const KURL&, bool = 1); +TDEIO::ListJob* listDir (const KURL&, bool = 1, bool = 1); +TDEIO::ListJob* listRecursive (const KURL&, bool = 1, bool = 1); +TDEIO::CopyJob* copy (const KURL&, const KURL&, bool = 1); +TDEIO::CopyJob* copyAs (const KURL&, const KURL&, bool = 1); +TDEIO::CopyJob* copy (const KURL::List&, const KURL&, bool = 1); +TDEIO::CopyJob* move (const KURL&, const KURL&, bool = 1); +TDEIO::CopyJob* moveAs (const KURL&, const KURL&, bool = 1); +TDEIO::CopyJob* move (const KURL::List&, const KURL&, bool = 1); +TDEIO::CopyJob* link (const KURL&, const KURL&, bool = 1); +TDEIO::CopyJob* link (const KURL::List&, const KURL&, bool = 1); +TDEIO::CopyJob* linkAs (const KURL&, const KURL&, bool = 1); %If ( KDE_3_4_0 - ) -KIO::CopyJob* trash (const KURL&, bool = 1); -KIO::CopyJob* trash (const KURL::List&, bool = 1); +TDEIO::CopyJob* trash (const KURL&, bool = 1); +TDEIO::CopyJob* trash (const KURL::List&, bool = 1); %End -KIO::DeleteJob* del (const KURL&, bool = 0, bool = 1) /PyName=del_/; -KIO::DeleteJob* del (const KURL::List&, bool = 0, bool = 1) /PyName=del_/; -}; // namespace KIO +TDEIO::DeleteJob* del (const KURL&, bool = 0, bool = 1) /PyName=del_/; +TDEIO::DeleteJob* del (const KURL::List&, bool = 0, bool = 1) /PyName=del_/; +}; // namespace TDEIO diff --git a/sip/kio/jobclasses.sip b/sip/kio/jobclasses.sip index d27caf9..3be8048 100644 --- a/sip/kio/jobclasses.sip +++ b/sip/kio/jobclasses.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class Job : TQObject @@ -62,58 +62,58 @@ public: TQWidget* window () const; %If ( KDE_3_1_0 - ) - void setParentJob (KIO::Job*); - KIO::Job* parentJob () const; + void setParentJob (TDEIO::Job*); + TDEIO::Job* parentJob () const; %End - void setMetaData (const KIO::MetaData&); + void setMetaData (const TDEIO::MetaData&); void addMetaData (const TQString&, const TQString&); void addMetaData (const TQMap<TQString,TQString>&); void mergeMetaData (const TQMap<TQString,TQString>&); - KIO::MetaData outgoingMetaData () const; - KIO::MetaData metaData () const; + TDEIO::MetaData outgoingMetaData () const; + TDEIO::MetaData metaData () const; TQString queryMetaData (const TQString&); %If ( KDE_3_2_0 - ) - KIO::filesize_t getProcessedSize (); + TDEIO::filesize_t getProcessedSize (); %End signals: - void result (KIO::Job*); - void canceled (KIO::Job*); - void infoMessage (KIO::Job*, const TQString&); + void result (TDEIO::Job*); + void canceled (TDEIO::Job*); + void infoMessage (TDEIO::Job*, const TQString&); %If ( KDE_3_5_0 - ) - void warning (KIO::Job*, const TQString&); + void warning (TDEIO::Job*, const TQString&); %End - void connected (KIO::Job*); - void percent (KIO::Job*, ulong); - void totalSize (KIO::Job*, KIO::filesize_t); - void processedSize (KIO::Job*, KIO::filesize_t); - void speed (KIO::Job*, ulong); + void connected (TDEIO::Job*); + void percent (TDEIO::Job*, ulong); + void totalSize (TDEIO::Job*, TDEIO::filesize_t); + void processedSize (TDEIO::Job*, TDEIO::filesize_t); + void speed (TDEIO::Job*, ulong); protected slots: - virtual void slotResult (KIO::Job*); - void slotSpeed (KIO::Job*, ulong); - void slotInfoMessage (KIO::Job*, const TQString&); + virtual void slotResult (TDEIO::Job*); + void slotSpeed (TDEIO::Job*, ulong); + void slotInfoMessage (TDEIO::Job*, const TQString&); void slotSpeedTimeout (); protected: - virtual void addSubjob (KIO::Job*, bool = 1); - virtual void removeSubjob (KIO::Job*); + virtual void addSubjob (TDEIO::Job*, bool = 1); + virtual void removeSubjob (TDEIO::Job*); %If ( KDE_3_4_0 - ) - void removeSubjob (KIO::Job*, bool, bool); + void removeSubjob (TDEIO::Job*, bool, bool); %End - void emitPercent (KIO::filesize_t, KIO::filesize_t); + void emitPercent (TDEIO::filesize_t, TDEIO::filesize_t); void emitSpeed (ulong); void emitResult (); %If ( KDE_3_2_0 - ) - void setProcessedSize (KIO::filesize_t); + void setProcessedSize (TDEIO::filesize_t); %End //ig int& extraFlags (); @@ -138,7 +138,7 @@ protected: }; // class Job -class SimpleJob : KIO::Job +class SimpleJob : TDEIO::Job { %TypeHeaderCode #include <jobclasses.h> @@ -151,15 +151,15 @@ public: virtual void kill (bool = 1); virtual void putOnHold (); static void removeOnHold (); - virtual void start (KIO::Slave*); + virtual void start (TDEIO::Slave*); void slaveDone (); - KIO::Slave* slave (); + TDEIO::Slave* slave (); int command (); public slots: %If ( KDE_3_1_0 - ) - void slotTotalSize (KIO::filesize_t); + void slotTotalSize (TDEIO::filesize_t); %End @@ -168,9 +168,9 @@ protected slots: void slotWarning (const TQString&); void slotInfoMessage (const TQString&); void slotConnected (); - void slotProcessedSize (KIO::filesize_t); + void slotProcessedSize (TDEIO::filesize_t); void slotSpeed (ulong); - virtual void slotMetaData (const KIO::MetaData&); + virtual void slotMetaData (const TDEIO::MetaData&); public slots: virtual void slotError (int, const TQString&); @@ -191,14 +191,14 @@ protected: protected slots: %If ( - KDE_3_1_0 ) - void slotTotalSize (KIO::filesize_t); + void slotTotalSize (TDEIO::filesize_t); %End }; // class SimpleJob -class StatJob : KIO::SimpleJob +class StatJob : TDEIO::SimpleJob { %TypeHeaderCode #include <jobclasses.h> @@ -209,24 +209,24 @@ public: StatJob (const KURL&, int, const TQByteArray&, bool); void setSide (bool); void setDetails (short); - const KIO::UDSEntry& statResult () const; - virtual void start (KIO::Slave*); + const TDEIO::UDSEntry& statResult () const; + virtual void start (TDEIO::Slave*); signals: - void redirection (KIO::Job*, const KURL&); + void redirection (TDEIO::Job*, const KURL&); %If ( KDE_3_1_0 - ) - void permanentRedirection (KIO::Job*, const KURL&, const KURL&); + void permanentRedirection (TDEIO::Job*, const KURL&, const KURL&); %End protected slots: - void slotStatEntry (const KIO::UDSEntry&); + void slotStatEntry (const TDEIO::UDSEntry&); void slotRedirection (const KURL&); virtual void slotFinished (); %If ( KDE_3_2_0 - ) - virtual void slotMetaData (const KIO::MetaData&); + virtual void slotMetaData (const TDEIO::MetaData&); %End @@ -240,7 +240,7 @@ protected: %If ( KDE_3_3_0 - ) -class MkdirJob : KIO::SimpleJob +class MkdirJob : TDEIO::SimpleJob { %TypeHeaderCode #include <jobclasses.h> @@ -249,11 +249,11 @@ class MkdirJob : KIO::SimpleJob public: MkdirJob (const KURL&, int, const TQByteArray&, bool); - virtual void start (KIO::Slave*); + virtual void start (TDEIO::Slave*); signals: - void redirection (KIO::Job*, const KURL&); - void permanentRedirection (KIO::Job*, const KURL&, const KURL&); + void redirection (TDEIO::Job*, const KURL&); + void permanentRedirection (TDEIO::Job*, const KURL&, const KURL&); protected slots: void slotRedirection (const KURL&); @@ -271,7 +271,7 @@ protected: %If ( KDE_3_3_0 - ) -class DirectCopyJob : KIO::SimpleJob +class DirectCopyJob : TDEIO::SimpleJob { %TypeHeaderCode #include <jobclasses.h> @@ -280,17 +280,17 @@ class DirectCopyJob : KIO::SimpleJob public: DirectCopyJob (const KURL&, int, const TQByteArray&, bool); - virtual void start (KIO::Slave*); + virtual void start (TDEIO::Slave*); signals: - void canResume (KIO::Job*, KIO::filesize_t); + void canResume (TDEIO::Job*, TDEIO::filesize_t); }; // class DirectCopyJob %End -class TransferJob : KIO::SimpleJob +class TransferJob : TDEIO::SimpleJob { %TypeHeaderCode #include <jobclasses.h> @@ -299,8 +299,8 @@ class TransferJob : KIO::SimpleJob public: TransferJob (const KURL&, int, const TQByteArray&, const TQByteArray&, bool); - virtual void start (KIO::Slave*); - virtual void slotResult (KIO::Job*); + virtual void start (TDEIO::Slave*); + virtual void slotResult (TDEIO::Job*); void suspend (); void resume (); bool isSuspended () const; @@ -315,16 +315,16 @@ public: signals: - void data (KIO::Job*, const TQByteArray&); - void dataReq (KIO::Job*, TQByteArray&); - void redirection (KIO::Job*, const KURL&); + void data (TDEIO::Job*, const TQByteArray&); + void dataReq (TDEIO::Job*, TQByteArray&); + void redirection (TDEIO::Job*, const KURL&); %If ( KDE_3_1_0 - ) - void permanentRedirection (KIO::Job*, const KURL&, const KURL&); + void permanentRedirection (TDEIO::Job*, const KURL&, const KURL&); %End - void mimetype (KIO::Job*, const TQString&); - void canResume (KIO::Job*, KIO::filesize_t); + void mimetype (TDEIO::Job*, const TQString&); + void canResume (TDEIO::Job*, TDEIO::filesize_t); protected slots: virtual void slotRedirection (const KURL&); @@ -333,14 +333,14 @@ protected slots: virtual void slotDataReq (); virtual void slotMimetype (const TQString&); virtual void slotNeedSubURLData (); - virtual void slotSubURLData (KIO::Job*, const TQByteArray&); + virtual void slotSubURLData (TDEIO::Job*, const TQByteArray&); %If ( KDE_3_2_0 - ) - virtual void slotMetaData (const KIO::MetaData&); + virtual void slotMetaData (const TDEIO::MetaData&); %End void slotErrorPage (); - void slotCanResume (KIO::filesize_t); + void slotCanResume (TDEIO::filesize_t); %If ( KDE_3_2_0 - ) void slotPostRedirection (); @@ -357,7 +357,7 @@ protected: %If ( KDE_3_3_0 - ) -class StoredTransferJob : KIO::TransferJob +class StoredTransferJob : TDEIO::TransferJob { %TypeHeaderCode #include <jobclasses.h> @@ -374,7 +374,7 @@ public: %End -class MultiGetJob : KIO::TransferJob +class MultiGetJob : TDEIO::TransferJob { %TypeHeaderCode #include <jobclasses.h> @@ -383,8 +383,8 @@ class MultiGetJob : KIO::TransferJob public: MultiGetJob (const KURL&, bool); - virtual void start (KIO::Slave*); - void get (long, const KURL&, const KIO::MetaData&); + virtual void start (TDEIO::Slave*); + void get (long, const KURL&, const TDEIO::MetaData&); signals: void data (long, const TQByteArray&); @@ -403,7 +403,7 @@ protected: }; // class MultiGetJob -class MimetypeJob : KIO::TransferJob +class MimetypeJob : TDEIO::TransferJob { %TypeHeaderCode #include <jobclasses.h> @@ -413,7 +413,7 @@ class MimetypeJob : KIO::TransferJob public: MimetypeJob (const KURL&, int, const TQByteArray&, bool); TQString mimetype () const; - virtual void start (KIO::Slave*); + virtual void start (TDEIO::Slave*); protected slots: virtual void slotFinished (); @@ -424,7 +424,7 @@ protected: }; // class MimetypeJob -class FileCopyJob : KIO::Job +class FileCopyJob : TDEIO::Job { %TypeHeaderCode #include <jobclasses.h> @@ -435,7 +435,7 @@ public: FileCopyJob (const KURL&, const KURL&, int, bool, bool, bool, bool); %If ( KDE_3_2_0 - ) - void setSourceSize64 (KIO::filesize_t); + void setSourceSize64 (TDEIO::filesize_t); %If ( KDE_3_5_2 - ) void setModificationTime (time_t); @@ -449,15 +449,15 @@ public: public slots: void slotStart (); - void slotData (KIO::Job*, const TQByteArray&); - void slotDataReq (KIO::Job*, TQByteArray&); + void slotData (TDEIO::Job*, const TQByteArray&); + void slotDataReq (TDEIO::Job*, TQByteArray&); protected slots: - virtual void slotResult (KIO::Job*); - void slotProcessedSize (KIO::Job*, KIO::filesize_t); - void slotTotalSize (KIO::Job*, KIO::filesize_t); - void slotPercent (KIO::Job*, ulong); - void slotCanResume (KIO::Job*, KIO::filesize_t); + virtual void slotResult (TDEIO::Job*); + void slotProcessedSize (TDEIO::Job*, TDEIO::filesize_t); + void slotTotalSize (TDEIO::Job*, TDEIO::filesize_t); + void slotPercent (TDEIO::Job*, ulong); + void slotCanResume (TDEIO::Job*, TDEIO::filesize_t); protected: void startCopyJob (); @@ -468,7 +468,7 @@ protected: %End void startDataPump (); - void connectSubjob (KIO::SimpleJob*); + void connectSubjob (TDEIO::SimpleJob*); protected: @@ -478,7 +478,7 @@ protected: }; // class FileCopyJob -class ListJob : KIO::SimpleJob +class ListJob : TDEIO::SimpleJob { %TypeHeaderCode #include <jobclasses.h> @@ -487,7 +487,7 @@ class ListJob : KIO::SimpleJob public: ListJob (const KURL&, bool, bool = 0, TQString = TQString ::null , bool = 1); - virtual void start (KIO::Slave*); + virtual void start (TDEIO::Slave*); %If ( KDE_3_4_3 - ) const KURL& redirectionURL () const; @@ -500,11 +500,11 @@ public: signals: - void entries (KIO::Job*, const KIO::UDSEntryList&); - void redirection (KIO::Job*, const KURL&); + void entries (TDEIO::Job*, const TDEIO::UDSEntryList&); + void redirection (TDEIO::Job*, const KURL&); %If ( KDE_3_1_0 - ) - void permanentRedirection (KIO::Job*, const KURL&, const KURL&); + void permanentRedirection (TDEIO::Job*, const KURL&, const KURL&); %End @@ -512,13 +512,13 @@ protected slots: virtual void slotFinished (); %If ( KDE_3_2_0 - ) - virtual void slotMetaData (const KIO::MetaData&); + virtual void slotMetaData (const TDEIO::MetaData&); %End - virtual void slotResult (KIO::Job*); - void slotListEntries (const KIO::UDSEntryList&); + virtual void slotResult (TDEIO::Job*); + void slotListEntries (const TDEIO::UDSEntryList&); void slotRedirection (const KURL&); - void gotEntries (KIO::Job*, const KIO::UDSEntryList&); + void gotEntries (TDEIO::Job*, const TDEIO::UDSEntryList&); protected: //igx virtual void virtual_hook (int, void*); @@ -545,7 +545,7 @@ public: }; // class CopyInfo -class CopyJob : KIO::Job +class CopyJob : TDEIO::Job { %TypeHeaderCode #include <jobclasses.h> @@ -561,7 +561,7 @@ public: Link }; - CopyJob (const KURL::List&, const KURL&, KIO::CopyJob::CopyMode, bool, bool); + CopyJob (const KURL::List&, const KURL&, TDEIO::CopyJob::CopyMode, bool, bool); KURL::List srcURLs () const; KURL destURL () const; @@ -576,22 +576,22 @@ public: signals: - void totalFiles (KIO::Job*, ulong); - void totalDirs (KIO::Job*, ulong); + void totalFiles (TDEIO::Job*, ulong); + void totalDirs (TDEIO::Job*, ulong); %If ( KDE_3_2_0 - ) - void aboutToCreate (KIO::Job*, const TQValueList<KIO::CopyInfo>&); + void aboutToCreate (TDEIO::Job*, const TQValueList<TDEIO::CopyInfo>&); %End - void processedFiles (KIO::Job*, ulong); - void processedDirs (KIO::Job*, ulong); - void copying (KIO::Job*, const KURL&, const KURL&); - void linking (KIO::Job*, const TQString&, const KURL&); - void moving (KIO::Job*, const KURL&, const KURL&); - void creatingDir (KIO::Job*, const KURL&); - void renamed (KIO::Job*, const KURL&, const KURL&); - void copyingDone (KIO::Job*, const KURL&, const KURL&, bool, bool); - void copyingLinkDone (KIO::Job*, const KURL&, const TQString&, const KURL&); + void processedFiles (TDEIO::Job*, ulong); + void processedDirs (TDEIO::Job*, ulong); + void copying (TDEIO::Job*, const KURL&, const KURL&); + void linking (TDEIO::Job*, const TQString&, const KURL&); + void moving (TDEIO::Job*, const KURL&, const KURL&); + void creatingDir (TDEIO::Job*, const KURL&); + void renamed (TDEIO::Job*, const KURL&, const KURL&); + void copyingDone (TDEIO::Job*, const KURL&, const KURL&, bool, bool); + void copyingLinkDone (TDEIO::Job*, const KURL&, const TQString&, const KURL&); protected: @@ -600,20 +600,20 @@ protected: %End void statNextSrc (); - void slotResultStating (KIO::Job*); + void slotResultStating (TDEIO::Job*); void startListing (const KURL&); - void slotResultCreatingDirs (KIO::Job*); - void slotResultConflictCreatingDirs (KIO::Job*); + void slotResultCreatingDirs (TDEIO::Job*); + void slotResultConflictCreatingDirs (TDEIO::Job*); void createNextDir (); - void slotResultCopyingFiles (KIO::Job*); - void slotResultConflictCopyingFiles (KIO::Job*); + void slotResultCopyingFiles (TDEIO::Job*); + void slotResultConflictCopyingFiles (TDEIO::Job*); void copyNextFile (); - void slotResultDeletingDirs (KIO::Job*); + void slotResultDeletingDirs (TDEIO::Job*); void deleteNextDir (); void skip (const KURL&); %If ( KDE_3_3_2 - ) - void slotResultRenaming (KIO::Job*); + void slotResultRenaming (TDEIO::Job*); %If ( KDE_3_5_2 - ) void setNextDirAttribute (); @@ -624,10 +624,10 @@ protected: protected slots: void slotStart (); - void slotEntries (KIO::Job*, const KIO::UDSEntryList&); - virtual void slotResult (KIO::Job*); - void slotProcessedSize (KIO::Job*, KIO::filesize_t); - void slotTotalSize (KIO::Job*, KIO::filesize_t); + void slotEntries (TDEIO::Job*, const TDEIO::UDSEntryList&); + virtual void slotResult (TDEIO::Job*); + void slotProcessedSize (TDEIO::Job*, TDEIO::filesize_t); + void slotTotalSize (TDEIO::Job*, TDEIO::filesize_t); void slotReport (); protected: @@ -636,7 +636,7 @@ protected: }; // class CopyJob -class DeleteJob : KIO::Job +class DeleteJob : TDEIO::Job { %TypeHeaderCode #include <jobclasses.h> @@ -648,17 +648,17 @@ public: KURL::List urls () const; signals: - void totalFiles (KIO::Job*, ulong); - void totalDirs (KIO::Job*, ulong); - void processedFiles (KIO::Job*, ulong); - void processedDirs (KIO::Job*, ulong); - void deleting (KIO::Job*, const KURL&); + void totalFiles (TDEIO::Job*, ulong); + void totalDirs (TDEIO::Job*, ulong); + void processedFiles (TDEIO::Job*, ulong); + void processedDirs (TDEIO::Job*, ulong); + void deleting (TDEIO::Job*, const KURL&); protected slots: void slotStart (); - void slotEntries (KIO::Job*, const KIO::UDSEntryList&); - virtual void slotResult (KIO::Job*); - void slotProcessedSize (KIO::Job*, KIO::filesize_t); + void slotEntries (TDEIO::Job*, const TDEIO::UDSEntryList&); + virtual void slotResult (TDEIO::Job*); + void slotProcessedSize (TDEIO::Job*, TDEIO::filesize_t); void slotReport (); protected: @@ -675,12 +675,12 @@ protected: }; // class DeleteJob -}; // namespace KIO +}; // namespace TDEIO -%MappedType TQValueList<KIO::CopyInfo> -//converts a Python list of KIO::CopyInfo +%MappedType TQValueList<TDEIO::CopyInfo> +//converts a Python list of TDEIO::CopyInfo { %TypeHeaderCode #include <tqvaluelist.h> @@ -695,14 +695,14 @@ protected: if ((pylist = PyList_New(0)) == NULL) return NULL; - TQValueList<KIO::CopyInfo> *cpplist = (TQValueList<KIO::CopyInfo> *)sipCpp; + TQValueList<TDEIO::CopyInfo> *cpplist = (TQValueList<TDEIO::CopyInfo> *)sipCpp; PyObject *inst; // Get it. - TQValueList<KIO::CopyInfo>::Iterator it; + TQValueList<TDEIO::CopyInfo>::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new KIO::CopyInfo(*it), sipType_KIO_CopyInfo, NULL)) == NULL) + if (((inst = sipConvertFromNewType(new TDEIO::CopyInfo(*it), sipType_KIO_CopyInfo, NULL)) == NULL) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); @@ -718,16 +718,16 @@ protected: if (sipIsErr == NULL) return PyList_Check(sipPy); - TQValueList<KIO::CopyInfo> *cpplist = new TQValueList<KIO::CopyInfo>; + TQValueList<TDEIO::CopyInfo> *cpplist = new TQValueList<TDEIO::CopyInfo>; PyObject *elem; - KIO::CopyInfo *cpp; + TDEIO::CopyInfo *cpp; int iserr = 0; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KIO::CopyInfo *)sipForceConvertToType(elem, sipType_KIO_CopyInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::CopyInfo *)sipForceConvertToType(elem, sipType_KIO_CopyInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { diff --git a/sip/kio/kautomount.sip b/sip/kio/kautomount.sip index 924d670..65643a1 100644 --- a/sip/kio/kautomount.sip +++ b/sip/kio/kautomount.sip @@ -39,7 +39,7 @@ signals: void error (); protected slots: - void slotResult (KIO::Job*); + void slotResult (TDEIO::Job*); protected: //force @@ -66,7 +66,7 @@ signals: void error (); protected slots: - void slotResult (KIO::Job*); + void slotResult (TDEIO::Job*); //force private: diff --git a/sip/kio/kdirlister.sip b/sip/kio/kdirlister.sip index 473c8cb..f41aa68 100644 --- a/sip/kio/kdirlister.sip +++ b/sip/kio/kdirlister.sip @@ -101,8 +101,8 @@ signals: void refreshItems (const KFileItemList&); void infoMessage (const TQString&); void percent (int); - void totalSize (KIO::filesize_t); - void processedSize (KIO::filesize_t); + void totalSize (TDEIO::filesize_t); + void processedSize (TDEIO::filesize_t); void speed (int); protected: @@ -116,7 +116,7 @@ protected: %End virtual bool validURL (const KURL&) const; - virtual void handleError (KIO::Job*); + virtual void handleError (TDEIO::Job*); protected: //igx virtual void virtual_hook (int, void*); diff --git a/sip/kio/kfileitem.sip b/sip/kio/kfileitem.sip index 985efdf..3cf982b 100644 --- a/sip/kio/kfileitem.sip +++ b/sip/kio/kfileitem.sip @@ -38,7 +38,7 @@ public: Unknown }; - KFileItem (const KIO::UDSEntry&, const KURL&, bool = 0, bool = 0); + KFileItem (const TDEIO::UDSEntry&, const KURL&, bool = 0, bool = 0); KFileItem (mode_t, mode_t, const KURL&, bool = 0); KFileItem (const KURL&, const TQString&, mode_t); KFileItem (const KFileItem&); @@ -83,10 +83,10 @@ public: TQString localPath () const; %End - KIO::filesize_t size () const; + TDEIO::filesize_t size () const; %If ( KDE_3_5_0 - ) - KIO::filesize_t size (bool& /Out/) const /PyName=sizeAndExists/; + TDEIO::filesize_t size (bool& /Out/) const /PyName=sizeAndExists/; %End time_t time (uint) const; @@ -111,7 +111,7 @@ public: TQString getToolTipText (int = 6); bool acceptsDrops (); void run (); - const KIO::UDSEntry& entry () const; + const TDEIO::UDSEntry& entry () const; bool isMarked () const; void mark (); void unmark (); @@ -130,7 +130,7 @@ public: void assign (const KFileItem&); %If ( KDE_3_4_3 - ) - void setUDSEntry (const KIO::UDSEntry&, const KURL&, bool = 0, bool = 0); + void setUDSEntry (const TDEIO::UDSEntry&, const KURL&, bool = 0, bool = 0); %End diff --git a/sip/kio/kmimetype.sip b/sip/kio/kmimetype.sip index 2cfbd86..34ece6b 100644 --- a/sip/kio/kmimetype.sip +++ b/sip/kio/kmimetype.sip @@ -195,10 +195,10 @@ public: static TQValueList<KDEDesktopMimeType::Service> userDefinedServices (const TQString&, bool); %If ( KDE_3_4_0 - ) - static TQValueList<KDEDesktopMimeType::Service> userDefinedServices (const TQString&, KConfig&, bool); + static TQValueList<KDEDesktopMimeType::Service> userDefinedServices (const TQString&, TDEConfig&, bool); %If ( KDE_3_5_0 - ) - static TQValueList<KDEDesktopMimeType::Service> userDefinedServices (const TQString&, KConfig&, bool, const KURL::List&); + static TQValueList<KDEDesktopMimeType::Service> userDefinedServices (const TQString&, TDEConfig&, bool, const KURL::List&); %End %End diff --git a/sip/kio/kprotocolmanager.sip b/sip/kio/kprotocolmanager.sip index 093e537..7713c88 100644 --- a/sip/kio/kprotocolmanager.sip +++ b/sip/kio/kprotocolmanager.sip @@ -74,7 +74,7 @@ public: static int maxCacheAge (); static int maxCacheSize (); static TQString cacheDir (); - static KIO::CacheControl cacheControl (); + static TDEIO::CacheControl cacheControl (); static bool autoResume (); static bool markPartial (); static int minimumKeepSize (); @@ -86,7 +86,7 @@ public: static bool persistentConnections (); static void reparseConfiguration (); static TQString slaveProtocol (const KURL&, TQString&); - static KConfig* config (); + static TDEConfig* config (); public: diff --git a/sip/kio/krun.sip b/sip/kio/krun.sip index e180301..4cfc58d 100644 --- a/sip/kio/krun.sip +++ b/sip/kio/krun.sip @@ -144,9 +144,9 @@ signals: protected slots: void slotTimeout (); - void slotScanFinished (KIO::Job*); - void slotScanMimeType (KIO::Job*, const TQString&); - virtual void slotStatResult (KIO::Job*); + void slotScanFinished (TDEIO::Job*); + void slotScanMimeType (TDEIO::Job*, const TQString&); + virtual void slotStatResult (TDEIO::Job*); protected: virtual void init (); diff --git a/sip/kio/kshred.sip b/sip/kio/kshred.sip index 966a3bf..33a1b35 100644 --- a/sip/kio/kshred.sip +++ b/sip/kio/kshred.sip @@ -42,7 +42,7 @@ public: static bool shred (TQString); signals: - void processedSize (KIO::filesize_t); + void processedSize (TDEIO::filesize_t); void infoMessage (const TQString&); }; // class KShred diff --git a/sip/kio/kurifilter.sip b/sip/kio/kurifilter.sip index ad87fa0..125ab82 100644 --- a/sip/kio/kurifilter.sip +++ b/sip/kio/kurifilter.sip @@ -102,7 +102,7 @@ public: virtual TQString name () const; virtual double priority () const; virtual bool filterURI (KURIFilterData&) const = 0; - virtual KCModule* configModule (TQWidget*, const char*) const; + virtual TDECModule* configModule (TQWidget*, const char*) const; virtual TQString configName () const; protected: diff --git a/sip/kio/kurlcompletion.sip b/sip/kio/kurlcompletion.sip index 237fb44..b270129 100644 --- a/sip/kio/kurlcompletion.sip +++ b/sip/kio/kurlcompletion.sip @@ -71,8 +71,8 @@ protected: protected slots: - void slotEntries (KIO::Job*, const KIO::UDSEntryList&); - void slotIOFinished (KIO::Job*); + void slotEntries (TDEIO::Job*, const TDEIO::UDSEntryList&); + void slotIOFinished (TDEIO::Job*); protected: //igx virtual void virtual_hook (int, void*); diff --git a/sip/kio/metainfojob.sip b/sip/kio/metainfojob.sip index 1abee91..3433bd3 100644 --- a/sip/kio/metainfojob.sip +++ b/sip/kio/metainfojob.sip @@ -25,10 +25,10 @@ %If ( KDE_3_1_0 - ) -namespace KIO +namespace TDEIO { -class MetaInfoJob : KIO::Job +class MetaInfoJob : TDEIO::Job { %TypeHeaderCode #include <kfileitem.h> @@ -51,13 +51,13 @@ protected: void getMetaInfo (); protected slots: - virtual void slotResult (KIO::Job*); + virtual void slotResult (TDEIO::Job*); }; // class MetaInfoJob -KIO::MetaInfoJob* fileMetaInfo (const KFileItemList&); -KIO::MetaInfoJob* fileMetaInfo (const KURL::List&); -}; // namespace KIO +TDEIO::MetaInfoJob* fileMetaInfo (const KFileItemList&); +TDEIO::MetaInfoJob* fileMetaInfo (const KURL::List&); +}; // namespace TDEIO %End diff --git a/sip/kio/netaccess.sip b/sip/kio/netaccess.sip index cbe0869..840c621 100644 --- a/sip/kio/netaccess.sip +++ b/sip/kio/netaccess.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class NetAccess : TQObject @@ -76,12 +76,12 @@ public: static bool exists (const KURL&, bool); %If ( KDE_3_2_0 - ) - static bool stat (const KURL&, KIO::UDSEntry&, TQWidget*); + static bool stat (const KURL&, TDEIO::UDSEntry&, TQWidget*); %End %End - static bool stat (const KURL&, KIO::UDSEntry&); + static bool stat (const KURL&, TDEIO::UDSEntry&); %If ( KDE_3_5_0 - ) static KURL mostLocalURL (const KURL&, TQWidget*); @@ -104,7 +104,7 @@ public: static TQString fish_execute (const KURL&, const TQString, TQWidget*); %If ( KDE_3_3_1 - ) - static bool synchronousRun (KIO::Job*, TQWidget*, TQByteArray* = 0, KURL* = 0, TQMap<TQString,TQString>* = 0); + static bool synchronousRun (TDEIO::Job*, TQWidget*, TQByteArray* = 0, KURL* = 0, TQMap<TQString,TQString>* = 0); %End static TQString mimetype (const KURL&, TQWidget*); @@ -124,5 +124,5 @@ private: }; // class NetAccess -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/observer.sip b/sip/kio/observer.sip index 47fe218..36aeae5 100644 --- a/sip/kio/observer.sip +++ b/sip/kio/observer.sip @@ -42,52 +42,52 @@ public: public: static Observer* self (); - int newJob (KIO::Job*, bool); + int newJob (TDEIO::Job*, bool); void jobFinished (int); bool openPassDlg (const TQString&, TQString&, TQString&, bool); - bool openPassDlg (KIO::AuthInfo&); + bool openPassDlg (TDEIO::AuthInfo&); int messageBox (int, int, const TQString&, const TQString&, const TQString&, const TQString&); %If ( KDE_3_3_0 - ) static int messageBox (int, int, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&); %End - KIO::RenameDlg_Result open_RenameDlg (KIO::Job*, const TQString&, const TQString&, const TQString&, KIO::RenameDlg_Mode, TQString&, KIO::filesize_t = -1, KIO::filesize_t = -1, time_t = -1, time_t = -1, time_t = -1, time_t = -1); - KIO::SkipDlg_Result open_SkipDlg (KIO::Job*, bool, const TQString&); + TDEIO::RenameDlg_Result open_RenameDlg (TDEIO::Job*, const TQString&, const TQString&, const TQString&, TDEIO::RenameDlg_Mode, TQString&, TDEIO::filesize_t = -1, TDEIO::filesize_t = -1, time_t = -1, time_t = -1, time_t = -1, time_t = -1); + TDEIO::SkipDlg_Result open_SkipDlg (TDEIO::Job*, bool, const TQString&); public: void killJob (int); - KIO::MetaData metadata (int); + TDEIO::MetaData metadata (int); protected: Observer (); ~Observer (); public slots: - void slotTotalSize (KIO::Job*, KIO::filesize_t); - void slotTotalFiles (KIO::Job*, ulong); - void slotTotalDirs (KIO::Job*, ulong); - void slotProcessedSize (KIO::Job*, KIO::filesize_t); - void slotProcessedFiles (KIO::Job*, ulong); - void slotProcessedDirs (KIO::Job*, ulong); - void slotSpeed (KIO::Job*, ulong); - void slotPercent (KIO::Job*, ulong); - void slotInfoMessage (KIO::Job*, const TQString&); - void slotCopying (KIO::Job*, const KURL&, const KURL&); - void slotMoving (KIO::Job*, const KURL&, const KURL&); - void slotDeleting (KIO::Job*, const KURL&); + void slotTotalSize (TDEIO::Job*, TDEIO::filesize_t); + void slotTotalFiles (TDEIO::Job*, ulong); + void slotTotalDirs (TDEIO::Job*, ulong); + void slotProcessedSize (TDEIO::Job*, TDEIO::filesize_t); + void slotProcessedFiles (TDEIO::Job*, ulong); + void slotProcessedDirs (TDEIO::Job*, ulong); + void slotSpeed (TDEIO::Job*, ulong); + void slotPercent (TDEIO::Job*, ulong); + void slotInfoMessage (TDEIO::Job*, const TQString&); + void slotCopying (TDEIO::Job*, const KURL&, const KURL&); + void slotMoving (TDEIO::Job*, const KURL&, const KURL&); + void slotDeleting (TDEIO::Job*, const KURL&); %If ( KDE_3_1_0 - ) - void slotTransferring (KIO::Job*, const KURL&); + void slotTransferring (TDEIO::Job*, const KURL&); %End - void slotCreatingDir (KIO::Job*, const KURL&); - void slotCanResume (KIO::Job*, KIO::filesize_t); + void slotCreatingDir (TDEIO::Job*, const KURL&); + void slotCanResume (TDEIO::Job*, TDEIO::filesize_t); public: - void stating (KIO::Job*, const KURL&); - void mounting (KIO::Job*, const TQString&, const TQString&); - void unmounting (KIO::Job*, const TQString&); + void stating (TDEIO::Job*, const KURL&); + void mounting (TDEIO::Job*, const TQString&, const TQString&); + void unmounting (TDEIO::Job*, const TQString&); protected: //igx virtual void virtual_hook (int, void*); diff --git a/sip/kio/passdlg.sip b/sip/kio/passdlg.sip index 1a4d96d..d7a4844 100644 --- a/sip/kio/passdlg.sip +++ b/sip/kio/passdlg.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class PasswordDialog : KDialogBase @@ -64,5 +64,5 @@ protected: }; // class PasswordDialog -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/paste.sip b/sip/kio/paste.sip index 64deae4..d39282c 100644 --- a/sip/kio/paste.sip +++ b/sip/kio/paste.sip @@ -27,19 +27,19 @@ #include <paste.h> %End -namespace KIO +namespace TDEIO { -KIO::Job* pasteClipboard (const KURL&, bool = 0); +TDEIO::Job* pasteClipboard (const KURL&, bool = 0); void pasteData (const KURL&, const TQByteArray&); %If ( KDE_3_2_0 - ) -KIO::CopyJob* pasteDataAsync (const KURL&, const TQByteArray&); +TDEIO::CopyJob* pasteDataAsync (const KURL&, const TQByteArray&); %If ( KDE_3_3_0 - ) -KIO::CopyJob* pasteDataAsync (const KURL&, const TQByteArray&, const TQString&); +TDEIO::CopyJob* pasteDataAsync (const KURL&, const TQByteArray&, const TQString&); %If ( KDE_3_5_0 - ) -KIO::CopyJob* pasteMimeSource (TQMimeSource*, const KURL&, const TQString&, TQWidget*, bool = 0); +TDEIO::CopyJob* pasteMimeSource (TQMimeSource*, const KURL&, const TQString&, TQWidget*, bool = 0); %End %End @@ -52,5 +52,5 @@ bool isClipboardEmpty (); TQString pasteActionText (); %End -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/previewjob.sip b/sip/kio/previewjob.sip index 195b634..c4e2011 100644 --- a/sip/kio/previewjob.sip +++ b/sip/kio/previewjob.sip @@ -23,10 +23,10 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { -class PreviewJob : KIO::Job +class PreviewJob : TDEIO::Job { %TypeHeaderCode #include <previewjob.h> @@ -59,14 +59,14 @@ protected: void createThumbnail (TQString); protected slots: - virtual void slotResult (KIO::Job*); + virtual void slotResult (TDEIO::Job*); protected: //igx virtual void virtual_hook (int, void*); }; // class PreviewJob -KIO::PreviewJob* filePreview (const KFileItemList&, int, int = 0, int = 0, int = 70, bool = 1, bool = 1, const TQStringList* = 0); -KIO::PreviewJob* filePreview (const KURL::List&, int, int = 0, int = 0, int = 70, bool = 1, bool = 1, const TQStringList* = 0); -}; // namespace KIO +TDEIO::PreviewJob* filePreview (const KFileItemList&, int, int = 0, int = 0, int = 70, bool = 1, bool = 1, const TQStringList* = 0); +TDEIO::PreviewJob* filePreview (const KURL::List&, int, int = 0, int = 0, int = 70, bool = 1, bool = 1, const TQStringList* = 0); +}; // namespace TDEIO diff --git a/sip/kio/progressbase.sip b/sip/kio/progressbase.sip index 2dd106f..5392383 100644 --- a/sip/kio/progressbase.sip +++ b/sip/kio/progressbase.sip @@ -27,7 +27,7 @@ #include <progressbase.h> %End -namespace KIO +namespace TDEIO { enum Progress @@ -47,9 +47,9 @@ class ProgressBase : TQWidget public: ProgressBase (TQWidget* /TransferThis/); - void setJob (KIO::Job*); - void setJob (KIO::CopyJob*); - void setJob (KIO::DeleteJob*); + void setJob (TDEIO::Job*); + void setJob (TDEIO::CopyJob*); + void setJob (TDEIO::DeleteJob*); void setStopOnClose (bool); bool stopOnClose () const; void setOnlyClean (bool); @@ -63,25 +63,25 @@ public: public slots: void slotStop (); virtual void slotClean (); - virtual void slotTotalSize (KIO::Job*, KIO::filesize_t); - virtual void slotTotalFiles (KIO::Job*, ulong); - virtual void slotTotalDirs (KIO::Job*, ulong); - virtual void slotProcessedSize (KIO::Job*, KIO::filesize_t); - virtual void slotProcessedFiles (KIO::Job*, ulong); - virtual void slotProcessedDirs (KIO::Job*, ulong); - virtual void slotSpeed (KIO::Job*, ulong); - virtual void slotPercent (KIO::Job*, ulong); - virtual void slotCopying (KIO::Job*, const KURL&, const KURL&); - virtual void slotMoving (KIO::Job*, const KURL&, const KURL&); - virtual void slotDeleting (KIO::Job*, const KURL&); - virtual void slotCreatingDir (KIO::Job*, const KURL&); - virtual void slotCanResume (KIO::Job*, KIO::filesize_t); + virtual void slotTotalSize (TDEIO::Job*, TDEIO::filesize_t); + virtual void slotTotalFiles (TDEIO::Job*, ulong); + virtual void slotTotalDirs (TDEIO::Job*, ulong); + virtual void slotProcessedSize (TDEIO::Job*, TDEIO::filesize_t); + virtual void slotProcessedFiles (TDEIO::Job*, ulong); + virtual void slotProcessedDirs (TDEIO::Job*, ulong); + virtual void slotSpeed (TDEIO::Job*, ulong); + virtual void slotPercent (TDEIO::Job*, ulong); + virtual void slotCopying (TDEIO::Job*, const KURL&, const KURL&); + virtual void slotMoving (TDEIO::Job*, const KURL&, const KURL&); + virtual void slotDeleting (TDEIO::Job*, const KURL&); + virtual void slotCreatingDir (TDEIO::Job*, const KURL&); + virtual void slotCanResume (TDEIO::Job*, TDEIO::filesize_t); signals: void stopped (); protected slots: - void slotFinished (KIO::Job*); + void slotFinished (TDEIO::Job*); protected: virtual void closeEvent (TQCloseEvent*); @@ -91,5 +91,5 @@ protected: }; // class ProgressBase -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/renamedlg.sip b/sip/kio/renamedlg.sip index 5890497..a4a4f51 100644 --- a/sip/kio/renamedlg.sip +++ b/sip/kio/renamedlg.sip @@ -27,7 +27,7 @@ #include <renamedlg.h> %End -namespace KIO +namespace TDEIO { enum RenameDlg_Mode @@ -57,11 +57,11 @@ enum RenameDlg_Result //ig class RenameDlg : TQDialog; -//ig KIO::RenameDlg_Result open_RenameDlg (const TQString&, const TQString&, const TQString&, KIO::RenameDlg_Mode, TQString&, KIO::filesize_t = (KIO ::filesize_t )-1 , KIO::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 = (KIO ::filesize_t )-1 , TDEIO::filesize_t = (KIO ::filesize_t )-1 , time_t = -1 , time_t = -1 , time_t = -1 , time_t = -1 ); %If ( - KDE_3_1_5 ) -//ig KIO::RenameDlg_Result open_RenameDlg (const TQString&, const TQString&, const TQString&, KIO::RenameDlg_Mode, TQString&, ulong = -1, ulong = -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&, ulong = -1, ulong = -1, time_t = -1, time_t = -1, time_t = -1, time_t = -1); %End -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/renamedlgplugin.sip b/sip/kio/renamedlgplugin.sip index 24e96ee..6891a08 100644 --- a/sip/kio/renamedlgplugin.sip +++ b/sip/kio/renamedlgplugin.sip @@ -33,7 +33,7 @@ class RenameDlgPlugin : TQWidget public: RenameDlgPlugin (TQDialog*, const char*, const TQStringList& = TQStringList ()); - virtual bool initialize (KIO::RenameDlg_Mode, const TQString&, const TQString&, const TQString&, const TQString&, KIO::filesize_t, KIO::filesize_t, time_t, time_t, time_t, time_t); + virtual bool initialize (TDEIO::RenameDlg_Mode, const TQString&, const TQString&, const TQString&, const TQString&, TDEIO::filesize_t, TDEIO::filesize_t, time_t, time_t, time_t, time_t); }; // class RenameDlgPlugin diff --git a/sip/kio/scheduler.sip b/sip/kio/scheduler.sip index 1ec06f0..4459906 100644 --- a/sip/kio/scheduler.sip +++ b/sip/kio/scheduler.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class Scheduler : TQObject, DCOPObject @@ -34,21 +34,21 @@ class Scheduler : TQObject, DCOPObject public: -//ig typedef TQPtrList<KIO::SimpleJob> JobList; - static void doJob (KIO::SimpleJob*); - static void scheduleJob (KIO::SimpleJob*); - static void cancelJob (KIO::SimpleJob*); - static void jobFinished (KIO::SimpleJob*, KIO::Slave*); - static void putSlaveOnHold (KIO::SimpleJob*, const KURL&); +//ig typedef TQPtrList<TDEIO::SimpleJob> JobList; + static void doJob (TDEIO::SimpleJob*); + static void scheduleJob (TDEIO::SimpleJob*); + static void cancelJob (TDEIO::SimpleJob*); + static void jobFinished (TDEIO::SimpleJob*, TDEIO::Slave*); + static void putSlaveOnHold (TDEIO::SimpleJob*, const KURL&); static void removeSlaveOnHold (); static void publishSlaveOnHold (); //doc // There is no default value for config (KIO.MetaData) - pass an // empty Python dict if you need the default value //end - static KIO::Slave* getConnectedSlave (const KURL&, const KIO::MetaData&); - static bool assignJobToSlave (KIO::Slave*, KIO::SimpleJob*); - static bool disconnectSlave (KIO::Slave*); + static TDEIO::Slave* getConnectedSlave (const KURL&, const TDEIO::MetaData&); + static bool assignJobToSlave (TDEIO::Slave*, TDEIO::SimpleJob*); + static bool disconnectSlave (TDEIO::Slave*); %If ( KDE_3_1_0 - ) static void registerWindow (TQWidget*); @@ -69,16 +69,16 @@ public: virtual QCStringList functions (); public slots: - void slotSlaveDied (KIO::Slave*); + void slotSlaveDied (TDEIO::Slave*); void slotSlaveStatus (pid_t, const TQCString&, const TQString&, bool); signals: - void slaveConnected (KIO::Slave*); - void slaveError (KIO::Slave*, int, const TQString&); + void slaveConnected (TDEIO::Slave*); + void slaveError (TDEIO::Slave*, int, const TQString&); protected: - void setupSlave (KIO::Slave*, const KURL&, const TQString&, const TQString&, bool, const KIO::MetaData* = 0); -//ig bool startJobScheduled (KIO::Scheduler::ProtocolInfo*); + void setupSlave (TDEIO::Slave*, const KURL&, const TQString&, const TQString&, bool, const TDEIO::MetaData* = 0); +//ig bool startJobScheduled (TDEIO::Scheduler::ProtocolInfo*); bool startJobDirect (); Scheduler (); @@ -95,12 +95,12 @@ protected slots: private: - Scheduler (const KIO::Scheduler&); + Scheduler (const TDEIO::Scheduler&); protected: //igx virtual void virtual_hook (int, void*); }; // class Scheduler -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/sessiondata.sip b/sip/kio/sessiondata.sip index ba8d723..507a2c3 100644 --- a/sip/kio/sessiondata.sip +++ b/sip/kio/sessiondata.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class SessionData : TQObject @@ -35,7 +35,7 @@ class SessionData : TQObject public: SessionData (); - virtual void configDataFor (KIO::MetaData&, const TQString&, const TQString&); + virtual void configDataFor (TDEIO::MetaData&, const TQString&, const TQString&); virtual void reset (); public slots: @@ -47,5 +47,5 @@ protected: }; // class SessionData -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/skipdlg.sip b/sip/kio/skipdlg.sip index c0f4ac2..75085e6 100644 --- a/sip/kio/skipdlg.sip +++ b/sip/kio/skipdlg.sip @@ -27,7 +27,7 @@ #include <skipdlg.h> %End -namespace KIO +namespace TDEIO { enum SkipDlg_Result @@ -37,9 +37,9 @@ enum SkipDlg_Result S_CANCEL }; -//ig KIO::SkipDlg_Result open_SkipDlg (bool, const TQString& = TQString ::null ); +//ig TDEIO::SkipDlg_Result open_SkipDlg (bool, const TQString& = TQString ::null ); //ig class SkipDlg : KDialog; -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/slave.sip b/sip/kio/slave.sip index e2d4961..1acea8d 100644 --- a/sip/kio/slave.sip +++ b/sip/kio/slave.sip @@ -23,10 +23,10 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { -class Slave : KIO::SlaveInterface +class Slave : TDEIO::SlaveInterface { %TypeHeaderCode #include <slave.h> @@ -36,19 +36,19 @@ class Slave : KIO::SlaveInterface protected: %If ( KDE_3_2_0 - ) - Slave (bool, KServerSocket*, const TQString&, const TQString&); + Slave (bool, TDEServerSocket*, const TQString&, const TQString&); %End public: - Slave (KServerSocket*, const TQString&, const TQString&); + Slave (TDEServerSocket*, const TQString&, const TQString&); void setPID (pid_t); int slave_pid (); void kill (); bool isAlive (); void setHost (const TQString&, int, const TQString&, const TQString&); void resetHost (); - void setConfig (const KIO::MetaData&); + void setConfig (const TDEIO::MetaData&); TQString protocol (); void setProtocol (const TQString&); TQString slaveProtocol (); @@ -56,8 +56,8 @@ public: int port (); TQString user (); TQString passwd (); - static KIO::Slave* createSlave (const TQString&, const KURL&, int& /Out/, TQString& /Out/); - static KIO::Slave* holdSlave (const TQString&, const KURL&); + static TDEIO::Slave* createSlave (const TQString&, const KURL&, int& /Out/, TQString& /Out/); + static TDEIO::Slave* holdSlave (const TQString&, const KURL&); void suspend (); void resume (); bool suspended (); @@ -71,17 +71,17 @@ public: void setIdle (); bool isConnected (); void setConnected (bool); - KIO::Connection* connection (); + TDEIO::Connection* connection (); void ref (); void deref (); public slots: - void accept (KSocket*); + void accept (TDESocket*); void gotInput (); void timeout (); signals: - void slaveDied (KIO::Slave*); + void slaveDied (TDEIO::Slave*); protected: void unlinkSocket (); @@ -91,5 +91,5 @@ protected: }; // class Slave -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/slavebase.sip b/sip/kio/slavebase.sip index 6d7d68e..3a8bd05 100644 --- a/sip/kio/slavebase.sip +++ b/sip/kio/slavebase.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class SlaveBase @@ -41,8 +41,8 @@ public: %End void dispatchLoop (); - void setConnection (KIO::Connection*); - KIO::Connection* connection () const; + void setConnection (TDEIO::Connection*); + TDEIO::Connection* connection () const; void data (const TQByteArray&); void dataReq (); void error (int, const TQString&); @@ -50,12 +50,12 @@ public: void finished (); void needSubURLData (); void slaveStatus (const TQString&, bool); - void statEntry (const KIO::UDSEntry&); - void listEntries (const KIO::UDSEntryList&); - bool canResume (KIO::filesize_t); + void statEntry (const TDEIO::UDSEntry&); + void listEntries (const TDEIO::UDSEntryList&); + bool canResume (TDEIO::filesize_t); void canResume (); - void totalSize (KIO::filesize_t); - void processedSize (KIO::filesize_t); + void totalSize (TDEIO::filesize_t); + void processedSize (TDEIO::filesize_t); void processedPercent (float); void speed (ulong); void redirection (const KURL&); @@ -74,10 +74,10 @@ public: SSLMessageBox }; - int messageBox (KIO::SlaveBase::MessageBoxType, const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null , const TQString& = TQString ::null ); + int messageBox (TDEIO::SlaveBase::MessageBoxType, const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null , const TQString& = TQString ::null ); %If ( KDE_3_3_0 - ) - int messageBox (const TQString&, KIO::SlaveBase::MessageBoxType, const TQString& = TQString ::null , const TQString& = TQString ::null , const TQString& = TQString ::null , const TQString& = TQString ::null ); + int messageBox (const TQString&, TDEIO::SlaveBase::MessageBoxType, const TQString& = TQString ::null , const TQString& = TQString ::null , const TQString& = TQString ::null , const TQString& = TQString ::null ); %End void setMetaData (const TQString&, const TQString&); @@ -85,10 +85,10 @@ public: TQString metaData (const TQString&); %If ( KDE_3_5_2 - ) - KIO::MetaData allMetaData () const; + TDEIO::MetaData allMetaData () const; %End - KConfigBase* config (); + TDEConfigBase* config (); %If ( KDE_3_3_0 - ) KRemoteEncoding* remoteEncoding (); @@ -129,13 +129,13 @@ public: int readData (TQByteArray&); %If ( KDE_3_1_0 - ) - void listEntry (const KIO::UDSEntry&, bool); + void listEntry (const TDEIO::UDSEntry&, bool); void connectSlave (const TQString&); void disconnectSlave (); - bool openPassDlg (KIO::AuthInfo&, const TQString&); - bool openPassDlg (KIO::AuthInfo&); - bool checkCachedAuthentication (KIO::AuthInfo&); - bool cacheAuthentication (const KIO::AuthInfo&); + bool openPassDlg (TDEIO::AuthInfo&, const TQString&); + bool openPassDlg (TDEIO::AuthInfo&); + bool checkCachedAuthentication (TDEIO::AuthInfo&); + bool cacheAuthentication (const TDEIO::AuthInfo&); bool pingCacheDaemon () const; TQString createAuthCacheKey (const KURL&); void sendAuthenticationKey (const TQCString&, const TQCString&, bool); @@ -148,9 +148,9 @@ public: int waitForAnswer (int, int, TQByteArray&, int* = 0); void sendMetaData (); TQCString mProtocol; - KIO::Connection* m_pConnection; - KIO::MetaData mOutgoingMetaData; - KIO::MetaData mIncomingMetaData; + TDEIO::Connection* m_pConnection; + TDEIO::MetaData mOutgoingMetaData; + TDEIO::MetaData mIncomingMetaData; bool wasKilled () const; void setKillFlag (); %End @@ -162,13 +162,13 @@ protected: protected: %If ( - KDE_3_1_0 ) - void listEntry (const KIO::UDSEntry&, bool); + void listEntry (const TDEIO::UDSEntry&, bool); void connectSlave (const TQString&); void disconnectSlave (); bool pingCacheDaemon () const; - bool openPassDlg (KIO::AuthInfo&); - bool checkCachedAuthentication (KIO::AuthInfo&); - bool cacheAuthentication (const KIO::AuthInfo&); + bool openPassDlg (TDEIO::AuthInfo&); + bool checkCachedAuthentication (TDEIO::AuthInfo&); + bool cacheAuthentication (const TDEIO::AuthInfo&); TQString createAuthCacheKey (const KURL&); void sendAuthenticationKey (const TQCString&, const TQCString&, bool); void delCachedAuthentication (const TQString&); @@ -183,5 +183,5 @@ protected: }; // class SlaveBase -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/slaveconfig.sip b/sip/kio/slaveconfig.sip index d8d2d10..c5789b7 100644 --- a/sip/kio/slaveconfig.sip +++ b/sip/kio/slaveconfig.sip @@ -23,7 +23,7 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { class SlaveConfig : TQObject @@ -34,10 +34,10 @@ class SlaveConfig : TQObject public: - static KIO::SlaveConfig* self (); + static TDEIO::SlaveConfig* self (); void setConfigData (const TQString&, const TQString&, const TQString&, const TQString&); - void setConfigData (const TQString&, const TQString&, const KIO::MetaData&); - KIO::MetaData configData (const TQString&, const TQString&); + void setConfigData (const TQString&, const TQString&, const TDEIO::MetaData&); + TDEIO::MetaData configData (const TQString&, const TQString&); TQString configData (const TQString&, const TQString&, const TQString&); void reset (); @@ -49,5 +49,5 @@ protected: }; // class SlaveConfig -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/slaveinterface.sip b/sip/kio/slaveinterface.sip index 80e2251..6eca9bc 100644 --- a/sip/kio/slaveinterface.sip +++ b/sip/kio/slaveinterface.sip @@ -27,7 +27,7 @@ #include <slaveinterface.h> %End -namespace KIO +namespace TDEIO { enum Info @@ -82,14 +82,14 @@ class SlaveInterface : TQObject public: - SlaveInterface (KIO::Connection*); - void setConnection (KIO::Connection*); - KIO::Connection* connection () const; + SlaveInterface (TDEIO::Connection*); + void setConnection (TDEIO::Connection*); + TDEIO::Connection* connection () const; void setProgressId (int); int progressId () const; void sendResumeAnswer (bool); - void setOffset (KIO::filesize_t); - KIO::filesize_t offset () const; + void setOffset (TDEIO::filesize_t); + TDEIO::filesize_t offset () const; signals: void data (const TQByteArray&); @@ -98,14 +98,14 @@ signals: void connected (); void finished (); void slaveStatus (pid_t, const TQCString&, const TQString&, bool); - void listEntries (const KIO::UDSEntryList&); - void statEntry (const KIO::UDSEntry&); + void listEntries (const TDEIO::UDSEntryList&); + void statEntry (const TDEIO::UDSEntry&); void needSubURLData (); void needProgressId (); - void canResume (KIO::filesize_t); - void metaData (const KIO::MetaData&); - void totalSize (KIO::filesize_t); - void processedSize (KIO::filesize_t); + void canResume (TDEIO::filesize_t); + void metaData (const TDEIO::MetaData&); + void totalSize (TDEIO::filesize_t); + void processedSize (TDEIO::filesize_t); void redirection (const KURL&); void speed (ulong); void errorPage (); @@ -119,7 +119,7 @@ signals: protected: virtual bool dispatch (); virtual bool dispatch (int, const TQByteArray&); - void openPassDlg (KIO::AuthInfo&); + void openPassDlg (TDEIO::AuthInfo&); void openPassDlg (const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool); void openPassDlg (const TQString&, const TQString&, bool); void messageBox (int, const TQString&, const TQString&, const TQString&, const TQString&); @@ -179,10 +179,10 @@ enum Command %End -}; // namespace KIO +}; // namespace TDEIO %If ( KDE_3_1_4 - ) -//igx TQDataStream& operator << (TQDataStream&, const KIO::UDSEntry&); -//igx TQDataStream& operator >> (TQDataStream&, KIO::UDSEntry&); +//igx TQDataStream& operator << (TQDataStream&, const TDEIO::UDSEntry&); +//igx TQDataStream& operator >> (TQDataStream&, TDEIO::UDSEntry&); %End diff --git a/sip/kio/statusbarprogress.sip b/sip/kio/statusbarprogress.sip index 4fa221d..2e8d4f7 100644 --- a/sip/kio/statusbarprogress.sip +++ b/sip/kio/statusbarprogress.sip @@ -23,10 +23,10 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { -class StatusbarProgress : KIO::ProgressBase +class StatusbarProgress : TDEIO::ProgressBase { %TypeHeaderCode #include <statusbarprogress.h> @@ -35,13 +35,13 @@ class StatusbarProgress : KIO::ProgressBase public: StatusbarProgress (TQWidget* /TransferThis/, bool = 1); - void setJob (KIO::Job*); + void setJob (TDEIO::Job*); public slots: virtual void slotClean (); - virtual void slotTotalSize (KIO::Job*, KIO::filesize_t); - virtual void slotPercent (KIO::Job*, ulong); - virtual void slotSpeed (KIO::Job*, ulong); + virtual void slotTotalSize (TDEIO::Job*, TDEIO::filesize_t); + virtual void slotPercent (TDEIO::Job*, ulong); + virtual void slotSpeed (TDEIO::Job*, ulong); protected: void setMode (); @@ -52,5 +52,5 @@ protected: }; // class StatusbarProgress -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kio/tcpslavebase.sip b/sip/kio/tcpslavebase.sip index ec2c09d..deeb4e3 100644 --- a/sip/kio/tcpslavebase.sip +++ b/sip/kio/tcpslavebase.sip @@ -23,10 +23,10 @@ // If not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -namespace KIO +namespace TDEIO { -class TCPSlaveBase : KIO::SlaveBase +class TCPSlaveBase : TDEIO::SlaveBase { %TypeHeaderCode #include <tcpslavebase.h> @@ -87,5 +87,5 @@ protected: }; // class TCPSlaveBase -}; // namespace KIO +}; // namespace TDEIO diff --git a/sip/kparts/browserrun.sip b/sip/kparts/browserrun.sip index ad2b14c..d728ec8 100644 --- a/sip/kparts/browserrun.sip +++ b/sip/kparts/browserrun.sip @@ -100,14 +100,14 @@ protected: virtual void init (); %End - virtual void handleError (KIO::Job*); + virtual void handleError (TDEIO::Job*); //ig KParts::BrowserRun::NonEmbeddableResult handleNonEmbeddable (const TQString&); protected slots: - void slotBrowserScanFinished (KIO::Job*); - void slotBrowserMimetype (KIO::Job*, const TQString&); - void slotCopyToTempFileResult (KIO::Job*); - virtual void slotStatResult (KIO::Job*); + void slotBrowserScanFinished (TDEIO::Job*); + void slotBrowserMimetype (TDEIO::Job*, const TQString&); + void slotCopyToTempFileResult (TDEIO::Job*); + virtual void slotStatResult (TDEIO::Job*); protected: diff --git a/sip/kparts/part.sip b/sip/kparts/part.sip index 4b8ca81..188c134 100644 --- a/sip/kparts/part.sip +++ b/sip/kparts/part.sip @@ -141,13 +141,13 @@ public: bool closeStream (); signals: - void started (KIO::Job*); + void started (TDEIO::Job*); void completed (); void completed (bool); void canceled (const TQString&); protected slots: - void slotJobFinished (KIO::Job*); + void slotJobFinished (TDEIO::Job*); protected: virtual bool openFile () = 0; @@ -209,7 +209,7 @@ protected: virtual bool saveToURL (); protected slots: - void slotUploadFinished (KIO::Job*); + void slotUploadFinished (TDEIO::Job*); }; // class ReadWritePart diff --git a/sip/kresources/configpage.sip b/sip/kresources/configpage.sip index e1dbf52..5d7a1de 100644 --- a/sip/kresources/configpage.sip +++ b/sip/kresources/configpage.sip @@ -38,7 +38,7 @@ class ResourcePageInfo : KShared public: ResourcePageInfo (); //ig Manager<Resource>* mManager; - KConfig* mConfig; + TDEConfig* mConfig; }; // class ResourcePageInfo diff --git a/sip/kresources/factory.sip b/sip/kresources/factory.sip index b854414..e6555c8 100644 --- a/sip/kresources/factory.sip +++ b/sip/kresources/factory.sip @@ -38,7 +38,7 @@ class Factory public: static KRES::Factory* self (const TQString&); KRES::ConfigWidget* configWidget (const TQString&, TQWidget* = 0); - KRES::Resource* resource (const TQString&, const KConfig*); + KRES::Resource* resource (const TQString&, const TDEConfig*); TQStringList typeNames () const; TQString typeName (const TQString&) const; TQString typeDescription (const TQString&) const; diff --git a/sip/kresources/resource.sip b/sip/kresources/resource.sip index c4a067f..231cee2 100644 --- a/sip/kresources/resource.sip +++ b/sip/kresources/resource.sip @@ -38,8 +38,8 @@ class Resource : TQObject public: typedef TQValueList<KRES::Resource*> List; - Resource (const KConfig*); - virtual void writeConfig (KConfig*); + Resource (const TDEConfig*); + virtual void writeConfig (TDEConfig*); bool open (); void close (); bool isOpen () const; @@ -70,7 +70,7 @@ class PluginFactoryBase : KLibFactory public: - virtual KRES::Resource* resource (const KConfig*) = 0; + virtual KRES::Resource* resource (const TDEConfig*) = 0; virtual KRES::ConfigWidget* configWidget (TQWidget*) = 0; protected: diff --git a/sip/kutils/kcmoduleinfo.sip b/sip/kutils/kcmoduleinfo.sip index a983cd9..4664aa4 100644 --- a/sip/kutils/kcmoduleinfo.sip +++ b/sip/kutils/kcmoduleinfo.sip @@ -26,7 +26,7 @@ %If ( KDE_3_3_0 - ) -class KCModuleInfo +class TDECModuleInfo { %TypeHeaderCode #include <kcmoduleinfo.h> @@ -34,16 +34,16 @@ class KCModuleInfo public: - KCModuleInfo (const TQString&); - KCModuleInfo (KService::Ptr); - KCModuleInfo (const KCModuleInfo&); + TDECModuleInfo (const TQString&); + TDECModuleInfo (KService::Ptr); + TDECModuleInfo (const TDECModuleInfo&); %If ( KDE_3_4_0 - ) - KCModuleInfo (); + TDECModuleInfo (); %End - bool operator == (const KCModuleInfo&) const; - bool operator != (const KCModuleInfo&) const; + bool operator == (const TDECModuleInfo&) const; + bool operator != (const TDECModuleInfo&) const; TQString fileName () const; const TQStringList& keywords () const; @@ -85,7 +85,7 @@ protected: void setDocPath (const TQString&); void loadAll (); -}; // class KCModuleInfo +}; // class TDECModuleInfo %End diff --git a/sip/kutils/kcmoduleloader.sip b/sip/kutils/kcmoduleloader.sip index d001591..6a21295 100644 --- a/sip/kutils/kcmoduleloader.sip +++ b/sip/kutils/kcmoduleloader.sip @@ -26,7 +26,7 @@ %If ( KDE_3_3_0 - ) -class KCModuleLoader +class TDECModuleLoader { %TypeHeaderCode #include <kcmoduleloader.h> @@ -34,8 +34,8 @@ class KCModuleLoader public: - static KCModule* loadModule (const KCModuleInfo&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); - static KCModule* loadModule (const TQString&, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); + static TDECModule* loadModule (const TDECModuleInfo&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); + static TDECModule* loadModule (const TQString&, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); %If ( KDE_3_4_0 - ) @@ -47,21 +47,21 @@ public: Both }; - static KCModule* loadModule (const KCModuleInfo&, KCModuleLoader::ErrorReporting, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); - static KCModule* loadModule (const TQString&, KCModuleLoader::ErrorReporting, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); + static TDECModule* loadModule (const TDECModuleInfo&, TDECModuleLoader::ErrorReporting, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); + static TDECModule* loadModule (const TQString&, TDECModuleLoader::ErrorReporting, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); %End - static void unloadModule (const KCModuleInfo&); + static void unloadModule (const TDECModuleInfo&); static void showLastLoaderError (TQWidget*); %If ( KDE_3_4_0 - ) static bool testModule (const TQString&); - static bool testModule (const KCModuleInfo&); - static KCModule* reportError (KCModuleLoader::ErrorReporting, const TQString&, TQString, TQWidget*); + static bool testModule (const TDECModuleInfo&); + static TDECModule* reportError (TDECModuleLoader::ErrorReporting, const TQString&, TQString, TQWidget*); %End -}; // class KCModuleLoader +}; // class TDECModuleLoader %End diff --git a/sip/kutils/kcmoduleproxy.sip b/sip/kutils/kcmoduleproxy.sip index ea68785..6224c01 100644 --- a/sip/kutils/kcmoduleproxy.sip +++ b/sip/kutils/kcmoduleproxy.sip @@ -26,7 +26,7 @@ %If ( KDE_3_3_0 - ) -class KCModuleProxy : TQWidget +class TDECModuleProxy : TQWidget { %TypeHeaderCode #include <kcmoduleproxy.h> @@ -34,11 +34,11 @@ class KCModuleProxy : TQWidget public: - KCModuleProxy (const KCModuleInfo&, bool = 0, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); + TDECModuleProxy (const TDECModuleInfo&, bool = 0, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); %If ( KDE_3_4_0 - ) - KCModuleProxy (const TQString&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); - KCModuleProxy (const KService::Ptr&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); + TDECModuleProxy (const TQString&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); + TDECModuleProxy (const KService::Ptr&, bool = 1, TQWidget* = 0, const char* = 0, const TQStringList& = TQStringList ()); %End void load (); @@ -55,8 +55,8 @@ public: bool rootMode () const; %End - KCModule* realModule () const; - const KCModuleInfo& moduleInfo () const; + TDECModule* realModule () const; + const TDECModuleInfo& moduleInfo () const; %If ( KDE_3_4_0 - ) TQCString dcopName () const; @@ -76,7 +76,7 @@ signals: void changed (bool); %If ( KDE_3_4_0 - ) - void changed (KCModuleProxy*); + void changed (TDECModuleProxy*); void childClosed (); void quickHelpChanged (); %End @@ -86,7 +86,7 @@ protected: void showEvent (TQShowEvent*); %If ( KDE_3_4_0 - ) - void init (const KCModuleInfo&); + void init (const TDECModuleInfo&); void emitQuickHelpChanged (); %End @@ -98,7 +98,7 @@ public: %End -}; // class KCModuleProxy +}; // class TDECModuleProxy %End diff --git a/sip/kutils/kcmultidialog.sip b/sip/kutils/kcmultidialog.sip index 9ab17e4..3a1f511 100644 --- a/sip/kutils/kcmultidialog.sip +++ b/sip/kutils/kcmultidialog.sip @@ -38,7 +38,7 @@ public: KCMultiDialog (int, const TQString&, TQWidget* = 0, const char* = 0, bool = 0); KCMultiDialog (int, const KGuiItem&, const KGuiItem& = KGuiItem (), int = User2 , const TQString& = i18n ("Configure" ), TQWidget* = 0, const char* = 0, bool = 0); void addModule (const TQString&, bool = 1) /ReleaseGIL/; - void addModule (const KCModuleInfo&, TQStringList = TQStringList (), bool = 0); + void addModule (const TDECModuleInfo&, TQStringList = TQStringList (), bool = 0); void removeAllModules (); void show (); @@ -63,7 +63,7 @@ private: // must be sorted by name. static sipStringTypeClassMap map[] = { -{sipName_KCModuleProxy, &sipClass_KCModuleProxy}, +{sipName_TDECModuleProxy, &sipClass_TDECModuleProxy}, {sipName_KCMultiDialog, &sipClass_KCMultiDialog}, {sipName_KFind, &sipClass_KFind}, {sipName_KFindDialog, &sipClass_KFindDialog}, diff --git a/sip/kutils/kplugininfo.sip b/sip/kutils/kplugininfo.sip index 20dee1f..c2ef478 100644 --- a/sip/kutils/kplugininfo.sip +++ b/sip/kutils/kplugininfo.sip @@ -37,9 +37,9 @@ public: typedef TQValueList<KPluginInfo*> List; KPluginInfo (const TQString&, const char* = 0); KPluginInfo (const KService::Ptr); - static KPluginInfo::List fromServices (const KService::List&, KConfig* = 0, const TQString& = TQString ::null ); - static KPluginInfo::List fromFiles (const TQStringList&, KConfig* = 0, const TQString& = TQString ::null ); - static KPluginInfo::List fromKPartsInstanceName (const TQString&, KConfig* = 0, const TQString& = TQString ::null ); + static KPluginInfo::List fromServices (const KService::List&, TDEConfig* = 0, const TQString& = TQString ::null ); + static KPluginInfo::List fromFiles (const TQStringList&, TDEConfig* = 0, const TQString& = TQString ::null ); + static KPluginInfo::List fromKPartsInstanceName (const TQString&, TDEConfig* = 0, const TQString& = TQString ::null ); bool isHidden () const; virtual void setPluginEnabled (bool); virtual bool isPluginEnabled () const; @@ -60,11 +60,11 @@ public: const TQStringList& dependencies () const; KService::Ptr service () const; //ig const TQValueList<KService::Ptr>& kcmServices () const; - void setConfig (KConfig*, const TQString&); - KConfig* config () const; + void setConfig (TDEConfig*, const TQString&); + TDEConfig* config () const; const TQString& configgroup () const; - virtual void save (KConfigGroup* = 0); - virtual void load (KConfigGroup* = 0); + virtual void save (TDEConfigGroup* = 0); + virtual void load (TDEConfigGroup* = 0); virtual void defaults (); private: diff --git a/sip/kutils/kpluginselector.sip b/sip/kutils/kpluginselector.sip index ec66e3f..c53f1c4 100644 --- a/sip/kutils/kpluginselector.sip +++ b/sip/kutils/kpluginselector.sip @@ -35,9 +35,9 @@ class KPluginSelector : TQWidget public: KPluginSelector (TQWidget*, const char* = 0); - void addPlugins (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0); - void addPlugins (const TDEInstance*, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0); -//ig void addPlugins (const TQValueList<KPluginInfo*>&, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0); + void addPlugins (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEConfig* = 0); + void addPlugins (const TDEInstance*, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEConfig* = 0); +//ig void addPlugins (const TQValueList<KPluginInfo*>&, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEConfig* = 0); void setShowEmptyConfigPage (bool); void load (); void save (); diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip index f054ef1..fbf0f96 100644 --- a/sip/tdecore/kaccel.sip +++ b/sip/tdecore/kaccel.sip @@ -58,8 +58,8 @@ public: bool setEnabled (const TQString&, bool); const TQString& configGroup () const; void setConfigGroup (const TQString&); - bool readSettings (KConfigBase* = 0); - bool writeSettings (KConfigBase* = 0) const; + bool readSettings (TDEConfigBase* = 0); + bool writeSettings (TDEConfigBase* = 0) const; void emitKeycodeChanged (); signals: @@ -126,9 +126,9 @@ public: {sipName_TDEClipboardSynchronizer, &sipClass_TDEClipboardSynchronizer}, #endif {sipName_KCompletion, &sipClass_KCompletion}, - {sipName_KConfig, &sipClass_KConfig}, - {sipName_KConfigBase, &sipClass_KConfigBase}, - {sipName_KConfigGroup, &sipClass_KConfigGroup}, + {sipName_TDEConfig, &sipClass_TDEConfig}, + {sipName_TDEConfigBase, &sipClass_TDEConfigBase}, + {sipName_TDEConfigGroup, &sipClass_TDEConfigGroup}, {sipName_KDesktopFile, &sipClass_KDesktopFile}, {sipName_TDEGlobalAccel, &sipClass_TDEGlobalAccel}, {sipName_KLibFactory, &sipClass_KLibFactory}, @@ -138,10 +138,10 @@ public: {sipName_KProcIO, &sipClass_KProcIO}, {sipName_TDEProcess, &sipClass_TDEProcess}, {sipName_TDEProcessController, &sipClass_TDEProcessController}, - {sipName_KServerSocket, &sipClass_KServerSocket}, + {sipName_TDEServerSocket, &sipClass_TDEServerSocket}, {sipName_KShellProcess, &sipClass_KShellProcess}, {sipName_KSimpleConfig, &sipClass_KSimpleConfig}, - {sipName_KSocket, &sipClass_KSocket}, + {sipName_TDESocket, &sipClass_TDESocket}, {sipName_KStartupInfo, &sipClass_KStartupInfo}, {sipName_KUniqueApplication, &sipClass_KUniqueApplication}, {sipName_KWinModule, &sipClass_KWinModule}, diff --git a/sip/tdecore/kaccelaction.sip b/sip/tdecore/kaccelaction.sip index 2c88eb9..6bdace1 100644 --- a/sip/tdecore/kaccelaction.sip +++ b/sip/tdecore/kaccelaction.sip @@ -85,7 +85,7 @@ public: KAccelActions (const KAccelActions&); void clear (); bool init (const KAccelActions&); - bool init (KConfigBase&, const TQString&); + bool init (TDEConfigBase&, const TQString&); void updateShortcuts (KAccelActions&); int actionIndex (const TQString&) const; KAccelAction* actionPtr (uint); @@ -105,8 +105,8 @@ public: KAccelAction* insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, const TQObject* = 0, const char* = 0, bool = 1, bool = 1); KAccelAction* insert (const TQString&, const TQString&); bool remove (const TQString&); - bool readActions (const TQString& = "Shortcuts", KConfigBase* = 0); - bool writeActions (const TQString& = "Shortcuts", KConfigBase* = 0, bool = 0, bool = 0) const; + bool readActions (const TQString& = "Shortcuts", TDEConfigBase* = 0); + bool writeActions (const TQString& = "Shortcuts", TDEConfigBase* = 0, bool = 0, bool = 0) const; void emitKeycodeChanged (); uint count () const; diff --git a/sip/tdecore/kaccelbase.sip b/sip/tdecore/kaccelbase.sip index 23c303f..eb9e5e8 100644 --- a/sip/tdecore/kaccelbase.sip +++ b/sip/tdecore/kaccelbase.sip @@ -65,8 +65,8 @@ public: bool updateConnections (); bool setShortcut (const TQString&, const KShortcut&); bool setActionEnabled (const TQString&, bool); - void readSettings (KConfigBase* = 0); - void writeSettings (KConfigBase* = 0) const; + void readSettings (TDEConfigBase* = 0); + void writeSettings (TDEConfigBase* = 0) const; TQPopupMenu* createPopupMenu (TQWidget*, const KKeySequence&); protected: diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip index 59e99a0..eaeb023 100644 --- a/sip/tdecore/kapplication.sip +++ b/sip/tdecore/kapplication.sip @@ -85,7 +85,7 @@ public: static void addCmdLineOptions (); static TDEApplication* kApplication (); - KConfig* sessionConfig (); + TDEConfig* sessionConfig (); bool isRestored () const; void disableSessionManagement (); @@ -333,7 +333,7 @@ public: %If ( KDE_3_1_0 - ) static TQPalette createApplicationPalette (); - static TQPalette createApplicationPalette (KConfig*, int); + static TQPalette createApplicationPalette (TDEConfig*, int); %If ( KDE_3_2_0 - ) static void installSigpipeHandler (); diff --git a/sip/tdecore/kconfig.sip b/sip/tdecore/kconfig.sip index cc0f307..1e30b31 100644 --- a/sip/tdecore/kconfig.sip +++ b/sip/tdecore/kconfig.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KConfig : KConfigBase +class TDEConfig : TDEConfigBase { %TypeHeaderCode #include <kconfig.h> @@ -32,10 +32,10 @@ class KConfig : KConfigBase public: - KConfig (const TQString& = TQString ::null , bool = 0, bool = 1, const char* = "config"); + TDEConfig (const TQString& = TQString ::null , bool = 0, bool = 1, const char* = "config"); %If ( KDE_3_2_0 - ) - KConfig (KConfigBackEnd*, bool = 0); + TDEConfig (TDEConfigBackEnd*, bool = 0); %End virtual void rollback (bool = 1); @@ -50,7 +50,7 @@ public: void checkUpdate (const TQString&, const TQString&); %If ( KDE_3_2_0 - ) - KConfig* copyTo (const TQString&, KConfig* = 0) const; + TDEConfig* copyTo (const TQString&, TDEConfig* = 0) const; %If ( KDE_3_3_0 - ) KLockFile::Ptr lockFile (bool = 0); @@ -69,17 +69,17 @@ protected: virtual KEntry lookupData (const KEntryKey&) const; private: - KConfig (const KConfig&); + TDEConfig (const TDEConfig&); protected: //igx virtual void virtual_hook (int, void*); -}; // class KConfig +}; // class TDEConfig %If ( KDE_3_2_0 - ) -class KSharedConfig : KConfig, KShared +class KSharedConfig : TDEConfig, KShared { %TypeHeaderCode #include <kconfig.h> diff --git a/sip/tdecore/kconfigbackend.sip b/sip/tdecore/kconfigbackend.sip index f7569cb..2df5316 100644 --- a/sip/tdecore/kconfigbackend.sip +++ b/sip/tdecore/kconfigbackend.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KConfigBackEnd +class TDEConfigBackEnd { %TypeHeaderCode #include <kconfigbackend.h> @@ -32,11 +32,11 @@ class KConfigBackEnd public: - KConfigBackEnd (KConfigBase*, const TQString&, const char*, bool); + TDEConfigBackEnd (TDEConfigBase*, const TQString&, const char*, bool); virtual bool parseConfigFiles () = 0; virtual void sync (bool = 1) = 0; void changeFileName (const TQString&, const char*, bool); - virtual KConfigBase::ConfigState getConfigState () const; + virtual TDEConfigBase::ConfigState getConfigState () const; TQString fileName () const; const char* resource () const; void setLocaleString (const TQCString&); @@ -60,10 +60,10 @@ protected: protected: -}; // class KConfigBackEnd +}; // class TDEConfigBackEnd -class KConfigINIBackEnd : KConfigBackEnd +class TDEConfigINIBackEnd : TDEConfigBackEnd { %TypeHeaderCode #include <kconfigdata.h> @@ -72,7 +72,7 @@ class KConfigINIBackEnd : KConfigBackEnd public: - KConfigINIBackEnd (KConfigBase*, const TQString&, const char*, bool = 1); + TDEConfigINIBackEnd (TDEConfigBase*, const TQString&, const char*, bool = 1); bool parseConfigFiles (); virtual void sync (bool = 1); @@ -89,5 +89,5 @@ protected: protected: //igx virtual void virtual_hook (int, void*); -}; // class KConfigINIBackEnd +}; // class TDEConfigINIBackEnd diff --git a/sip/tdecore/kconfigbase.sip b/sip/tdecore/kconfigbase.sip index 5508ddf..2f9d9c9 100644 --- a/sip/tdecore/kconfigbase.sip +++ b/sip/tdecore/kconfigbase.sip @@ -30,7 +30,7 @@ typedef unsigned long long ulonglong; %End -class KConfigBase : TQObject +class TDEConfigBase : TQObject { %TypeHeaderCode #include <kconfigbase.h> @@ -38,7 +38,7 @@ class KConfigBase : TQObject public: - KConfigBase (); + TDEConfigBase (); void setGroup (const TQString&); void setDesktopGroup (); TQString group () const; @@ -206,10 +206,10 @@ protected: protected: //igx virtual void virtual_hook (int, void*); -}; // class KConfigBase +}; // class TDEConfigBase -class KConfigGroupSaver +class TDEConfigGroupSaver { %TypeHeaderCode #include <kconfigbase.h> @@ -217,18 +217,18 @@ class KConfigGroupSaver public: - KConfigGroupSaver (KConfigBase*, TQString); - KConfigGroupSaver (KConfigBase*, const char*); - KConfigGroupSaver (KConfigBase*, const TQCString&); - KConfigBase* config (); + TDEConfigGroupSaver (TDEConfigBase*, TQString); + TDEConfigGroupSaver (TDEConfigBase*, const char*); + TDEConfigGroupSaver (TDEConfigBase*, const TQCString&); + TDEConfigBase* config (); private: - KConfigGroupSaver (const KConfigGroupSaver&); + TDEConfigGroupSaver (const TDEConfigGroupSaver&); -}; // class KConfigGroupSaver +}; // class TDEConfigGroupSaver -class KConfigGroup : KConfigBase +class TDEConfigGroup : TDEConfigBase { %TypeHeaderCode #include <kconfigbase.h> @@ -236,9 +236,9 @@ class KConfigGroup : KConfigBase public: - KConfigGroup (KConfigBase*, const TQCString&); - KConfigGroup (KConfigBase*, const TQString&); - KConfigGroup (KConfigBase*, const char*); + TDEConfigGroup (TDEConfigBase*, const TQCString&); + TDEConfigGroup (TDEConfigBase*, const TQString&); + TDEConfigGroup (TDEConfigBase*, const char*); void deleteGroup (bool = 0); %If ( KDE_3_4_0 - ) @@ -253,7 +253,7 @@ public: protected: //igx virtual void virtual_hook (int, void*); -}; // class KConfigGroup +}; // class TDEConfigGroup diff --git a/sip/tdecore/kconfigdialogmanager.sip b/sip/tdecore/kconfigdialogmanager.sip index 5d4575c..cec0949 100644 --- a/sip/tdecore/kconfigdialogmanager.sip +++ b/sip/tdecore/kconfigdialogmanager.sip @@ -26,7 +26,7 @@ %If ( KDE_3_2_0 - ) -class KConfigDialogManager : TQObject +class TDEConfigDialogManager : TQObject { %TypeHeaderCode #include <kconfigdialogmanager.h> @@ -39,7 +39,7 @@ signals: void widgetModified (); public: - KConfigDialogManager (TQWidget* /TransferThis/, KConfigSkeleton*, const char* = 0); + TDEConfigDialogManager (TQWidget* /TransferThis/, TDEConfigSkeleton*, const char* = 0); void addWidget (TQWidget*); bool hasChanged (); bool isDefault (); @@ -54,11 +54,11 @@ protected: bool parseChildren (const TQWidget*, bool); void setProperty (TQWidget*, const TQVariant&); TQVariant property (TQWidget*); - void setupWidget (TQWidget*, KConfigSkeletonItem*); + void setupWidget (TQWidget*, TDEConfigSkeletonItem*); protected: -}; // class KConfigDialogManager +}; // class TDEConfigDialogManager %End diff --git a/sip/tdecore/kconfigskeleton.sip b/sip/tdecore/kconfigskeleton.sip index 4def51c..61e9b52 100644 --- a/sip/tdecore/kconfigskeleton.sip +++ b/sip/tdecore/kconfigskeleton.sip @@ -26,7 +26,7 @@ %If ( KDE_3_2_0 - ) -class KConfigSkeletonItem +class TDEConfigSkeletonItem { %TypeHeaderCode #include <typeinfo> @@ -35,10 +35,10 @@ class KConfigSkeletonItem public: - typedef TQValueList<KConfigSkeletonItem*> List; -//ig typedef TQDict<KConfigSkeletonItem> Dict; -//ig typedef TQDictIterator<KConfigSkeletonItem> DictIterator; - KConfigSkeletonItem (const TQString&, const TQString&); + typedef TQValueList<TDEConfigSkeletonItem*> List; +//ig typedef TQDict<TDEConfigSkeletonItem> Dict; +//ig typedef TQDictIterator<TDEConfigSkeletonItem> DictIterator; + TDEConfigSkeletonItem (const TQString&, const TQString&); void setGroup (const TQString&); TQString group () const; void setKey (const TQString&); @@ -49,9 +49,9 @@ public: TQString label () const; void setWhatsThis (const TQString&); TQString whatsThis () const; - virtual void readConfig (KConfig*) = 0; - virtual void writeConfig (KConfig*) = 0; - virtual void readDefault (KConfig*) = 0; + virtual void readConfig (TDEConfig*) = 0; + virtual void writeConfig (TDEConfig*) = 0; + virtual void readDefault (TDEConfig*) = 0; virtual void setProperty (const TQVariant&) = 0; virtual TQVariant property () const = 0; virtual TQVariant minValue () const; @@ -61,65 +61,65 @@ public: bool isImmutable () const; protected: - void readImmutability (KConfig*); + void readImmutability (TDEConfig*); //force %ConvertToSubClassCode - if (dynamic_cast<KConfigSkeleton::ItemBool*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemBool; - else if (dynamic_cast<KConfigSkeleton::ItemColor*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemColor; - else if (dynamic_cast<KConfigSkeleton::ItemDateTime*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemDateTime; - else if (dynamic_cast<KConfigSkeleton::ItemDouble*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemDouble; - else if (dynamic_cast<KConfigSkeleton::ItemEnum*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemEnum; - else if (dynamic_cast<KConfigSkeleton::ItemFont*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemFont; - else if (dynamic_cast<KConfigSkeleton::ItemInt*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemInt; - else if (dynamic_cast<KConfigSkeleton::ItemInt64*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemInt64; - else if (dynamic_cast<KConfigSkeleton::ItemIntList*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemIntList; - else if (dynamic_cast<KConfigSkeleton::ItemLong*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemLong; - else if (dynamic_cast<KConfigSkeleton::ItemPassword*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemPassword; - else if (dynamic_cast<KConfigSkeleton::ItemPath*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemPath; - else if (dynamic_cast<KConfigSkeleton::ItemPoint*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemPoint; - else if (dynamic_cast<KConfigSkeleton::ItemProperty*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemProperty; - else if (dynamic_cast<KConfigSkeleton::ItemRect*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemRect; - else if (dynamic_cast<KConfigSkeleton::ItemSize*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemSize; - else if (dynamic_cast<KConfigSkeleton::ItemString*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemString; - else if (dynamic_cast<KConfigSkeleton::ItemStringList*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemStringList; - else if (dynamic_cast<KConfigSkeleton::ItemUInt*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemUInt; - else if (dynamic_cast<KConfigSkeleton::ItemUInt64*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemUInt64; - else if (dynamic_cast<KConfigSkeleton::ItemULong*>(sipCpp)) - sipClass = sipClass_KConfigSkeleton_ItemULong; + if (dynamic_cast<TDEConfigSkeleton::ItemBool*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemBool; + else if (dynamic_cast<TDEConfigSkeleton::ItemColor*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemColor; + else if (dynamic_cast<TDEConfigSkeleton::ItemDateTime*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemDateTime; + else if (dynamic_cast<TDEConfigSkeleton::ItemDouble*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemDouble; + else if (dynamic_cast<TDEConfigSkeleton::ItemEnum*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemEnum; + else if (dynamic_cast<TDEConfigSkeleton::ItemFont*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemFont; + else if (dynamic_cast<TDEConfigSkeleton::ItemInt*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemInt; + else if (dynamic_cast<TDEConfigSkeleton::ItemInt64*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemInt64; + else if (dynamic_cast<TDEConfigSkeleton::ItemIntList*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemIntList; + else if (dynamic_cast<TDEConfigSkeleton::ItemLong*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemLong; + else if (dynamic_cast<TDEConfigSkeleton::ItemPassword*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemPassword; + else if (dynamic_cast<TDEConfigSkeleton::ItemPath*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemPath; + else if (dynamic_cast<TDEConfigSkeleton::ItemPoint*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemPoint; + else if (dynamic_cast<TDEConfigSkeleton::ItemProperty*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemProperty; + else if (dynamic_cast<TDEConfigSkeleton::ItemRect*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemRect; + else if (dynamic_cast<TDEConfigSkeleton::ItemSize*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemSize; + else if (dynamic_cast<TDEConfigSkeleton::ItemString*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemString; + else if (dynamic_cast<TDEConfigSkeleton::ItemStringList*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemStringList; + else if (dynamic_cast<TDEConfigSkeleton::ItemUInt*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemUInt; + else if (dynamic_cast<TDEConfigSkeleton::ItemUInt64*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemUInt64; + else if (dynamic_cast<TDEConfigSkeleton::ItemULong*>(sipCpp)) + sipClass = sipClass_TDEConfigSkeleton_ItemULong; else sipClass = NULL; %End //end -}; // class KConfigSkeletonItem +}; // class TDEConfigSkeletonItem %End %If ( KDE_3_2_0 - ) -class KConfigSkeleton +class TDEConfigSkeleton { %TypeHeaderCode #include <kconfigskeleton.h> @@ -129,7 +129,7 @@ typedef TQValueList<int> IntList; public: - class ItemPassword : KConfigSkeleton::ItemString + class ItemPassword : TDEConfigSkeleton::ItemString { public: @@ -140,7 +140,7 @@ public: public: - class ItemPath : KConfigSkeleton::ItemString + class ItemPath : TDEConfigSkeleton::ItemString { public: @@ -151,7 +151,7 @@ public: public: - class ItemEnum : KConfigSkeleton::ItemInt + class ItemEnum : TDEConfigSkeleton::ItemInt { public: @@ -168,15 +168,15 @@ public: public: - ItemEnum (const TQString&, const TQString&, int, const TQValueList<KConfigSkeleton::ItemEnum::Choice>&, int = 0) [(const TQString&, const TQString&, int&, const TQValueList<KConfigSkeleton::ItemEnum::Choice>&, int = 0)]; + ItemEnum (const TQString&, const TQString&, int, const TQValueList<TDEConfigSkeleton::ItemEnum::Choice>&, int = 0) [(const TQString&, const TQString&, int&, const TQValueList<TDEConfigSkeleton::ItemEnum::Choice>&, int = 0)]; %MethodCode -//takes group | (TQString) | key | (TQString) | reference | (int) | choices | (TQValueList<KConfigSkeleton::ItemEnum::Choice>) |defaultValue | (int = 1) +//takes group | (TQString) | key | (TQString) | reference | (int) | choices | (TQValueList<TDEConfigSkeleton::ItemEnum::Choice>) |defaultValue | (int = 1) - class PyItemEnum : public KConfigSkeleton::ItemEnum + class PyItemEnum : public TDEConfigSkeleton::ItemEnum { public: - PyItemEnum (const TQString& group, const TQString& key, int& val, const TQValueList<KConfigSkeleton::ItemEnum::Choice>& choices, int defaultValue = 0) : - KConfigSkeleton::ItemEnum(group, key, this->value, choices, defaultValue) + PyItemEnum (const TQString& group, const TQString& key, int& val, const TQValueList<TDEConfigSkeleton::ItemEnum::Choice>& choices, int defaultValue = 0) : + TDEConfigSkeleton::ItemEnum(group, key, this->value, choices, defaultValue) { value = val; }; @@ -186,13 +186,13 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemEnum *) new PyItemEnum (*a0, *a1, a2, *a3, a4); + sipCpp = (sipTDEConfigSkeleton_ItemEnum *) new PyItemEnum (*a0, *a1, a2, *a3, a4); Py_END_ALLOW_THREADS %End - TQValueList<KConfigSkeleton::ItemEnum::Choice> choices () const; - void readConfig (KConfig*); - void writeConfig (KConfig*); + TQValueList<TDEConfigSkeleton::ItemEnum::Choice> choices () const; + void readConfig (TDEConfig*); + void writeConfig (TDEConfig*); public: //force @@ -210,13 +210,13 @@ public: %If ( KDE_3_4_0 - ) - class ItemPathList : KConfigSkeleton::ItemStringList + class ItemPathList : TDEConfigSkeleton::ItemStringList { public: ItemPathList (const TQString&, const TQString&, TQStringList&, const TQStringList& = TQStringList ()); - void readConfig (KConfig*); - void writeConfig (KConfig*); + void readConfig (TDEConfig*); + void writeConfig (TDEConfig*); }; // class ItemPathList @@ -226,27 +226,27 @@ public: public: - KConfigSkeleton (const TQString& = TQString ::null ); - KConfigSkeleton (KSharedConfig::Ptr); + TDEConfigSkeleton (const TQString& = TQString ::null ); + TDEConfigSkeleton (KSharedConfig::Ptr); void setDefaults (); void readConfig (); void writeConfig (); void setCurrentGroup (const TQString&); TQString currentGroup (); - void addItem (KConfigSkeletonItem*, const TQString& = TQString ::null ); + void addItem (TDEConfigSkeletonItem*, const TQString& = TQString ::null ); ItemString* addItemString (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); - KConfigSkeleton::ItemPassword* addItemPassword (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); - KConfigSkeleton::ItemPath* addItemPath (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemPassword* addItemPassword (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemPath* addItemPath (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); ItemProperty* addItemProperty (const TQString&, TQVariant&, const TQVariant& = TQVariant (), const TQString& = TQString ::null ); ItemBool* addItemBool (const TQString&, bool&, bool = 0, const TQString& = TQString ::null ); %MethodCode //takes name | (TQString) | value | (bool) | defaultValue | (bool) | key | (TQString = TQString::null) - class PyItemBool : public KConfigSkeleton::ItemBool + class PyItemBool : public TDEConfigSkeleton::ItemBool { public: PyItemBool (const TQString &group, const TQString &key, bool val, bool defaultValue = 0) : - KConfigSkeleton::ItemBool (group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemBool (group, key, this->value, defaultValue) { value = val; } @@ -265,11 +265,11 @@ public: %MethodCode //takes name | (TQString) | value | (int) | defaultValue | (int) | key | (TQString = TQString::null) - class PyItemInt : public KConfigSkeleton::ItemInt + class PyItemInt : public TDEConfigSkeleton::ItemInt { public: PyItemInt(const TQString &group, const TQString &key, int val, int defaultValue=0) : - KConfigSkeleton::ItemInt (group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemInt (group, key, this->value, defaultValue) { value = val; } @@ -288,11 +288,11 @@ public: %MethodCode //takes name | (TQString) | value | (uint) | defaultValue | (uint) | key | (TQString = TQString::null) - class PyItemUInt : public KConfigSkeleton::ItemUInt + class PyItemUInt : public TDEConfigSkeleton::ItemUInt { public: PyItemUInt(const TQString &group, const TQString &key, uint val, uint defaultValue = 0) : - KConfigSkeleton::ItemUInt (group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemUInt (group, key, this->value, defaultValue) { value = val; } @@ -311,11 +311,11 @@ public: %MethodCode //takes name | (TQString) | value | (long) | defaultValue | (long) | key | (TQString = TQString::null) - class PyItemLong : public KConfigSkeleton::ItemLong + class PyItemLong : public TDEConfigSkeleton::ItemLong { public: PyItemLong(const TQString &group, const TQString &key, long val, long defaultValue=0) : - KConfigSkeleton::ItemLong (group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemLong (group, key, this->value, defaultValue) { value = val; } @@ -334,11 +334,11 @@ public: %MethodCode //takes name | (TQString) | value | (ulong) | defaultValue | (ulong) | key | (TQString = TQString::null) - class PyItemULong : public KConfigSkeleton::ItemULong + class PyItemULong : public TDEConfigSkeleton::ItemULong { public: PyItemULong(const TQString &group, const TQString &key, ulong val, ulong defaultValue = 0) : - KConfigSkeleton::ItemULong (group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemULong (group, key, this->value, defaultValue) { value = val; } @@ -353,17 +353,17 @@ public: Py_END_ALLOW_THREADS %End - KConfigSkeleton::ItemInt64* addItemInt64 (const TQString&, longlong&, longlong = 0, const TQString& = TQString ::null ); - KConfigSkeleton::ItemUInt64* addItemUInt64 (const TQString&, ulonglong&, ulonglong = 0, const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemInt64* addItemInt64 (const TQString&, longlong&, longlong = 0, const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemUInt64* addItemUInt64 (const TQString&, ulonglong&, ulonglong = 0, const TQString& = TQString ::null ); ItemDouble* addItemDouble (const TQString&, double&, double = 0.0, const TQString& = TQString ::null ); %MethodCode //takes name | (TQString) | value | (double) | defaultValue | (double) | key | (TQString = TQString::null) - class PyItemDouble : public KConfigSkeleton::ItemDouble + class PyItemDouble : public TDEConfigSkeleton::ItemDouble { public: PyItemDouble(const TQString &group, const TQString &key, double val, double defaultValue=0.0) : - KConfigSkeleton::ItemDouble(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemDouble(group, key, this->value, defaultValue) { value = val; }; @@ -384,8 +384,8 @@ public: ItemPoint* addItemPoint (const TQString&, TQPoint&, const TQPoint& = TQPoint (), const TQString& = TQString ::null ); ItemSize* addItemSize (const TQString&, TQSize&, const TQSize& = TQSize (), const TQString& = TQString ::null ); ItemDateTime* addItemDateTime (const TQString&, TQDateTime&, const TQDateTime& = TQDateTime (), const TQString& = TQString ::null ); - KConfigSkeleton::ItemStringList* addItemStringList (const TQString&, TQStringList&, const TQStringList& = TQStringList (), const TQString& = TQString ::null ); - KConfigSkeleton::ItemIntList* addItemIntList (const TQString&, TQValueList<int>&, const TQValueList<int>& = IntList (), const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemStringList* addItemStringList (const TQString&, TQStringList&, const TQStringList& = TQStringList (), const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemIntList* addItemIntList (const TQString&, TQValueList<int>&, const TQValueList<int>& = IntList (), const TQString& = TQString ::null ); %MethodCode //returns a Python list of int //takes name | (TQString) | reference | (a Python list of int) | defaultValue | (a Python list of int = []) | key | (TQString = TQString::null) @@ -395,12 +395,12 @@ public: Py_END_ALLOW_THREADS %End - KConfig* config () const; - SIP_PYLIST items () const [KConfigSkeletonItem::List ()]; + TDEConfig* config () const; + SIP_PYLIST items () const [TDEConfigSkeletonItem::List ()]; %MethodCode //returns (a Python list of Items) - KConfigSkeletonItem::List list; + TDEConfigSkeletonItem::List list; Py_BEGIN_ALLOW_THREADS list = sipCpp->items (); @@ -409,11 +409,11 @@ public: int n = list.count (); if (n > 0) for (int i = 0; i < n; i++) - PyList_Append (sipRes, sipConvertFromInstance (&(list [i]), sipClass_KConfigSkeletonItem, NULL)); + PyList_Append (sipRes, sipConvertFromInstance (&(list [i]), sipClass_TDEConfigSkeletonItem, NULL)); %End bool isImmutable (const TQString&); - KConfigSkeletonItem* findItem (const TQString&); + TDEConfigSkeletonItem* findItem (const TQString&); bool useDefaults (bool); protected: @@ -425,7 +425,7 @@ protected: public: //force - class ItemString : KConfigSkeletonItem + class ItemString : TDEConfigSkeletonItem { public: @@ -437,14 +437,14 @@ public: Path }; - ItemString (const TQString&, const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), KConfigSkeleton::ItemString::Type = KConfigSkeleton ::ItemString ::Normal ); + ItemString (const TQString&, const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), TDEConfigSkeleton::ItemString::Type = TDEConfigSkeleton ::ItemString ::Normal ); void setValue (const TQString&); TQString& value (); virtual void setDefaultValue (const TQString&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -457,7 +457,7 @@ public: public: //force - class ItemProperty : KConfigSkeletonItem + class ItemProperty : TDEConfigSkeletonItem { public: @@ -465,7 +465,7 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (TQVariant) | defaultValue | (TQVariant = 0) Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemProperty *) new KConfigSkeleton::ItemProperty (*a0, *a1, *a2, *a3); + sipCpp = (sipTDEConfigSkeleton_ItemProperty *) new TDEConfigSkeleton::ItemProperty (*a0, *a1, *a2, *a3); Py_END_ALLOW_THREADS %End @@ -474,8 +474,8 @@ public: virtual void setDefaultValue (const TQVariant&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -488,7 +488,7 @@ public: public: //force - class ItemBool : KConfigSkeletonItem + class ItemBool : TDEConfigSkeletonItem { public: @@ -496,11 +496,11 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (bool) | defaultValue | (bool = 1) - class PyItemBool : public KConfigSkeleton::ItemBool + class PyItemBool : public TDEConfigSkeleton::ItemBool { public: PyItemBool(const TQString &group, const TQString &key, bool val, bool defaultValue = false) : - KConfigSkeleton::ItemBool(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemBool(group, key, this->value, defaultValue) { value = val; }; @@ -510,7 +510,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemBool *) new PyItemBool (*a0, *a1, a2); + sipCpp = (sipTDEConfigSkeleton_ItemBool *) new PyItemBool (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -519,8 +519,8 @@ public: virtual void setDefaultValue (const bool&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -533,7 +533,7 @@ public: public: //force - class ItemInt : KConfigSkeletonItem + class ItemInt : TDEConfigSkeletonItem { public: @@ -541,11 +541,11 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (int) | defaultValue | (int = 1) - class PyItemInt : public KConfigSkeleton::ItemInt + class PyItemInt : public TDEConfigSkeleton::ItemInt { public: PyItemInt(const TQString &group, const TQString &key, int val, int defaultValue = 0) : - KConfigSkeleton::ItemInt(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemInt(group, key, this->value, defaultValue) { value = val; }; @@ -555,7 +555,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemInt *) new PyItemInt (*a0, *a1, a2); + sipCpp = (sipTDEConfigSkeleton_ItemInt *) new PyItemInt (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -564,8 +564,8 @@ public: virtual void setDefaultValue (const int&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; TQVariant minValue () const; @@ -582,7 +582,7 @@ public: public: //force - class ItemInt64 : KConfigSkeletonItem + class ItemInt64 : TDEConfigSkeletonItem { public: @@ -590,11 +590,11 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (longlong) | defaultValue | (longlong = 0) - class PyItemInt64 : public KConfigSkeleton::ItemInt64 + class PyItemInt64 : public TDEConfigSkeleton::ItemInt64 { public: PyItemInt64(const TQString &group, const TQString &key, TQ_INT64 val, TQ_INT64 defaultValue=0) : - KConfigSkeleton::ItemInt64(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemInt64(group, key, this->value, defaultValue) { value = val; }; @@ -604,7 +604,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemInt64 *) new PyItemInt64 (*a0, *a1, *a2, *a3); + sipCpp = (sipTDEConfigSkeleton_ItemInt64 *) new PyItemInt64 (*a0, *a1, *a2, *a3); Py_END_ALLOW_THREADS %End @@ -613,8 +613,8 @@ public: virtual void setDefaultValue (const longlong&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; TQVariant minValue () const; @@ -631,7 +631,7 @@ public: public: //force - class ItemUInt : KConfigSkeletonItem + class ItemUInt : TDEConfigSkeletonItem { public: @@ -639,11 +639,11 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (uint) | defaultValue | (uint = 1) - class PyItemUInt : public KConfigSkeleton::ItemUInt + class PyItemUInt : public TDEConfigSkeleton::ItemUInt { public: PyItemUInt(const TQString &group, const TQString &key, uint val, uint defaultValue = 0) : - KConfigSkeleton::ItemUInt(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemUInt(group, key, this->value, defaultValue) { value = val; }; @@ -653,7 +653,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemUInt *) new PyItemUInt (*a0, *a1, a2); + sipCpp = (sipTDEConfigSkeleton_ItemUInt *) new PyItemUInt (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -662,8 +662,8 @@ public: virtual void setDefaultValue (const uint&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; TQVariant minValue () const; @@ -678,7 +678,7 @@ public: public: - class ItemLong : KConfigSkeletonItem + class ItemLong : TDEConfigSkeletonItem { public: @@ -686,11 +686,11 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (long) | defaultValue | (long = 1) - class PyItemLong : public KConfigSkeleton::ItemLong + class PyItemLong : public TDEConfigSkeleton::ItemLong { public: PyItemLong(const TQString &group, const TQString &key, long val, long defaultValue = 0) : - KConfigSkeleton::ItemLong(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemLong(group, key, this->value, defaultValue) { value = val; }; @@ -700,7 +700,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemLong *) new PyItemLong (*a0, *a1, a2); + sipCpp = (sipTDEConfigSkeleton_ItemLong *) new PyItemLong (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -709,8 +709,8 @@ public: virtual void setDefaultValue (const long&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; TQVariant minValue () const; @@ -727,7 +727,7 @@ public: public: //force - class ItemULong : KConfigSkeletonItem + class ItemULong : TDEConfigSkeletonItem { public: @@ -735,11 +735,11 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (ulong) | defaultValue | (ulong = 1) - class PyItemULong : public KConfigSkeleton::ItemULong + class PyItemULong : public TDEConfigSkeleton::ItemULong { public: PyItemULong(const TQString &group, const TQString &key, ulong val, ulong defaultValue = 0) : - KConfigSkeleton::ItemULong(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemULong(group, key, this->value, defaultValue) { value = val; }; @@ -749,7 +749,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemULong *) new PyItemULong (*a0, *a1, a2); + sipCpp = (sipTDEConfigSkeleton_ItemULong *) new PyItemULong (*a0, *a1, a2); Py_END_ALLOW_THREADS %End @@ -758,8 +758,8 @@ public: virtual void setDefaultValue (const ulong&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; TQVariant minValue () const; @@ -776,7 +776,7 @@ public: public: //force - class ItemUInt64 : KConfigSkeletonItem + class ItemUInt64 : TDEConfigSkeletonItem { public: @@ -784,11 +784,11 @@ public: %MethodCode //takes group | (TQString) | key | (TQString) | reference | (ulonglong) | defaultValue | (ulonglong = 0) - class PyItemUInt64 : public KConfigSkeleton::ItemUInt64 + class PyItemUInt64 : public TDEConfigSkeleton::ItemUInt64 { public: PyItemUInt64(const TQString &group, const TQString &key, TQ_UINT64 val, TQ_UINT64 defaultValue = 0) : - KConfigSkeleton::ItemUInt64(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemUInt64(group, key, this->value, defaultValue) { value = val; }; @@ -798,7 +798,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemUInt64 *) new PyItemUInt64 (*a0, *a1, *a2, *a3); + sipCpp = (sipTDEConfigSkeleton_ItemUInt64 *) new PyItemUInt64 (*a0, *a1, *a2, *a3); Py_END_ALLOW_THREADS %End @@ -807,8 +807,8 @@ public: virtual void setDefaultValue (const ulonglong&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; TQVariant minValue () const; @@ -825,18 +825,18 @@ public: public: //force - class ItemDouble : KConfigSkeletonItem + class ItemDouble : TDEConfigSkeletonItem { public: ItemDouble (const TQString&, const TQString&, double, double = 0) [(const TQString&, const TQString&, double&, double = 0)]; %MethodCode //takes group | (TQString) | key | (TQString) | reference | (double) | defaultValue | (double = 0) - class PyItemDouble : public KConfigSkeleton::ItemDouble + class PyItemDouble : public TDEConfigSkeleton::ItemDouble { public: PyItemDouble(const TQString &group, const TQString &key, double val, double defaultValue=0.0) : - KConfigSkeleton::ItemDouble(group, key, this->value, defaultValue) + TDEConfigSkeleton::ItemDouble(group, key, this->value, defaultValue) { value = val; }; @@ -846,7 +846,7 @@ public: }; Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemDouble *) new PyItemDouble (*a0, *a1, a2, a3); + sipCpp = (sipTDEConfigSkeleton_ItemDouble *) new PyItemDouble (*a0, *a1, a2, a3); Py_END_ALLOW_THREADS %End @@ -855,8 +855,8 @@ public: virtual void setDefaultValue (const double&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; TQVariant minValue () const; @@ -873,7 +873,7 @@ public: public: //force - class ItemColor : KConfigSkeletonItem + class ItemColor : TDEConfigSkeletonItem { public: @@ -883,8 +883,8 @@ public: virtual void setDefaultValue (const TQColor&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -897,7 +897,7 @@ public: public: //force - class ItemFont : KConfigSkeletonItem + class ItemFont : TDEConfigSkeletonItem { public: @@ -907,8 +907,8 @@ public: virtual void setDefaultValue (const TQFont&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -921,7 +921,7 @@ public: public: //force - class ItemRect : KConfigSkeletonItem + class ItemRect : TDEConfigSkeletonItem { public: @@ -931,8 +931,8 @@ public: virtual void setDefaultValue (const TQRect&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -945,7 +945,7 @@ public: public: //force - class ItemPoint : KConfigSkeletonItem + class ItemPoint : TDEConfigSkeletonItem { public: @@ -955,8 +955,8 @@ public: virtual void setDefaultValue (const TQPoint&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -969,7 +969,7 @@ public: public: //force - class ItemSize : KConfigSkeletonItem + class ItemSize : TDEConfigSkeletonItem { public: @@ -979,8 +979,8 @@ public: virtual void setDefaultValue (const TQSize&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -993,7 +993,7 @@ public: public: //force - class ItemDateTime : KConfigSkeletonItem + class ItemDateTime : TDEConfigSkeletonItem { public: @@ -1003,8 +1003,8 @@ public: virtual void setDefaultValue (const TQDateTime&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -1017,7 +1017,7 @@ public: public: //force - class ItemStringList : KConfigSkeletonItem + class ItemStringList : TDEConfigSkeletonItem { public: @@ -1027,8 +1027,8 @@ public: virtual void setDefaultValue (const TQStringList&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -1041,7 +1041,7 @@ public: public: //force - class ItemIntList : KConfigSkeletonItem + class ItemIntList : TDEConfigSkeletonItem { public: @@ -1050,7 +1050,7 @@ public: //takes group | (TQString) | key | (TQString) | reference | (a Python list of int) | defaultValue | (a Python list of int = 0) if (a3 == NULL) *(TQValueList<int> *)a3 = TQValueList<int>(); Py_BEGIN_ALLOW_THREADS - sipCpp = (sipKConfigSkeleton_ItemIntList *) new KConfigSkeleton::ItemIntList (*a0, *a1, *a2, *a3); + sipCpp = (sipTDEConfigSkeleton_ItemIntList *) new TDEConfigSkeleton::ItemIntList (*a0, *a1, *a2, *a3); Py_END_ALLOW_THREADS %End @@ -1059,8 +1059,8 @@ public: virtual void setDefaultValue (const TQValueList<int>&); virtual void setDefault (); void swapDefault (); - void writeConfig (KConfig*); - void readConfig (KConfig*); + void writeConfig (TDEConfig*); + void readConfig (TDEConfig*); void setProperty (const TQVariant&); TQVariant property () const; @@ -1070,14 +1070,14 @@ public: public: //end -}; // class KConfigSkeleton +}; // class TDEConfigSkeleton %End %If (KDE_3_2_0 - ) -%MappedType TQValueList<KConfigSkeleton::ItemEnum::Choice> +%MappedType TQValueList<TDEConfigSkeleton::ItemEnum::Choice> { %TypeHeaderCode #include <kconfigskeleton.h> @@ -1092,14 +1092,14 @@ public: if ((pylist = PyList_New(0)) == NULL) return NULL; - TQValueList<KConfigSkeleton::ItemEnum::Choice> *cpplist = (TQValueList<KConfigSkeleton::ItemEnum::Choice> *)sipCpp; + TQValueList<TDEConfigSkeleton::ItemEnum::Choice> *cpplist = (TQValueList<TDEConfigSkeleton::ItemEnum::Choice> *)sipCpp; PyObject *inst; // Get it. - TQValueList<KConfigSkeleton::ItemEnum::Choice>::Iterator it; + TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new KConfigSkeleton::ItemEnum::Choice(*it), sipType_KConfigSkeleton_ItemEnum_Choice, NULL)) == NULL) + if (((inst = sipConvertFromNewType(new TDEConfigSkeleton::ItemEnum::Choice(*it), sipType_TDEConfigSkeleton_ItemEnum_Choice, NULL)) == NULL) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); @@ -1115,16 +1115,16 @@ public: if (sipIsErr == NULL) return PyList_Check(sipPy); - TQValueList<KConfigSkeleton::ItemEnum::Choice> *cpplist = new TQValueList<KConfigSkeleton::ItemEnum::Choice>; + TQValueList<TDEConfigSkeleton::ItemEnum::Choice> *cpplist = new TQValueList<TDEConfigSkeleton::ItemEnum::Choice>; PyObject *elem; - KConfigSkeleton::ItemEnum::Choice *cpp; + TDEConfigSkeleton::ItemEnum::Choice *cpp; int iserr = 0; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KConfigSkeleton::ItemEnum::Choice *)sipForceConvertToType(elem, sipType_KConfigSkeleton_ItemEnum_Choice, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEConfigSkeleton::ItemEnum::Choice *)sipForceConvertToType(elem, sipType_TDEConfigSkeleton_ItemEnum_Choice, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { diff --git a/sip/tdecore/kdesktopfile.sip b/sip/tdecore/kdesktopfile.sip index 42eff4c..f3b50ef 100644 --- a/sip/tdecore/kdesktopfile.sip +++ b/sip/tdecore/kdesktopfile.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KDesktopFile : KConfig +class KDesktopFile : TDEConfig { %TypeHeaderCode #include <kdesktopfile.h> diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip index fdfd5ba..71652c9 100644 --- a/sip/tdecore/kglobal.sip +++ b/sip/tdecore/kglobal.sip @@ -34,7 +34,7 @@ class TDEGlobal public: static TDEInstance* instance (); static KStandardDirs* dirs (); - static KConfig* config (); + static TDEConfig* config (); %If ( KDE_3_2_0 - ) static KSharedConfig* sharedConfig (); diff --git a/sip/tdecore/kglobalaccel.sip b/sip/tdecore/kglobalaccel.sip index e23a332..887d37b 100644 --- a/sip/tdecore/kglobalaccel.sip +++ b/sip/tdecore/kglobalaccel.sip @@ -58,11 +58,11 @@ public: const TQString& configGroup () const; void setConfigGroup (const TQString&); - bool readSettings (KConfigBase* = 0); - bool writeSettings (KConfigBase* = 0) const; + bool readSettings (TDEConfigBase* = 0); + bool writeSettings (TDEConfigBase* = 0) const; %If ( KDE_3_1_0 - ) - bool writeSettings (KConfigBase*, bool) const; + bool writeSettings (TDEConfigBase*, bool) const; %End static bool useFourModifierKeys (); diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip index beadd9d..bd22d8c 100644 --- a/sip/tdecore/kinstance.sip +++ b/sip/tdecore/kinstance.sip @@ -36,7 +36,7 @@ public: TDEInstance (const TDEAboutData*); TDEInstance (TDEInstance*); KStandardDirs* dirs () const; - KConfig* config () const; + TDEConfig* config () const; %If ( KDE_3_2_0 - ) KSharedConfig* sharedConfig () const; diff --git a/sip/tdecore/klocale.sip b/sip/tdecore/klocale.sip index a951a67..6afc795 100644 --- a/sip/tdecore/klocale.sip +++ b/sip/tdecore/klocale.sip @@ -32,7 +32,7 @@ class KLocale public: - KLocale (const TQString&, KConfig* = 0); + KLocale (const TQString&, TDEConfig* = 0); //ig KLocale (const KLocale&); TQString translate (const char*) const; TQString translate (const char*, const char*) const; @@ -215,7 +215,7 @@ public: static TQString defaultCountry (); %If ( KDE_3_0_1 - ) - static TQString _initLanguage (KConfigBase*); + static TQString _initLanguage (TDEConfigBase*); %End TQString formatMoney (const TQString&) const; diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip index cf8f3a5..53ce168 100644 --- a/sip/tdecore/kshortcutlist.sip +++ b/sip/tdecore/kshortcutlist.sip @@ -56,8 +56,8 @@ public: virtual TQVariant getOther (KShortcutList::Other, uint) const = 0; virtual bool setOther (KShortcutList::Other, uint, TQVariant) = 0; virtual bool save () const = 0; - virtual bool readSettings (const TQString& = TQString ::null , KConfigBase* = 0); - virtual bool writeSettings (const TQString& = TQString ::null , KConfigBase* = 0, bool = 0, bool = 0) const; + virtual bool readSettings (const TQString& = TQString ::null , TDEConfigBase* = 0); + virtual bool writeSettings (const TQString& = TQString ::null , TDEConfigBase* = 0, bool = 0, bool = 0) const; protected: //igx virtual void virtual_hook (int, void*); diff --git a/sip/tdecore/ksimpleconfig.sip b/sip/tdecore/ksimpleconfig.sip index 20d17b9..bf46b7d 100644 --- a/sip/tdecore/ksimpleconfig.sip +++ b/sip/tdecore/ksimpleconfig.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KSimpleConfig : KConfig +class KSimpleConfig : TDEConfig { %TypeHeaderCode #include <ksimpleconfig.h> @@ -35,7 +35,7 @@ public: KSimpleConfig (const TQString&, bool = 0); %If ( KDE_3_2_0 - ) - KSimpleConfig (KConfigBackEnd*, bool = 0); + KSimpleConfig (TDEConfigBackEnd*, bool = 0); %End virtual void sync (); diff --git a/sip/tdecore/ksock.sip b/sip/tdecore/ksock.sip index 5178dec..04f5e7e 100644 --- a/sip/tdecore/ksock.sip +++ b/sip/tdecore/ksock.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KSocket : TQObject +class TDESocket : TQObject { %TypeHeaderCode #include <ksock.h> @@ -32,17 +32,17 @@ class KSocket : TQObject public: - KSocket (int); - KSocket (const char*, ushort, int = 30); - KSocket (const char*); + TDESocket (int); + TDESocket (const char*, ushort, int = 30); + TDESocket (const char*); int socket () const; void enableRead (bool); void enableWrite (bool); signals: - void readEvent (KSocket*); - void writeEvent (KSocket*); - void closeEvent (KSocket*); + void readEvent (TDESocket*); + void writeEvent (TDESocket*); + void closeEvent (TDESocket*); public slots: void slotWrite (int); @@ -53,12 +53,12 @@ protected: bool connect (const char*); private: - KSocket (const KSocket&); + TDESocket (const TDESocket&); -}; // class KSocket +}; // class TDESocket -class KServerSocket : TQObject +class TDEServerSocket : TQObject { %TypeHeaderCode #include <ksock.h> @@ -66,8 +66,8 @@ class KServerSocket : TQObject public: - KServerSocket (ushort, bool); - KServerSocket (const char*, bool); + TDEServerSocket (ushort, bool); + TDEServerSocket (const char*, bool); bool bindAndListen (); int socket () const; ushort port (); @@ -76,22 +76,22 @@ public slots: virtual void slotAccept (int); signals: - void accepted (KSocket*); + void accepted (TDESocket*); protected: bool init (ushort); bool init (const char*); private: - KServerSocket (const KServerSocket&); + TDEServerSocket (const TDEServerSocket&); public: %If ( - KDE_3_1_2 ) - KServerSocket (ushort); - KServerSocket (const char*); + TDEServerSocket (ushort); + TDEServerSocket (const char*); %End -}; // class KServerSocket +}; // class TDEServerSocket diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip index 22204e2..005b8fe 100644 --- a/sip/tdecore/kstddirs.sip +++ b/sip/tdecore/kstddirs.sip @@ -45,7 +45,7 @@ public: static TQString findExe (const TQString&, const TQString& = TQString::null, bool = 0); static int findAllExe (TQStringList&, const TQString&, const TQString& = TQString::null, bool = 0); void addKDEDefaults (); - bool addCustomized (KConfig*); + bool addCustomized (TDEConfig*); TQStringList resourceDirs (const char*) const; TQStringList allTypes () const; TQString saveLocation (const char*, const TQString& = TQString::null, bool = 1) const; diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip index 343665c..fc20a16 100644 --- a/sip/tdeui/kaboutapplication.sip +++ b/sip/tdeui/kaboutapplication.sip @@ -60,7 +60,7 @@ protected: {sipName_KAuthIcon, &sipClass_KAuthIcon}, {sipName_KBugReport, &sipClass_KBugReport}, {sipName_KButtonBox, &sipClass_KButtonBox}, - {sipName_KCModule, &sipClass_KCModule}, + {sipName_TDECModule, &sipClass_TDECModule}, {sipName_KCharSelect, &sipClass_KCharSelect}, {sipName_KCharSelectTable, &sipClass_KCharSelectTable}, {sipName_KColorButton, &sipClass_KColorButton}, diff --git a/sip/tdeui/kaction.sip b/sip/tdeui/kaction.sip index cae6587..14e8390 100644 --- a/sip/tdeui/kaction.sip +++ b/sip/tdeui/kaction.sip @@ -376,8 +376,8 @@ public: public slots: void setMaxItems (uint); - void loadEntries (KConfig*, TQString = TQString ::null ); - void saveEntries (KConfig*, TQString = TQString ::null ); + void loadEntries (TDEConfig*, TQString = TQString ::null ); + void saveEntries (TDEConfig*, TQString = TQString ::null ); public slots: void addURL (const KURL&); @@ -640,8 +640,8 @@ public: virtual TQValueList<KAction*> actions () const; %End - bool readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0); - bool writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const; + bool readShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0); + bool writeShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0) const; void setInstance (TDEInstance*); TDEInstance* instance () const; void setXMLFile (const TQString&); diff --git a/sip/tdeui/kactionclasses.sip b/sip/tdeui/kactionclasses.sip index 5ae95a1..7858dbf 100644 --- a/sip/tdeui/kactionclasses.sip +++ b/sip/tdeui/kactionclasses.sip @@ -234,8 +234,8 @@ public: public slots: void setMaxItems (uint); - void loadEntries (KConfig*, TQString = TQString ::null ); - void saveEntries (KConfig*, TQString = TQString ::null ); + void loadEntries (TDEConfig*, TQString = TQString ::null ); + void saveEntries (TDEConfig*, TQString = TQString ::null ); void addURL (const KURL&); %If ( KDE_3_5_0 - ) diff --git a/sip/tdeui/kactioncollection.sip b/sip/tdeui/kactioncollection.sip index 0f4d6ab..a7c5e0e 100644 --- a/sip/tdeui/kactioncollection.sip +++ b/sip/tdeui/kactioncollection.sip @@ -51,8 +51,8 @@ public: virtual TQStringList groups () const; virtual KActionPtrList actions (const TQString&) const; virtual KActionPtrList actions () const; - bool readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0); - bool writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const; + bool readShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0); + bool writeShortcutSettings (const TQString& = TQString ::null , TDEConfigBase* = 0) const; void setInstance (TDEInstance*); TDEInstance* instance () const; void setXMLFile (const TQString&); diff --git a/sip/tdeui/kcmodule.sip b/sip/tdeui/kcmodule.sip index 8878de2..0ff0b24 100644 --- a/sip/tdeui/kcmodule.sip +++ b/sip/tdeui/kcmodule.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KCModule : TQWidget +class TDECModule : TQWidget { %TypeHeaderCode #include <kcmodule.h> @@ -44,8 +44,8 @@ public: SysDefault }; - KCModule (TQWidget* /TransferThis/ = 0, const char* = 0, const TQStringList& = TQStringList ()); - KCModule (TDEInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ()); + TDECModule (TQWidget* /TransferThis/ = 0, const char* = 0, const TQStringList& = TQStringList ()); + TDECModule (TDEInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ()); virtual void load (); virtual void save (); virtual void defaults (); @@ -63,14 +63,14 @@ public: TDEInstance* instance () const; %If ( KDE_3_4_0 - ) - const TQPtrList<KConfigDialogManager>& configs () const; + const TQPtrList<TDEConfigDialogManager>& configs () const; %End protected: %If ( KDE_3_3_0 - ) - KConfigDialogManager* addConfig (KConfigSkeleton*, TQWidget*); + TDEConfigDialogManager* addConfig (TDEConfigSkeleton*, TQWidget*); void setQuickHelp (const TQString&); %End @@ -105,13 +105,13 @@ protected: protected: //igx virtual void virtual_hook (int, void*); -}; // class KCModule +}; // class TDECModule %If (KDE_3_3_0 - ) -%MappedType TQPtrList<KConfigDialogManager> -//converts a Python list of KConfigDialogManager +%MappedType TQPtrList<TDEConfigDialogManager> +//converts a Python list of TDEConfigDialogManager { %TypeHeaderCode #include <tqptrlist.h> @@ -130,14 +130,14 @@ protected: // Get it. - TQPtrList<KConfigDialogManager> *cpplist = (TQPtrList<KConfigDialogManager> *)sipCpp; - KConfigDialogManager *cpp; + TQPtrList<TDEConfigDialogManager> *cpplist = (TQPtrList<TDEConfigDialogManager> *)sipCpp; + TDEConfigDialogManager *cpp; PyObject *inst; // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KConfigDialogManager, sipTransferObj)) == NULL) + if (((inst = sipConvertFromInstance (cpp, sipClass_TDEConfigDialogManager, sipTransferObj)) == NULL) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); @@ -152,16 +152,16 @@ protected: if (sipIsErr == NULL) return PyList_Check(sipPy); - TQPtrList<KConfigDialogManager> *cpplist = new TQPtrList<KConfigDialogManager>; + TQPtrList<TDEConfigDialogManager> *cpplist = new TQPtrList<TDEConfigDialogManager>; PyObject *elem; - KConfigDialogManager *cpp; + TDEConfigDialogManager *cpp; int iserr = 0; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KConfigDialogManager *)sipForceConvertToType(elem, sipType_KConfigDialogManager, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEConfigDialogManager *)sipForceConvertToType(elem, sipType_TDEConfigDialogManager, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { diff --git a/sip/tdeui/kconfigdialog.sip b/sip/tdeui/kconfigdialog.sip index ad12eaa..30a7234 100644 --- a/sip/tdeui/kconfigdialog.sip +++ b/sip/tdeui/kconfigdialog.sip @@ -26,7 +26,7 @@ %If ( KDE_3_2_0 - ) -class KConfigDialog : KDialogBase +class TDEConfigDialog : KDialogBase { %TypeHeaderCode #include <kconfigdialog.h> @@ -39,14 +39,14 @@ signals: void settingsChanged (const char*); public: - KConfigDialog (TQWidget* /TransferThis/, const char*, KConfigSkeleton*, KDialogBase::DialogType = KDialogBase ::IconList , int = KDialogBase ::Default |KDialogBase ::Ok |KDialogBase ::Apply |KDialogBase ::Cancel |KDialogBase ::Help , KDialogBase::ButtonCode = Ok , bool = 0); + TDEConfigDialog (TQWidget* /TransferThis/, const char*, TDEConfigSkeleton*, KDialogBase::DialogType = KDialogBase ::IconList , int = KDialogBase ::Default |KDialogBase ::Ok |KDialogBase ::Apply |KDialogBase ::Cancel |KDialogBase ::Help , KDialogBase::ButtonCode = Ok , bool = 0); void addPage (TQWidget*, const TQString&, const TQString&, const TQString& = TQString ::null , bool = 1); %If ( KDE_3_3_0 - ) - void addPage (TQWidget*, KConfigSkeleton*, const TQString&, const TQString&, const TQString& = TQString ::null ); + void addPage (TQWidget*, TDEConfigSkeleton*, const TQString&, const TQString&, const TQString& = TQString ::null ); %End - static KConfigDialog* exists (const char*); + static TDEConfigDialog* exists (const char*); static bool showDialog (const char*); virtual void show (); @@ -63,7 +63,7 @@ protected slots: void updateButtons (); void settingsChangedSlot (); -}; // class KConfigDialog +}; // class TDEConfigDialog %End diff --git a/sip/tdeui/kdialogbase.sip b/sip/tdeui/kdialogbase.sip index 7ffba42..61455a7 100644 --- a/sip/tdeui/kdialogbase.sip +++ b/sip/tdeui/kdialogbase.sip @@ -123,13 +123,13 @@ public: TQSize configDialogSize (const TQString&) const; %If ( KDE_3_2_0 - ) - TQSize configDialogSize (KConfig&, const TQString&) const; + TQSize configDialogSize (TDEConfig&, const TQString&) const; %End void saveDialogSize (const TQString&, bool = 0); %If ( KDE_3_2_0 - ) - void saveDialogSize (KConfig&, const TQString&, bool = 0) const; + void saveDialogSize (TDEConfig&, const TQString&, bool = 0) const; void setButtonOK (const KGuiItem& = KStdGuiItem ::ok ()); %End diff --git a/sip/tdeui/kdockwidget.sip b/sip/tdeui/kdockwidget.sip index 8150ad1..9d29bfa 100644 --- a/sip/tdeui/kdockwidget.sip +++ b/sip/tdeui/kdockwidget.sip @@ -34,8 +34,8 @@ class KDockWidgetAbstractHeader : TQFrame public: KDockWidgetAbstractHeader (KDockWidget* /TransferThis/, const char* = 0); virtual void setTopLevel (bool); - virtual void saveConfig (KConfig*); - virtual void loadConfig (KConfig*); + virtual void saveConfig (TDEConfig*); + virtual void loadConfig (TDEConfig*); protected: //igx virtual void virtual_hook (int, void*); @@ -107,8 +107,8 @@ public: %End - virtual void saveConfig (KConfig*); - virtual void loadConfig (KConfig*); + virtual void saveConfig (TDEConfig*); + virtual void loadConfig (TDEConfig*); %If ( KDE_3_2_0 - ) //ig void addButton (KDockButton_Private*); @@ -346,8 +346,8 @@ public: void dumpDockWidgets (); %End - void writeConfig (KConfig* = 0, TQString = TQString ::null ); - void readConfig (KConfig* = 0, TQString = TQString ::null ); + void writeConfig (TDEConfig* = 0, TQString = TQString ::null ); + void readConfig (TDEConfig* = 0, TQString = TQString ::null ); %If ( KDE_3_1_0 - ) void setMainDockWidget2 (KDockWidget*); @@ -405,8 +405,8 @@ public: KDockWidget* createDockWidget (const TQString&, const TQPixmap&, TQWidget* /Transfer/ = 0, const TQString& = 0, const TQString& = " "); void writeDockConfig (TQDomElement&); void readDockConfig (TQDomElement&); - void writeDockConfig (KConfig* = 0, TQString = TQString ::null ); - void readDockConfig (KConfig* = 0, TQString = TQString ::null ); + void writeDockConfig (TDEConfig* = 0, TQString = TQString ::null ); + void readDockConfig (TDEConfig* = 0, TQString = TQString ::null ); void activateDock (); TQPopupMenu* dockHideShowMenu (); void makeDockVisible (KDockWidget*); @@ -443,8 +443,8 @@ public: KDockWidget* createDockWidget (const TQString&, const TQPixmap&, TQWidget* /Transfer/ = 0, const TQString& = 0, const TQString& = " "); void writeDockConfig (TQDomElement&); void readDockConfig (TQDomElement&); - void writeDockConfig (KConfig* = 0, TQString = TQString ::null ); - void readDockConfig (KConfig* = 0, TQString = TQString ::null ); + void writeDockConfig (TDEConfig* = 0, TQString = TQString ::null ); + void readDockConfig (TDEConfig* = 0, TQString = TQString ::null ); void activateDock (); TQPopupMenu* dockHideShowMenu (); void makeDockVisible (KDockWidget*); diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip index 6e0297c..2a5d4ca 100644 --- a/sip/tdeui/kkeydialog.sip +++ b/sip/tdeui/kkeydialog.sip @@ -52,7 +52,7 @@ public: bool insert (KActionCollection*, const TQString&); %End - void syncToConfig (const TQString&, KConfigBase*, bool); + void syncToConfig (const TQString&, TDEConfigBase*, bool); void commitChanges (); void save (); diff --git a/sip/tdeui/klistview.sip b/sip/tdeui/klistview.sip index e48e33a..8e0ff5d 100644 --- a/sip/tdeui/klistview.sip +++ b/sip/tdeui/klistview.sip @@ -85,8 +85,8 @@ public: void setAlternateBackground (const TQColor&); const TQColor& alternateBackground () const; - void saveLayout (KConfig*, const TQString&) const; - void restoreLayout (KConfig*, const TQString&); + void saveLayout (TDEConfig*, const TQString&) const; + void restoreLayout (TDEConfig*, const TQString&); virtual void setSorting (int, bool = 1); int columnSorted () const; bool ascendingSort () const; diff --git a/sip/tdeui/kmainwindow.sip b/sip/tdeui/kmainwindow.sip index 9f48a75..89567ff 100644 --- a/sip/tdeui/kmainwindow.sip +++ b/sip/tdeui/kmainwindow.sip @@ -84,13 +84,13 @@ public: TQString autoSaveGroup () const; %If ( KDE_3_3_0 - ) - void applyMainWindowSettings (KConfig*, const TQString&, bool); + void applyMainWindowSettings (TDEConfig*, const TQString&, bool); %End %End - void applyMainWindowSettings (KConfig*, const TQString& = TQString ::null ); - void saveMainWindowSettings (KConfig*, const TQString& = TQString ::null ); + void applyMainWindowSettings (TDEConfig*, const TQString& = TQString ::null ); + void saveMainWindowSettings (TDEConfig*, const TQString& = TQString ::null ); %If ( KDE_3_1_0 - ) void setStandardToolBarMenuEnabled (bool); @@ -168,16 +168,16 @@ protected: virtual void closeEvent (TQCloseEvent*); virtual bool queryExit (); virtual bool queryClose (); - virtual void saveProperties (KConfig*); - virtual void readProperties (KConfig*); - virtual void saveGlobalProperties (KConfig*); - virtual void readGlobalProperties (KConfig*); - void savePropertiesInternal (KConfig*, int); - bool readPropertiesInternal (KConfig*, int); + virtual void saveProperties (TDEConfig*); + virtual void readProperties (TDEConfig*); + virtual void saveGlobalProperties (TDEConfig*); + virtual void readGlobalProperties (TDEConfig*); + void savePropertiesInternal (TDEConfig*, int); + bool readPropertiesInternal (TDEConfig*, int); bool settingsDirty () const; TQString settingsGroup () const; - void saveWindowSize (KConfig*) const; - void restoreWindowSize (KConfig*); + void saveWindowSize (TDEConfig*) const; + void restoreWindowSize (TDEConfig*); void parseGeometry (bool); protected slots: diff --git a/sip/tdeui/kmessagebox.sip b/sip/tdeui/kmessagebox.sip index 01a5105..68a1bcd 100644 --- a/sip/tdeui/kmessagebox.sip +++ b/sip/tdeui/kmessagebox.sip @@ -207,7 +207,7 @@ public: static bool shouldBeShownContinue (const TQString&); static void saveDontShowAgainYesNo (const TQString&, KMessageBox::ButtonCode); static void saveDontShowAgainContinue (const TQString&); - static void setDontShowAskAgainConfig (KConfig*); + static void setDontShowAskAgainConfig (TDEConfig*); %If ( KDE_3_3_0 - ) static int createKMessageBox (KDialogBase*, TQMessageBox::Icon, const TQString&, const TQStringList&, const TQString&, bool*, int, const TQString& = TQString ::null ); diff --git a/sip/tdeui/kpanelapplet.sip b/sip/tdeui/kpanelapplet.sip index de0f1de..f3fc116 100644 --- a/sip/tdeui/kpanelapplet.sip +++ b/sip/tdeui/kpanelapplet.sip @@ -77,7 +77,7 @@ public: KPanelApplet (const TQString&, KPanelApplet::Type = Normal , int = 0, TQWidget* /TransferThis/ = 0, const char* = 0, WFlags = 0); virtual int widthForHeight (int) const; virtual int heightForWidth (int) const; - KConfig* config () const; + TDEConfig* config () const; %If ( KDE_3_2_0 - ) KSharedConfig::Ptr sharedConfig () const; diff --git a/sip/tdeui/kpanelextension.sip b/sip/tdeui/kpanelextension.sip index 26206ec..5d801c9 100644 --- a/sip/tdeui/kpanelextension.sip +++ b/sip/tdeui/kpanelextension.sip @@ -86,7 +86,7 @@ public: KPanelExtension (const TQString&, KPanelExtension::Type = Normal , int = 0, TQWidget* /TransferThis/ = 0, const char* = 0); virtual TQSize sizeHint (KPanelExtension::Position, TQSize) const; - KConfig* config () const; + TDEConfig* config () const; Type type () const; int actions () const; virtual void action (KPanelExtension::Action); diff --git a/sip/tdeui/kthemebase.sip b/sip/tdeui/kthemebase.sip index 0a1db3f..9fc652c 100644 --- a/sip/tdeui/kthemebase.sip +++ b/sip/tdeui/kthemebase.sip @@ -239,7 +239,7 @@ protected: TQColor* gradientHigh (KThemeBase::WidgetType) const; TQColor* gradientLow (KThemeBase::WidgetType) const; void readConfig (TQt::GUIStyle = TQt::WindowsStyle); -//ig void readWidgetConfig (int, KConfig*, TQString*, TQString*, bool*); +//ig void readWidgetConfig (int, TDEConfig*, TQString*, TQString*, bool*); void copyWidgetConfig (int, int, TQString*, TQString*); TQColorGroup* makeColorGroup (TQColor&, TQColor&, TQt::GUIStyle = TQt::WindowsStyle); KThemePixmap* scale (int, int, KThemeBase::WidgetType); @@ -247,8 +247,8 @@ protected: KThemePixmap* gradient (int, int, KThemeBase::WidgetType); KThemePixmap* blend (KThemeBase::WidgetType); void generateBorderPix (int); - void applyResourceGroup (KConfig*, int); - void applyMiscResourceGroup (KConfig*); + void applyResourceGroup (TDEConfig*, int); + void applyMiscResourceGroup (TDEConfig*); void readResourceGroup (int, TQString*, TQString*, bool*); void readMiscResourceGroup (); KThemePixmap* loadPixmap (TQString&); diff --git a/sip/tdeui/ktoolbar.sip b/sip/tdeui/ktoolbar.sip index 6bd7d34..5df7a7b 100644 --- a/sip/tdeui/ktoolbar.sip +++ b/sip/tdeui/ktoolbar.sip @@ -180,13 +180,13 @@ public: void setFlat (bool); int count (); void saveState (); - void saveSettings (KConfig*, const TQString&); + void saveSettings (TDEConfig*, const TQString&); %If ( KDE_3_3_0 - ) - void applySettings (KConfig*, const TQString&, bool); + void applySettings (TDEConfig*, const TQString&, bool); %End - void applySettings (KConfig*, const TQString&); + void applySettings (TDEConfig*, const TQString&); void setXMLGUIClient (KXMLGUIClient*); void setText (const TQString&); TQString text () const; @@ -237,7 +237,7 @@ protected: void showEvent (TQShowEvent*); void resizeEvent (TQResizeEvent*); bool event (TQEvent*); - void applyAppearanceSettings (KConfig*, const TQString&, bool = 0); + void applyAppearanceSettings (TDEConfig*, const TQString&, bool = 0); TQString settingsGroup () const; protected: |