summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog.2001-42
-rw-r--r--doc/classref/allclasses.html4
-rw-r--r--doc/classref/kio/KTrader.html16
-rw-r--r--doc/classref/kio/index.html2
-rw-r--r--doc/classref/tdecore/KLockFile.html12
-rw-r--r--doc/classref/tdecore/TDEConfig.html2
-rw-r--r--doc/classref/tdecore/TDEConfigBackEnd.html2
-rw-r--r--doc/classref/tdecore/index.html2
-rw-r--r--doc/examples.html2
-rw-r--r--examples/mimetype.py6
-rw-r--r--examples/pyTDEHTMLPart.py2
-rw-r--r--examples/pytde-sampler/qt_widgets/CONTRIB2
-rwxr-xr-xexamples/pytde-sampler/sampler.py4
-rw-r--r--sip/kio/ktrader.sip14
-rw-r--r--sip/kio/tdesycoca.sip2
-rw-r--r--sip/tdecore/klockfile.sip24
-rw-r--r--sip/tdecore/tdeconfig.sip2
-rw-r--r--sip/tdecore/tdeconfigbackend.sip2
18 files changed, 51 insertions, 51 deletions
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 @@
<tr ><td><a href="tdeui/KListViewSearchLine.html">KListViewSearchLine</A></td></tr>
<tr ><td><a href="tdeui/KListViewSearchLineWidget.html">KListViewSearchLineWidget</A></td></tr>
<tr ><td><a href="tdecore/TDELocale.html">TDELocale</A></td></tr>
-<tr ><td><a href="tdecore/KLockFile.html">KLockFile</A></td></tr>
+<tr ><td><a href="tdecore/TDELockFile.html">TDELockFile</A></td></tr>
<tr ><td><a href="tdecore/KMD4.html">KMD4</A></td></tr>
<tr ><td><a href="tdecore/KMD5.html">KMD5</A></td></tr>
<tr ><td><a href="tdeprint/KMJob.html">KMJob</A></td></tr>
@@ -740,7 +740,7 @@
<tr ><td><a href="tdeui/KToolBarPopupAction.html">KToolBarPopupAction</A></td></tr>
<tr ><td><a href="tdeui/KToolBarRadioGroup.html">KToolBarRadioGroup</A></td></tr>
<tr ><td><a href="tdeui/KToolBarSeparator.html">KToolBarSeparator</A></td></tr>
-<tr ><td><a href="tdeio/KTrader.html">KTrader</A></td></tr>
+<tr ><td><a href="tdeio/TDETrader.html">TDETrader</A></td></tr>
<tr ><td><a href="tdeio/KURIFilter.html">KURIFilter</A></td></tr>
<tr ><td><a href="tdeio/KURIFilterData.html">KURIFilterData</A></td></tr>
<tr ><td><a href="tdeio/KURIFilterPlugin.html"><i>KURIFilterPlugin</i></A></td></tr>
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"">
<html>
<head>
- <title>class KTrader</title>
+ <title>class TDETrader</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="GENERATOR" content="wabbit dumphtml">
</head>
@@ -12,7 +12,7 @@
<hr>
<table width="100%"><tr>
<td width ="70%">
- <h1>class KTrader</h1><hr>
+ <h1>class TDETrader</h1><hr>
</td>
<td width="30%" valign="top" align="right">
<table>
@@ -28,18 +28,18 @@
<td width="30%" align=left>kio</td>
</tr>
<tr><td>Class</td>
- <td>KTrader</td>
+ <td>TDETrader</td>
</tr>
<tr><td>Inherits</td>
<td>TQObject </td>
</tr>
</table>
<h3>methods</h3><ul>
-<li><b>KTrader</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KTrader instance</i></td></tr>
+<li><b>TDETrader</b> ()
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDETrader instance</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>query</b> (servicetype, constraint = TQString .null, preferences = TQString .null)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KTrader.OfferList)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDETrader.OfferList)</i></td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>servicetype</td><td>TQString</td><td></td></tr>
<tr><td>constraint</td><td>TQString</td><td>TQString .null</td></tr>
@@ -47,7 +47,7 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>query</b> (servicetype, genericServiceType, constraint, preferences)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KTrader.OfferList)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDETrader.OfferList)</i></td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>servicetype</td><td>TQString</td><td></td></tr>
<tr><td>genericServiceType</td><td>TQString</td><td></td></tr>
@@ -56,7 +56,7 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>self</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KTrader)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDETrader)</i></td></tr>
<tr><td><i>static</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
</ul>
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 @@
<tr ><td><a href="KSycocaEntry.html"><i>KSycocaEntry</i></a></td></tr>
<tr ><td><a href="KSycocaFactory.html"><i>KSycocaFactory</i></a></td></tr>
<tr ><td><a href="KTar.html">KTar</a></td></tr>
-<tr ><td><a href="KTrader.html">KTrader</a></td></tr>
+<tr ><td><a href="TDETrader.html">TDETrader</a></td></tr>
<tr ><td><a href="KURIFilter.html">KURIFilter</a></td></tr>
<tr ><td><a href="KURIFilterData.html">KURIFilterData</a></td></tr>
<tr ><td><a href="KURIFilterPlugin.html"><i>KURIFilterPlugin</i></a></td></tr>
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"">
<html>
<head>
- <title>class KLockFile</title>
+ <title>class TDELockFile</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="GENERATOR" content="wabbit dumphtml">
</head>
@@ -12,7 +12,7 @@
<hr>
<table width="100%"><tr>
<td width ="70%">
- <h1>class KLockFile</h1><hr>
+ <h1>class TDELockFile</h1><hr>
</td>
<td width="30%" valign="top" align="right">
<table>
@@ -28,7 +28,7 @@
<td width="30%" align=left>tdecore</td>
</tr>
<tr><td>Class</td>
- <td>KLockFile</td>
+ <td>TDELockFile</td>
</tr>
<tr><td>Inherits</td>
<td>TDEShared </td>
@@ -39,8 +39,8 @@
}<li><b>LockResult</b> = {LockOK, LockFail, LockError, LockStale
}</ul>
<h3>methods</h3><ul>
-<li><b>KLockFile</b> (file)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KLockFile instance</i></td></tr>
+<li><b>TDELockFile</b> (file)
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDELockFile instance</i></td></tr>
<tr><td>In versions KDE 3.3.0 and above only</td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>file</td><td>TQString</td><td></td></tr>
@@ -55,7 +55,7 @@
<tr><td>In versions KDE 3.3.0 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>lock</b> (options = 0)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KLockFile.LockResult)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDELockFile.LockResult)</i></td></tr>
<tr><td>In versions KDE 3.3.0 and above only</td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>options</td><td>int</td><td>0</td></tr>
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 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>lockFile</b> (bGlobal = 0)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KLockFile.Ptr)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDELockFile.Ptr)</i></td></tr>
<tr><td>In versions KDE 3.3.0 and above only</td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>bGlobal</td><td>bool</td><td>0</td></tr>
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 @@
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDEConfigBase.ConfigState)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>lockFile</b> (bGlobal = 0)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KLockFile.Ptr)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDELockFile.Ptr)</i></td></tr>
<tr><td>In versions KDE 3.3.0 and above only</td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>bGlobal</td><td>bool</td><td>0</td></tr>
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 @@
<tr ><td><a href="KLibLoader.html">KLibLoader</a></td></tr>
<tr ><td><a href="KLibrary.html">KLibrary</a></td></tr>
<tr ><td><a href="TDELocale.html">TDELocale</a></td></tr>
-<tr ><td><a href="KLockFile.html">KLockFile</a></td></tr>
+<tr ><td><a href="TDELockFile.html">TDELockFile</a></td></tr>
<tr ><td><a href="KMD4.html">KMD4</a></td></tr>
<tr ><td><a href="KMD5.html">KMD5</a></td></tr>
<tr ><td><a href="KMacroExpander.html">KMacroExpander</a></td></tr>
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.
<h2>mimetype.py</h2>
<p>
-mimetype.py displays several tabs of KMimeType/KService/KTrader related data
+mimetype.py displays several tabs of KMimeType/KService/TDETrader related data
</p>
<img src="images/mimetype.png" border=0>
<p>
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 <ktrader.h>
@@ -38,21 +38,21 @@ public:
//ig typedef TQValueListIterator<KService::Ptr> 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 <klockfile.h>
@@ -34,8 +34,8 @@ class KLockFile : TDEShared
public:
- typedef TDESharedPtr<KLockFile> Ptr;
- KLockFile (const TQString&);
+ typedef TDESharedPtr<TDELockFile> 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 <ksharedptr.h>
@@ -80,9 +80,9 @@ public:
if (!sipCpp)
return NULL;
- TDESharedPtr<KLockFile> *cPtr = new TDESharedPtr<KLockFile> (*(TDESharedPtr<KLockFile> *)sipCpp);
- KLockFile *cpp = cPtr->data ();
- PyObject *obj = sipConvertFromInstance (cpp, sipClass_KLockFile, sipTransferObj);
+ TDESharedPtr<TDELockFile> *cPtr = new TDESharedPtr<TDELockFile> (*(TDESharedPtr<TDELockFile> *)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<KLockFile> (cpp);
+ *sipCppPtr = new TDESharedPtr<TDELockFile> (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
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 17:42:03 +0000