diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4 index dbf3846..5c6e2ae 100644 --- a/ChangeLog.2001-4 +++ b/ChangeLog.2001-4 @@ -140,7 +140,7 @@ fixes for gcc2.96 compatiblility 2002/3/11 11:01:00 jim 3.0beta1: versioning to KDE3.0beta2; mapped types for TDESharedPtr descendants; KParts modified - now -works; KTrader added; support for long long added; +works; TDETrader added; support for long long added; created PyKDE2generic and revised build system; new examples; removed inaccessible member classes; added tdesu (all), tdeprint (>= 2.2.0), tdefx (3.0); diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html index 4e990f2..83e1411 100644 --- a/doc/classref/allclasses.html +++ b/doc/classref/allclasses.html @@ -513,7 +513,7 @@ KListViewSearchLine KListViewSearchLineWidget TDELocale -KLockFile +TDELockFile KMD4 KMD5 KMJob @@ -740,7 +740,7 @@ KToolBarPopupAction KToolBarRadioGroup KToolBarSeparator -KTrader +TDETrader KURIFilter KURIFilterData KURIFilterPlugin diff --git a/doc/classref/kio/KTrader.html b/doc/classref/kio/KTrader.html index e6e7357..e70f8ce 100644 --- a/doc/classref/kio/KTrader.html +++ b/doc/classref/kio/KTrader.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KTrader + class TDETrader @@ -12,7 +12,7 @@
-

class KTrader

+

class TDETrader

 @@ -28,18 +28,18 @@ - +
kio
ClassKTraderTDETrader
Inherits TQObject

