summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEBUG2
-rw-r--r--KDE2PORTING.html2
-rw-r--r--arts/kde/kconverttest.cc2
-rw-r--r--arts/kde/kiotest.cc2
-rw-r--r--arts/kde/kiotestslow.cc2
-rw-r--r--arts/kde/mcop-dcop/kmcop.cpp4
-rw-r--r--arts/knotify/knotify.cpp4
-rw-r--r--arts/message/artsmessage.cc4
-rw-r--r--interfaces/terminal/test/main.cc2
-rw-r--r--kabc/kab2kabc.cpp2
-rw-r--r--kabc/tests/bigread.cpp2
-rw-r--r--kabc/tests/bigwrite.cpp2
-rw-r--r--kabc/tests/kabcargl.cpp2
-rw-r--r--kabc/tests/testaddressee.cpp2
-rw-r--r--kabc/tests/testaddresseelist.cpp2
-rw-r--r--kabc/tests/testaddressfmt.cpp2
-rw-r--r--kabc/tests/testaddresslineedit.cpp2
-rw-r--r--kabc/tests/testdb.cpp2
-rw-r--r--kabc/tests/testdistlist.cpp2
-rw-r--r--kabc/tests/testkabc.cpp2
-rw-r--r--kabc/tests/testkabcdlg.cpp2
-rw-r--r--kabc/tests/testlock.cpp2
-rw-r--r--kabc/vcard/testwrite.cpp2
-rw-r--r--kabc/vcardparser/testread.cpp2
-rw-r--r--kabc/vcardparser/testwrite.cpp2
-rw-r--r--kate/part/katefactory.cpp2
-rw-r--r--kate/part/katefactory.h6
-rw-r--r--kate/plugins/kdatatool/kate_kdatatool.cpp2
-rw-r--r--kcert/kcertpart.cc6
-rw-r--r--kcert/kcertpart.h6
-rw-r--r--kcmshell/main.cpp4
-rw-r--r--kconf_update/kconf_update.cpp6
-rw-r--r--kded/kbuildsycoca.cpp4
-rw-r--r--kded/kde-menu.cpp4
-rw-r--r--kded/kded.cpp4
-rw-r--r--kded/khostname.cpp6
-rw-r--r--kdewidgets/kde.widgets2
-rw-r--r--kdewidgets/makekdewidgets.cpp4
-rw-r--r--kdewidgets/tests/test.widgets2
-rw-r--r--kdoctools/main.cpp2
-rw-r--r--kdoctools/main_ghelp.cpp2
-rw-r--r--kdoctools/meinproc.cpp4
-rw-r--r--kdoctools/xslt.cpp2
-rw-r--r--kdoctools/xslt.h2
-rw-r--r--khtml/ecma/kjs_debugwin.cpp2
-rw-r--r--khtml/ecma/kjs_debugwin.h2
-rw-r--r--khtml/java/kjavaappletviewer.cpp8
-rw-r--r--khtml/java/kjavaappletviewer.h10
-rw-r--r--khtml/khtml_factory.cpp14
-rw-r--r--khtml/khtml_factory.h10
-rw-r--r--khtml/khtmlimage.cpp4
-rw-r--r--khtml/khtmlimage.h6
-rw-r--r--khtml/kmultipart/kmultipart.cpp6
-rw-r--r--khtml/kmultipart/kmultipart.h4
-rw-r--r--kinit/kdostartupconfig.cpp2
-rw-r--r--kinit/kinit.cpp6
-rw-r--r--kio/kfile/knotifydialog.cpp4
-rw-r--r--kio/kfile/knotifydialog.h10
-rw-r--r--kio/kio/dataprotocol.cpp2
-rw-r--r--kio/kio/kdatatool.cpp6
-rw-r--r--kio/kio/kdatatool.h16
-rw-r--r--kio/kio/kscan.h16
-rw-r--r--kio/kioexec/main.cpp4
-rw-r--r--kio/misc/kfile/fileprops.cpp4
-rw-r--r--kio/misc/kpac/proxyscout.cpp2
-rw-r--r--kio/misc/kpac/proxyscout.h4
-rw-r--r--kio/misc/ksendbugmail/main.cpp4
-rw-r--r--kio/misc/uiserver.cpp4
-rw-r--r--kio/tests/kfiltertest.cpp2
-rw-r--r--kio/tests/kiopassdlgtest.cpp2
-rw-r--r--kio/tests/kmfitest.cpp2
-rw-r--r--kio/tests/kmimemagictest.cpp2
-rw-r--r--kio/tests/kmimetypetest.cpp2
-rw-r--r--kio/tests/kpropsdlgtest.cpp2
-rw-r--r--kio/tests/kprotocolinfotest.cpp2
-rw-r--r--kio/tests/ktartest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp2
-rw-r--r--kio/tests/kziptest.cpp2
-rw-r--r--kioslave/file/file.cc2
-rw-r--r--kioslave/ftp/ftp.cc2
-rw-r--r--kioslave/http/http.cc2
-rw-r--r--kioslave/http/http_cache_cleaner.cpp2
-rw-r--r--kioslave/http/kcookiejar/main.cpp2
-rw-r--r--kioslave/http/kcookiejar/tests/kcookiejartest.cpp4
-rw-r--r--kioslave/iso/iso.cpp2
-rw-r--r--knewstuff/ghns.cpp2
-rw-r--r--knewstuff/khotnewstuff.cpp2
-rw-r--r--knewstuff/testnewstuff.cpp2
-rw-r--r--kparts/factory.cpp4
-rw-r--r--kparts/factory.h8
-rw-r--r--kparts/genericfactory.h34
-rw-r--r--kparts/part.cpp6
-rw-r--r--kparts/part.h14
-rw-r--r--kparts/partmanager.cpp2
-rw-r--r--kparts/partmanager.h4
-rw-r--r--kparts/plugin.cpp12
-rw-r--r--kparts/plugin.h12
-rw-r--r--kparts/tests/notepad.cpp4
-rw-r--r--kparts/tests/notepad.h4
-rw-r--r--kparts/tests/parts.cpp4
-rw-r--r--kparts/tests/parts.h4
-rw-r--r--kresources/kcmkresources.cpp6
-rw-r--r--kresources/testresources.cpp2
-rw-r--r--kunittest/modrunner.cpp6
-rw-r--r--kunittest/tester.h4
-rw-r--r--kutils/kcmodulecontainer.cpp2
-rw-r--r--kutils/kcmoduleproxy.cpp6
-rw-r--r--kutils/kcmoduleproxy.h12
-rw-r--r--kutils/kplugininfo.h2
-rw-r--r--kutils/kpluginselector.cpp2
-rw-r--r--kutils/kpluginselector.h6
-rw-r--r--kutils/ksettings/README.dox2
-rw-r--r--kutils/ksettings/dispatcher.cpp8
-rw-r--r--kutils/ksettings/dispatcher.h14
-rw-r--r--kutils/ksettings/pluginpage.cpp2
-rw-r--r--kutils/ksettings/pluginpage.h2
-rw-r--r--kwallet/tests/kwalletasync.cpp2
-rw-r--r--kwallet/tests/kwalletboth.cpp2
-rw-r--r--kwallet/tests/kwalletsync.cpp2
-rw-r--r--libkmid/deviceman.cc4
-rw-r--r--tdecore/kaboutdata.cpp90
-rw-r--r--tdecore/kaboutdata.h18
-rw-r--r--tdecore/kapplication.cpp24
-rw-r--r--tdecore/kapplication.h6
-rw-r--r--tdecore/kcmdlineargs.cpp14
-rw-r--r--tdecore/kcmdlineargs.h18
-rw-r--r--tdecore/kconfig_compiler/example/autoexample.cpp2
-rw-r--r--tdecore/kconfig_compiler/example/example.cpp2
-rw-r--r--tdecore/kconfig_compiler/kconfig_compiler.cpp6
-rw-r--r--tdecore/kconfig_compiler/tests/test1main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test2main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test3main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test4main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test5main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test6main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test7main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test8main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test9main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test_dpointer_main.cpp2
-rw-r--r--tdecore/kcrash.cpp4
-rw-r--r--tdecore/kdetcompmgr.cpp4
-rw-r--r--tdecore/kgenericfactory.h54
-rw-r--r--tdecore/kglobal.cpp10
-rw-r--r--tdecore/kglobal.h12
-rw-r--r--tdecore/kiconloader.cpp32
-rw-r--r--tdecore/kiconloader.h40
-rw-r--r--tdecore/kinstance.cpp56
-rw-r--r--tdecore/kinstance.h34
-rw-r--r--tdecore/klibloader.cpp2
-rw-r--r--tdecore/klibloader.h12
-rw-r--r--tdecore/klocale.cpp2
-rw-r--r--tdecore/kmimesourcefactory.cpp4
-rw-r--r--tdecore/kmimesourcefactory.h8
-rw-r--r--tdecore/knotifyclient.cpp10
-rw-r--r--tdecore/knotifyclient.h24
-rw-r--r--tdecore/kshortcutlist.cpp2
-rw-r--r--tdecore/kshortcutlist.h8
-rw-r--r--tdecore/kstandarddirs.cpp6
-rw-r--r--tdecore/kstandarddirs.h8
-rw-r--r--tdecore/kuniqueapplication.cpp4
-rw-r--r--tdecore/kuniqueapplication.h4
-rw-r--r--tdecore/network/ksockssocketdevice.cpp2
-rw-r--r--tdecore/tde-config.cpp.cmake4
-rw-r--r--tdecore/tde-config.cpp.in4
-rw-r--r--tdecore/tests/kapptest.cpp2
-rw-r--r--tdecore/tests/kcalendartest.cpp4
-rw-r--r--tdecore/tests/kdebugtest.cpp2
-rw-r--r--tdecore/tests/kresolvertest.cpp2
-rw-r--r--tdecore/tests/ksocktest.cpp2
-rw-r--r--tdecore/tests/ktimezonestest.cpp2
-rw-r--r--tdecore/tests/kuniqueapptest.cpp2
-rw-r--r--tdecore/tests/startserviceby.cpp2
-rw-r--r--tdecore/tests/testqtargs.cpp4
-rw-r--r--tdelfeditor/tdelfeditor.cpp2
-rw-r--r--tdeui/kaboutapplication.cpp8
-rw-r--r--tdeui/kaboutapplication.h12
-rw-r--r--tdeui/kaction.cpp4
-rw-r--r--tdeui/kaction.h2
-rw-r--r--tdeui/kactionclasses.cpp8
-rw-r--r--tdeui/kactionclasses.h2
-rw-r--r--tdeui/kactioncollection.cpp16
-rw-r--r--tdeui/kactioncollection.h12
-rw-r--r--tdeui/kactionshortcutlist.h2
-rw-r--r--tdeui/kbugreport.cpp2
-rw-r--r--tdeui/kbugreport.h10
-rw-r--r--tdeui/kcmodule.cpp16
-rw-r--r--tdeui/kcmodule.h16
-rw-r--r--tdeui/kedittoolbar.cpp6
-rw-r--r--tdeui/kguiitem.cpp2
-rw-r--r--tdeui/kguiitem.h4
-rw-r--r--tdeui/khelpmenu.cpp6
-rw-r--r--tdeui/khelpmenu.h4
-rw-r--r--tdeui/kkeydialog.h2
-rw-r--r--tdeui/kmainwindow.h2
-rw-r--r--tdeui/kstdaction.cpp4
-rw-r--r--tdeui/ksystemtray.cpp4
-rw-r--r--tdeui/ksystemtray.h6
-rw-r--r--tdeui/ktoolbar.cpp4
-rw-r--r--tdeui/ktoolbar.h6
-rw-r--r--tdeui/ktoolbarbutton.cpp4
-rw-r--r--tdeui/ktoolbarbutton.h4
-rw-r--r--tdeui/kxmlguibuilder.cpp10
-rw-r--r--tdeui/kxmlguibuilder.h6
-rw-r--r--tdeui/kxmlguiclient.cpp6
-rw-r--r--tdeui/kxmlguiclient.h10
-rw-r--r--tdeui/kxmlguifactory.cpp10
-rw-r--r--tdeui/kxmlguifactory.h8
-rw-r--r--tdeui/kxmlguifactory_p.cpp2
-rw-r--r--tdeui/tests/klineedittest.cpp2
-rw-r--r--tdeui/tests/kxmlguitest.cpp2
-rw-r--r--tdeui/tests/kxmlguitest.h2
211 files changed, 658 insertions, 658 deletions
diff --git a/DEBUG b/DEBUG
index 042fe54c..cf3dfbc4 100644
--- a/DEBUG
+++ b/DEBUG
@@ -82,7 +82,7 @@ are interested in and verify that we have found the correct source line:
218 TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
219 QApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
220 GUIenabled ),
-221 KInstance( TDECmdLineArgs::about),
+221 TDEInstance( TDECmdLineArgs::about),
222 d (new TDEApplicationPrivate)
223 {
224 if (!GUIenabled)
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index a8580e3f..c69d1173 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -168,7 +168,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
TDECmdLineArgs itself will add the command line options supported by Qt
and TDEApplication.<P>
- You can also use the KAboutData class to specify name, description and
+ You can also use the TDEAboutData class to specify name, description and
version.<P>
In return for this information you can query TDECmdLineArgs whether an
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index 10778d6b..63f5ae53 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -55,7 +55,7 @@ void KConvertTest::slotRawStreamFinished()
int main(int argc, char **argv)
{
- KAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
+ TDEAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index b27978f4..826a3b16 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
+ TDEAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index f35f2a3e..e367ea92 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -88,7 +88,7 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
+ TDEAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp
index b95f97de..0ba9b48a 100644
--- a/arts/kde/mcop-dcop/kmcop.cpp
+++ b/arts/kde/mcop-dcop/kmcop.cpp
@@ -48,9 +48,9 @@ public:
int main(int argc, char **argv)
{
- KAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
+ TDEAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
"0.1", I18N_NOOP("TDE MCOP-DCOP Bridge"),
- KAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
+ TDEAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org");
TDECmdLineArgs::init(argc, argv, &aboutdata);
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index e6a234fb..3fcaff6e 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -105,9 +105,9 @@ extern "C"{
KDE_EXPORT int kdemain(int argc, char **argv)
{
- KAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
+ TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
"3.0", I18N_NOOP("TDE Notification Server"),
- KAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
+ TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
aboutdata.addAuthor("Carsten Pfeiffer",I18N_NOOP("Current Maintainer"),"pfeiffer@kde.org");
aboutdata.addAuthor("Christian Esken",0,"esken@kde.org");
aboutdata.addAuthor("Stefan Westerfeld",I18N_NOOP("Sound support"),"stefan@space.twc.de");
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index 41041930..37bf4b75 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -51,9 +51,9 @@ static KCmdLineOptions options[] =
KCmdLineLastOption // End of options.
};
-KAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
+TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
I18N_NOOP("Utility to display aRts error messages"),
- KAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");
+ TDEAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");
int main(int argc, char **argv) {
aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index 403bde0b..e1dacc6d 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -33,7 +33,7 @@ Win::Win()
int main( int argc, char** argv )
{
- KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
+ TDEAboutData* about = new TDEAboutData( "tetest", "TETest", "0.1" );
TDECmdLineArgs::init( argc, argv, about );
TDEApplication a;
Win* win = new Win();
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 417d62b8..c2342626 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -432,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
int main( int argc, char **argv )
{
- KAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
+ TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp
index c5a1a602..bb19379b 100644
--- a/kabc/tests/bigread.cpp
+++ b/kabc/tests/bigread.cpp
@@ -17,7 +17,7 @@ using namespace KABC;
int main(int argc,char **argv)
{
- KAboutData aboutData("bigread","BigReadKabc","0.1");
+ TDEAboutData aboutData("bigread","BigReadKabc","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app( false, false );
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index 5d3d2bd6..b1f705eb 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -14,7 +14,7 @@ using namespace KABC;
int main(int argc,char **argv)
{
- KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
+ TDEAboutData aboutData("bigwrite","BigWriteKabc","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app( false, false );
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index b1116b2e..62b1df25 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -35,7 +35,7 @@ using namespace KABC;
int main(int argc,char **argv)
{
- KAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
+ TDEAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
TDECmdLineArgs::init(argc,argv,&aboutData);
diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp
index 39536efb..9b4993dc 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/kabc/tests/testaddressee.cpp
@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv)
{
- KAboutData aboutData("testaddressee","TestAddressee","0.1");
+ TDEAboutData aboutData("testaddressee","TestAddressee","0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index 08d73b8d..98e5be50 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
int main(int /*argc*/,char /* **argv*/)
{
-/* KAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
+/* TDEAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp
index c9369d75..b66c7ad0 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/kabc/tests/testaddressfmt.cpp
@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv)
{
- KAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
+ TDEAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp
index f46604dc..474b5fc7 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/kabc/tests/testaddresslineedit.cpp
@@ -10,7 +10,7 @@ using namespace KABC;
int main( int argc,char **argv )
{
- KAboutData aboutData( "testaddresslineedit",
+ TDEAboutData aboutData( "testaddresslineedit",
I18N_NOOP( "Test Address LineEdit" ), "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp
index 2abedb9b..4759a4bd 100644
--- a/kabc/tests/testdb.cpp
+++ b/kabc/tests/testdb.cpp
@@ -12,7 +12,7 @@ using namespace KABC;
int main(int argc,char **argv)
{
- KAboutData aboutData("testdb","TestKabcDB","0.1");
+ TDEAboutData aboutData("testdb","TestKabcDB","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
// TDEApplication app( false, false );
diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp
index 3f4b67e0..e46d90d7 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/kabc/tests/testdistlist.cpp
@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv)
{
- KAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
+ TDEAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp
index ee767e52..b8b9fe3b 100644
--- a/kabc/tests/testkabc.cpp
+++ b/kabc/tests/testkabc.cpp
@@ -20,7 +20,7 @@ using namespace KABC;
int main(int argc,char **argv)
{
- KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
+ TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication app( false, false );
diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp
index b78fb4a5..1d328f23 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/kabc/tests/testkabcdlg.cpp
@@ -18,7 +18,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv)
{
- KAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
+ TDEAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 31d05320..701b9448 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -165,7 +165,7 @@ static const KCmdLineOptions options[] =
int main(int argc,char **argv)
{
- KAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
+ TDEAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index 8498fc6d..fe218c0b 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -8,7 +8,7 @@
int main(int argc,char **argv)
{
- KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
+ TDEAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app;
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index 3fcbb851..50ff8b09 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -44,7 +44,7 @@ int main( int argc, char **argv )
{
TDEApplication::disableAutoDcopRegistration();
- KAboutData aboutData( "testread", "vCard test reader", "0.1" );
+ TDEAboutData aboutData( "testread", "vCard test reader", "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index 11c3c785..73d462d4 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -35,7 +35,7 @@
int main( int argc, char **argv )
{
- KAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
+ TDEAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index 64bde871..aa4c4365 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -68,7 +68,7 @@ KateFactory *KateFactory::s_self = 0;
KateFactory::KateFactory ()
: m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION,
- I18N_NOOP( "Embeddable editor component" ), KAboutData::License_LGPL_V2,
+ I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
, m_instance (&m_aboutData)
, m_plugins (KTrader::self()->query("KTextEditor/Plugin"))
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index 0fd939ce..79d3ac01 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -87,7 +87,7 @@ class KateFactory
* public accessor to the instance
* @return instance
*/
- inline KInstance *instance () { return &m_instance; };
+ inline TDEInstance *instance () { return &m_instance; };
/**
* register document at the factory
@@ -221,12 +221,12 @@ class KateFactory
/**
* about data (authors and more)
*/
- KAboutData m_aboutData;
+ TDEAboutData m_aboutData;
/**
* our kinstance
*/
- KInstance m_instance;
+ TDEInstance m_instance;
/**
* registered docs
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index e78bb422..3265a77b 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -157,7 +157,7 @@ void KDataToolPluginView::aboutToShow()
}
}
- KInstance *inst=instance();
+ TDEInstance *inst=instance();
TQValueList<KDataToolInfo> tools;
tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst );
diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index 5986bcba..7ae79d87 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -131,7 +131,7 @@ KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const TQStringList & /*args*/ )
: KParts::ReadWritePart(parent, name) {
-KInstance *instance = new KInstance("KCertPart");
+TDEInstance *instance = new TDEInstance("KCertPart");
TQGridLayout *grid;
setInstance(instance);
@@ -874,9 +874,9 @@ KMessageBox::information(_frame, i18n("Certificates have been successfully impor
}
-KAboutData *KCertPart::createAboutData()
+TDEAboutData *KCertPart::createAboutData()
{
- return new KAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
+ return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
}
#include "kcertpart.moc"
diff --git a/kcert/kcertpart.h b/kcert/kcertpart.h
index ec011c08..a5274a92 100644
--- a/kcert/kcertpart.h
+++ b/kcert/kcertpart.h
@@ -40,7 +40,7 @@ class KSSLPKCS12;
class KSSLCertificate;
class TQTabWidget;
class TQMultiLineEdit;
-class KAboutData;
+class TDEAboutData;
class TQGridLayout;
@@ -75,7 +75,7 @@ public:
virtual void setReadWrite(bool readwrite);
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
protected slots:
void slotChain(int c);
@@ -115,7 +115,7 @@ protected:
// The rest
- KInstance *_instance;
+ TDEInstance *_instance;
TQButton *_import, *_save, *_done, *_launch, *_importAll;
// Store the pointer to the current item
KSSLPKCS12 *_p12;
diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 4453cac0..7196c0e0 100644
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -198,10 +198,10 @@ static void setIcon(TQWidget *w, const TQString &iconName)
extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
{
- KAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
+ TDEAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
0,
I18N_NOOP("A tool to start single TDE control modules"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2004, The KDE Developers") );
aboutData.addAuthor("Frans Englich", I18N_NOOP("Maintainer"), "frans.englich@kde.org");
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index b324e53f..ac4fda76 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -940,10 +940,10 @@ void KonfUpdate::resetOptions()
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
- KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
+ TDEAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
"1.0.2",
I18N_NOOP("TDE Tool for updating user configuration files"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
"(c) 2001, Waldo Bastian");
aboutData.addAuthor("Waldo Bastian", 0, "bastian@kde.org");
@@ -951,7 +951,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
- KInstance instance(&aboutData);
+ TDEInstance instance(&aboutData);
KonfUpdate konfUpdate;
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 483578c7..958f3830 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -718,9 +718,9 @@ public:
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
- KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
+ TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
I18N_NOOP("Rebuilds the system configuration cache."),
- KAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
+ TDEAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
d.addAuthor("David Faure", I18N_NOOP("Author"), "faure@kde.org");
d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 7148a1e6..7c73fb22 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -113,9 +113,9 @@ int main(int argc, char **argv)
"The --highlight option can be used to visually indicate to the user where\n"
"in the TDE menu a specific application is located.");
- KAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
+ TDEAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
description,
- KAboutData::License_GPL, "(c) 2003 Waldo Bastian");
+ TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian");
d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
TDECmdLineArgs::init(argc, argv, &d);
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 538cfff0..84db43b4 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -872,7 +872,7 @@ public:
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
- KAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
+ TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
"$Id$",
I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed"));
@@ -904,7 +904,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
}
}
- KInstance *instance = new KInstance(&aboutData);
+ TDEInstance *instance = new TDEInstance(&aboutData);
KConfig *config = instance->config(); // Enable translations.
if (args->isSet("check"))
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 0c1dd1b1..bd0980a2 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -366,15 +366,15 @@ void KHostName::changeSessionManager()
int main(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
- KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
+ TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
I18N_NOOP("Informs TDE about a change in hostname"),
- KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
+ TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian");
d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
TDECmdLineArgs::init(argc, argv, &d);
TDECmdLineArgs::addCmdLineOptions(options);
- KInstance k(&d);
+ TDEInstance k(&d);
KHostName hn;
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index bce813f8..8ca72586 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -1,7 +1,7 @@
[Global]
PluginName=KDEWidgets
Includes=kinstance.h,classpreviews.h
-Init=new KInstance("kdewidgets");
+Init=new TDEInstance("kdewidgets");
[KActiveLabel]
ToolTip=Active Label (KDE)
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index 8c557735..bec6988b 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -124,9 +124,9 @@ static void buildFile( TQTextStream &stream, const TQString& group, const TQStri
static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );
int main( int argc, char **argv ) {
- new KInstance( "makekdewidgets" );
+ new TDEInstance( "makekdewidgets" );
- KAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, KAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
+ TDEAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, TDEAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
about.addAuthor( "ian reinhart geiser", 0, "geiseri@kde.org" );
TDECmdLineArgs::init( argc, argv, &about );
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index b67abede..d375f0ad 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -1,7 +1,7 @@
[Global]
PluginName=KDEWidgets
Includes=kinstance.h,classpreviews.h
-Init=new KInstance("kdewidgets");
+Init=new TDEInstance("kdewidgets");
[KActiveLabel]
ToolTip=Active Label (KDE)
diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index 8e096d6c..7ba294bf 100644
--- a/kdoctools/main.cpp
+++ b/kdoctools/main.cpp
@@ -25,7 +25,7 @@ extern "C"
{
KDE_EXPORT int kdemain( int argc, char **argv )
{
- KInstance instance( "kio_help" );
+ TDEInstance instance( "kio_help" );
fillInstance(instance);
(void)instance.config(); // we need this one to make sure system globals are read
diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp
index 281b31f1..bbdb5d7c 100644
--- a/kdoctools/main_ghelp.cpp
+++ b/kdoctools/main_ghelp.cpp
@@ -25,7 +25,7 @@ extern "C"
{
KDE_EXPORT int kdemain( int argc, char **argv )
{
- KInstance instance( "kio_ghelp" );
+ TDEInstance instance( "kio_ghelp" );
fillInstance(instance);
(void)instance.config(); // we need this one to make sure system globals are read
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 8f9b9435..577d0341 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv) {
// xsltSetGenericDebugFunc(stderr, NULL);
- KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
+ TDEAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
"$Revision$",
I18N_NOOP("TDE Translator for XML"));
@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
TDECmdLineArgs::addCmdLineOptions( options );
KLocale::setMainCatalogue("kio_help");
- KInstance ins("meinproc");
+ TDEInstance ins("meinproc");
KGlobal::locale();
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index f9803ff0..6653c7cd 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -179,7 +179,7 @@ TQString splitOut(const TQString &parsed, int index)
return filedata;
}
-void fillInstance(KInstance &ins, const TQString &srcdir) {
+void fillInstance(TDEInstance &ins, const TQString &srcdir) {
TQString catalogs;
if ( srcdir.isEmpty() ) {
diff --git a/kdoctools/xslt.h b/kdoctools/xslt.h
index 975bd3c8..c09e0c9e 100644
--- a/kdoctools/xslt.h
+++ b/kdoctools/xslt.h
@@ -7,7 +7,7 @@
TQString transform(const TQString &file, const TQString& stylesheet,
const TQValueVector<const char *> &params = TQValueVector<const char *>());
TQString splitOut(const TQString &parsed, int index);
-void fillInstance(KInstance &ins, const TQString &srcdir = TQString::null );
+void fillInstance(TDEInstance &ins, const TQString &srcdir = TQString::null );
bool saveToCache( const TQString &contents, const TQString &filename );
TQString lookForCache( const TQString &filename );
TQCString fromUnicode( const TQString &data );
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index 8e605d79..b8d44590 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
}
//-------------------------------------------------------------------------
KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
- : KMainWindow(parent, name, (WFlags)WType_TopLevel), KInstance("kjs_debugger")
+ : KMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
{
m_breakpoints = 0;
m_breakpointCount = 0;
diff --git a/khtml/ecma/kjs_debugwin.h b/khtml/ecma/kjs_debugwin.h
index 8faf71d5..dc2368ac 100644
--- a/khtml/ecma/kjs_debugwin.h
+++ b/khtml/ecma/kjs_debugwin.h
@@ -157,7 +157,7 @@ namespace KJS {
*
* There is only one debug window per program. This can be obtained by calling #instance
*/
- class KJSDebugWin : public KMainWindow, public Debugger, public KInstance
+ class KJSDebugWin : public KMainWindow, public Debugger, public TDEInstance
{
Q_OBJECT
friend class SourceDisplay;
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index 5948dea2..05c2eb7d 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -48,10 +48,10 @@
K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory)
-KInstance *KJavaAppletViewerFactory::s_instance = 0;
+TDEInstance *KJavaAppletViewerFactory::s_instance = 0;
KJavaAppletViewerFactory::KJavaAppletViewerFactory () {
- s_instance = new KInstance ("kjava");
+ s_instance = new TDEInstance ("kjava");
}
KJavaAppletViewerFactory::~KJavaAppletViewerFactory () {
@@ -447,8 +447,8 @@ void KJavaAppletViewer::infoMessage (const TQString & msg) {
m_browserextension->infoMessage(msg);
}
-KAboutData* KJavaAppletViewer::createAboutData () {
- return new KAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
+TDEAboutData* KJavaAppletViewer::createAboutData () {
+ return new TDEAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
}
//---------------------------------------------------------------------
diff --git a/khtml/java/kjavaappletviewer.h b/khtml/java/kjavaappletviewer.h
index e12b3c1d..b76f2036 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/khtml/java/kjavaappletviewer.h
@@ -39,8 +39,8 @@ class TQTable;
class TQLabel;
class KJavaProcess;
class KJavaAppletViewer;
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
class KConfig;
class CoverWidget;
@@ -86,7 +86,7 @@ public:
TQObject * parent, const char * name, const TQStringList &args);
~KJavaAppletViewer ();
CoverWidget * view () const { return m_view; }
- static KAboutData* createAboutData ();
+ static TDEAboutData* createAboutData ();
KJavaAppletViewerBrowserExtension * browserextension() const
{ return m_browserextension; }
@@ -126,9 +126,9 @@ public:
(TQWidget *wparent, const char *wname,
TQObject *parent, const char *name,
const char *className, const TQStringList &args);
- static KInstance * instance () { return s_instance; }
+ static TDEInstance * instance () { return s_instance; }
private:
- static KInstance * s_instance;
+ static TDEInstance * s_instance;
};
class AppletParameterDialog : public KDialogBase {
diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp
index 7eedc631..c2eee7d1 100644
--- a/khtml/khtml_factory.cpp
+++ b/khtml/khtml_factory.cpp
@@ -58,8 +58,8 @@ extern "C" KDE_EXPORT void *init_libkhtml()
KHTMLFactory *KHTMLFactory::s_self = 0;
unsigned long int KHTMLFactory::s_refcnt = 0;
-KInstance *KHTMLFactory::s_instance = 0;
-KAboutData *KHTMLFactory::s_about = 0;
+TDEInstance *KHTMLFactory::s_instance = 0;
+TDEAboutData *KHTMLFactory::s_about = 0;
KHTMLSettings *KHTMLFactory::s_settings = 0;
TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0;
TQString *KHTMLSettings::avFamilies = 0;
@@ -119,7 +119,7 @@ void KHTMLFactory::ref()
// we can't use a staticdeleter here, because that would mean
// that the factory gets deleted from within a qPostRoutine, called
// from the TQApplication destructor. That however is too late, because
- // we want to destruct a KInstance object, which involves destructing
+ // we want to destruct a TDEInstance object, which involves destructing
// a KConfig object, which might call KGlobal::dirs() (in sync()) which
// probably is not going to work ;-)
// well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
@@ -168,15 +168,15 @@ void KHTMLFactory::deregisterPart( KHTMLPart *part )
}
}
-KInstance *KHTMLFactory::instance()
+TDEInstance *KHTMLFactory::instance()
{
assert( s_self );
if ( !s_instance )
{
- s_about = new KAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
+ s_about = new TDEAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
I18N_NOOP( "Embeddable HTML component" ),
- KAboutData::License_LGPL );
+ TDEAboutData::License_LGPL );
s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
s_about->addAuthor( "Antti Koivisto", 0, "koivisto@kde.org" );
s_about->addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
@@ -187,7 +187,7 @@ KInstance *KHTMLFactory::instance()
s_about->addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" );
s_about->addAuthor( "Tobias Anton", 0, "anton@stud.fbi.fh-darmstadt.de" );
- s_instance = new KInstance( s_about );
+ s_instance = new TDEInstance( s_about );
}
return s_instance;
diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h
index e9d5c62a..4d015412 100644
--- a/khtml/khtml_factory.h
+++ b/khtml/khtml_factory.h
@@ -25,8 +25,8 @@
#include <tqptrlist.h>
#include <kurl.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class HistoryProvider;
class KHTMLSettings;
class KHTMLPart;
@@ -52,7 +52,7 @@ public:
static TQPtrList<KHTMLPart> *partList() { return s_parts; }
- static KInstance *instance();
+ static TDEInstance *instance();
static KHTMLSettings *defaultHTMLSettings();
@@ -67,8 +67,8 @@ protected:
private:
static unsigned long s_refcnt;
static KHTMLFactory *s_self;
- static KInstance *s_instance;
- static KAboutData *s_about;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_about;
static KHTMLSettings *s_settings;
static TQPtrList<KHTMLPart> *s_parts;
};
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index a8ee4d7e..7782f178 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -36,11 +36,11 @@
K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory )
-KInstance *KHTMLImageFactory::s_instance = 0;
+TDEInstance *KHTMLImageFactory::s_instance = 0;
KHTMLImageFactory::KHTMLImageFactory()
{
- s_instance = new KInstance( "khtmlimage" );
+ s_instance = new TDEInstance( "khtmlimage" );
}
KHTMLImageFactory::~KHTMLImageFactory()
diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h
index dda91817..6db0cbf5 100644
--- a/khtml/khtmlimage.h
+++ b/khtml/khtmlimage.h
@@ -27,7 +27,7 @@
#include "misc/loader_client.h"
class KHTMLPart;
-class KInstance;
+class TDEInstance;
namespace khtml
{
@@ -48,10 +48,10 @@ public:
TQObject *parent, const char *name,
const char *className, const TQStringList &args );
- static KInstance *instance() { return s_instance; }
+ static TDEInstance *instance() { return s_instance; }
private:
- static KInstance *s_instance;
+ static TDEInstance *s_instance;
};
/**
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 55f37f39..65be07e8 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -571,12 +571,12 @@ void KMultiPart::slotProgressInfo()
emit m_extension->infoMessage( str );
}
-KAboutData* KMultiPart::createAboutData()
+TDEAboutData* KMultiPart::createAboutData()
{
- KAboutData* aboutData = new KAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
+ TDEAboutData* aboutData = new TDEAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
"0.1",
I18N_NOOP( "Embeddable component for multipart/mixed" ),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
"(c) 2001, David Faure <david@mandrakesoft.com>");
return aboutData;
}
diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h
index f3bf9521..7ba5ba2f 100644
--- a/khtml/kmultipart/kmultipart.h
+++ b/khtml/kmultipart/kmultipart.h
@@ -29,7 +29,7 @@
#include <tqdatetime.h>
class KHTMLPart;
-class KInstance;
+class TDEInstance;
class KTempFile;
class KLineParser;
@@ -49,7 +49,7 @@ public:
virtual bool closeURL();
- static KAboutData* createAboutData();
+ static TDEAboutData* createAboutData();
protected:
virtual void guiActivateEvent( KParts::GUIActivateEvent *e );
diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp
index fceed88e..650a3e12 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/kdostartupconfig.cpp
@@ -62,7 +62,7 @@ TQString get_entry( TQString* ll )
int main()
{
- KInstance inst( "kdostartupconfig" );
+ TDEInstance inst( "kdostartupconfig" );
kdDebug() << "Running kdostartupconfig." << endl;
TQString keysname = locateLocal( "config", "startupconfigkeys" );
TQFile keys( keysname );
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 478331fd..9bc6b7b1 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -113,7 +113,7 @@ static Display *X11display = 0;
static int X11_startup_notify_fd = -1;
static Display *X11_startup_notify_display = 0;
#endif
-static const KInstance *s_instance = 0;
+static const TDEInstance *s_instance = 0;
#define MAX_SOCK_FILE 255
static char sock_file[MAX_SOCK_FILE];
static char sock_file_old[MAX_SOCK_FILE];
@@ -1752,14 +1752,14 @@ int main(int argc, char **argv, char **envp)
setsid();
/** Create our instance **/
- s_instance = new KInstance("tdeinit");
+ s_instance = new TDEInstance("tdeinit");
/** Prepare to change process name **/
tdeinit_initsetproctitle(argc, argv, envp);
tdeinit_library_path();
// Don't make our instance the global instance
// (do it only after tdeinit_library_path, that one indirectly uses KConfig,
- // which seems to be buggy and always use KGlobal instead of the maching KInstance)
+ // which seems to be buggy and always use KGlobal instead of the maching TDEInstance)
KGlobal::_instance = 0L;
// don't change envvars before tdeinit_initsetproctitle()
unsetenv("LD_BIND_NOW");
diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index b3242e90..ebaadaa7 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/kio/kfile/knotifydialog.cpp
@@ -152,14 +152,14 @@ namespace KNotify
int KNotifyDialog::configure( TQWidget *parent, const char *name,
- const KAboutData *aboutData )
+ const TDEAboutData *aboutData )
{
KNotifyDialog dialog( parent, name, true, aboutData );
return dialog.exec();
}
KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal,
- const KAboutData *aboutData )
+ const TDEAboutData *aboutData )
: KDialogBase(parent, name, modal, i18n("Notification Settings"),
Ok | Apply | Cancel | Default, Ok, true )
{
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index 2adb2b15..1f758a01 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -63,14 +63,14 @@ public:
* @param parent The parent widget for the dialog
* @param name The widget name
* @param modal If true, this will be a modal dialog, otherwise non-modal.
- * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
+ * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
* will be used to find the KNotify events (in the eventsrc file).
* Set this to 0L if you want to add all events yourself with
* addApplicationEvents().
*/
KNotifyDialog( TQWidget *parent = 0, const char *name = 0,
bool modal = true,
- const KAboutData *aboutData =
+ const TDEAboutData *aboutData =
KGlobal::instance()->aboutData() );
/**
* Destroys the KNotifyDialog
@@ -82,13 +82,13 @@ public:
*
* @param parent The parent widget for the dialog
* @param name The widget name
- * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
+ * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
* will be used to find the KNotify events (in the eventsrc file).
* @see exec for the return values.
* @return The value of TQDialog::exec()
*/
static int configure( TQWidget *parent = 0, const char *name = 0,
- const KAboutData *aboutData = KGlobal::instance()->aboutData() );
+ const TDEAboutData *aboutData = KGlobal::instance()->aboutData() );
/**
* With this method, you can add the KNotify events of one eventsrc
@@ -96,7 +96,7 @@ public:
* KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
* Successive calls with a different @p appName will add them.
* @param appName The application's name, i.e. the name passed to the
- * TDEApplication constructor or KAboutData.
+ * TDEApplication constructor or TDEAboutData.
* @see clearApplicationEvents()
*/
virtual void addApplicationEvents( const char *appName );
diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp
index 161c8229..0ee463d8 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/kio/kio/dataprotocol.cpp
@@ -47,7 +47,7 @@ using namespace KIO;
extern "C" {
int kdemain( int argc, char **argv ) {
- KInstance instance( "kio_data" );
+ TDEInstance instance( "kio_data" );
kdDebug(7101) << "*** Starting kio_data " << endl;
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index c5e04537..76cf7836 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -42,7 +42,7 @@ KDataToolInfo::KDataToolInfo()
m_service = 0;
}
-KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance )
+KDataToolInfo::KDataToolInfo( const KService::Ptr& service, TDEInstance* instance )
{
m_service = service;
m_instance = instance;
@@ -159,7 +159,7 @@ KService::Ptr KDataToolInfo::service() const
return m_service;
}
-TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, KInstance* instance )
+TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, TDEInstance* instance )
{
TQValueList<KDataToolInfo> lst;
@@ -271,7 +271,7 @@ KDataTool::KDataTool( TQObject* parent, const char* name )
{
}
-KInstance* KDataTool::instance() const
+TDEInstance* KDataTool::instance() const
{
return m_instance;
}
diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h
index 573bf809..46005ada 100644
--- a/kio/kio/kdatatool.h
+++ b/kio/kio/kdatatool.h
@@ -30,7 +30,7 @@
class KDataTool;
class TQPixmap;
class TQStringList;
-class KInstance;
+class TDEInstance;
// If you're only looking at implementing a data-tool, skip directly to the last
// class definition, KDataTool.
@@ -56,7 +56,7 @@ public:
* @param service the corresponding service
* @param instance the instance to use
*/
- KDataToolInfo( const KService::Ptr& service, KInstance* instance );
+ KDataToolInfo( const KService::Ptr& service, TDEInstance* instance );
/**
* Copy constructor.
*/
@@ -154,7 +154,7 @@ public:
* The instance of the service.
* @return the instance
*/
- KInstance* instance() const { return m_instance; }
+ TDEInstance* instance() const { return m_instance; }
/**
* A DataToolInfo may be invalid if the KService passed to its constructor does
@@ -171,11 +171,11 @@ public:
* and also used if the tool wants to read its configuration in the app's config file).
* @return the list of results
*/
- static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, KInstance * instance );
+ static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, TDEInstance * instance );
private:
KService::Ptr m_service;
- KInstance* m_instance;
+ TDEInstance* m_instance;
private:
class KDataToolInfoPrivate* d;
};
@@ -267,14 +267,14 @@ public:
/**
* @internal. Do not use under any circumstance (including bad weather).
*/
- void setInstance( KInstance* instance ) { m_instance = instance; }
+ void setInstance( TDEInstance* instance ) { m_instance = instance; }
/**
* Returns the instance of the part that created this tool.
* Usually used if the tool wants to read its configuration in the app's config file.
* @return the instance of the part that created this tool.
*/
- KInstance* instance() const;
+ TDEInstance* instance() const;
/**
* Interface for 'running' this tool.
@@ -292,7 +292,7 @@ public:
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype) = 0;
private:
- KInstance * m_instance;
+ TDEInstance * m_instance;
protected:
virtual void virtual_hook( int id, void* data );
private:
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index 5306156a..755d4972 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -213,17 +213,17 @@ protected:
*/
void setName( const TQCString& instanceName ) {
delete m_instance;
- m_instance = new KInstance( instanceName );
+ m_instance = new TDEInstance( instanceName );
}
/**
* Returns the instance.
- * @return the KInstance
+ * @return the TDEInstance
*/
- KInstance *instance() const { return m_instance; }
+ TDEInstance *instance() const { return m_instance; }
private:
- KInstance *m_instance;
+ TDEInstance *m_instance;
protected:
virtual void virtual_hook( int id, void* data );
private:
@@ -349,17 +349,17 @@ protected:
*/
void setName( const TQCString& instanceName ) {
delete m_instance;
- m_instance = new KInstance( instanceName );
+ m_instance = new TDEInstance( instanceName );
}
/**
* Returns the instance.
- * @return the KInstance
+ * @return the TDEInstance
*/
- KInstance *instance() const { return m_instance; }
+ TDEInstance *instance() const { return m_instance; }
private:
- KInstance *m_instance;
+ TDEInstance *m_instance;
protected:
virtual void virtual_hook( int id, void* data );
private:
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 18014f08..2a149404 100644
--- a/kio/kioexec/main.cpp
+++ b/kio/kioexec/main.cpp
@@ -271,8 +271,8 @@ void KIOExec::slotRunApp()
int main( int argc, char **argv )
{
- KAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
- VERSION, description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
+ VERSION, description, TDEAboutData::License_GPL,
"(c) 1998-2000,2003 The KFM/Konqueror Developers");
aboutData.addAuthor("David Faure",0, "faure@kde.org");
aboutData.addAuthor("Stephan Kulow",0, "coolo@kde.org");
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index cba281cc..bbd34a2a 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -406,10 +406,10 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
int main( int argc, char **argv )
{
- KAboutData about(
+ TDEAboutData about(
"kfile", I18N_NOOP( "kfile" ), KFILEVERSION,
I18N_NOOP("A commandline tool to read and modify metadata of files." ),
- KAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
+ TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
"pfeiffer@kde.org" );
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index 5d8b008b..b651e231 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -41,7 +41,7 @@ namespace KPAC
ProxyScout::ProxyScout( const TQCString& name )
: KDEDModule( name ),
- m_instance( new KInstance( "proxyscout" ) ),
+ m_instance( new TDEInstance( "proxyscout" ) ),
m_downloader( 0 ),
m_script( 0 ),
m_suspendTime( 0 )
diff --git a/kio/misc/kpac/proxyscout.h b/kio/misc/kpac/proxyscout.h
index c18e5173..78c8fc23 100644
--- a/kio/misc/kpac/proxyscout.h
+++ b/kio/misc/kpac/proxyscout.h
@@ -29,7 +29,7 @@
#include <time.h>
class DCOPClientTransaction;
-class KInstance;
+class TDEInstance;
namespace KPAC
{
@@ -56,7 +56,7 @@ namespace KPAC
bool startDownload();
TQString handleRequest( const KURL& url );
- KInstance* m_instance;
+ TDEInstance* m_instance;
Downloader* m_downloader;
Script* m_script;
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 527d8545..be1eb8b9 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -59,9 +59,9 @@ void BugMailer::slotSend() {
int main(int argc, char **argv) {
KLocale::setMainCatalogue("tdelibs");
- KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
+ TDEAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
- KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
+ TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow");
d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
TDECmdLineArgs::init(argc, argv, &d);
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 919676fc..3e890c55 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -1380,9 +1380,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
KLocale::setMainCatalogue("tdelibs");
// GS 5/2001 - I changed the name to "TDE" to make it look better
// in the titles of dialogs which are displayed.
- KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
+ TDEAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
"0.8", I18N_NOOP("TDE Progress Information UI Server"),
- KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
+ TDEAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
// Who's the maintainer ? :)
aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");
aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk");
diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp
index e070418e..1922e207 100644
--- a/kio/tests/kfiltertest.cpp
+++ b/kio/tests/kfiltertest.cpp
@@ -88,7 +88,7 @@ void test_textstream( const TQString & fileName )
int main()
{
- KInstance instance("kfiltertest");
+ TDEInstance instance("kfiltertest");
char currentdir[PATH_MAX+1];
getcwd( currentdir, PATH_MAX );
diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp
index 099ce468..2bbdaa65 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/kio/tests/kiopassdlgtest.cpp
@@ -8,7 +8,7 @@
int main ( int argc, char** argv )
{
- KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
+ TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication app;
diff --git a/kio/tests/kmfitest.cpp b/kio/tests/kmfitest.cpp
index df37df99..40530184 100644
--- a/kio/tests/kmfitest.cpp
+++ b/kio/tests/kmfitest.cpp
@@ -8,7 +8,7 @@
int main (int argc, char **argv)
{
- KInstance ins("kmfitest");
+ TDEInstance ins("kmfitest");
if (argc < 2) {
printf("usage: %s <file>\n", argv[0]);
diff --git a/kio/tests/kmimemagictest.cpp b/kio/tests/kmimemagictest.cpp
index eb01137c..00c545c3 100644
--- a/kio/tests/kmimemagictest.cpp
+++ b/kio/tests/kmimemagictest.cpp
@@ -30,7 +30,7 @@ int main( int argc, char** argv )
"Usage : ./kmimemagictest file\n");
return 1;
}
- KInstance blah("kmimemagictest");
+ TDEInstance blah("kmimemagictest");
TQString file = TQString::fromLocal8Bit( argv[1] );
diff --git a/kio/tests/kmimetypetest.cpp b/kio/tests/kmimetypetest.cpp
index 5802a408..5d963c81 100644
--- a/kio/tests/kmimetypetest.cpp
+++ b/kio/tests/kmimetypetest.cpp
@@ -38,7 +38,7 @@ static void checkIcon( const KURL& url, const TQString& expectedIcon )
int main( int argc, char** argv )
{
- KInstance blah("kmimetypetest");
+ TDEInstance blah("kmimetypetest");
// Obviously those tests will need to be fixed if we ever change the name of the icons
// but at least they unit-test KMimeType::iconForURL.
diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp
index 02a4b6f3..66b02bae 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/kio/tests/kpropsdlgtest.cpp
@@ -13,7 +13,7 @@ static KCmdLineOptions options[] =
int main ( int argc, char** argv )
{
- KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
+ TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index 1f4dc95c..03bbbdac 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -26,7 +26,7 @@
#include <assert.h>
int main(int argc, char **argv) {
- KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
+ TDEAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
"1.0");
TDECmdLineArgs::init(argc, argv, &aboutData);
diff --git a/kio/tests/ktartest.cpp b/kio/tests/ktartest.cpp
index 5fe4a4f1..2c470f6e 100644
--- a/kio/tests/ktartest.cpp
+++ b/kio/tests/ktartest.cpp
@@ -50,7 +50,7 @@ int main( int argc, char** argv )
" ./ktartest iodevice /path/to/existing_file.tar.gz tests KArchiveFile::device()\n");
return 1;
}
- KInstance instance("ktartest");
+ TDEInstance instance("ktartest");
TQString command = argv[1];
if ( command == "list" )
{
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 3dbd8c64..9f4e0901 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
- KAboutData aboutData(appName, programName, version, description);
+ TDEAboutData aboutData(appName, programName, version, description);
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kio/tests/kziptest.cpp b/kio/tests/kziptest.cpp
index 5b784c40..84d38d13 100644
--- a/kio/tests/kziptest.cpp
+++ b/kio/tests/kziptest.cpp
@@ -98,7 +98,7 @@ int main( int argc, char** argv )
" ./kziptest iodevice /path/to/existing_file.zip tests KArchiveFile::device()\n");
return 1;
}
- KInstance instance("kziptest");
+ TDEInstance instance("kziptest");
TQString command = argv[1];
if ( command == "list" )
{
diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index 2deeb353..4e386583 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -113,7 +113,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
- KInstance instance( "kio_file" );
+ TDEInstance instance( "kio_file" );
( void ) KGlobal::locale();
kdDebug(7101) << "Starting " << getpid() << endl;
diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc
index 5f0f993b..00fe94b2 100644
--- a/kioslave/ftp/ftp.cc
+++ b/kioslave/ftp/ftp.cc
@@ -140,7 +140,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
- KInstance instance( "kio_ftp" );
+ TDEInstance instance( "kio_ftp" );
( void ) KGlobal::locale();
kdDebug(7102) << "Starting " << getpid() << endl;
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index bb9eb586..8c732d82 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -99,7 +99,7 @@ extern "C" {
int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
- KInstance instance( "kio_http" );
+ TDEInstance instance( "kio_http" );
( void ) KGlobal::locale();
if (argc != 4)
diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp
index a94ce320..4a140262 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/kioslave/http/http_cache_cleaner.cpp
@@ -200,7 +200,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
bool deleteAll = args->isSet("clear-all");
- KInstance ins( appName );
+ TDEInstance ins( appName );
if (!deleteAll)
{
diff --git a/kioslave/http/kcookiejar/main.cpp b/kioslave/http/kcookiejar/main.cpp
index 87cefe3b..e2411288 100644
--- a/kioslave/http/kcookiejar/main.cpp
+++ b/kioslave/http/kcookiejar/main.cpp
@@ -48,7 +48,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions( options );
- KInstance a("kcookiejar");
+ TDEInstance a("kcookiejar");
kapp->dcopClient()->attach();
diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
index d457ae5c..05f0ac0e 100644
--- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -249,12 +249,12 @@ int main(int argc, char *argv[])
lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8());
nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8());
- KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
+ TDEAboutData about("kcookietest", "kcookietest", "1.0", description, TDEAboutData::License_GPL, "(C) 2004 Waldo Bastian");
TDECmdLineArgs::init( argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KInstance a("kcookietest");
+ TDEInstance a("kcookietest");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() != 1)
diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
index 4bd128e4..f5f7f875 100644
--- a/kioslave/iso/iso.cpp
+++ b/kioslave/iso/iso.cpp
@@ -60,7 +60,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
- KInstance instance( "kio_iso" );
+ TDEInstance instance( "kio_iso" );
kdDebug() << "Starting " << getpid() << endl;
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index 1f5c0176..6c0c2a9f 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -78,7 +78,7 @@ void GhnsWidget::downloadWallpapers()
int main(int argc,char **argv)
{
- KAboutData aboutData("ghns","Get Hot New Stuff","0.1");
+ TDEAboutData aboutData("ghns","Get Hot New Stuff","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app;
diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/khotnewstuff.cpp
index bbca71b8..67c6c70b 100644
--- a/knewstuff/khotnewstuff.cpp
+++ b/knewstuff/khotnewstuff.cpp
@@ -35,7 +35,7 @@ static const KCmdLineOptions op[] =
int main(int argc, char **argv)
{
- KAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
+ TDEAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
TDECmdLineArgs *args;
TDECmdLineArgs::init(argc, argv, &about);
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index 189a9006..a1de4c1d 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -107,7 +107,7 @@ void MyWidget::upload()
int main(int argc,char **argv)
{
- KAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
+ TDEAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDEApplication app;
diff --git a/kparts/factory.cpp b/kparts/factory.cpp
index 7d04b43d..a3985fd0 100644
--- a/kparts/factory.cpp
+++ b/kparts/factory.cpp
@@ -47,7 +47,7 @@ Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObj
return part;
}
-const KInstance *Factory::partInstance()
+const TDEInstance *Factory::partInstance()
{
QueryInstanceParams params;
params.instance = 0;
@@ -55,7 +55,7 @@ const KInstance *Factory::partInstance()
return params.instance;
}
-const KInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
+const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
{
KLibrary *library = KLibLoader::self()->library( libraryName );
if ( !library )
diff --git a/kparts/factory.h b/kparts/factory.h
index 26c53b9d..05b23d9d 100644
--- a/kparts/factory.h
+++ b/kparts/factory.h
@@ -75,12 +75,12 @@ public:
/**
* If you have a part contained in a shared library you might want to query
- * for meta-information like the about-data, or the KInstance in general.
+ * for meta-information like the about-data, or the TDEInstance in general.
* If the part is exported using KParts::GenericFactory then this method will
* return the instance that belongs to the part without the need to instantiate
* the part component.
*/
- const KInstance *partInstance();
+ const TDEInstance *partInstance();
/**
* A convenience method for partInstance() that takes care of retrieving
@@ -88,7 +88,7 @@ public:
*
* @param libraryName name of the library to query the instance from
*/
- static const KInstance *partInstanceFromLibrary( const TQCString &libraryName );
+ static const TDEInstance *partInstanceFromLibrary( const TQCString &libraryName );
protected:
@@ -129,7 +129,7 @@ protected:
enum { VIRTUAL_QUERY_INSTANCE_PARAMS = 0x10 };
struct QueryInstanceParams
{
- const KInstance *instance;
+ const TDEInstance *instance;
};
};
diff --git a/kparts/genericfactory.h b/kparts/genericfactory.h
index f4ab3be1..7deea124 100644
--- a/kparts/genericfactory.h
+++ b/kparts/genericfactory.h
@@ -32,13 +32,13 @@ namespace KParts
s_self = 0;
}
- static KInstance *instance();
- static KAboutData *aboutData();
+ static TDEInstance *instance();
+ static TDEAboutData *aboutData();
protected:
- virtual KInstance *createInstance()
+ virtual TDEInstance *createInstance()
{
- return new KInstance( aboutData() );
+ return new TDEInstance( aboutData() );
}
virtual void virtual_hook( int id, void *data )
@@ -54,30 +54,30 @@ namespace KParts
private:
static GenericFactoryBase<T> *s_self;
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
/**
* A template for a KParts::Factory implementation. It implements the pure virtual
* createPartObject method by instantiating the template argument when requested
- * through the className field. In addition it is a container for a part's KInstance
- * object, by providing a static KInstance *instance() method.
+ * through the className field. In addition it is a container for a part's TDEInstance
+ * object, by providing a static TDEInstance *instance() method.
*
* The template argument has to inherit from KParts::Part and has to implement two methods:
* 1) There needs to be a public constructor with the following signature:
* MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
*
- * 2) It needs to provide one static method to create a KAboutData object per
+ * 2) It needs to provide one static method to create a TDEAboutData object per
* request, holding information about the component's name, its authors, license, etc.
* The signature of that static method has to be
- * KAboutData *createAboutData()
+ * TDEAboutData *createAboutData()
*
- * The template will take care of memory management of the KInstance and the KAboutData object,
+ * The template will take care of memory management of the TDEInstance and the TDEAboutData object,
* meaning ownership of what createAboutData returns is passed to the caller (this template) .
*
* For advanced use you can also inherit from the template and re-implement additionally the
- * virtual KInstance *createInstance() method, for example in case you want to extend the
+ * virtual TDEInstance *createInstance() method, for example in case you want to extend the
* paths of your instance's KStandardDirs object.
*
* If a KParts::ReadOnlyPart is requested through this factory and the template argument
@@ -159,26 +159,26 @@ namespace KParts
* @internal
*/
template <class T>
- KInstance *GenericFactoryBase<T>::s_instance = 0;
+ TDEInstance *GenericFactoryBase<T>::s_instance = 0;
/**
* @internal
*/
template <class T>
- KAboutData *GenericFactoryBase<T>::s_aboutData = 0;
+ TDEAboutData *GenericFactoryBase<T>::s_aboutData = 0;
/**
* @internal
*/
template <class T>
- KInstance *GenericFactoryBase<T>::instance()
+ TDEInstance *GenericFactoryBase<T>::instance()
{
if ( !s_instance )
{
if ( s_self )
s_instance = s_self->createInstance();
else
- s_instance = new KInstance( aboutData() );
+ s_instance = new TDEInstance( aboutData() );
}
return s_instance;
}
@@ -187,7 +187,7 @@ namespace KParts
* @internal
*/
template <class T>
- KAboutData *GenericFactoryBase<T>::aboutData()
+ TDEAboutData *GenericFactoryBase<T>::aboutData()
{
if ( !s_aboutData )
s_aboutData = T::createAboutData();
diff --git a/kparts/part.cpp b/kparts/part.cpp
index a76fce28..d2efbeea 100644
--- a/kparts/part.cpp
+++ b/kparts/part.cpp
@@ -102,12 +102,12 @@ TQObject *PartBase::partObject() const
return m_obj;
}
-void PartBase::setInstance( KInstance *inst )
+void PartBase::setInstance( TDEInstance *inst )
{
setInstance( inst, true );
}
-void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
+void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins )
{
KXMLGUIClient::setInstance( inst );
KGlobal::locale()->insertCatalogue( inst->instanceName() );
@@ -119,7 +119,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
loadPlugins( m_obj, this, instance() );
}
-void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance )
+void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance )
{
if( d->m_pluginLoadingMode != DoNotLoadPlugins )
Plugin::loadPlugins( parent, parentGUIClient, instance, d->m_pluginLoadingMode == LoadPlugins );
diff --git a/kparts/part.h b/kparts/part.h
index 0c4023f6..8a58063a 100644
--- a/kparts/part.h
+++ b/kparts/part.h
@@ -27,7 +27,7 @@
#include <kxmlguiclient.h>
-class KInstance;
+class TDEInstance;
class TQWidget;
class KAction;
class KActionCollection;
@@ -79,24 +79,24 @@ public:
protected:
/**
- * Set the instance ( KInstance) for this part.
+ * Set the instance ( TDEInstance) for this part.
*
* Call this *first* in the inherited class constructor,
* because it loads the i18n catalogues.
*/
- virtual void setInstance( KInstance *instance );
+ virtual void setInstance( TDEInstance *instance );
/**
- * Set the instance ( KInstance) for this part.
+ * Set the instance ( TDEInstance) for this part.
*
* Call this *first* in the inherited class constructor,
* because it loads the i18n catalogues.
*/
- virtual void setInstance( KInstance *instance, bool loadPlugins );
+ virtual void setInstance( TDEInstance *instance, bool loadPlugins );
/**
* We have three different policies, whether to load new plugins or not. The
- * value in the KConfig object of the KInstance object always overrides
+ * value in the KConfig object of the TDEInstance object always overrides
* LoadPlugins and LoadPluginsIfEnabled.
*/
enum PluginLoadingMode {
@@ -140,7 +140,7 @@ protected:
* }
* \endcode
*/
- void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance );
+ void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance );
/**
* For a KParts::Part: call this before setInstance().
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp
index 97a8b996..8d9ff199 100644
--- a/kparts/partmanager.cpp
+++ b/kparts/partmanager.cpp
@@ -486,7 +486,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
emit activePartChanged( d->m_activePart );
}
-void PartManager::setActiveInstance( KInstance * instance )
+void PartManager::setActiveInstance( TDEInstance * instance )
{
// It's a separate method to allow redefining this behavior
KGlobal::_activeInstance = instance;
diff --git a/kparts/partmanager.h b/kparts/partmanager.h
index 33c13d3e..604e5ff9 100644
--- a/kparts/partmanager.h
+++ b/kparts/partmanager.h
@@ -27,7 +27,7 @@
#include <tdelibs_export.h>
-class KInstance;
+class TDEInstance;
namespace KParts
{
@@ -256,7 +256,7 @@ protected:
* The active instance is used by KBugReport and KAboutDialog.
* Override if you really need to - usually you don't need to.
*/
- virtual void setActiveInstance( KInstance * instance );
+ virtual void setActiveInstance( TDEInstance * instance );
protected slots:
/**
diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp
index b5c50be2..1e5ca900 100644
--- a/kparts/plugin.cpp
+++ b/kparts/plugin.cpp
@@ -45,7 +45,7 @@ class Plugin::PluginPrivate
public:
PluginPrivate() : m_parentInstance( 0 ) {}
- const KInstance *m_parentInstance;
+ const TDEInstance *m_parentInstance;
TQString m_library; // filename of the library
};
@@ -86,7 +86,7 @@ TQString Plugin::localXMLFile() const
}
//static
-TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance )
+TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const TDEInstance * instance )
{
if ( !instance )
kdError(1000) << "No instance ???" << endl;
@@ -138,12 +138,12 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
return plugins;
}
-void Plugin::loadPlugins( TQObject *parent, const KInstance *instance )
+void Plugin::loadPlugins( TQObject *parent, const TDEInstance *instance )
{
loadPlugins( parent, pluginInfos( instance ), instance );
}
-void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance *instance )
+void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance *instance )
{
TQValueList<PluginInfo>::ConstIterator pIt = pluginInfos.begin();
TQValueList<PluginInfo>::ConstIterator pEnd = pluginInfos.end();
@@ -218,13 +218,13 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library )
return false;
}
-void Plugin::setInstance( KInstance *instance )
+void Plugin::setInstance( TDEInstance *instance )
{
KGlobal::locale()->insertCatalogue( instance->instanceName() );
KXMLGUIClient::setInstance( instance );
}
-void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault )
+void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault )
{
KConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
TQValueList<PluginInfo> plugins = pluginInfos( instance );
diff --git a/kparts/plugin.h b/kparts/plugin.h
index 0da0a46e..efebf5af 100644
--- a/kparts/plugin.h
+++ b/kparts/plugin.h
@@ -24,7 +24,7 @@
#include <kaction.h>
#include <kxmlguiclient.h>
-class KInstance;
+class TDEInstance;
namespace KParts
{
@@ -86,7 +86,7 @@ public:
* It is recommended to use the last loadPlugins method instead,
* to support enabling and disabling of plugins.
*/
- static void loadPlugins( TQObject *parent, const KInstance * instance );
+ static void loadPlugins( TQObject *parent, const TDEInstance * instance );
/**
* Load the plugin libraries specified by the list @p docs and make the
@@ -104,7 +104,7 @@ public:
* It is recommended to use the last loadPlugins method instead,
* to support enabling and disabling of plugins.
*/
- static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance * instance );
+ static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance * instance );
/**
* Load the plugin libraries for the given @p instance, make the
@@ -140,7 +140,7 @@ public:
* }
* \endcode
*/
- static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault = true );
+ static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault = true );
/**
* Returns a list of plugin objects loaded for @p parent. This
@@ -156,7 +156,7 @@ protected:
*
* @return A list of TQDomDocument s, containing the parsed xml documents returned by plugins.
*/
- static TQValueList<Plugin::PluginInfo> pluginInfos( const KInstance * instance );
+ static TQValueList<Plugin::PluginInfo> pluginInfos( const TDEInstance * instance );
/**
* @internal
@@ -164,7 +164,7 @@ protected:
*/
static Plugin* loadPlugin( TQObject * parent, const char* libname );
- virtual void setInstance( KInstance *instance );
+ virtual void setInstance( TDEInstance *instance );
private:
static bool hasPlugin( TQObject* parent, const TQString& library );
diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp
index e0857a51..844a4ba1 100644
--- a/kparts/tests/notepad.cpp
+++ b/kparts/tests/notepad.cpp
@@ -46,9 +46,9 @@ void NotepadPart::setReadWrite( bool rw )
ReadWritePart::setReadWrite( rw );
}
-KAboutData* NotepadPart::createAboutData()
+TDEAboutData* NotepadPart::createAboutData()
{
- return new KAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
+ return new TDEAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
}
bool NotepadPart::openFile()
diff --git a/kparts/tests/notepad.h b/kparts/tests/notepad.h
index d192d42e..9cc4f2d9 100644
--- a/kparts/tests/notepad.h
+++ b/kparts/tests/notepad.h
@@ -5,7 +5,7 @@
#include <kparts/genericfactory.h>
#include <kparts/part.h>
-class KAboutData;
+class TDEAboutData;
class TQMultiLineEdit;
/**
@@ -24,7 +24,7 @@ public:
virtual void setReadWrite( bool rw );
- static KAboutData* createAboutData();
+ static TDEAboutData* createAboutData();
protected:
virtual bool openFile();
diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp
index d932a168..97ebdd4f 100644
--- a/kparts/tests/parts.cpp
+++ b/kparts/tests/parts.cpp
@@ -21,7 +21,7 @@
Part1::Part1( TQObject *parent, TQWidget * parentWidget )
: KParts::ReadOnlyPart( parent, "Part1" )
{
- m_instance = new KInstance( "kpartstestpart" );
+ m_instance = new TDEInstance( "kpartstestpart" );
setInstance( m_instance );
m_edit = new TQMultiLineEdit( parentWidget );
setWidget( m_edit );
@@ -59,7 +59,7 @@ bool Part1::openFile()
Part2::Part2( TQObject *parent, TQWidget * parentWidget )
: KParts::Part( parent, "Part2" )
{
- m_instance = new KInstance( "part2" );
+ m_instance = new TDEInstance( "part2" );
setInstance( m_instance );
TQWidget * w = new TQWidget( parentWidget, "Part2Widget" );
setWidget( w );
diff --git a/kparts/tests/parts.h b/kparts/tests/parts.h
index 6f373a85..0d4e6480 100644
--- a/kparts/tests/parts.h
+++ b/kparts/tests/parts.h
@@ -21,7 +21,7 @@ protected:
protected:
TQMultiLineEdit * m_edit;
- KInstance *m_instance;
+ TDEInstance *m_instance;
};
class Part2 : public KParts::Part
@@ -37,7 +37,7 @@ protected:
// (i.e. in a part manager)
// There is a default impl for ReadOnlyPart...
virtual void guiActivateEvent( KParts::GUIActivateEvent * );
- KInstance *m_instance;
+ TDEInstance *m_instance;
};
#endif
diff --git a/kresources/kcmkresources.cpp b/kresources/kcmkresources.cpp
index f517b5ea..ec6a7be4 100644
--- a/kresources/kcmkresources.cpp
+++ b/kresources/kcmkresources.cpp
@@ -40,10 +40,10 @@ KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQString
layout->addWidget( mConfigPage );
connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
setButtons( Help | Apply );
- KAboutData *about =
- new KAboutData( I18N_NOOP( "kcmkresources" ),
+ TDEAboutData *about =
+ new TDEAboutData( I18N_NOOP( "kcmkresources" ),
I18N_NOOP( "TDE Resources configuration module" ),
- 0, 0, KAboutData::License_GPL,
+ 0, 0, TDEAboutData::License_GPL,
I18N_NOOP( "(c) 2003 Tobias Koenig" ) );
about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
diff --git a/kresources/testresources.cpp b/kresources/testresources.cpp
index 6624b9ff..51556317 100644
--- a/kresources/testresources.cpp
+++ b/kresources/testresources.cpp
@@ -29,7 +29,7 @@ class TestSubResource : public TestResource
int main( int argc, char **argv )
{
- KAboutData aboutData( "testresources", "Kresource Test", "0" );
+ TDEAboutData aboutData( "testresources", "Kresource Test", "0" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app;
diff --git a/kunittest/modrunner.cpp b/kunittest/modrunner.cpp
index c7e545ac..93dcff8e 100644
--- a/kunittest/modrunner.cpp
+++ b/kunittest/modrunner.cpp
@@ -48,10 +48,10 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv )
{
- KInstance instance("modrunner");
+ TDEInstance instance("modrunner");
- KAboutData about("KUnitTest Module Runner", I18N_NOOP("KUnitTest ModRunner"), version, description,
- KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
+ TDEAboutData about("KUnitTest Module Runner", I18N_NOOP("KUnitTest ModRunner"), version, description,
+ TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
"Jeroen.Wijnhout@kdemail.net");
TDECmdLineArgs::init(argc, argv, &about);
diff --git a/kunittest/tester.h b/kunittest/tester.h
index 75eebd39..e654b1b4 100644
--- a/kunittest/tester.h
+++ b/kunittest/tester.h
@@ -147,8 +147,8 @@ SampleTest - 1 test passed, 1 test failed
*
* int main( int argc, char** argv )
* {
- * KAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description,
- * KAboutData::License_BSD, "(C) 2005 You!", 0, 0, "mail@provider");
+ * TDEAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description,
+ * TDEAboutData::License_BSD, "(C) 2005 You!", 0, 0, "mail@provider");
*
* TDECmdLineArgs::init(argc, argv, &about);
* TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp
index c613e438..258a5d96 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/kutils/kcmodulecontainer.cpp
@@ -182,7 +182,7 @@ void KCModuleContainer::tabSwitched( TQWidget * module )
d->btnRootMode->setEnabled( false );
setQuickHelp( mod->quickHelp() );
- setAboutData( const_cast<KAboutData*>(mod->aboutData()) );
+ setAboutData( const_cast<TDEAboutData*>(mod->aboutData()) );
}
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 2323cd26..3528ae73 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -586,12 +586,12 @@ TQString KCModuleProxy::quickHelp() const
}
}
-const KAboutData * KCModuleProxy::aboutData() const
+const TDEAboutData * KCModuleProxy::aboutData() const
{
if( !d->rootMode )
return realModule() ? realModule()->aboutData() : 0;
else
- /* This needs fixing, perhaps cache a KAboutData copy
+ /* This needs fixing, perhaps cache a TDEAboutData copy
* while in root mode? */
return 0;
@@ -614,7 +614,7 @@ bool KCModuleProxy::useRootOnlyMsg() const
return realModule() ? realModule()->useRootOnlyMsg() : true;
}
-KInstance * KCModuleProxy::instance() const
+TDEInstance * KCModuleProxy::instance() const
{
return realModule() ? realModule()->instance() : 0;
}
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index 11ae06db..63365295 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -27,10 +27,10 @@
#include <kservice.h>
#include <tdelibs_export.h>
-class KAboutData;
+class TDEAboutData;
class KCModule;
class KCModuleInfo;
-class KInstance;
+class TDEInstance;
class KProcess;
/**
@@ -155,7 +155,7 @@ public:
/**
* @return the module's aboutData()
*/
- const KAboutData * aboutData() const;
+ const TDEAboutData * aboutData() const;
/**
* @return what buttons the module
@@ -181,11 +181,11 @@ public:
// this one's available via moduleInfo()-> and realModule()->
/**
- * Returns the embedded KCModule's KInstance.
- * @return The module's KInstance.
+ * Returns the embedded KCModule's TDEInstance.
+ * @return The module's TDEInstance.
* @deprecated
*/
- KInstance * instance() const;
+ TDEInstance * instance() const;
//KDE4 remove. There's a limit for convenience functions,
// this one's available via realModule()
diff --git a/kutils/kplugininfo.h b/kutils/kplugininfo.h
index b75edf1a..bebd11cb 100644
--- a/kutils/kplugininfo.h
+++ b/kutils/kplugininfo.h
@@ -133,7 +133,7 @@ class KUTILS_EXPORT KPluginInfo
/**
* @return A list of KPluginInfo objects for the KParts plugins of an
* instance. You only need the name of the instance not a pointer to the
- * KInstance object.
+ * TDEInstance object.
*/
static KPluginInfo::List fromKPartsInstanceName( const TQString &, KConfig * config = 0, const TQString & group = TQString::null );
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index a385d271..3b6b4c39 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -618,7 +618,7 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin
d->pswidgets += w;
}
-void KPluginSelector::addPlugins( const KInstance * instance, const TQString &
+void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString &
catname, const TQString & category, KConfig * config )
{
if ( !config )
diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h
index 27890679..f018d2f9 100644
--- a/kutils/kpluginselector.h
+++ b/kutils/kpluginselector.h
@@ -25,7 +25,7 @@
#include <tdelibs_export.h>
-class KInstance;
+class TDEInstance;
class KPluginInfo;
class TQWidgetStack;
class KConfig;
@@ -78,7 +78,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
* The information about the plugins will be loaded from the
* share/apps/&lt;instancename&gt;/kpartplugins directory.
*
- * @param instanceName The name of the KInstance of the plugin's parent.
+ * @param instanceName The name of the TDEInstance of the plugin's parent.
* @param catname The translated name of the category. This is the
* name that is shown in the TabWidget if there is
* more than one category.
@@ -107,7 +107,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
* Add a list of KParts plugins. Convenience method for the one above.
* If not set explicitely, @p config is set to instance->config().
*/
- void addPlugins( const KInstance * instance,
+ void addPlugins( const TDEInstance * instance,
const TQString & catname = TQString::null,
const TQString & category = TQString::null,
KConfig * config = 0 );
diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox
index 4abfc6be..f42c325e 100644
--- a/kutils/ksettings/README.dox
+++ b/kutils/ksettings/README.dox
@@ -124,7 +124,7 @@ Some explanation for those keys:
use all modules that set X-TDE-ParentApp to
KGlobal::instance()->instanceName(). It
should be pretty easy to find out what name that is: look at the first
- argument to the KAboutData ctor.
+ argument to the TDEAboutData ctor.
- X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever)
this config page belongs to. Normally there is only one component.
It is used for two things:
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index 7f20c1bc..eb9acf0b 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -58,10 +58,10 @@ Dispatcher::~Dispatcher()
//delete d;
}
-void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const char * slot )
+void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, const char * slot )
{
assert( instance != 0 );
- // keep the KInstance around and call
+ // keep the TDEInstance around and call
// instance->config()->reparseConfiguration when the app should reparse
TQCString instanceName = instance->instanceName();
kdDebug( 701 ) << k_funcinfo << instanceName << endl;
@@ -88,7 +88,7 @@ KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
kdDebug( 701 ) << k_funcinfo << endl;
if( m_instanceInfo.contains( instanceName ) )
{
- KInstance * inst = m_instanceInfo[ instanceName ].instance;
+ TDEInstance * inst = m_instanceInfo[ instanceName ].instance;
if( inst )
return inst->config();
}
@@ -145,7 +145,7 @@ void Dispatcher::unregisterInstance( TQObject * obj )
}
}
-//X KInstance * Dispatcher::instanceForName( const TQCString & instanceName )
+//X TDEInstance * Dispatcher::instanceForName( const TQCString & instanceName )
//X {
//X return m_instanceInfo[ instanceName ].instance;
//X }
diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h
index 52829f9e..c04a41b9 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/kutils/ksettings/dispatcher.h
@@ -28,7 +28,7 @@ class TQCString;
class TQSignal;
class TQStrList;
template<class T> class KStaticDeleter;
-class KInstance;
+class TDEInstance;
class KConfig;
namespace KSettings
@@ -61,17 +61,17 @@ class KUTILS_EXPORT Dispatcher : public TQObject
/**
* Register a slot to be called when the configuration for the instance
- * has changed. @p instance is the KInstance object
+ * has changed. @p instance is the TDEInstance object
* that is passed to KGenericFactory (if it is used). You can query
* it with KGenericFactory<YourClassName>::instance().
* instance->instanceName() is also the same name that is put into the
* .desktop file of the KCMs for the X-TDE-ParentComponents.
*
- * @param instance The KInstance object
+ * @param instance The TDEInstance object
* @param recv The object that should receive the signal
* @param slot The slot to be called: TQT_SLOT( slotName() )
*/
- void registerInstance( KInstance * instance, TQObject * recv, const char * slot );
+ void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot );
/**
* @return the KConfig object that belongs to the instanceName
@@ -85,10 +85,10 @@ class KUTILS_EXPORT Dispatcher : public TQObject
TQStrList instanceNames() const;
//X /**
-//X * @return The KInstance object belonging to the instance name you pass
+//X * @return The TDEInstance object belonging to the instance name you pass
//X * (only works for registered instances of course).
//X */
-//X KInstance * instanceForName( const TQCString & instanceName );
+//X TDEInstance * instanceForName( const TQCString & instanceName );
public slots:
/**
@@ -116,7 +116,7 @@ class KUTILS_EXPORT Dispatcher : public TQObject
static Dispatcher * m_self;
struct InstanceInfo {
- KInstance * instance;
+ TDEInstance * instance;
TQSignal * signal;
int count;
};
diff --git a/kutils/ksettings/pluginpage.cpp b/kutils/ksettings/pluginpage.cpp
index 99ea904f..4a94d21d 100644
--- a/kutils/ksettings/pluginpage.cpp
+++ b/kutils/ksettings/pluginpage.cpp
@@ -46,7 +46,7 @@ class PluginPage::PluginPagePrivate
connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
}
- PluginPage::PluginPage( KInstance * instance, TQWidget * parent, const TQStringList & args )
+ PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
: KCModule( instance, parent, args )
, d( new PluginPagePrivate )
{
diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h
index df9acd49..74c7756d 100644
--- a/kutils/ksettings/pluginpage.h
+++ b/kutils/ksettings/pluginpage.h
@@ -84,7 +84,7 @@ class KUTILS_EXPORT PluginPage : public KCModule
* Standart KCModule constructor. Automatically creates the the
* KPluginSelector widget.
*/
- PluginPage( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
+ PluginPage( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
~PluginPage();
diff --git a/kwallet/tests/kwalletasync.cpp b/kwallet/tests/kwalletasync.cpp
index 0900f9d2..e4371448 100644
--- a/kwallet/tests/kwalletasync.cpp
+++ b/kwallet/tests/kwalletasync.cpp
@@ -43,7 +43,7 @@ void WalletReceiver::walletOpened( bool got )
int main( int argc, char *argv[] )
{
- KAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
+ TDEAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( "kwalletasync" );
diff --git a/kwallet/tests/kwalletboth.cpp b/kwallet/tests/kwalletboth.cpp
index cee1cc12..5df7b56a 100644
--- a/kwallet/tests/kwalletboth.cpp
+++ b/kwallet/tests/kwalletboth.cpp
@@ -65,7 +65,7 @@ void WalletReceiver::walletOpened( bool got )
int main( int argc, char *argv[] )
{
- KAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
+ TDEAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( "kwalletboth" );
diff --git a/kwallet/tests/kwalletsync.cpp b/kwallet/tests/kwalletsync.cpp
index 93baa01a..74369274 100644
--- a/kwallet/tests/kwalletsync.cpp
+++ b/kwallet/tests/kwalletsync.cpp
@@ -23,7 +23,7 @@ void openWallet()
int main( int argc, char *argv[] )
{
- KAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
+ TDEAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( "kwalletsync" );
diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc
index c8030f44..f989f2be 100644
--- a/libkmid/deviceman.cc
+++ b/libkmid/deviceman.cc
@@ -108,8 +108,8 @@ DeviceManager::DeviceManager(int def)
#if 1
if (def==-1)
{
- KInstance *tmp_instance=0L;
- if (!KGlobal::_instance) tmp_instance=new KInstance("nonKDEapp");
+ TDEInstance *tmp_instance=0L;
+ if (!KGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp");
KConfig *config = new KConfig("kcmmidirc", true);
config->setGroup("Configuration");
diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp
index 00d75225..303403ef 100644
--- a/tdecore/kaboutdata.cpp
+++ b/tdecore/kaboutdata.cpp
@@ -71,10 +71,10 @@ TQString KAboutTranslator::emailAddress() const
return mEmail;
}
-class KAboutDataPrivate
+class TDEAboutDataPrivate
{
public:
- KAboutDataPrivate()
+ TDEAboutDataPrivate()
: translatorName("_: NAME OF TRANSLATORS\nYour names")
, translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails")
, productName(0)
@@ -82,7 +82,7 @@ public:
, customAuthorTextEnabled(false)
, mTranslatedProgramName( 0 )
{}
- ~KAboutDataPrivate()
+ ~TDEAboutDataPrivate()
{
delete programLogo;
delete[] mTranslatedProgramName;
@@ -96,9 +96,9 @@ public:
const char *mTranslatedProgramName;
};
-const char *KAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org";
+const char *TDEAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org";
-KAboutData::KAboutData( const char *appName,
+TDEAboutData::TDEAboutData( const char *appName,
const char *programName,
const char *version,
const char *shortDescription,
@@ -118,7 +118,7 @@ KAboutData::KAboutData( const char *appName,
mBugEmailAddress( (bugsEmailAddress!=0)?bugsEmailAddress:defaultBugTracker ),
mLicenseText (0)
{
- d = new KAboutDataPrivate;
+ d = new TDEAboutDataPrivate;
if( appName ) {
const char *p = strrchr(appName, '/');
@@ -130,7 +130,7 @@ KAboutData::KAboutData( const char *appName,
mAppName = 0;
}
-KAboutData::~KAboutData()
+TDEAboutData::~TDEAboutData()
{
if (mLicenseKey == License_File)
delete [] mLicenseText;
@@ -138,109 +138,109 @@ KAboutData::~KAboutData()
}
void
-KAboutData::addAuthor( const char *name, const char *task,
+TDEAboutData::addAuthor( const char *name, const char *task,
const char *emailAddress, const char *webAddress )
{
mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress));
}
void
-KAboutData::addCredit( const char *name, const char *task,
+TDEAboutData::addCredit( const char *name, const char *task,
const char *emailAddress, const char *webAddress )
{
mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress));
}
void
-KAboutData::setTranslator( const char *name, const char *emailAddress)
+TDEAboutData::setTranslator( const char *name, const char *emailAddress)
{
d->translatorName=name;
d->translatorEmail=emailAddress;
}
void
-KAboutData::setLicenseText( const char *licenseText )
+TDEAboutData::setLicenseText( const char *licenseText )
{
mLicenseText = licenseText;
mLicenseKey = License_Custom;
}
void
-KAboutData::setLicenseTextFile( const TQString &file )
+TDEAboutData::setLicenseTextFile( const TQString &file )
{
mLicenseText = tqstrdup(TQFile::encodeName(file));
mLicenseKey = License_File;
}
void
-KAboutData::setAppName( const char *appName )
+TDEAboutData::setAppName( const char *appName )
{
mAppName = appName;
}
void
-KAboutData::setProgramName( const char* programName )
+TDEAboutData::setProgramName( const char* programName )
{
mProgramName = programName;
translateInternalProgramName();
}
void
-KAboutData::setVersion( const char* version )
+TDEAboutData::setVersion( const char* version )
{
mVersion = version;
}
void
-KAboutData::setShortDescription( const char *shortDescription )
+TDEAboutData::setShortDescription( const char *shortDescription )
{
mShortDescription = shortDescription;
}
void
-KAboutData::setLicense( LicenseKey licenseKey)
+TDEAboutData::setLicense( LicenseKey licenseKey)
{
mLicenseKey = licenseKey;
}
void
-KAboutData::setCopyrightStatement( const char *copyrightStatement )
+TDEAboutData::setCopyrightStatement( const char *copyrightStatement )
{
mCopyrightStatement = copyrightStatement;
}
void
-KAboutData::setOtherText( const char *otherText )
+TDEAboutData::setOtherText( const char *otherText )
{
mOtherText = otherText;
}
void
-KAboutData::setHomepage( const char *homepage )
+TDEAboutData::setHomepage( const char *homepage )
{
mHomepageAddress = homepage;
}
void
-KAboutData::setBugAddress( const char *bugAddress )
+TDEAboutData::setBugAddress( const char *bugAddress )
{
mBugEmailAddress = bugAddress;
}
void
-KAboutData::setProductName( const char *productName )
+TDEAboutData::setProductName( const char *productName )
{
d->productName = productName;
}
const char *
-KAboutData::appName() const
+TDEAboutData::appName() const
{
return mAppName;
}
const char *
-KAboutData::productName() const
+TDEAboutData::productName() const
{
if (d->productName)
return d->productName;
@@ -249,7 +249,7 @@ KAboutData::productName() const
}
TQString
-KAboutData::programName() const
+TDEAboutData::programName() const
{
if (mProgramName && *mProgramName)
return i18n(mProgramName);
@@ -258,7 +258,7 @@ KAboutData::programName() const
}
const char*
-KAboutData::internalProgramName() const
+TDEAboutData::internalProgramName() const
{
if (d->mTranslatedProgramName)
return d->mTranslatedProgramName;
@@ -270,7 +270,7 @@ KAboutData::internalProgramName() const
// because it may deadlock. Since i18n() needs it, when KLocale is available
// the i18n() call will be done here in advance.
void
-KAboutData::translateInternalProgramName() const
+TDEAboutData::translateInternalProgramName() const
{
delete[] d->mTranslatedProgramName;
d->mTranslatedProgramName = 0;
@@ -279,13 +279,13 @@ KAboutData::translateInternalProgramName() const
}
TQImage
-KAboutData::programLogo() const
+TDEAboutData::programLogo() const
{
return d->programLogo ? (*d->programLogo) : TQImage();
}
void
-KAboutData::setProgramLogo(const TQImage& image)
+TDEAboutData::setProgramLogo(const TQImage& image)
{
if (!d->programLogo)
d->programLogo = new TQImage( image );
@@ -294,13 +294,13 @@ KAboutData::setProgramLogo(const TQImage& image)
}
TQString
-KAboutData::version() const
+TDEAboutData::version() const
{
return TQString::fromLatin1(mVersion);
}
TQString
-KAboutData::shortDescription() const
+TDEAboutData::shortDescription() const
{
if (mShortDescription && *mShortDescription)
return i18n(mShortDescription);
@@ -309,31 +309,31 @@ KAboutData::shortDescription() const
}
TQString
-KAboutData::homepage() const
+TDEAboutData::homepage() const
{
return TQString::fromLatin1(mHomepageAddress);
}
TQString
-KAboutData::bugAddress() const
+TDEAboutData::bugAddress() const
{
return TQString::fromLatin1(mBugEmailAddress);
}
const TQValueList<KAboutPerson>
-KAboutData::authors() const
+TDEAboutData::authors() const
{
return mAuthorList;
}
const TQValueList<KAboutPerson>
-KAboutData::credits() const
+TDEAboutData::credits() const
{
return mCreditList;
}
const TQValueList<KAboutTranslator>
-KAboutData::translators() const
+TDEAboutData::translators() const
{
TQValueList<KAboutTranslator> personList;
@@ -382,7 +382,7 @@ KAboutData::translators() const
}
TQString
-KAboutData::aboutTranslationTeam()
+TDEAboutData::aboutTranslationTeam()
{
return i18n("replace this with information about your translation team",
"<p>KDE is translated into many languages thanks to the work "
@@ -393,7 +393,7 @@ KAboutData::aboutTranslationTeam()
}
TQString
-KAboutData::otherText() const
+TDEAboutData::otherText() const
{
if (mOtherText && *mOtherText)
return i18n(mOtherText);
@@ -403,7 +403,7 @@ KAboutData::otherText() const
TQString
-KAboutData::license() const
+TDEAboutData::license() const
{
TQString result;
if (!copyrightStatement().isEmpty())
@@ -466,7 +466,7 @@ KAboutData::license() const
}
TQString
-KAboutData::copyrightStatement() const
+TDEAboutData::copyrightStatement() const
{
if (mCopyrightStatement && *mCopyrightStatement)
return i18n(mCopyrightStatement);
@@ -475,25 +475,25 @@ KAboutData::copyrightStatement() const
}
TQString
-KAboutData::customAuthorPlainText() const
+TDEAboutData::customAuthorPlainText() const
{
return d->customAuthorPlainText;
}
TQString
-KAboutData::customAuthorRichText() const
+TDEAboutData::customAuthorRichText() const
{
return d->customAuthorRichText;
}
bool
-KAboutData::customAuthorTextEnabled() const
+TDEAboutData::customAuthorTextEnabled() const
{
return d->customAuthorTextEnabled;
}
void
-KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText)
+TDEAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText)
{
d->customAuthorPlainText = plainText;
d->customAuthorRichText = richText;
@@ -502,7 +502,7 @@ KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richT
}
void
-KAboutData::unsetCustomAuthorText()
+TDEAboutData::unsetCustomAuthorText()
{
d->customAuthorPlainText = TQString::null;
d->customAuthorRichText = TQString::null;
diff --git a/tdecore/kaboutdata.h b/tdecore/kaboutdata.h
index 9fe8d859..b803b779 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/kaboutdata.h
@@ -28,21 +28,21 @@
#define _KABOUTDATA_H_
class KAboutPersonPrivate;
-class KAboutDataPrivate;
+class TDEAboutDataPrivate;
/**
* This structure is used to store information about a person or developer.
* It can store the person's name, a task, an email address and a
* link to a home page. This class is intended for use in the
- * KAboutData class, but it can be used elsewhere as well.
+ * TDEAboutData class, but it can be used elsewhere as well.
* Normally you should at least define the person's name.
*
* Example Usage within a main():
*
* \code
- * KAboutData about("khello", I18N_NOOP("KHello"), "0.1",
+ * TDEAboutData about("khello", I18N_NOOP("KHello"), "0.1",
* I18N_NOOP("A TDE version of Hello, world!"),
- * KAboutData::License_LGPL,
+ * TDEAboutData::License_LGPL,
* I18N_NOOP("Copyright (c) 2003 Developer"));
*
* about.addAuthor("Joe Developer", I18N_NOOP("developer"), "joe@host.com", 0);
@@ -122,7 +122,7 @@ class KAboutTranslatorPrivate;
/**
* This structure is used to store information about a translator.
* It can store the translator's name and an email address.
- * This class is intended for use in the KAboutData class,
+ * This class is intended for use in the TDEAboutData class,
* but it can be used elsewhere as well.
* Normally you should at least define the translator's name.
*
@@ -179,7 +179,7 @@ private:
* classes.
* @author Espen Sand (espen@kde.org), David Faure (faure@kde.org)
*/
-class TDECORE_EXPORT KAboutData
+class TDECORE_EXPORT TDEAboutData
{
public:
/**
@@ -235,7 +235,7 @@ class TDECORE_EXPORT KAboutData
* This defaults to the trinitydesktop.org bug system.
*
*/
- KAboutData( const char *appName,
+ TDEAboutData( const char *appName,
const char *programName,
const char *version,
const char *shortDescription = 0,
@@ -246,7 +246,7 @@ class TDECORE_EXPORT KAboutData
const char *bugsEmailAddress = 0
);
- ~KAboutData();
+ ~TDEAboutData();
/**
* Defines an author. You can call this function as many times you
@@ -623,7 +623,7 @@ class TDECORE_EXPORT KAboutData
const char *mLicenseText;
static const char *defaultBugTracker;
- KAboutDataPrivate *d;
+ TDEAboutDataPrivate *d;
};
#endif
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 1f0dae66..62eb373e 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -623,7 +623,7 @@ static TQTime* smModificationTime = 0;
TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName,
bool allowStyles, bool GUIenabled ) :
- TQApplication( argc, argv, GUIenabled ), KInstance(rAppName),
+ TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName),
#ifdef Q_WS_X11
display(0L),
argb_visual(false),
@@ -649,7 +649,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI
TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), // We need to be able to run command line apps
- KInstance( TDECmdLineArgs::about),
+ TDEInstance( TDECmdLineArgs::about),
#ifdef Q_WS_X11
display(0L),
argb_visual(false),
@@ -674,7 +674,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ),
- KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
+ TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
{
aIconPixmap.pm.icon = 0L;
aIconPixmap.pm.miniIcon = 0L;
@@ -690,7 +690,7 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ),
- KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
+ TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
{
aIconPixmap.pm.icon = 0L;
aIconPixmap.pm.miniIcon = 0L;
@@ -708,7 +708,7 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
bool allowStyles ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
- KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
+ TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
{
if ((visual) && (colormap))
getX11RGBAInformation(dpy);
@@ -724,10 +724,10 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
}
TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
- bool allowStyles, KInstance * _instance ) :
+ bool allowStyles, TDEInstance * _instance ) :
TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
- KInstance( _instance ), display(0L), d (new TDEApplicationPrivate)
+ TDEInstance( _instance ), display(0L), d (new TDEApplicationPrivate)
{
if ((visual) && (colormap))
getX11RGBAInformation(dpy);
@@ -743,10 +743,10 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
}
#endif
-TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) :
+TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance ) :
TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
GUIenabled ),
- KInstance( _instance ),
+ TDEInstance( _instance ),
#ifdef Q_WS_X11
display(0L),
#endif
@@ -770,7 +770,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _i
#ifdef Q_WS_X11
TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
bool allowStyles, bool GUIenabled ) :
- TQApplication( display ), KInstance(rAppName),
+ TQApplication( display ), TDEInstance(rAppName),
display(0L),
argb_visual(false),
d (new TDEApplicationPrivate())
@@ -1442,7 +1442,7 @@ bool TDEApplication::sessionSaving() const
void TDEApplication::startKdeinit()
{
#ifndef Q_WS_WIN //TODO
- KInstance inst( "starttdeinitlock" );
+ TDEInstance inst( "starttdeinitlock" );
KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
lock.lock();
@@ -3630,7 +3630,7 @@ bool TDEApplication::guiEnabled()
}
void TDEApplication::virtual_hook( int id, void* data )
-{ KInstance::virtual_hook( id, data ); }
+{ TDEInstance::virtual_hook( id, data ); }
void KSessionManaged::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index 89aaab2e..49abf120 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -93,7 +93,7 @@ class TDEApplicationPrivate;
* @short Controls and provides information to all KDE applications.
* @author Matthias Kalle Dalheimer <kalle@kde.org>
*/
-class TDECORE_EXPORT TDEApplication : public TQApplication, public KInstance
+class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance
{
Q_OBJECT
@@ -1232,14 +1232,14 @@ protected:
/**
* @internal Used by KUniqueApplication
*/
- TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance );
+ TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance );
#ifdef Q_WS_X11
/**
* @internal Used by KUniqueApplication
*/
TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
- bool allowStyles, KInstance* _instance );
+ bool allowStyles, TDEInstance* _instance );
/**
* Used to catch X11 events
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index d9e564d4..186f7e3a 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -115,7 +115,7 @@ int TDECmdLineArgs::argc = 0;
char **TDECmdLineArgs::argv = 0;
char *TDECmdLineArgs::mCwd = 0;
static KStaticDeleter <char> mCwdd;
-const KAboutData *TDECmdLineArgs::about = 0;
+const TDEAboutData *TDECmdLineArgs::about = 0;
bool TDECmdLineArgs::parsed = false;
bool TDECmdLineArgs::ignoreUnknown = false;
@@ -128,7 +128,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char*
const char *_description, const char *_version, bool noKApp)
{
init(_argc, _argv,
- new KAboutData(_appname, programName, _version, _description),
+ new TDEAboutData(_appname, programName, _version, _description),
noKApp);
}
@@ -137,7 +137,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname,
const char *_description, const char *_version, bool noKApp)
{
init(_argc, _argv,
- new KAboutData(_appname, _appname, _version, _description),
+ new TDEAboutData(_appname, _appname, _version, _description),
noKApp);
}
@@ -145,12 +145,12 @@ void
TDECmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
{
init(_argc, _argv,
- new KAboutData(_appname, _appname, "unknown", "TDE Application", false));
+ new TDEAboutData(_appname, _appname, "unknown", "TDE Application", false));
ignoreUnknown = true;
}
void
-TDECmdLineArgs::init(const KAboutData* ab)
+TDECmdLineArgs::init(const TDEAboutData* ab)
{
char **_argv = (char **) malloc(sizeof(char *));
_argv[0] = (char *) ab->appName();
@@ -159,7 +159,7 @@ TDECmdLineArgs::init(const KAboutData* ab)
void
-TDECmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKApp)
+TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool noKApp)
{
argc = _argc;
argv = _argv;
@@ -747,7 +747,7 @@ TDECmdLineArgs::enable_i18n()
return;
if (!KGlobal::_instance) {
- KInstance *instance = new KInstance(about);
+ TDEInstance *instance = new TDEInstance(about);
(void) instance->config();
// Don't delete instance!
}
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index 142544ae..09a6a655 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -72,7 +72,7 @@ class TDEApplication;
class KUniqueApplication;
class KCmdLineParsedOptions;
class KCmdLineParsedArgs;
-class KAboutData;
+class TDEAboutData;
class TDECmdLineArgsPrivate;
/**
@@ -263,17 +263,17 @@ public:
* Initialize class.
*
* This function should be called as the very first thing in
- * your application. It uses KAboutData to replace some of the
+ * your application. It uses TDEAboutData to replace some of the
* arguments that would otherwise be required.
*
* @param _argc As passed to @p main(...).
* @param _argv As passed to @p main(...).
- * @param about A KAboutData object describing your program.
+ * @param about A TDEAboutData object describing your program.
* @param noKApp Set this true to not add commandline options for
* TQApplication / TDEApplication
*/
static void init(int _argc, char **_argv,
- const KAboutData *about, bool noKApp = false);
+ const TDEAboutData *about, bool noKApp = false);
/**
* Initialize Class
@@ -281,14 +281,14 @@ public:
* This function should be called as the very first thing in your
* application. This method will rarely be used, since it doesn't
* provide any argument parsing. It does provide access to the
- * KAboutData information.
+ * TDEAboutData information.
* This method is exactly the same as calling
- * init(0,0, const KAboutData *about, true).
+ * init(0,0, const TDEAboutData *about, true).
*
* @param about the about data.
- * \see KAboutData
+ * \see TDEAboutData
*/
- static void init(const KAboutData *about);
+ static void init(const TDEAboutData *about);
/**
* Add options to your application.
@@ -674,7 +674,7 @@ private:
bool isQt;
static TDECmdLineArgsList *argsList; // All options.
- static const KAboutData *about;
+ static const TDEAboutData *about;
static int argc; // The original argc
static char **argv; // The original argv
diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp
index eb8f8c4c..ec71dea7 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/kconfig_compiler/example/autoexample.cpp
@@ -38,7 +38,7 @@
int main( int argc, char **argv )
{
- KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
+ TDEAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/kconfig_compiler/example/example.cpp
index f15b4bb1..cf808c9b 100644
--- a/tdecore/kconfig_compiler/example/example.cpp
+++ b/tdecore/kconfig_compiler/example/example.cpp
@@ -32,7 +32,7 @@
int main( int argc, char **argv )
{
- KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
+ TDEAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp
index e0b6422a..91e8c799 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -952,8 +952,8 @@ TQString indent(TQString text, int spaces)
int main( int argc, char **argv )
{
- KAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
- I18N_NOOP("KConfig Compiler") , KAboutData::License_LGPL );
+ TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
+ I18N_NOOP("KConfig Compiler") , TDEAboutData::License_LGPL );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
@@ -965,7 +965,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
- KInstance app( &aboutData );
+ TDEInstance app( &aboutData );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/tdecore/kconfig_compiler/tests/test1main.cpp b/tdecore/kconfig_compiler/tests/test1main.cpp
index 976a7bbd..79546639 100644
--- a/tdecore/kconfig_compiler/tests/test1main.cpp
+++ b/tdecore/kconfig_compiler/tests/test1main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test1 *t = new Test1( TQString::null, TQString::null );
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test2main.cpp b/tdecore/kconfig_compiler/tests/test2main.cpp
index 904c5727..5970bf03 100644
--- a/tdecore/kconfig_compiler/tests/test2main.cpp
+++ b/tdecore/kconfig_compiler/tests/test2main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test2 *t = new Test2();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test3main.cpp b/tdecore/kconfig_compiler/tests/test3main.cpp
index 9789d697..f73ae38e 100644
--- a/tdecore/kconfig_compiler/tests/test3main.cpp
+++ b/tdecore/kconfig_compiler/tests/test3main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
TestNameSpace::Test3 *t = new TestNameSpace::Test3();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test4main.cpp b/tdecore/kconfig_compiler/tests/test4main.cpp
index 8b38b3db..5229d8a8 100644
--- a/tdecore/kconfig_compiler/tests/test4main.cpp
+++ b/tdecore/kconfig_compiler/tests/test4main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test4 *t = Test4::self();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test5main.cpp b/tdecore/kconfig_compiler/tests/test5main.cpp
index 57ad5189..89f28587 100644
--- a/tdecore/kconfig_compiler/tests/test5main.cpp
+++ b/tdecore/kconfig_compiler/tests/test5main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test5 *t = Test5::self();
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test6main.cpp b/tdecore/kconfig_compiler/tests/test6main.cpp
index 27dff57f..9b1b7503 100644
--- a/tdecore/kconfig_compiler/tests/test6main.cpp
+++ b/tdecore/kconfig_compiler/tests/test6main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test6 *t = new Test6(TQString::null);
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test7main.cpp b/tdecore/kconfig_compiler/tests/test7main.cpp
index 9c1ad193..81cca018 100644
--- a/tdecore/kconfig_compiler/tests/test7main.cpp
+++ b/tdecore/kconfig_compiler/tests/test7main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test7 *t = new Test7(42);
delete t;
}
diff --git a/tdecore/kconfig_compiler/tests/test8main.cpp b/tdecore/kconfig_compiler/tests/test8main.cpp
index b3c242f6..04864a95 100644
--- a/tdecore/kconfig_compiler/tests/test8main.cpp
+++ b/tdecore/kconfig_compiler/tests/test8main.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
Test8a *config2 = new Test8a();
Test8b::self();
diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/kconfig_compiler/tests/test9main.cpp
index 39b904af..8668d8d8 100644
--- a/tdecore/kconfig_compiler/tests/test9main.cpp
+++ b/tdecore/kconfig_compiler/tests/test9main.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
Test9 *t = new Test9( TQString::null, TQString::null );
TQStringList myPathsList2 = t->myPathsList2();
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp b/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
index a6c23c8f..b62ee17a 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
+++ b/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int main( int, char*[] )
{
- KInstance i("test");
+ TDEInstance i("test");
TestDPointer *t = TestDPointer::self();
delete t;
}
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 4a3b778d..86ec1f39 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -196,8 +196,8 @@ KCrash::defaultCrashHandler (int sig)
argv[i++] = "--pid";
argv[i++] = pidtxt;
- const KInstance *instance = KGlobal::_instance;
- const KAboutData *about = instance ? instance->aboutData() : 0;
+ const TDEInstance *instance = KGlobal::_instance;
+ const TDEAboutData *about = instance ? instance->aboutData() : 0;
if (about) {
if (about->internalVersion()) {
argv[i++] = "--appversion";
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index 90b2e944..c4a90324 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -43,8 +43,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
- KAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
+ TDEAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
+ TDEAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index 3faaae7b..032c1430 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -39,7 +39,7 @@ public:
s_self = this;
m_catalogueInitialized = false;
}
- KGenericFactoryBase( const KAboutData *data )
+ KGenericFactoryBase( const TDEAboutData *data )
: m_aboutData(data)
{
s_self = this;
@@ -55,18 +55,18 @@ public:
s_self = 0;
}
- static KInstance *instance();
+ static TDEInstance *instance();
protected:
- virtual KInstance *createInstance()
+ virtual TDEInstance *createInstance()
{
if ( m_aboutData )
- return new KInstance( m_aboutData );
+ return new TDEInstance( m_aboutData );
if ( m_instanceName.isEmpty() ) {
kdWarning() << "KGenericFactory: instance requested but no instance name or about data passed to the constructor!" << endl;
return 0;
}
- return new KInstance( m_instanceName );
+ return new TDEInstance( m_instanceName );
}
virtual void setupTranslations( void )
@@ -86,16 +86,16 @@ protected:
private:
TQCString m_instanceName;
- const KAboutData *m_aboutData;
+ const TDEAboutData *m_aboutData;
bool m_catalogueInitialized;
- static KInstance *s_instance;
+ static TDEInstance *s_instance;
static KGenericFactoryBase<T> *s_self;
};
/* @internal */
template <class T>
-KInstance *KGenericFactoryBase<T>::s_instance = 0;
+TDEInstance *KGenericFactoryBase<T>::s_instance = 0;
/* @internal */
template <class T>
@@ -103,7 +103,7 @@ KGenericFactoryBase<T> *KGenericFactoryBase<T>::s_self = 0;
/* @internal */
template <class T>
-KInstance *KGenericFactoryBase<T>::instance()
+TDEInstance *KGenericFactoryBase<T>::instance()
{
if ( !s_instance && s_self )
s_instance = s_self->createInstance();
@@ -141,17 +141,17 @@ KInstance *KGenericFactoryBase<T>::instance()
* that the caller passed to KLibFactory's create method.
*
* In addition upon instantiation this template provides a central
- * KInstance object for your component, accessible through the
+ * TDEInstance object for your component, accessible through the
* static instance() method. The instanceName argument of the
- * KGenericFactory constructor is passed to the KInstance object.
+ * KGenericFactory constructor is passed to the TDEInstance object.
*
- * The creation of the KInstance object can be customized by inheriting
+ * The creation of the TDEInstance object can be customized by inheriting
* from this template class and re-implementing the virtual createInstance
* method. For example it could look like this:
* \code
- * KInstance *MyFactory::createInstance()
+ * TDEInstance *MyFactory::createInstance()
* {
- * return new KInstance( myAboutData );
+ * return new TDEInstance( myAboutData );
* }
* \endcode
*
@@ -180,7 +180,7 @@ public:
/**
* @since 3.3
*/
- KGenericFactory( const KAboutData *data )
+ KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase<Product>( data )
{}
@@ -224,17 +224,17 @@ protected:
* that the caller passed to KLibFactory's create method.
*
* In addition upon instantiation this template provides a central
- * KInstance object for your component, accessible through the
+ * TDEInstance object for your component, accessible through the
* static instance() method. The instanceName argument of the
- * KGenericFactory constructor is passed to the KInstance object.
+ * KGenericFactory constructor is passed to the TDEInstance object.
*
- * The creation of the KInstance object can be customized by inheriting
+ * The creation of the TDEInstance object can be customized by inheriting
* from this template class and re-implementing the virtual createInstance
* method. For example it could look like this:
* \code
- * KInstance *MyFactory::createInstance()
+ * TDEInstance *MyFactory::createInstance()
* {
- * return new KInstance( myAboutData );
+ * return new TDEInstance( myAboutData );
* }
* \endcode
*
@@ -275,7 +275,7 @@ public:
/**
* @since 3.3
*/
- KGenericFactory( const KAboutData *data )
+ KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
{}
@@ -319,17 +319,17 @@ protected:
* that the caller passed to KLibFactory's create method.
*
* In addition upon instantiation this template provides a central
- * KInstance object for your component, accessible through the
+ * TDEInstance object for your component, accessible through the
* static instance() method. The instanceName argument of the
- * KGenericFactory constructor is passed to the KInstance object.
+ * KGenericFactory constructor is passed to the TDEInstance object.
*
- * The creation of the KInstance object can be customized by inheriting
+ * The creation of the TDEInstance object can be customized by inheriting
* from this template class and re-implementing the virtual createInstance
* method. For example it could look like this:
* \code
- * KInstance *MyFactory::createInstance()
+ * TDEInstance *MyFactory::createInstance()
* {
- * return new KInstance( myAboutData );
+ * return new TDEInstance( myAboutData );
* }
* \endcode
*
@@ -371,7 +371,7 @@ public:
/**
* @since 3.3
*/
- KGenericFactory( const KAboutData *data )
+ KGenericFactory( const TDEAboutData *data )
: KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
{}
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index 6c88302c..57135a76 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -44,7 +44,7 @@
#ifndef NDEBUG
#define MYASSERT(x) if (!x) \
- tqFatal("Fatal error: you need to have a KInstance object before\n" \
+ tqFatal("Fatal error: you need to have a TDEInstance object before\n" \
"you do anything that requires it! Examples of this are config\n" \
"objects, standard directories or translations.");
#else
@@ -95,7 +95,7 @@ TDEGlobalNetworkManager *KGlobal::networkManager()
return _instance->networkManager();
}
-KInstance *KGlobal::instance()
+TDEInstance *KGlobal::instance()
{
MYASSERT(_instance);
return _instance;
@@ -127,7 +127,7 @@ KCharsets *KGlobal::charsets()
return _charsets;
}
-void KGlobal::setActiveInstance(KInstance *i)
+void KGlobal::setActiveInstance(TDEInstance *i)
{
_activeInstance = i;
if (i && _locale)
@@ -215,8 +215,8 @@ KGlobal::deleteStaticDeleters()
// The Variables
KStringDict *KGlobal::_stringDict = 0;
-KInstance *KGlobal::_instance = 0;
-KInstance *KGlobal::_activeInstance = 0;
+TDEInstance *KGlobal::_instance = 0;
+TDEInstance *KGlobal::_activeInstance = 0;
KLocale *KGlobal::_locale = 0;
KCharsets *KGlobal::_charsets = 0;
KStaticDeleterList *KGlobal::_staticDeleters = 0;
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 931ee6a9..5a775ae8 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -19,7 +19,7 @@
#define _KGLOBAL_H
#include "tdelibs_export.h"
-#include <kinstance.h> // KDE4: class KInstance is enough here
+#include <kinstance.h> // KDE4: class TDEInstance is enough here
class KCharsets;
class KConfig;
@@ -53,7 +53,7 @@ public:
* cases the application itself).
* @return the global instance
*/
- static KInstance *instance();
+ static TDEInstance *instance();
/**
* Returns the application standard dirs object.
@@ -167,7 +167,7 @@ public:
//private:
static KStringDict *_stringDict;
- static KInstance *_instance;
+ static TDEInstance *_instance;
static KLocale *_locale;
static KCharsets *_charsets;
static KStaticDeleterList *_staticDeleters;
@@ -178,10 +178,10 @@ public:
* Don't use this - it's mainly for KAboutDialog and KBugReport.
* @internal
*/
- static void setActiveInstance(KInstance *d);
- static KInstance *activeInstance() { return _activeInstance; }
+ static void setActiveInstance(TDEInstance *d);
+ static TDEInstance *activeInstance() { return _activeInstance; }
- static KInstance *_activeInstance;
+ static TDEInstance *_activeInstance;
};
/**
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index d3d8d523..f413b75f 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -1291,95 +1291,95 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS
// Easy access functions
TQPixmap DesktopIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::Desktop, force_size, state);
}
-TQPixmap DesktopIcon(const TQString& name, KInstance *instance)
+TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance)
{
return DesktopIcon(name, 0, KIcon::DefaultState, instance);
}
-TQIconSet DesktopIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet DesktopIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Desktop, force_size );
}
TQPixmap BarIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::Toolbar, force_size, state);
}
-TQPixmap BarIcon(const TQString& name, KInstance *instance)
+TQPixmap BarIcon(const TQString& name, TDEInstance *instance)
{
return BarIcon(name, 0, KIcon::DefaultState, instance);
}
-TQIconSet BarIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet BarIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Toolbar, force_size );
}
TQPixmap SmallIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::Small, force_size, state);
}
-TQPixmap SmallIcon(const TQString& name, KInstance *instance)
+TQPixmap SmallIcon(const TQString& name, TDEInstance *instance)
{
return SmallIcon(name, 0, KIcon::DefaultState, instance);
}
-TQIconSet SmallIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet SmallIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::Small, force_size );
}
TQPixmap MainBarIcon(const TQString& name, int force_size, int state,
- KInstance *instance)
+ TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::MainToolbar, force_size, state);
}
-TQPixmap MainBarIcon(const TQString& name, KInstance *instance)
+TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance)
{
return MainBarIcon(name, 0, KIcon::DefaultState, instance);
}
-TQIconSet MainBarIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet MainBarIconSet(const TQString& name, int force_size, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::MainToolbar, force_size );
}
-TQPixmap UserIcon(const TQString& name, int state, KInstance *instance)
+TQPixmap UserIcon(const TQString& name, int state, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIcon(name, KIcon::User, 0, state);
}
-TQPixmap UserIcon(const TQString& name, KInstance *instance)
+TQPixmap UserIcon(const TQString& name, TDEInstance *instance)
{
return UserIcon(name, KIcon::DefaultState, instance);
}
-TQIconSet UserIconSet(const TQString& name, KInstance *instance)
+TQIconSet UserIconSet(const TQString& name, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->loadIconSet( name, KIcon::User );
}
-int IconSize(KIcon::Group group, KInstance *instance)
+int IconSize(KIcon::Group group, TDEInstance *instance)
{
KIconLoader *loader = instance->iconLoader();
return loader->currentSize(group);
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index 998d7a97..2ad23ae3 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -87,10 +87,10 @@ public:
*
* Usually, you use the default iconloader, which can be accessed via
* KGlobal::iconLoader(), so you hardly ever have to create an
- * iconloader object yourself. That one is the current KInstance's
+ * iconloader object yourself. That one is the current TDEInstance's
* (typically TDEApplication's) iconloader.
* @see KGlobal::iconLoader()
- * @see KInstance::iconLoader()
+ * @see TDEInstance::iconLoader()
*/
KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0);
@@ -296,7 +296,7 @@ public:
KIconEffect *iconEffect() const;
/**
- * Called by KInstance::newIconLoader to reconfigure the icon loader.
+ * Called by TDEInstance::newIconLoader to reconfigure the icon loader.
* @param _appname the new application name
* @param _dirs the new standard directories. If 0, the directories
* from KGlobal will be taken.
@@ -345,7 +345,7 @@ public:
* destroyed before all those iconsets are destroyed.
*
* (Some broken applications use temporary KIconLoader objects).
- * Every KInstance 's iconloader has this feature enabled.
+ * Every TDEInstance 's iconloader has this feature enabled.
*
* @param enable true to enable delayed icon loading, false to disable
* @see isDelayedIconSetLoadingEnabled()
@@ -447,40 +447,40 @@ public:
*/
TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a desktop icon.
*/
-TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a desktop icon, and apply the necessary effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a toolbar icon.
*/
TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a toolbar icon.
*/
-TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a toolbar icon, and apply the necessary effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
@@ -488,20 +488,20 @@ TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
*/
TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a small icon.
*/
-TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a small icon, and apply the necessary effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
@@ -509,45 +509,45 @@ TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
*/
TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a main toolbar icon.
*/
-TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a main toolbar icon, and apply the effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a user icon. User icons are searched in $appdir/pics.
*/
TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Load a user icon. User icons are searched in $appdir/pics.
*/
-TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, TDEInstance *instance);
/**
* \relates KIconLoader
* Load a user icon, and apply the effects to get an IconSet.
*/
TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
- KInstance *instance=KGlobal::instance());
+ TDEInstance *instance=KGlobal::instance());
/**
* \relates KIconLoader
* Returns the current icon size for a specific group.
*/
-TDECORE_EXPORT int IconSize(KIcon::Group group, KInstance *instance=KGlobal::instance());
+TDECORE_EXPORT int IconSize(KIcon::Group group, TDEInstance *instance=KGlobal::instance());
#endif // __KIconLoader_h_Included__
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 721864e5..6d37c3db 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -38,26 +38,26 @@
#ifndef NDEBUG
#include <assert.h>
#include <tqptrdict.h>
- static TQPtrList<KInstance> *allInstances = 0;
+ static TQPtrList<TDEInstance> *allInstances = 0;
static TQPtrDict<TQCString> *allOldInstances = 0;
- #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<KInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
+ #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<TDEInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
#define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false);
- #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((KInstance*)this)) { TQCString *old = allOldInstances->find((KInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
+ #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((TDEInstance*)this)) { TQCString *old = allOldInstances->find((TDEInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
#else
#define DEBUG_ADD
#define DEBUG_REMOVE
#define DEBUG_CHECK_ALIVE
#endif
-class KInstancePrivate
+class TDEInstancePrivate
{
public:
- KInstancePrivate ()
+ TDEInstancePrivate ()
{
mimeSourceFactory = 0L;
}
- ~KInstancePrivate ()
+ ~TDEInstancePrivate ()
{
delete mimeSourceFactory;
}
@@ -68,13 +68,13 @@ public:
KSharedConfig::Ptr sharedConfig;
};
-KInstance::KInstance( const TQCString& name)
+TDEInstance::TDEInstance( const TQCString& name)
: _dirs (0L),
_config (0L),
_iconLoader (0L),
_hardwaredevices (0L),
_networkmanager (0L),
- _name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false)
+ _name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false)
{
DEBUG_ADD
Q_ASSERT(!name.isEmpty());
@@ -84,11 +84,11 @@ KInstance::KInstance( const TQCString& name)
KGlobal::setActiveInstance(this);
}
- d = new KInstancePrivate ();
+ d = new TDEInstancePrivate ();
d->ownAboutdata = true;
}
-KInstance::KInstance( const KAboutData * aboutData )
+TDEInstance::TDEInstance( const TDEAboutData * aboutData )
: _dirs (0L),
_config (0L),
_iconLoader (0L),
@@ -105,11 +105,11 @@ KInstance::KInstance( const KAboutData * aboutData )
KGlobal::setActiveInstance(this);
}
- d = new KInstancePrivate ();
+ d = new TDEInstancePrivate ();
d->ownAboutdata = false;
}
-KInstance::KInstance( KInstance* src )
+TDEInstance::TDEInstance( TDEInstance* src )
: _dirs ( src->_dirs ),
_config ( src->_config ),
_iconLoader ( src->_iconLoader ),
@@ -126,7 +126,7 @@ KInstance::KInstance( KInstance* src )
KGlobal::setActiveInstance(this);
}
- d = new KInstancePrivate ();
+ d = new TDEInstancePrivate ();
d->ownAboutdata = src->d->ownAboutdata;
d->sharedConfig = src->d->sharedConfig;
@@ -139,7 +139,7 @@ KInstance::KInstance( KInstance* src )
delete src;
}
-KInstance::~KInstance()
+TDEInstance::~TDEInstance()
{
DEBUG_CHECK_ALIVE
@@ -172,7 +172,7 @@ KInstance::~KInstance()
}
-KStandardDirs *KInstance::dirs() const
+KStandardDirs *TDEInstance::dirs() const
{
DEBUG_CHECK_ALIVE
if( _dirs == 0 ) {
@@ -190,12 +190,12 @@ KStandardDirs *KInstance::dirs() const
extern bool kde_kiosk_exception;
extern bool kde_kiosk_admin;
-void KInstance::setConfigReadOnly(bool ro)
+void TDEInstance::setConfigReadOnly(bool ro)
{
m_configReadOnly = ro;
}
-KConfig *KInstance::config() const
+KConfig *TDEInstance::config() const
{
DEBUG_CHECK_ALIVE
if( _config == 0 ) {
@@ -244,7 +244,7 @@ KConfig *KInstance::config() const
return _config;
}
-KSharedConfig *KInstance::sharedConfig() const
+KSharedConfig *TDEInstance::sharedConfig() const
{
DEBUG_CHECK_ALIVE
if (_config == 0)
@@ -253,13 +253,13 @@ KSharedConfig *KInstance::sharedConfig() const
return d->sharedConfig;
}
-void KInstance::setConfigName(const TQString &configName)
+void TDEInstance::setConfigName(const TQString &configName)
{
DEBUG_CHECK_ALIVE
d->configName = configName;
}
-KIconLoader *KInstance::iconLoader() const
+KIconLoader *TDEInstance::iconLoader() const
{
DEBUG_CHECK_ALIVE
if( _iconLoader == 0 ) {
@@ -270,7 +270,7 @@ KIconLoader *KInstance::iconLoader() const
return _iconLoader;
}
-TDEHardwareDevices *KInstance::hardwareDevices() const
+TDEHardwareDevices *TDEInstance::hardwareDevices() const
{
DEBUG_CHECK_ALIVE
if( _hardwaredevices == 0 ) {
@@ -280,7 +280,7 @@ TDEHardwareDevices *KInstance::hardwareDevices() const
return _hardwaredevices;
}
-TDEGlobalNetworkManager *KInstance::networkManager() const
+TDEGlobalNetworkManager *TDEInstance::networkManager() const
{
DEBUG_CHECK_ALIVE
if( _networkmanager == 0 ) {
@@ -290,37 +290,37 @@ TDEGlobalNetworkManager *KInstance::networkManager() const
return _networkmanager;
}
-void KInstance::newIconLoader() const
+void TDEInstance::newIconLoader() const
{
DEBUG_CHECK_ALIVE
KIconTheme::reconfigure();
_iconLoader->reconfigure( _name, dirs() );
}
-const KAboutData * KInstance::aboutData() const
+const TDEAboutData * TDEInstance::aboutData() const
{
DEBUG_CHECK_ALIVE
return _aboutData;
}
-TQCString KInstance::instanceName() const
+TQCString TDEInstance::instanceName() const
{
DEBUG_CHECK_ALIVE
return _name;
}
-KMimeSourceFactory* KInstance::mimeSourceFactory () const
+KMimeSourceFactory* TDEInstance::mimeSourceFactory () const
{
DEBUG_CHECK_ALIVE
if (!d->mimeSourceFactory)
{
d->mimeSourceFactory = new KMimeSourceFactory(_iconLoader);
- d->mimeSourceFactory->setInstance(const_cast<KInstance *>(this));
+ d->mimeSourceFactory->setInstance(const_cast<TDEInstance *>(this));
}
return d->mimeSourceFactory;
}
-void KInstance::virtual_hook( int, void* )
+void TDEInstance::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 2d94d10c..36d463d8 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -19,12 +19,12 @@
#define _KINSTANCE_H
class KStandardDirs;
-class KAboutData;
+class TDEAboutData;
class KConfig;
class KIconLoader;
class KCharsets;
class TQFont;
-class KInstancePrivate;
+class TDEInstancePrivate;
class KMimeSourceFactory;
class KSharedConfig;
class TDEHardwareDevices;
@@ -42,7 +42,7 @@ class TDEGlobalNetworkManager;
*
* @author Torben Weis
*/
-class TDECORE_EXPORT KInstance
+class TDECORE_EXPORT TDEInstance
{
friend class KStandardDirs;
@@ -51,19 +51,19 @@ class TDECORE_EXPORT KInstance
* Constructor.
* @param instanceName the name of the instance
*/
- KInstance( const TQCString& instanceName) ;
+ TDEInstance( const TQCString& instanceName) ;
/**
* Constructor.
- * When building a KInstance that is not your TDEApplication,
- * make sure that the KAboutData and the KInstance have the same life time.
+ * When building a TDEInstance that is not your TDEApplication,
+ * make sure that the TDEAboutData and the TDEInstance have the same life time.
* You have to destroy both, since the instance doesn't own the about data.
- * Don't build a KAboutData on the stack in this case !
- * Building a KAboutData on the stack is only ok for usage with
+ * Don't build a TDEAboutData on the stack in this case !
+ * Building a TDEAboutData on the stack is only ok for usage with
* TDECmdLineArgs and TDEApplication (not destroyed until the app exits).
- * @param aboutData data about this instance (see KAboutData)
+ * @param aboutData data about this instance (see TDEAboutData)
*/
- KInstance( const KAboutData * aboutData );
+ TDEInstance( const TDEAboutData * aboutData );
/*
* @internal
@@ -71,12 +71,12 @@ class TDECORE_EXPORT KInstance
* Initialize from src and delete it.
*/
- KInstance( KInstance* src );
+ TDEInstance( TDEInstance* src );
/**
* Destructor.
*/
- virtual ~KInstance();
+ virtual ~TDEInstance();
/**
* Returns the application standard dirs object.
@@ -133,11 +133,11 @@ class TDECORE_EXPORT KInstance
* @return the about data of the instance, or 0 if it has
* not been set yet
*/
- const KAboutData *aboutData() const;
+ const TDEAboutData *aboutData() const;
/**
* Returns the name of the instance
- * @return the instance name, can be null if the KInstance has been
+ * @return the instance name, can be null if the TDEInstance has been
* created with a null name
*/
TQCString instanceName() const;
@@ -153,7 +153,7 @@ protected:
/**
* Copy Constructor is not allowed
*/
- KInstance( const KInstance& );
+ TDEInstance( const TDEInstance& );
/**
* Set name of default config file.
@@ -173,12 +173,12 @@ private:
mutable void *_placeholder;
TQCString _name;
- const KAboutData *_aboutData;
+ const TDEAboutData *_aboutData;
protected:
virtual void virtual_hook( int id, void* data );
private:
- KInstancePrivate *d;
+ TDEInstancePrivate *d;
bool m_configReadOnly;
};
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 2c75989d..b7cad0fb 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -346,7 +346,7 @@ static inline TQCString makeLibName( const char* name )
}
//static
-TQString KLibLoader::findLibrary( const char * name, const KInstance * instance )
+TQString KLibLoader::findLibrary( const char * name, const TDEInstance * instance )
{
TQCString libname = makeLibName( name );
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 10df2c44..9f080b88 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -27,7 +27,7 @@
#include <stdlib.h> // For backwards compatibility
-class KInstance;
+class TDEInstance;
class TQTimer;
class KLibrary;
class KLibFactory;
@@ -271,9 +271,9 @@ public:
* @param name of the library. If it is not a path, the function searches in
* the "module" and "lib" resources. If there is no extension,
* ".la" will be appended.
- * @param instance a KInstance used to get the standard paths
+ * @param instance a TDEInstance used to get the standard paths
*/
- static TQString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() );
+ static TQString findLibrary( const char * name, const TDEInstance * instance = KGlobal::instance() );
protected:
KLibLoader( TQObject* parent = 0, const char* name = 0 );
@@ -306,12 +306,12 @@ private:
* NOTE: you probably want to use KGenericFactory<PluginClassName>
* instead of writing your own factory.
*
- * In the constructor of your factory you should create an instance of KInstance
+ * In the constructor of your factory you should create an instance of TDEInstance
* like this:
* \code
- * s_global = new KInstance( "kspread" );
+ * s_global = new TDEInstance( "kspread" );
* \endcode
- * This KInstance is comparable to KGlobal used by normal applications.
+ * This TDEInstance is comparable to KGlobal used by normal applications.
* It allows you to find resource files (images, XML, sound etc.) belonging
* to the library.
*
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index c4ae52b1..43c21ef2 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -2006,7 +2006,7 @@ void KLocale::initInstance()
if (KGlobal::_locale)
return;
- KInstance *app = KGlobal::instance();
+ TDEInstance *app = KGlobal::instance();
if (app) {
KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName()));
diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp
index 37745d39..ed426583 100644
--- a/tdecore/kmimesourcefactory.cpp
+++ b/tdecore/kmimesourcefactory.cpp
@@ -41,7 +41,7 @@ public:
}
KIconLoader *m_iconLoader;
- KInstance *m_instance;
+ TDEInstance *m_instance;
};
KMimeSourceFactory::KMimeSourceFactory (KIconLoader* loader)
@@ -96,7 +96,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T
return result;
}
-void KMimeSourceFactory::setInstance(KInstance *instance)
+void KMimeSourceFactory::setInstance(TDEInstance *instance)
{
d->m_instance = instance;
}
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index 2ee6728e..7090b173 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -26,7 +26,7 @@
#include <kglobal.h>
class KMimeSourceFactoryPrivate;
-class KInstance;
+class TDEInstance;
/**
* An extension to TQMimeSourceFactory that uses KIconLoader to
@@ -74,10 +74,10 @@ protected:
private:
/**
* @internal
- * Associate with a KInstance so we can pull its iconLoader() when need arises.
+ * Associate with a TDEInstance so we can pull its iconLoader() when need arises.
*/
- friend class KInstance;
- void setInstance(KInstance *);
+ friend class TDEInstance;
+ void setInstance(TDEInstance *);
KMimeSourceFactoryPrivate* d;
};
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index e4ae533e..e84c8c44 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -277,7 +277,7 @@ void KNotifyClient::beep(const TQString& reason)
}
-KInstance * KNotifyClient::instance() {
+TDEInstance * KNotifyClient::instance() {
return KNotifyClient::Instance::current();
}
@@ -322,11 +322,11 @@ static KStaticDeleter<KNotifyClient::InstanceStack > instancesDeleter;
struct KNotifyClient::InstancePrivate
{
- KInstance *instance;
+ TDEInstance *instance;
bool useSystemBell;
};
-KNotifyClient::Instance::Instance(KInstance *instance)
+KNotifyClient::Instance::Instance(TDEInstance *instance)
{
d = new InstancePrivate;
d->instance = instance;
@@ -360,7 +360,7 @@ bool KNotifyClient::Instance::useSystemBell() const
// static methods
// We always return a valid KNotifyClient::Instance here. If no special one
-// is available, we have a default-instance with kapp as KInstance.
+// is available, we have a default-instance with kapp as TDEInstance.
// We make sure to always have that default-instance in the stack, because
// the stack might have gotten cleared in the destructor.
// We can't use QStack::setAutoDelete( true ), because no instance besides
@@ -370,7 +370,7 @@ KNotifyClient::Instance * KNotifyClient::Instance::currentInstance()
return instances()->currentInstance();
}
-KInstance *KNotifyClient::Instance::current()
+TDEInstance *KNotifyClient::Instance::current()
{
return currentInstance()->d->instance;
}
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index 66ee95fa..ff96b020 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -20,7 +20,7 @@
#include <tqstring.h>
#include "tdelibs_export.h"
-class KInstance;
+class TDEInstance;
#undef None // X11 headers...
/**
@@ -82,7 +82,7 @@ namespace KNotifyClient
class InstanceStack;
/**
- * Makes it possible to use KNotifyClient with a KInstance
+ * Makes it possible to use KNotifyClient with a TDEInstance
* that is not the application.
*
* Use like this:
@@ -91,20 +91,20 @@ namespace KNotifyClient
* KNotifyClient::event("MyEvent");
* \endcode
*
- * @short Enables KNotifyClient to use a different KInstance
+ * @short Enables KNotifyClient to use a different TDEInstance
*/
class TDECORE_EXPORT Instance
{
public:
/**
* Constructs a KNotifyClient::Instance to make KNotifyClient use
- * the specified KInstance for the event configuration.
+ * the specified TDEInstance for the event configuration.
* @param instance the instance for the event configuration
*/
- Instance(KInstance *instance);
+ Instance(TDEInstance *instance);
/**
* Destructs the KNotifyClient::Instance and resets KNotifyClient
- * to the previously used KInstance.
+ * to the previously used TDEInstance.
*/
~Instance();
/**
@@ -114,13 +114,13 @@ namespace KNotifyClient
*/
bool useSystemBell() const;
/**
- * Returns the currently active KInstance.
- * @return the active KInstance
+ * Returns the currently active TDEInstance.
+ * @return the active TDEInstance
*/
- static KInstance *current();
+ static TDEInstance *current();
/**
- * Returns the current KNotifyClient::Instance (not the KInstance).
+ * Returns the current KNotifyClient::Instance (not the TDEInstance).
* @return the active Instance
*/
static Instance *currentInstance();
@@ -317,9 +317,9 @@ namespace KNotifyClient
/**
* Shortcut to KNotifyClient::Instance::current() :)
- * @returns the current KInstance.
+ * @returns the current TDEInstance.
*/
- TDECORE_EXPORT KInstance * instance();
+ TDECORE_EXPORT TDEInstance * instance();
}
#endif
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp
index 865bdc25..7c3fc67d 100644
--- a/tdecore/kshortcutlist.cpp
+++ b/tdecore/kshortcutlist.cpp
@@ -53,7 +53,7 @@ int KShortcutList::index( const KKeySequence& seq ) const
return -1;
}
-const KInstance* KShortcutList::instance() const
+const TDEInstance* KShortcutList::instance() const
{
return 0;
}
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index 7a1890c1..ce8f408a 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -26,7 +26,7 @@
class TQVariant;
class KConfigBase;
-class KInstance;
+class TDEInstance;
class KKeySequence;
class KShortcut;
@@ -137,10 +137,10 @@ class TDECORE_EXPORT KShortcutList
virtual int index( const KKeySequence& keySeq ) const;
/**
- * The KInstance.
- * @return the KInstance of the list, can be 0 if not available
+ * The TDEInstance.
+ * @return the TDEInstance of the list, can be 0 if not available
*/
- virtual const KInstance* instance() const;
+ virtual const TDEInstance* instance() const;
// These are here in order to handle expansion.
enum Other { };
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index a7cdd365..1f948653 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -1687,19 +1687,19 @@ TQString KStandardDirs::localxdgconfdir() const
// just to make code more readable without macros
TQString locate( const char *type,
- const TQString& filename, const KInstance* inst )
+ const TQString& filename, const TDEInstance* inst )
{
return inst->dirs()->findResource(type, filename);
}
TQString locateLocal( const char *type,
- const TQString& filename, const KInstance* inst )
+ const TQString& filename, const TDEInstance* inst )
{
return locateLocal(type, filename, true, inst);
}
TQString locateLocal( const char *type,
- const TQString& filename, bool createDir, const KInstance* inst )
+ const TQString& filename, bool createDir, const TDEInstance* inst )
{
// try to find slashes. If there are some, we have to
// create the subdir first
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 560cca39..6c6e71ab 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -96,7 +96,7 @@ class KStandardDirsPrivate;
* appends the name of the application.
* So while you had to ::locate("data", "appname/filename") so you can
* also write ::locate("appdata", "filename") if your TDEApplication instance
- * is called "appname" (as set via TDEApplication's constructor or KAboutData, if
+ * is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if
* you use the global KStandardDirs object KGlobal::dirs()).
* Please note though that you cannot use the "appdata"
* type if you intend to use it in an applet for Kicker because 'appname' would
@@ -700,7 +700,7 @@ public:
* This function is just for convenience. It simply calls
*instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
**/
-TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = KGlobal::instance() );
/*!
* \relates KStandardDirs
@@ -711,7 +711,7 @@ TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons
* specific file, filename must have a trailing slash.
*
**/
-TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = KGlobal::instance() );
/*!
* \relates KStandardDirs
@@ -722,7 +722,7 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename,
* filename must have a trailing slash.
*
**/
-TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = KGlobal::instance() );
/*! @} */
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 97a8eec1..708a9efb 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -351,9 +351,9 @@ KUniqueApplication::~KUniqueApplication()
}
// this gets called before even entering TQApplication::TQApplication()
-KInstance* KUniqueApplication::initHack( bool configUnique )
+TDEInstance* KUniqueApplication::initHack( bool configUnique )
{
- KInstance* inst = new KInstance( TDECmdLineArgs::about );
+ TDEInstance* inst = new TDEInstance( TDECmdLineArgs::about );
if (configUnique)
{
KConfigGroupSaver saver( inst->config(), "KDE" );
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index eaa79dc5..ede89ef1 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -113,7 +113,7 @@ public:
* Typically this is used like:
* \code
* int main(int argc, char **argv) {
- * KAboutData about("myappname", "myAppName", .....);
+ * TDEAboutData about("myappname", "myAppName", .....);
* TDECmdLineArgs::init(argc, argv, &about);
* TDECmdLineArgs::addCmdLineOptions( myCmdOptions );
* KUniqueApplication::addCmdLineOptions();
@@ -204,7 +204,7 @@ private slots:
void newInstanceNoFork();
- static KInstance* initHack( bool configUnique );
+ static TDEInstance* initHack( bool configUnique );
private:
static bool s_nofork;
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index 02d9daa8..6a60ce0a 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -469,7 +469,7 @@ void KSocksSocketDevice::initSocks()
if (kapp == 0L)
return; // no TDEApplication, so don't initialise
- // this should, however, test for KInstance
+ // this should, however, test for TDEInstance
init = true;
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 58c6407d..9fe32850 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
- KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
+ TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow");
TDECmdLineArgs::init( argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
- KInstance a("tde-config");
+ TDEInstance a("tde-config");
a.setConfigReadOnly(TRUE);
(void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config();
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index 10a904e3..61feeea7 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
- KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
+ TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow");
TDECmdLineArgs::init( argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
- KInstance a("tde-config");
+ TDEInstance a("tde-config");
a.setConfigReadOnly(TRUE);
(void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config();
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 6c5e135d..53bb0f9f 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -28,7 +28,7 @@
int
main(int argc, char *argv[])
{
- KAboutData about("kapptest", "kapptest", "version");
+ TDEAboutData about("kapptest", "kapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a;
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 086cae30..62b14aa7 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -32,8 +32,8 @@ int main(int argc, char **argv) {
TQDate date;
TQString calType, option;
- KAboutData aboutData( "kcalendartest", "KCalendarTest" ,
- "0.1", description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "kcalendartest", "KCalendarTest" ,
+ "0.1", description, TDEAboutData::License_GPL,
"(c) 2002, Carlos Moro", 0, 0,
"cfmoro@correo.uniovi.es");
aboutData.addAuthor("Carlos Moro",0, "cfmoro@correo.uniovi.es");
diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp
index ee49127e..cc85b455 100644
--- a/tdecore/tests/kdebugtest.cpp
+++ b/tdecore/tests/kdebugtest.cpp
@@ -26,7 +26,7 @@ public:
kdDebug(2 == 2) << "this is right " << perror << endl;
kdDebug() << "Before instance creation" << endl;
kdDebug(1202) << "Before instance creation" << endl;
- KInstance i("kdebugtest");
+ TDEInstance i("kdebugtest");
kdDebug(1) << "kDebugInfo with inexisting area number" << endl;
kdDebug(1202) << "This number has a value of " << 5 << endl;
// kdDebug() << "This number should come out as appname " << 5 << " " << "test" << endl;
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index ca5afe0e..c5640dc0 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -410,7 +410,7 @@ int TestApp::newInstance(TQValueList<TQCString> /*params*/)
int main(int argc, char **argv)
{
- KAboutData about("socktest2", "SockTest", "1.0");
+ TDEAboutData about("socktest2", "SockTest", "1.0");
TDECmdLineArgs::init(argc, argv, &about);
KUniqueApplication::addCmdLineOptions();
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index c599c457..48420acf 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -57,7 +57,7 @@ bool check(TQString txt, TQString a, TQString b)
int
main(int argc, char *argv[])
{
- KAboutData about("socktest", "SockTest", "version");
+ TDEAboutData about("socktest", "SockTest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication::addCmdLineOptions();
diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp
index 650cc051..729c88bb 100644
--- a/tdecore/tests/ktimezonestest.cpp
+++ b/tdecore/tests/ktimezonestest.cpp
@@ -5,7 +5,7 @@
int main(int argc, char *argv[])
{
- KInstance instance("ktimezonestest");
+ TDEInstance instance("ktimezonestest");
if ((argc==2) && (strcmp(argv[1], "local")==0))
{
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index f696711a..05395671 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -43,7 +43,7 @@ TestApp::newInstance( )
int
main(int argc, char *argv[])
{
- KAboutData about("kuniqueapptest", "kuniqueapptest", "version");
+ TDEAboutData about("kuniqueapptest", "kuniqueapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
KUniqueApplication::addCmdLineOptions();
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index ce30a964..5cccaa3d 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -27,7 +27,7 @@
int
main(int argc, char *argv[])
{
- KAboutData about("kapptest", "kapptest", "version");
+ TDEAboutData about("kapptest", "kapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a;
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index 56a3e943..fd73923f 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -60,8 +60,8 @@ int main(int argc, char *argv[])
{
tqDebug("argv[%d] = %s", i, argv[i]);
}
- KAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
- "1.0", I18N_NOOP("testqtargs"), KAboutData::License_GPL,
+ TDEAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
+ "1.0", I18N_NOOP("testqtargs"), TDEAboutData::License_GPL,
"", "", "", "");
TDECmdLineArgs::init(argc, argv, &aboutData);
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index 138c38ce..9868dbfc 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -537,7 +537,7 @@ int main_console(int argc, char **argv)
{
printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]);
TDEApplication::disableAutoDcopRegistration();
- KAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1");
+ TDEAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1");
TDECmdLineArgs::init(&aboutd);
TDEApplication app(false, false);
diff --git a/tdeui/kaboutapplication.cpp b/tdeui/kaboutapplication.cpp
index 8d582896..4be70c48 100644
--- a/tdeui/kaboutapplication.cpp
+++ b/tdeui/kaboutapplication.cpp
@@ -43,7 +43,7 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name,
buildDialog(KGlobal::instance()->aboutData());
}
-KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *parent,
+KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent,
const char *name, bool modal )
:KAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close,
parent, name, modal )
@@ -51,7 +51,7 @@ KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *par
buildDialog(aboutData);
}
-void KAboutApplication::buildDialog( const KAboutData *aboutData )
+void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
{
if( !aboutData )
{
@@ -65,7 +65,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
TQString appPageText =
i18n("No information available.\n"
- "The supplied KAboutData object does not exist.");
+ "The supplied TDEAboutData object does not exist.");
TQLabel *appPageLabel = new TQLabel( "\n\n\n\n"+appPageText+"\n\n\n\n", 0 );
appPage->addWidget( appPageLabel );
return;
@@ -172,7 +172,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
.arg((*it).emailAddress());
}
- text += KAboutData::aboutTranslationTeam() + "</qt>";
+ text += TDEAboutData::aboutTranslationTeam() + "</qt>";
addTextPage( i18n("T&ranslation"), text, true);
}
diff --git a/tdeui/kaboutapplication.h b/tdeui/kaboutapplication.h
index 58145aa4..7fe088d0 100644
--- a/tdeui/kaboutapplication.h
+++ b/tdeui/kaboutapplication.h
@@ -31,7 +31,7 @@
*
* This class provides the standard "About Application" dialog box
* that is used by KHelpMenu. It uses the information of the global
- * KAboutData that is specified at the start of your program in
+ * TDEAboutData that is specified at the start of your program in
* main(). Normally you should not use this class directly but rather
* the KHelpMenu class or even better just subclass your toplevel
* window from KMainWindow. If you do the latter, the help menu and
@@ -61,12 +61,12 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
/**
* Constructor. Mostly does the same stuff as the previous constructor, except
- * that it can take a custom KAboutData object instead of the one specified
+ * that it can take a custom TDEAboutData object instead of the one specified
* in your main() function. This is especially useful for applications
* which are implemented as (dynamically loaded) libraries, e.g. panel
* applets.
*
- * @param aboutData A pointer to a KAboutData object which data
+ * @param aboutData A pointer to a TDEAboutData object which data
* will be used for filling the dialog.
* @param parent The parent of the dialog box. You should use the
* toplevel window so that the dialog becomes centered.
@@ -76,17 +76,17 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
* made visible using TQWidget::show(). Otherwise it will be
* modal and must be made visible using TQWidget::exec().
*/
- KAboutApplication( const KAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
+ KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
/*
FIXME: The two constructors should be replaced with the following after the lib freeze:
- KAboutApplication( const KAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
+ KAboutApplication( const TDEAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
This will make buildDialog() obsolete as well (Frerich).
*/
protected:
- void buildDialog( const KAboutData *aboutData );
+ void buildDialog( const TDEAboutData *aboutData );
};
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp
index 4937b3a8..89e39745 100644
--- a/tdeui/kaction.cpp
+++ b/tdeui/kaction.cpp
@@ -658,7 +658,7 @@ int KAction::plug( TQWidget *w, int index )
if ( d->hasIcon() )
{
- KInstance *instance;
+ TDEInstance *instance;
if ( m_parentCollection )
instance = m_parentCollection->instance();
else
@@ -698,7 +698,7 @@ int KAction::plug( TQWidget *w, int index )
KToolBar *bar = static_cast<KToolBar *>( w );
int id_ = getToolButtonID();
- KInstance *instance;
+ TDEInstance *instance;
if ( m_parentCollection )
instance = m_parentCollection->instance();
else
diff --git a/tdeui/kaction.h b/tdeui/kaction.h
index dca99b4b..a6ebbfb9 100644
--- a/tdeui/kaction.h
+++ b/tdeui/kaction.h
@@ -48,7 +48,7 @@ class KAccelActions;
class KConfig;
class KConfigBase;
class KURL;
-class KInstance;
+class TDEInstance;
class KToolBar;
class KActionCollection;
class KPopupMenu;
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp
index 9e224140..e83a9f05 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/kactionclasses.cpp
@@ -1278,7 +1278,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index )
int id_ = KAction::getToolButtonID();
- KInstance * instance;
+ TDEInstance * instance;
if ( m_parentCollection )
instance = m_parentCollection->instance();
else
@@ -1827,7 +1827,7 @@ int KActionMenu::plug( TQWidget* widget, int index )
index );
else
{
- KInstance *instance;
+ TDEInstance *instance;
if ( m_parentCollection )
instance = m_parentCollection->instance();
@@ -1954,7 +1954,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index )
isEnabled(), plainText(),
index );
} else {
- KInstance * instance;
+ TDEInstance * instance;
if ( m_parentCollection )
instance = m_parentCollection->instance();
else
@@ -2290,7 +2290,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index )
int id_ = KAction::getToolButtonID();
- KInstance * instance;
+ TDEInstance * instance;
if ( m_parentCollection )
instance = m_parentCollection->instance();
else
diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h
index 06e00d17..0a6a105f 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/kactionclasses.h
@@ -51,7 +51,7 @@ class KAccelActions;
class KConfig;
class KConfigBase;
class KURL;
-class KInstance;
+class TDEInstance;
class KToolBar;
class KActionCollection;
class KPopupMenu;
diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp
index ba809087..9cc76902 100644
--- a/tdeui/kactioncollection.cpp
+++ b/tdeui/kactioncollection.cpp
@@ -56,7 +56,7 @@ public:
m_parentGUIClient = 0L;
}
- KInstance *m_instance;
+ TDEInstance *m_instance;
TQString m_sXMLFile;
bool m_bAutoConnectShortcuts;
//bool m_bOneKAccelOnly;
@@ -77,7 +77,7 @@ public:
};
KActionCollection::KActionCollection( TQWidget *parent, const char *name,
- KInstance *instance )
+ TDEInstance *instance )
: TQObject( parent, name )
{
kdDebug(129) << "KActionCollection::KActionCollection( " << parent << ", " << name << " ): this = " << this << endl; // ellis
@@ -90,7 +90,7 @@ KActionCollection::KActionCollection( TQWidget *parent, const char *name,
KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const char *name,
- KInstance *instance )
+ TDEInstance *instance )
: TQObject( parent, name )
{
kdDebug(129) << "KActionCollection::KActionCollection( " << watch << ", " << parent << ", " << name << " ): this = " << this << endl; //ellis
@@ -104,10 +104,10 @@ KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const c
#ifndef KDE_NO_COMPAT
// KDE 4: remove
KActionCollection::KActionCollection( TQObject *parent, const char *name,
- KInstance *instance )
+ TDEInstance *instance )
: TQObject( parent, name )
{
- kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, KInstance *instance )" << endl; //ellis
+ kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, TDEInstance *instance )" << endl; //ellis
kdDebug(129) << kdBacktrace() << endl;
d = new KActionCollectionPrivate;
TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent );
@@ -457,7 +457,7 @@ KActionPtrList KActionCollection::actions() const
return lst;
}
-void KActionCollection::setInstance( KInstance *instance )
+void KActionCollection::setInstance( TDEInstance *instance )
{
if ( instance )
d->m_instance = instance;
@@ -465,7 +465,7 @@ void KActionCollection::setInstance( KInstance *instance )
d->m_instance = KGlobal::instance();
}
-KInstance *KActionCollection::instance() const
+TDEInstance *KActionCollection::instance() const
{
return d->m_instance;
}
@@ -695,7 +695,7 @@ bool KActionShortcutList::isConfigurable( uint i ) const
{ return m_actions.action(i)->isShortcutConfigurable(); }
bool KActionShortcutList::setShortcut( uint i, const KShortcut& cut )
{ return m_actions.action(i)->setShortcut( cut ); }
-const KInstance* KActionShortcutList::instance() const
+const TDEInstance* KActionShortcutList::instance() const
{ return m_actions.instance(); }
TQVariant KActionShortcutList::getOther( Other, uint ) const
{ return TQVariant(); }
diff --git a/tdeui/kactioncollection.h b/tdeui/kactioncollection.h
index 8111effa..28c9e530 100644
--- a/tdeui/kactioncollection.h
+++ b/tdeui/kactioncollection.h
@@ -49,7 +49,7 @@ class KAccelActions;
class KConfig;
class KConfigBase;
class KURL;
-class KInstance;
+class TDEInstance;
class KToolBar;
class KActionCollection;
class KPopupMenu;
@@ -83,13 +83,13 @@ class TDEUI_EXPORT KActionCollection : public TQObject
Q_OBJECT
public:
- KActionCollection( TQWidget *parent, const char *name = 0, KInstance *instance = 0 );
+ KActionCollection( TQWidget *parent, const char *name = 0, TDEInstance *instance = 0 );
/**
* Use this constructor if you want the collection's actions to restrict
* their accelerator keys to @p watch rather than the @p parent. If
* you don't require shortcuts, you can pass a null to the @p watch parameter.
*/
- KActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, KInstance *instance = 0 );
+ KActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, TDEInstance *instance = 0 );
#ifndef KDE_NO_COMPAT
KActionCollection( const KActionCollection &copy );
#endif
@@ -197,9 +197,9 @@ public:
*/
bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ) const;
- void setInstance( KInstance *instance );
+ void setInstance( TDEInstance *instance );
/** The instance with which this class is associated. */
- KInstance *instance() const;
+ TDEInstance *instance() const;
/**
* @deprecated
@@ -335,7 +335,7 @@ private:
#ifndef KDE_NO_COMPAT
public:
- KActionCollection( TQObject *parent, const char *name = 0, KInstance *instance = 0 );
+ KActionCollection( TQObject *parent, const char *name = 0, TDEInstance *instance = 0 );
#endif
public:
diff --git a/tdeui/kactionshortcutlist.h b/tdeui/kactionshortcutlist.h
index c61a7e2a..7c5f5b0d 100644
--- a/tdeui/kactionshortcutlist.h
+++ b/tdeui/kactionshortcutlist.h
@@ -24,7 +24,7 @@ class TDEUI_EXPORT KActionShortcutList : public KShortcutList
virtual bool isConfigurable( uint index ) const;
virtual bool setShortcut( uint index, const KShortcut& shortcut );
- virtual const KInstance* instance() const;
+ virtual const TDEInstance* instance() const;
virtual TQVariant getOther( Other, uint index ) const;
virtual bool setOther( Other, uint index, TQVariant );
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index c3cf0b51..37f84a80 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -65,7 +65,7 @@ public:
KURL url;
};
-KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutData )
+KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *aboutData )
: KDialogBase( Plain,
i18n("Submit Bug Report"),
Ok | Cancel,
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index 419ad3c8..2c60b091 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -25,7 +25,7 @@ class TQMultiLineEdit;
class TQLineEdit;
class TQHButtonGroup;
class KProcess;
-class KAboutData;
+class TDEAboutData;
class KBugReportPrivate;
/**
@@ -33,8 +33,8 @@ class KBugReportPrivate;
*
* All the information needed by the dialog box
* (program name, version, bug-report address, etc.)
- * comes from the KAboutData class.
- * Make sure you create an instance of KAboutData and pass it
+ * comes from the TDEAboutData class.
+ * Make sure you create an instance of TDEAboutData and pass it
* to TDECmdLineArgs.
*
* @author David Faure <faure@kde.org>
@@ -49,7 +49,7 @@ public:
* since KHelpMenu takes care of the menu item
* for "Report Bug..." and of creating a KBugReport dialog.
*/
- KBugReport( TQWidget * parent = 0L, bool modal=true, const KAboutData *aboutData = 0L );
+ KBugReport( TQWidget * parent = 0L, bool modal=true, const TDEAboutData *aboutData = 0L );
/**
* Destructor
*/
@@ -101,7 +101,7 @@ protected:
bool sendBugReport();
KProcess * m_process;
- const KAboutData * m_aboutData;
+ const TDEAboutData * m_aboutData;
TQMultiLineEdit * m_lineedit;
TQLineEdit * m_subject;
diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp
index 7d82d295..a047fe6b 100644
--- a/tdeui/kcmodule.cpp
+++ b/tdeui/kcmodule.cpp
@@ -44,8 +44,8 @@ public:
_unmanagedWidgetChangeState( false )
{ }
- KInstance *_instance;
- KAboutData *_about;
+ TDEInstance *_instance;
+ TDEAboutData *_about;
TQString _rootOnlyMsg;
bool _useRootOnlyMsg;
bool _hasOwnInstance;
@@ -64,17 +64,17 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &)
{
init();
if (name && strlen(name)) {
- d->_instance = new KInstance(name);
+ d->_instance = new TDEInstance(name);
KGlobal::locale()->insertCatalogue(name);
} else
- d->_instance = new KInstance("kcmunnamed");
+ d->_instance = new TDEInstance("kcmunnamed");
KGlobal::setActiveInstance(this->instance());
d->managers.setAutoDelete( true );
}
-KCModule::KCModule(KInstance *instance, TQWidget *parent, const TQStringList & )
+KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & )
: TQWidget(parent, instance ? instance->instanceName().data() : 0)
{
init();
@@ -156,12 +156,12 @@ void KCModule::unmanagedWidgetChangeState(bool changed)
widgetChanged();
}
-const KAboutData *KCModule::aboutData() const
+const TDEAboutData *KCModule::aboutData() const
{
return d->_about;
}
-void KCModule::setAboutData( KAboutData* about )
+void KCModule::setAboutData( TDEAboutData* about )
{
delete d->_about;
d->_about = about;
@@ -192,7 +192,7 @@ void KCModule::changed()
emit changed(true);
}
-KInstance *KCModule::instance() const
+TDEInstance *KCModule::instance() const
{
return d->_instance;
}
diff --git a/tdeui/kcmodule.h b/tdeui/kcmodule.h
index bba06ae4..c237ad16 100644
--- a/tdeui/kcmodule.h
+++ b/tdeui/kcmodule.h
@@ -29,11 +29,11 @@
class TQStringList;
-class KAboutData;
+class TDEAboutData;
class KConfigDialogManager;
class KConfigSkeleton;
class KCModulePrivate;
-class KInstance;
+class TDEInstance;
/**
* The base class for control center modules.
@@ -91,7 +91,7 @@ public:
*/
KCModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() );
- KCModule(KInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
+ KCModule(TDEInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
/*
* Destroys the module.
@@ -182,15 +182,15 @@ public:
* If you override you should have it return a pointer to a constant.
*
*
- * @returns the KAboutData for this module
+ * @returns the TDEAboutData for this module
*/
- virtual const KAboutData *aboutData() const;
+ virtual const TDEAboutData *aboutData() const;
/**
- * This sets the KAboutData returned by aboutData()
+ * This sets the TDEAboutData returned by aboutData()
* @since 3.3
*/
- void setAboutData( KAboutData* about );
+ void setAboutData( TDEAboutData* about );
/**
* Indicate which buttons will be used.
@@ -228,7 +228,7 @@ public:
*/
bool useRootOnlyMsg() const;
- KInstance *instance() const;
+ TDEInstance *instance() const;
/**
* @return a list of @ref KConfigDialogManager's in use, if any.
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 418fb755..b89a5b97 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -214,7 +214,7 @@ public:
* In a KParts application we let create a KXMLGUIClient create a dummy one,
* but it probably isn't used.
*/
- KEditToolbarWidgetPrivate(KInstance *instance, KActionCollection* collection)
+ KEditToolbarWidgetPrivate(TDEInstance *instance, KActionCollection* collection)
: m_collection( collection )
{
m_instance = instance;
@@ -339,7 +339,7 @@ public:
//TQValueList<KAction*> m_actionList;
KActionCollection* m_collection;
- KInstance *m_instance;
+ TDEInstance *m_instance;
XmlData* m_currentXmlData;
TQDomElement m_currentToolbarElem;
@@ -466,7 +466,7 @@ void KEditToolbar::slotDefault()
if (TQDir::isRelativePath(file))
{
- const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
+ const TDEInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file);
}
else
diff --git a/tdeui/kguiitem.cpp b/tdeui/kguiitem.cpp
index 7b73c740..e4d09bff 100644
--- a/tdeui/kguiitem.cpp
+++ b/tdeui/kguiitem.cpp
@@ -149,7 +149,7 @@ TQString KGuiItem::plainText() const
return stripped;
}
-TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, KInstance* instance ) const
+TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, TDEInstance* instance ) const
{
if( d->m_hasIcon )
{
diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h
index 586998d4..189dc129 100644
--- a/tdeui/kguiitem.h
+++ b/tdeui/kguiitem.h
@@ -61,10 +61,10 @@ public:
TQString text() const;
TQString plainText() const;
#ifndef KDE_NO_COMPAT
- TQIconSet iconSet( KIcon::Group, int size = 0, KInstance* instance = KGlobal::instance()) const;
+ TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = KGlobal::instance()) const;
TQIconSet iconSet() const { return iconSet( KIcon::Small ); }
#else
- TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, KInstance* instance = KGlobal::instance()) const;
+ TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = KGlobal::instance()) const;
#endif
TQString iconName() const;
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 071db124..67043944 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -59,7 +59,7 @@ public:
delete mSwitchApplicationLanguage;
}
- const KAboutData *mAboutData;
+ const TDEAboutData *mAboutData;
KSwitchLanguageDialog *mSwitchApplicationLanguage;
};
@@ -74,7 +74,7 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TQString &aboutAppText,
d->mAboutData = 0;
}
-KHelpMenu::KHelpMenu( TQWidget *parent, const KAboutData *aboutData,
+KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
bool showWhatsThis, KActionCollection *actions )
: TQObject(parent), mMenu(0), mAboutApp(0), mAboutKDE(0), mBugReport(0),
d(new KHelpMenuPrivate)
@@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu()
// I use hardcoded menu id's here. Reason is to stay backward
// compatible.
//
- const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
+ const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
mMenu = new KPopupMenu();
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index e58569bf..0f2a7078 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -31,7 +31,7 @@ class KActionCollection;
class KPopupMenu;
class TQWidget;
-class KAboutData;
+class TDEAboutData;
class KAboutKDE;
class KBugReport;
class KDialogBase;
@@ -175,7 +175,7 @@ class TDEUI_EXPORT KHelpMenu : public TQObject
* standard actions.
*
*/
- KHelpMenu( TQWidget *parent, const KAboutData *aboutData,
+ KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
bool showWhatsThis=true, KActionCollection *actions = 0 );
/**
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index 4df3e2ec..d291a87d 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -306,7 +306,7 @@ public:
* Simply call insert with the action collections of each one in turn.
*
* @param title the title associated with the collection (if null, the
- * KAboutData::progName() of the collection's instance is used)
+ * TDEAboutData::progName() of the collection's instance is used)
* @return true :)
* @since 3.1
*/
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index d03a2efc..56b5f266 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -189,7 +189,7 @@ public:
*
* @param aboutAppText The string that is used in the application
* specific dialog box. If you leave this string empty the
- * information in the global KAboutData of the
+ * information in the global TDEAboutData of the
* application will be used to make a standard dialog box.
*
* @param showWhatsThis Set this to false if you do not want to include
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index e1adac16..befd93fc 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -64,9 +64,9 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
case Preferences:
case HelpContents:
{
- const KAboutData *aboutData = KGlobal::instance()->aboutData();
+ const TDEAboutData *aboutData = KGlobal::instance()->aboutData();
/* TODO KDE4
- const KAboutData *aboutData;
+ const TDEAboutData *aboutData;
if ( parent )
aboutData = parent->instance()->aboutData();
else
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 1ae786d6..668f070d 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -312,7 +312,7 @@ KActionCollection* KSystemTray::actionCollection()
return d->actionCollection;
}
-TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance )
+TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance )
{
KConfig *appCfg = kapp->config();
KConfigGroupSaver configSaver(appCfg, "System Tray");
@@ -320,7 +320,7 @@ TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance )
return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
}
-TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance )
+TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance )
{
return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
}
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index 79d73d3e..a74dc9be 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -105,7 +105,7 @@ public:
/**
* Changes the tray's text description (which can be seen e.g. in the systray
- * configuration dialog). The default value is KAboutData::programName().
+ * configuration dialog). The default value is TDEAboutData::programName().
*/
virtual void setCaption( const TQString& title );
@@ -117,7 +117,7 @@ public:
*
* @since 3.2
*/
- static TQPixmap loadIcon( const TQString &icon, KInstance *instance=KGlobal::instance() );
+ static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=KGlobal::instance() );
/**
* Loads an icon @p icon using the icon loader class of the given instance @p instance.
@@ -128,7 +128,7 @@ public:
*
* @since 3.5.12
*/
- static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance=KGlobal::instance() );
+ static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=KGlobal::instance() );
signals:
/**
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index 32e5b9f1..0fd9e5ad 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -255,7 +255,7 @@ void KToolBar::init( bool readConfig, bool honorStyle )
}
int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
- const TQString& text, int index, KInstance *_instance )
+ const TQString& text, int index, TDEInstance *_instance )
{
KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance );
@@ -268,7 +268,7 @@ int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
int KToolBar::insertButton(const TQString& icon, int id, const char *signal,
const TQObject *receiver, const char *slot,
- bool enabled, const TQString& text, int index, KInstance *_instance )
+ bool enabled, const TQString& text, int index, TDEInstance *_instance )
{
KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance);
insertWidgetInternal( button, index, id );
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index 1f233f23..aa371732 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -49,7 +49,7 @@ class KToolBarButton;
class KToolBoxManager;
class KAnimWidget;
class KPopupMenu;
-class KInstance;
+class TDEInstance;
class KComboBox;
class KXMLGUIClient;
@@ -207,7 +207,7 @@ public:
*/
int insertButton(const TQString& icon, int id, bool enabled = true,
const TQString& text = TQString::null, int index=-1,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* This is the same as above, but with specified signals and
@@ -230,7 +230,7 @@ public:
int insertButton(const TQString& icon, int id, const char *signal,
const TQObject *receiver, const char *slot,
bool enabled = true, const TQString& text = TQString::null,
- int index=-1, KInstance *_instance = KGlobal::instance() );
+ int index=-1, TDEInstance *_instance = KGlobal::instance() );
/**
* Inserts a button (a KToolBarButton) with the specified
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp
index 1316081c..66b9d6ee 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/ktoolbarbutton.cpp
@@ -93,7 +93,7 @@ public:
TQPoint m_mousePressPos;
- KInstance *m_instance;
+ TDEInstance *m_instance;
};
// This will construct a separator
@@ -109,7 +109,7 @@ KToolBarButton::KToolBarButton( TQWidget *_parent, const char *_name )
KToolBarButton::KToolBarButton( const TQString& _icon, int _id,
TQWidget *_parent, const char *_name,
- const TQString &_txt, KInstance *_instance )
+ const TQString &_txt, TDEInstance *_instance )
: TQToolButton( _parent, _name ), d( 0 )
{
d = new KToolBarButtonPrivate;
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h
index 340761bd..df26fea7 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -61,7 +61,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/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index c31242ff..43f71687 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -61,7 +61,7 @@ public:
TQString attrIcon;
- KInstance *m_instance;
+ TDEInstance *m_instance;
KXMLGUIClient *m_client;
};
@@ -174,7 +174,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
if ( !icon.isEmpty() )
{
- KInstance *instance = d->m_instance;
+ TDEInstance *instance = d->m_instance;
if ( !instance )
instance = KGlobal::instance();
@@ -371,7 +371,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
if ( !icon.isEmpty() )
{
- KInstance *instance = d->m_instance;
+ TDEInstance *instance = d->m_instance;
if ( !instance )
instance = KGlobal::instance();
@@ -409,12 +409,12 @@ void KXMLGUIBuilder::setBuilderClient( KXMLGUIClient *client )
setBuilderInstance( client->instance() );
}
-KInstance *KXMLGUIBuilder::builderInstance() const
+TDEInstance *KXMLGUIBuilder::builderInstance() const
{
return d->m_instance;
}
-void KXMLGUIBuilder::setBuilderInstance( KInstance *instance )
+void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance )
{
d->m_instance = instance;
}
diff --git a/tdeui/kxmlguibuilder.h b/tdeui/kxmlguibuilder.h
index f32c3024..657add5f 100644
--- a/tdeui/kxmlguibuilder.h
+++ b/tdeui/kxmlguibuilder.h
@@ -27,7 +27,7 @@
class KXMLGUIBuilderPrivate;
class TQWidget;
-class KInstance;
+class TDEInstance;
class KXMLGUIClient;
/**
@@ -48,9 +48,9 @@ class TDEUI_EXPORT KXMLGUIBuilder
/* @internal */
void setBuilderClient( KXMLGUIClient *client );
/* @internal */
- KInstance *builderInstance() const;
+ TDEInstance *builderInstance() const;
/* @internal */
- void setBuilderInstance( KInstance *instance );
+ void setBuilderInstance( TDEInstance *instance );
/* @internal */
TQWidget *widget();
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index ff463e45..d8548cad 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -50,7 +50,7 @@ public:
{
}
- KInstance *m_instance;
+ TDEInstance *m_instance;
TQDomDocument m_doc;
KActionCollection *m_actionCollection;
@@ -120,7 +120,7 @@ KAction *KXMLGUIClient::action( const TQDomElement &element ) const
return actionCollection()->action( element.attribute( attrName ).latin1() );
}
-KInstance *KXMLGUIClient::instance() const
+TDEInstance *KXMLGUIClient::instance() const
{
return d->m_instance;
}
@@ -154,7 +154,7 @@ void KXMLGUIClient::reloadXML()
setXMLFile( file );
}
-void KXMLGUIClient::setInstance( KInstance *instance )
+void KXMLGUIClient::setInstance( TDEInstance *instance )
{
d->m_instance = instance;
actionCollection()->setInstance( instance );
diff --git a/tdeui/kxmlguiclient.h b/tdeui/kxmlguiclient.h
index c05a1afd..78c41260 100644
--- a/tdeui/kxmlguiclient.h
+++ b/tdeui/kxmlguiclient.h
@@ -29,7 +29,7 @@
class TQWidget;
class KAction;
class KActionCollection;
-class KInstance;
+class TDEInstance;
class KXMLGUIClientPrivate;
class KXMLGUIFactory;
class KXMLGUIBuilder;
@@ -95,9 +95,9 @@ public:
virtual KActionCollection* actionCollection() const;
/**
- * @return The instance ( KInstance ) for this GUI client.
+ * @return The instance ( TDEInstance ) for this GUI client.
*/
- virtual KInstance *instance() const;
+ virtual TDEInstance *instance() const;
/**
* @return The parsed XML in a TQDomDocument, set by
@@ -271,12 +271,12 @@ protected:
//bool addSuperClient( KXMLGUIClient * );
/**
- * Sets the instance ( KInstance) for this part.
+ * Sets the instance ( TDEInstance) for this part.
*
* Call this first in the inherited class constructor.
* (At least before setXMLFile().)
*/
- virtual void setInstance( KInstance *instance );
+ virtual void setInstance( TDEInstance *instance );
/**
* Sets the name of the rc file containing the XML for the part.
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 7aa42793..3c3f2466 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -96,14 +96,14 @@ public:
BuildStateStack m_stateStack;
};
-TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const KInstance *instance )
+TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInstance *instance )
{
return readConfigFile( filename, false, instance );
}
-TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const KInstance *_instance )
+TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance )
{
- const KInstance *instance = _instance ? _instance : KGlobal::instance();
+ const TDEInstance *instance = _instance ? _instance : KGlobal::instance();
TQString xml_file;
if (!TQDir::isRelativePath(filename))
@@ -140,9 +140,9 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
}
bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
- const TQString& filename, const KInstance *_instance )
+ const TQString& filename, const TDEInstance *_instance )
{
- const KInstance *instance = _instance ? _instance : KGlobal::instance();
+ const TDEInstance *instance = _instance ? _instance : KGlobal::instance();
TQString xml_file(filename);
if (TQDir::isRelativePath(xml_file))
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index 9b473379..bf49c6b6 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -32,7 +32,7 @@ class KAction;
class KXMLGUIFactoryPrivate;
class KXMLGUIClient;
class KXMLGUIBuilder;
-class KInstance;
+class TDEInstance;
namespace KXMLGUI
{
@@ -79,10 +79,10 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject
~KXMLGUIFactory();
// XXX move to somewhere else? (Simon)
- static TQString readConfigFile( const TQString &filename, bool never_null, const KInstance *instance = 0 );
- static TQString readConfigFile( const TQString &filename, const KInstance *instance = 0 );
+ static TQString readConfigFile( const TQString &filename, bool never_null, const TDEInstance *instance = 0 );
+ static TQString readConfigFile( const TQString &filename, const TDEInstance *instance = 0 );
static bool saveConfigFile( const TQDomDocument& doc, const TQString& filename,
- const KInstance *instance = 0 );
+ const TDEInstance *instance = 0 );
static TQString documentToXML( const TQDomDocument& doc );
static TQString elementToXML( const TQDomElement& elem );
diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp
index 27975327..26d120de 100644
--- a/tdeui/kxmlguifactory_p.cpp
+++ b/tdeui/kxmlguifactory_p.cpp
@@ -805,7 +805,7 @@ TQWidget *BuildHelper::createContainer( TQWidget *parent, int index,
}
}
- KInstance *oldInstance = m_state.builder->builderInstance();
+ TDEInstance *oldInstance = m_state.builder->builderInstance();
KXMLGUIClient *oldClient = m_state.builder->builderClient();
m_state.builder->setBuilderClient( m_state.guiClient );
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index c9b3485c..cfb4160d 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -118,7 +118,7 @@ void KLineEditTest::slotHide()
int main ( int argc, char **argv)
{
- KAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
+ TDEAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication::addCmdLineOptions();
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index dbe688eb..9f764e77 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -36,7 +36,7 @@ int main( int argc, char **argv )
KXMLGUIFactory *factory = new KXMLGUIFactory( builder );
Client *shell = new Client;
- shell->setInstance( new KInstance( "konqueror" ) );
+ shell->setInstance( new TDEInstance( "konqueror" ) );
shell->instance()->dirs()->addResourceDir( "data", TQDir::currentDirPath() );
(void)new KAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" );
diff --git a/tdeui/tests/kxmlguitest.h b/tdeui/tests/kxmlguitest.h
index 1adb1a14..bc88711f 100644
--- a/tdeui/tests/kxmlguitest.h
+++ b/tdeui/tests/kxmlguitest.h
@@ -11,7 +11,7 @@ public:
Client() {}
void setXMLFile( const TQString &f, bool merge = true ) { KXMLGUIClient::setXMLFile( f, merge ); }
- void setInstance( KInstance *inst ) { KXMLGUIClient::setInstance( inst ); }
+ void setInstance( TDEInstance *inst ) { KXMLGUIClient::setInstance( inst ); }
public slots:
void slotSec();