| returns (KInstance) |
+| returns (TDEInstance) |
| In versions less than KDE 3.2.0 only |
| |
instance ()
-| returns (KInstance) |
+| returns (TDEInstance) |
| In versions KDE 3.2.0 and above only |
| |
isAutoConnectShortcuts ()
@@ -462,14 +462,14 @@
| returns nothing |
| In versions less than KDE 3.2.0 only |
| Argument | Type | Default |
|---|
-| a0 | KInstance | |
+| a0 | TDEInstance | |
| |
setInstance (instance)
| returns nothing |
| In versions KDE 3.2.0 and above only |
| Argument | Type | Default |
|---|
-| instance | KInstance | |
+| instance | TDEInstance | |
| |
setWidget (a0)
diff --git a/doc/classref/tdeui/KActionShortcutList.html b/doc/classref/tdeui/KActionShortcutList.html
index f1aa228..2ae9928 100644
--- a/doc/classref/tdeui/KActionShortcutList.html
+++ b/doc/classref/tdeui/KActionShortcutList.html
@@ -59,7 +59,7 @@
| |
instance ()
-| returns (KInstance) |
+
isConfigurable (a0)
| returns (bool) |
diff --git a/doc/classref/tdeui/KBugReport.html b/doc/classref/tdeui/KBugReport.html
index b779ae8..1e6ab4f 100644
--- a/doc/classref/tdeui/KBugReport.html
+++ b/doc/classref/tdeui/KBugReport.html
@@ -40,7 +40,7 @@
| Argument | Type | Default |
|---|
| parent | TQWidget | 0 |
| modal | bool | 1 |
-| aboutData | KAboutData | 0 |
+| aboutData | TDEAboutData | 0 |
| |
appChanged (a0)
diff --git a/doc/classref/tdeui/KCModule.html b/doc/classref/tdeui/KCModule.html
index 631ce61..66cb16a 100644
--- a/doc/classref/tdeui/KCModule.html
+++ b/doc/classref/tdeui/KCModule.html
@@ -49,13 +49,13 @@
KCModule (instance, parent = 0, args = TQStringList ())
| returns a KCModule instance |
| Argument | Type | Default |
|---|
-| instance | KInstance | |
+| instance | TDEInstance | |
| parent | TQWidget | 0 |
| args | TQStringList | TQStringList () |
| |
aboutData ()
-| returns (KAboutData) |
+
addConfig (config, widget)
| returns (KConfigDialogManager) |
@@ -86,7 +86,7 @@
instance ()
-| returns (KInstance) |
+
load ()
| returns nothing |
@@ -111,7 +111,7 @@
| returns nothing |
| In versions KDE 3.3.0 and above only |
| Argument | Type | Default |
|---|
-| about | KAboutData | |
+| about | TDEAboutData | |
| |
setButtons (btn)
diff --git a/doc/classref/tdeui/KGuiItem.html b/doc/classref/tdeui/KGuiItem.html
index b49160b..3997b42 100644
--- a/doc/classref/tdeui/KGuiItem.html
+++ b/doc/classref/tdeui/KGuiItem.html
@@ -76,7 +76,7 @@
| Argument | Type | Default |
|---|
| a0 | KIcon.Group | |
| size | int | 0 |
-| instance | KInstance | KGlobal .instance () |
+| instance | TDEInstance | KGlobal .instance () |
| |
iconSet ()
diff --git a/doc/classref/tdeui/KHelpMenu.html b/doc/classref/tdeui/KHelpMenu.html
index 0ba8395..3104c98 100644
--- a/doc/classref/tdeui/KHelpMenu.html
+++ b/doc/classref/tdeui/KHelpMenu.html
@@ -50,7 +50,7 @@
| returns a KHelpMenu instance |
| Argument | Type | Default |
|---|
| parent | TQWidget | |
-| aboutData | KAboutData | |
+| aboutData | TDEAboutData | |
| showWhatsThis | bool | 1 |
| actions | KActionCollection | 0 |
diff --git a/doc/classref/tdeui/KSystemTray.html b/doc/classref/tdeui/KSystemTray.html
index 3e23cc8..32f483a 100644
--- a/doc/classref/tdeui/KSystemTray.html
+++ b/doc/classref/tdeui/KSystemTray.html
@@ -72,7 +72,7 @@
| | static |
| Argument | Type | Default |
|---|
| icon | TQString | |
-| instance | KInstance | KGlobal .instance () |
+| instance | TDEInstance | KGlobal .instance () |
|
mousePressEvent (a0)
diff --git a/doc/classref/tdeui/KToolBar.html b/doc/classref/tdeui/KToolBar.html
index 9b20efe..f2274ba 100644
--- a/doc/classref/tdeui/KToolBar.html
+++ b/doc/classref/tdeui/KToolBar.html
@@ -291,7 +291,7 @@
| enabled | bool | 1 |
| text | TQString | TQString .null |
| index | int | -1 |
-| _instance | KInstance | KGlobal .instance () |
+| _instance | TDEInstance | KGlobal .instance () |
|
|
insertButton (icon, id, signal, slot, enabled = 1, text = TQString .null, index = -1, _instance = KGlobal .instance ())
@@ -304,7 +304,7 @@
| enabled | bool | 1 |
| text | TQString | TQString .null |
| index | int | -1 |
-| _instance | KInstance | KGlobal .instance () |
+| _instance | TDEInstance | KGlobal .instance () |
|
|
insertButton (pixmap, id, enabled = 1, text = TQString .null, index = -1)
diff --git a/doc/classref/tdeui/KToolBarButton.html b/doc/classref/tdeui/KToolBarButton.html
index 386fee3..1fb533f 100644
--- a/doc/classref/tdeui/KToolBarButton.html
+++ b/doc/classref/tdeui/KToolBarButton.html
@@ -43,7 +43,7 @@
| parent | TQWidget | |
| name | char | 0 |
| txt | TQString | TQString .null |
-| _instance | KInstance | KGlobal .instance () |
+| _instance | TDEInstance | KGlobal .instance () |
|
|
KToolBarButton (pixmap, id, parent, name = 0, txt = TQString .null)
diff --git a/doc/classref/tdeui/KXMLGUIBuilder.html b/doc/classref/tdeui/KXMLGUIBuilder.html
index c1ed222..ae4d2e7 100644
--- a/doc/classref/tdeui/KXMLGUIBuilder.html
+++ b/doc/classref/tdeui/KXMLGUIBuilder.html
@@ -45,7 +45,7 @@
builderInstance ()
-| returns (KInstance) |
+
containerTags ()
| returns (TQStringList) |
@@ -95,7 +95,7 @@
setBuilderInstance (instance)
| Argument | Type | Default |
|---|
-| instance | KInstance | |
+| instance | TDEInstance | |
| |
widget ()
diff --git a/doc/classref/tdeui/KXMLGUIClient.html b/doc/classref/tdeui/KXMLGUIClient.html
index fdfcce6..6b97cd2 100644
--- a/doc/classref/tdeui/KXMLGUIClient.html
+++ b/doc/classref/tdeui/KXMLGUIClient.html
@@ -123,7 +123,7 @@
| |
instance ()
-| returns (KInstance) |
+
localXMLFile ()
| returns (TQString) |
@@ -176,7 +176,7 @@
setInstance (instance)
| Argument | Type | Default |
|---|
-| instance | KInstance | |
+| instance | TDEInstance | |
| |
setLocalXMLFile (file)
diff --git a/doc/classref/tdeui/KXMLGUIFactory.html b/doc/classref/tdeui/KXMLGUIFactory.html
index 325aa3a..6589fc1 100644
--- a/doc/classref/tdeui/KXMLGUIFactory.html
+++ b/doc/classref/tdeui/KXMLGUIFactory.html
@@ -132,7 +132,7 @@
| Argument | Type | Default |
|---|
| filename | TQString | |
| never_null | bool | |
-| instance | KInstance | 0 |
+| instance | TDEInstance | 0 |
| |
readConfigFile (filename, instance = 0)
@@ -140,7 +140,7 @@
| static |
| Argument | Type | Default |
|---|
| filename | TQString | |
-| instance | KInstance | 0 |
+| instance | TDEInstance | 0 |
| |
removeClient (client)
@@ -172,7 +172,7 @@
| Argument | Type | Default |
|---|
| doc | TQDomDocument | |
| filename | TQString | |
-| instance | KInstance | 0 |
+| instance | TDEInstance | 0 |
| |
unplugActionList (client, name)
diff --git a/doc/trouble.html b/doc/trouble.html
index 5e8a24e..3c589df 100644
--- a/doc/trouble.html
+++ b/doc/trouble.html
@@ -154,14 +154,14 @@ from loading. The error message will normally print a "mangled" version of the m
> ImportError: /usr/lib/python2.2/site-packages/libtdecorecmodule.so:
- > undefined symbol: _ZNK10KAboutData18copyrightStatementEv
+ > undefined symbol: _ZNK10TDEAboutData18copyrightStatementEv
|
|
You can decipher the mangled name to a class and method (in the example above,
-KAboutData::copyrightStatement) by running:
+TDEAboutData::copyrightStatement) by running:
@@ -171,7 +171,7 @@ KAboutData::copyrightStatement) by running:
for example:
- c++filt _ZNK10KAboutData18copyrightStatementEv
+ c++filt _ZNK10TDEAboutData18copyrightStatementEv
@@ -289,7 +289,7 @@ from Simon Edwards:
> I'm trying to setup PyKDE on my Mandrake 9.1/python 2.2 box but so far I
> ImportError: /usr/lib/python2.2/site-packages/libtdecorecmodule.so:
- > undefined symbol: _ZNK10KAboutData18copyrightStatementEv
+ > undefined symbol: _ZNK10TDEAboutData18copyrightStatementEv
Let me guess. You are using the original KDE version that came with Mandrake
9.1. :) yeah, there is a problem and the PyKDE rpms for mandrake don't work
diff --git a/examples/example_dcopexport.py b/examples/example_dcopexport.py
index 6c9efdb..2e7a504 100644
--- a/examples/example_dcopexport.py
+++ b/examples/example_dcopexport.py
@@ -34,7 +34,7 @@ copyright holder.
# which was written by Torben Weis and Julian Rockey
import sys
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from dcopexport import DCOPExObj
from qt import TQString, TQStringList
@@ -102,8 +102,8 @@ class DeadParrotObject (DCOPExObj):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("testdcopexport", "petshop",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("testdcopexport", "petshop",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/examples/example_dcopext.py b/examples/example_dcopext.py
index e206a21..721df50 100644
--- a/examples/example_dcopext.py
+++ b/examples/example_dcopext.py
@@ -30,7 +30,7 @@ copyright holder.
import sys, time
import dcop
import dcopext
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from qt import TQString, TQCString
@@ -54,8 +54,8 @@ def getAnyApplication (client, appName):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("testdcopext", "testdcopext",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("testdcopext", "testdcopext",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/examples/kurldemo.py b/examples/kurldemo.py
index 0c03007..2ef56d3 100644
--- a/examples/kurldemo.py
+++ b/examples/kurldemo.py
@@ -31,7 +31,7 @@ urls = ["http://slashdot.org", "http://www.kde.org", "http://www.riverbankcomput
import sys
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, KURL
from tdeui import KMainWindow, KEdit
class MainWin (KMainWindow):
@@ -81,8 +81,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/examples/menudemo.py b/examples/menudemo.py
index f6426ce..59931e8 100644
--- a/examples/menudemo.py
+++ b/examples/menudemo.py
@@ -43,7 +43,7 @@ import sys
from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KIcon, KIconLoader, KShortcut
from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
KActionSeparator, KActionMenu, KWindowListMenu
@@ -274,8 +274,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/examples/mimetype.py b/examples/mimetype.py
index fc85699..e9d0031 100644
--- a/examples/mimetype.py
+++ b/examples/mimetype.py
@@ -41,7 +41,7 @@ import sys
from qt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, KURL
from tdeui import KMainWindow, KTabCtl, KListBox
from kio import KMimeType, KService, KServiceGroup, KServiceType, KTrader, KServiceTypeProfile, KServiceGroup
@@ -255,8 +255,8 @@ class KMimeTypeTab (TQWidget):
description = "Test/demo KSharedPtr related methods/classes"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 Jim Bublitz")
TDECmdLineArgs.init (sys.argv, aboutData)
diff --git a/examples/pyKHTMLPart.py b/examples/pyKHTMLPart.py
index bcccdc7..e483d6f 100644
--- a/examples/pyKHTMLPart.py
+++ b/examples/pyKHTMLPart.py
@@ -43,7 +43,7 @@ lifted from the KDE classref.
# If you import more classes, don't forget to add them here (some of these
# are extras/not used)
-from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, KAboutData, BarIcon, KLibLoader
+from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, TDEAboutData, BarIcon, KLibLoader
from tdeui import KMainWindow, KMessageBox, KAction, KStdAction, KKeyDialog, KEditToolbar
@@ -186,8 +186,8 @@ description = "KHTMLPart - simple example"
version = "0.1"
# stuff for the "About" menu
-aboutData = KAboutData ("pyKHTMLPart", "pyHTMLPart",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("pyKHTMLPart", "pyHTMLPart",\
+ version, description, TDEAboutData.License_GPL,\
"(c) 2002, Jim Bublitz")
aboutData.addAuthor ("Jim Bublitz", "Example for PyKDE", "jbublitz@nwinternet.com")
diff --git a/examples/pytde-sampler/about.py b/examples/pytde-sampler/about.py
index 108194b..f675b1c 100644
--- a/examples/pytde-sampler/about.py
+++ b/examples/pytde-sampler/about.py
@@ -1,11 +1,11 @@
#!/usr/bin/env python
""" About the PyKDE Sampler
-Defines the 'about' function to create a KAboutData instance for the
+Defines the 'about' function to create a TDEAboutData instance for the
sampler application.
"""
from os.path import dirname, join
-from tdecore import KAboutData
+from tdecore import TDEAboutData
appName = 'pytdesampler'
@@ -14,7 +14,7 @@ authorName = 'Troy Melhase'
authorEmail = bugsEmailAddress = 'troy@gci.net'
version = '0.1'
shortDescription = 'The PyKDE Sampler'
-licenseType = KAboutData.License_GPL_V2
+licenseType = TDEAboutData.License_GPL_V2
copyrightStatement = '(c) 2006, %s' % (authorName, )
homePageAddress = 'http://www.riverbankcomputing.co.uk/pytde/'
aboutText = ("The application sampler for PyKDE.")
@@ -22,10 +22,10 @@ contributors = [] # module-level global for keeping the strings around; intentio
def about():
- """ creates KAboutData instance for the app
+ """ creates TDEAboutData instance for the app
"""
- about = KAboutData(
+ about = TDEAboutData(
appName,
progName,
version,
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index 3c741aa..4a37f4f 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -11,7 +11,7 @@ tdecore,BarIconSet,,,
tdecore,DesktopIcon,,,
tdecore,DesktopIconSet,,,
tdecore,IconSize,,,
-tdecore,KAboutData,,,
+tdecore,TDEAboutData,,,
tdecore,KAboutPerson,,,
tdecore,KAboutTranslator,,,
tdecore,KAccel,,,
@@ -57,7 +57,7 @@ tdecore,KIcon,,,
tdecore,KIconEffect,,,
tdecore,KIconLoader,,,
tdecore,KIconTheme,,,
-tdecore,KInstance,,,
+tdecore,TDEInstance,,,
tdecore,KKey,,,
tdecore,KKeyNative,,,
tdecore,KKeySequence,,,
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index 4e7eb43..f8048f8 100755
--- a/examples/pytde-sampler/sampler.py
+++ b/examples/pytde-sampler/sampler.py
@@ -14,7 +14,7 @@ from qt import SIGNAL, SLOT, PYSIGNAL, TQt
from qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
from qt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton
-from tdecore import i18n, KAboutData, TDEApplication, TDECmdLineArgs, KGlobal
+from tdecore import i18n, TDEAboutData, TDEApplication, TDECmdLineArgs, KGlobal
from tdecore import KGlobalSettings, KWin, KWinModule, KURL, KIcon
from tdeui import KComboBox, KListView, KListViewItem, KTabWidget, KTextEdit
diff --git a/examples/uikmdi.py b/examples/uikmdi.py
index 32735ce..2b26dde 100644
--- a/examples/uikmdi.py
+++ b/examples/uikmdi.py
@@ -29,7 +29,7 @@ import os
import sys
from qt import SIGNAL, TQVBoxLayout, TQLabel
-from tdecore import i18n, KAboutData, TDEApplication, KGlobal, KIcon, TDECmdLineArgs
+from tdecore import i18n, TDEAboutData, TDEApplication, KGlobal, KIcon, TDECmdLineArgs
from tdeui import KDockWidget, KListBox, KStdAction
try:
@@ -189,11 +189,11 @@ if __name__ == '__main__':
aname = 'PyKDE KMDI Sample'
desc = 'A Simple PyKDE KMDI Sample'
ver = '1.0'
- lic = KAboutData.License_GPL
+ lic = TDEAboutData.License_GPL
author = 'Troy Melhase'
authormail = 'troy@gci.net'
- about = KAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
+ about = TDEAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
about.addAuthor(author, 'hi, mom!', authormail)
about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
TDECmdLineArgs.init(sys.argv, about)
diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py
index a204d7a..969f23a 100644
--- a/examples/uiqxembed.py
+++ b/examples/uiqxembed.py
@@ -6,7 +6,7 @@ import sys
from qt import TQIconSet, TQProcess, TQTimer, SIGNAL, SLOT
-from tdecore import KAboutData, TDEApplication, TDECmdLineArgs, KGlobal, KIcon
+from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, KGlobal, KIcon
from tdecore import KWin, KWinModule
from tdeui import KComboBox, KMainWindow, KPushButton, QXEmbed
@@ -104,11 +104,11 @@ if __name__ == '__main__':
aname = 'PyKDE QXEmbed Sample'
desc = 'A Simple PyKDE QXEmbed Sample'
ver = '1.0'
- lic = KAboutData.License_GPL
+ lic = TDEAboutData.License_GPL
author = 'Troy Melhase'
authormail = 'troy@gci.net'
- about = KAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
+ about = TDEAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
about.addAuthor(author, 'hi, mom!', authormail)
about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
TDECmdLineArgs.init(sys.argv, about)
diff --git a/examples/uisampler.py b/examples/uisampler.py
index 3a1b00c..863a9f0 100644
--- a/examples/uisampler.py
+++ b/examples/uisampler.py
@@ -3,7 +3,7 @@ sys.path.append ("./uimodules")
from qt import TQSplitter, TQWidgetStack, TQWidget, TQListViewItem, SIGNAL, TQCString , TQScrollView, TQRect, TQt
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from tdeui import KMainWindow, KListView
from uidialogs import *
diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py
index bc9a9a2..5279896 100644
--- a/examples/xmlmenudemo.py
+++ b/examples/xmlmenudemo.py
@@ -43,7 +43,7 @@ import sys, os
from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
KActionSeparator, KActionMenu, KWindowListMenu, KXMLGUIClient, KActionCollection
@@ -273,8 +273,8 @@ version = "1.0"
# The appName (xmlmenudemo - first argument) is required
# if the program is to automatically locate it *ui.rc file
-aboutData = KAboutData ("xmlmenudemo", "xmlmenudemo",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("xmlmenudemo", "xmlmenudemo",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/extra/kde300/konsole_part.h b/extra/kde300/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde300/konsole_part.h
+++ b/extra/kde300/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde300/ktoolbarbutton.h b/extra/kde300/ktoolbarbutton.h
index 67f5ddd..49a457f 100644
--- a/extra/kde300/ktoolbarbutton.h
+++ b/extra/kde300/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde301/konsole_part.h b/extra/kde301/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde301/konsole_part.h
+++ b/extra/kde301/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde301/ktoolbarbutton.h b/extra/kde301/ktoolbarbutton.h
index d8a659b..7147029 100644
--- a/extra/kde301/ktoolbarbutton.h
+++ b/extra/kde301/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde303/konsole_part.h b/extra/kde303/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde303/konsole_part.h
+++ b/extra/kde303/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde303/ktoolbarbutton.h b/extra/kde303/ktoolbarbutton.h
index f9cb79e..6763dea 100644
--- a/extra/kde303/ktoolbarbutton.h
+++ b/extra/kde303/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde310/konsole_part.h b/extra/kde310/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde310/konsole_part.h
+++ b/extra/kde310/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde310/ktoolbarbutton.h b/extra/kde310/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde310/ktoolbarbutton.h
+++ b/extra/kde310/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde311/konsole_part.h b/extra/kde311/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde311/konsole_part.h
+++ b/extra/kde311/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde311/ktoolbarbutton.h b/extra/kde311/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde311/ktoolbarbutton.h
+++ b/extra/kde311/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde312/konsole_part.h b/extra/kde312/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde312/konsole_part.h
+++ b/extra/kde312/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde312/ktoolbarbutton.h b/extra/kde312/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde312/ktoolbarbutton.h
+++ b/extra/kde312/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde313/konsole_part.h b/extra/kde313/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde313/konsole_part.h
+++ b/extra/kde313/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde313/ktoolbarbutton.h b/extra/kde313/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde313/ktoolbarbutton.h
+++ b/extra/kde313/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde314/konsole_part.h b/extra/kde314/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde314/konsole_part.h
+++ b/extra/kde314/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde314/ktoolbarbutton.h b/extra/kde314/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde314/ktoolbarbutton.h
+++ b/extra/kde314/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde315/konsole_part.h b/extra/kde315/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde315/konsole_part.h
+++ b/extra/kde315/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde315/ktoolbarbutton.h b/extra/kde315/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde315/ktoolbarbutton.h
+++ b/extra/kde315/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde320/konsole_part.h b/extra/kde320/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde320/konsole_part.h
+++ b/extra/kde320/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde320/ktoolbarbutton.h b/extra/kde320/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde320/ktoolbarbutton.h
+++ b/extra/kde320/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde321/konsole_part.h b/extra/kde321/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde321/konsole_part.h
+++ b/extra/kde321/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde321/ktoolbarbutton.h b/extra/kde321/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde321/ktoolbarbutton.h
+++ b/extra/kde321/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde322/konsole_part.h b/extra/kde322/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde322/konsole_part.h
+++ b/extra/kde322/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde322/ktoolbarbutton.h b/extra/kde322/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde322/ktoolbarbutton.h
+++ b/extra/kde322/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde323/konsole_part.h b/extra/kde323/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde323/konsole_part.h
+++ b/extra/kde323/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde323/ktoolbarbutton.h b/extra/kde323/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde323/ktoolbarbutton.h
+++ b/extra/kde323/ktoolbarbutton.h
@@ -32,7 +32,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde330/konsole_part.h b/extra/kde330/konsole_part.h
index e264732..94847b1 100644
--- a/extra/kde330/konsole_part.h
+++ b/extra/kde330/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde330/ktoolbarbutton.h b/extra/kde330/ktoolbarbutton.h
index 3243485..e59050a 100644
--- a/extra/kde330/ktoolbarbutton.h
+++ b/extra/kde330/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde331/konsole_part.h b/extra/kde331/konsole_part.h
index e264732..94847b1 100644
--- a/extra/kde331/konsole_part.h
+++ b/extra/kde331/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde331/ktoolbarbutton.h b/extra/kde331/ktoolbarbutton.h
index 3243485..e59050a 100644
--- a/extra/kde331/ktoolbarbutton.h
+++ b/extra/kde331/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde332/konsole_part.h b/extra/kde332/konsole_part.h
index e264732..94847b1 100644
--- a/extra/kde332/konsole_part.h
+++ b/extra/kde332/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde332/ktoolbarbutton.h b/extra/kde332/ktoolbarbutton.h
index 3243485..e59050a 100644
--- a/extra/kde332/ktoolbarbutton.h
+++ b/extra/kde332/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde340/konsole_part.h b/extra/kde340/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde340/konsole_part.h
+++ b/extra/kde340/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde340/ktoolbarbutton.h b/extra/kde340/ktoolbarbutton.h
index dcea85e..2febc9b 100644
--- a/extra/kde340/ktoolbarbutton.h
+++ b/extra/kde340/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde341/konsole_part.h b/extra/kde341/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde341/konsole_part.h
+++ b/extra/kde341/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde341/ktoolbarbutton.h b/extra/kde341/ktoolbarbutton.h
index dcea85e..2febc9b 100644
--- a/extra/kde341/ktoolbarbutton.h
+++ b/extra/kde341/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde342/konsole_part.h b/extra/kde342/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde342/konsole_part.h
+++ b/extra/kde342/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde342/ktoolbarbutton.h b/extra/kde342/ktoolbarbutton.h
index 77cbdc0..98f8476 100644
--- a/extra/kde342/ktoolbarbutton.h
+++ b/extra/kde342/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde343/konsole_part.h b/extra/kde343/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde343/konsole_part.h
+++ b/extra/kde343/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -56,11 +56,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde343/ktoolbarbutton.h b/extra/kde343/ktoolbarbutton.h
index 77cbdc0..98f8476 100644
--- a/extra/kde343/ktoolbarbutton.h
+++ b/extra/kde343/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde350/konsole_part.h b/extra/kde350/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde350/konsole_part.h
+++ b/extra/kde350/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -57,11 +57,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde350/ktoolbarbutton.h b/extra/kde350/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde350/ktoolbarbutton.h
+++ b/extra/kde350/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde351/konsole_part.h b/extra/kde351/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde351/konsole_part.h
+++ b/extra/kde351/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -57,11 +57,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde351/ktoolbarbutton.h b/extra/kde351/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde351/ktoolbarbutton.h
+++ b/extra/kde351/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde352/konsole_part.h b/extra/kde352/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde352/konsole_part.h
+++ b/extra/kde352/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -57,11 +57,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde352/ktoolbarbutton.h b/extra/kde352/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde352/ktoolbarbutton.h
+++ b/extra/kde352/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/extra/kde353/konsole_part.h b/extra/kde353/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde353/konsole_part.h
+++ b/extra/kde353/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -57,11 +57,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde353/ktoolbarbutton.h b/extra/kde353/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde353/ktoolbarbutton.h
+++ b/extra/kde353/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not
diff --git a/sip/kfile/knotifydialog.sip b/sip/kfile/knotifydialog.sip
index ebf00fe..5787bb2 100644
--- a/sip/kfile/knotifydialog.sip
+++ b/sip/kfile/knotifydialog.sip
@@ -34,9 +34,9 @@ class KNotifyDialog : KDialogBase
public:
- KNotifyDialog (TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1, const KAboutData* = 0);
+ KNotifyDialog (TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1, const TDEAboutData* = 0);
%MethodCode
-//takes parent | (TQWidget = 0) | name | (char = 0) | modal | (bool = 1) | aboutData | (KAboutData = see note)
+//takes parent | (TQWidget = 0) | name | (char = 0) | modal | (bool = 1) | aboutData | (TDEAboutData = see note)
//doc
// The default value for aboutData in C++ is KGlobal::instance()->aboutData()
// which sip is unable to parse. Since it's the last arg in the list, it has
@@ -46,17 +46,17 @@ public:
//end
if (a3 == 0)
- a3 = (KAboutData *)KGlobal::instance ()->aboutData ();
+ a3 = (TDEAboutData *)KGlobal::instance ()->aboutData ();
Py_BEGIN_ALLOW_THREADS
sipCpp = new sipKNotifyDialog (a0, a1, a2, a3);
Py_END_ALLOW_THREADS
%End
- static int configure (TQWidget* /Transfer/ = 0, const char* = 0, const KAboutData* = 0);
+ static int configure (TQWidget* /Transfer/ = 0, const char* = 0, const TDEAboutData* = 0);
%MethodCode
//returns (int)
-//takes parent | (TQWidget = 0) | name | (a Python string = "") | aboutData | (KAboutData = see note)
+//takes parent | (TQWidget = 0) | name | (a Python string = "") | aboutData | (TDEAboutData = see note)
//doc
// The default value for aboutData in C++ is KGlobal::instance()->aboutData()
// which sip is unable to parse. Since it's the last arg in the list, it has
@@ -66,7 +66,7 @@ public:
//end
if (a2 == 0)
- a2 = (KAboutData *)KGlobal::instance ()->aboutData ();
+ a2 = (TDEAboutData *)KGlobal::instance ()->aboutData ();
Py_BEGIN_ALLOW_THREADS
sipRes = KNotifyDialog::configure (a0, a1, a2);
diff --git a/sip/kio/kdatatool.sip b/sip/kio/kdatatool.sip
index 8395429..46071ce 100644
--- a/sip/kio/kdatatool.sip
+++ b/sip/kio/kdatatool.sip
@@ -33,7 +33,7 @@ class KDataToolInfo
public:
KDataToolInfo ();
- KDataToolInfo (const KService::Ptr&, KInstance*);
+ KDataToolInfo (const KService::Ptr&, TDEInstance*);
KDataToolInfo (const KDataToolInfo&);
TQString dataType () const;
TQStringList mimeTypes () const;
@@ -45,9 +45,9 @@ public:
TQStringList commands () const;
KDataTool* createTool (TQObject* /Transfer/ = 0, const char* = 0) const;
KService::Ptr service () const;
- KInstance* instance () const;
+ TDEInstance* instance () const;
bool isValid () const;
- static TQValueList query (const TQString&, const TQString&, KInstance*);
+ static TQValueList query (const TQString&, const TQString&, TDEInstance*);
}; // class KDataToolInfo
@@ -84,8 +84,8 @@ class KDataTool : TQObject
public:
KDataTool (TQObject* /TransferThis/ = 0, const char* = 0);
- void setInstance (KInstance*);
- KInstance* instance () const;
+ void setInstance (TDEInstance*);
+ TDEInstance* instance () const;
virtual bool run (const TQString&, void*, const TQString&, const TQString&) = 0;
protected:
diff --git a/sip/kio/kscan.sip b/sip/kio/kscan.sip
index 3355b34..022210e 100644
--- a/sip/kio/kscan.sip
+++ b/sip/kio/kscan.sip
@@ -65,7 +65,7 @@ protected:
KScanDialogFactory (TQObject* /TransferThis/ = 0, const char* = 0);
virtual TQObject* createObject (TQObject* /Transfer/ = 0, const char* = 0, const char* = "TQObject", const TQStringList& = TQStringList ());
void setName (const TQCString&);
- KInstance* instance () const;
+ TDEInstance* instance () const;
protected:
//igx virtual void virtual_hook (int, void*);
@@ -111,7 +111,7 @@ protected:
KOCRDialogFactory (TQObject* /TransferThis/ = 0, const char* = 0);
virtual TQObject* createObject (TQObject* /Transfer/ = 0, const char* = 0, const char* = "TQObject", const TQStringList& = TQStringList ());
void setName (const TQCString&);
- KInstance* instance () const;
+ TDEInstance* instance () const;
protected:
//igx virtual void virtual_hook (int, void*);
diff --git a/sip/kparts/factory.sip b/sip/kparts/factory.sip
index 6b919e2..35b18f8 100644
--- a/sip/kparts/factory.sip
+++ b/sip/kparts/factory.sip
@@ -38,8 +38,8 @@ public:
KParts::Part* createPart (TQWidget* = 0, const char* = 0, TQObject* /Transfer/ = 0, const char* = 0, const char* = "KParts::Part", const TQStringList& = TQStringList ());
%If ( KDE_3_2_0 - )
- const KInstance* partInstance ();
- static const KInstance* partInstanceFromLibrary (const TQCString&);
+ const TDEInstance* partInstance ();
+ static const TDEInstance* partInstanceFromLibrary (const TQCString&);
%End
diff --git a/sip/kparts/part.sip b/sip/kparts/part.sip
index c1f5758..4b8ca81 100644
--- a/sip/kparts/part.sip
+++ b/sip/kparts/part.sip
@@ -39,11 +39,11 @@ public:
TQObject* partObject () const;
protected:
- virtual void setInstance (KInstance*);
- virtual void setInstance (KInstance*, bool);
+ virtual void setInstance (TDEInstance*);
+ virtual void setInstance (TDEInstance*, bool);
%If ( KDE_3_1_0 - )
- void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, KInstance*);
+ void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, TDEInstance*);
//ig void setPluginLoadingMode (KParts::PartBase::PluginLoadingMode);
%End
diff --git a/sip/kparts/partmanager.sip b/sip/kparts/partmanager.sip
index 7f44390..ed4f6ca 100644
--- a/sip/kparts/partmanager.sip
+++ b/sip/kparts/partmanager.sip
@@ -93,7 +93,7 @@ signals:
void activePartChanged (KParts::Part*);
protected:
- virtual void setActiveInstance (KInstance*);
+ virtual void setActiveInstance (TDEInstance*);
protected slots:
void slotObjectDestroyed ();
diff --git a/sip/kparts/plugin.sip b/sip/kparts/plugin.sip
index f4cf8e8..54102dc 100644
--- a/sip/kparts/plugin.sip
+++ b/sip/kparts/plugin.sip
@@ -50,20 +50,20 @@ public:
Plugin (TQObject* /TransferThis/ = 0, const char* = 0);
virtual TQString xmlFile () const;
virtual TQString localXMLFile () const;
- static void loadPlugins (TQObject* /Transfer/, const KInstance*);
+ static void loadPlugins (TQObject* /Transfer/, const TDEInstance*);
static void loadPlugins (TQObject* /Transfer/, const TQValueList&);
- static void loadPlugins (TQObject* /Transfer/, const TQValueList&, const KInstance*);
+ static void loadPlugins (TQObject* /Transfer/, const TQValueList&, const TDEInstance*);
%If ( KDE_3_1_0 - )
- static void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, KInstance*, bool = 1);
+ static void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, TDEInstance*, bool = 1);
%End
static TQPtrList pluginObjects (TQObject* /Transfer/);
protected:
- static TQValueList pluginInfos (const KInstance*);
+ static TQValueList pluginInfos (const TDEInstance*);
static KParts::Plugin* loadPlugin (TQObject* /Transfer/, const char*);
- virtual void setInstance (KInstance*);
+ virtual void setInstance (TDEInstance*);
}; // class Plugin
diff --git a/sip/kutils/kcmoduleproxy.sip b/sip/kutils/kcmoduleproxy.sip
index 6387540..ea68785 100644
--- a/sip/kutils/kcmoduleproxy.sip
+++ b/sip/kutils/kcmoduleproxy.sip
@@ -44,11 +44,11 @@ public:
void load ();
void save ();
TQString quickHelp () const;
- const KAboutData* aboutData () const;
+ const TDEAboutData* aboutData () const;
int buttons () const;
TQString rootOnlyMsg () const;
bool useRootOnlyMsg () const;
- KInstance* instance () const;
+ TDEInstance* instance () const;
bool changed () const;
%If ( KDE_3_4_0 - )
diff --git a/sip/kutils/kpluginselector.sip b/sip/kutils/kpluginselector.sip
index 8b84eba..ec66e3f 100644
--- a/sip/kutils/kpluginselector.sip
+++ b/sip/kutils/kpluginselector.sip
@@ -36,7 +36,7 @@ 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 KInstance*, 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&, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0);
void setShowEmptyConfigPage (bool);
void load ();
diff --git a/sip/tdecore/kaboutdata.sip b/sip/tdecore/kaboutdata.sip
index 8b3f5a1..eb75fed 100644
--- a/sip/tdecore/kaboutdata.sip
+++ b/sip/tdecore/kaboutdata.sip
@@ -57,7 +57,7 @@ public:
}; // class KAboutTranslator
-class KAboutData
+class TDEAboutData
{
%TypeHeaderCode
#include
@@ -83,7 +83,7 @@ public:
public:
- KAboutData (const char*, const char*, const char*, const char* = 0, int = License_Unknown , const char* = 0, const char* = 0, const char* = 0, const char* = "submit@bugs.kde.org");
+ TDEAboutData (const char*, const char*, const char*, const char* = 0, int = License_Unknown , const char* = 0, const char* = 0, const char* = 0, const char* = "submit@bugs.kde.org");
void addAuthor (const char*, const char* = 0, const char* = 0, const char* = 0);
void addCredit (const char*, const char* = 0, const char* = 0, const char* = 0);
void setTranslator (const char*, const char*);
@@ -100,7 +100,7 @@ public:
void setVersion (const char*);
void setShortDescription (const char*);
- void setLicense (KAboutData::LicenseKey);
+ void setLicense (TDEAboutData::LicenseKey);
void setCopyrightStatement (const char*);
void setOtherText (const char*);
void setHomepage (const char*);
@@ -161,7 +161,7 @@ public:
%End
-}; // class KAboutData
+}; // class TDEAboutData
diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip
index 5306a5e..59e99a0 100644
--- a/sip/tdecore/kapplication.sip
+++ b/sip/tdecore/kapplication.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class TDEApplication : TQApplication, KInstance
+class TDEApplication : TQApplication, TDEInstance
{
%TypeHeaderCode
#include
@@ -291,10 +291,10 @@ public slots:
void deref ();
protected:
- TDEApplication (bool, bool, KInstance*);
+ TDEApplication (bool, bool, TDEInstance*);
%If ( KDE_3_3_0 - )
-//ig TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, KInstance*);
+//ig TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, TDEInstance*);
%End
//ig bool x11EventFilter (XEvent*);
diff --git a/sip/tdecore/kcmdlineargs.sip b/sip/tdecore/kcmdlineargs.sip
index 7a29bc1..f716f68 100644
--- a/sip/tdecore/kcmdlineargs.sip
+++ b/sip/tdecore/kcmdlineargs.sip
@@ -107,9 +107,9 @@ public:
updatePyArgv (a0, argc, argv);
%End
- static void init (SIP_PYLIST, const KAboutData*, bool = 0) [void (int, char**, const KAboutData*, bool = 0)];
+ static void init (SIP_PYLIST, const TDEAboutData*, bool = 0) [void (int, char**, const TDEAboutData*, bool = 0)];
%MethodCode
-//takes _argv | (a Python list of strings which may be modified) | about | (KAboutData) | noKApp | (bool = 0)
+//takes _argv | (a Python list of strings which may be modified) | about | (TDEAboutData) | noKApp | (bool = 0)
int argc, nargc; //, iserr = 0;
char **argv;
@@ -131,7 +131,7 @@ public:
updatePyArgv (a0, argc, argv);
%End
- static void init (const KAboutData*);
+ static void init (const TDEAboutData*);
static void addCmdLineOptions (SIP_PYLIST, const char* = 0, const char* = 0, const char* = 0) [void (const KCmdLineOptions*, const char* = 0, const char* = 0, const char* = 0)];
%MethodCode
//takes options | (a Python list of tuples) | name | (char = 0) | id | (char = 0) | afterId | (char = 0)
diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index 849bb07..7a03345 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -32,7 +32,7 @@ class KGlobal
public:
- static KInstance* instance ();
+ static TDEInstance* instance ();
static KStandardDirs* dirs ();
static KConfig* config ();
@@ -49,13 +49,13 @@ public:
static void unregisterStaticDeleter (KStaticDeleterBase*);
static void deleteStaticDeleters ();
//ig KStringDict* _stringDict;
-//ig KInstance* _instance;
+//ig TDEInstance* _instance;
//ig KLocale* _locale;
//ig KCharsets* _charsets;
//ig KStaticDeleterList* _staticDeleters;
- static void setActiveInstance (KInstance*);
- static KInstance* activeInstance ();
-//ig KInstance* _activeInstance;
+ static void setActiveInstance (TDEInstance*);
+ static TDEInstance* activeInstance ();
+//ig TDEInstance* _activeInstance;
}; // class KGlobal
diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip
index 23f4fcc..bf62f2e 100644
--- a/sip/tdecore/kiconloader.sip
+++ b/sip/tdecore/kiconloader.sip
@@ -79,19 +79,19 @@ public:
#include
%End
-TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap DesktopIcon (const TQString&, KInstance*);
-TQIconSet DesktopIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap BarIcon (const TQString&, KInstance*);
-TQIconSet BarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap SmallIcon (const TQString&, KInstance*);
-TQIconSet SmallIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap MainBarIcon (const TQString&, KInstance*);
-TQIconSet MainBarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap UserIcon (const TQString&, KInstance*);
-TQIconSet UserIconSet (const TQString&, KInstance* = KGlobal ::instance ());
-int IconSize (KIcon::Group, KInstance* = KGlobal ::instance ());
+TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap DesktopIcon (const TQString&, TDEInstance*);
+TQIconSet DesktopIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap BarIcon (const TQString&, TDEInstance*);
+TQIconSet BarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap SmallIcon (const TQString&, TDEInstance*);
+TQIconSet SmallIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap MainBarIcon (const TQString&, TDEInstance*);
+TQIconSet MainBarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap UserIcon (const TQString&, TDEInstance*);
+TQIconSet UserIconSet (const TQString&, TDEInstance* = KGlobal ::instance ());
+int IconSize (KIcon::Group, TDEInstance* = KGlobal ::instance ());
diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip
index 5ee05ee..beadd9d 100644
--- a/sip/tdecore/kinstance.sip
+++ b/sip/tdecore/kinstance.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KInstance
+class TDEInstance
{
%TypeHeaderCode
#include
@@ -32,9 +32,9 @@ class KInstance
public:
- KInstance (const TQCString&);
- KInstance (const KAboutData*);
- KInstance (KInstance*);
+ TDEInstance (const TQCString&);
+ TDEInstance (const TDEAboutData*);
+ TDEInstance (TDEInstance*);
KStandardDirs* dirs () const;
KConfig* config () const;
@@ -44,12 +44,12 @@ public:
KIconLoader* iconLoader () const;
void newIconLoader () const;
- const KAboutData* aboutData () const;
+ const TDEAboutData* aboutData () const;
TQCString instanceName () const;
KMimeSourceFactory* mimeSourceFactory () const;
protected:
-//ig KInstance (const KInstance&);
+//ig TDEInstance (const TDEInstance&);
%If ( KDE_3_1_0 - )
void setConfigName (const TQString&);
@@ -68,8 +68,8 @@ public:
//force
private:
- KInstance (const KInstance&);
+ TDEInstance (const TDEInstance&);
//end
-}; // class KInstance
+}; // class TDEInstance
diff --git a/sip/tdecore/klibloader.sip b/sip/tdecore/klibloader.sip
index 27c8e72..d068558 100644
--- a/sip/tdecore/klibloader.sip
+++ b/sip/tdecore/klibloader.sip
@@ -68,7 +68,7 @@ public:
virtual void unloadLibrary (const char*);
static KLibLoader* self ();
static void cleanUp ();
- static TQString findLibrary (const char*, const KInstance* = KGlobal ::instance ());
+ static TQString findLibrary (const char*, const TDEInstance* = KGlobal ::instance ());
protected:
KLibLoader (TQObject* /TransferThis/ = 0, const char* = 0);
diff --git a/sip/tdecore/knotifyclient.sip b/sip/tdecore/knotifyclient.sip
index d0aeb62..5320ff8 100644
--- a/sip/tdecore/knotifyclient.sip
+++ b/sip/tdecore/knotifyclient.sip
@@ -38,9 +38,9 @@ class Instance
public:
- Instance (KInstance*);
+ Instance (TDEInstance*);
bool useSystemBell () const;
- static KInstance* current ();
+ static TDEInstance* current ();
static KNotifyClient::Instance* currentInstance ();
}; // class Instance
@@ -102,7 +102,7 @@ int getPresentation (const TQString&);
TQString getFile (const TQString&, int);
int getDefaultPresentation (const TQString&);
TQString getDefaultFile (const TQString&, int);
-KInstance* instance ();
+TDEInstance* instance ();
%If ( KDE_3_1_0 - KDE_3_2_0 )
diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip
index ee3c6fc..8c44662 100644
--- a/sip/tdecore/kshortcutlist.sip
+++ b/sip/tdecore/kshortcutlist.sip
@@ -46,7 +46,7 @@ public:
virtual bool isGlobal (uint) const;
virtual int index (const TQString&) const;
virtual int index (const KKeySequence&) const;
- virtual const KInstance* instance () const;
+ virtual const TDEInstance* instance () const;
enum Other
{
diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip
index a066ec9..7922a4e 100644
--- a/sip/tdecore/kstddirs.sip
+++ b/sip/tdecore/kstddirs.sip
@@ -65,5 +65,5 @@ private:
#include
%End
-TQString locate (const char*, const TQString&, const KInstance* = KGlobal::instance());
-TQString locateLocal (const char*, const TQString&, const KInstance* = KGlobal::instance());
+TQString locate (const char*, const TQString&, const TDEInstance* = KGlobal::instance());
+TQString locateLocal (const char*, const TQString&, const TDEInstance* = KGlobal::instance());
diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip
index 3d7d5ef..343665c 100644
--- a/sip/tdeui/kaboutapplication.sip
+++ b/sip/tdeui/kaboutapplication.sip
@@ -33,10 +33,10 @@ class KAboutApplication : KAboutDialog
public:
KAboutApplication (TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1);
- KAboutApplication (const KAboutData*, TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1);
+ KAboutApplication (const TDEAboutData*, TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1);
protected:
- void buildDialog (const KAboutData*);
+ void buildDialog (const TDEAboutData*);
//force
%ConvertToSubClassCode
diff --git a/sip/tdeui/kaction.sip b/sip/tdeui/kaction.sip
index d54d730..cae6587 100644
--- a/sip/tdeui/kaction.sip
+++ b/sip/tdeui/kaction.sip
@@ -611,8 +611,8 @@ class KActionCollection : TQObject
public:
- KActionCollection (TQWidget* /TransferThis/, const char* = 0, KInstance* = 0);
- KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, KInstance* = 0);
+ KActionCollection (TQWidget* /TransferThis/, const char* = 0, TDEInstance* = 0);
+ KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0);
KActionCollection (const KActionCollection&);
virtual void setWidget (TQWidget*);
@@ -642,8 +642,8 @@ public:
bool readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0);
bool writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const;
- void setInstance (KInstance*);
- KInstance* instance () const;
+ void setInstance (TDEInstance*);
+ TDEInstance* instance () const;
void setXMLFile (const TQString&);
const TQString& xmlFile () const;
void setHighlightingEnabled (bool);
@@ -660,7 +660,7 @@ signals:
void clearStatusText ();
public:
- KActionCollection (TQObject* /TransferThis/ = 0, const char* = 0, KInstance* = 0);
+ KActionCollection (TQObject* /TransferThis/ = 0, const char* = 0, TDEInstance* = 0);
void insert (KAction*);
void remove (KAction*);
KAction* take (KAction*);
diff --git a/sip/tdeui/kactioncollection.sip b/sip/tdeui/kactioncollection.sip
index 3bd6859..0f4d6ab 100644
--- a/sip/tdeui/kactioncollection.sip
+++ b/sip/tdeui/kactioncollection.sip
@@ -34,8 +34,8 @@ class KActionCollection : TQObject
public:
- KActionCollection (TQWidget* /TransferThis/, const char* = 0, KInstance* = 0);
- KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, KInstance* = 0);
+ KActionCollection (TQWidget* /TransferThis/, const char* = 0, TDEInstance* = 0);
+ KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0);
KActionCollection (const KActionCollection&);
virtual void setWidget (TQWidget*);
void setAutoConnectShortcuts (bool);
@@ -53,8 +53,8 @@ public:
virtual KActionPtrList actions () const;
bool readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0);
bool writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const;
- void setInstance (KInstance*);
- KInstance* instance () const;
+ void setInstance (TDEInstance*);
+ TDEInstance* instance () const;
void setXMLFile (const TQString&);
const TQString& xmlFile () const;
void setHighlightingEnabled (bool);
@@ -76,7 +76,7 @@ signals:
void clearStatusText ();
public:
- KActionCollection (TQObject* /TransferThis/, const char* = 0, KInstance* = 0);
+ KActionCollection (TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0);
public:
void insert (KAction*);
diff --git a/sip/tdeui/kactionshortcutlist.sip b/sip/tdeui/kactionshortcutlist.sip
index 319db0c..2d5a0d7 100644
--- a/sip/tdeui/kactionshortcutlist.sip
+++ b/sip/tdeui/kactionshortcutlist.sip
@@ -44,7 +44,7 @@ public:
virtual const KShortcut& shortcutDefault (uint) const;
virtual bool isConfigurable (uint) const;
virtual bool setShortcut (uint, const KShortcut&);
- virtual const KInstance* instance () const;
+ virtual const TDEInstance* instance () const;
virtual TQVariant getOther (Other, uint) const;
virtual bool setOther (Other, uint, TQVariant);
virtual bool save () const;
diff --git a/sip/tdeui/kbugreport.sip b/sip/tdeui/kbugreport.sip
index 8454063..6facfcd 100644
--- a/sip/tdeui/kbugreport.sip
+++ b/sip/tdeui/kbugreport.sip
@@ -32,7 +32,7 @@ class KBugReport : KDialogBase
public:
- KBugReport (TQWidget* /TransferThis/ = 0, bool = 1, const KAboutData* = 0);
+ KBugReport (TQWidget* /TransferThis/ = 0, bool = 1, const TDEAboutData* = 0);
protected slots:
virtual void slotConfigureEmail ();
diff --git a/sip/tdeui/kcmodule.sip b/sip/tdeui/kcmodule.sip
index 63daf3d..8878de2 100644
--- a/sip/tdeui/kcmodule.sip
+++ b/sip/tdeui/kcmodule.sip
@@ -45,22 +45,22 @@ public:
};
KCModule (TQWidget* /TransferThis/ = 0, const char* = 0, const TQStringList& = TQStringList ());
- KCModule (KInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ());
+ KCModule (TDEInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ());
virtual void load ();
virtual void save ();
virtual void defaults ();
virtual void sysdefaults ();
virtual TQString quickHelp () const;
- virtual const KAboutData* aboutData () const;
+ virtual const TDEAboutData* aboutData () const;
%If ( KDE_3_3_0 - )
- void setAboutData (KAboutData*);
+ void setAboutData (TDEAboutData*);
%End
int buttons ();
TQString rootOnlyMsg () const;
bool useRootOnlyMsg () const;
- KInstance* instance () const;
+ TDEInstance* instance () const;
%If ( KDE_3_4_0 - )
const TQPtrList& configs () const;
diff --git a/sip/tdeui/kguiitem.sip b/sip/tdeui/kguiitem.sip
index 5b490ac..18ead43 100644
--- a/sip/tdeui/kguiitem.sip
+++ b/sip/tdeui/kguiitem.sip
@@ -38,7 +38,7 @@ public:
KGuiItem (const KGuiItem&);
TQString text () const;
TQString plainText () const;
- TQIconSet iconSet (KIcon::Group, int = 0, KInstance* = KGlobal ::instance ()) const;
+ TQIconSet iconSet (KIcon::Group, int = 0, TDEInstance* = KGlobal ::instance ()) const;
TQIconSet iconSet () const;
TQString iconName () const;
TQString toolTip () const;
diff --git a/sip/tdeui/khelpmenu.sip b/sip/tdeui/khelpmenu.sip
index aa970f7..fd2d0e9 100644
--- a/sip/tdeui/khelpmenu.sip
+++ b/sip/tdeui/khelpmenu.sip
@@ -43,7 +43,7 @@ public:
};
KHelpMenu (TQWidget* /TransferThis/ = 0, const TQString& = TQString ::null , bool = 1);
- KHelpMenu (TQWidget* /TransferThis/, const KAboutData*, bool = 1, KActionCollection* = 0);
+ KHelpMenu (TQWidget* /TransferThis/, const TDEAboutData*, bool = 1, KActionCollection* = 0);
KPopupMenu* menu ();
public slots:
diff --git a/sip/tdeui/ksystemtray.sip b/sip/tdeui/ksystemtray.sip
index 89b1081..5af6040 100644
--- a/sip/tdeui/ksystemtray.sip
+++ b/sip/tdeui/ksystemtray.sip
@@ -43,7 +43,7 @@ public:
virtual void setCaption (const TQString&);
%End
- static TQPixmap loadIcon (const TQString&, KInstance* = KGlobal ::instance ());
+ static TQPixmap loadIcon (const TQString&, TDEInstance* = KGlobal ::instance ());
%End
diff --git a/sip/tdeui/ktoolbar.sip b/sip/tdeui/ktoolbar.sip
index e36fe0b..5221988 100644
--- a/sip/tdeui/ktoolbar.sip
+++ b/sip/tdeui/ktoolbar.sip
@@ -92,8 +92,8 @@ public:
KToolBar (TQWidget* /TransferThis/, const char* = 0, bool = 0, bool = 1);
//ig KToolBar (TQMainWindow*, TQMainWindow::ToolBarDock, bool = 0, const char* = 0, bool = 0, bool = 1);
KToolBar (TQMainWindow*, TQWidget*, bool = 0, const char* = 0, bool = 0, bool = 1);
- int insertButton (const TQString&, int, bool = 1, const TQString& = TQString ::null , int = -1, KInstance* = KGlobal ::instance ());
- int insertButton (const TQString&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1, KInstance* = KGlobal ::instance ());
+ int insertButton (const TQString&, int, bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = KGlobal ::instance ());
+ int insertButton (const TQString&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = KGlobal ::instance ());
int insertButton (const TQPixmap&, int, bool = 1, const TQString& = TQString ::null , int = -1);
int insertButton (const TQPixmap&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1);
int insertButton (const TQString&, int, TQPopupMenu*, bool, const TQString&, int = -1);
diff --git a/sip/tdeui/ktoolbarbutton.sip b/sip/tdeui/ktoolbarbutton.sip
index 8fdfbe4..902ee11 100644
--- a/sip/tdeui/ktoolbarbutton.sip
+++ b/sip/tdeui/ktoolbarbutton.sip
@@ -32,7 +32,7 @@ class KToolBarButton : TQToolButton
public:
- KToolBarButton (const TQString&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null , KInstance* = KGlobal ::instance ());
+ KToolBarButton (const TQString&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null , TDEInstance* = KGlobal ::instance ());
KToolBarButton (const TQPixmap&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null );
KToolBarButton (TQWidget* /TransferThis/ = 0, const char* = 0);
virtual void setPixmap (const TQPixmap&);
diff --git a/sip/tdeui/kxmlguibuilder.sip b/sip/tdeui/kxmlguibuilder.sip
index a5b48e5..9123dad 100644
--- a/sip/tdeui/kxmlguibuilder.sip
+++ b/sip/tdeui/kxmlguibuilder.sip
@@ -35,8 +35,8 @@ public:
KXMLGUIBuilder (TQWidget*);
KXMLGUIClient* builderClient () const;
void setBuilderClient (KXMLGUIClient*);
- KInstance* builderInstance () const;
- void setBuilderInstance (KInstance*);
+ TDEInstance* builderInstance () const;
+ void setBuilderInstance (TDEInstance*);
TQWidget* widget ();
virtual TQStringList containerTags () const;
//ig virtual TQWidget* createContainer (TQWidget* /Transfer/, int, const TQDomElement&, int&);
diff --git a/sip/tdeui/kxmlguiclient.sip b/sip/tdeui/kxmlguiclient.sip
index 800801a..3ea9d70 100644
--- a/sip/tdeui/kxmlguiclient.sip
+++ b/sip/tdeui/kxmlguiclient.sip
@@ -37,7 +37,7 @@ public:
KAction* action (const char*) const;
virtual KAction* action (const TQDomElement&) const;
virtual KActionCollection* actionCollection () const;
- virtual KInstance* instance () const;
+ virtual TDEInstance* instance () const;
virtual TQDomDocument domDocument () const;
virtual TQString xmlFile () const;
virtual TQString localXMLFile () const;
@@ -86,7 +86,7 @@ public:
protected:
- virtual void setInstance (KInstance*);
+ virtual void setInstance (TDEInstance*);
virtual void setXMLFile (const TQString&, bool = 0, bool = 1);
virtual void setLocalXMLFile (const TQString&);
virtual void setXML (const TQString&, bool = 0);
diff --git a/sip/tdeui/kxmlguifactory.sip b/sip/tdeui/kxmlguifactory.sip
index 7f361c7..d9be213 100644
--- a/sip/tdeui/kxmlguifactory.sip
+++ b/sip/tdeui/kxmlguifactory.sip
@@ -33,9 +33,9 @@ class KXMLGUIFactory : TQObject
public:
KXMLGUIFactory (KXMLGUIBuilder*, TQObject* /TransferThis/ = 0, const char* = 0);
- static TQString readConfigFile (const TQString&, bool, const KInstance* = 0);
- static TQString readConfigFile (const TQString&, const KInstance* = 0);
- static bool saveConfigFile (const TQDomDocument&, const TQString&, const KInstance* = 0);
+ static TQString readConfigFile (const TQString&, bool, const TDEInstance* = 0);
+ static TQString readConfigFile (const TQString&, const TDEInstance* = 0);
+ static bool saveConfigFile (const TQDomDocument&, const TQString&, const TDEInstance* = 0);
static TQString documentToXML (const TQDomDocument&);
static TQString elementToXML (const TQDomElement&);
static void removeDOMComments (TQDomNode&);
diff --git a/templates/annotated/basicapp.py b/templates/annotated/basicapp.py
index b5abe80..a725004 100644
--- a/templates/annotated/basicapp.py
+++ b/templates/annotated/basicapp.py
@@ -35,7 +35,7 @@ copyright holder.
import sys
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from tdeui import KMainWindow
"""
@@ -58,17 +58,17 @@ class MainWin (KMainWindow):
#-------------------- main ------------------------------------------------
# set up some basic information about the program in
-# a KAboutData object - this affects the application's
+# a TDEAboutData object - this affects the application's
# title bar caption and makes it easy to set up a
# Help | About dialog box for your app
appName = "some app"
programName = "some program"
description = "A basic application template"
-license = KAboutData.License_GPL
+license = TDEAboutData.License_GPL
version = "1.0"
copyright = "(C) 2003 whoever the author is"
-aboutData = KAboutData (appName, programName, version, description, license, copyright)
+aboutData = TDEAboutData (appName, programName, version, description, license, copyright)
# you can add the names of the app's authors here
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/menuapp1.py b/templates/annotated/menuapp1.py
index faa8662..93b2a90 100644
--- a/templates/annotated/menuapp1.py
+++ b/templates/annotated/menuapp1.py
@@ -45,7 +45,7 @@ import sys
from qt import TQPopupMenu, SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KStdAccel, KIcon, KIconLoader
from tdeui import KMainWindow, KMessageBox
TOOLBAR_NEW = 1
@@ -136,7 +136,7 @@ class MainWin (KMainWindow):
# Let KDE generate a nifty help menu
- # The KAboutData/TDECmdLineArgs data from the main part of the program
+ # The TDEAboutData/TDECmdLineArgs data from the main part of the program
# will be used to generate the About dialog
helpMenu = self.helpMenu ("")
@@ -253,8 +253,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/menuapp2.py b/templates/annotated/menuapp2.py
index 1924eef..6447d1c 100644
--- a/templates/annotated/menuapp2.py
+++ b/templates/annotated/menuapp2.py
@@ -43,7 +43,7 @@ import sys
from qt import TQPopupMenu, SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
from tdeui import KMainWindow, KMessageBox, KStdAction, KAction
STATUSBAR_LEFT = 1
@@ -147,7 +147,7 @@ class MainWin (KMainWindow):
self.specialAction.plug (editMenu)
self.menuBar ().insertItem (i18n ("&Edit"), editMenu)
- # Uses the info from KAboutData (specified below)
+ # Uses the info from TDEAboutData (specified below)
# to construct the "About" box in the Help menu
helpMenu = self.helpMenu ("")
@@ -227,8 +227,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/menuapp3.py b/templates/annotated/menuapp3.py
index 84a90f7..59b0a6a 100644
--- a/templates/annotated/menuapp3.py
+++ b/templates/annotated/menuapp3.py
@@ -43,7 +43,7 @@ import sys
from qt import TQPopupMenu, SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection
STATUSBAR_LEFT = 1
@@ -188,11 +188,11 @@ description = "A basic application template"
version = "1.0"
# To use the XMLGUI mechanism, you MUST provide an appName
-# (the first argument to KAboutData below) - the XML spec
+# (the first argument to TDEAboutData below) - the XML spec
# for the interface will be in ui.rc (don't forget
# the "ui" suffix to the application name)
-aboutData = KAboutData ("menuapp3", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("menuapp3", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py
index db017c3..faf97e0 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -74,7 +74,7 @@ class MainWin (KMainWindow):
#-------------------- main ------------------------------------------------
-# The usual stuff - you can also use the KAboutData/TDECmdLineArgs version
+# The usual stuff - you can also use the TDEAboutData/TDECmdLineArgs version
# for program startup used in other templates - the TDEApplication constructor
# used here may be obsoleted eventually
appName = "template"
diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py
index 01ce1af..53e0c51 100644
--- a/templates/basic/basicapp.py
+++ b/templates/basic/basicapp.py
@@ -30,7 +30,7 @@ copyright holder.
import sys
from qt import SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from tdeui import KMainWindow
class MainWin (KMainWindow):
@@ -42,8 +42,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py
index 7809cef..6bd548e 100644
--- a/templates/basic/menuapp1.py
+++ b/templates/basic/menuapp1.py
@@ -44,7 +44,7 @@ import sys
from qt import TQPopupMenu, SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KStdAccel, KIcon, KIconLoader
from tdeui import KMainWindow, KMessageBox
TOOLBAR_NEW = 1
@@ -177,8 +177,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/basic/menuapp2.py b/templates/basic/menuapp2.py
index f765692..1f68d59 100644
--- a/templates/basic/menuapp2.py
+++ b/templates/basic/menuapp2.py
@@ -43,7 +43,7 @@ import sys
from qt import TQPopupMenu, SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KShortcut
from tdeui import KMainWindow, KMessageBox, KStdAction, KAction
STATUSBAR_LEFT = 1
@@ -183,8 +183,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/basic/menuapp3.py b/templates/basic/menuapp3.py
index 9051661..cd46f81 100644
--- a/templates/basic/menuapp3.py
+++ b/templates/basic/menuapp3.py
@@ -43,7 +43,7 @@ import sys
from qt import TQPopupMenu, SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KShortcut
from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection
STATUSBAR_LEFT = 1
@@ -144,8 +144,8 @@ class MainWin (KMainWindow):
description = "A basic application template"
version = "1.0"
-aboutData = KAboutData ("menuapp3", "",\
- version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("menuapp3", "",\
+ version, description, TDEAboutData.License_GPL,\
"(C) 2003 whoever the author is")
aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
|