methods

    -
  • KTrader () -
    +
  • TDETrader () +
    • returns a KTrader instance
    returns a TDETrader instance
  • query (servicetype, constraint = TQString .null, preferences = TQString .null) -
    +
    returns (KTrader.OfferList)
    returns (TDETrader.OfferList)
    @@ -47,7 +47,7 @@
    ArgumentTypeDefault
    servicetypeTQString
    constraintTQStringTQString .null
  • query (servicetype, genericServiceType, constraint, preferences) -
    +
    returns (KTrader.OfferList)
    returns (TDETrader.OfferList)
    @@ -56,7 +56,7 @@
    ArgumentTypeDefault
    servicetypeTQString
    genericServiceTypeTQString
  • self () - - + diff --git a/doc/classref/tdecore/KLockFile.html b/doc/classref/tdecore/KLockFile.html index 89de3b8..dbcf664 100644 --- a/doc/classref/tdecore/KLockFile.html +++ b/doc/classref/tdecore/KLockFile.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KLockFile + class TDELockFile @@ -12,7 +12,7 @@
    +
    returns (KTrader)
    returns (TDETrader)
    static
    diff --git a/doc/classref/kio/index.html b/doc/classref/kio/index.html index 3a24090..bb1242a 100644 --- a/doc/classref/kio/index.html +++ b/doc/classref/kio/index.html @@ -132,7 +132,7 @@
    KSycocaEntry
    KSycocaFactory
    KTar
    KTrader
    TDETrader
    KURIFilter
    KURIFilterData
    KURIFilterPlugin
    -

    class KLockFile

    +

    class TDELockFile

    		 @@ -28,7 +28,7 @@ - + @@ -39,8 +39,8 @@ }
  • LockResult = {LockOK, LockFail, LockError, LockStale }

    methods

      -
    • KLockFile (file) -
    • tdecore
    ClassKLockFileTDELockFile
    Inherits TDEShared
    +
  • TDELockFile (file) +
    • returns a KLockFile instance
    returns a TDELockFile instance
    In versions KDE 3.3.0 and above only
    @@ -55,7 +55,7 @@
    ArgumentTypeDefault
    fileTQString
    In versions KDE 3.3.0 and above only
  • lock (options = 0) -
    +
    returns (KLockFile.LockResult)
    returns (TDELockFile.LockResult)
    In versions KDE 3.3.0 and above only
    diff --git a/doc/classref/tdecore/TDEConfig.html b/doc/classref/tdecore/TDEConfig.html index d6d5837..1be46e8 100644 --- a/doc/classref/tdecore/TDEConfig.html +++ b/doc/classref/tdecore/TDEConfig.html @@ -102,7 +102,7 @@
    ArgumentTypeDefault
    optionsint0
  • lockFile (bGlobal = 0) -
    +
    returns (KLockFile.Ptr)
    returns (TDELockFile.Ptr)
    In versions KDE 3.3.0 and above only
    diff --git a/doc/classref/tdecore/TDEConfigBackEnd.html b/doc/classref/tdecore/TDEConfigBackEnd.html index 7c3b40f..9c6ae26 100644 --- a/doc/classref/tdecore/TDEConfigBackEnd.html +++ b/doc/classref/tdecore/TDEConfigBackEnd.html @@ -69,7 +69,7 @@
    ArgumentTypeDefault
    bGlobalbool0
    returns (TDEConfigBase.ConfigState)
  • lockFile (bGlobal = 0) -
    +
    returns (KLockFile.Ptr)
    returns (TDELockFile.Ptr)
    In versions KDE 3.3.0 and above only
    diff --git a/doc/classref/tdecore/index.html b/doc/classref/tdecore/index.html index 14483c2..1b00d6e 100644 --- a/doc/classref/tdecore/index.html +++ b/doc/classref/tdecore/index.html @@ -112,7 +112,7 @@ - + diff --git a/doc/examples.html b/doc/examples.html index 800508d..7a2e337 100644 --- a/doc/examples.html +++ b/doc/examples.html @@ -75,7 +75,7 @@ it, but it is working code.

    mimetype.py

    -mimetype.py displays several tabs of KMimeType/KService/KTrader related data +mimetype.py displays several tabs of KMimeType/KService/TDETrader related data

    diff --git a/examples/mimetype.py b/examples/mimetype.py index 90ea660..ca99534 100644 --- a/examples/mimetype.py +++ b/examples/mimetype.py @@ -43,7 +43,7 @@ from qt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, KURL from tdeui import KMainWindow, KTabCtl, KListBox -from kio import KMimeType, KService, KServiceGroup, KServiceType, KTrader, KServiceTypeProfile, KServiceGroup +from kio import KMimeType, KService, KServiceGroup, KServiceType, TDETrader, KServiceTypeProfile, KServiceGroup class MainWin (KMainWindow): def __init__ (self, *args): @@ -86,9 +86,9 @@ class OfferListTab (TQWidget): TQListViewItem (lv, "Preferred", "--------", "", "") TQListViewItem (lv, "", "", "", "") - trader = KTrader.self () + trader = TDETrader.self () slist = trader.query ("image/jpeg", "Type == 'Application'") - print "KTrader returned:", slist + print "TDETrader returned:", slist for s in slist: lvi = TQListViewItem (lv, s.type_ (), s.name (), s.exec_ (), s.library ()) diff --git a/examples/pyTDEHTMLPart.py b/examples/pyTDEHTMLPart.py index e4e209f..4f31e2b 100644 --- a/examples/pyTDEHTMLPart.py +++ b/examples/pyTDEHTMLPart.py @@ -49,7 +49,7 @@ from tdeui import KMainWindow, KMessageBox, KAction, KStdAction, KKeyDialog, KEd from qt import TQString, TQStringList -from kio import KTrader +from kio import TDETrader from tdehtml import TDEHTMLPart, TDEHTMLView diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB index 0c3ac50..1dd45b0 100644 --- a/examples/pytde-sampler/qt_widgets/CONTRIB +++ b/examples/pytde-sampler/qt_widgets/CONTRIB @@ -470,7 +470,7 @@ kio,KSycoca,,, kio,KSycocaEntry,,, kio,KSycocaFactory,,, kio,KTar,,, -kio,KTrader,,, +kio,TDETrader,,, kio,KURIFilter,,, kio,KURIFilterData,,, kio,KURIFilterPlugin,,, diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py index 2a8146e..dfb2a06 100755 --- a/examples/pytde-sampler/sampler.py +++ b/examples/pytde-sampler/sampler.py @@ -21,7 +21,7 @@ from tdeui import KComboBox, KListView, KListViewItem, KTabWidget, KTextEdit from tdeui import KMainWindow, KPushButton, KSplashScreen, KStdAction from tdeui import KKeyDialog, KEditToolbar -from kio import KTrader +from kio import TDETrader from tdeparts import createReadOnlyPart, createReadWritePart from tdehtml import TDEHTMLPart @@ -70,7 +70,7 @@ def buildPart(parent, query, constraint, writable=False): """ builds the first available offered part on the parent """ - offers = KTrader.self().query(query, constraint) + offers = TDETrader.self().query(query, constraint) for ptr in offers: if writable: builder = createReadWritePart diff --git a/sip/kio/ktrader.sip b/sip/kio/ktrader.sip index b3421b0..4a019cf 100644 --- a/sip/kio/ktrader.sip +++ b/sip/kio/ktrader.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KTrader : TQObject +class TDETrader : TQObject { %TypeHeaderCode #include @@ -38,21 +38,21 @@ public: //ig typedef TQValueListIterator OfferListIterator; %End - virtual KTrader::OfferList query (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null ) const; - KTrader::OfferList query (const TQString&, const TQString&, const TQString&, const TQString&) const; - static KTrader* self (); + virtual TDETrader::OfferList query (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null ) const; + TDETrader::OfferList query (const TQString&, const TQString&, const TQString&, const TQString&) const; + static TDETrader* self (); protected: - KTrader (); + TDETrader (); protected: //igx virtual void virtual_hook (int, void*); -}; // class KTrader +}; // class TDETrader -%MappedType KTrader::OfferList +%MappedType TDETrader::OfferList //converts a Python list of KService { %TypeHeaderCode diff --git a/sip/kio/tdesycoca.sip b/sip/kio/tdesycoca.sip index c83166d..2bfe1dc 100644 --- a/sip/kio/tdesycoca.sip +++ b/sip/kio/tdesycoca.sip @@ -137,7 +137,7 @@ protected: {sipName_KShellCompletion, &sipClass_KShellCompletion}, {sipName_KShred, &sipClass_KShred}, {sipName_KSycoca, &sipClass_KSycoca}, - {sipName_KTrader, &sipClass_KTrader}, + {sipName_TDETrader, &sipClass_TDETrader}, {sipName_KURIFilterPlugin, &sipClass_KURIFilterPlugin}, {sipName_KURLCompletion, &sipClass_KURLCompletion}, {sipName_ListJob, &sipClass_KIO_ListJob}, diff --git a/sip/tdecore/klockfile.sip b/sip/tdecore/klockfile.sip index 6082dab..fe3bc95 100644 --- a/sip/tdecore/klockfile.sip +++ b/sip/tdecore/klockfile.sip @@ -26,7 +26,7 @@ %If ( KDE_3_3_0 - ) -class KLockFile : TDEShared +class TDELockFile : TDEShared { %TypeHeaderCode #include @@ -34,8 +34,8 @@ class KLockFile : TDEShared public: - typedef TDESharedPtr Ptr; - KLockFile (const TQString&); + typedef TDESharedPtr Ptr; + TDELockFile (const TQString&); enum LockResult { @@ -52,22 +52,22 @@ public: LockForce }; - KLockFile::LockResult lock (int = 0); + TDELockFile::LockResult lock (int = 0); bool isLocked () const; void unlock (); int staleTime () const; void setStaleTime (int); bool getLockInfo (int& /Out/, TQString& /Out/, TQString& /Out/); -}; // class KLockFile +}; // class TDELockFile %End %If (KDE_3_3_0 - ) -%MappedType KLockFile::Ptr -//converts KLockFile +%MappedType TDELockFile::Ptr +//converts TDELockFile { %TypeHeaderCode #include @@ -80,9 +80,9 @@ public: if (!sipCpp) return NULL; - TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); - KLockFile *cpp = cPtr->data (); - PyObject *obj = sipConvertFromInstance (cpp, sipClass_KLockFile, sipTransferObj); + TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); + TDELockFile *cpp = cPtr->data (); + PyObject *obj = sipConvertFromInstance (cpp, sipClass_TDELockFile, sipTransferObj); return obj; %End @@ -94,7 +94,7 @@ public: return PyInstance_Check(sipPy); int iserr = 0; - KLockFile *cpp = (KLockFile *)sipForceConvertToType(sipPy, sipType_KLockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + TDELockFile *cpp = (TDELockFile *)sipForceConvertToType(sipPy, sipType_TDELockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { @@ -102,7 +102,7 @@ public: return 0; } - *sipCppPtr = new TDESharedPtr (cpp); + *sipCppPtr = new TDESharedPtr (cpp); return 1; %End diff --git a/sip/tdecore/tdeconfig.sip b/sip/tdecore/tdeconfig.sip index 354bfa0..f93133f 100644 --- a/sip/tdecore/tdeconfig.sip +++ b/sip/tdecore/tdeconfig.sip @@ -53,7 +53,7 @@ public: TDEConfig* copyTo (const TQString&, TDEConfig* = 0) const; %If ( KDE_3_3_0 - ) - KLockFile::Ptr lockFile (bool = 0); + TDELockFile::Ptr lockFile (bool = 0); %End %End diff --git a/sip/tdecore/tdeconfigbackend.sip b/sip/tdecore/tdeconfigbackend.sip index 1afa8e2..21391a8 100644 --- a/sip/tdecore/tdeconfigbackend.sip +++ b/sip/tdecore/tdeconfigbackend.sip @@ -46,7 +46,7 @@ public: bool checkConfigFilesWritable (bool); %If ( KDE_3_3_0 - ) - KLockFile::Ptr lockFile (bool = 0); + TDELockFile::Ptr lockFile (bool = 0); %End %End

    ArgumentTypeDefault
    bGlobalbool0
    KLibLoader
    KLibrary
    TDELocale
    KLockFile
    TDELockFile
    KMD4
    KMD5
    KMacroExpander