From 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- khtml/java/tests/testkjavaappletserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'khtml/java') diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/khtml/java/tests/testkjavaappletserver.cpp index 2045f7512..cb85550e6 100644 --- a/khtml/java/tests/testkjavaappletserver.cpp +++ b/khtml/java/tests/testkjavaappletserver.cpp @@ -17,9 +17,9 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KCmdLineArgs::init( argc, argv, "testKJASSever", "testKJASServer", "test program", "0.0" ); + TDECmdLineArgs::init( argc, argv, "testKJASSever", "testKJASServer", "test program", "0.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; -- cgit v1.2.3 From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- DEBUG | 10 +- KDE2PORTING.html | 22 +- KDE3PORTING.html | 2 +- TODO | 6 +- arts/kde/kconverttest.cc | 2 +- arts/kde/kiotest.cc | 2 +- arts/kde/kiotestslow.cc | 2 +- arts/knotify/knotifytest.cpp | 2 +- arts/message/artsmessage.cc | 2 +- dcop/HOWTO | 20 +- dcop/Mainpage.dox | 10 +- dcop/dcop_deadlock_test.cpp | 4 +- dcop/dcopclient.h | 10 +- dcop/tests/driver.cpp | 2 +- dcop/tests/test.cpp | 2 +- dnssd/domainbrowser.cpp | 2 +- interfaces/kspeech/kspeech.h | 2 +- interfaces/terminal/test/main.cc | 2 +- kabc/address.cpp | 4 +- kabc/kab2kabc.cpp | 2 +- kabc/key.cpp | 2 +- kabc/phonenumber.cpp | 2 +- kabc/scripts/addressee.src.cpp | 2 +- kabc/tests/bigread.cpp | 2 +- kabc/tests/bigwrite.cpp | 2 +- kabc/tests/kabcargl.cpp | 2 +- kabc/tests/testaddressee.cpp | 2 +- kabc/tests/testaddresseelist.cpp | 2 +- kabc/tests/testaddressfmt.cpp | 2 +- kabc/tests/testaddresslineedit.cpp | 2 +- kabc/tests/testdb.cpp | 4 +- kabc/tests/testdistlist.cpp | 2 +- kabc/tests/testkabc.cpp | 2 +- kabc/tests/testkabcdlg.cpp | 2 +- kabc/tests/testldapclient.cpp | 4 +- kabc/tests/testlock.cpp | 2 +- kabc/vcard/testwrite.cpp | 2 +- kabc/vcardparser/testread.cpp | 4 +- kabc/vcardparser/testwrite.cpp | 2 +- kate/ChangeLog | 2 +- kate/part/kateschema.cpp | 6 +- kate/part/kateviewinternal.cpp | 12 +- kate/part/test_regression.cpp | 2 +- kcmshell/main.h | 4 +- kded/kbuildsycoca.cpp | 6 +- kded/kde-menu.cpp | 6 +- kded/kded.cpp | 10 +- kded/khostname.cpp | 2 +- kded/kmimelist.cpp | 2 +- khtml/html/html_documentimpl.cpp | 2 +- khtml/html/html_formimpl.cpp | 2 +- khtml/java/tests/testkjavaappletserver.cpp | 2 +- khtml/khtml_part.cpp | 4 +- khtml/khtml_part.h | 2 +- khtml/khtmlview.cpp | 6 +- khtml/rendering/render_frames.cpp | 4 +- khtml/rendering/render_image.cpp | 2 +- khtml/test_regression.cpp | 2 +- khtml/test_regression_fontoverload.cpp | 4 +- khtml/testkhtml.cpp | 2 +- kinit/README | 8 +- kinit/kinit.cpp | 2 +- kinit/klauncher.cpp | 4 +- kinit/klauncher.h | 2 +- kinit/klauncher_main.cpp | 4 +- kinit/tests/klaunchertest.cpp | 8 +- kio/kfile/kdiroperator.cpp | 4 +- kio/kfile/kfileiconview.cpp | 2 +- kio/kfile/knotifydialog.h | 2 +- kio/kfile/kopenwith.cpp | 18 +- kio/kfile/kopenwith.h | 4 +- kio/kfile/kopenwith_p.h | 6 +- kio/kfile/kpropertiesdialog.cpp | 26 +- kio/kfile/kpropertiesdialog.h | 10 +- kio/kfile/tests/kcustommenueditortest.cpp | 2 +- kio/kfile/tests/kdirselectdialogtest.cpp | 2 +- kio/kfile/tests/kfiletreeviewtest.cpp | 2 +- kio/kfile/tests/kfstest.cpp | 2 +- kio/kfile/tests/kicondialogtest.cpp | 2 +- kio/kfile/tests/knotifytest.cpp | 2 +- kio/kfile/tests/kopenwithtest.cpp | 2 +- kio/kfile/tests/kurlrequestertest.cpp | 2 +- kio/kio/jobclasses.h | 2 +- kio/kio/kmessageboxwrapper.h | 4 +- kio/kio/kmimetype.cpp | 2 +- kio/kio/krun.cpp | 2 +- kio/kio/observer.cpp | 2 +- kio/kio/slave.cpp | 6 +- kio/kio/slavebase.cpp | 2 +- kio/kio/tcpslavebase.cpp | 8 +- kio/kioexec/README | 2 +- kio/kioexec/main.cpp | 2 +- kio/misc/kfile/fileprops.cpp | 2 +- kio/misc/kmailservice.cpp | 2 +- kio/misc/kntlm/kntlm.cpp | 4 +- kio/misc/ksendbugmail/main.cpp | 2 +- kio/misc/ktelnetservice.cpp | 2 +- kio/misc/kwalletd/kwalletd.cpp | 4 +- kio/tests/getalltest.cpp | 2 +- kio/tests/jobtest.cpp | 4 +- kio/tests/kacltest.cpp | 4 +- kio/tests/kdcopcheck.cpp | 2 +- kio/tests/kdefaultprogresstest.cpp | 2 +- kio/tests/kdirlistertest.cpp | 2 +- kio/tests/kdirwatchtest.cpp | 4 +- kio/tests/kionetrctest.cpp | 2 +- kio/tests/kiopassdlgtest.cpp | 2 +- kio/tests/kioslavetest.cpp | 2 +- kio/tests/kmimefromext.cpp | 2 +- kio/tests/kpropsdlgtest.cpp | 2 +- kio/tests/kprotocolinfotest.cpp | 2 +- kio/tests/kruntest.cpp | 2 +- kio/tests/kscantest.cpp | 2 +- kio/tests/ksycocatest.cpp | 2 +- kio/tests/ksycocaupdatetest.cpp | 2 +- kio/tests/ktradertest.cpp | 2 +- kio/tests/kurifiltertest.cpp | 2 +- kio/tests/kurlcompletiontest.cpp | 4 +- kio/tests/metatest.cpp | 4 +- kio/tests/netaccesstest.cpp | 2 +- kio/tests/previewtest.cpp | 2 +- kio/tests/speed.cpp | 2 +- kioslave/http/http.cc | 4 +- kioslave/metainfo/metainfo.cpp | 2 +- kmdi/test/main.cpp | 4 +- knewstuff/ghns.cpp | 2 +- knewstuff/khotnewstuff.cpp | 2 +- knewstuff/knewstuff.cpp | 2 +- knewstuff/testnewstuff.cpp | 2 +- kparts/tests/example.cpp | 2 +- kparts/tests/ghostview.cpp | 2 +- kparts/tests/normalktm.cpp | 2 +- krandr/randr.cpp | 4 +- kresources/managerimpl.cpp | 2 +- kresources/resource.cpp | 2 +- kresources/testresources.cpp | 2 +- kspell2/tests/backgroundtest.cpp | 2 +- kspell2/tests/test.cpp | 2 +- kspell2/tests/test_config.cpp | 2 +- kspell2/tests/test_configdialog.cpp | 2 +- kspell2/tests/test_dialog.cpp | 2 +- kspell2/tests/test_filter.cpp | 2 +- kspell2/tests/test_highlighter.cpp | 2 +- kstyles/asteroid/asteroid.cpp | 2 +- kstyles/kthemestyle/kthemebase.cpp | 2 +- kstyles/kthemestyle/kthemebase.h | 2 +- kstyles/utils/installtheme/main.cpp | 2 +- kunittest/tester.h | 2 +- kutils/kcmoduleloader.cpp | 2 +- kutils/tests/kfindtest.cpp | 2 +- kutils/tests/kreplacetest.cpp | 2 +- kwallet/backend/tests/backendtest.cpp | 2 +- kwallet/tests/kwalletasync.cpp | 2 +- kwallet/tests/kwalletboth.cpp | 2 +- kwallet/tests/kwalletsync.cpp | 2 +- libkscreensaver/kscreensaver.cpp | 6 +- libkscreensaver/main.cpp | 2 +- networkstatus/testservice.cpp | 2 +- tdecore/AUTHORS | 4 +- tdecore/DESIGN.COLOR | 2 +- tdecore/Mainpage.dox | 2 +- tdecore/README.kiosk | 2 +- tdecore/README.kstartupinfo | 6 +- tdecore/kaccel.cpp | 6 +- tdecore/kappdcopiface.cpp | 10 +- tdecore/kappdcopiface.h | 14 +- tdecore/kapplication.cpp | 334 +++++++++++------------ tdecore/kapplication.h | 84 +++--- tdecore/kapplication_win.cpp | 16 +- tdecore/kclipboard.cpp | 2 +- tdecore/kclipboard.h | 4 +- tdecore/kcmdlineargs.cpp | 10 +- tdecore/kcmdlineargs.h | 20 +- tdecore/kconfig.cpp | 2 +- tdecore/kconfig_compiler/example/autoexample.cpp | 2 +- tdecore/kconfig_compiler/example/example.cpp | 2 +- tdecore/kconfigbackend.cpp | 2 +- tdecore/kconfigbase.h | 2 +- tdecore/kcrash.cpp | 2 +- tdecore/kdebug.cpp | 4 +- tdecore/kdetcompmgr.cpp | 2 +- tdecore/kglobal.h | 2 +- tdecore/kglobalsettings.cpp | 8 +- tdecore/kglobalsettings.h | 8 +- tdecore/kiconloader.h | 2 +- tdecore/kinstance.h | 4 +- tdecore/kipc.h | 6 +- tdecore/klibloader.h | 2 +- tdecore/klockfile.cpp | 2 +- tdecore/kmimesourcefactory.h | 2 +- tdecore/knotifyclient.cpp | 4 +- tdecore/knotifyclient.h | 2 +- tdecore/kprocctrl.h | 6 +- tdecore/krandomsequence.cpp | 2 +- tdecore/krandomsequence.h | 4 +- tdecore/kstandarddirs.h | 6 +- tdecore/kstartupinfo.cpp | 8 +- tdecore/kstartupinfo.h | 4 +- tdecore/ksycoca.cpp | 2 +- tdecore/ktempdir.cpp | 2 +- tdecore/ktempfile.cpp | 2 +- tdecore/kuniqueapplication.cpp | 12 +- tdecore/kuniqueapplication.h | 8 +- tdecore/libtdecore_weak.nmcheck | 2 +- tdecore/network/ksockssocketdevice.cpp | 2 +- tdecore/tests/KIDLTest.cpp | 2 +- tdecore/tests/KIDLTestClient.cpp | 2 +- tdecore/tests/dcopkonqtest.cpp | 2 +- tdecore/tests/kapptest.cpp | 4 +- tdecore/tests/kcalendartest.cpp | 2 +- tdecore/tests/kcmdlineargstest.cpp | 4 +- tdecore/tests/kconfigtestgui.cpp | 2 +- tdecore/tests/kglobaltest.cpp | 4 +- tdecore/tests/kiconloadertest.cpp | 2 +- tdecore/tests/kipctest.cpp | 2 +- tdecore/tests/klocaletest.cpp | 2 +- tdecore/tests/kmacroexpandertest.cpp | 2 +- tdecore/tests/kmdcodectest.cpp | 2 +- tdecore/tests/kmemtest.cpp | 4 +- tdecore/tests/knotifytest.cpp | 2 +- tdecore/tests/kprocesstest.cpp | 2 +- tdecore/tests/kprociotest.cpp | 2 +- tdecore/tests/krandomsequencetest.cpp | 2 +- tdecore/tests/krfcdatetest.cpp | 2 +- tdecore/tests/ksimpleconfigtest.cpp | 2 +- tdecore/tests/ksocktest.cpp | 4 +- tdecore/tests/kstdacceltest.cpp | 4 +- tdecore/tests/kstddirstest.cpp | 2 +- tdecore/tests/ktempfiletest.cpp | 4 +- tdecore/tests/kurltest.cpp | 4 +- tdecore/tests/startserviceby.cpp | 2 +- tdecore/tests/testqtargs.cpp | 2 +- tdelfeditor/tdelfeditor.cpp | 4 +- tdeprint/cups/cupsdconf2/main.cpp | 2 +- tdeprint/kmmanager.cpp | 2 +- tdeprint/kprinterimpl.cpp | 2 +- tdeprint/management/kaddprinterwizard.cpp | 2 +- tdeprint/management/kmwdrivertest.cpp | 2 +- tdeprint/tests/drawdemo.cpp | 2 +- tdeprint/tests/main.cpp | 2 +- tdeui/AUTHORS | 2 +- tdeui/kaction.cpp | 2 +- tdeui/kdetrayproxy/kdetrayproxy.cpp | 2 +- tdeui/kiconview.cpp | 8 +- tdeui/kkeydialog.cpp | 2 +- tdeui/klistbox.cpp | 8 +- tdeui/klistview.cpp | 12 +- tdeui/kmainwindow.cpp | 8 +- tdeui/kmainwindow.h | 18 +- tdeui/kmessagebox.cpp | 2 +- tdeui/kmessagebox.h | 2 +- tdeui/kpanelapplet.h | 2 +- tdeui/kpanelextension.h | 2 +- tdeui/ktoolbar.h | 2 +- tdeui/ktoolbarbutton.cpp | 2 +- tdeui/tests/itemcontainertest.cpp | 4 +- tdeui/tests/kaboutdialogtest.cpp | 2 +- tdeui/tests/kactiontest.cpp | 2 +- tdeui/tests/kblendtest.cpp | 2 +- tdeui/tests/kbuttonboxtest.cpp | 2 +- tdeui/tests/kcharselecttest.cpp | 2 +- tdeui/tests/kcolordlgtest.cpp | 2 +- tdeui/tests/kcolortest.cpp | 2 +- tdeui/tests/kcomboboxtest.cpp | 2 +- tdeui/tests/kcompletiontest.cpp | 2 +- tdeui/tests/kdatepicktest.cpp | 2 +- tdeui/tests/kdatetimewidgettest.cpp | 2 +- tdeui/tests/kdatewidgettest.cpp | 2 +- tdeui/tests/kdesattest.cpp | 2 +- tdeui/tests/kdialogbasetest.cpp | 2 +- tdeui/tests/kdocktest.cpp | 2 +- tdeui/tests/kdockwidgetdemo.cpp | 2 +- tdeui/tests/kdockwidgettest.cpp | 2 +- tdeui/tests/kdualcolortest.cpp | 2 +- tdeui/tests/keditlistboxtest.cpp | 2 +- tdeui/tests/kedittest.cpp | 2 +- tdeui/tests/kfontdialogtest.cpp | 2 +- tdeui/tests/kgradienttest.cpp | 2 +- tdeui/tests/khashtest.cpp | 2 +- tdeui/tests/kinputdialogtest.cpp | 2 +- tdeui/tests/kjanuswidgettest.cpp | 2 +- tdeui/tests/kledtest.cpp | 2 +- tdeui/tests/klineeditdlgtest.cpp | 2 +- tdeui/tests/klineedittest.cpp | 4 +- tdeui/tests/klistviewtest.cpp | 2 +- tdeui/tests/kmainwindowrestoretest.cpp | 2 +- tdeui/tests/kmainwindowtest.cpp | 2 +- tdeui/tests/kmessageboxtest.cpp | 2 +- tdeui/tests/knuminputtest.cpp | 4 +- tdeui/tests/kpalettetest.cpp | 2 +- tdeui/tests/kpanelmenutest.cpp | 2 +- tdeui/tests/kpixmapregionselectordialogtest.cpp | 2 +- tdeui/tests/kpopuptest.cpp | 2 +- tdeui/tests/kprogresstest.cpp | 2 +- tdeui/tests/krulertest.cpp | 4 +- tdeui/tests/kspelltest.cpp | 2 +- tdeui/tests/ksqueezedtextlabeltest.cpp | 2 +- tdeui/tests/kstatusbartest.cpp | 6 +- tdeui/tests/ksystemtraytest.cpp | 2 +- tdeui/tests/ktabctltest.cpp | 4 +- tdeui/tests/ktabwidgettest.cpp | 2 +- tdeui/tests/ktextedittest.cpp | 2 +- tdeui/tests/ktimewidgettest.cpp | 2 +- tdeui/tests/ktoolbarlabelactiontest.cpp | 2 +- tdeui/tests/kunbalancedgrdtest.cpp | 2 +- tdeui/tests/kwizardtest.cpp | 2 +- tdeui/tests/kwordwraptest.cpp | 2 +- tdeui/tests/kxmlguitest.cpp | 2 +- tdeui/tests/twindowtest.cpp | 8 +- 309 files changed, 734 insertions(+), 734 deletions(-) (limited to 'khtml/java') diff --git a/DEBUG b/DEBUG index c5df1299b..4bcf3ce7b 100644 --- a/DEBUG +++ b/DEBUG @@ -68,7 +68,7 @@ Current language: auto; currently c++ (gdb) You can now set breakpoints everywhere. For example lets set a breakpoint -in the KApplication constructor. Unfortunately gdb is not very good in +in the TDEApplication constructor. Unfortunately gdb is not very good in handling C++ names, so it is not really possible to specify the constructor directly after the break command. Instead we look up a line of source code where we want to place the breakpoint. An external editor is of great @@ -79,11 +79,11 @@ are interested in and verify that we have found the correct source line: 215 parseCommandLine( argc, argv ); 216 } 217 -218 KApplication::KApplication( bool allowStyles, bool GUIenabled ) : +218 TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) : 219 QApplication( *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(), 220 GUIenabled ), 221 KInstance( KCmdLineArgs::about), -222 d (new KApplicationPrivate) +222 d (new TDEApplicationPrivate) 223 { 224 if (!GUIenabled) (gdb) break 224 @@ -92,14 +92,14 @@ Breakpoint 2 at 0x4048aa7e: file kapp.cpp, line 224. We can now continue the execution of kedit. Execution will stop when it hits a breakpoint of when the program exits. In this case execution will stop -in the first line of the KApplication constructor: +in the first line of the TDEApplication constructor: (gdb) continue Continuing. Qt: gdb: -nograb added to command-line options. Use the -dograb option to enforce grabbing. -Breakpoint 2, KApplication::KApplication (this=0xbffff6a8, allowStyles=true, +Breakpoint 2, TDEApplication::TDEApplication (this=0xbffff6a8, allowStyles=true, GUIenabled=true) at kapp.cpp:224 224 if (!GUIenabled) (gdb) diff --git a/KDE2PORTING.html b/KDE2PORTING.html index 2a9b9766f..a8580e3f5 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -19,7 +19,7 @@ or this page online.

  • Getting Started
  • Global changes
  • automoc/am_edit, Makefile.am tags
    • -
  • KApplication
    • +
  • TDEApplication
  • TDECmdLineArgs
  • KLocale
  • KGlobal: access to KDE global objects.
    • @@ -107,7 +107,7 @@ or this page online.

    Return to the Table of Contents

    -

    KApplication

    +

    TDEApplication

    doesn't hold any longer a KLocale instance. With this getLocale() and isLocaleInstantiated are now replaced by KGlobal::locale()

    @@ -128,7 +128,7 @@ or this page online.

    KGlobal::dirs()->findResource.

    Use locateLocal to get the path of a writable file. For instance, - KApplication::localconfigdir()+filename is now locateLocal( "config", filename ), + TDEApplication::localconfigdir()+filename is now locateLocal( "config", filename ), but for most cases, simply using KGlobal::config() is enough, if you're happy with saving the application's configuration into appnamerc, or KSimpleConfig cfg("anothercfgfile") to create a config file with another name.

    @@ -146,8 +146,8 @@ or this page online.

    appHelpActivated() have all been removed See section for KMainWindow for more info.

    - The KApplication constructor has changed. Command line arguments and - program name should no longer be passed to KApplication but to + The TDEApplication constructor has changed. Command line arguments and + program name should no longer be passed to TDEApplication but to TDECmdLineArgs. TDECmdLineArgs performs command line parsing and a command line help. See below for more info.

    @@ -166,7 +166,7 @@ or this page online.

    TDECmdLineArgs itself will add the command line options supported by Qt - and KApplication.

    + and TDEApplication.

    You can also use the KAboutData class to specify name, description and version.

    @@ -183,7 +183,7 @@ or this page online.

    i18n is no longer a macro

    - KApplication::getApplication()->getLocale()->translate

    + TDEApplication::getApplication()->getLocale()->translate

    but a function on its own. klocale is obsolete and replace every call to klocale->translate with i18n.

    @@ -199,7 +199,7 @@ KGlobal allows centralized access to KDE global objects without including extraneous headers. object creation is deferred if possible.

    All methods are static and headers for returned types are not included. You -must have created a KApplication object before the methods can be used.

    +must have created a TDEApplication object before the methods can be used.

    @@ -309,9 +309,9 @@ you should or should not use them.

    1. fork + exec

    You never want to use this unless you have a very good reason why it is -impossible to use KProcess. +impossible to use TDEProcess.

    -

    2. KProcess

    +

    2. TDEProcess

    You want to use this if you need to start a new process which needs to be a child of your process, e.g. because you want to catch stdout/stderr or need @@ -323,7 +323,7 @@ off with KProcIO

    3. KProcIO

    -Like KProcess. Unlike KProcess, this class actually makes it easy to +Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to send data to and receive data from the process.

    @@ -534,7 +534,7 @@ The kcharsets class has been completely rewritten, and most of it has vanished, since support for it moved to Qt.

    Most applications will only need to replace kapp->getKCharsets() with -KGlobal::charsets().

    +TDEGlobal::charsets().

    For conversion of various input formats to QStrings, please have a look at TQTextCodec and classes derived from it.

    @@ -570,9 +570,9 @@ HINTS:

    Return to the Table of Contents

    -

    KClipboard

    +

    TDEClipboard

    -KClipboard has been removed. In case you've been using KClipboard, +TDEClipboard has been removed. In case you've been using TDEClipboard, QClipboard is the way to go now, as it has all the functionality the K version had, and more.

    diff --git a/KDE3PORTING.html b/KDE3PORTING.html index f3a3f0256..1c96f6ecb 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -179,7 +179,7 @@ The preferred means of defining a shortcut, however, is to use KAction. this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" ); -

    KGlobalAccel
    +
    TDEGlobalAccel
    • Call updateConnections() after all insert() or insertItem() (deprecated) calls have been made. This function then performs the diff --git a/TODO b/TODO index dff44b8f0..26845a9d6 100644 --- a/TODO +++ b/TODO @@ -68,7 +68,7 @@ that we would like to make for the next binary incompatible release. KGuiItem has one of these dangerous ctors, too. KUser has a whole bunch of them. -- Solve need for casting when using bitfield enums (e.g. KProcess::Communication), +- Solve need for casting when using bitfield enums (e.g. TDEProcess::Communication), if Simon's solution works. - Merge tdelibs/tdecore/kuser.h and tdeadmin/kuser/kuser.h. @@ -133,7 +133,7 @@ that we would like to make for the next binary incompatible release. - kpassdlg.h needs to be renamed to kpassworddialog.h - consistent with other classes(it won't break many apps). The class needs a facelift - see the comments in kpassdlg.{h,cpp} -- KProcess needs a major facelift. Not all of these items need to be BIC, but not needing to +- TDEProcess needs a major facelift. Not all of these items need to be BIC, but not needing to worry about legacy will certainly allow an overall cleaner solution. - the internals need to be encapsulated properly. many of the virtuals shouldn't be virtual; lots of protected members should be accessible only via accessors. the current model is @@ -149,7 +149,7 @@ that we would like to make for the next binary incompatible release. - do something about the NoRead comm mode - add setComm(); remove comm arg from start(). as a side effect, this will allow for using writeStdin() in Block mode. - - merge KProcIO into KProcess; add setBuffered() for separate channels. + - merge KProcIO into TDEProcess; add setBuffered() for separate channels. - use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted. - To discuss: Migrate the about dialog to use qhtml or khtml rather then the current diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index e030cb411..50a2ae462 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -60,7 +60,7 @@ Arts::SoundServerV2 KArtsServer::server(void) // aRts seems not to be running, let's try to run it // First, let's read the configuration as in kcmarts KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); - KProcess proc; + TDEProcess proc; config.setGroup("Arts"); @@ -86,7 +86,7 @@ Arts::SoundServerV2 KArtsServer::server(void) proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) ); - if(proc.start(KProcess::Block) && proc.normalExit()) + if(proc.start(TDEProcess::Block) && proc.normalExit()) { // We could have a race-condition here. // The correct way to do it is to make artsd fork-and-exit diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 3fcaff6e0..5ff633516 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -78,7 +78,7 @@ public: TQMap events; TQMap configs; TQString externalPlayer; - KProcess *externalPlayerProc; + TDEProcess *externalPlayerProc; #ifndef WITHOUT_ARTS TQPtrList playObjects; @@ -136,7 +136,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) // abort this. #ifndef WITHOUT_ARTS - KConfigGroup config( KGlobal::config(), "StartProgress" ); + KConfigGroup config( TDEGlobal::config(), "StartProgress" ); KConfig artsKCMConfig( "kcmartsrc" ); artsKCMConfig.setGroup( "Arts" ); bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true ); @@ -285,7 +285,7 @@ KNotify::~KNotify() void KNotify::loadConfig() { // load external player settings - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); kc->setGroup("Misc"); d->useExternal = kc->readBoolEntry( "Use external player", false ); d->externalPlayer = kc->readPathEntry("External player"); @@ -452,7 +452,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( TQFileInfo(sound).isRelative() ) { TQString search = TQString("%1/sounds/%2").arg(appname).arg(sound); - soundFile = KGlobal::instance()->dirs()->findResource("data", search); + soundFile = TDEGlobal::instance()->dirs()->findResource("data", search); if ( soundFile.isEmpty() ) soundFile = locate( "sound", sound ); } @@ -537,12 +537,12 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int } else if(!d->externalPlayer.isEmpty()) { // use an external player to play the sound - KProcess *proc = d->externalPlayerProc; + TDEProcess *proc = d->externalPlayerProc; if (!proc) { - proc = d->externalPlayerProc = new KProcess; - connect( proc, TQT_SIGNAL( processExited( KProcess * )), - TQT_SLOT( slotPlayerProcessExited( KProcess * ))); + proc = d->externalPlayerProc = new TDEProcess; + connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), + TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { @@ -552,7 +552,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int proc->clearArguments(); (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data(); d->externalPlayerEventId = eventId; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); return true; } @@ -619,10 +619,10 @@ bool KNotify::notifyByExecute(const TQString &command, const TQString& event, if ( execLine.isEmpty() ) execLine = command; // fallback - KProcess p; + TDEProcess p; p.setUseShell(true); p << execLine; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); return true; } return false; @@ -721,7 +721,7 @@ bool KNotify::isPlaying( const TQString& soundFile ) const return false; } -void KNotify::slotPlayerProcessExited( KProcess *proc ) +void KNotify::slotPlayerProcessExited( TDEProcess *proc ) { soundFinished( d->externalPlayerEventId, (proc->normalExit() && proc->exitStatus() == 0) ? PlayedOK : Unknown ); diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index 12e699299..a6fec6747 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -25,7 +25,7 @@ #include class KNotifyPrivate; -class KProcess; +class TDEProcess; class KConfig; class KNotify : public TQObject, public DCOPObject @@ -98,7 +98,7 @@ private: private slots: void playTimeout(); - void slotPlayerProcessExited( KProcess *proc ); + void slotPlayerProcessExited( TDEProcess *proc ); void restartedArtsd(); private: diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc index 37bf4b75e..77f2a6185 100644 --- a/arts/message/artsmessage.cc +++ b/arts/message/artsmessage.cc @@ -57,7 +57,7 @@ TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1", int main(int argc, char **argv) { aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org"); - KGlobal::locale()->setMainCatalogue("tdelibs"); + TDEGlobal::locale()->setMainCatalogue("tdelibs"); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); TDEApplication app; diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 639be9bf1..061f8405d 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -56,7 +56,7 @@ public: KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) : KPreviewWidgetBase( parent, name ) { - KGlobal::locale()->insertCatalogue("kfileaudiopreview"); + TDEGlobal::locale()->insertCatalogue("kfileaudiopreview"); TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); // ### @@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) } m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); - KConfigGroup config( KGlobal::config(), ConfigGroup ); + KConfigGroup config( TDEGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() { - KConfigGroup config( KGlobal::config(), ConfigGroup ); + KConfigGroup config( TDEGlobal::config(), ConfigGroup ); config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() ); delete d; diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/kscript/sample/shellscript.cpp index 49aee0727..9ec34f7a2 100644 --- a/interfaces/kscript/sample/shellscript.cpp +++ b/interfaces/kscript/sample/shellscript.cpp @@ -30,10 +30,10 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" ) ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent) { - m_script = new KProcess(); - connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *))); - connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int ))); - connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int ))); + m_script = new TDEProcess(); + connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *))); + connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int ))); + connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int ))); // Connect feedback signals and slots //kdDebug() << "Building new script engine" << endl; } @@ -60,7 +60,7 @@ void ShellScript::setScript( const TQString &, const TQString & ) void ShellScript::run(TQObject *, const TQVariant &) { - m_script->start(KProcess::NotifyOnExit,KProcess::All); + m_script->start(TDEProcess::NotifyOnExit,TDEProcess::All); } void ShellScript::kill() { @@ -68,16 +68,16 @@ void ShellScript::kill() m_script->kill(9); // Kill it harder } -void ShellScript::Exit(KProcess *proc) +void ShellScript::Exit(TDEProcess *proc) { ScriptClientInterface->done((KScriptClientInterface::Result)proc->exitStatus(), ""); } -void ShellScript::stdErr(KProcess *, char *buffer, int) +void ShellScript::stdErr(TDEProcess *, char *buffer, int) { ScriptClientInterface->error(buffer); } -void ShellScript::stdOut(KProcess *, char *buffer, int) +void ShellScript::stdOut(TDEProcess *, char *buffer, int) { ScriptClientInterface->output(buffer); } diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/kscript/sample/shellscript.h index 853a7bd12..2cdaf7e5a 100644 --- a/interfaces/kscript/sample/shellscript.h +++ b/interfaces/kscript/sample/shellscript.h @@ -36,11 +36,11 @@ public: void run(TQObject *context = 0, const TQVariant &arg = 0); void kill(); private slots: - void Exit(KProcess *proc); - void stdErr(KProcess *proc, char *buffer, int buflen); - void stdOut(KProcess *proc, char *buffer, int buflen); + void Exit(TDEProcess *proc); + void stdErr(TDEProcess *proc, char *buffer, int buflen); + void stdOut(TDEProcess *proc, char *buffer, int buflen); private: - KProcess *m_script; + TDEProcess *m_script; KScriptClientInterface *ScriptClientInterface; TQString m_scriptName; }; diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp index 894d23f6a..ecc34c7e2 100644 --- a/interfaces/ktexteditor/templateinterface.cpp +++ b/interfaces/ktexteditor/templateinterface.cpp @@ -113,23 +113,23 @@ bool TemplateInterface::expandMacros( TQMap &map, TQWidget * } else if ( placeholder == "date" ) { - map[ placeholder ] = KGlobal::locale() ->formatDate( date, true ); + map[ placeholder ] = TDEGlobal::locale() ->formatDate( date, true ); } else if ( placeholder == "time" ) { - map[ placeholder ] = KGlobal::locale() ->formatTime( time, true, false ); + map[ placeholder ] = TDEGlobal::locale() ->formatTime( time, true, false ); } else if ( placeholder == "year" ) { - map[ placeholder ] = KGlobal::locale() ->calendar() ->yearString( date, false ); + map[ placeholder ] = TDEGlobal::locale() ->calendar() ->yearString( date, false ); } else if ( placeholder == "month" ) { - map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) ); + map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->month( date ) ); } else if ( placeholder == "day" ) { - map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) ); + map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->day( date ) ); } else if ( placeholder == "hostname" ) { diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 6a65477c2..0624c0e8d 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -35,7 +35,7 @@ class TQStrList; * we can't have signals without having a TQObject, which * TerminalInterface is not. * These are the signals you can connect to: - * void processExited( KProcess *process ); + * void processExited( TDEProcess *process ); * void receivedData( const TQString& s ); * See the example code below for how to connect to these.. * diff --git a/kabc/address.cpp b/kabc/address.cpp index 9ecf8eb2d..2fce393e0 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp @@ -338,7 +338,7 @@ TQString Address::formattedAddress( const TQString &realName, ciso = countryToISO( country() ); } else { // fall back to our own country - ciso = KGlobal::locale()->country(); + ciso = TDEGlobal::locale()->country(); } KSimpleConfig entry( locate( "locale", TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) ); @@ -369,7 +369,7 @@ TQString Address::formattedAddress( const TQString &realName, // the rules of our own system country ) if ( !country().isEmpty() ) { KSimpleConfig entry( locate( "locale", TQString( "l10n/" ) - + KGlobal::locale()->country() + TQString( "/entry.desktop" ) ) ); + + TDEGlobal::locale()->country() + TQString( "/entry.desktop" ) ) ); entry.setGroup( "KCM Locale" ); TQString cpos = entry.readEntry( "AddressCountryPosition" ); if ( "BELOW" == cpos || cpos.isEmpty() ) { @@ -520,7 +520,7 @@ TQString Address::countryToISO( const TQString &cname ) if ( it != mISOMap->end() ) return it.data(); - TQString mapfile = KGlobal::dirs()->findResource( "data", + TQString mapfile = TDEGlobal::dirs()->findResource( "data", TQString::fromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); @@ -540,8 +540,8 @@ TQString Address::countryToISO( const TQString &cname ) } // fall back to system country - mISOMap->insert( cname, KGlobal::locale()->country() ); - return KGlobal::locale()->country(); + mISOMap->insert( cname, TDEGlobal::locale()->country() ); + return TDEGlobal::locale()->country(); } TQString Address::ISOtoCountry( const TQString &ISOname ) @@ -550,7 +550,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname ) if ( ISOname.simplifyWhiteSpace().isEmpty() ) return TQString::null; - TQString mapfile = KGlobal::dirs()->findResource( "data", + TQString mapfile = TDEGlobal::dirs()->findResource( "data", TQString::fromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index bf6d0d17a..45d4f10e3 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -673,7 +673,7 @@ bool AddressBook::addCustomField( const TQString &label, int category, d->mAllFields = Field::allFields(); } - TQString a = app.isNull() ? KGlobal::instance()->instanceName() : app; + TQString a = app.isNull() ? TDEGlobal::instance()->instanceName() : app; TQString k = key.isNull() ? label : key; Field *field = Field::createCustomField( label, category, k, a ); diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index ec8e7be05..623d26cf3 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -78,7 +78,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : TQT_SLOT( updateEdit( TQListViewItem * ) ) ); mAddresseeEdit = new KLineEdit( topWidget ); - mAddresseeEdit->setCompletionMode( KGlobalSettings::CompletionAuto ); + mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ), TQT_SLOT( selectItem( const TQString & ) ) ); mAddresseeEdit->setFocus(); diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index fe9d1f602..6f056a404 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -326,16 +326,16 @@ void AddressLineEdit::doCompletion(bool ctrlT) return; } - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); switch ( mode ) { - case KGlobalSettings::CompletionPopupAuto: + case TDEGlobalSettings::CompletionPopupAuto: { if (s.isEmpty()) break; } - case KGlobalSettings::CompletionPopup: + case TDEGlobalSettings::CompletionPopup: { m_previousAddresses = prevAddr; TQStringList items = s_completion->allMatches( s ); @@ -368,7 +368,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) // completion (suggestion) since it does not know how to deal // with providing proper completions for different items on the // same line, e.g. comma-separated list of email addresses. - bool autoSuggest = (mode != KGlobalSettings::CompletionPopupAuto); + bool autoSuggest = (mode != TDEGlobalSettings::CompletionPopupAuto); setCompletedItems( items, autoSuggest ); if (!autoSuggest) @@ -385,7 +385,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) break; } - case KGlobalSettings::CompletionShell: + case TDEGlobalSettings::CompletionShell: { TQString match = s_completion->makeCompletion( s ); if ( !match.isNull() && match != s ) @@ -396,8 +396,8 @@ void AddressLineEdit::doCompletion(bool ctrlT) break; } - case KGlobalSettings::CompletionMan: // Short-Auto in fact - case KGlobalSettings::CompletionAuto: + case TDEGlobalSettings::CompletionMan: // Short-Auto in fact + case TDEGlobalSettings::CompletionAuto: { if (!s.isEmpty()) { @@ -410,7 +410,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) break; } } - case KGlobalSettings::CompletionNone: + case TDEGlobalSettings::CompletionNone: default: // fall through break; } @@ -496,7 +496,7 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs ) if( hasFocus() || completionBox()->hasFocus()) { - if( completionMode() != KGlobalSettings::CompletionNone ) + if( completionMode() != TDEGlobalSettings::CompletionNone ) { doCompletion( false ); } diff --git a/kabc/field.h b/kabc/field.h index f1de43717..7a622b90f 100644 --- a/kabc/field.h +++ b/kabc/field.h @@ -138,7 +138,7 @@ public: const Field::List &fields ); /** * This is the same as above, with the difference, that - * the list is stored in KGlobal::config() in group "KABCFields". + * the list is stored in TDEGlobal::config() in group "KABCFields". */ static void saveFields( const TQString &identifier, const Field::List &fields ); @@ -153,7 +153,7 @@ public: /** * This is the same as above, with the difference, that - * the list is loaded from KGlobal::config() from group "KABCFields". + * the list is loaded from TDEGlobal::config() from group "KABCFields". */ static Field::List restoreFields( const TQString &identifier ); diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp index 8af9e1701..17e7b0f33 100644 --- a/kabc/formatfactory.cpp +++ b/kabc/formatfactory.cpp @@ -56,7 +56,7 @@ FormatFactory::FormatFactory() info->descriptionLabel = i18n( "vCard Format" ); mFormatList.insert( "vcard", info ); - const TQStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true ); + const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true ); for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { KSimpleConfig config( *it, true ); diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index c23426260..2447229da 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -251,7 +251,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) } else if ( fieldName == "ROLE" ) { a.setRole( fieldValue ); } else if ( fieldName == "BDAY" ) { - a.setBirthday( KGlobal::locale()->readDate( fieldValue ) ); + a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) ); } else if ( fieldName == "WEBPAGE" ) { a.setUrl( KURL( fieldValue ) ); } else if ( fieldName == "N" ) { @@ -280,7 +280,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) void importKab( KABC::AddressBook *ab, bool override, bool quiet ) { - TQString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" ); + TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" ); fileName += "addressbook.kab"; if ( !TQFile::exists( fileName ) ) { if ( !quiet ) { diff --git a/kabc/lock.cpp b/kabc/lock.cpp index b5e0ea5a6..42c8c8580 100644 --- a/kabc/lock.cpp +++ b/kabc/lock.cpp @@ -68,7 +68,7 @@ bool Lock::writeLockFile( const TQString &filename ) TQFile file( filename ); if ( !file.open( IO_WriteOnly ) ) return false; TQTextStream t( &file ); - t << ::getpid() << endl << TQString( KGlobal::instance()->instanceName() ); + t << ::getpid() << endl << TQString( TDEGlobal::instance()->instanceName() ); return true; } diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index f4b4f83b8..e8da1b6aa 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -110,7 +110,7 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config ) d->mCachePolicy = Cache_No; d->mAutoCache = true; } - d->mCacheDst = KGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" + + d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" + type() + "_" + identifier(); init(); } diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp index 98b21061e..975837bf8 100644 --- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp @@ -30,7 +30,7 @@ extern "C" { KDE_EXPORT void *init_kabc_ldapkio() { - KGlobal::locale()->insertCatalogue("kabc_ldapkio"); + TDEGlobal::locale()->insertCatalogue("kabc_ldapkio"); return new KRES::PluginFactory(); } } diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp index 5291303f5..b0704e393 100644 --- a/kabc/scripts/field.src.cpp +++ b/kabc/scripts/field.src.cpp @@ -428,7 +428,7 @@ void Field::deleteFields() void Field::saveFields( const TQString &identifier, const Field::List &fields ) { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); KConfigGroupSaver( cfg, "KABCFields" ); saveFields( cfg, identifier, fields ); @@ -458,7 +458,7 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier, Field::List Field::restoreFields( const TQString &identifier ) { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); KConfigGroupSaver( cfg, "KABCFields" ); return restoreFields( cfg, identifier ); diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 4b3c2f52b..ef6da69c1 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -422,11 +422,11 @@ TQTextCodec *KateDocumentConfig::codec () if (m_encodingSet || isGlobal()) { if (m_encoding.isEmpty() && isGlobal()) - return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding())); + return TDEGlobal::charsets()->codecForName (TQString::fromLatin1(TDEGlobal::locale()->encoding())); else if (m_encoding.isEmpty()) return s_global->codec (); else - return KGlobal::charsets()->codecForName (m_encoding); + return TDEGlobal::charsets()->codecForName (m_encoding); } return s_global->codec (); @@ -439,7 +439,7 @@ void KateDocumentConfig::setEncoding (const TQString &encoding) if (!enc.isEmpty()) { bool found = false; - TQTextCodec *codec = KGlobal::charsets()->codecForName (encoding, found); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName (encoding, found); if (!found || !codec) return; @@ -1127,12 +1127,12 @@ void KateRendererConfig::setSchemaInternal( int schema ) KConfig *config (KateFactory::self()->schemaManager()->schema(schema)); - TQColor tmp0 (KGlobalSettings::baseColor()); - TQColor tmp1 (KGlobalSettings::highlightColor()); - TQColor tmp2 (KGlobalSettings::alternateBackgroundColor()); + TQColor tmp0 (TDEGlobalSettings::baseColor()); + TQColor tmp1 (TDEGlobalSettings::highlightColor()); + TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor()); TQColor tmp3 ( "#FFFF99" ); TQColor tmp4 (tmp2.dark()); - TQColor tmp5 ( KGlobalSettings::textColor() ); + TQColor tmp5 ( TDEGlobalSettings::textColor() ); TQColor tmp6 ( "#EAE9E8" ); TQColor tmp7 ( "#000000" ); @@ -1170,7 +1170,7 @@ void KateRendererConfig::setSchemaInternal( int schema ) m_lineMarkerColor[index] = col; } - TQFont f (KGlobalSettings::fixedFont()); + TQFont f (TDEGlobalSettings::fixedFont()); if (!m_fontSet) { diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 5a5a73b70..1ae416264 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -999,7 +999,7 @@ void KateSaveConfigTab::apply() KateDocumentConfig::global()->setConfigFlags(configFlags); - KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : KGlobal::charsets()->encodingForName(m_encoding->currentText())); + KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : TDEGlobal::charsets()->encodingForName(m_encoding->currentText())); KateDocumentConfig::global()->setEol(m_eol->currentItem()); KateDocumentConfig::global()->setAllowEolDetection(allowEolDetection->isChecked()); @@ -1013,12 +1013,12 @@ void KateSaveConfigTab::reload() m_encoding->clear (); m_encoding->insertItem (i18n("TDE Default")); m_encoding->setCurrentItem(0); - TQStringList encodings (KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->descriptiveEncodingNames()); int insert = 1; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found); if (found) { @@ -1529,7 +1529,7 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data) void KateHlDownloadDialog::slotUser1() { - TQString destdir=KGlobal::dirs()->saveLocation("data","katepart/syntax/"); + TQString destdir=TDEGlobal::dirs()->saveLocation("data","katepart/syntax/"); for (TQListViewItem *it=list->firstChild();it;it=it->nextSibling()) { if (list->isSelected(it)) @@ -1640,16 +1640,16 @@ KateModOnHdPrompt::~KateModOnHdPrompt() void KateModOnHdPrompt::slotDiff() { - // Start a KProcess that creates a diff + // Start a TDEProcess that creates a diff KProcIO *p = new KProcIO(); - p->setComm( KProcess::All ); + p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << m_doc->url().path(); - connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) ); + connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); - p->start( KProcess::NotifyOnExit, true ); + p->start( TDEProcess::NotifyOnExit, true ); uint lastln = m_doc->numLines(); for ( uint l = 0; l < lastln; l++ ) @@ -1678,7 +1678,7 @@ void KateModOnHdPrompt::slotPRead( KProcIO *p) p->ackRead(); } -void KateModOnHdPrompt::slotPDone( KProcess *p ) +void KateModOnHdPrompt::slotPDone( TDEProcess *p ) { setCursor( ArrowCursor ); if( ! m_tmpfile ) diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index aa6f21f6d..169ffaffc 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -360,7 +360,7 @@ class KateHlDownloadDialog: public KDialogBase }; class KProcIO; -class KProcess; +class TDEProcess; /** * This dialog will prompt the user for what do with a file that is * modified on disk. @@ -394,7 +394,7 @@ class KateModOnHdPrompt : public KDialogBase private slots: void slotPRead(KProcIO*); ///< Read from the diff process - void slotPDone(KProcess*); ///< Runs the diff file when done + void slotPDone(TDEProcess*); ///< Runs the diff file when done private: KateDocument *m_doc; diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 603388479..b264e6533 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -1955,7 +1955,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig) void KateDocument::writeSessionConfig(KConfig *kconfig) { - if ( m_url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) + if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) return; // save url kconfig->writeEntry("URL", m_url.prettyURL() ); diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp index 89bfd0025..29955d7e2 100644 --- a/kate/part/katefont.cpp +++ b/kate/part/katefont.cpp @@ -68,10 +68,10 @@ int KateFontMetrics::width(TQChar c) // KateFontStruct::KateFontStruct() -: myFont(KGlobalSettings::fixedFont()), - myFontBold(KGlobalSettings::fixedFont()), - myFontItalic(KGlobalSettings::fixedFont()), - myFontBI(KGlobalSettings::fixedFont()), +: myFont(TDEGlobalSettings::fixedFont()), + myFontBold(TDEGlobalSettings::fixedFont()), + myFontItalic(TDEGlobalSettings::fixedFont()), + myFontBI(TDEGlobalSettings::fixedFont()), myFontMetrics(myFont), myFontMetricsBold(myFontBold), myFontMetricsItalic(myFontItalic), diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index d5eec4c27..ca1276a6b 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -2094,7 +2094,7 @@ bool KateHighlighting::isInWord( TQChar c, int attrib ) const bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const { - static const TQString& sq = KGlobal::staticQString("\"'"); + static const TQString& sq = TDEGlobal::staticQString("\"'"); return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1); } diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 58b4dd163..d33f26947 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -653,7 +653,7 @@ void KateJScriptManager::collectScripts (bool force) } // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -1028,7 +1028,7 @@ void KateIndentJScriptManager::collectScripts (bool force) #endif // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index dbc7d1fa4..178831f69 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -383,7 +383,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force) #endif // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index e9a74c50e..7f4481722 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -190,11 +190,11 @@ bool KatePrinter::print (KateDocument *doc) KUser u (KUser::UseRealUserID); tags["u"] = u.loginName(); - tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false); - tags["D"] = KGlobal::locale()->formatDateTime(dt, false, false); - tags["h"] = KGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); - tags["y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); - tags["Y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); + tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false); + tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false); + tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); + tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); + tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); tags["f"] = doc->url().fileName(); tags["U"] = doc->url().prettyURL(); if ( selectionOnly ) diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 1978c867c..bb3aa2866 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -209,7 +209,7 @@ KConfig *KateSchemaManager::schema (uint number) void KateSchemaManager::addSchema (const TQString &t) { m_config.setGroup (t); - m_config.writeEntry("Color Background", KGlobalSettings::baseColor()); + m_config.writeEntry("Color Background", TDEGlobalSettings::baseColor()); update (false); } @@ -419,12 +419,12 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) if ( ! m_schemas.contains( newSchema ) ) { // fallback defaults - TQColor tmp0 (KGlobalSettings::baseColor()); - TQColor tmp1 (KGlobalSettings::highlightColor()); - TQColor tmp2 (KGlobalSettings::alternateBackgroundColor()); + TQColor tmp0 (TDEGlobalSettings::baseColor()); + TQColor tmp1 (TDEGlobalSettings::highlightColor()); + TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor()); TQColor tmp3 ( "#FFFF99" ); TQColor tmp4 (tmp2.dark()); - TQColor tmp5 ( KGlobalSettings::textColor() ); + TQColor tmp5 ( TDEGlobalSettings::textColor() ); TQColor tmp6 ( "#EAE9E8" ); TQColor tmp7 ( "#000000" ); @@ -578,7 +578,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema ) m_schema = newSchema; - TQFont f (KGlobalSettings::fixedFont()); + TQFont f (TDEGlobalSettings::fixedFont()); m_fontchooser->disconnect ( this ); m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) ); @@ -635,11 +635,11 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema) // set colors TQPalette p ( m_defaultStyles->palette() ); - TQColor _c ( KGlobalSettings::baseColor() ); + TQColor _c ( TDEGlobalSettings::baseColor() ); p.setColor( TQColorGroup::Base, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Background", &_c ) ); - _c = KGlobalSettings::highlightColor(); + _c = TDEGlobalSettings::highlightColor(); p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Selection", &_c ) ); @@ -762,11 +762,11 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) // TODO this reads of the KConfig object, which should be changed when // the color tab is fixed. TQPalette p ( m_styles->palette() ); - TQColor _c ( KGlobalSettings::baseColor() ); + TQColor _c ( TDEGlobalSettings::baseColor() ); p.setColor( TQColorGroup::Base, KateFactory::self()->schemaManager()->schema(m_schema)-> readColorEntry( "Color Background", &_c ) ); - _c = KGlobalSettings::highlightColor(); + _c = TDEGlobalSettings::highlightColor(); p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(m_schema)-> readColorEntry( "Color Selection", &_c ) ); @@ -1066,7 +1066,7 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); // grap the bg color, selected color and default font - normalcol = KGlobalSettings::textColor(); + normalcol = TDEGlobalSettings::textColor(); bgcol = KateRendererConfig::global()->backgroundColor(); selcol = KateRendererConfig::global()->selectionColor(); docfont = *KateRendererConfig::global()->font(); diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 8e391b620..34f44bf66 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -346,7 +346,7 @@ void KateSyntaxDocument::setupModeList (bool force) } // Let's get a list of all the xml files for hl - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index ab4c2f54e..50f186c8c 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -709,8 +709,8 @@ void KateView::slotStatusMsg () uint r = cursorLine() + 1; uint c = cursorColumn() + 1; - TQString s1 = i18n(" Line: %1").arg(KGlobal::locale()->formatNumber(r, 0)); - TQString s2 = i18n(" Col: %1").arg(KGlobal::locale()->formatNumber(c, 0)); + TQString s1 = i18n(" Line: %1").arg(TDEGlobal::locale()->formatNumber(r, 0)); + TQString s2 = i18n(" Col: %1").arg(TDEGlobal::locale()->formatNumber(c, 0)); TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString (" "); TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM "); diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index f858ae908..a7a88b945 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -1175,7 +1175,7 @@ KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_vi void KateViewEncodingAction::slotAboutToShow() { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); popupMenu()->clear (); for (uint z=0; zinsertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z); bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(modes[z]), found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found); if (found && codecForEnc) { @@ -1195,8 +1195,8 @@ void KateViewEncodingAction::slotAboutToShow() void KateViewEncodingAction::setMode (int mode) { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); - doc->config()->setEncoding( KGlobal::charsets()->encodingForName( modes[mode] ) ); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); + doc->config()->setEncoding( TDEGlobal::charsets()->encodingForName( modes[mode] ) ); // now we don't want the encoding changed again unless the user does so using the menu. doc->setEncodingSticky( true ); doc->reloadFile(); diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 7f916c6e9..bea6ba3bc 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -2986,7 +2986,7 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) TQPoint p( e->pos() - dragInfo.start ); // we've left the drag square, we can start a real drag operation now - if( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) + if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) doDrag(); return; diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index da3d96da9..c996b216e 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -928,7 +928,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir); - // are blocking reads possible with KProcess? + // are blocking reads possible with TDEProcess? char pwd[PATH_MAX]; (void) getcwd( pwd, PATH_MAX ); chdir( TQFile::encodeName( m_baseDir ) ); diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index 7ae79d874..5b31c8166 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -775,7 +775,7 @@ void KCertPart::slotDone() { void KCertPart::slotLaunch() { KShellProcess p; p << "kcmshell" << "crypto"; -p.start(KProcess::DontCare); +p.start(TDEProcess::DontCare); } diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp index 7196c0e0a..2ef0ac781 100644 --- a/kcmshell/main.cpp +++ b/kcmshell/main.cpp @@ -211,7 +211,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); - KGlobal::locale()->setMainCatalogue("kcmshell"); + TDEGlobal::locale()->setMainCatalogue("kcmshell"); TDECmdLineArgs::init(_argc, _argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. @@ -221,7 +221,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) const TQCString lang = args->getOption("lang"); if( !lang.isNull() ) - KGlobal::locale()->setLanguage(lang); + TDEGlobal::locale()->setLanguage(lang); if (args->isSet("list")) { diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp index ac4fda768..15a963678 100644 --- a/kconf_update/kconf_update.cpp +++ b/kconf_update/kconf_update.cpp @@ -209,7 +209,7 @@ KonfUpdate::log() TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly) { TQStringList result; - TQStringList list = KGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true); for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index 958f38303..59ff8bc18 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -104,13 +104,13 @@ static TQString sycocaPath() if (bGlobalDatabase) { - path = KGlobal::dirs()->saveLocation("services")+"ksycoca"; + path = TDEGlobal::dirs()->saveLocation("services")+"ksycoca"; } else { TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - path = KGlobal::dirs()->saveLocation("cache")+"ksycoca"; + path = TDEGlobal::dirs()->saveLocation("cache")+"ksycoca"; else path = TQFile::decodeName(ksycoca_env); } @@ -122,7 +122,7 @@ static TQString oldSycocaPath() { TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - return KGlobal::dirs()->saveLocation("tmp")+"ksycoca"; + return TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca"; return TQString::null; } @@ -189,7 +189,7 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory) TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file); if (!timeStamp) { - timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true); + timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, file, true); } KSycocaEntry* entry = 0; if (g_allEntries) @@ -317,7 +317,7 @@ bool KBuildSycoca::build() TQStringList relFiles; - (void) KGlobal::dirs()->findAllResources( g_resource, + (void) TDEGlobal::dirs()->findAllResources( g_resource, TQString::null, true, // Recursive! true, // uniq @@ -417,7 +417,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile); if (!timeStamp) { - timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true); + timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true); } KServiceGroup* entry = 0; @@ -563,10 +563,10 @@ void KBuildSycoca::save() } (*m_str) << (TQ_INT32) 0; // No more factories. // Write TDEDIRS - (*m_str) << KGlobal::dirs()->kfsstnd_prefixes(); + (*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes(); (*m_str) << newTimestamp; - (*m_str) << KGlobal::locale()->language(); - (*m_str) << KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); + (*m_str) << TDEGlobal::locale()->language(); + (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); (*m_str) << (*g_allResourceDirs); // Write factory data.... @@ -673,7 +673,7 @@ TQStringList KBuildSycoca::existingResourceDirs() while( !resources.empty()) { TQString res = resources.front(); - *dirs += KGlobal::dirs()->resourceDirs( res.latin1()); + *dirs += TDEGlobal::dirs()->resourceDirs( res.latin1()); resources.remove( res ); // remove this 'res' and all its duplicates } @@ -767,8 +767,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KLocale::setMainCatalogue("tdelibs"); // force generating of KLocale object. if not, the database will get // be translated - KGlobal::locale(); - KGlobal::dirs()->addResourceType("app-reg", "share/application-registry" ); + TDEGlobal::locale(); + TDEGlobal::dirs()->addResourceType("app-reg", "share/application-registry" ); DCOPClient *dcopClient = new DCOPClient(); @@ -804,9 +804,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (incremental || !checkfiles) { KSycoca::self()->disableAutoRebuild(); // Prevent deadlock - TQString current_language = KGlobal::locale()->language(); + TQString current_language = TDEGlobal::locale()->language(); TQString ksycoca_language = KSycoca::self()->language(); - TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); + TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature(); if ((current_update_sig != ksycoca_update_sig) || @@ -914,9 +914,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { // These directories may have been created with 0700 permission // better delete them if they are empty - TQString applnkDir = KGlobal::dirs()->saveLocation("apps", TQString::null, false); + TQString applnkDir = TDEGlobal::dirs()->saveLocation("apps", TQString::null, false); ::rmdir(TQFile::encodeName(applnkDir)); - TQString servicetypesDir = KGlobal::dirs()->saveLocation("servicetypes", TQString::null, false); + TQString servicetypesDir = TDEGlobal::dirs()->saveLocation("servicetypes", TQString::null, false); ::rmdir(TQFile::encodeName(servicetypesDir)); } } diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp index 7c73fb226..5c1a38b4d 100644 --- a/kded/kde-menu.cpp +++ b/kded/kde-menu.cpp @@ -151,7 +151,7 @@ int main(int argc, char **argv) if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { tqWarning("Can't talk to klauncher!"); - command = KGlobal::dirs()->findExe(command); + command = TDEGlobal::dirs()->findExe(command); command += " " + args.join(" "); system(command.local8Bit()); } diff --git a/kded/kded.cpp b/kded/kded.cpp index 84db43b46..efbde0011 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -106,7 +106,7 @@ Kded::Kded(bool checkUpdates, bool new_startup) TQCString cPath; TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - cPath = TQFile::encodeName(KGlobal::dirs()->saveLocation("tmp")+"ksycoca"); + cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca"); else cPath = ksycoca_env; m_pTimer = new TQTimer(this); @@ -665,7 +665,7 @@ KUpdateD::KUpdateD() TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotNewUpdateFile())); - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kconf_update"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kconf_update"); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) diff --git a/kded/khostname.cpp b/kded/khostname.cpp index bd0980a2b..7e080378b 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -166,15 +166,15 @@ void KHostName::changeX() // don't nuke the xauth when XAUTHLOCALHOSTNAME points to it if (!xauthlocalhostname || oldNetId != xauthlocalhostname) { - cmd = "xauth -n remove "+KProcess::quote(netId); + cmd = "xauth -n remove "+TDEProcess::quote(netId); system(TQFile::encodeName(cmd)); } cmd = "xauth -n add "; - cmd += KProcess::quote(newNetId); + cmd += TDEProcess::quote(newNetId); cmd += " "; - cmd += KProcess::quote(authName); + cmd += TDEProcess::quote(authName); cmd += " "; - cmd += KProcess::quote(authKey); + cmd += TDEProcess::quote(authKey); system(TQFile::encodeName(cmd)); } } @@ -236,7 +236,7 @@ void KHostName::changeDcop() ::symlink(fname.data(), compatLink.data()); // Compatibility link // Update .ICEauthority - TQString cmd = "iceauth list "+KProcess::quote("netid="+oldNetId); + TQString cmd = "iceauth list "+TDEProcess::quote("netid="+oldNetId); FILE *iceFile = popen(TQFile::encodeName(cmd), "r"); if (!iceFile) { @@ -272,13 +272,13 @@ void KHostName::changeDcop() continue; cmd = "iceauth add "; - cmd += KProcess::quote(protName); + cmd += TDEProcess::quote(protName); cmd += " '' "; - cmd += KProcess::quote(newNetId); + cmd += TDEProcess::quote(newNetId); cmd += " "; - cmd += KProcess::quote(authName); + cmd += TDEProcess::quote(authName); cmd += " "; - cmd += KProcess::quote(authKey); + cmd += TDEProcess::quote(authKey); system(TQFile::encodeName(cmd)); } } @@ -288,7 +288,7 @@ void KHostName::changeDcop() char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname)) { - TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId); + TQString cmd = "iceauth remove "+TDEProcess::quote("netid="+oldNetId); system(TQFile::encodeName(cmd)); unlink(origFName.data()); origFName = DCOPClient::dcopServerFileOld(oldName); // Compatibility link @@ -299,8 +299,8 @@ void KHostName::changeDcop() void KHostName::changeStdDirs(const TQCString &type) { // We make links to the old dirs cause we can't delete the old dirs. - TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data())); - TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data())); + TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data())); + TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data())); KDE_struct_stat st_buf; diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index e147dcfaf..b00b3553d 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -441,10 +441,10 @@ VFolderMenu::absoluteDir(const TQString &_dir, const TQString &baseDir, bool kee if (TQDir::isRelativePath(dir) && !keepRelativeToCfg) { - dir = KGlobal::dirs()->findResource("xdgconf-menu", dir); + dir = TDEGlobal::dirs()->findResource("xdgconf-menu", dir); } - dir = KGlobal::dirs()->realPath(dir); + dir = TDEGlobal::dirs()->realPath(dir); return dir; } @@ -642,7 +642,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) else if( e.tagName() == "MergeDir") { TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir"), true); - TQStringList dirs = KGlobal::dirs()->findDirs("xdgconf-menu", dir); + TQStringList dirs = TDEGlobal::dirs()->findDirs("xdgconf-menu", dir); for(TQStringList::ConstIterator it=dirs.begin(); it != dirs.end(); ++it) { @@ -653,12 +653,12 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) if (!TQDir::isRelativePath(dir)) { // Absolute - fileList = KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false); + fileList = TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false); } else { // Relative - (void) KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList); + (void) TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList); } for(TQStringList::ConstIterator it=fileList.begin(); @@ -699,7 +699,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir) if (!baseDir.isEmpty()) { if (!TQDir::isRelativePath(baseDir)) - m_docInfo.baseDir = KGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir); + m_docInfo.baseDir = TDEGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir); else m_docInfo.baseDir = baseDir; } @@ -743,7 +743,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir m_docInfo.baseName = fileName.left( fileName.length() - 5 ); TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName); - TQStringList result = KGlobal::dirs()->findAllResources("xdgconf-menu", baseName); + TQStringList result = TDEGlobal::dirs()->findAllResources("xdgconf-menu", baseName); while( !result.isEmpty() && (result[0] != basePath)) result.remove(result.begin()); @@ -830,13 +830,13 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName) void VFolderMenu::initDirs() { - m_defaultDataDirs = TQStringList::split(':', KGlobal::dirs()->kfsstnd_prefixes()); + m_defaultDataDirs = TQStringList::split(':', TDEGlobal::dirs()->kfsstnd_prefixes()); TQString localDir = m_defaultDataDirs.first(); m_defaultDataDirs.remove(localDir); // Remove local dir - m_defaultAppDirs = KGlobal::dirs()->findDirs("xdgdata-apps", TQString::null); - m_defaultDirectoryDirs = KGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null); - m_defaultLegacyDirs = KGlobal::dirs()->resourceDirs("apps"); + m_defaultAppDirs = TDEGlobal::dirs()->findDirs("xdgdata-apps", TQString::null); + m_defaultDirectoryDirs = TDEGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null); + m_defaultLegacyDirs = TDEGlobal::dirs()->resourceDirs("apps"); } void @@ -1038,7 +1038,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl; TQRegExp files("\\.(desktop|kdelnk)$"); TQRegExp dirs("\\.directory$"); - (void) KGlobal::dirs()->findAllResources( "apps", + (void) TDEGlobal::dirs()->findAllResources( "apps", TQString::null, true, // Recursive! true, // uniq @@ -1629,7 +1629,7 @@ VFolderMenu::parseMenu(const TQString &file, bool forceLegacyLoad) m_legacyLoaded = false; m_appsInfo = 0; - TQStringList dirs = KGlobal::dirs()->resourceDirs("xdgconf-menu"); + TQStringList dirs = TDEGlobal::dirs()->resourceDirs("xdgconf-menu"); for(TQStringList::ConstIterator it=dirs.begin(); it != dirs.end(); ++it) { diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index 292c4de13..dda8fa324 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -42,9 +42,9 @@ TQString HelpProtocol::langLookup(const TQString& fname) TQStringList search; // assemble the local search paths - const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html") + KGlobal::dirs()->resourceDirs("html-bundle"); + const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle"); - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( "C" ); diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 577d0341d..1c47ec43f 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -100,7 +100,7 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kio_help"); TDEInstance ins("meinproc"); - KGlobal::locale(); + TDEGlobal::locale(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -171,7 +171,7 @@ int main(int argc, char **argv) { chdir( TQFile::encodeName( file.dirPath( true ) ) ); TQString cmd = exe; cmd += " --catalogs --valid --noout "; - cmd += KProcess::quote(file.fileName()); + cmd += TDEProcess::quote(file.fileName()); cmd += " 2>&1"; FILE *xmllint = popen( TQFile::encodeName( cmd ), "r"); char buf[ 512 ]; diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index fc125b5e2..6559a2b9e 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value ) TQColor c = pal.color( uicol->group, uicol->role ); #ifndef APPLE_CHANGES if ( uicol->configEntry ) { - KConfig *globalConfig = KGlobal::config(); + KConfig *globalConfig = TDEGlobal::config(); globalConfig->setGroup( uicol->configGroup ); c = globalConfig->readColorEntry( uicol->configEntry, &c ); } diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index b8d445900..674a3f3c6 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -77,11 +77,11 @@ using namespace khtml; SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name) : TQScrollView(parent,name), m_currentLine(-1), m_sourceFile(0), m_debugWin(debugWin), - m_font(KGlobalSettings::fixedFont()) + m_font(TDEGlobalSettings::fixedFont()) { verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height()); viewport()->setBackgroundMode(TQt::NoBackground); - m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small); + m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small); } SourceDisplay::~SourceDisplay() @@ -296,7 +296,7 @@ KJSErrorDialog::KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, b setMainWidget(page); TQLabel *iconLabel = new TQLabel("",page); - iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_critical", + iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_critical", KIcon::NoGroup,KIcon::SizeMedium, KIcon::DefaultState,0,true)); @@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_execsAlloc = 0; m_steppingDepth = 0; - m_stopIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small); + m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small); m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height()); TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true); m_emptyIcon.setMask(emptyMask); @@ -376,7 +376,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) // frame list & code TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget); TQSplitter *vsplitter = new TQSplitter(hsplitter); - TQFont font(KGlobalSettings::fixedFont()); + TQFont font(TDEGlobalSettings::fixedFont()); TQWidget *contextContainer = new TQWidget(vsplitter); diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index ee36ddd1b..426c68343 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -240,7 +240,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const case BrowserLanguage: case Language: case UserLanguage: - return String(KGlobal::locale()->language()); + return String(TDEGlobal::locale()->language()); case UserAgent: return String(userAgent); case Platform: diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index 8d96380ab..e557497e0 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -165,7 +165,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const KWinModule info(0, KWinModule::INFO_DESKTOP); #endif TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget(); - TQRect sg = KGlobalSettings::desktopGeometry(thisWidget); + TQRect sg = TDEGlobalSettings::desktopGeometry(thisWidget); switch( token ) { case Height: @@ -882,14 +882,14 @@ Value Window::get(ExecState *exec, const Identifier &p) const case ScreenX: { if (!part->view()) return Undefined(); - TQRect sg = KGlobalSettings::desktopGeometry(part->view()); + TQRect sg = TDEGlobalSettings::desktopGeometry(part->view()); return Number(part->view()->mapToGlobal(TQPoint(0,0)).x() + sg.x()); } case ScreenTop: case ScreenY: { if (!part->view()) return Undefined(); - TQRect sg = KGlobalSettings::desktopGeometry(part->view()); + TQRect sg = TDEGlobalSettings::desktopGeometry(part->view()); return Number(part->view()->mapToGlobal(TQPoint(0,0)).y() + sg.y()); } case ScrollX: { @@ -1504,7 +1504,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) return; } - TQRect sg = KGlobalSettings::desktopGeometry(tl); + TQRect sg = TDEGlobalSettings::desktopGeometry(tl); if ( width > sg.width() || height > sg.height() ) { kdDebug(6070) << "Window::resizeTo refused, window would be too big ("<= 0) { key = s.left(pos).stripWhiteSpace().lower(); val = s.mid(pos + 1).stripWhiteSpace().lower(); - TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget()); + TQRect screen = TDEGlobalSettings::desktopGeometry(widget->topLevelWidget()); if (key == "left" || key == "screenx") { winargs.x = (int)val.toFloat() + screen.x(); @@ -1951,7 +1951,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { TQWidget * tl = widget->topLevelWidget(); - TQRect sg = KGlobalSettings::desktopGeometry(tl); + TQRect sg = TDEGlobalSettings::desktopGeometry(tl); TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) ); // Security check (the spec talks about UniversalBrowserWrite to disable this check...) @@ -1971,7 +1971,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { TQWidget * tl = widget->topLevelWidget(); - TQRect sg = KGlobalSettings::desktopGeometry(tl); + TQRect sg = TDEGlobalSettings::desktopGeometry(tl); TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() ); // Security check (the spec talks about UniversalBrowserWrite to disable this check...) diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index b7ae2a8f4..7477679bc 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -238,7 +238,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) if(view && view->part()) enc = view->part()->encoding(); } - if((codec = KGlobal::charsets()->codecForName(enc.latin1()))) + if((codec = TDEGlobal::charsets()->codecForName(enc.latin1()))) break; } } @@ -305,8 +305,8 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) TQString val = static_cast(current)->value().string().stripWhiteSpace(); if (!val.isEmpty() && TQDir::isRelativePath(val) && - TQFile::exists(KGlobalSettings::documentPath() + val)) { - path.setPath(KGlobalSettings::documentPath() + val); + TQFile::exists(TDEGlobalSettings::documentPath() + val)) { + path.setPath(TDEGlobalSettings::documentPath() + val); } else { path = KURL::fromPathOrURL(val); } @@ -1609,8 +1609,8 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis TQString val = value().string(); if (!val.isEmpty() && TQDir::isRelativePath(val) && - TQFile::exists(KGlobalSettings::documentPath() + val)) { - fileurl.setPath(KGlobalSettings::documentPath() + val); + TQFile::exists(TDEGlobalSettings::documentPath() + val)) { + fileurl.setPath(TDEGlobalSettings::documentPath() + val); } else { fileurl = KURL::fromPathOrURL(val); } diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index 2329e2325..50e3ea69e 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -129,7 +129,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view) buffer = 0; scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; - charsets = KGlobal::charsets(); + charsets = TDEGlobal::charsets(); parser = new KHTMLParser(_view, _doc); m_executingScript = 0; m_autoCloseTimer = 0; @@ -144,7 +144,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl buffer = 0; scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; - charsets = KGlobal::charsets(); + charsets = TDEGlobal::charsets(); parser = new KHTMLParser( i, _doc ); m_executingScript = 0; m_autoCloseTimer = 0; diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index 48eb7b764..dbe80305e 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -46,20 +46,20 @@ private: bool processKilled; }; -KJavaProcess::KJavaProcess() : KProcess() +KJavaProcess::KJavaProcess() : TDEProcess() { d = new KJavaProcessPrivate; d->BufferList.setAutoDelete( true ); d->processKilled = false; - javaProcess = this; //new KProcess(); + javaProcess = this; //new TDEProcess(); - connect( javaProcess, TQT_SIGNAL( wroteStdin( KProcess * ) ), + connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), this, TQT_SLOT( slotWroteData() ) ); connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), this, TQT_SLOT( slotReceivedData(int, int&) ) ); - connect( javaProcess, TQT_SIGNAL( processExited (KProcess *) ), - this, TQT_SLOT( slotExited (KProcess *) ) ); + connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ), + this, TQT_SLOT( slotExited (TDEProcess *) ) ); d->jvmPath = "java"; d->mainClass = "-help"; @@ -303,11 +303,11 @@ bool KJavaProcess::invokeJVM() tqCopy( args.begin(), args.end(), TQTextOStreamIterator( stream, " " ) ); kdDebug(6100) << argStr << endl; - KProcess::Communication flags = (KProcess::Communication) - (KProcess::Stdin | KProcess::Stdout | - KProcess::NoRead); + TDEProcess::Communication flags = (TDEProcess::Communication) + (TDEProcess::Stdin | TDEProcess::Stdout | + TDEProcess::NoRead); - const bool rval = javaProcess->start( KProcess::NotifyOnExit, flags ); + const bool rval = javaProcess->start( TDEProcess::NotifyOnExit, flags ); if( rval ) javaProcess->resume(); //start processing stdout on the java process else @@ -382,7 +382,7 @@ void KJavaProcess::slotReceivedData( int fd, int& len ) len = num_bytes + num_bytes_msg; } -void KJavaProcess::slotExited( KProcess *process ) +void KJavaProcess::slotExited( TDEProcess *process ) { if (process == javaProcess) { int status = -1; diff --git a/khtml/java/kjavaprocess.h b/khtml/java/kjavaprocess.h index 280701233..4768bc382 100644 --- a/khtml/java/kjavaprocess.h +++ b/khtml/java/kjavaprocess.h @@ -39,7 +39,7 @@ */ class KJavaProcessPrivate; -class KJavaProcess : public KProcess //QObject +class KJavaProcess : public TDEProcess //QObject { Q_OBJECT @@ -64,7 +64,7 @@ public: /** * Returns the status of the java Process- true if it's ok, false if it has died. - * It calls KProcess::isRunning() + * It calls TDEProcess::isRunning() */ bool isRunning(); @@ -139,7 +139,7 @@ protected slots: /** * This slot is called when the Java Process exited. */ - void slotExited( KProcess *process ); + void slotExited( TDEProcess *process ); protected: virtual bool invokeJVM(); @@ -150,7 +150,7 @@ protected: void sendBuffer( TQByteArray* buff ); void storeSize( TQByteArray* buff ); - KProcess* javaProcess; + TDEProcess* javaProcess; signals: void received( const TQByteArray& ); diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 3f94dcd17..44c060b61 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -897,8 +897,8 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, downloadViaKIO = false; KURL cleanDest = destURL; cleanDest.setPass( TQString::null ); // don't put password into commandline - cmd += " " + KProcess::quote(url.url()) + " " + - KProcess::quote(cleanDest.url()); + cmd += " " + TDEProcess::quote(url.url()) + " " + + TDEProcess::quote(cleanDest.url()); kdDebug(1000) << "Calling command "< let's use a simple reference counting scheme diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index ffa1e0853..bf4566c86 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -300,13 +300,13 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) d->m_manualDetection = new KSelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); d->m_manualDetection->setItems( encodings ); d->m_manualDetection->setCurrentItem( -1 ); d->m_paSetEncoding->insert( d->m_manualDetection ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if ( config->hasGroup( "HTML Settings" ) ) { config->setGroup( "HTML Settings" ); khtml::Decoder::AutoDetectLanguage language; @@ -460,16 +460,16 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) // loadPlugins( partObject(), this, instance() ); // "khtml" catalog does not exist, our translations are in tdelibs. - // removing this catalog from KGlobal::locale() prevents problems + // removing this catalog from TDEGlobal::locale() prevents problems // with changing the language in applications at runtime -Thomas Reitelbach - KGlobal::locale()->removeCatalogue("khtml"); + TDEGlobal::locale()->removeCatalogue("khtml"); } KHTMLPart::~KHTMLPart() { //kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "HTML Settings" ); config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage ); @@ -1086,7 +1086,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() { if (!d->m_jsedlg) { d->m_jsedlg = new KJSErrorDlg; d->m_jsedlg->setURL(m_url.prettyURL()); - if (KGlobalSettings::showIconsOnPushButtons()) { + if (TDEGlobalSettings::showIconsOnPushButtons()) { d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase")); d->m_jsedlg->_close->setIconSet(SmallIconSet("fileclose")); } @@ -1757,7 +1757,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU TQString url, protocol, datetime; url = reqUrl.prettyURL(); protocol = reqUrl.protocol(); - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); TQString doc = TQString::fromLatin1( "" ); @@ -2500,7 +2500,7 @@ TQString KHTMLPart::defaultEncoding() const if ( url().protocol().startsWith( "http" ) ) return "iso-8859-1"; else - return KGlobal::locale()->encoding(); + return TDEGlobal::locale()->encoding(); } void KHTMLPart::setUserStyleSheet(const KURL &url) @@ -3800,7 +3800,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi else { float d = (float) buff.st_size/1024.0; - text = i18n("%2 (%1 K)").arg(KGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f + text = i18n("%2 (%1 K)").arg(TDEGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f } text += " "; text += com; @@ -4222,7 +4222,7 @@ void KHTMLPart::slotSetEncoding() d->m_paSetEncoding->popupMenu()->setItemChecked( 0, false ); d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), true ); - TQString enc = KGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() ); + TQString enc = TDEGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() ); setEncoding( enc, true ); } @@ -6390,7 +6390,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event ) if( d->m_bDnd && d->m_bMousePressed && ( (!d->m_strSelectedURL.isEmpty() && !isEditable()) || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) ) { - if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= KGlobalSettings::dndEventDelay() ) + if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= TDEGlobalSettings::dndEventDelay() ) return; TQPixmap pix; diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 431aec0ca..5c5db7341 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -292,7 +292,7 @@ void KHTMLSettings::init() KConfig global( "khtmlrc", true, false ); init( &global, true ); - KConfig *local = KGlobal::config(); + KConfig *local = TDEGlobal::config(); if ( !local ) return; @@ -369,8 +369,8 @@ void KHTMLSettings::init( KConfig * config, bool reset ) // Fonts and colors if( reset ) { d->defaultFonts = TQStringList(); - d->defaultFonts.append( config->readEntry( "StandardFont", KGlobalSettings::generalFont().family() ) ); - d->defaultFonts.append( config->readEntry( "FixedFont", KGlobalSettings::fixedFont().family() ) ); + d->defaultFonts.append( config->readEntry( "StandardFont", TDEGlobalSettings::generalFont().family() ) ); + d->defaultFonts.append( config->readEntry( "FixedFont", TDEGlobalSettings::fixedFont().family() ) ); d->defaultFonts.append( config->readEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) ); d->defaultFonts.append( config->readEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) ); d->defaultFonts.append( config->readEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) ); @@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled) { d->m_jsErrorsEnabled = enabled; // save it - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("HTML Settings"); config->writeEntry("ReportJSErrors", enabled); config->sync(); @@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) { d->m_jsPopupBlockerPassivePopup = enabled; // save it - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Java/JavaScript Settings"); config->writeEntry("PopupBlockerPassivePopup", enabled); config->sync(); diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 7782f1786..4cb4bb3f1 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -135,7 +135,7 @@ KHTMLImage::~KHTMLImage() bool KHTMLImage::openURL( const KURL &url ) { - static const TQString &html = KGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" ); + static const TQString &html = TDEGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" ); disposeImage(); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 14169e651..411d03f2e 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -975,13 +975,13 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) ); TQPainter p( &pixmap ); - icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); p.drawPixmap( 16, 0, icon ); - icon = KGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small ); p.drawPixmap( 0, 16, icon ); - icon = KGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small ); p.drawPixmap( 16, 32,icon ); - icon = KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ); p.drawPixmap( 32, 16, icon ); p.drawEllipse( 23, 23, 2, 2 ); @@ -994,7 +994,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) bool hasHorBar = visibleWidth() < contentsWidth(); bool hasVerBar = visibleHeight() < contentsHeight(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "HTML Settings" ); if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) { d->m_mouseScrollIndicator->show(); @@ -1269,7 +1269,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) { #ifdef Q_WS_X11 - TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", KIcon::Small, 0, KIcon::DefaultState, 0, true ); + TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", KIcon::Small, 0, KIcon::DefaultState, 0, true ); if (d->cursor_icon_widget) { const TQPixmap *pm = d->cursor_icon_widget->backgroundPixmap(); @@ -2839,7 +2839,7 @@ void KHTMLView::print(bool quick) int headerHeight = 0; TQFont headerFont("Sans Serif", 8); - TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true); + TQString headerLeft = TDEGlobal::locale()->formatDate(TQDate::currentDate(),true); TQString headerMid = docname; TQString headerRight; @@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20; void KHTMLView::scrollBy(int dx, int dy) { - KConfigGroup cfg( KGlobal::config(), "KDE" ); + KConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", false )) { TQScrollView::scrollBy( dx, dy ); return; diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index f227f4014..f75fa411d 100644 --- a/khtml/misc/decoder.cpp +++ b/khtml/misc/decoder.cpp @@ -97,7 +97,7 @@ void Decoder::setEncoding(const char *_encoding, EncodingType type) if(enc == "visual") // hebrew visually ordered enc = "iso8859-8"; bool b; - TQTextCodec *codec = KGlobal::charsets()->codecForName(enc, b); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(enc, b); if (!b) codec = 0; diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index 7b085aab9..b9400f229 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -194,7 +194,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte // Link or @charset if(!charset.isEmpty()) { - TQTextCodec* c = KGlobal::charsets()->codecForName(charset); + TQTextCodec* c = TDEGlobal::charsets()->codecForName(charset); if(c->mibEnum() == 11) { // iso8859-8 (visually ordered) c = TQTextCodec::codecForName("iso8859-8-i"); @@ -256,7 +256,7 @@ void CachedCSSStyleSheet::data( TQBuffer &buffer, bool eof ) // TQString charset = checkCharset( buffer.buffer() ); TQTextCodec* c = 0; if (!m_charset.isEmpty()) { - c = KGlobal::charsets()->codecForName(m_charset); + c = TDEGlobal::charsets()->codecForName(m_charset); if(c->mibEnum() == 11) c = TQTextCodec::codecForName("iso8859-8-i"); } else { @@ -469,7 +469,7 @@ static TQString buildAcceptHeader() CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*) : TQObject(), CachedObject(url, Image, _cachePolicy, 0) { - static const TQString &acceptHeader = KGlobal::staticQString( buildAcceptHeader() ); + static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() ); m = 0; p = 0; diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index a0ac7b732..81005de85 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -783,7 +783,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element) KURLRequester* w = new KURLRequester( view()->viewport(), "__khtml" ); w->setMode(KFile::File | KFile::ExistingOnly); - w->completionObject()->setDir(KGlobalSettings::documentPath()); + w->completionObject()->setDir(TDEGlobalSettings::documentPath()); connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 6d6823455..319f842e7 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -272,7 +272,7 @@ void RenderWidget::updateFromElement() if ( color.isValid() || backgroundColor.isValid() ) { TQPalette pal(TQApplication::palette(m_widget)); - int contrast_ = KGlobalSettings::contrast(); + int contrast_ = TDEGlobalSettings::contrast(); int highlightVal = 100 + (2*contrast_+4)*16/10; int lowlightVal = 100 + (2*contrast_+4)*10; diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 8db2c590a..62785e204 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -1131,7 +1131,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir); - // are blocking reads possible with KProcess? + // are blocking reads possible with TDEProcess? char pwd[PATH_MAX]; (void) getcwd( pwd, PATH_MAX ); chdir( TQFile::encodeName( m_baseDir ) ); diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index 257b656c2..ba5bf063f 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) void Dummy::doBenchmark() { - KConfigGroup settings(KGlobal::config(), "bench"); + KConfigGroup settings(TDEGlobal::config(), "bench"); results.clear(); TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 197ceee13..3a277ecf5 100644 --- a/khtml/xml/dom_docimpl.cpp +++ b/khtml/xml/dom_docimpl.cpp @@ -1127,7 +1127,7 @@ void DocumentImpl::recalcStyle( StyleChange change ) // ### make the font stuff _really_ work!!!! khtml::FontDef fontDef; - TQFont f = KGlobalSettings::generalFont(); + TQFont f = TDEGlobalSettings::generalFont(); fontDef.family = f.family(); fontDef.italic = f.italic(); fontDef.weight = f.weight(); diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index c7feb1752..4e8b6c784 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -49,14 +49,14 @@ AutoStart::AutoStart( bool new_startup ) { m_startList = new AutoStartList; m_startList->setAutoDelete(true); - KGlobal::dirs()->addResourceType("autostart", "share/autostart"); + TDEGlobal::dirs()->addResourceType("autostart", "share/autostart"); TQString xdgdirs = getenv("XDG_CONFIG_DIRS"); if (xdgdirs.isEmpty()) xdgdirs = "/etc/xdg"; TQStringList xdgdirslist = TQStringList::split( ':', xdgdirs ); for ( TQStringList::Iterator itr = xdgdirslist.begin(); itr != xdgdirslist.end(); ++itr ) { - KGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart"); + TDEGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart"); } } @@ -114,8 +114,8 @@ static bool startCondition(const TQString &condition) void AutoStart::loadAutoStartList() { - TQStringList files = KGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true); - TQStringList kdefiles = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true); + TQStringList files = TDEGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true); + TQStringList kdefiles = TDEGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true); files += kdefiles; for(TQStringList::ConstIterator it = files.begin(); @@ -143,7 +143,7 @@ AutoStart::loadAutoStartList() localit != files.end(); ++localit) { - if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localtdedir()) == true)) { + if (((*localit).startsWith(TDEGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(TDEGlobal::dirs()->localtdedir()) == true)) { // Same local file name? TQString localOuter; TQString localInner; diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp index 650a3e129..470e7faba 100644 --- a/kinit/kdostartupconfig.cpp +++ b/kinit/kdostartupconfig.cpp @@ -126,7 +126,7 @@ int main() } startupconfigfiles << line << endl; // use even currently non-existing paths in $TDEDIRS - TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, KGlobal::dirs()->kfsstnd_prefixes()); + TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, TDEGlobal::dirs()->kfsstnd_prefixes()); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 9bc6b7b1b..d7e7c7e1c 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -1759,8 +1759,8 @@ int main(int argc, char **argv, char **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 TDEInstance) - KGlobal::_instance = 0L; + // which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance) + TDEGlobal::_instance = 0L; // don't change envvars before tdeinit_initsetproctitle() unsetenv("LD_BIND_NOW"); unsetenv("DYLD_BIND_AT_LAUNCH"); diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 15a0882fe..3f5510ea0 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -396,7 +396,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data, } else if (fun == "reparseConfiguration()") { - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); kdDebug(7016) << "KLauncher::process : reparseConfiguration" << endl; KProtocolManager::reparseConfiguration(); IdleSlave *slave; diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index 44b8b496c..ab1cc398a 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -89,9 +89,9 @@ KBookmark KBookmarkGroup::next( const KBookmark & current ) const // firstElement() and lastElement() TQDomElement KBookmarkGroup::nextKnownTag( TQDomElement start, bool goNext ) const { - static const TQString & bookmark = KGlobal::staticQString("bookmark"); - static const TQString & folder = KGlobal::staticQString("folder"); - static const TQString & separator = KGlobal::staticQString("separator"); + static const TQString & bookmark = TDEGlobal::staticQString("bookmark"); + static const TQString & folder = TDEGlobal::staticQString("folder"); + static const TQString & separator = TDEGlobal::staticQString("separator"); for( TQDomNode n = start; !n.isNull(); ) { diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index 08c34061b..dc2ad0cde 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -223,8 +223,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) action->setDelayed( false ); // this flag doesn't have any UI yet - KGlobal::config()->setGroup( "Settings" ); - bool addEntriesBookmarkBar = KGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true); + TDEGlobal::config()->setGroup( "Settings" ); + bool addEntriesBookmarkBar = TDEGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true); KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(), m_actionCollection, false, addEntriesBookmarkBar, diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 96ce12896..9e6d711d2 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -311,7 +311,7 @@ void KBookmarkManager::convertAttribute( TQDomElement elem, const TQString & old void KBookmarkManager::importDesktopFiles() { KBookmarkImporter importer( const_cast<TQDomDocument *>(&internalDocument()) ); - TQString path(KGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true)); + TQString path(TDEGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true)); importer.import( path ); //kdDebug(7043) << internalDocument().toCString() << endl; @@ -613,23 +613,23 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser ) void KBookmarkManager::slotEditBookmarks() { - KProcess proc; + TDEProcess proc; proc << TQString::fromLatin1("keditbookmarks"); if (!dptr()->m_editorCaption.isNull()) proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption; if (!dptr()->m_browserEditor) proc << TQString::fromLatin1("--nobrowser"); proc << m_bookmarksFile; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address ) { - KProcess proc; + TDEProcess proc; proc << TQString::fromLatin1("keditbookmarks") << TQString::fromLatin1("--address") << address << m_bookmarksFile; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } /////// diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index 30513bbf3..1c762bfb9 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -60,7 +60,7 @@ public: // to accelators, replace them with two ampersands. serviceName.replace("&", "&&"); - TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, + TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); // make sure they are not larger than 16x16 @@ -164,7 +164,7 @@ KCustomMenuEditor::save(KConfigBase *cfg) { i++; TQString path = item->s->desktopEntryPath(); - if (TQDir::isRelativePath(path) || TQDir::isRelativePath(KGlobal::dirs()->relativeLocation("xdgdata-apps", path))) + if (TQDir::isRelativePath(path) || TQDir::isRelativePath(TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path))) path = item->s->desktopEntryName(); cfg->writePathEntry(TQString("Item%1").arg(i), path); item = (Item *) item->nextSibling(); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index f9e2d237c..0f2e9f4e1 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -812,7 +812,7 @@ bool KDirOperator::checkPreviewSupport() KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" )); bool hasPreviewSupport = false; - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs( kc, ConfigGroup ); if ( kc->readBoolEntry( "Show Default Preview", true ) ) hasPreviewSupport = checkPreviewInternal(); @@ -1385,7 +1385,7 @@ void KDirOperator::setupMenu(int whichActions) actionMenu->insert( mkdirAction ); if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); - KConfig *globalconfig = KGlobal::config(); + KConfig *globalconfig = TDEGlobal::config(); KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index 85bcf9187..e644f7b98 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -82,7 +82,7 @@ namespace KIO { * connect(op, TQT_SIGNAL(finishedLoading()), * TQT_SLOT(slotLoadingFinished())); * - * op->readConfig( KGlobal::config(), "Your KDiroperator ConfigGroup" ); + * op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" ); * op->setView(KFile::Default); * \endcode * @@ -400,7 +400,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * instantiation can make use of it already. * * Note that KDirOperator does NOT take ownership of that object (typically - * it's KGlobal::config() anyway. + * it's TDEGlobal::config() anyway. * * @see viewConfig * @see viewConfigGroup diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 4a3613b98..8f8a8b299 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -133,7 +133,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, if ( localOnly && !d->startURL.isLocalFile() ) { d->startURL = KURL(); - TQString docPath = KGlobalSettings::documentPath(); + TQString docPath = TDEGlobalSettings::documentPath(); if (TQDir(docPath).exists()) d->startURL.setPath( docPath ); else @@ -146,7 +146,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->branch = createBranch( root ); - readConfig( KGlobal::config(), "DirSelect Dialog" ); + readConfig( TDEGlobal::config(), "DirSelect Dialog" ); m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); @@ -314,7 +314,7 @@ void KDirSelectDialog::accept() KFileDialog::setStartDir( url() ); KDialogBase::accept(); - saveConfig( KGlobal::config(), "DirSelect Dialog" ); + saveConfig( TDEGlobal::config(), "DirSelect Dialog" ); } diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 86dfc756d..3ab42817b 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -79,8 +79,8 @@ void KDirSize::startNextJob( const KURL & url ) void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) { - static const TQString& dot = KGlobal::staticQString( "." ); - static const TQString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = TDEGlobal::staticQString( "." ); + static const TQString& dotdot = TDEGlobal::staticQString( ".." ); KIO::UDSEntryListConstIterator it = list.begin(); KIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 1e9d3a130..21338c058 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -46,11 +46,11 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) : TQObject(parent,name) { - dfProc = new KProcess(); TQ_CHECK_PTR(dfProc); + dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); - connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(KProcess *) ), + connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), this, TQT_SLOT(dfDone() ) ); readingDFStdErrOut=false; @@ -68,7 +68,7 @@ KDiskFreeSp::~KDiskFreeSp() /*************************************************************************** * is called, when the df-command writes on StdOut **/ -void KDiskFreeSp::receivedDFStdErrOut(KProcess *, char *data, int len) +void KDiskFreeSp::receivedDFStdErrOut(TDEProcess *, char *data, int len) { TQCString tmp(data,len+1); // adds a zero-byte dfStringErrOut.append(tmp); @@ -85,7 +85,7 @@ int KDiskFreeSp::readDF( const TQString & mountPoint ) dfStringErrOut=""; // yet no data received dfProc->clearArguments(); (*dfProc) << TQString::fromLocal8Bit(DF_COMMAND) << TQString::fromLocal8Bit(DF_ARGS); - if (!dfProc->start( KProcess::NotifyOnExit, KProcess::AllOutput )) + if (!dfProc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput )) kdError() << "could not execute ["<< DF_COMMAND << "]" << endl; return 1; } diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index b7286f2df..7b9fc6238 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -31,7 +31,7 @@ #include <tdelibs_export.h> -class KProcess; +class TDEProcess; /** * This class parses the output of "df" to find the disk usage @@ -72,11 +72,11 @@ signals: void done(); private slots: - void receivedDFStdErrOut(KProcess *, char *data, int len); + void receivedDFStdErrOut(TDEProcess *, char *data, int len); void dfDone(); private: - KProcess *dfProc; + TDEProcess *dfProc; TQCString dfStringErrOut; TQString m_mountPoint; bool readingDFStdErrOut; diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 396006504..183023cf5 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -54,14 +54,14 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin d->encoding->clear (); TQString sEncoding = encoding; if (sEncoding.isEmpty()) - sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + sEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); - TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found); if (found) { diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 823714396..1bc6f6257 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -234,7 +234,7 @@ void KFileDetailView::selected( TQListViewItem *item ) if ( !item ) return; - if ( KGlobalSettings::singleClick() ) { + if ( TDEGlobalSettings::singleClick() ) { const KFileItem *fi = ( (KFileListViewItem*)item )->fileInfo(); if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) ) sig->activate( fi ); @@ -671,7 +671,7 @@ void KFileListViewItem::init() KFileListViewItem::setPixmap( COL_NAME, inf->pixmap(KIcon::SizeSmall)); setText( COL_NAME, inf->text() ); - setText( COL_SIZE, KGlobal::locale()->formatNumber( inf->size(), 0)); + setText( COL_SIZE, TDEGlobal::locale()->formatNumber( inf->size(), 0)); setText( COL_DATE, inf->timeString() ); setText( COL_PERM, inf->permissionsString() ); setText( COL_OWNER, inf->user() ); diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 1decc462e..5e1634144 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -185,7 +185,7 @@ KFileDialog::~KFileDialog() { hide(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (d->urlBar) d->urlBar->save( config ); @@ -672,7 +672,7 @@ void KFileDialog::accept() locationEdit->insertItem( file, 1 ); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -751,7 +751,7 @@ void KFileDialog::multiSelectionChanged() return; } - static const TQString &begin = KGlobal::staticQString(" \""); + static const TQString &begin = TDEGlobal::staticQString(" \""); KFileItemListIterator it ( *list ); TQString text; while ( (item = it.current()) ) { @@ -857,7 +857,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge text ); KURL docPath; - docPath.setPath( KGlobalSettings::documentPath() ); + docPath.setPath( TDEGlobalSettings::documentPath() ); if ( (u.path(+1) != docPath.path(+1)) && TQDir(docPath.path(+1)).exists() ) { @@ -867,7 +867,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge text ); } - u.setPath( KGlobalSettings::desktopPath() ); + u.setPath( TDEGlobalSettings::desktopPath() ); text = i18n("Desktop: %1").arg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), @@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge initGUI(); // activate GM - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); readRecentFiles( config ); adjustSize(); @@ -1474,7 +1474,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const d->urlList.clear(); if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename - static const TQString &prot = KGlobal::staticQString(":/"); + static const TQString &prot = TDEGlobal::staticQString(":/"); KURL u; if ( d->filenames.find( prot ) != -1 ) u = d->filenames; @@ -1717,16 +1717,16 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) autoDirectoryFollowing = kc->readBoolEntry( AutoDirectoryFollowing, DefaultDirectoryFollowing ); - KGlobalSettings::Completion cm = (KGlobalSettings::Completion) + TDEGlobalSettings::Completion cm = (TDEGlobalSettings::Completion) kc->readNumEntry( PathComboCompletionMode, - KGlobalSettings::completionMode() ); - if ( cm != KGlobalSettings::completionMode() ) + TDEGlobalSettings::completionMode() ); + if ( cm != TDEGlobalSettings::completionMode() ) combo->setCompletionMode( cm ); - cm = (KGlobalSettings::Completion) + cm = (TDEGlobalSettings::Completion) kc->readNumEntry( LocationComboCompletionMode, - KGlobalSettings::completionMode() ); - if ( cm != KGlobalSettings::completionMode() ) + TDEGlobalSettings::completionMode() ); + if ( cm != TDEGlobalSettings::completionMode() ) locationEdit->setCompletionMode( cm ); // show or don't show the speedbar @@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel() ops->close(); KDialogBase::slotCancel(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -2332,7 +2332,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir, if ( useDefaultStartDir ) { if (lastDirectory->isEmpty()) { - lastDirectory->setPath(KGlobalSettings::documentPath()); + lastDirectory->setPath(TDEGlobalSettings::documentPath()); KURL home; home.setPath( TQDir::homeDirPath() ); // if there is no docpath set (== home dir), we prefer the current diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index 10b8285c1..a9882d56f 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -365,7 +365,7 @@ void KFileIconView::selected( TQIconViewItem *item ) if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 ) return; - if ( KGlobalSettings::singleClick() ) { + if ( TDEGlobalSettings::singleClick() ) { const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo(); if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) ) sig->activate( fi ); @@ -547,7 +547,7 @@ void KFileIconView::slotLargeRows() // setIconSize() all call arrangeItemsInGrid() :( Prevent this. d->noArrangement = true; // stop arrangeItemsInGrid()! - setGridX( KGlobal::iconLoader()->currentSize( KIcon::Desktop ) + 50 ); + setGridX( TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ) + 50 ); setItemTextPos( Bottom ); setArrangement( LeftToRight ); setWordWrapIconText( true ); diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index 0a2798ae6..e9b4c2673 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -45,7 +45,7 @@ class KFileSharePropsPlugin::Private { public: TQVBox *m_vBox; - KProcess *m_configProc; + TDEProcess *m_configProc; bool m_bAllShared; bool m_bAllUnshared; bool m_bAllReadOnly; @@ -86,7 +86,7 @@ bool KFileSharePropsPlugin::supports( const KFileItemList& items ) if ( !(*it)->isDir() || !isLocal ) return false; // And sharing the trash doesn't make sense - if ( isLocal && (*it)->url().path( 1 ) == KGlobalSettings::trashPath() ) + if ( isLocal && (*it)->url().path( 1 ) == TDEGlobalSettings::trashPath() ) return false; } return true; @@ -236,15 +236,15 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() { if (d->m_configProc) return; - d->m_configProc = new KProcess(this); + d->m_configProc = new TDEProcess(this); (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; - if (!d->m_configProc->start( KProcess::NotifyOnExit )) + if (!d->m_configProc->start( TDEProcess::NotifyOnExit )) { delete d->m_configProc; d->m_configProc = 0; return; } - connect(d->m_configProc, TQT_SIGNAL(processExited(KProcess *)), + connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotConfigureFileSharingDone())); m_pbConfig->setEnabled(false); } diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 154009625..9ab3b8ee5 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -35,24 +35,24 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) : KURLBar( true, parent, name ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults", true ); setIconSize(KIcon::SizeSmallMedium); - readConfig( KGlobal::config(), "KFileDialog Speedbar" ); + readConfig( TDEGlobal::config(), "KFileDialog Speedbar" ); if ( m_initializeSpeedbar ) { KURL u; - u.setPath( KGlobalSettings::desktopPath() ); + u.setPath( TDEGlobalSettings::desktopPath() ); insertItem( u, i18n("Desktop"), false ); //TODO: win32 - if ((KGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) && - TQDir(KGlobalSettings::documentPath()).exists()) + if ((TDEGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) && + TQDir(TDEGlobalSettings::documentPath()).exists()) { - u.setPath( KGlobalSettings::documentPath() ); + u.setPath( TDEGlobalSettings::documentPath() ); insertItem( u, i18n("Documents"), false, "folder_txt" ); } diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index 165801652..b32746aa6 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -171,7 +171,7 @@ void KFileView::sortReversed() #if 0 int KFileView::compareItems(const KFileItem *fi1, const KFileItem *fi2) const { - static const TQString &dirup = KGlobal::staticQString(".."); + static const TQString &dirup = TDEGlobal::staticQString(".."); bool bigger = true; bool keepFirst = false; bool dirsFirst = ((m_sorting & TQDir::DirsFirst) == TQDir::DirsFirst); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 3d0b6be8f..dfbf47d0d 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -241,7 +241,7 @@ KIconDialog::KIconDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Select Icon"), Ok|Cancel, Ok) { d = new KIconDialogPrivate; - mpLoader = KGlobal::iconLoader(); + mpLoader = TDEGlobal::iconLoader(); init(); } @@ -259,7 +259,7 @@ void KIconDialog::init() mGroupOrSize = KIcon::Desktop; mContext = KIcon::Any; mType = 0; - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); + mFileList = TDEGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); TQWidget *main = new TQWidget( this ); setMainWidget(main); @@ -660,7 +660,7 @@ class KIconButton::KIconButtonPrivate KIconButton::KIconButton(TQWidget *parent, const char *name) : TQPushButton(parent, name) { - init( KGlobal::iconLoader() ); + init( TDEGlobal::iconLoader() ); } KIconButton::KIconButton(KIconLoader *loader, diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index 2d9f7881a..c55acaf9e 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -35,7 +35,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) : KPreviewWidgetBase( parent ), m_job( 0L ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); autoMode = config->readBoolEntry( "Automatic Preview", true ); @@ -70,7 +70,7 @@ KImageFilePreview::~KImageFilePreview() if ( m_job ) m_job->kill(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); config->writeEntry( "Automatic Preview", autoPreview->isChecked() ); } diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index d82c4523b..c349693e5 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -250,7 +250,7 @@ bool KFileMetaPropsPlugin::supports( KFileItemList _items ) if (KExecPropsPlugin::supports(_items) || KURLPropsPlugin::supports(_items)) return false; // Having both is redundant. - bool metaDataEnabled = KGlobalSettings::showFilePreview(_items.first()->url()); + bool metaDataEnabled = TDEGlobalSettings::showFilePreview(_items.first()->url()); return _items.count() == 1 && metaDataEnabled; } diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index ebaadaa76..69d7be4e8 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -864,8 +864,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); TQStringList soundDirs = - KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; @@ -920,8 +920,8 @@ void KNotifyWidget::playSound() // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); - TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { TQDir dir; diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 1f758a01b..ef5d356fd 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -71,7 +71,7 @@ public: KNotifyDialog( TQWidget *parent = 0, const char *name = 0, bool modal = true, const TDEAboutData *aboutData = - KGlobal::instance()->aboutData() ); + TDEGlobal::instance()->aboutData() ); /** * Destroys the KNotifyDialog */ @@ -88,7 +88,7 @@ public: * @return The value of TQDialog::exec() */ static int configure( TQWidget *parent = 0, const char *name = 0, - const TDEAboutData *aboutData = KGlobal::instance()->aboutData() ); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData() ); /** * With this method, you can add the KNotify events of one eventsrc diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index c8623ced2..9a3fcabd1 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -171,7 +171,7 @@ bool TDEApplicationTree::isDirSel() static TQPixmap appIcon(const TQString &iconName) { - TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) { @@ -412,13 +412,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // init the history combo and insert it into the URL-Requester KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), - KGlobalSettings::completionMode()); - combo->setCompletionMode((KGlobalSettings::Completion)mode); + TDEGlobalSettings::completionMode()); + combo->setCompletionMode((TDEGlobalSettings::Completion)mode); TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); combo->setHistoryItems( list, true ); edit = new KURLRequester( combo, this ); @@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") @@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using @@ -813,7 +813,7 @@ void KOpenWithDlg::accept() if ( combo ) { combo->addToHistory( edit->url() ); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); kc->writeEntry(TQString::fromLatin1("CompletionMode"), diff --git a/kio/kfile/kpreviewprops.cpp b/kio/kfile/kpreviewprops.cpp index 9fd91cc7b..3672f4387 100644 --- a/kio/kfile/kpreviewprops.cpp +++ b/kio/kfile/kpreviewprops.cpp @@ -66,7 +66,7 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items ) { if ( _items.count() != 1) return false; - if( !KGlobalSettings::showFilePreview(_items.first()->url())) + if( !TDEGlobalSettings::showFilePreview(_items.first()->url())) return false; KMimeType::Ptr mt = KMimeType::findByURL( _items.first()->url() ); if ( mt->inherits("inode/directory") || mt->name() == "application/octet-stream" ) diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index a1076c134..94b95a2b6 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -885,7 +885,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) TQLabel *iconLabel = new TQLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); - iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); + iconLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; } grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); @@ -1041,7 +1041,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } @@ -1052,7 +1052,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } @@ -1063,7 +1063,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } } @@ -1139,7 +1139,7 @@ void KFilePropsPlugin::slotEditFileType() TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId()) - + " " + KProcess::quote(mime), + + " " + TDEProcess::quote(mime), keditfiletype, keditfiletype /*unused*/); #endif } @@ -1162,16 +1162,16 @@ void KFilePropsPlugin::determineRelativePath( const TQString & path ) TQStringList dirs; if (KBindingPropsPlugin::supports(properties->items())) { - m_sRelativePath =KGlobal::dirs()->relativeLocation("mime", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("mime", path); if (m_sRelativePath.startsWith("/")) m_sRelativePath = TQString::null; } else { - m_sRelativePath =KGlobal::dirs()->relativeLocation("apps", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("apps", path); if (m_sRelativePath.startsWith("/")) { - m_sRelativePath =KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); if (m_sRelativePath.startsWith("/")) m_sRelativePath = TQString::null; else @@ -1220,7 +1220,7 @@ void KFilePropsPlugin::slotDirSizeUpdate() KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs(); m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) - .arg(KGlobal::locale()->formatNumber(totalSize, 0)) + .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } @@ -1236,7 +1236,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs(); m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) - .arg(KGlobal::locale()->formatNumber(totalSize, 0)) + .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } @@ -1755,8 +1755,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++) kcom->addItem(TQString::fromLatin1(user->pw_name)); endpwent(); - usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto : - KGlobalSettings::CompletionNone); + usrEdit->setCompletionMode((i < maxEntries) ? TDEGlobalSettings::CompletionAuto : + TDEGlobalSettings::CompletionNone); usrEdit->setText(strOwner); gl->addWidget(usrEdit, 1, 1); connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ), @@ -1833,7 +1833,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr kcom->setItems(groupList); grpEdit->setCompletionObject(kcom, true); grpEdit->setAutoDeleteCompletionObject( true ); - grpEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); grpEdit->setText(strGroup); gl->addWidget(grpEdit, 2, 1); connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ), @@ -3402,11 +3402,11 @@ void KDesktopPropsPlugin::applyChanges() config.sync(); // KSycoca update needed? - TQString sycocaPath = KGlobal::dirs()->relativeLocation("apps", path); + TQString sycocaPath = TDEGlobal::dirs()->relativeLocation("apps", path); bool updateNeeded = !sycocaPath.startsWith("/"); if (!updateNeeded) { - sycocaPath = KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + sycocaPath = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); updateNeeded = !sycocaPath.startsWith("/"); } if (updateNeeded) @@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3499,7 +3499,7 @@ void KDesktopPropsPlugin::slotAdvanced() { w->suidEdit->setCompletionObject(kcom, true); w->suidEdit->setAutoDeleteCompletionObject( true ); - w->suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + w->suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); } else { @@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3773,7 +3773,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) { suidEdit->setCompletionObject(kcom, true); suidEdit->setAutoDeleteCompletionObject( true ); - suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); } else { diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 22b4cd477..609668373 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -34,7 +34,7 @@ static void recentdirs_done(KConfig *config) { - if (config == KGlobal::config()) + if (config == TDEGlobal::config()) { config->sync(); } @@ -57,14 +57,14 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re else { key = key.mid(1); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Recent Dirs")); } result=config->readPathListEntry(key); if (result.isEmpty()) { - result.append(KGlobalSettings::documentPath()); + result.append(TDEGlobalSettings::documentPath()); } return config; } diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index 7ad690be4..d91e7551f 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -79,14 +79,14 @@ void KRecentDocument::add(const KURL& url) void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) { - if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) + if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) return; TQString openStr = url.url(); openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded kdDebug(250) << "KRecentDocument::add for " << openStr << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString oldGrp = config->group(); config->setGroup(TQString::fromLatin1("RecentDocuments")); bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); @@ -169,7 +169,7 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index ee79b4e58..1d2cf1547 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -142,7 +142,7 @@ void KURLBarItem::setIcon( const TQString& icon, KIcon::Group group ) if ( icon.isEmpty() ) m_pixmap = KMimeType::pixmapForURL( m_url, 0, group, iconSize() ); else - m_pixmap = KGlobal::iconLoader()->loadIcon( icon, group, iconSize(), + m_pixmap = TDEGlobal::iconLoader()->loadIcon( icon, group, iconSize(), KIcon::DefaultState ); } @@ -585,7 +585,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup ) m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize ); if ( m_useGlobal ) { // read global items - KConfig *globalConfig = KGlobal::config(); + KConfig *globalConfig = TDEGlobal::config(); KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)")); int num = globalConfig->readNumEntry( "Number of Entries" ); for ( int i = 0; i < num; i++ ) { @@ -977,10 +977,10 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, if ( allowGlobal ) { TQString appName; - if ( KGlobal::instance()->aboutData() ) - appName = KGlobal::instance()->aboutData()->programName(); + if ( TDEGlobal::instance()->aboutData() ) + appName = TDEGlobal::instance()->aboutData()->programName(); if ( appName.isEmpty() ) - appName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); + appName = TQString::fromLatin1( TDEGlobal::instance()->instanceName() ); m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box ); m_appLocal->setChecked( appLocal ); TQWhatsThis::add( m_appLocal, diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 72c7cbd07..e01be4548 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -81,7 +81,7 @@ void KURLComboBox::init( Mode mode ) TQStringList KURLComboBox::urls() const { kdDebug(250) << "::urls()" << endl; - //static const TQString &fileProt = KGlobal::staticQString("file:"); + //static const TQString &fileProt = TDEGlobal::staticQString("file:"); TQStringList list; TQString url; for ( int i = defaultList.count(); i < count(); i++ ) { diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index e131bda3a..cf28557f8 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -66,7 +66,7 @@ void testFrame::showPath( const KURL &url ) { TQString fname = "TestBranch"; // url.fileName (); /* try a user icon */ - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); TQPixmap pix = loader->loadIcon( "contents2", KIcon::Small ); TQPixmap pixOpen = loader->loadIcon( "contents", KIcon::Small ); diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index f85995a61..b0ecabcc6 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) if (argv1 == TQString::fromLatin1("diroperator")) { KDirOperator *op = new KDirOperator(startDir, 0, "operator"); - op->setViewConfig( KGlobal::config(), "TestGroup" ); + op->setViewConfig( TDEGlobal::config(), "TestGroup" ); op->setView(KFile::Simple); op->show(); a.setMainWidget(op); diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 12eacab5d..3f16f565f 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -89,8 +89,8 @@ void DefaultProgress::init() #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS // Set a useful icon for this window! KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), @@ -470,7 +470,7 @@ void DefaultProgress::checkDestination(const KURL& dest) { bool ok = true; if ( dest.isLocalFile() ) { TQString path = dest.path( -1 ); - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" ); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs( "tmp" ); for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it ) if ( path.contains( *it ) ) ok = false; // it's in the tmp resource @@ -486,17 +486,17 @@ void DefaultProgress::checkDestination(const KURL& dest) { void DefaultProgress::slotOpenFile() { - KProcess proc; + TDEProcess proc; proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::slotOpenLocation() { - KProcess proc; + TDEProcess proc; d->location.setFileName(""); proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::virtual_hook( int id, void* data ) diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 1ad304a41..63ba82921 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -45,7 +45,7 @@ KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size ) { if ( size >= 1024 ) - return convertSize( size ) + " (" + i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(size, 0) ) + ")"; + return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")"; else return convertSize( size ); } @@ -59,26 +59,26 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size ) { fsize /= 1073741824.0; if ( fsize > 1024 ) // Tera-byte - s = i18n( "%1 TB" ).arg( KGlobal::locale()->formatNumber(fsize / 1024.0, 1)); + s = i18n( "%1 TB" ).arg( TDEGlobal::locale()->formatNumber(fsize / 1024.0, 1)); else - s = i18n( "%1 GB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 GB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Mega-byte else if ( size >= 1048576 ) { fsize /= 1048576.0; - s = i18n( "%1 MB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 MB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Kilo-byte else if ( size >= 1024 ) { fsize /= 1024.0; - s = i18n( "%1 KB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 KB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Just byte else if ( size > 0 ) { - s = i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(fsize, 0)); + s = i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(fsize, 0)); } // Nothing else @@ -117,7 +117,7 @@ KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds ) seconds = (seconds - (days * 86400) - (hours * 3600) - (mins * 60)); const TQTime time(hours, mins, seconds); - const TQString timeStr( KGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) ); + const TQString timeStr( TDEGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) ); if ( days > 0 ) return i18n("1 day %1", "%n days %1", days).arg(timeStr); else @@ -477,7 +477,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 url = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); ret << errorName; @@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT protocol = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); TQString errorName, techName, description; @@ -1666,7 +1666,7 @@ static TQString get_mount_info(const TQString& filename, gotDevice = true; if (stat_buf.st_dev == rootDevice) { - static const TQString &root = KGlobal::staticQString("/"); + static const TQString &root = TDEGlobal::staticQString("/"); isautofs = Wrong; isslow = Wrong; ismanual = Wrong; diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 69b363392..3bbb72432 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -298,7 +298,7 @@ void Job::showErrorDialog( TQWidget * parent ) // Show a message box, except for "user canceled" or "no content" if ( (m_error != ERR_USER_CANCELED) && (m_error != ERR_NO_CONTENT) ) { //old plain error message - //kdDebug(7007) << "Default language: " << KGlobal::locale()->defaultLanguage() << endl; + //kdDebug(7007) << "Default language: " << TDEGlobal::locale()->defaultLanguage() << endl; if ( 1 ) KMessageBox::queuedMessageBox( parent, KMessageBox::Error, errorString() ); #if 0 diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index 76cf7836b..17a220541 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -98,7 +98,7 @@ TQPixmap KDataToolInfo::icon() const return TQPixmap(); TQPixmap pix; - TQStringList lst = KGlobal::dirs()->resourceDirs("icon"); + TQStringList lst = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::ConstIterator it = lst.begin(); while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() ) it++; @@ -112,7 +112,7 @@ TQPixmap KDataToolInfo::miniIcon() const return TQPixmap(); TQPixmap pix; - TQStringList lst = KGlobal::dirs()->resourceDirs("mini"); + TQStringList lst = TDEGlobal::dirs()->resourceDirs("mini"); TQStringList::ConstIterator it = lst.begin(); while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() ) it++; diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 0641645a6..b6905b3a3 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -951,8 +951,8 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri delayedMimeTypes = delayedMimeTypes && kdl->d->delayedMimeTypes; // avoid creating these QStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = entries.begin(); KIO::UDSEntryListConstIterator end = entries.end(); @@ -1539,8 +1539,8 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) fileItems.insert( (*kit)->url().url(), *kit ); } - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KFileItem *item = 0, *tmp; @@ -1979,8 +1979,8 @@ void KDirLister::emitChanges() if ( d->changes == NONE ) return; - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); for ( KURL::List::Iterator it = d->lstDirs.begin(); it != d->lstDirs.end(); ++it ) @@ -2180,7 +2180,7 @@ bool KDirLister::matchesMimeFilter( const TQString& mime ) const bool KDirLister::matchesFilter( const KFileItem *item ) const { Q_ASSERT( item ); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); if ( item->text() == dotdot ) return false; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index 330e6cd39..580de16cc 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() delayRemove = false; m_ref = 0; - KConfigGroup config(KGlobal::config(), TQCString("DirWatch")); + KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); m_PollInterval = config.readNumEntry("PollInterval", 500); diff --git a/kio/kio/kfilefilter.cpp b/kio/kio/kfilefilter.cpp index 05c53c02c..c927804b5 100644 --- a/kio/kio/kfilefilter.cpp +++ b/kio/kio/kfilefilter.cpp @@ -79,8 +79,8 @@ void KSimpleFileFilter::setModeFilter( mode_t mode ) bool KSimpleFileFilter::passesFilter( const KFileItem *item ) const { - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); const TQString& name = item->name(); diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index cf903f712..50ee1a5d2 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -261,7 +261,7 @@ void KFileItem::readUDSEntry( bool _urlIsDirectory ) } // avoid creating these QStrings again and again - static const TQString& dot = KGlobal::staticQString("."); + static const TQString& dot = TDEGlobal::staticQString("."); if ( _urlIsDirectory && !UDS_URL_seen && !m_strName.isEmpty() && m_strName != dot ) m_url.addPath( m_strName ); } @@ -602,7 +602,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const if ( !m_pMimeType ) { static const TQString & defaultFolderIcon = - KGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); + TDEGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); if ( S_ISDIR( m_fileMode ) ) return DesktopIcon( defaultFolderIcon, _size, _state ); @@ -672,7 +672,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const // See if there is a system icon we can use TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon"); if (!sysIconName.isEmpty()) { - if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { p = DesktopIcon( sysIconName.ascii(), _size, _state ); } } @@ -688,7 +688,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const // Try loading this icon as fallback icon = libr_icon_geticon_byname(handle, entry->name); } - if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { iconresnamefound = 1; p = DesktopIcon( entry->name, _size, _state ); break; @@ -1137,7 +1137,7 @@ TQString KFileItem::timeString( unsigned int which ) const TQDateTime t; t.setTime_t( time_); - return KGlobal::locale()->formatDateTime( t ); + return TDEGlobal::locale()->formatDateTime( t ); } void KFileItem::setMetaInfo( const KFileMetaInfo & info ) @@ -1151,7 +1151,7 @@ const KFileMetaInfo & KFileItem::metaInfo(bool autoget, int) const KURL url = mostLocalURL(isLocalURL); if ( autoget && !m_metaInfo.isValid() && - KGlobalSettings::showFilePreview(url) ) + TDEGlobalSettings::showFilePreview(url) ) { m_metaInfo = KFileMetaInfo( url, mimetype() ); } diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index d04a22ca1..c345ef89e 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -1634,11 +1634,11 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle return KIO::convertSizeFromKB(value.toInt()); } else - s = KGlobal::locale()->formatNumber( value.toInt() , 0); + s = TDEGlobal::locale()->formatNumber( value.toInt() , 0); break; case TQVariant::LongLong : - s = KGlobal::locale()->formatNumber( value.toLongLong(), 0 ); + s = TDEGlobal::locale()->formatNumber( value.toLongLong(), 0 ); break; case TQVariant::ULongLong : @@ -1647,27 +1647,27 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle else if ( unit() == KFileMimeTypeInfo::KiloBytes ) return KIO::convertSizeFromKB( value.toULongLong() ); else - s = KGlobal::locale()->formatNumber( value.toULongLong(), 0 ); + s = TDEGlobal::locale()->formatNumber( value.toULongLong(), 0 ); break; case TQVariant::UInt : - s = KGlobal::locale()->formatNumber( value.toUInt() , 0); + s = TDEGlobal::locale()->formatNumber( value.toUInt() , 0); break; case TQVariant::Double : - s = KGlobal::locale()->formatNumber( value.toDouble(), 3); + s = TDEGlobal::locale()->formatNumber( value.toDouble(), 3); break; case TQVariant::Date : - s = KGlobal::locale()->formatDate( value.toDate(), true ); + s = TDEGlobal::locale()->formatDate( value.toDate(), true ); break; case TQVariant::Time : - s = KGlobal::locale()->formatTime( value.toTime(), true ); + s = TDEGlobal::locale()->formatTime( value.toTime(), true ); break; case TQVariant::DateTime : - s = KGlobal::locale()->formatDateTime( value.toDateTime(), + s = TDEGlobal::locale()->formatDateTime( value.toDateTime(), true, true ); break; diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index 1f6dca285..bf8cdca1d 100644 --- a/kio/kio/kfileshare.cpp +++ b/kio/kio/kfileshare.cpp @@ -181,7 +181,7 @@ void KFileShare::readShareList() } KProcIO proc; proc << exe; - if ( !proc.start( KProcess::Block ) ) { + if ( !proc.start( TDEProcess::Block ) ) { kdError() << "Can't run " << exe << endl; s_authorization = ErrorNotFound; return; @@ -264,11 +264,11 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw ) return false; // we want to share, so we kick it first - just to be sure - KProcess proc; + TDEProcess proc; proc << exe; proc << "--remove"; proc << path; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); proc.clearArguments(); proc << exe; @@ -279,7 +279,7 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw ) else proc << "--remove"; proc << path; - proc.start( KProcess::Block ); // should be ok, the perl script terminates fast + proc.start( TDEProcess::Block ); // should be ok, the perl script terminates fast bool ok = proc.normalExit() && (proc.exitStatus() == 0); kdDebug(7000) << "KFileSharePropsPlugin::setShared normalExit=" << proc.normalExit() << endl; diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index e2c4c1fa7..f639a7049 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -529,7 +529,7 @@ public: // The trick is that we also don't want the user to override globally set // directories. So we have to misuse KStandardDirs :} - TQStringList confDirs = KGlobal::dirs()->resourceDirs( "config" ); + TQStringList confDirs = TDEGlobal::dirs()->resourceDirs( "config" ); if ( !confDirs.isEmpty() ) { TQString globalConf = confDirs.last() + "kmimemagicrc"; @@ -2121,7 +2121,7 @@ KMimeMagic::KMimeMagic() TQString mimefile = locate( "mime", "magic" ); init( mimefile ); // Add snippets from share/config/magic/* - TQStringList snippets = KGlobal::dirs()->findAllResources( "config", "magic/*.magic", true ); + TQStringList snippets = TDEGlobal::dirs()->findAllResources( "config", "magic/*.magic", true ); for ( TQStringList::Iterator it = snippets.begin() ; it != snippets.end() ; ++it ) if ( !mergeConfig( *it ) ) kdWarning() << k_funcinfo << "Failed to parse " << *it << endl; diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index 09a45b5ea..37867cd23 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -204,7 +204,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, TQString fileName ( _url.fileName() ); - static const TQString& slash = KGlobal::staticQString("/"); + static const TQString& slash = TDEGlobal::staticQString("/"); if ( ! fileName.isNull() && !path.endsWith( slash ) ) { // Try to find it out by looking at the filename @@ -230,9 +230,9 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, } } - static const TQString& dotdesktop = KGlobal::staticQString(".desktop"); - static const TQString& dotkdelnk = KGlobal::staticQString(".kdelnk"); - static const TQString& dotdirectory = KGlobal::staticQString(".directory"); + static const TQString& dotdesktop = TDEGlobal::staticQString(".desktop"); + static const TQString& dotkdelnk = TDEGlobal::staticQString(".kdelnk"); + static const TQString& dotdirectory = TDEGlobal::staticQString(".directory"); // Another filename binding, hardcoded, is .desktop: if ( fileName.endsWith( dotdesktop ) ) @@ -453,7 +453,7 @@ KMimeType::~KMimeType() TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName=icon( TQString::null, false ); if (!iconLoader->extraDesktopThemesAdded()) { @@ -469,7 +469,7 @@ TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state, TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName=icon( _url, _url.isLocalFile() ); if (!iconLoader->extraDesktopThemesAdded()) { @@ -485,7 +485,7 @@ TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_si TQPixmap KMimeType::pixmapForURL( const KURL & _url, mode_t _mode, KIcon::Group _group, int _force_size, int _state, TQString * _path ) { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName = iconForURL( _url, _mode ); if (!iconLoader->extraDesktopThemesAdded()) @@ -504,7 +504,7 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode ) { const KMimeType::Ptr mt = findByURL( _url, _mode, _url.isLocalFile(), false /*HACK*/); - static const TQString& unknown = KGlobal::staticQString("unknown"); + static const TQString& unknown = TDEGlobal::staticQString("unknown"); const TQString mimeTypeIcon = mt->icon( _url, _url.isLocalFile() ); TQString i = mimeTypeIcon; @@ -533,7 +533,7 @@ TQString KMimeType::favIconForURL( const KURL& url ) static bool check = true; if ( check ) { check = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "HTML Settings" ); useFavIcons = config->readBoolEntry( "EnableFavicon", true ); } @@ -749,10 +749,10 @@ TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, KIcon::Group _group, int int _state, TQString * _path ) const { TQString _icon = icon( _url, _url.isLocalFile() ); - TQPixmap pix = KGlobal::iconLoader()->loadIcon( _icon, _group, + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( _icon, _group, _force_size, _state, _path, false ); if ( pix.isNull() ) - pix = KGlobal::iconLoader()->loadIcon( "unknown", _group, + pix = TDEGlobal::iconLoader()->loadIcon( "unknown", _group, _force_size, _state, _path, false ); return pix; } @@ -903,9 +903,9 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & ) if ( !TDEApplication::tdeinitExec("kfmclient", args, 0, &pid) ) return pid; - KProcess p; + TDEProcess p; p << "kfmclient" << args; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); return p.pid(); } @@ -1152,7 +1152,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT const TQString & KMimeType::defaultMimeType() { static const TQString & s_strDefaultMimeType = - KGlobal::staticQString( "application/octet-stream" ); + TDEGlobal::staticQString( "application/octet-stream" ); return s_strDefaultMimeType; } diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 78011e143..0cb010913 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -198,7 +198,7 @@ void KMimeTypeChooser::editMimeType() TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) - + " " + KProcess::quote(mt), + + " " + TDEProcess::quote(mt), keditfiletype, keditfiletype /*unused*/); } @@ -261,7 +261,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -280,7 +280,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -288,7 +288,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( KMimeTypeChooserDialog::~KMimeTypeChooserDialog() { - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); group.writeEntry("size", size()); } diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index a3d8e0302..252bdbfbd 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -189,7 +189,7 @@ KIO::CacheControl KProtocolManager::cacheControl() TQString KProtocolManager::cacheDir() { KConfig *cfg = http_config(); - return cfg->readPathEntry("CacheDir", KGlobal::dirs()->saveLocation("cache","http")); + return cfg->readPathEntry("CacheDir", TDEGlobal::dirs()->saveLocation("cache","http")); } int KProtocolManager::maxCacheAge() @@ -470,7 +470,7 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) } if( modifiers.contains('l') ) { - TQStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = TDEGlobal::locale()->languageList(); TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if( it != languageList.end() ) { diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index cbc72242e..2f6e9861a 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -184,7 +184,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, KURL::List lst; lst.append( u ); - static const TQString& app_str = KGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticQString("Application"); KService::Ptr offer = KServiceTypeProfile::preferredService( _mimetype, app_str ); @@ -476,8 +476,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List */ if (_service.terminal()) { - KConfigGroupSaver gs(KGlobal::config(), "General"); - TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole"); + KConfigGroupSaver gs(TDEGlobal::config(), "General"); + TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole"); if (terminal == "konsole") terminal += " -caption=%c %i %m"; terminal += " "; @@ -549,7 +549,7 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath ) return TQString(); } -static pid_t runCommandInternal( KProcess* proc, const KService* service, const TQString& binName, +static pid_t runCommandInternal( TDEProcess* proc, const KService* service, const TQString& binName, const TQString &execName, const TQString & iconName, TQWidget* window, TQCString asn ) { if (service && !service->desktopEntryPath().isEmpty() @@ -590,7 +590,7 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const data.setLaunchedBy( window->winId()); KStartupInfo::sendStartup( id, data ); } - pid_t pid = KProcessRunner::run( proc, binName, id ); + pid_t pid = TDEProcessRunner::run( proc, binName, id ); if( startup_notify && pid ) { KStartupInfoData data; @@ -602,7 +602,7 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const #else Q_UNUSED( execName ); Q_UNUSED( iconName ); - return KProcessRunner::run( proc, bin ); + return TDEProcessRunner::run( proc, bin ); #endif } @@ -681,9 +681,9 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls, { args = KRun::processDesktopExec(_service, _urls, false, tempFiles, suggestedFileName); } - kdDebug(7010) << "runTempService: KProcess args=" << args << endl; + kdDebug(7010) << "runTempService: TDEProcess args=" << args << endl; - KProcess * proc = new KProcess; + TDEProcess * proc = new TDEProcess; *proc << args; if (!_service.path().isEmpty()) @@ -856,7 +856,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS TQWidget* window, const TQCString& asn ) { kdDebug(7010) << "runCommand " << cmd << "," << execName << endl; - KProcess * proc = new KProcess; + TDEProcess * proc = new TDEProcess; proc->setUseShell(true); *proc << cmd; KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) ); @@ -1440,7 +1440,7 @@ void KRun::abort() void KRun::setEnableExternalBrowser(bool b) { if (b) - d->m_externalBrowser = KConfigGroup(KGlobal::config(), "General").readEntry("BrowserApplication"); + d->m_externalBrowser = KConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication"); else d->m_externalBrowser = TQString::null; } @@ -1477,27 +1477,27 @@ bool KRun::isExecutable( const TQString& serviceType ) /****************/ pid_t -KProcessRunner::run(KProcess * p, const TQString & binName) +TDEProcessRunner::run(TDEProcess * p, const TQString & binName) { - return (new KProcessRunner(p, binName))->pid(); + return (new TDEProcessRunner(p, binName))->pid(); } #ifdef Q_WS_X11 pid_t -KProcessRunner::run(KProcess * p, const TQString & binName, const KStartupInfoId& id ) +TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const KStartupInfoId& id ) { - return (new KProcessRunner(p, binName, id))->pid(); + return (new TDEProcessRunner(p, binName, id))->pid(); } #endif -KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName ) +TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName ) : TQObject(), process_(p), binName( _binName ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + process_, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1505,15 +1505,15 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName ) } #ifdef Q_WS_X11 -KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KStartupInfoId& id ) +TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const KStartupInfoId& id ) : TQObject(), process_(p), binName( _binName ), id_( id ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + process_, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1521,19 +1521,19 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KS } #endif -KProcessRunner::~KProcessRunner() +TDEProcessRunner::~TDEProcessRunner() { delete process_; } pid_t -KProcessRunner::pid() const +TDEProcessRunner::pid() const { return process_->pid(); } void -KProcessRunner::slotProcessExited(KProcess * p) +TDEProcessRunner::slotProcessExited(TDEProcess * p) { if (p != process_) return; // Eh ? diff --git a/kio/kio/krun.h b/kio/kio/krun.h index e6aa4d027..9e4bf8c44 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -30,7 +30,7 @@ #include <kurl.h> #include <kstartupinfo.h> -class KProcess; +class TDEProcess; class KService; namespace KIO { class Job; @@ -475,34 +475,34 @@ public: * It sends a notification when the process exits (for the taskbar) * and it will show an error message if necessary (e.g. "program not found"). */ -class KIO_EXPORT KProcessRunner : public TQObject +class KIO_EXPORT TDEProcessRunner : public TQObject { Q_OBJECT public: - static pid_t run(KProcess *, const TQString & binName); + static pid_t run(TDEProcess *, const TQString & binName); #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded - static pid_t run(KProcess *, const TQString & binName, const KStartupInfoId& id ); + static pid_t run(TDEProcess *, const TQString & binName, const KStartupInfoId& id ); #endif - virtual ~KProcessRunner(); + virtual ~TDEProcessRunner(); pid_t pid() const; protected slots: - void slotProcessExited(KProcess *); + void slotProcessExited(TDEProcess *); private: - KProcessRunner(KProcess *, const TQString & binName); + TDEProcessRunner(TDEProcess *, const TQString & binName); #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded - KProcessRunner(KProcess *, const TQString & binName, const KStartupInfoId& id ); + TDEProcessRunner(TDEProcess *, const TQString & binName, const KStartupInfoId& id ); #endif - KProcessRunner(); + TDEProcessRunner(); - KProcess * process_; + TDEProcess * process_; TQString binName; #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded KStartupInfoId id_; diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp index defeae4a7..ff5b9c104 100644 --- a/kio/kio/ksambashare.cpp +++ b/kio/kio/ksambashare.cpp @@ -151,7 +151,7 @@ bool KSambaSharePrivate::readSmbConf() { TQString name = completeLine.left(i).stripWhiteSpace().lower(); TQString value = completeLine.mid(i+1).stripWhiteSpace(); - if (name == KGlobal::staticQString("path")) { + if (name == TDEGlobal::staticQString("path")) { // Handle quotation marks if ( value[0] == '"' ) value.remove(0,1); diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index e3b4a4adb..9324f964d 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -310,7 +310,7 @@ KService::~KService() TQPixmap KService::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); if (!iconLoader->extraDesktopThemesAdded()) { TQPixmap pixmap=iconLoader->loadIcon( m_strIcon, _group, _force_size, _state, _path, true ); diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index c7e076eac..d1425e9eb 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -186,7 +186,7 @@ TQString KURIFilterData::iconName() if (service && service->icon() != TQString::fromLatin1( "unknown" )) { m_strIconName = service->icon(); } - else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { + else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { m_strIconName = exeName; } else { @@ -200,7 +200,7 @@ TQString KURIFilterData::iconName() if (service && service->icon() != TQString::fromLatin1( "unknown" )) { m_strIconName = service->icon(); } - else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { + else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { m_strIconName = exeName; } else { @@ -239,7 +239,7 @@ TQString KURIFilterData::iconName() // See if there is a system icon we can use TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon"); if (!sysIconName.isEmpty()) { - if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { m_strIconName = sysIconName; } } @@ -255,7 +255,7 @@ TQString KURIFilterData::iconName() // Try loading this icon as fallback icon = libr_icon_geticon_byname(handle, entry->name); } - if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { iconresnamefound = 1; m_strIconName = entry->name; break; diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 17caccb88..0443e0fce 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -519,7 +519,7 @@ void KURLCompletion::init() d->mode = KURLCompletion::FileCompletion; // Read settings - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); KConfigGroupSaver cgs( c, "URLCompletion" ); d->url_auto_completion = c->readBoolEntry("alwaysAutoComplete", true); @@ -736,10 +736,10 @@ bool KURLCompletion::isListedURL( int complType, */ bool KURLCompletion::isAutoCompletion() { - return completionMode() == KGlobalSettings::CompletionAuto - || completionMode() == KGlobalSettings::CompletionPopup - || completionMode() == KGlobalSettings::CompletionMan - || completionMode() == KGlobalSettings::CompletionPopupAuto; + return completionMode() == TDEGlobalSettings::CompletionAuto + || completionMode() == TDEGlobalSettings::CompletionPopup + || completionMode() == TDEGlobalSettings::CompletionMan + || completionMode() == TDEGlobalSettings::CompletionPopupAuto; } ////////////////////////////////////////////////// ////////////////////////////////////////////////// @@ -963,7 +963,7 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) if (url.url().length() == 1) { *match = - ( completionMode() == KGlobalSettings::CompletionMan )? "." : ".."; + ( completionMode() == TDEGlobalSettings::CompletionMan )? "." : ".."; return true; } if (url.url().length() == 2 && url.url()[1]=='.') @@ -1008,8 +1008,8 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) // Append '/' to directories in Popup mode? bool append_slash = ( d->popup_append_slash - && (completionMode() == KGlobalSettings::CompletionPopup || - completionMode() == KGlobalSettings::CompletionPopupAuto ) ); + && (completionMode() == TDEGlobalSettings::CompletionPopup || + completionMode() == TDEGlobalSettings::CompletionPopupAuto ) ); bool only_dir = ( d->mode == DirCompletion ); diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index b7ef68c76..fe07c3ad1 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -55,7 +55,7 @@ void KServiceTypeProfile::initStatic() KConfig config( "profilerc", true, false); - static const TQString & defaultGroup = KGlobal::staticQString("<default>"); + static const TQString & defaultGroup = TDEGlobal::staticQString("<default>"); TQStringList tmpList = config.groupList(); for (TQStringList::Iterator aIt = tmpList.begin(); @@ -243,7 +243,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const KServiceTypeProfile* KServiceTypeProfile::serviceTypeProfile( const TQString& _servicetype, const TQString& _genericServiceType ) { initStatic(); - static const TQString& app_str = KGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticQString("Application"); const TQString &_genservicetype = ((!_genericServiceType.isEmpty()) ? _genericServiceType : app_str); diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index e18666328..28d32d377 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -74,7 +74,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->nRow = 0; d->keepCheckBox = 0; - KConfig* cfg = KGlobal::config(); + KConfig* cfg = TDEGlobal::config(); KConfigGroupSaver saver( cfg, "Passwords" ); d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint()); @@ -82,7 +82,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 0: pixmap prompt TQLabel* lbl; - TQPixmap pix( KGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); + TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); if ( !pix.isNull() ) { lbl = new TQLabel( main ); @@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label) // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, label->font()); - TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget()); + TQRect d = TDEGlobalSettings::desktopGeometry(label->topLevelWidget()); pref_width = d.width() / 4; rt.setWidth(pref_width-10); diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 2249a1bfa..c266947f3 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -244,7 +244,7 @@ void PreviewJob::startPreview() } // Read configuration value for the maximum allowed size - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); KConfigGroupSaver cgs( config, "PreviewSettings" ); d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index 722f2874b..9eb7a2c73 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -253,14 +253,14 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, if ( ctimeDest != (time_t)-1 ) { TQDateTime dctime; dctime.setTime_t( ctimeDest ); - TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this ); + TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } if ( mtimeDest != (time_t)-1 ) { TQDateTime dmtime; dmtime.setTime_t( mtimeDest ); - TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this ); + TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } @@ -288,14 +288,14 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, if ( ctimeSrc != (time_t)-1 ) { TQDateTime dctime; dctime.setTime_t( ctimeSrc ); - TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this ); + TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } if ( mtimeSrc != (time_t)-1 ) { TQDateTime dmtime; dmtime.setTime_t( mtimeSrc ); - TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this ); + TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 8619c2dc4..d3c398fc4 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -252,7 +252,7 @@ void SessionData::configDataFor( MetaData &configData, const TQString &proto, if ( configData["Charsets"].isEmpty() ) configData["Charsets"] = d->charsets; if ( configData["CacheDir"].isEmpty() ) - configData["CacheDir"] = KGlobal::dirs()->saveLocation("cache", "http"); + configData["CacheDir"] = TDEGlobal::dirs()->saveLocation("cache", "http"); if ( configData["UserAgent"].isEmpty() ) { configData["UserAgent"] = KProtocolManager::defaultUserAgent(); @@ -269,10 +269,10 @@ void SessionData::reset() d->useCookie = cfg->readBoolEntry( "Cookies", true ); delete cfg; - static const TQString & english = KGlobal::staticQString( "en" ); + static const TQString & english = TDEGlobal::staticQString( "en" ); // Get language settings... - TQStringList languageList = KGlobal::locale()->languagesTwoAlpha(); + TQStringList languageList = TDEGlobal::locale()->languagesTwoAlpha(); TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if ( it != languageList.end() ) { diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index 29b8482fb..8306c8650 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -363,7 +363,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (!client->isAttached()) client->attach(); - TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); + TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName()); KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) { @@ -388,7 +388,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error // klauncher for a slave, because the slave might have that other uid // as well, which might either be a) undesired or b) make it impossible // for the slave to connect to the application. - // In such case we start the slave via KProcess. + // In such case we start the slave via TDEProcess. // It's possible to force this by setting the env. variable // TDE_FORK_SLAVES, Clearcase seems to require this. static bool bForkSlaves = !TQCString(getenv("TDE_FORK_SLAVES")).isEmpty(); @@ -411,12 +411,12 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error return 0; } - KProcess proc; + TDEProcess proc; proc << locate("exe", "kioslave") << lib_path << protocol << "" << socketfile.name(); kdDebug(7002) << "kioslave" << ", " << lib_path << ", " << protocol << ", " << TQString::null << ", " << socketfile.name() << endl; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); #ifndef Q_WS_WIN slave->setPID(proc.pid()); @@ -468,7 +468,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) if (!client->isAttached()) client->attach(); - TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); + TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName()); KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) return 0; diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index fe888c99c..9ce4a86a0 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -72,7 +72,7 @@ void SlaveConfigPrivate::readGlobalConfig() global.clear(); // Read stuff... KConfig *config = KProtocolManager::config(); - readConfig(KGlobal::config(), "Socks", &global); // Socks settings. + readConfig(TDEGlobal::config(), "Socks", &global); // Socks settings. if ( config ) readConfig(config, "<default>", &global); } diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 2a1494043..22c539a75 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -111,7 +111,7 @@ KIOExec::KIOExec() // Build the destination filename, in ~/.trinity/cache-*/krun/ // Unlike KDE-1.1, we put the filename at the end so that the extension is kept // (Some programs rely on it) - TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) + + TQString tmp = TDEGlobal::dirs()->saveLocation( "cache", "krun/" ) + TQString("%1.%2.%3").arg(getpid()).arg(jobCounter++).arg(fileName); fileInfo file; file.path = tmp; @@ -211,9 +211,9 @@ void KIOExec::slotRunApp() id.setupStartupEnv(); #endif - KProcess proc; + TDEProcess proc; proc << params; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); #ifdef Q_WS_X11 KStartupInfo::resetStartupEnv(); diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc index 511bd4021..3d51c1e85 100644 --- a/kio/kssl/ksslcertdlg.cc +++ b/kio/kssl/ksslcertdlg.cc @@ -60,7 +60,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) _certs = new TQListView(this); _certs->addColumn(i18n("Certificate")); _certs->setResizeMode(TQListView::LastColumn); - TQFontMetrics fm( KGlobalSettings::generalFont() ); + TQFontMetrics fm( TDEGlobalSettings::generalFont() ); _certs->setMinimumHeight(4*fm.height()); grid->addWidget(_certs); diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index 285bb1d2d..8e2192f7d 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -93,7 +93,7 @@ public: KSSLCertificate::KSSLCertificate() { d = new KSSLCertificatePrivate; d->m_stateCached = false; - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); #ifdef KSSL_HAVE_SSL d->m_cert = NULL; #endif @@ -103,7 +103,7 @@ KSSLCertificate::KSSLCertificate() { KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) { d = new KSSLCertificatePrivate; d->m_stateCached = false; - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); #ifdef KSSL_HAVE_SSL d->m_cert = NULL; setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert())); @@ -637,7 +637,7 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi return errors; } - TQStringList qsl = KGlobal::dirs()->resourceDirs("kssl"); + TQStringList qsl = TDEGlobal::dirs()->resourceDirs("kssl"); if (qsl.isEmpty()) { errors << KSSLCertificate::NoCARoot; diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index bc67d3e6e..c6f76a190 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -127,9 +127,9 @@ KSSLInfoDlg::~KSSLInfoDlg() { } void KSSLInfoDlg::launchConfig() { - KProcess p; + TDEProcess p; p << "kcmshell" << "crypto"; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); } diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc index 5e7eb3a77..a34773989 100644 --- a/kio/kssl/ksslkeygen.cc +++ b/kio/kssl/ksslkeygen.cc @@ -166,9 +166,9 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits // back from there. Yes it's inefficient, but it doesn't happen // often and this way things are uniform. - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); - TQString path = KGlobal::dirs()->saveLocation("kssl"); + TQString path = TDEGlobal::dirs()->saveLocation("kssl"); KTempFile csrFile(path + "csr_", ".der"); if (!csrFile.fstream()) { diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 5a77b12bf..26f6114a1 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -98,7 +98,7 @@ KSSLSettings::KSSLSettings(bool readConfig) { d = new KSSLSettingsPrivate; m_cfg = new KConfig("cryptodefaults", false, false); - if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) { + if (!TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) { //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl; } @@ -316,7 +316,7 @@ void KSSLSettings::save() { m_cfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); #endif diff --git a/kio/kssl/ksslutils.cc b/kio/kssl/ksslutils.cc index cf024347c..80651757f 100644 --- a/kio/kssl/ksslutils.cc +++ b/kio/kssl/ksslutils.cc @@ -73,7 +73,7 @@ TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm) { int gmt; TQDateTime qdt = ASN1_UTCTIME_QDateTime(tm, &gmt); - qstr = KGlobal::locale()->formatDateTime(qdt, false, true); + qstr = TDEGlobal::locale()->formatDateTime(qdt, false, true); if (gmt) { qstr += " "; qstr += i18n("GMT"); diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 7a84958f7..4f33d1389 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -54,7 +54,7 @@ namespace KPAC m_helper( new KProcIO ) { connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp index 6f419f5f5..19417b1fb 100644 --- a/kio/misc/kpac/downloader.cpp +++ b/kio/misc/kpac/downloader.cpp @@ -71,7 +71,7 @@ namespace KPAC if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() ) { bool dummy; - m_script = KGlobal::charsets()->codecForName( + m_script = TDEGlobal::charsets()->codecForName( job->queryMetaData( "charset" ), dummy )->toUnicode( m_data ); emit result( true ); } diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 760e654d7..40c52a1be 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -117,7 +117,7 @@ KSSLD::KSSLD(const TQCString &name) : KDEDModule(name) if (2 != cfg->readNumEntry("policies version", 0)) { ::updatePoliciesConfig(cfg); } - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); caVerifyUpdate(); cacheLoadDefaultPolicies(); certList.setAutoDelete(false); @@ -195,7 +195,7 @@ KSSLCNode *node; cfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "ksslpolicies")); if (!cfgName.isEmpty()) { ::chmod(TQFile::encodeName(cfgName), 0600); @@ -618,12 +618,12 @@ return false; /////////////////////////////////////////////////////////////////////////// void KSSLD::caVerifyUpdate() { - TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; + TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; if (!TQFile::exists(path)) return; cfg->setGroup(TQString::null); - TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); + TQ_UINT32 newStamp = TDEGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); if (oldStamp != newStamp) { @@ -634,7 +634,7 @@ void KSSLD::caVerifyUpdate() { } bool KSSLD::caRegenerate() { -TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; +TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; TQFile out(path); diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index a88f4e5b1..e87f96c31 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name) _idleTime = 0; connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); reconfigure(); - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(TDEApplication::dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), this, TQT_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "KWallet Directory Watcher"); - _dw->addDir(KGlobal::dirs()->saveLocation("kwallet")); + _dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet")); _dw->startScan(true); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); } @@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W int KWalletD::deleteWallet(const TQString& wallet) { - TQString path = KGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; if (TQFile::exists(path)) { close(wallet, true); @@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) { TQStringList KWalletD::wallets() const { - TQString path = KGlobal::dirs()->saveLocation("kwallet"); + TQString path = TDEGlobal::dirs()->saveLocation("kwallet"); TQDir dir(path, "*.kwl"); TQStringList rc; diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp index 1626f2ebc..79f050f51 100644 --- a/kio/tests/kdcopcheck.cpp +++ b/kio/tests/kdcopcheck.cpp @@ -44,7 +44,7 @@ TestService::TestService(const TQString &exec) this, TQT_SLOT(newApp(const TQCString&))); connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(KProcess *)), + connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(appExit())); TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h index 9a76e6246..593dbba1e 100644 --- a/kio/tests/kdcopcheck.h +++ b/kio/tests/kdcopcheck.h @@ -22,7 +22,7 @@ public slots: protected: int result; TQString m_exec; - KProcess proc; + TDEProcess proc; }; #endif diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp index 03bbbdac6..845f3367c 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -45,7 +45,7 @@ int main(int argc, char **argv) { assert( KProtocolInfo::showFilePreview( "file" ) == true ); assert( KProtocolInfo::showFilePreview( "audiocd" ) == false ); - assert( KGlobalSettings::showFilePreview( "audiocd:/" ) == false ); + assert( TDEGlobalSettings::showFilePreview( "audiocd:/" ) == false ); TQString proxy; TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.kde.org", proxy ); diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc index 4e3865837..9b906ffb5 100644 --- a/kioslave/file/file.cc +++ b/kioslave/file/file.cc @@ -114,7 +114,7 @@ int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_file" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); kdDebug(7101) << "Starting " << getpid() << endl; @@ -1406,24 +1406,24 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c if ( _dev.startsWith( "LABEL=" ) ) { // turn LABEL=foo into -L foo (#71430) TQString labelName = _dev.mid( 6 ); dev = "-L "; - dev += TQFile::encodeName( KProcess::quote( labelName ) ); // is it correct to assume same encoding as filesystem? + dev += TQFile::encodeName( TDEProcess::quote( labelName ) ); // is it correct to assume same encoding as filesystem? } else if ( _dev.startsWith( "UUID=" ) ) { // and UUID=bar into -U bar TQString uuidName = _dev.mid( 5 ); dev = "-U "; - dev += TQFile::encodeName( KProcess::quote( uuidName ) ); + dev += TQFile::encodeName( TDEProcess::quote( uuidName ) ); } else - dev = TQFile::encodeName( KProcess::quote(_dev) ); // get those ready to be given to a shell + dev = TQFile::encodeName( TDEProcess::quote(_dev) ); // get those ready to be given to a shell - TQCString point = TQFile::encodeName( KProcess::quote(_point) ); + TQCString point = TQFile::encodeName( TDEProcess::quote(_point) ); bool fstype_empty = !_fstype || !*_fstype; - TQCString fstype = KProcess::quote(_fstype).latin1(); // good guess + TQCString fstype = TDEProcess::quote(_fstype).latin1(); // good guess TQCString readonly = _ro ? "-r" : ""; TQString epath = TQString::fromLatin1(getenv("PATH")); TQString path = TQString::fromLatin1("/sbin:/bin"); if(!epath.isEmpty()) path += TQString::fromLatin1(":") + epath; - TQString mountProg = KGlobal::dirs()->findExe("mount", path); + TQString mountProg = TDEGlobal::dirs()->findExe("mount", path); if (mountProg.isEmpty()){ error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\"")); return; @@ -1572,7 +1572,7 @@ void FileProtocol::unmount( const TQString& _point ) */ ptr = strrchr( devname, '/' ); *ptr = '\0'; - TQCString qdevname(TQFile::encodeName(KProcess::quote(TQFile::decodeName(TQCString(devname)))).data()); + TQCString qdevname(TQFile::encodeName(TDEProcess::quote(TQFile::decodeName(TQCString(devname)))).data()); buffer.sprintf( "/usr/bin/eject %s 2>%s", qdevname.data(), tmp ); kdDebug(7101) << "VOLMGT: eject " << qdevname << endl; @@ -1607,13 +1607,13 @@ void FileProtocol::unmount( const TQString& _point ) TQString path = TQString::fromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; - TQString umountProg = KGlobal::dirs()->findExe("umount", path); + TQString umountProg = TDEGlobal::dirs()->findExe("umount", path); if (umountProg.isEmpty()) { error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\"")); return; } - buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(KProcess::quote(_point)).data(), tmp ); + buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(TDEProcess::quote(_point)).data(), tmp ); system( buffer.data() ); #endif /* HAVE_VOLMGT */ @@ -1661,14 +1661,14 @@ bool FileProtocol::pmount(const TQString &dev) TQString path = TQString::fromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; - TQString pmountProg = KGlobal::dirs()->findExe("pmount", path); + TQString pmountProg = TDEGlobal::dirs()->findExe("pmount", path); if (pmountProg.isEmpty()) return false; TQCString buffer; buffer.sprintf( "%s %s", TQFile::encodeName(pmountProg).data(), - TQFile::encodeName(KProcess::quote(dev)).data() ); + TQFile::encodeName(TDEProcess::quote(dev)).data() ); int res = system( buffer.data() ); @@ -1703,14 +1703,14 @@ bool FileProtocol::pumount(const TQString &point) TQString path = TQString::fromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; - TQString pumountProg = KGlobal::dirs()->findExe("pumount", path); + TQString pumountProg = TDEGlobal::dirs()->findExe("pumount", path); if (pumountProg.isEmpty()) return false; TQCString buffer; buffer.sprintf( "%s %s", TQFile::encodeName(pumountProg).data(), - TQFile::encodeName(KProcess::quote(dev)).data() ); + TQFile::encodeName(TDEProcess::quote(dev)).data() ); int res = system( buffer.data() ); diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc index 00fe94b2e..62ff5c59c 100644 --- a/kioslave/ftp/ftp.cc +++ b/kioslave/ftp/ftp.cc @@ -141,7 +141,7 @@ int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_ftp" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); kdDebug(7102) << "Starting " << getpid() << endl; diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index 8c732d823..f6e714988 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -100,7 +100,7 @@ int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_http" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); if (argc != 4) { @@ -5120,7 +5120,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy ) { //for sites like lib.homelinux.org TQTextCodec* oldCodec=TQTextCodec::codecForCStrings(); - if (KGlobal::locale()->language().contains("ru")) + if (TDEGlobal::locale()->language().contains("ru")) TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("CP1251")); p += 6; diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp index 4a140262e..554d221d5 100644 --- a/kioslave/http/http_cache_cleaner.cpp +++ b/kioslave/http/http_cache_cleaner.cpp @@ -220,7 +220,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (deleteAll) m_maxCacheSize = -1; - TQString strCacheDir = KGlobal::dirs()->saveLocation("cache", "http"); + TQString strCacheDir = TDEGlobal::dirs()->saveLocation("cache", "http"); TQDir cacheDir( strCacheDir ); if (!cacheDir.exists()) diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp index ca86e0a16..57a22f62c 100644 --- a/kioslave/http/kcookiejar/kcookiewin.cpp +++ b/kioslave/http/kcookiejar/kcookiewin.cpp @@ -357,7 +357,7 @@ void KCookieDetail::slotNextCookie() TQDateTime cookiedate; cookiedate.setTime_t( m_cookie->expireDate() ); if ( m_cookie->expireDate() ) - m_expires->setText( KGlobal::locale()->formatDateTime(cookiedate) ); + m_expires->setText( TDEGlobal::locale()->formatDateTime(cookiedate) ); else m_expires->setText( i18n("End of Session") ); TQString sec; diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 65433cfaa..79e319964 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -278,7 +278,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) case TQEvent::MouseMove: if (m_movingState==WaitingForMoveStart) { TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() ); - if( p.manhattanLength() > KGlobalSettings::dndEventDelay()) { + if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) { m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent)); m_dockManager->eventFilter(m_dragPanel,event); m_movingState=Moving; diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp index fe28fdff9..342fbdd9c 100644 --- a/kmdi/kmdichildarea.cpp +++ b/kmdi/kmdichildarea.cpp @@ -52,10 +52,10 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent ) m_captionFont = TQFont(); TQFontMetrics fm( m_captionFont ); m_captionFontLineSpacing = fm.lineSpacing(); - m_captionActiveBackColor = KGlobalSettings::activeTitleColor(); - m_captionActiveForeColor = KGlobalSettings::activeTextColor(); - m_captionInactiveBackColor = KGlobalSettings::inactiveTitleColor(); - m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor(); + m_captionActiveBackColor = TDEGlobalSettings::activeTitleColor(); + m_captionActiveForeColor = TDEGlobalSettings::activeTextColor(); + m_captionInactiveBackColor = TDEGlobalSettings::inactiveTitleColor(); + m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor(); m_pZ = new TQPtrList<KMdiChildFrm>; m_pZ->setAutoDelete( true ); setFocusPolicy( TQ_ClickFocus ); @@ -784,10 +784,10 @@ void KMdiChildArea::setMdiCaptionInactiveBackColor( const TQColor& clr ) void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeBG, TQColor& activeFG, TQColor& inactiveBG, TQColor& inactiveFG ) { - activeBG = KGlobalSettings::activeTitleColor(); - activeFG = KGlobalSettings::activeTextColor(); - inactiveBG = KGlobalSettings::inactiveTitleColor(); - inactiveFG = KGlobalSettings::inactiveTextColor(); + activeBG = TDEGlobalSettings::activeTitleColor(); + activeFG = TDEGlobalSettings::activeTextColor(); + inactiveBG = TDEGlobalSettings::inactiveTitleColor(); + inactiveFG = TDEGlobalSettings::inactiveTextColor(); } // kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h index 747919a4a..0a6076076 100644 --- a/kmdi/kmdichildarea.h +++ b/kmdi/kmdichildarea.h @@ -188,8 +188,8 @@ public: * This method is useful not only for KMDI child windows. * Colors are returned via activeBG, activeFG, inactiveBG, inactiveFG references. * - * @deprecated Use KGlobalSettings::activeTitleColor(), KGlobalSettings::activeTextColor(), - * KGlobalSettings::inactiveTitleColor() and KGlobalSettings::inactiveTextColor() instead. + * @deprecated Use TDEGlobalSettings::activeTitleColor(), TDEGlobalSettings::activeTextColor(), + * TDEGlobalSettings::inactiveTitleColor() and TDEGlobalSettings::inactiveTextColor() instead. */ static void getCaptionColors( const TQPalette &pal, TQColor &activeBG, TQColor &activeFG, TQColor &inactiveBG, TQColor &inactiveFG ) KDE_DEPRECATED; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index cf7053c51..7c3da3878 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -301,7 +301,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) if ( m_movingState == WaitingForMoveStart ) { TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() ); - if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) + if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) ); m_dockManager->eventFilter( m_dragPanel, event ); diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index e8e2bfb3f..6a54e3a78 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -88,7 +88,7 @@ class DateSortListViewItem : public KListViewItem if (col == 2) { TQString s; - TQDate date = KGlobal::locale()->readDate(text(col)); + TQDate date = TDEGlobal::locale()->readDate(text(col)); s.sprintf("%08d", date.year() * 366 + date.dayOfYear()); return s; } @@ -242,11 +242,11 @@ void DownloadDialog::addProvider(Provider *p) } else { - pix = KGlobal::iconLoader()->loadIcon(p->icon().path(), KIcon::Panel); + pix = TDEGlobal::iconLoader()->loadIcon(p->icon().path(), KIcon::Panel); ret = true; } } - if(!ret) pix = KGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); + if(!ret) pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); frame = addPage(p->name(), p->name(), pix); m_frame = frame; @@ -392,7 +392,7 @@ int DownloadDialog::installStatus(Entry *entry) TQString datestring; int installed; - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); kapp->config()->setGroup("KNewStuffStatus"); datestring = kapp->config()->readEntry(entry->name(lang)); @@ -415,11 +415,11 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) installed = installStatus(entry); - if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small); + if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small); else pix = TQPixmap(); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); if(variants.contains("score")) { @@ -436,7 +436,7 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) if(variants.contains("latest")) { KListViewItem *tmp_l = new DateSortListViewItem(lv_l, - entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); + entry->name(lang), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate())); tmp_l->setPixmap(0, pix); } @@ -470,7 +470,7 @@ void DownloadDialog::slotDetails() Entry *e = getEntry(); if(!e) return; - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); TQString info = i18n ( @@ -490,7 +490,7 @@ void DownloadDialog::slotDetails() ).arg(e->release() ).arg(e->rating() ).arg(e->downloads() - ).arg(KGlobal::locale()->formatDate(e->releaseDate()) + ).arg(TDEGlobal::locale()->formatDate(e->releaseDate()) ).arg(e->summary(lang) ); @@ -550,9 +550,9 @@ void DownloadDialog::install(Entry *e) kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate))); kapp->config()->sync(); - TQPixmap pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); if(m_entryitem) { @@ -640,12 +640,12 @@ void DownloadDialog::slotSelected() TQString tmp; bool enabled; Entry *e = getEntry(); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); bool ret; if(e) { - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); TQListViewItem *item; if(m_curtab != 0) @@ -685,7 +685,7 @@ void DownloadDialog::slotSelected() { desc += TQString("%1").arg(e->author()); } - desc += TQString("<br>%1").arg(KGlobal::locale()->formatDate(e->releaseDate())); + desc += TQString("<br>%1").arg(TDEGlobal::locale()->formatDate(e->releaseDate())); desc += TQString("<br><br>"); if(ret) { @@ -728,7 +728,7 @@ Entry *DownloadDialog::getEntry() TQString entryName = entryItem->text(0); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); for(Entry *e = m_entries.first(); e; e = m_entries.next()) if(e->name(lang) == entryName) diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h index 2c30ee9ba..1f879d938 100644 --- a/knewstuff/downloaddialog.h +++ b/knewstuff/downloaddialog.h @@ -112,7 +112,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase a previously set type. @param providerList the URl to the list of providers; if empty - we first try the ProvidersUrl from KGlobal::config, then we + we first try the ProvidersUrl from TDEGlobal::config, then we fall back to a hardcoded value. */ void load(TQString providerList); // KDE4: merge with load() above diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp index 55d60579c..56dd375f4 100644 --- a/knewstuff/entry.cpp +++ b/knewstuff/entry.cpp @@ -72,7 +72,7 @@ TQString Entry::name( const TQString &lang ) const if ( !d(this)->mNameMap[ lang ].isEmpty() ) return d(this)->mNameMap[ lang ]; else { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !d(this)->mNameMap[ *it ].isEmpty() ) return d(this)->mNameMap[ *it ]; } @@ -175,7 +175,7 @@ TQString Entry::summary( const TQString &lang ) const if ( !mSummaryMap[ lang ].isEmpty() ) return mSummaryMap[ lang ]; else { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mSummaryMap[ *it ].isEmpty() ) return mSummaryMap[ *it ]; } @@ -228,7 +228,7 @@ KURL Entry::payload( const TQString &lang ) const { KURL payload = mPayloadMap[ lang ]; if ( payload.isEmpty() ) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mPayloadMap[ *it ].isEmpty() ) return mPayloadMap[ *it ]; } @@ -251,7 +251,7 @@ KURL Entry::preview( const TQString &lang ) const { KURL preview = mPreviewMap[ lang ]; if ( preview.isEmpty() ) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mPreviewMap[ *it ].isEmpty() ) return mPreviewMap[ *it ]; } diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp index c572f347d..6bfbb3333 100644 --- a/knewstuff/knewstuff.cpp +++ b/knewstuff/knewstuff.cpp @@ -71,7 +71,7 @@ void KNewStuff::download() TQString KNewStuff::downloadDestination( Entry * ) { - return KGlobal::dirs()->saveLocation( "tmp" ) + + return TDEGlobal::dirs()->saveLocation( "tmp" ) + TDEApplication::randomString( 10 ); } diff --git a/knewstuff/knewstuffbutton.h b/knewstuff/knewstuffbutton.h index 6935ba653..bebd08297 100644 --- a/knewstuff/knewstuffbutton.h +++ b/knewstuff/knewstuffbutton.h @@ -46,7 +46,7 @@ class Button : public KPushButton * @param what text describing what is being downloaded. will be * shown on the button as "Download New <what>" * @param providerList the URL to the list of providers; if empty - * we first try the ProvidersUrl from KGlobal::config, then we + * we first try the ProvidersUrl from TDEGlobal::config, then we * fall back to a hardcoded value * @param resourceType the Hotstuff data type for this downlaod such * as "korganizer/calendar" diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index 8438e25ea..1e4e6ecc3 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -40,7 +40,7 @@ using namespace std; KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent ) : KNewStuff( type, parent ) { - mConfig = KGlobal::config(); + mConfig = TDEGlobal::config(); } KNewStuffGeneric::~KNewStuffGeneric() @@ -72,9 +72,9 @@ bool KNewStuffGeneric::install( const TQString &fileName ) for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { list2 << (*it).replace("%f", fileName); } - KProcess proc; + TDEProcess proc; proc << list2; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); } return true; diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index f68be7ae3..5010b5084 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result) emit installFinished(); } else { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->deleteGroup("KNewStuffStatus"); cfg->setGroup("KNewStuffStatus"); for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) @@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index 3c4018a13..b9dd24ed8 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -219,7 +219,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) mProviders.clear(); mJobData = ""; - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup("KNewStuff"); TQString providersUrl = providersList; diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 37e2a8daf..829e52d71 100644 --- a/knewstuff/provider.h +++ b/knewstuff/provider.h @@ -186,7 +186,7 @@ class KDE_EXPORT ProviderLoader : public TQObject * * @param type data type such as 'kdesktop/wallpaper'. * @param providerList the URl to the list of providers; if empty - * we first try the ProvidersUrl from KGlobal::config, then we + * we first try the ProvidersUrl from TDEGlobal::config, then we * fall back to a hardcoded value. */ void load( const TQString &type, const TQString &providerList = TQString::null ); diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp index 247c6d5bc..d9ad85a7c 100644 --- a/knewstuff/security.cpp +++ b/knewstuff/security.cpp @@ -57,9 +57,9 @@ void Security::readKeys() m_keys.clear(); KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; - connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (!readProcess->start(KProcess::NotifyOnExit, true)) + if (!readProcess->start(TDEProcess::NotifyOnExit, true)) KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>")); else m_gpgRunning = true; @@ -75,13 +75,13 @@ void Security::readSecretKeys() m_runMode = ListSecret; KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys"; - connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (readProcess->start(KProcess::NotifyOnExit, true)) + if (readProcess->start(TDEProcess::NotifyOnExit, true)) m_gpgRunning = true; } -void Security::slotProcessExited(KProcess *process) +void Security::slotProcessExited(TDEProcess *process) { switch (m_runMode) { @@ -248,9 +248,9 @@ void Security::slotCheckValidity() //verify the signature KProcIO *verifyProcess=new KProcIO(); *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName; - connect(verifyProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (verifyProcess->start(KProcess::NotifyOnExit,true)) + if (verifyProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else { @@ -328,10 +328,10 @@ void Security::slotSignFile() //verify the signature KProcIO *signProcess=new KProcIO(); *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName; - connect(signProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); m_runMode = Sign; - if (signProcess->start(KProcess::NotifyOnExit,true)) + if (signProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else { diff --git a/knewstuff/security.h b/knewstuff/security.h index 2831770e0..230821e7e 100644 --- a/knewstuff/security.h +++ b/knewstuff/security.h @@ -22,7 +22,7 @@ #include <tqobject.h> class KProcIO; -class KProcess; +class TDEProcess; struct KeyStruct { TQString id; @@ -120,7 +120,7 @@ private: TQString m_secretKey; /// the key used for signing private slots: - void slotProcessExited(KProcess *process); + void slotProcessExited(TDEProcess *process); void slotDataArrived(KProcIO *process); signals: diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp index a1de4c1d0..db8e255ff 100644 --- a/knewstuff/testnewstuff.cpp +++ b/knewstuff/testnewstuff.cpp @@ -54,9 +54,9 @@ bool TestNewStuff::install( const TQString &fileName ) bool TestNewStuff::createUploadFile( const TQString &fileName ) { - KProcess p; + TDEProcess p; p << "touch" << fileName; - p.start(KProcess::Block); + p.start(TDEProcess::Block); kdDebug() << "TestNewStuff::createUploadFile(): " << fileName << endl; return true; } diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp index cecc67e32..0a9ec85c0 100644 --- a/knewstuff/uploaddialog.cpp +++ b/knewstuff/uploaddialog.cpp @@ -94,7 +94,7 @@ UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) : topLayout->addWidget( languageLabel, 6, 0 ); mLanguageCombo = new TQComboBox( topPage ); topLayout->addWidget( mLanguageCombo, 6, 1 ); - mLanguageCombo->insertStringList( KGlobal::locale()->languageList() ); + mLanguageCombo->insertStringList( TDEGlobal::locale()->languageList() ); TQLabel *previewLabel = new TQLabel( i18n("Preview URL:"), topPage ); topLayout->addWidget( previewLabel, 7, 0 ); diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index 0500e0631..8bec0e790 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -399,9 +399,9 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam // the duplicated code) with shiny new KDownload class for 3.2 (pfeiffer) // Until the shiny new class comes about, send the suggestedFilename // along with the actual URL to download. (DA) - cmd += " " + KProcess::quote(url.url()); + cmd += " " + TDEProcess::quote(url.url()); if ( !suggestedFilename.isEmpty() ) - cmd +=" " + KProcess::quote(suggestedFilename); + cmd +=" " + TDEProcess::quote(suggestedFilename); kdDebug(1000) << "Calling command " << cmd << endl; // slave is already on hold (slotBrowserMimetype()) diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp index 9f7703ab6..9d8d73057 100644 --- a/kparts/dockmainwindow.cpp +++ b/kparts/dockmainwindow.cpp @@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp index c0c4cd086..ce963c23a 100644 --- a/kparts/mainwindow.cpp +++ b/kparts/mainwindow.cpp @@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -134,7 +134,7 @@ void MainWindow::createGUI( Part * part ) TQApplication::sendEvent( part, &ev ); if ( autoSaveSettings() ) - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } setUpdatesEnabled( true ); @@ -185,7 +185,7 @@ void MainWindow::createShellGUI( bool create ) void KParts::MainWindow::saveNewToolbarConfig() { createGUI( d->m_activePart ); - applyMainWindowSettings( KGlobal::config() ); + applyMainWindowSettings( TDEGlobal::config() ); } #include "mainwindow.moc" diff --git a/kparts/part.cpp b/kparts/part.cpp index d2efbeeac..68e9dbbf2 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -110,9 +110,9 @@ void PartBase::setInstance( TDEInstance *inst ) void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins ) { KXMLGUIClient::setInstance( inst ); - KGlobal::locale()->insertCatalogue( inst->instanceName() ); + TDEGlobal::locale()->insertCatalogue( inst->instanceName() ); // install 'instancename'data resource type - KGlobal::dirs()->addResourceType( inst->instanceName() + "data", + TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data", KStandardDirs::kde_default( "data" ) + TQString::fromLatin1( inst->instanceName() ) + '/' ); if ( bLoadPlugins ) diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 8d9ff1994..0f3bc347d 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -479,7 +479,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( d->m_activeWidget, &ev ); } } - // Set the new active instance in KGlobal + // Set the new active instance in TDEGlobal setActiveInstance( d->m_activePart ? d->m_activePart->instance() : 0L ); kdDebug(1000) << this << " emitting activePartChanged " << d->m_activePart << endl; @@ -489,7 +489,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) void PartManager::setActiveInstance( TDEInstance * instance ) { // It's a separate method to allow redefining this behavior - KGlobal::_activeInstance = instance; + TDEGlobal::_activeInstance = instance; } Part *PartManager::activePart() const diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index 1e5ca9008..b36d4dbc6 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -220,7 +220,7 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library ) void Plugin::setInstance( TDEInstance *instance ) { - KGlobal::locale()->insertCatalogue( instance->instanceName() ); + TDEGlobal::locale()->insertCatalogue( instance->instanceName() ); KXMLGUIClient::setInstance( instance ); } diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp index 3675781ea..4628e8ca7 100644 --- a/kparts/tests/example.cpp +++ b/kparts/tests/example.cpp @@ -63,7 +63,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp index 82c464a5a..913686bf9 100644 --- a/kparts/tests/normalktm.cpp +++ b/kparts/tests/normalktm.cpp @@ -61,7 +61,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } diff --git a/kspell2/settings.cpp b/kspell2/settings.cpp index 664ae24e0..dd54cf53f 100644 --- a/kspell2/settings.cpp +++ b/kspell2/settings.cpp @@ -207,7 +207,7 @@ void Settings::loadConfig() d->defaultClient = conf.readEntry( "defaultClient", TQString::null ); d->defaultLanguage = conf.readEntry( - "defaultLanguage", KGlobal::locale()->language() ); + "defaultLanguage", TDEGlobal::locale()->language() ); //same defaults are in the default filter (filter.cpp) d->checkUppercase = conf.readBoolEntry( diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp index 233fb7365..9de7f1bfd 100644 --- a/kstyles/highcontrast/config/highcontrastconfig.cpp +++ b/kstyles/highcontrast/config/highcontrastconfig.cpp @@ -44,7 +44,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( { // Should have no margins here, the dialog provides them TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); - KGlobal::locale()->insertCatalogue("kstyle_highcontrast_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_highcontrast_config"); wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this); @@ -62,7 +62,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( HighContrastStyleConfig::~HighContrastStyleConfig() { - KGlobal::locale()->removeCatalogue("kstyle_keramik_config"); + TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config"); } diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp index 7be529840..bd1deffb8 100644 --- a/kstyles/klegacy/klegacystyle.cpp +++ b/kstyles/klegacy/klegacystyle.cpp @@ -3040,7 +3040,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h TQString s(title); - static const TQString &modStr = KGlobal::staticQString( + static const TQString &modStr = TDEGlobal::staticQString( TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]")); int modStrPos = s.find(modStr); diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastikconf.cpp index 70d4f6cfa..338cdcd1e 100644 --- a/kstyles/plastik/config/plastikconf.cpp +++ b/kstyles/plastik/config/plastikconf.cpp @@ -41,7 +41,7 @@ extern "C" { KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) { - KGlobal::locale()->insertCatalogue("kstyle_plastik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config"); return new PlastikStyleConfig(parent); } } @@ -50,7 +50,7 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) { //Should have no margins here, the dialog provides them TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); - KGlobal::locale()->insertCatalogue("kstyle_plastik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config"); // scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this); animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp index e6ffce721..67e29f706 100644 --- a/kstyles/utils/installtheme/main.cpp +++ b/kstyles/utils/installtheme/main.cpp @@ -40,8 +40,8 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver); TDEApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? - KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); - TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc"); + TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); + TQStringList themercs = TDEGlobal::dirs()->findAllResources("themercs","*.themerc"); TQMap <TQString, TQString> themes; //Name->file mapping.. @@ -62,7 +62,7 @@ int main(int argc, char **argv) } } - KSimpleConfig cache( KGlobal::dirs()->saveLocation("config")+"kthemestylerc"); + KSimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc"); #if 0 //Doesn't seem to work with present Qt.. diff --git a/kunittest/runner.cpp b/kunittest/runner.cpp index 972a34276..e3a8830bb 100644 --- a/kunittest/runner.cpp +++ b/kunittest/runner.cpp @@ -58,7 +58,7 @@ namespace KUnitTest // Add the folder to the "module" resource such that the KLibLoader can // find the modules in this folder. - KGlobal::dirs()->addResourceDir("module", folder); + TDEGlobal::dirs()->addResourceDir("module", folder); kdDebug() << "Looking in folder: " << dir.absPath() << endl; // Get a list of all modules. diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp index 258a5d965..8df54f231 100644 --- a/kutils/kcmodulecontainer.cpp +++ b/kutils/kcmodulecontainer.cpp @@ -140,7 +140,7 @@ void KCModuleContainer::addModule( const TQString& module ) KCModuleProxy* proxy = new KCModuleProxy( module, false, d->tabWidget, module.latin1()); allModules.append( proxy ); - d->tabWidget->addTab( proxy, TQIconSet(KGlobal::iconLoader()->loadIcon( + d->tabWidget->addTab( proxy, TQIconSet(TDEGlobal::iconLoader()->loadIcon( proxy->moduleInfo().icon(), KIcon::Desktop)), /* QT eats ampersands for dinner. But not this time. */ proxy->moduleInfo().moduleName().replace( "&", "&&" )); diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 3528ae738..f034c9a5f 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -93,7 +93,7 @@ class KCModuleProxy::KCModuleProxyPrivate TQStringList args; KCModule *kcm; QXEmbed *embedWidget; - KProcess *rootProcess; + TDEProcess *rootProcess; TQVBox *embedFrame; KCModuleProxyIfaceImpl *dcopObject; DCOPClient *dcopClient; @@ -359,17 +359,17 @@ void KCModuleProxy::runAsRoot() if (!tdesu.isEmpty()) { - d->rootProcess = new KProcess; + d->rootProcess = new TDEProcess; *d->rootProcess << tdesu; *d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon()); *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell")) - .arg(cmd).arg(d->embedWidget->winId()).arg(KGlobal::locale()->language()); + .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); - connect(d->rootProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(rootExited())); + connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); - if ( !d->rootProcess->start( KProcess::NotifyOnExit )) + if ( !d->rootProcess->start( TDEProcess::NotifyOnExit )) { d->rootMode = false; rootExited(); diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h index 633652955..baf532e34 100644 --- a/kutils/kcmoduleproxy.h +++ b/kutils/kcmoduleproxy.h @@ -31,7 +31,7 @@ class TDEAboutData; class KCModule; class KCModuleInfo; class TDEInstance; -class KProcess; +class TDEProcess; /** * @ingroup kcmodule diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp index 58c196abc..511af866b 100644 --- a/kutils/kcmultidialog.cpp +++ b/kutils/kcmultidialog.cpp @@ -196,10 +196,10 @@ void KCMultiDialog::slotHelp() KURL url( KURL("help:/"), docPath ); if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { - KProcess process; + TDEProcess process; process << "khelpcenter" << url.url(); - process.start(KProcess::DontCare); + process.start(TDEProcess::DontCare); process.detach(); } else { new KRun(url); diff --git a/kutils/kplugininfo.cpp b/kutils/kplugininfo.cpp index 7b83be7ed..acdf57dc2 100644 --- a/kutils/kplugininfo.cpp +++ b/kutils/kplugininfo.cpp @@ -179,7 +179,7 @@ TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, KC TQValueList<KPluginInfo*> KPluginInfo::fromKPartsInstanceName( const TQString & name, KConfig * config, const TQString & group ) { - TQStringList files = KGlobal::dirs()->findAllResources( "data", name + + TQStringList files = TDEGlobal::dirs()->findAllResources( "data", name + "/kpartplugins/*.desktop", true, false ); return fromFiles( files, config, group ); } diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 3b6b4c39a..9dbf42c4a 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -575,7 +575,7 @@ static TQValueList<KPluginInfo*> kpartsPluginInfos( const TQString& instanceName if( instanceName.isNull() ) return TQValueList<KPluginInfo*>(); //nothing - const TQStringList desktopfilenames = KGlobal::dirs()->findAllResources( "data", + const TQStringList desktopfilenames = TDEGlobal::dirs()->findAllResources( "data", instanceName + "/kpartplugins/*.desktop", true, false ); return KPluginInfo::fromFiles( desktopfilenames ); } @@ -631,7 +631,7 @@ void KPluginSelector::addPlugins( const TQValueList<KPluginInfo*> & plugininfos, { checkNeedForTabWidget(); // the KConfigGroup becomes owned by KPluginSelectionWidget - KConfigGroup * cfgGroup = new KConfigGroup( config ? config : KGlobal::config(), "Plugins" ); + KConfigGroup * cfgGroup = new KConfigGroup( config ? config : TDEGlobal::config(), "Plugins" ); kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl; addPluginsInternal( plugininfos, catname, category, cfgGroup ); } diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h index f018d2f9e..87026154e 100644 --- a/kutils/kpluginselector.h +++ b/kutils/kpluginselector.h @@ -130,7 +130,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget * and all plugins are shown. * @param config The KConfig object that holds the state of the * plugins being enabled or not. By default it will - * use KGlobal::config(). It is recommended to + * use TDEGlobal::config(). It is recommended to * always pass a KConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox index f42c325eb..b9efd0dcb 100644 --- a/kutils/ksettings/README.dox +++ b/kutils/ksettings/README.dox @@ -77,7 +77,7 @@ MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args \endcode For the KConfig object you can either use -KGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). +TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). I added a method to KSettings::Dispatcher that gives you the KConfig object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName @@ -122,7 +122,7 @@ Some explanation for those keys: - X-TDE-ParentApp is the name of the application this config page belongs to. It is used by the first two \ref KSettings::Dialog constructors. The Dialog will use all modules that set X-TDE-ParentApp to - KGlobal::instance()->instanceName(). It + TDEGlobal::instance()->instanceName(). It should be pretty easy to find out what name that is: look at the first argument to the TDEAboutData ctor. - X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever) diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index 8fbe74c81..c64e2e64a 100644 --- a/kutils/ksettings/dialog.cpp +++ b/kutils/ksettings/dialog.cpp @@ -428,7 +428,7 @@ KCMultiDialog * Dialog::dialog() TQValueList<KService::Ptr> Dialog::instanceServices() const { kdDebug( 700 ) << k_funcinfo << endl; - TQString instanceName = KGlobal::instance()->instanceName(); + TQString instanceName = TDEGlobal::instance()->instanceName(); d->registeredComponents.append( instanceName ); kdDebug( 700 ) << "calling KServiceGroup::childGroup( " << instanceName << " )" << endl; @@ -533,8 +533,8 @@ void Dialog::createDialogFromServices() { // read .setdlg files TQString setdlgpath = locate( "appdata", - KGlobal::instance()->instanceName() + ".setdlg" ); - TQStringList setdlgaddon = KGlobal::dirs()->findAllResources( "appdata", + TDEGlobal::instance()->instanceName() + ".setdlg" ); + TQStringList setdlgaddon = TDEGlobal::dirs()->findAllResources( "appdata", "ksettingsdialog/*.setdlg" ); if( ! setdlgpath.isNull() ) parseGroupFile( setdlgpath ); diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h index 5a8afa510..cd9b539ef 100644 --- a/kutils/ksettings/dialog.h +++ b/kutils/ksettings/dialog.h @@ -95,7 +95,7 @@ class KUTILS_EXPORT Dialog : public TQObject /** * Construct a new Preferences Dialog for the application. It uses all - * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName(). + * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName(). * * @param parent The parent is only used as the parent for the * dialog - centering the dialog over the parent @@ -106,7 +106,7 @@ class KUTILS_EXPORT Dialog : public TQObject /** * Construct a new Preferences Dialog for the application. It uses all - * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName(). + * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName(). * * @param content Select whether you want a static or configurable * config dialog. diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h index 74c7756da..16cfbc572 100644 --- a/kutils/ksettings/pluginpage.h +++ b/kutils/ksettings/pluginpage.h @@ -44,8 +44,8 @@ namespace KSettings * MyAppPluginConfig( TQWidget * parent, const char *, const TQStringList & args ) * : PluginPage( MyAppPluginConfigFactory::instance(), parent, args ) * { - * pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" ); - * pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" ); + * pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" ); + * pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" ); * } * \endcode * diff --git a/kwallet/backend/kwalletbackend.cc b/kwallet/backend/kwalletbackend.cc index 59b7dda2e..cfc296a61 100644 --- a/kwallet/backend/kwalletbackend.cc +++ b/kwallet/backend/kwalletbackend.cc @@ -56,7 +56,7 @@ using namespace KWallet; static void initKWalletDir() { - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); } Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) { @@ -64,7 +64,7 @@ Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) { if (isPath) { _path = name; } else { - _path = KGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl"; + _path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl"; } _open = false; @@ -245,7 +245,7 @@ static int password2hash(const TQByteArray& password, TQByteArray& hash) { bool Backend::exists(const TQString& wallet) { initKWalletDir(); - TQString path = KGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl"; // Note: 60 bytes is presently the minimum size of a wallet file. // Anything smaller is junk. return TQFile::exists(path) && TQFileInfo(path).size() >= 60; diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc index f989f2beb..ad9fc54fb 100644 --- a/libkmid/deviceman.cc +++ b/libkmid/deviceman.cc @@ -109,7 +109,7 @@ DeviceManager::DeviceManager(int def) if (def==-1) { TDEInstance *tmp_instance=0L; - if (!KGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); + if (!TDEGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); KConfig *config = new KConfig("kcmmidirc", true); config->setGroup("Configuration"); diff --git a/libkmid/midfile.cc b/libkmid/midfile.cc index 0e804e4e3..4bf19f5b1 100644 --- a/libkmid/midfile.cc +++ b/libkmid/midfile.cc @@ -54,7 +54,7 @@ double metronomeTempoToTempo(ulong x) int uncompressFile(const char *gzname, char *tmpname) // Returns 0 if OK, 1 if error (tmpname not set) { - TQString cmd("gzip -dc " + KProcess::quote(gzname)); + TQString cmd("gzip -dc " + TDEProcess::quote(gzname)); FILE *infile = popen( TQFile::encodeName(cmd).data(), "r"); if (infile==NULL) { fprintf(stderr,"ERROR : popen failed : %s\n",TQFile::encodeName(cmd).data()); diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp index 75c2e72dd..4934a1658 100644 --- a/libkscreensaver/main.cpp +++ b/libkscreensaver/main.cpp @@ -101,8 +101,8 @@ KDE_EXPORT int main(int argc, char *argv[]) TDEApplication app; KCrash::setCrashHandler( crashHandler ); - KGlobal::locale()->insertCatalogue("klock"); - KGlobal::locale()->insertCatalogue("kscreensaver"); + TDEGlobal::locale()->insertCatalogue("klock"); + TDEGlobal::locale()->insertCatalogue("kscreensaver"); DemoWindow *demoWidget = 0; Window saveWin = 0; diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS index aad1c76e9..07b7d44ef 100644 --- a/tdecore/AUTHORS +++ b/tdecore/AUTHORS @@ -37,7 +37,7 @@ Michael Will <Michael.Will@student.uni-tuebingen.de> loading routine in KPixmap Christian Czezatke <e9025461@student.tuwien.ac.at> -KProcess class +TDEProcess class Matthias Ettrich <ettrich@kde.org> KWM, Changes to TDEApplication and KIconLoader diff --git a/tdecore/README.exec b/tdecore/README.exec index f2065b7ad..d47c808e9 100644 --- a/tdecore/README.exec +++ b/tdecore/README.exec @@ -7,9 +7,9 @@ you should or should not use them. 1. fork + exec You never want to use this unless you have a very good reason why it is -impossible to use KProcess. +impossible to use TDEProcess. -2. KProcess +2. TDEProcess You want to use this if you need to start a new process which needs to be a child of your process, e.g. because you want to catch stdout/stderr or need @@ -20,7 +20,7 @@ off with KProcIO 3. KProcIO -Like KProcess. Unlike KProcess, this class actually makes it easy to +Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to send data to and receive data from the process. 4. startServiceByDesktopPath diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo index 91d87329f..051b1fae6 100644 --- a/tdecore/README.kstartupinfo +++ b/tdecore/README.kstartupinfo @@ -30,7 +30,7 @@ ASNs which will stay too long until a timeout ). For improving the quality of ASN and reducing the number of ASNs that don't detect when the application has started, some .desktop file entries may be helpful ( see below ). If you want to start an application in your code, prefer using KRun or -TDEApplication::startServiceByXXX() calls. Classes like KProcess don't create +TDEApplication::startServiceByXXX() calls. Classes like TDEProcess don't create ASN, so if you need to use it, you have to send it manually ( only in case ASN is useful in this case, it shouldn't be sent e.g. for system processes ). diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp index 303403ef7..2add13022 100644 --- a/tdecore/kaboutdata.cpp +++ b/tdecore/kaboutdata.cpp @@ -274,7 +274,7 @@ TDEAboutData::translateInternalProgramName() const { delete[] d->mTranslatedProgramName; d->mTranslatedProgramName = 0; - if( KGlobal::locale() ) + if( TDEGlobal::locale() ) d->mTranslatedProgramName = tqstrdup( programName().utf8()); } diff --git a/tdecore/kaccel.h b/tdecore/kaccel.h index 7f24a5e73..a54c6bd2e 100644 --- a/tdecore/kaccel.h +++ b/tdecore/kaccel.h @@ -51,7 +51,7 @@ class KAccelPrivate; * has precedence over any KAccel objects created before it. * When a shortcut pressed, KAccel calls the slot to which it has been * connected. If you want to set global accelerators, independent of the window - * which has the focus, use KGlobalAccel. + * which has the focus, use TDEGlobalAccel. * * Reconfiguration of a given shortcut can be prevented by specifying * that an accelerator item is not configurable when it is inserted. A special @@ -84,7 +84,7 @@ class KAccelPrivate; * \endcode * * @short Configurable shortcut support for widgets. - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KAccelShortcutList * @see KKeyChooser * @see KKeyDialog @@ -281,7 +281,7 @@ class TDECORE_EXPORT KAccel : public TQAccel /** * Read all shortcuts from @p pConfig, or (if @p pConfig * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/tdecore/kaccelaction.cpp b/tdecore/kaccelaction.cpp index 856bbefdc..0dc320a84 100644 --- a/tdecore/kaccelaction.cpp +++ b/tdecore/kaccelaction.cpp @@ -203,8 +203,8 @@ bool KAccelAction::useFourModifierKeys() { if( KAccelAction::g_bUseFourModifierKeys == -1 ) { // Read in whether to use 4 modifier keys - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - bool b = KGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + bool b = TDEGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false ); KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey(); } return KAccelAction::g_bUseFourModifierKeys == 1; @@ -219,8 +219,8 @@ void KAccelAction::useFourModifierKeys( bool b ) if( b && !KKeyNative::keyboardHasWinKey() ) kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n"; } - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - KGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true); kdDebug(125) << "bUseFourModifierKeys = " << KAccelAction::g_bUseFourModifierKeys << endl; } @@ -507,7 +507,7 @@ bool KAccelActions::writeActions( const TQString &sGroup, KConfigBase* pConfig, { kdDebug(125) << "KAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); KConfigGroupSaver cs( pConfig, sGroup ); for( uint i = 0; i < m_nSize; i++ ) { diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h index 470c70559..4c7ac1840 100644 --- a/tdecore/kaccelaction.h +++ b/tdecore/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/tdecore/kaccelbase.cpp b/tdecore/kaccelbase.cpp index 4ba4c9c3b..cb21146d2 100644 --- a/tdecore/kaccelbase.cpp +++ b/tdecore/kaccelbase.cpp @@ -63,9 +63,9 @@ KAccelBase::~KAccelBase() uint KAccelBase::actionCount() const { return m_rgActions.count(); } KAccelActions& KAccelBase::actions() { return m_rgActions; } bool KAccelBase::isEnabled() const { return m_bEnabled; } -// see KGlobalAccel::blockShortcuts() stuff - it's to temporarily block +// see TDEGlobalAccel::blockShortcuts() stuff - it's to temporarily block // all global shortcuts, so that the key grabs are released, but from the app's -// point of view the KGlobalAccel is still enabled, so KGlobalAccel needs +// point of view the TDEGlobalAccel is still enabled, so TDEGlobalAccel needs // to disable key grabbing even if enabled bool KAccelBase::isEnabledInternal() const { return isEnabled(); } diff --git a/tdecore/kaccelbase.h b/tdecore/kaccelbase.h index 082f09324..03cad863a 100644 --- a/tdecore/kaccelbase.h +++ b/tdecore/kaccelbase.h @@ -200,7 +200,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp index e3ee63353..768a94fff 100644 --- a/tdecore/kappdcopiface.cpp +++ b/tdecore/kappdcopiface.cpp @@ -61,7 +61,7 @@ void KAppDCOPInterface::updateUserTimestamp( ulong time ) void KAppDCOPInterface::reparseConfiguration() { - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); } void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) { diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 62eb373e5..dfc3bb612 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -569,7 +569,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) // icon() cannot be null pixmap, it'll be the "unknown" icon - so check if there is this application icon static TQPixmap* ic = NULL; if( ic == NULL ) - ic = new TQPixmap( KGlobal::iconLoader()->loadIcon( iconName(), + ic = new TQPixmap( TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::NoGroup, 0, KIcon::DefaultState, NULL, true )); if( !ic->isNull()) { @@ -841,7 +841,7 @@ public: const char* message) const { TQTranslatorMessage res; - res.setTranslation(KGlobal::locale()->translateQt(context, sourceText, message)); + res.setTranslation(TDEGlobal::locale()->translateQt(context, sourceText, message)); return res; } }; @@ -861,9 +861,9 @@ void TDEApplication::init(bool GUIenabled) } } - KProcessController::ref(); + TDEProcessController::ref(); - (void) KClipboardSynchronizer::self(); + (void) TDEClipboardSynchronizer::self(); TQApplication::setDesktopSettingsAware( false ); @@ -912,9 +912,9 @@ void TDEApplication::init(bool GUIenabled) #endif // Trigger creation of locale. - (void) KGlobal::locale(); + (void) TDEGlobal::locale(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); d->actionRestrictions = config->hasGroup("KDE Action Restrictions" ) && !kde_kiosk_exception; // For brain-dead configurations where the user's local config file is not writable. // * We use kdialog to warn the user, so we better not generate warnings from @@ -945,7 +945,7 @@ void TDEApplication::init(bool GUIenabled) #endif { - TQStringList plugins = KGlobal::dirs()->resourceDirs( "qtplugins" ); + TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" ); TQStringList::Iterator it = plugins.begin(); while (it != plugins.end()) { addLibraryPath( *it ); @@ -977,7 +977,7 @@ void TDEApplication::init(bool GUIenabled) #ifdef Q_WS_MACX if (GUIenabled) { - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(), + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(), KIcon::NoGroup, KIcon::SizeLarge, KIcon::DefaultState, 0L, false ); if (!pixmap.isNull()) { TQImage i = pixmap.convertToImage().convertDepth(32).smoothScale(40, 40); @@ -1013,7 +1013,7 @@ void TDEApplication::init(bool GUIenabled) setReverseLayout( !rtl ); // install appdata resource type - KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") + TDEGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") + TQString::fromLatin1(name()) + '/'); pSessionConfig = 0L; bSessionManagement = true; @@ -1453,7 +1453,7 @@ void TDEApplication::startKdeinit() // Try to launch tdeinit. TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit")); if (srv.isEmpty()) - srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); + srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir()); if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) @@ -1476,8 +1476,8 @@ void TDEApplication::dcopFailure(const TQString &msg) if (failureCount == 2) { #ifdef Q_WS_WIN - KGlobal::config()->setGroup("General"); - if (KGlobal::config()->readBoolEntry("ignoreDCOPFailures", false)) + TDEGlobal::config()->setGroup("General"); + if (TDEGlobal::config()->readBoolEntry("ignoreDCOPFailures", false)) return; #endif TQString msgStr(i18n("There was an error setting up inter-process " @@ -1581,7 +1581,7 @@ void TDEApplication::parseCommandLine( ) if (args->isSet("style")) { - TQStringList plugins = KGlobal::dirs()->resourceDirs( "qtplugins" ); + TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" ); TQStringList::Iterator itp = plugins.begin(); while (itp != plugins.end()) { addLibraryPath( *itp ); @@ -1736,7 +1736,7 @@ TDEApplication::~TDEApplication() // First call the static deleters and then call KLibLoader::cleanup() // The static deleters may delete libraries for which they need KLibLoader. // KLibLoader will take care of the remaining ones. - KGlobal::deleteStaticDeleters(); + TDEGlobal::deleteStaticDeleters(); KLibLoader::cleanUp(); delete smw; @@ -1745,7 +1745,7 @@ TDEApplication::~TDEApplication() delete s_DCOPClient; s_DCOPClient = 0L; - KProcessController::deref(); + TDEProcessController::deref(); #ifdef Q_WS_X11 if ( d->oldXErrorHandler != NULL ) @@ -2123,24 +2123,24 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) switch (id) { case KIPC::StyleChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); kdisplaySetStyle(); break; case KIPC::ToolbarStyleChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); if (useStyles) emit toolbarAppearanceChanged(arg); break; case KIPC::PaletteChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); kdisplaySetPalette(); break; case KIPC::FontChanged: - KGlobal::config()->reparseConfiguration(); - KGlobalSettings::rereadFontSettings(); + TDEGlobal::config()->reparseConfiguration(); + TDEGlobalSettings::rereadFontSettings(); kdisplaySetFont(); break; @@ -2149,28 +2149,28 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) break; case KIPC::SettingsChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); if (arg == SETTINGS_PATHS) - KGlobalSettings::rereadPathSettings(); + TDEGlobalSettings::rereadPathSettings(); else if (arg == SETTINGS_MOUSE) - KGlobalSettings::rereadMouseSettings(); + TDEGlobalSettings::rereadMouseSettings(); propagateSettings((SettingsCategory)arg); break; case KIPC::IconChanged: TQPixmapCache::clear(); - KGlobal::config()->reparseConfiguration(); - KGlobal::instance()->newIconLoader(); + TDEGlobal::config()->reparseConfiguration(); + TDEGlobal::instance()->newIconLoader(); emit updateIconLoaders(); emit iconChanged(arg); break; case KIPC::ClipboardConfigChanged: - KClipboardSynchronizer::newConfiguration(arg); + TDEClipboardSynchronizer::newConfiguration(arg); break; case KIPC::BlockShortcuts: - KGlobalAccel::blockShortcuts(arg); + TDEGlobalAccel::blockShortcuts(arg); emit kipcMessage(id, arg); // some apps may do additional things break; } @@ -2276,7 +2276,7 @@ void TDEApplication::applyGUIStyle() { if ( !useStyles ) return; - KConfigGroup pConfig (KGlobal::config(), "General"); + KConfigGroup pConfig (TDEGlobal::config(), "General"); TQString defaultStyle = KStyle::defaultStyle(); TQString styleStr = pConfig.readEntry("widgetStyle", defaultStyle); @@ -2306,8 +2306,8 @@ TQString TDEApplication::caption() const return aCaption; else // We have some about data ? - if ( KGlobal::instance()->aboutData() ) - return KGlobal::instance()->aboutData()->programName(); + if ( TDEGlobal::instance()->aboutData() ) + return TDEGlobal::instance()->aboutData()->programName(); else // Last resort : application name return name(); @@ -2339,9 +2339,9 @@ TQString TDEApplication::makeStdCaption( const TQString &userCaption, TQPalette TDEApplication::createApplicationPalette() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "General" ); - return createApplicationPalette( config, KGlobalSettings::contrast() ); + return createApplicationPalette( config, TDEGlobalSettings::contrast() ); } TQPalette TDEApplication::createApplicationPalette( KConfig *config, int contrast_ ) @@ -2440,7 +2440,7 @@ void TDEApplication::kdisplaySetPalette() #ifdef Q_WS_MACX //Can I have this on other platforms, please!? --Sam { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "General" ); bool do_not_set_palette = FALSE; if(config->readBoolEntry("nopaletteChange", &do_not_set_palette)) @@ -2455,16 +2455,16 @@ void TDEApplication::kdisplaySetPalette() void TDEApplication::kdisplaySetFont() { - TQApplication::setFont(KGlobalSettings::generalFont(), true); - TQApplication::setFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); - TQApplication::setFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); - TQApplication::setFont(KGlobalSettings::menuFont(), true, "KPopupTitle"); + TQApplication::setFont(TDEGlobalSettings::generalFont(), true); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "KPopupTitle"); // "patch" standard TQStyleSheet to follow our fonts TQStyleSheet* sheet = TQStyleSheet::defaultSheet(); - sheet->item ("pre")->setFontFamily (KGlobalSettings::fixedFont().family()); - sheet->item ("code")->setFontFamily (KGlobalSettings::fixedFont().family()); - sheet->item ("tt")->setFontFamily (KGlobalSettings::fixedFont().family()); + sheet->item ("pre")->setFontFamily (TDEGlobalSettings::fixedFont().family()); + sheet->item ("code")->setFontFamily (TDEGlobalSettings::fixedFont().family()); + sheet->item ("tt")->setFontFamily (TDEGlobalSettings::fixedFont().family()); emit kdisplayFontChanged(); emit appearanceChanged(); @@ -2484,7 +2484,7 @@ void TDEApplication::kdisplaySetStyle() void TDEApplication::propagateSettings(SettingsCategory arg) { - KConfigBase* config = KGlobal::config(); + KConfigBase* config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE" ); #ifdef QT_HAVE_MAX_IMAGE_SIZE @@ -2821,7 +2821,7 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons if (config.readBoolEntry("TerminalClient", false)) { - KConfigGroup confGroup( KGlobal::config(), "General" ); + KConfigGroup confGroup( TDEGlobal::config(), "General" ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", "konsole"); command = preferredTerminal + " -e " + command; } @@ -3167,7 +3167,7 @@ TQString TDEApplication::tempSaveName( const TQString& pFilename ) const if( !aAutosaveDir.mkdir( aAutosaveDir.absPath() ) ) { // Last chance: use temp dir - aAutosaveDir.setPath( KGlobal::dirs()->saveLocation("tmp") ); + aAutosaveDir.setPath( TDEGlobal::dirs()->saveLocation("tmp") ); } } @@ -3196,7 +3196,7 @@ TQString TDEApplication::checkRecoverFile( const TQString& pFilename, if( !aAutosaveDir.mkdir( aAutosaveDir.absPath() ) ) { // Last chance: use temp dir - aAutosaveDir.setPath( KGlobal::dirs()->saveLocation("tmp") ); + aAutosaveDir.setPath( TDEGlobal::dirs()->saveLocation("tmp") ); } } @@ -3351,7 +3351,7 @@ bool TDEApplication::authorize(const TQString &genericAction) if (!d->actionRestrictions) return true; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE Action Restrictions" ); return config->readBoolEntry(genericAction, true); } @@ -3361,7 +3361,7 @@ bool TDEApplication::authorizeKAction(const char *action) if (!d->actionRestrictions || !action) return true; - static const TQString &action_prefix = KGlobal::staticQString( "action/" ); + static const TQString &action_prefix = TDEGlobal::staticQString( "action/" ); return authorize(action_prefix + action); } @@ -3370,14 +3370,14 @@ bool TDEApplication::authorizeControlModule(const TQString &menuId) { if (menuId.isEmpty() || kde_kiosk_exception) return true; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); return config->readBoolEntry(menuId, true); } TQStringList TDEApplication::authorizeControlModules(const TQStringList &menuIds) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); TQStringList result; for(TQStringList::ConstIterator it = menuIds.begin(); @@ -3426,7 +3426,7 @@ void TDEApplication::initUrlActionRestrictions() d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", TQString::null, TQString::null, TQString::null, "=", TQString::null, TQString::null, true)); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE URL Restrictions" ); int count = config->readNumEntry("rule_count"); TQString keyFormat = TQString("rule_%1"); @@ -3457,9 +3457,9 @@ void TDEApplication::initUrlActionRestrictions() urlPath.replace(0, 1, TQDir::homeDirPath()); if (refPath.startsWith("$TMP")) - refPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp")); + refPath.replace(0, 4, TDEGlobal::dirs()->saveLocation("tmp")); if (urlPath.startsWith("$TMP")) - urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp")); + urlPath.replace(0, 4, TDEGlobal::dirs()->saveLocation("tmp")); d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule ( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled)); diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index 49abf1202..f472e3351 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -662,7 +662,7 @@ public slots: /** * Broadcast a received keycode to all listening KDE applications * The primary use for this feature is to connect hotkeys such as - * XF86Display to their respective KGlobalAccel functions while + * XF86Display to their respective TDEGlobalAccel functions while * the screen is locked by kdesktop_lock. */ void broadcastKeyCode(unsigned int keyCode); @@ -1450,8 +1450,8 @@ signals: void backgroundChanged(int desk); /** - * Emitted when the global settings have been changed - see KGlobalSettings - * TDEApplication takes care of calling reparseConfiguration on KGlobal::config() + * Emitted when the global settings have been changed - see TDEGlobalSettings + * TDEApplication takes care of calling reparseConfiguration on TDEGlobal::config() * so that applications/classes using this only have to re-read the configuration * @param category the category among the enum above */ @@ -1522,7 +1522,7 @@ signals: /** * @internal - * Used to send KGlobalAccel objects a new keypress from physical hotkeys. + * Used to send TDEGlobalAccel objects a new keypress from physical hotkeys. */ void coreFakeKeyPress(unsigned int keyCode); @@ -1546,7 +1546,7 @@ private: /** - * \relates KGlobal + * \relates TDEGlobal * Check, if a file may be accessed in a given mode. * This is a wrapper around the access() system call. * checkAccess() calls access() with the given parameters. diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index e5b19a28c..f6c29be7d 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -42,8 +42,8 @@ */ void TDEApplication_init_windows(bool /*GUIenabled*/) { - TQString qt_transl_file = ::locate( "locale", KGlobal::locale()->language() - + "/LC_MESSAGES/qt_" + KGlobal::locale()->language() + ".qm" ); + TQString qt_transl_file = ::locate( "locale", TDEGlobal::locale()->language() + + "/LC_MESSAGES/qt_" + TDEGlobal::locale()->language() + ".qm" ); QTranslator *qt_transl = new QTranslator(); if (qt_transl->load( qt_transl_file, "")) kapp->installTranslator( qt_transl ); diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp index 57898da84..ab38dc4ca 100644 --- a/tdecore/kcalendarsystem.cpp +++ b/tdecore/kcalendarsystem.cpp @@ -49,7 +49,7 @@ const KLocale * KCalendarSystem::locale() const if ( d->locale ) return d->locale; - return KGlobal::locale(); + return TDEGlobal::locale(); } TQString KCalendarSystem::dayString(const TQDate & pDate, bool bShort) const diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index 52cf87849..a732bf266 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -535,7 +535,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const return codec; // cache hit, return if (n.isEmpty()) { - codec = KGlobal::locale()->codecForEncoding(); + codec = TDEGlobal::locale()->codecForEncoding(); d->codecForNameDict.replace("->locale<-", codec); return codec; } @@ -572,8 +572,8 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const TQString dir; { - KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" ); - dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); + KConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" ); + dir = TDEGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); } // these are codecs not included in Qt. They can be build up if the corresponding charmap diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h index 2816e4fcd..da96643ff 100644 --- a/tdecore/kcharsets.h +++ b/tdecore/kcharsets.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> #include "tdelibs_export.h" -class KGlobal; +class TDEGlobal; class KCharsetsPrivate; class TQTextCodec; @@ -42,11 +42,11 @@ class TQTextCodec; */ class TDECORE_EXPORT KCharsets { - friend class KGlobal; + friend class TDEGlobal; protected: /** Protected constructor. If you need the kcharsets object, use - KGlobal::charsets() instead. + TDEGlobal::charsets() instead. */ KCharsets(); diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index 06337485c..c245f9435 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -80,15 +80,15 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent ) : TQObject( parent, "kapp_accel_filter" ), key(0), block( false ), drklash(0) { parent->installEventFilter( this ); - KConfigGroupSaver saver( KGlobal::config(), "Development" ); - TQString sKey = KGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace(); + KConfigGroupSaver saver( TDEGlobal::config(), "Development" ); + TQString sKey = TDEGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace(); if( !sKey.isEmpty() ) { KShortcut cuts( sKey ); if( cuts.count() > 0 ) key = int(cuts.seq(0).qt()); } - alwaysShow = KGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false ); - autoCheck = KGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true ); + alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false ); + autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true ); connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot())); } diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 4d77c3da2..e6d763b79 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -38,7 +38,7 @@ * especially the second one. */ -class KClipboardSynchronizer::MimeSource : public TQMimeSource +class TDEClipboardSynchronizer::MimeSource : public TQMimeSource { public: MimeSource( const TQMimeSource * src ) @@ -89,25 +89,25 @@ private: }; -KClipboardSynchronizer * KClipboardSynchronizer::s_self = 0L; -bool KClipboardSynchronizer::s_sync = false; -bool KClipboardSynchronizer::s_reverse_sync = false; -bool KClipboardSynchronizer::s_blocked = false; +TDEClipboardSynchronizer * TDEClipboardSynchronizer::s_self = 0L; +bool TDEClipboardSynchronizer::s_sync = false; +bool TDEClipboardSynchronizer::s_reverse_sync = false; +bool TDEClipboardSynchronizer::s_blocked = false; -KClipboardSynchronizer * KClipboardSynchronizer::self() +TDEClipboardSynchronizer * TDEClipboardSynchronizer::self() { if ( !s_self ) - s_self = new KClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); + s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); return s_self; } -KClipboardSynchronizer::KClipboardSynchronizer( TQObject *parent, const char *name ) +TDEClipboardSynchronizer::TDEClipboardSynchronizer( TQObject *parent, const char *name ) : TQObject( parent, name ) { s_self = this; - KConfigGroup config( KGlobal::config(), "General" ); + KConfigGroup config( TDEGlobal::config(), "General" ); s_sync = config.readBoolEntry( "SynchronizeClipboardAndSelection", s_sync); s_reverse_sync = config.readBoolEntry( "ClipboardSetSelection", s_reverse_sync ); @@ -115,13 +115,13 @@ KClipboardSynchronizer::KClipboardSynchronizer( TQObject *parent, const char *na setupSignals(); } -KClipboardSynchronizer::~KClipboardSynchronizer() +TDEClipboardSynchronizer::~TDEClipboardSynchronizer() { if ( s_self == this ) s_self = 0L; } -void KClipboardSynchronizer::setupSignals() +void TDEClipboardSynchronizer::setupSignals() { TQClipboard *clip = TQApplication::clipboard(); disconnect( clip, NULL, this, NULL ); @@ -133,7 +133,7 @@ void KClipboardSynchronizer::setupSignals() TQT_SLOT( slotClipboardChanged() )); } -void KClipboardSynchronizer::slotSelectionChanged() +void TDEClipboardSynchronizer::slotSelectionChanged() { TQClipboard *clip = TQApplication::clipboard(); @@ -145,7 +145,7 @@ void KClipboardSynchronizer::slotSelectionChanged() TQClipboard::Clipboard ); } -void KClipboardSynchronizer::slotClipboardChanged() +void TDEClipboardSynchronizer::slotClipboardChanged() { TQClipboard *clip = TQApplication::clipboard(); @@ -157,7 +157,7 @@ void KClipboardSynchronizer::slotClipboardChanged() TQClipboard::Selection ); } -void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode ) +void TDEClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode ) { // tqDebug("---> setting clipboard: %p", data); @@ -177,20 +177,20 @@ void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode s_blocked = false; } -void KClipboardSynchronizer::setSynchronizing( bool sync ) +void TDEClipboardSynchronizer::setSynchronizing( bool sync ) { s_sync = sync; self()->setupSignals(); } -void KClipboardSynchronizer::setReverseSynchronizing( bool enable ) +void TDEClipboardSynchronizer::setReverseSynchronizing( bool enable ) { s_reverse_sync = enable; self()->setupSignals(); } // private, called by TDEApplication -void KClipboardSynchronizer::newConfiguration( int config ) +void TDEClipboardSynchronizer::newConfiguration( int config ) { s_sync = (config & Synchronize); self()->setupSignals(); diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h index c13959e61..8ed8dcc91 100644 --- a/tdecore/kclipboard.h +++ b/tdecore/kclipboard.h @@ -33,7 +33,7 @@ * @since 3.1 * @internal */ -class TDECORE_EXPORT KClipboardSynchronizer : public TQObject +class TDECORE_EXPORT TDEClipboardSynchronizer : public TQObject { Q_OBJECT @@ -43,13 +43,13 @@ public: friend class TDEApplication; /** - * Returns the KClipboardSynchronizer singleton object. - * @return the KClipboardSynchronizer singleton object. + * Returns the TDEClipboardSynchronizer singleton object. + * @return the TDEClipboardSynchronizer singleton object. */ - static KClipboardSynchronizer *self(); + static TDEClipboardSynchronizer *self(); /** - * Configures KClipboardSynchronizer to synchronize the Selection to Clipboard whenever + * Configures TDEClipboardSynchronizer to synchronize the Selection to Clipboard whenever * it changes. * * Default is false. @@ -69,7 +69,7 @@ public: } /** - * Configures KClipboardSynchronizer to copy the Clipboard buffer to the Selection + * Configures TDEClipboardSynchronizer to copy the Clipboard buffer to the Selection * buffer whenever the Clipboard changes. * * @@ -93,19 +93,19 @@ public: protected: - ~KClipboardSynchronizer(); + ~TDEClipboardSynchronizer(); private slots: void slotSelectionChanged(); void slotClipboardChanged(); private: - KClipboardSynchronizer( TQObject *parent = 0, const char *name = 0L ); + TDEClipboardSynchronizer( TQObject *parent = 0, const char *name = 0L ); void setupSignals(); static void setClipboard( TQMimeSource* data, TQClipboard::Mode mode ); - static KClipboardSynchronizer *s_self; + static TDEClipboardSynchronizer *s_self; static bool s_sync; static bool s_reverse_sync; static bool s_blocked; diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index 186f7e3af..b5af05f20 100644 --- a/tdecore/kcmdlineargs.cpp +++ b/tdecore/kcmdlineargs.cpp @@ -743,10 +743,10 @@ void TDECmdLineArgs::enable_i18n() { // called twice or too late - if (KGlobal::_locale) + if (TDEGlobal::_locale) return; - if (!KGlobal::_instance) { + if (!TDEGlobal::_instance) { TDEInstance *instance = new TDEInstance(about); (void) instance->config(); // Don't delete instance! @@ -756,7 +756,7 @@ TDECmdLineArgs::enable_i18n() void TDECmdLineArgs::usage(const TQString &error) { - assert(KGlobal::_locale); + assert(TDEGlobal::_locale); TQCString localError = error.local8Bit(); if (localError[error.length()-1] == '\n') localError = localError.left(error.length()-1); diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp index f74c0460c..8d1c7f0ac 100644 --- a/tdecore/kcompletion.cpp +++ b/tdecore/kcompletion.cpp @@ -42,7 +42,7 @@ KCompletion::KCompletion() { d = new KCompletionPrivate; - myCompletionMode = KGlobalSettings::completionMode(); + myCompletionMode = TDEGlobalSettings::completionMode(); myTreeRoot = new KCompTreeNode; myBeep = true; myIgnoreCase = false; @@ -188,7 +188,7 @@ void KCompletion::clear() TQString KCompletion::makeCompletion( const TQString& string ) { - if ( myCompletionMode == KGlobalSettings::CompletionNone ) + if ( myCompletionMode == TDEGlobalSettings::CompletionNone ) return TQString::null; //kdDebug(0) << "KCompletion: completing: " << string << endl; @@ -200,7 +200,7 @@ TQString KCompletion::makeCompletion( const TQString& string ) // in Shell-completion-mode, emit all matches when we get the same // complete-string twice - if ( myCompletionMode == KGlobalSettings::CompletionShell && + if ( myCompletionMode == TDEGlobalSettings::CompletionShell && string == myLastString ) { // Don't use d->matches since calling postProcessMatches() // on d->matches here would interfere with call to @@ -219,8 +219,8 @@ TQString KCompletion::makeCompletion( const TQString& string ) TQString completion; // in case-insensitive popup mode, we search all completions at once - if ( myCompletionMode == KGlobalSettings::CompletionPopup || - myCompletionMode == KGlobalSettings::CompletionPopupAuto ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionPopup || + myCompletionMode == TDEGlobalSettings::CompletionPopupAuto ) { findAllCompletions( string, &d->matches, myHasMultipleMatches ); if ( !d->matches.isEmpty() ) completion = d->matches.first(); @@ -288,7 +288,7 @@ TQStringList KCompletion::substringCompletion( const TQString& string ) const } -void KCompletion::setCompletionMode( KGlobalSettings::Completion mode ) +void KCompletion::setCompletionMode( TDEGlobalSettings::Completion mode ) { myCompletionMode = mode; } @@ -442,7 +442,7 @@ TQString KCompletion::findCompletion( const TQString& string ) if ( node && node->childrenCount() > 1 ) { myHasMultipleMatches = true; - if ( myCompletionMode == KGlobalSettings::CompletionAuto ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionAuto ) { myRotationIndex = 1; if (myOrder != Weighted) { while ( (node = node->firstChild()) ) { @@ -632,14 +632,14 @@ void KCompletion::doBeep( BeepMode mode ) const text = i18n("You reached the end of the list\nof matching items.\n"); break; case PartialMatch: - if ( myCompletionMode == KGlobalSettings::CompletionShell || - myCompletionMode == KGlobalSettings::CompletionMan ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionShell || + myCompletionMode == TDEGlobalSettings::CompletionMan ) { event = TQString::fromLatin1("Textcompletion: partial match"); text = i18n("The completion is ambiguous, more than one\nmatch is available.\n"); } break; case NoMatch: - if ( myCompletionMode == KGlobalSettings::CompletionShell ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionShell ) { event = TQString::fromLatin1("Textcompletion: no match"); text = i18n("There is no matching item available.\n"); } diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h index c0ba02d34..45182bd9d 100644 --- a/tdecore/kcompletion.h +++ b/tdecore/kcompletion.h @@ -77,8 +77,8 @@ class TQPopupMenu; * of manual and auto-completion is therefore only visible in UI classes, * KCompletion needs to know whether to deliver partial matches * (shell completion) or whole matches (auto/manual completion), therefore - * KGlobalSettings::CompletionMan and - * KGlobalSettings::CompletionAuto have the exact same effect in + * TDEGlobalSettings::CompletionMan and + * TDEGlobalSettings::CompletionAuto have the exact same effect in * KCompletion. * * @li shell completion works like how shells complete filenames: @@ -90,7 +90,7 @@ class TQPopupMenu; * You don't have to worry much about that though, KCompletion handles * that for you, according to the setting setCompletionMode(). * The default setting is globally configured by the user and read - * from KGlobalSettings::completionMode(). + * from TDEGlobalSettings::completionMode(). * * A short example: * \code @@ -251,22 +251,22 @@ public: /** * Sets the completion mode to Auto/Manual, Shell or None. * If you don't set the mode explicitly, the global default value - * KGlobalSettings::completionMode() is used. - * KGlobalSettings::CompletionNone disables completion. + * TDEGlobalSettings::completionMode() is used. + * TDEGlobalSettings::CompletionNone disables completion. * @param mode the completion mode * @see completionMode - * @see KGlobalSettings::completionMode + * @see TDEGlobalSettings::completionMode */ - virtual void setCompletionMode( KGlobalSettings::Completion mode ); + virtual void setCompletionMode( TDEGlobalSettings::Completion mode ); /** * Return the current completion mode. - * May be different from KGlobalSettings::completionMode(), if you + * May be different from TDEGlobalSettings::completionMode(), if you * explicitly called setCompletionMode(). * @return the current completion mode * @see setCompletionMode */ - KGlobalSettings::Completion completionMode() const { + TDEGlobalSettings::Completion completionMode() const { return myCompletionMode; } @@ -570,7 +570,7 @@ private: enum BeepMode { NoMatch, PartialMatch, Rotation }; void doBeep( BeepMode ) const; - KGlobalSettings::Completion myCompletionMode; + TDEGlobalSettings::Completion myCompletionMode; CompOrder myOrder; TQString myLastString; @@ -825,7 +825,7 @@ public: * Sets the type of completion to be used. * * The completion modes supported are those defined in - * KGlobalSettings(). See below. + * TDEGlobalSettings(). See below. * * @param mode Completion type: * @li CompletionNone: Disables completion feature. @@ -841,17 +841,17 @@ public: * @li CompletionPopup: Shows all available completions at once, * in a listbox popping up. */ - virtual void setCompletionMode( KGlobalSettings::Completion mode ); + virtual void setCompletionMode( TDEGlobalSettings::Completion mode ); /** * Returns the current completion mode. * - * The return values are of type KGlobalSettings::Completion. + * The return values are of type TDEGlobalSettings::Completion. * See setCompletionMode() for details. * * @return the completion mode. */ - KGlobalSettings::Completion completionMode() const { + TDEGlobalSettings::Completion completionMode() const { return m_delegate ? m_delegate->completionMode() : m_iCompletionMode; } @@ -908,7 +908,7 @@ public: * * This method changes the values of the key bindings for * rotation and completion features to the default values - * provided in KGlobalSettings. + * provided in TDEGlobalSettings. * * NOTE: By default inheriting widgets should uses the * global key-bindings so that there will be no need to @@ -992,7 +992,7 @@ private: // Determines whether this widget fires rotation signals bool m_bEmitSignals; // Stores the completion mode locally. - KGlobalSettings::Completion m_iCompletionMode; + TDEGlobalSettings::Completion m_iCompletionMode; // Pointer to Completion object. TQGuardedPtr<KCompletion> m_pCompObj; // Keybindings diff --git a/tdecore/kcompletionbase.cpp b/tdecore/kcompletionbase.cpp index 9e7f6d746..7589d842c 100644 --- a/tdecore/kcompletionbase.cpp +++ b/tdecore/kcompletionbase.cpp @@ -26,7 +26,7 @@ KCompletionBase::KCompletionBase() { m_delegate = 0L; // Assign the default completion type to use. - m_iCompletionMode = KGlobalSettings::completionMode(); + m_iCompletionMode = TDEGlobalSettings::completionMode(); // Initialize all key-bindings to 0 by default so that // the event filter will use the global settings. @@ -98,7 +98,7 @@ void KCompletionBase::setHandleSignals( bool handle ) m_bHandleSignals = handle; } -void KCompletionBase::setCompletionMode( KGlobalSettings::Completion mode ) +void KCompletionBase::setCompletionMode( TDEGlobalSettings::Completion mode ) { if ( m_delegate ) { m_delegate->setCompletionMode( mode ); @@ -108,7 +108,7 @@ void KCompletionBase::setCompletionMode( KGlobalSettings::Completion mode ) m_iCompletionMode = mode; // Always sync up KCompletion mode with ours as long as we // are performing completions. - if( m_pCompObj && m_iCompletionMode != KGlobalSettings::CompletionNone ) + if( m_pCompObj && m_iCompletionMode != TDEGlobalSettings::CompletionNone ) m_pCompObj->setCompletionMode( m_iCompletionMode ); } diff --git a/tdecore/kconfig.cpp b/tdecore/kconfig.cpp index 968c45d02..b8ac9d2a1 100644 --- a/tdecore/kconfig.cpp +++ b/tdecore/kconfig.cpp @@ -71,7 +71,7 @@ KConfig::KConfig( const TQString& fileName, // config object. // Since this makes only sense for config directories, addCustomized // returns true only if new config directories appeared. - if (KGlobal::dirs()->addCustomized(this)) + if (TDEGlobal::dirs()->addCustomized(this)) reparseConfiguration(); } diff --git a/tdecore/kconfig.h b/tdecore/kconfig.h index e3eb52f64..63e7be591 100644 --- a/tdecore/kconfig.h +++ b/tdecore/kconfig.h @@ -37,7 +37,7 @@ class KConfigPrivate; * This class implements KDE's default configuration system. * * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> -* @see KGlobal::config(), KConfigBase, KSimpleConfig +* @see TDEGlobal::config(), KConfigBase, KSimpleConfig * @short KDE Configuration Management class */ class TDECORE_EXPORT KConfig : public KConfigBase diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp index 91e8c7998..51175c528 100644 --- a/tdecore/kconfig_compiler/kconfig_compiler.cpp +++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp @@ -666,7 +666,7 @@ TQString defaultValue( const TQString &type ) { if ( type == "String" ) return "\"\""; // Use empty string, not null string! else if ( type == "StringList" ) return "TQStringList()"; - else if ( type == "Font" ) return "KGlobalSettings::generalFont()"; + else if ( type == "Font" ) return "TDEGlobalSettings::generalFont()"; else if ( type == "Rect" ) return "TQRect()"; else if ( type == "Size" ) return "TQSize()"; else if ( type == "Color" ) return "TQColor(128, 128, 128)"; @@ -1220,7 +1220,7 @@ int main( int argc, char **argv ) if ( !singleton ) { h << " " << className << "("; if (cfgFileNameArg) - h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = KGlobal::sharedConfig()" : ", "); + h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", "); for (TQValueList<Param>::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref index f89b7c133..413e75c9c 100644 --- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref @@ -9,10 +9,10 @@ Test8a::Test8a( KSharedConfig::Ptr config ) setCurrentGroup( TQString::fromLatin1( "Group" ) ); KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); + itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() ); addItem( itemFont, TQString::fromLatin1( "Font" ) ); KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); + itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() ); addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref index 2e947c437..0ab182a04 100644 --- a/tdecore/kconfig_compiler/tests/test8a.h.ref +++ b/tdecore/kconfig_compiler/tests/test8a.h.ref @@ -11,7 +11,7 @@ class Test8a : public KConfigSkeleton { public: - Test8a( KSharedConfig::Ptr config = KGlobal::sharedConfig() ); + Test8a( KSharedConfig::Ptr config = TDEGlobal::sharedConfig() ); ~Test8a(); /** diff --git a/tdecore/kconfig_compiler/tests/test8a.kcfg b/tdecore/kconfig_compiler/tests/test8a.kcfg index 5ee87199f..53448b624 100644 --- a/tdecore/kconfig_compiler/tests/test8a.kcfg +++ b/tdecore/kconfig_compiler/tests/test8a.kcfg @@ -7,11 +7,11 @@ <group name="Group"> <entry name="Font" type="Font"> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry name="TitleFont" type="Font"> - <default code="true">KGlobalSettings::windowTitleFont()</default> + <default code="true">TDEGlobalSettings::windowTitleFont()</default> </entry> </group> </kcfg> diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp index 492d4f494..4f217597b 100644 --- a/tdecore/kconfigbackend.cpp +++ b/tdecore/kconfigbackend.cpp @@ -254,11 +254,11 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, mLocalFileName = mfileName; } else { - mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName; + mLocalFileName = TDEGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName; } if (useKDEGlobals) { - mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals"); + mGlobalFileName = TDEGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals"); } else { mGlobalFileName = TQString::null; @@ -350,7 +350,7 @@ bool KConfigINIBackEnd::parseConfigFiles() // Parse the general config files if (useKDEGlobals) { - TQStringList kdercs = KGlobal::dirs()-> + TQStringList kdercs = TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("kdeglobals")); #ifdef Q_WS_WIN @@ -362,7 +362,7 @@ bool KConfigINIBackEnd::parseConfigFiles() if (checkAccess(etc_kderc, R_OK)) kdercs += etc_kderc; - kdercs += KGlobal::dirs()-> + kdercs += TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("system.kdeglobals")); TQStringList::ConstIterator it; @@ -383,7 +383,7 @@ bool KConfigINIBackEnd::parseConfigFiles() while(bReadFile) { bReadFile = false; TQString bootLanguage; - if (useKDEGlobals && localeString.isEmpty() && !KGlobal::_locale) { + if (useKDEGlobals && localeString.isEmpty() && !TDEGlobal::_locale) { // Boot strap language bootLanguage = KLocale::_initLanguage(pConfig); setLocaleString(bootLanguage.utf8()); @@ -394,7 +394,7 @@ bool KConfigINIBackEnd::parseConfigFiles() if ( !TQDir::isRelativePath(mfileName) ) list << mfileName; else - list = KGlobal::dirs()->findAllResources(resType, mfileName); + list = TDEGlobal::dirs()->findAllResources(resType, mfileName); TQStringList::ConstIterator it; @@ -410,7 +410,7 @@ bool KConfigINIBackEnd::parseConfigFiles() break; } } - if (KGlobal::dirs()->isRestrictedResource(resType, mfileName)) + if (TDEGlobal::dirs()->isRestrictedResource(resType, mfileName)) bFileImmutable = true; TQString currentLanguage; if (!bootLanguage.isEmpty()) @@ -1181,9 +1181,9 @@ bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser) TDEApplication *app = kapp; if (!cmdToExec.isEmpty() && app) { - KProcess lprocess; + TDEProcess lprocess; lprocess << cmdToExec << "--title" << app->instanceName() << "--msgbox" << TQCString(errorMsg.local8Bit()); - lprocess.start( KProcess::Block ); + lprocess.start( TDEProcess::Block ); } } return allWritable; diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp index c5c0a4e25..e13d07782 100644 --- a/tdecore/kconfigbase.cpp +++ b/tdecore/kconfigbase.cpp @@ -63,8 +63,8 @@ void KConfigBase::setLocale() { bLocaleInitialized = true; - if (KGlobal::locale()) - aLocaleString = KGlobal::locale()->language().utf8(); + if (TDEGlobal::locale()) + aLocaleString = TDEGlobal::locale()->language().utf8(); else aLocaleString = KLocale::defaultLanguage().utf8(); if (backEnd) @@ -231,7 +231,7 @@ TQString KConfigBase::readEntry( const char *pKey, // because calling locale() will create a locale object if it // doesn't exist, which requires KConfig, which will create a infinite // loop, and nobody likes those. - if (!bLocaleInitialized && KGlobal::_locale) { + if (!bLocaleInitialized && TDEGlobal::_locale) { // get around const'ness. KConfigBase *that = const_cast<KConfigBase *>(this); that->setLocale(); @@ -259,7 +259,7 @@ TQString KConfigBase::readEntry( const char *pKey, aValue = TQString::fromUtf8(aEntryData.mValue.data()); if (aValue.isNull()) { - static const TQString &emptyString = KGlobal::staticQString(""); + static const TQString &emptyString = TDEGlobal::staticQString(""); aValue = emptyString; } expand = aEntryData.bExpand; @@ -526,7 +526,7 @@ TQStringList KConfigBase::readListEntry( const TQString& pKey, char sep ) const TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const { - static const TQString& emptyString = KGlobal::staticQString(""); + static const TQString& emptyString = TDEGlobal::staticQString(""); TQStringList list; if( !hasKey( pKey ) ) @@ -1081,7 +1081,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value, if( bPersistent ) setDirty(true); - if (!bLocaleInitialized && KGlobal::locale()) + if (!bLocaleInitialized && TDEGlobal::locale()) setLocale(); KEntryKey entryKey(mGroup, pKey); @@ -1152,7 +1152,7 @@ static TQString translatePath( TQString path ) path.remove(0,1); } - // we can not use KGlobal::dirs()->relativeLocation("home", path) here, + // we can not use TDEGlobal::dirs()->relativeLocation("home", path) here, // since it would not recognize paths without a trailing '/'. // All of the 3 following functions to return the user's home directory // can return different paths. We have to test all them. @@ -1222,7 +1222,7 @@ void KConfigBase::deleteEntry( const char *pKey, // possible but minimized. setDirty(true); - if (!bLocaleInitialized && KGlobal::locale()) + if (!bLocaleInitialized && TDEGlobal::locale()) setLocale(); KEntryKey entryKey(mGroup, pKey); @@ -1750,7 +1750,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, void KConfigBase::parseConfigFiles() { - if (!bLocaleInitialized && KGlobal::_locale) { + if (!bLocaleInitialized && TDEGlobal::_locale) { setLocale(); } if (backEnd) diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h index 600bceb69..1818aadb5 100644 --- a/tdecore/kconfigbase.h +++ b/tdecore/kconfigbase.h @@ -62,7 +62,7 @@ class KConfigGroup; * a group name. * * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> - * @see KGlobal#config() + * @see TDEGlobal#config() * @see KConfig * @see KSimpleConfig * @see KSharedConfig diff --git a/tdecore/kconfigskeleton.cpp b/tdecore/kconfigskeleton.cpp index b464f64d2..ee873eca2 100644 --- a/tdecore/kconfigskeleton.cpp +++ b/tdecore/kconfigskeleton.cpp @@ -889,7 +889,7 @@ KConfigSkeleton::KConfigSkeleton( const TQString &configname ) } else { - mConfig = KGlobal::sharedConfig(); + mConfig = TDEGlobal::sharedConfig(); } } diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h index dde0779cf..3ad18d958 100644 --- a/tdecore/kconfigskeleton.h +++ b/tdecore/kconfigskeleton.h @@ -670,7 +670,7 @@ public: { public: ItemFont(const TQString & group, const TQString & key, TQFont & reference, - const TQFont & defaultValue = KGlobalSettings::generalFont()); + const TQFont & defaultValue = TDEGlobalSettings::generalFont()); void readConfig(KConfig * config); void setProperty(const TQVariant & p); @@ -1059,7 +1059,7 @@ public: */ ItemFont *addItemFont(const TQString & name, TQFont & reference, const TQFont & defaultValue = - KGlobalSettings::generalFont(), + TDEGlobalSettings::generalFont(), const TQString & key = TQString::null); /** diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp index 86ec1f39d..ae767ffb2 100644 --- a/tdecore/kcrash.cpp +++ b/tdecore/kcrash.cpp @@ -196,7 +196,7 @@ KCrash::defaultCrashHandler (int sig) argv[i++] = "--pid"; argv[i++] = pidtxt; - const TDEInstance *instance = KGlobal::_instance; + const TDEInstance *instance = TDEGlobal::_instance; const TDEAboutData *about = instance ? instance->aboutData() : 0; if (about) { if (about->internalVersion()) { diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index df38ff422..3d1818592 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -19,7 +19,7 @@ 172 tdecore (KStartupInfo) 173 tdecore (KLocale) 174 tdecore (KProcIO) -175 tdecore (KProcess) +175 tdecore (TDEProcess) 176 tdecore (KWin) 177 tdecore (KConfigSkeleton) 178 tdecore (KConfigDialogManager) diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index d3cc3c6b6..ef76e04f6 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -82,7 +82,7 @@ static TQCString getDescrFromNum(unsigned int _num) if (!KDebugCache) { kdd.setObject(KDebugCache, new TQIntDict<KDebugEntry>( 601 )); // Do not call this deleter from ~TDEApplication - KGlobal::unregisterStaticDeleter(&kdd); + TDEGlobal::unregisterStaticDeleter(&kdd); KDebugCache->setAutoDelete(true); } @@ -176,7 +176,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char { pcd.setObject(kDebug_data, new kDebugPrivate()); // Do not call this deleter from ~TDEApplication - KGlobal::unregisterStaticDeleter(&pcd); + TDEGlobal::unregisterStaticDeleter(&pcd); // create the dcop interface if it has not been created yet if (!kDebugDCOPIface) @@ -185,25 +185,25 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char } } - if (!kDebug_data->config && KGlobal::_instance ) + if (!kDebug_data->config && TDEGlobal::_instance ) { kDebug_data->config = new KConfig("kdebugrc", false, false); kDebug_data->config->setGroup("0"); //AB: this is necessary here, otherwise all output with area 0 won't be //prefixed with anything, unless something with area != 0 is called before - if ( KGlobal::_instance ) - kDebug_data->aAreaName = KGlobal::instance()->instanceName(); + if ( TDEGlobal::_instance ) + kDebug_data->aAreaName = TDEGlobal::instance()->instanceName(); } if (kDebug_data->config && kDebug_data->oldarea != nArea) { kDebug_data->config->setGroup( TQString::number(static_cast<int>(nArea)) ); kDebug_data->oldarea = nArea; - if ( nArea > 0 && KGlobal::_instance ) + if ( nArea > 0 && TDEGlobal::_instance ) kDebug_data->aAreaName = getDescrFromNum(nArea); if ((nArea == 0) || kDebug_data->aAreaName.isEmpty()) - if ( KGlobal::_instance ) - kDebug_data->aAreaName = KGlobal::instance()->instanceName(); + if ( TDEGlobal::_instance ) + kDebug_data->aAreaName = TDEGlobal::instance()->instanceName(); } int nPriority = 0; diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h index 1121d3679..d8a1998f9 100644 --- a/tdecore/kdebug.h +++ b/tdecore/kdebug.h @@ -422,7 +422,7 @@ kdbgstream &kdbgstream::operator<<( const TQValueList<T> &list ) } /** - * \relates KGlobal + * \relates TDEGlobal * Prints an "\n". * @param s the debug stream to write to * @return the debug stream (@p s) @@ -430,7 +430,7 @@ kdbgstream &kdbgstream::operator<<( const TQValueList<T> &list ) inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; } /** - * \relates KGlobal + * \relates TDEGlobal * Flushes the stream. * @param s the debug stream to write to * @return the debug stream (@p s) @@ -440,7 +440,7 @@ inline kdbgstream &flush( kdbgstream &s) { s.flush(); return s; } TDECORE_EXPORT kdbgstream &perror( kdbgstream &s); /** - * \relates KGlobal + * \relates TDEGlobal * kndbgstream is a dummy variant of kdbgstream. All functions do * nothing. * @see kndDebug() @@ -590,7 +590,7 @@ inline kndbgstream &flush( kndbgstream & s) { return s; } inline kndbgstream &perror( kndbgstream & s) { return s; } /** - * \relates KGlobal + * \relates TDEGlobal * Returns a debug stream. You can use it to print debug * information. * @param area an id to identify the output, 0 for default @@ -599,13 +599,13 @@ inline kndbgstream &perror( kndbgstream & s) { return s; } TDECORE_EXPORT kdbgstream kdDebug(int area = 0); TDECORE_EXPORT kdbgstream kdDebug(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Returns a backtrace. * @return a backtrace */ TDECORE_EXPORT TQString kdBacktrace(); /** - * \relates KGlobal + * \relates TDEGlobal * Returns a backtrace. * @param levels the number of levels of the backtrace * @return a backtrace @@ -623,7 +623,7 @@ inline TQString kndBacktrace() { return TQString::null; } inline TQString kndBacktrace(int) { return TQString::null; } /** - * \relates KGlobal + * \relates TDEGlobal * Returns a warning stream. You can use it to print warning * information. * @param area an id to identify the output, 0 for default @@ -631,7 +631,7 @@ inline TQString kndBacktrace(int) { return TQString::null; } TDECORE_EXPORT kdbgstream kdWarning(int area = 0); TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Returns an error stream. You can use it to print error * information. * @param area an id to identify the output, 0 for default @@ -639,7 +639,7 @@ TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0); TDECORE_EXPORT kdbgstream kdError(int area = 0); TDECORE_EXPORT kdbgstream kdError(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Returns a fatal error stream. You can use it to print fatal error * information. * @param area an id to identify the output, 0 for default @@ -648,7 +648,7 @@ TDECORE_EXPORT kdbgstream kdFatal(int area = 0); TDECORE_EXPORT kdbgstream kdFatal(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Deletes the kdebugrc cache and therefore forces KDebug to reread the * config file */ diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 02dfb1d5f..29c30f9d9 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -67,7 +67,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) if (!TQDir::isRelativePath(local)) { // Relative wrt apps? - local = KGlobal::dirs()->relativeLocation("apps", path); + local = TDEGlobal::dirs()->relativeLocation("apps", path); } if (TQDir::isRelativePath(local)) @@ -78,7 +78,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) { // XDG Desktop menu items come with absolute paths, we need to // extract their relative path and then build a local path. - local = KGlobal::dirs()->relativeLocation("xdgdata-dirs", local); + local = TDEGlobal::dirs()->relativeLocation("xdgdata-dirs", local); if (!TQDir::isRelativePath(local)) { // Hm, that didn't work... @@ -98,7 +98,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) { // XDG Desktop menu items come with absolute paths, we need to // extract their relative path and then build a local path. - local = KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + local = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); if (!TQDir::isRelativePath(local)) { // What now? Use filename only and hope for the best. @@ -133,7 +133,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) if (TQDir::isRelativePath(path)) return true; // Relative paths are ok. - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); if (TQDir::isRelativePath( dirs->relativeLocation("apps", path) )) return true; if (TQDir::isRelativePath( dirs->relativeLocation("xdgdata-apps", path) )) @@ -157,7 +157,7 @@ TQString KDesktopFile::translatedEntry(const char* key) const TQString fName = fileName(); fName = fName.mid(fName.findRev('/')+1); TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value; - TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data()); + TQString po_value = TDEGlobal::locale()->translate(po_lookup_key.utf8().data()); if (po_value == po_lookup_key) return value; diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h index 032c14302..426b29ef1 100644 --- a/tdecore/kgenericfactory.h +++ b/tdecore/kgenericfactory.h @@ -49,7 +49,7 @@ public: virtual ~KGenericFactoryBase() { if ( s_instance ) - KGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) ); + TDEGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) ); delete s_instance; s_instance = 0; s_self = 0; @@ -72,7 +72,7 @@ protected: virtual void setupTranslations( void ) { if ( instance() ) - KGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) ); + TDEGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) ); } void initializeMessageCatalogue() diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index 57135a769..c51f13e7f 100644 --- a/tdecore/kglobal.cpp +++ b/tdecore/kglobal.cpp @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ /* -* kglobal.cpp -- Implementation of class KGlobal. +* kglobal.cpp -- Implementation of class TDEGlobal. * Author: Sirtaj Singh Kang * Version: $Id$ * Generated: Sat May 1 02:08:43 EST 1999 @@ -53,55 +53,55 @@ static void kglobal_init(); -KStandardDirs *KGlobal::dirs() +KStandardDirs *TDEGlobal::dirs() { MYASSERT(_instance); return _instance->dirs(); } -KConfig *KGlobal::config() +KConfig *TDEGlobal::config() { MYASSERT(_instance); return _instance->config(); } -KSharedConfig *KGlobal::sharedConfig() +KSharedConfig *TDEGlobal::sharedConfig() { MYASSERT(_instance); return _instance->sharedConfig(); } -KIconLoader *KGlobal::iconLoader() +KIconLoader *TDEGlobal::iconLoader() { MYASSERT(_instance); return _instance->iconLoader(); } -TDEHardwareDevices *KGlobal::hardwareDevices() +TDEHardwareDevices *TDEGlobal::hardwareDevices() { MYASSERT(_instance); return _instance->hardwareDevices(); } -TDEGlobalNetworkManager *KGlobal::networkManager() +TDEGlobalNetworkManager *TDEGlobal::networkManager() { MYASSERT(_instance); return _instance->networkManager(); } -TDEInstance *KGlobal::instance() +TDEInstance *TDEGlobal::instance() { MYASSERT(_instance); return _instance; } -KLocale *KGlobal::locale() +KLocale *TDEGlobal::locale() { if( _locale == 0 ) { if (!_instance) @@ -117,7 +117,7 @@ KLocale *KGlobal::locale() return _locale; } -KCharsets *KGlobal::charsets() +KCharsets *TDEGlobal::charsets() { if( _charsets == 0 ) { _charsets =new KCharsets(); @@ -127,7 +127,7 @@ KCharsets *KGlobal::charsets() return _charsets; } -void KGlobal::setActiveInstance(TDEInstance *i) +void TDEGlobal::setActiveInstance(TDEInstance *i) { _activeInstance = i; if (i && _locale) @@ -138,10 +138,10 @@ void KGlobal::setActiveInstance(TDEInstance *i) * Create a static QString * * To be used inside functions(!) like: - * static const TQString &myString = KGlobal::staticQString("myText"); + * static const TQString &myString = TDEGlobal::staticQString("myText"); */ const TQString & -KGlobal::staticQString(const char *str) +TDEGlobal::staticQString(const char *str) { return staticQString(TQString::fromLatin1(str)); } @@ -156,10 +156,10 @@ public: * Create a static QString * * To be used inside functions(!) like: - * static const TQString &myString = KGlobal::staticQString(i18n("My Text")); + * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); */ const TQString & -KGlobal::staticQString(const TQString &str) +TDEGlobal::staticQString(const TQString &str) { if (!_stringDict) { _stringDict = new KStringDict; @@ -182,7 +182,7 @@ public: }; void -KGlobal::registerStaticDeleter(KStaticDeleterBase *obj) +TDEGlobal::registerStaticDeleter(KStaticDeleterBase *obj) { if (!_staticDeleters) kglobal_init(); @@ -191,16 +191,16 @@ KGlobal::registerStaticDeleter(KStaticDeleterBase *obj) } void -KGlobal::unregisterStaticDeleter(KStaticDeleterBase *obj) +TDEGlobal::unregisterStaticDeleter(KStaticDeleterBase *obj) { if (_staticDeleters) _staticDeleters->removeRef(obj); } void -KGlobal::deleteStaticDeleters() +TDEGlobal::deleteStaticDeleters() { - if (!KGlobal::_staticDeleters) + if (!TDEGlobal::_staticDeleters) return; for(;_staticDeleters->count();) @@ -208,18 +208,18 @@ KGlobal::deleteStaticDeleters() _staticDeleters->take(0)->destructObject(); } - delete KGlobal::_staticDeleters; - KGlobal::_staticDeleters = 0; + delete TDEGlobal::_staticDeleters; + TDEGlobal::_staticDeleters = 0; } // The Variables -KStringDict *KGlobal::_stringDict = 0; -TDEInstance *KGlobal::_instance = 0; -TDEInstance *KGlobal::_activeInstance = 0; -KLocale *KGlobal::_locale = 0; -KCharsets *KGlobal::_charsets = 0; -KStaticDeleterList *KGlobal::_staticDeleters = 0; +KStringDict *TDEGlobal::_stringDict = 0; +TDEInstance *TDEGlobal::_instance = 0; +TDEInstance *TDEGlobal::_activeInstance = 0; +KLocale *TDEGlobal::_locale = 0; +KCharsets *TDEGlobal::_charsets = 0; +KStaticDeleterList *TDEGlobal::_staticDeleters = 0; #ifdef WIN32 #include <windows.h> @@ -235,23 +235,23 @@ __attribute__((destructor)) #endif static void kglobal_freeAll() { - delete KGlobal::_locale; - KGlobal::_locale = 0; - delete KGlobal::_charsets; - KGlobal::_charsets = 0; - delete KGlobal::_stringDict; - KGlobal::_stringDict = 0; - KGlobal::deleteStaticDeleters(); + delete TDEGlobal::_locale; + TDEGlobal::_locale = 0; + delete TDEGlobal::_charsets; + TDEGlobal::_charsets = 0; + delete TDEGlobal::_stringDict; + TDEGlobal::_stringDict = 0; + TDEGlobal::deleteStaticDeleters(); // so that we don't hold a reference and see memory leaks :/ - KGlobal::setActiveInstance(0); + TDEGlobal::setActiveInstance(0); } static void kglobal_init() { - if (KGlobal::_staticDeleters) + if (TDEGlobal::_staticDeleters) return; - KGlobal::_staticDeleters = new KStaticDeleterList; + TDEGlobal::_staticDeleters = new KStaticDeleterList; } int kasciistricmp( const char *str1, const char *str2 ) diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h index 5a775ae8c..361129e2b 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -36,14 +36,14 @@ class TQString; /** * Access to the KDE global objects. - * KGlobal provides you with pointers of many central + * TDEGlobal provides you with pointers of many central * objects that exist only once in the process. It is also * responsible for managing instances of KStaticDeleterBase. * * @see KStaticDeleterBase * @author Sirtaj Singh Kang (taj@kde.org) */ -class TDECORE_EXPORT KGlobal +class TDECORE_EXPORT TDEGlobal { public: @@ -108,12 +108,12 @@ public: * * To be used inside functions(!) like: * \code - * static const TQString &myString = KGlobal::staticQString("myText"); + * static const TQString &myString = TDEGlobal::staticQString("myText"); * \endcode * * !!! Do _NOT_ use: !!! * \code - * static TQString myString = KGlobal::staticQString("myText"); + * static TQString myString = TDEGlobal::staticQString("myText"); * \endcode * This creates a static object (instead of a static reference) * and as you know static objects are EVIL. @@ -127,12 +127,12 @@ public: * * To be used inside functions(!) like: * \code - * static const TQString &myString = KGlobal::staticQString(i18n("My Text")); + * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); * \endcode * * !!! Do _NOT_ use: !!! * \code - * static TQString myString = KGlobal::staticQString(i18n("myText")); + * static TQString myString = TDEGlobal::staticQString(i18n("myText")); * \endcode * This creates a static object (instead of a static reference) * and as you know static objects are EVIL. @@ -185,22 +185,22 @@ public: }; /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function to find the minimum of the two arguments. */ #define KMIN(a,b) kMin(a,b) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function to find the maximum of the two arguments. */ #define KMAX(a,b) kMax(a,b) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function to determine the absolute value of the argument. */ #define KABS(a) kAbs(a) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function that returns x if it's between low and high values. * low if x is smaller than then low and high if x is bigger than high. */ diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp index 32ed04f3f..f5fb71027 100644 --- a/tdecore/kglobalaccel.cpp +++ b/tdecore/kglobalaccel.cpp @@ -36,45 +36,45 @@ //---------------------------------------------------- -KGlobalAccel::KGlobalAccel( TQObject* pParent, const char* psName ) +TDEGlobalAccel::TDEGlobalAccel( TQObject* pParent, const char* psName ) : TQObject( pParent, psName ) { - kdDebug(125) << "KGlobalAccel(): this = " << this << endl; - d = new KGlobalAccelPrivate(); + kdDebug(125) << "TDEGlobalAccel(): this = " << this << endl; + d = new TDEGlobalAccelPrivate(); } -KGlobalAccel::~KGlobalAccel() +TDEGlobalAccel::~TDEGlobalAccel() { - kdDebug(125) << "~KGlobalAccel(): this = " << this << endl; + kdDebug(125) << "~TDEGlobalAccel(): this = " << this << endl; delete d; } /* -void KGlobalAccel::clear() +void TDEGlobalAccel::clear() { d->clearActions(); } */ -KAccelActions& KGlobalAccel::actions() +KAccelActions& TDEGlobalAccel::actions() { return d->KAccelBase::actions(); } -const KAccelActions& KGlobalAccel::actions() const +const KAccelActions& TDEGlobalAccel::actions() const { return d->KAccelBase::actions(); } -bool KGlobalAccel::isEnabled() +bool TDEGlobalAccel::isEnabled() { return ((KAccelBase*)d)->isEnabled(); } -void KGlobalAccel::setEnabled( bool bEnabled ) +void TDEGlobalAccel::setEnabled( bool bEnabled ) { d->setEnabled( bEnabled ); } -void KGlobalAccel::suspend( bool s ) +void TDEGlobalAccel::suspend( bool s ) { d->suspend( s ); } -void KGlobalAccel::blockShortcuts( bool block ) - { KGlobalAccelPrivate::blockShortcuts( block ); } +void TDEGlobalAccel::blockShortcuts( bool block ) + { TDEGlobalAccelPrivate::blockShortcuts( block ); } -void KGlobalAccel::disableBlocking( bool disable ) +void TDEGlobalAccel::disableBlocking( bool disable ) { d->disableBlocking( disable ); } -KAccelAction* KGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp, +KAccelAction* TDEGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp, const KShortcut& cutDef3, const KShortcut& cutDef4, const TQObject* pObjSlot, const char* psMethodSlot, bool bConfigurable, bool bEnabled ) @@ -85,55 +85,55 @@ KAccelAction* KGlobalAccel::insert( const TQString& sAction, const TQString& sDe bConfigurable, bEnabled ); } -KAccelAction* KGlobalAccel::insert( const TQString& sName, const TQString& sDesc ) +KAccelAction* TDEGlobalAccel::insert( const TQString& sName, const TQString& sDesc ) { return d->insert( sName, sDesc ); } -bool KGlobalAccel::updateConnections() +bool TDEGlobalAccel::updateConnections() { return d->updateConnections(); } -bool KGlobalAccel::remove( const TQString& sAction ) +bool TDEGlobalAccel::remove( const TQString& sAction ) { return d->remove( sAction ); } -const KShortcut& KGlobalAccel::shortcut( const TQString& sAction ) const +const KShortcut& TDEGlobalAccel::shortcut( const TQString& sAction ) const { const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->shortcut() : KShortcut::null(); } -bool KGlobalAccel::setShortcut( const TQString& sAction, const KShortcut& cut ) +bool TDEGlobalAccel::setShortcut( const TQString& sAction, const KShortcut& cut ) { return d->setShortcut( sAction, cut ); } -bool KGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot ) +bool TDEGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot ) { return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); } -TQString KGlobalAccel::label( const TQString& sAction ) const +TQString TDEGlobalAccel::label( const TQString& sAction ) const { const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->label() : TQString(); } -bool KGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable ) +bool TDEGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable ) { return d->setActionEnabled( sAction, bEnable ); } -const TQString& KGlobalAccel::configGroup() const +const TQString& TDEGlobalAccel::configGroup() const { return d->configGroup(); } // for tdemultimedia/kmix -void KGlobalAccel::setConfigGroup( const TQString& s ) +void TDEGlobalAccel::setConfigGroup( const TQString& s ) { d->setConfigGroup( s ); } -bool KGlobalAccel::readSettings( KConfigBase* pConfig ) +bool TDEGlobalAccel::readSettings( KConfigBase* pConfig ) { d->readSettings( pConfig ); return true; } -bool KGlobalAccel::writeSettings( KConfigBase* pConfig ) const +bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig ) const { d->writeSettings( pConfig ); return true; } -bool KGlobalAccel::writeSettings( KConfigBase* pConfig, bool bGlobal ) const +bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig, bool bGlobal ) const { d->setConfigGlobal( bGlobal ); d->writeSettings( pConfig ); return true; } -bool KGlobalAccel::useFourModifierKeys() +bool TDEGlobalAccel::useFourModifierKeys() { return KAccelAction::useFourModifierKeys(); } -void KGlobalAccel::virtual_hook( int, void* ) +void TDEGlobalAccel::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } #include "kglobalaccel.moc" diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h index 7fb44a021..1389386c4 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/kglobalaccel.h @@ -29,10 +29,10 @@ class KAccelAction; class KAccelActions; class KConfigBase; -class KGlobalAccelPrivate; +class TDEGlobalAccelPrivate; /** -* KGlobalAccel allows you to have global accelerators that are independent of +* TDEGlobalAccel allows you to have global accelerators that are independent of * the focused window. Unlike KAccel it does not matter which window is * currently active. * @@ -42,28 +42,28 @@ class KGlobalAccelPrivate; * @see KKeyDialog * @short Configurable global shortcut support */ -class TDECORE_EXPORT KGlobalAccel : public TQObject +class TDECORE_EXPORT TDEGlobalAccel : public TQObject { Q_OBJECT public: /** - * Creates a new KGlobalAccel object with the given pParent and + * Creates a new TDEGlobalAccel object with the given pParent and * psName. * @param pParent the parent of the QObject * @param psName the name of the QObject */ - KGlobalAccel( TQObject* pParent, const char* psName = 0 ); - virtual ~KGlobalAccel(); + TDEGlobalAccel( TQObject* pParent, const char* psName = 0 ); + virtual ~TDEGlobalAccel(); /** * Checks whether the accelerators are enabled. - * @return true if the KGlobalAccel is enabled + * @return true if the TDEGlobalAccel is enabled */ bool isEnabled(); /** - * Enables or disables the KGlobalAccel - * @param bEnabled true if the KGlobalAccel should be enabled, false if it + * Enables or disables the TDEGlobalAccel + * @param bEnabled true if the TDEGlobalAccel should be enabled, false if it * should be disabled. */ void setEnabled( bool bEnabled ); @@ -171,7 +171,7 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject /** * Read all shortcuts from @p pConfig, or (if @p pConfig * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * @param pConfig the configuration file to read from, or 0 for the application * configuration file * @return true if successful, false otherwise @@ -219,7 +219,7 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject /** * @internal */ - // like setEnabled(), but doesn't ungrab (see in KGlobalAccelPrivate) + // like setEnabled(), but doesn't ungrab (see in TDEGlobalAccelPrivate) void suspend( bool s ); private: @@ -227,13 +227,13 @@ private: KAccelActions& actions(); const KAccelActions& actions() const; - friend class KGlobalAccelPrivate; + friend class TDEGlobalAccelPrivate; friend class KAccelShortcutList; protected: /** \internal */ virtual void virtual_hook( int id, void* data ); private: - class KGlobalAccelPrivate* d; + class TDEGlobalAccelPrivate* d; }; #endif // _KGLOBALACCEL_H_ diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/kglobalaccel_emb.h index 859a53362..8a5352817 100644 --- a/tdecore/kglobalaccel_emb.h +++ b/tdecore/kglobalaccel_emb.h @@ -4,10 +4,10 @@ #include "kaccelbase.h" #include "kshortcut.h" -class KGlobalAccelPrivate +class TDEGlobalAccelPrivate { public: - KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/kglobalaccel_mac.h index 1bed4f3cc..c82bdc17a 100644 --- a/tdecore/kglobalaccel_mac.h +++ b/tdecore/kglobalaccel_mac.h @@ -6,10 +6,10 @@ #include "kshortcut.h" #include "kaccelbase.h" -class KGlobalAccelPrivate: public KAccelBase +class TDEGlobalAccelPrivate: public KAccelBase { public: - KGlobalAccelPrivate() + TDEGlobalAccelPrivate() : KAccelBase(KAccelBase::NATIVE_KEYS) {} diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index 4323320bc..1ea3f0250 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -37,21 +37,21 @@ //---------------------------------------------------- -static TQValueList< KGlobalAccelPrivate* >* all_accels = 0; +static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0; -KGlobalAccelPrivate::KGlobalAccelPrivate() +TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() : KAccelBase( KAccelBase::NATIVE_KEYS ) , m_blocked( false ) , m_blockingDisabled( false ) { if( all_accels == NULL ) - all_accels = new TQValueList< KGlobalAccelPrivate* >; + all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; // kapp->installX11EventFilter( this ); } -KGlobalAccelPrivate::~KGlobalAccelPrivate() +TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() { // TODO: Need to release all grabbed keys if the main window is not shutting down. //for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { @@ -64,17 +64,17 @@ KGlobalAccelPrivate::~KGlobalAccelPrivate() } } -void KGlobalAccelPrivate::setEnabled( bool bEnable ) +void TDEGlobalAccelPrivate::setEnabled( bool bEnable ) { m_bEnabled = bEnable; //updateConnections(); } -void KGlobalAccelPrivate::blockShortcuts( bool block ) +void TDEGlobalAccelPrivate::blockShortcuts( bool block ) { if( all_accels == NULL ) return; - for( TQValueList< KGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); + for( TQValueList< TDEGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); it != all_accels->end(); ++it ) { if( (*it)->m_blockingDisabled ) @@ -84,35 +84,35 @@ void KGlobalAccelPrivate::blockShortcuts( bool block ) } } -void KGlobalAccelPrivate::disableBlocking( bool block ) +void TDEGlobalAccelPrivate::disableBlocking( bool block ) { m_blockingDisabled = block; } -bool KGlobalAccelPrivate::isEnabledInternal() const +bool TDEGlobalAccelPrivate::isEnabledInternal() const { return KAccelBase::isEnabled() && !m_blocked; } -bool KGlobalAccelPrivate::emitSignal( Signal ) +bool TDEGlobalAccelPrivate::emitSignal( Signal ) { return false; } -bool KGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, true, &action ); } -bool KGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) { return grabKey( key, true, 0 ); } -bool KGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, false, &action ); } -bool KGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) { return grabKey( key, false, 0 ); } -bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) +bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) { /* if( !key.code() ) { - kdWarning(125) << "KGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; + kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; return false; } @@ -190,7 +190,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce return false; } -/*bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) +/*bool TDEGlobalAccelPrivate::x11Event( XEvent* pEvent ) { //kdDebug(125) << "x11EventFilter( type = " << pEvent->type << " )" << endl; switch( pEvent->type ) { @@ -206,9 +206,9 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce } } -void KGlobalAccelPrivate::x11MappingNotify() +void TDEGlobalAccelPrivate::x11MappingNotify() { - kdDebug(125) << "KGlobalAccelPrivate::x11MappingNotify()" << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::x11MappingNotify()" << endl; if( m_bEnabled ) { // Maybe the X modifier map has been changed. KKeyServer::initializeMods(); @@ -218,7 +218,7 @@ void KGlobalAccelPrivate::x11MappingNotify() } } -bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) +bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) { // do not change this line unless you really really know what you are doing (Matthias) if ( !TQWidget::keyboardGrabber() && !TQApplication::activePopupWidget() ) { @@ -297,9 +297,9 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) return true; }*/ -void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) +void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) { - kdDebug(125) << "KGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; TQRegExp rexPassIndex( "([ ]*int[ ]*)" ); TQRegExp rexPassInfo( " TQString" ); @@ -333,7 +333,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s } } -void KGlobalAccelPrivate::slotActivated( int iAction ) +void TDEGlobalAccelPrivate::slotActivated( int iAction ) { KAccelAction* pAction = actions().actionPtr( iAction ); if( pAction ) diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h index 414254881..cde46c472 100644 --- a/tdecore/kglobalaccel_win.h +++ b/tdecore/kglobalaccel_win.h @@ -30,13 +30,13 @@ /** * @internal */ -class KGlobalAccelPrivate : public TQWidget, public KAccelBase +class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase { - friend class KGlobalAccel; + friend class TDEGlobalAccel; Q_OBJECT public: - KGlobalAccelPrivate(); - virtual ~KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); + virtual ~TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 260bc39e1..701c954f3 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -77,23 +77,23 @@ static void calculateGrabMasks() //---------------------------------------------------- -static TQValueList< KGlobalAccelPrivate* >* all_accels = 0; +static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0; -KGlobalAccelPrivate::KGlobalAccelPrivate() +TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() : KAccelBase( KAccelBase::NATIVE_KEYS ) , m_blocked( false ) , m_blockingDisabled( false ) , m_suspended( false ) { if( all_accels == NULL ) - all_accels = new TQValueList< KGlobalAccelPrivate* >; + all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; kapp->installX11EventFilter( this ); connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int))); } -KGlobalAccelPrivate::~KGlobalAccelPrivate() +TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() { // TODO: Need to release all grabbed keys if the main window is not shutting down. //for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { @@ -106,17 +106,17 @@ KGlobalAccelPrivate::~KGlobalAccelPrivate() } } -void KGlobalAccelPrivate::setEnabled( bool bEnable ) +void TDEGlobalAccelPrivate::setEnabled( bool bEnable ) { m_bEnabled = bEnable; updateConnections(); } -void KGlobalAccelPrivate::blockShortcuts( bool block ) +void TDEGlobalAccelPrivate::blockShortcuts( bool block ) { if( all_accels == NULL ) return; - for( TQValueList< KGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); + for( TQValueList< TDEGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); it != all_accels->end(); ++it ) { if( (*it)->m_blockingDisabled ) @@ -126,41 +126,41 @@ void KGlobalAccelPrivate::blockShortcuts( bool block ) } } -void KGlobalAccelPrivate::disableBlocking( bool block ) +void TDEGlobalAccelPrivate::disableBlocking( bool block ) { m_blockingDisabled = block; } -bool KGlobalAccelPrivate::isEnabledInternal() const +bool TDEGlobalAccelPrivate::isEnabledInternal() const { return KAccelBase::isEnabled() && !m_blocked; } // see #117169 - the bug is hard to reproduce, probably somewhere in X, testcase would be probably // difficult to make, and so on - just don't release the grabs and only ignore the events instead -void KGlobalAccelPrivate::suspend( bool s ) +void TDEGlobalAccelPrivate::suspend( bool s ) { m_suspended = s; } -bool KGlobalAccelPrivate::emitSignal( Signal ) +bool TDEGlobalAccelPrivate::emitSignal( Signal ) { return false; } -bool KGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, true, &action ); } -bool KGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) { return grabKey( key, true, 0 ); } -bool KGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, false, &action ); } -bool KGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) { return grabKey( key, false, 0 ); } -bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) +bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) { if( !key.code() ) { - kdWarning(125) << "KGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; + kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; return false; } @@ -245,7 +245,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce return !failed; } -bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) +bool TDEGlobalAccelPrivate::x11Event( XEvent* pEvent ) { //kdDebug(125) << "x11EventFilter( type = " << pEvent->type << " )" << endl; switch( pEvent->type ) { @@ -261,9 +261,9 @@ bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) } } -void KGlobalAccelPrivate::x11MappingNotify() +void TDEGlobalAccelPrivate::x11MappingNotify() { - kdDebug(125) << "KGlobalAccelPrivate::x11MappingNotify()" << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::x11MappingNotify()" << endl; // Maybe the X modifier map has been changed. KKeyServer::initializeMods(); calculateGrabMasks(); @@ -271,7 +271,7 @@ void KGlobalAccelPrivate::x11MappingNotify() updateConnections(); } -void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { +void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { CodeMod codemod; codemod.code = keyCode; codemod.mod = 0; @@ -314,7 +314,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { activate( pAction, KKeySequence(key) ); } -bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) +bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) { // do not change this line unless you really really know what you are doing (Matthias) if ( !TQWidget::keyboardGrabber() && !TQApplication::activePopupWidget() ) { @@ -394,9 +394,9 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) return true; } -void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) +void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) { - kdDebug(125) << "KGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; TQRegExp rexPassIndex( "([ ]*int[ ]*)" ); TQRegExp rexPassInfo( " TQString" ); @@ -430,7 +430,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s } } -void KGlobalAccelPrivate::slotActivated( int iAction ) +void TDEGlobalAccelPrivate::slotActivated( int iAction ) { KAccelAction* pAction = KAccelBase::actions().actionPtr( iAction ); if( pAction ) diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h index 3022e0d90..e28df060d 100644 --- a/tdecore/kglobalaccel_x11.h +++ b/tdecore/kglobalaccel_x11.h @@ -30,13 +30,13 @@ /** * @internal */ -class KGlobalAccelPrivate : public TQWidget, public KAccelBase +class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase { - friend class KGlobalAccel; + friend class TDEGlobalAccel; Q_OBJECT public: - KGlobalAccelPrivate(); - virtual ~KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); + virtual ~TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index 74cdaa603..f654608ac 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -58,28 +58,28 @@ static QRgb qt_colorref2qrgb(COLORREF col) #include <X11/Xlib.h> #endif -TQString* KGlobalSettings::s_desktopPath = 0; -TQString* KGlobalSettings::s_autostartPath = 0; -TQString* KGlobalSettings::s_trashPath = 0; -TQString* KGlobalSettings::s_documentPath = 0; -TQFont *KGlobalSettings::_generalFont = 0; -TQFont *KGlobalSettings::_fixedFont = 0; -TQFont *KGlobalSettings::_toolBarFont = 0; -TQFont *KGlobalSettings::_menuFont = 0; -TQFont *KGlobalSettings::_windowTitleFont = 0; -TQFont *KGlobalSettings::_taskbarFont = 0; -TQFont *KGlobalSettings::_largeFont = 0; -TQColor *KGlobalSettings::_trinity4Blue = 0; -TQColor *KGlobalSettings::_inactiveBackground = 0; -TQColor *KGlobalSettings::_inactiveForeground = 0; -TQColor *KGlobalSettings::_activeBackground = 0; -TQColor *KGlobalSettings::_buttonBackground = 0; -TQColor *KGlobalSettings::_selectBackground = 0; -TQColor *KGlobalSettings::_linkColor = 0; -TQColor *KGlobalSettings::_visitedLinkColor = 0; -TQColor *KGlobalSettings::alternateColor = 0; - -KGlobalSettings::KMouseSettings *KGlobalSettings::s_mouseSettings = 0; +TQString* TDEGlobalSettings::s_desktopPath = 0; +TQString* TDEGlobalSettings::s_autostartPath = 0; +TQString* TDEGlobalSettings::s_trashPath = 0; +TQString* TDEGlobalSettings::s_documentPath = 0; +TQFont *TDEGlobalSettings::_generalFont = 0; +TQFont *TDEGlobalSettings::_fixedFont = 0; +TQFont *TDEGlobalSettings::_toolBarFont = 0; +TQFont *TDEGlobalSettings::_menuFont = 0; +TQFont *TDEGlobalSettings::_windowTitleFont = 0; +TQFont *TDEGlobalSettings::_taskbarFont = 0; +TQFont *TDEGlobalSettings::_largeFont = 0; +TQColor *TDEGlobalSettings::_trinity4Blue = 0; +TQColor *TDEGlobalSettings::_inactiveBackground = 0; +TQColor *TDEGlobalSettings::_inactiveForeground = 0; +TQColor *TDEGlobalSettings::_activeBackground = 0; +TQColor *TDEGlobalSettings::_buttonBackground = 0; +TQColor *TDEGlobalSettings::_selectBackground = 0; +TQColor *TDEGlobalSettings::_linkColor = 0; +TQColor *TDEGlobalSettings::_visitedLinkColor = 0; +TQColor *TDEGlobalSettings::alternateColor = 0; + +TDEGlobalSettings::KMouseSettings *TDEGlobalSettings::s_mouseSettings = 0; // helper function for reading xdg user dirs: it is required in order to take // care of locale stuff @@ -106,49 +106,49 @@ void readXdgUserDirs(TQString *desktop, TQString *documents) } } -int KGlobalSettings::dndEventDelay() +int TDEGlobalSettings::dndEventDelay() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readNumEntry("StartDragDist", TQApplication::startDragDistance()); } -bool KGlobalSettings::singleClick() +bool TDEGlobalSettings::singleClick() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK); } -bool KGlobalSettings::iconUseRoundedRect() +bool TDEGlobalSettings::iconUseRoundedRect() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED); } -KGlobalSettings::TearOffHandle KGlobalSettings::insertTearOffHandle() +TDEGlobalSettings::TearOffHandle TDEGlobalSettings::insertTearOffHandle() { int tearoff; bool effectsenabled; - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); effectsenabled = g.readBoolEntry( "EffectsEnabled", false); tearoff = g.readNumEntry("InsertTearOffHandle", KDE_DEFAULT_INSERTTEAROFFHANDLES); return effectsenabled ? (TearOffHandle) tearoff : Disable; } -bool KGlobalSettings::changeCursorOverIcon() +bool TDEGlobalSettings::changeCursorOverIcon() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ChangeCursor", KDE_DEFAULT_CHANGECURSOR); } -bool KGlobalSettings::visualActivate() +bool TDEGlobalSettings::visualActivate() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("VisualActivate", KDE_DEFAULT_VISUAL_ACTIVATE); } -unsigned int KGlobalSettings::visualActivateSpeed() +unsigned int TDEGlobalSettings::visualActivateSpeed() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry( "VisualActivateSpeed", @@ -158,16 +158,16 @@ unsigned int KGlobalSettings::visualActivateSpeed() -int KGlobalSettings::autoSelectDelay() +int TDEGlobalSettings::autoSelectDelay() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry("AutoSelectDelay", KDE_DEFAULT_AUTOSELECTDELAY); } -KGlobalSettings::Completion KGlobalSettings::completionMode() +TDEGlobalSettings::Completion TDEGlobalSettings::completionMode() { int completion; - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); completion = g.readNumEntry("completionMode", -1); if ((completion < (int) CompletionNone) || (completion > (int) CompletionPopupAuto)) @@ -177,51 +177,51 @@ KGlobalSettings::Completion KGlobalSettings::completionMode() return (Completion) completion; } -bool KGlobalSettings::showContextMenusOnPress () +bool TDEGlobalSettings::showContextMenusOnPress () { - KConfigGroup g(KGlobal::config(), "ContextMenus"); + KConfigGroup g(TDEGlobal::config(), "ContextMenus"); return g.readBoolEntry("ShowOnPress", true); } -int KGlobalSettings::contextMenuKey () +int TDEGlobalSettings::contextMenuKey () { - KConfigGroup g(KGlobal::config(), "Shortcuts"); + KConfigGroup g(TDEGlobal::config(), "Shortcuts"); KShortcut cut (g.readEntry ("PopupMenuContext", "Menu")); return cut.keyCodeQt(); } -TQColor KGlobalSettings::toolBarHighlightColor() +TQColor TDEGlobalSettings::toolBarHighlightColor() { initColors(); - KConfigGroup g( KGlobal::config(), "Toolbar style" ); + KConfigGroup g( TDEGlobal::config(), "Toolbar style" ); return g.readColorEntry("HighlightColor", _trinity4Blue); } -TQColor KGlobalSettings::inactiveTitleColor() +TQColor TDEGlobalSettings::inactiveTitleColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION)); #else if (!_inactiveBackground) _inactiveBackground = new TQColor(157, 170, 186); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "inactiveBackground", _inactiveBackground ); #endif } -TQColor KGlobalSettings::inactiveTextColor() +TQColor TDEGlobalSettings::inactiveTextColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)); #else if (!_inactiveForeground) _inactiveForeground = new TQColor(221,221,221); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "inactiveForeground", _inactiveForeground ); #endif } -TQColor KGlobalSettings::activeTitleColor() +TQColor TDEGlobalSettings::activeTitleColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); @@ -229,89 +229,89 @@ TQColor KGlobalSettings::activeTitleColor() initColors(); if (!_activeBackground) _activeBackground = new TQColor(65,142,220); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "activeBackground", _activeBackground); #endif } -TQColor KGlobalSettings::activeTextColor() +TQColor TDEGlobalSettings::activeTextColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)); #else - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "activeForeground", tqwhiteptr ); #endif } -int KGlobalSettings::contrast() +int TDEGlobalSettings::contrast() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry( "contrast", 7 ); } -TQColor KGlobalSettings::buttonBackground() +TQColor TDEGlobalSettings::buttonBackground() { if (!_buttonBackground) _buttonBackground = new TQColor(221,223,228); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "buttonBackground", _buttonBackground ); } -TQColor KGlobalSettings::buttonTextColor() +TQColor TDEGlobalSettings::buttonTextColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "buttonForeground", tqblackptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::baseColor() +TQColor TDEGlobalSettings::baseColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "windowBackground", tqwhiteptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::textColor() +TQColor TDEGlobalSettings::textColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "windowForeground", tqblackptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::highlightedTextColor() +TQColor TDEGlobalSettings::highlightedTextColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "selectForeground", tqwhiteptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::highlightColor() +TQColor TDEGlobalSettings::highlightColor() { initColors(); if (!_selectBackground) _selectBackground = new TQColor(103,141,178); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "selectBackground", _selectBackground ); } -TQColor KGlobalSettings::alternateBackgroundColor() +TQColor TDEGlobalSettings::alternateBackgroundColor() { initColors(); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *alternateColor = calculateAlternateBackgroundColor( baseColor() ); return g.readColorEntry( "alternateBackground", alternateColor ); } -TQColor KGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) +TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) { if (base == Qt::white) return TQColor(238,246,255); @@ -328,30 +328,30 @@ TQColor KGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) } } -bool KGlobalSettings::shadeSortColumn() +bool TDEGlobalSettings::shadeSortColumn() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readBoolEntry( "shadeSortColumn", KDE_DEFAULT_SHADE_SORT_COLUMN ); } -TQColor KGlobalSettings::linkColor() +TQColor TDEGlobalSettings::linkColor() { initColors(); if (!_linkColor) _linkColor = new TQColor(0,0,238); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "linkColor", _linkColor ); } -TQColor KGlobalSettings::visitedLinkColor() +TQColor TDEGlobalSettings::visitedLinkColor() { if (!_visitedLinkColor) _visitedLinkColor = new TQColor(82,24,139); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "visitedLinkColor", _visitedLinkColor ); } -TQFont KGlobalSettings::generalFont() +TQFont TDEGlobalSettings::generalFont() { if (_generalFont) return *_generalFont; @@ -361,13 +361,13 @@ TQFont KGlobalSettings::generalFont() _generalFont->setPointSize(10); _generalFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_generalFont = g.readFontEntry("font", _generalFont); return *_generalFont; } -TQFont KGlobalSettings::fixedFont() +TQFont TDEGlobalSettings::fixedFont() { if (_fixedFont) return *_fixedFont; @@ -377,13 +377,13 @@ TQFont KGlobalSettings::fixedFont() _fixedFont->setPointSize(10); _fixedFont->setStyleHint(TQFont::TypeWriter); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_fixedFont = g.readFontEntry("fixed", _fixedFont); return *_fixedFont; } -TQFont KGlobalSettings::toolBarFont() +TQFont TDEGlobalSettings::toolBarFont() { if(_toolBarFont) return *_toolBarFont; @@ -393,13 +393,13 @@ TQFont KGlobalSettings::toolBarFont() _toolBarFont->setPointSize(10); _toolBarFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_toolBarFont = g.readFontEntry("toolBarFont", _toolBarFont); return *_toolBarFont; } -TQFont KGlobalSettings::menuFont() +TQFont TDEGlobalSettings::menuFont() { if(_menuFont) return *_menuFont; @@ -409,13 +409,13 @@ TQFont KGlobalSettings::menuFont() _menuFont->setPointSize(10); _menuFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_menuFont = g.readFontEntry("menuFont", _menuFont); return *_menuFont; } -TQFont KGlobalSettings::windowTitleFont() +TQFont TDEGlobalSettings::windowTitleFont() { if(_windowTitleFont) return *_windowTitleFont; @@ -425,13 +425,13 @@ TQFont KGlobalSettings::windowTitleFont() _windowTitleFont->setPointSize(10); _windowTitleFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); *_windowTitleFont = g.readFontEntry("activeFont", _windowTitleFont); // inconsistency return *_windowTitleFont; } -TQFont KGlobalSettings::taskbarFont() +TQFont TDEGlobalSettings::taskbarFont() { if(_taskbarFont) return *_taskbarFont; @@ -441,14 +441,14 @@ TQFont KGlobalSettings::taskbarFont() _taskbarFont->setPointSize(10); _taskbarFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_taskbarFont = g.readFontEntry("taskbarFont", _taskbarFont); return *_taskbarFont; } -TQFont KGlobalSettings::largeFont(const TQString &text) +TQFont TDEGlobalSettings::largeFont(const TQString &text) { TQFontDatabase db; TQStringList fam = db.families(); @@ -501,12 +501,12 @@ TQFont KGlobalSettings::largeFont(const TQString &text) return *_largeFont; } } - _largeFont = new TQFont(KGlobalSettings::generalFont()); + _largeFont = new TQFont(TDEGlobalSettings::generalFont()); _largeFont->setPointSize(48); return *_largeFont; } -void KGlobalSettings::initStatic() // should be called initPaths(). Don't put anything else here. +void TDEGlobalSettings::initStatic() // should be called initPaths(). Don't put anything else here. { if ( s_desktopPath != 0 ) return; @@ -516,7 +516,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an s_trashPath = new TQString(); s_documentPath = new TQString(); - KConfigGroup g( KGlobal::config(), "Paths" ); + KConfigGroup g( TDEGlobal::config(), "Paths" ); // Read desktop and documents path using XDG_USER_DIRS readXdgUserDirs(s_desktopPath, s_documentPath); @@ -553,7 +553,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an } // Autostart Path - *s_autostartPath = KGlobal::dirs()->localtdedir() + "Autostart/"; + *s_autostartPath = TDEGlobal::dirs()->localtdedir() + "Autostart/"; *s_autostartPath = g.readPathEntry( "Autostart" , *s_autostartPath); *s_autostartPath = TQDir::cleanDirPath( *s_autostartPath ); if ( !s_autostartPath->endsWith("/") ) @@ -564,7 +564,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an kapp->addKipcEventMask(KIPC::SettingsChanged); } -void KGlobalSettings::initColors() +void TDEGlobalSettings::initColors() { if (!_trinity4Blue) { if (TQPixmap::defaultDepth() > 8) @@ -576,7 +576,7 @@ void KGlobalSettings::initColors() alternateColor = new TQColor(237, 244, 249); } -void KGlobalSettings::rereadFontSettings() +void TDEGlobalSettings::rereadFontSettings() { delete _generalFont; _generalFont = 0L; @@ -592,9 +592,9 @@ void KGlobalSettings::rereadFontSettings() _taskbarFont = 0L; } -void KGlobalSettings::rereadPathSettings() +void TDEGlobalSettings::rereadPathSettings() { - kdDebug() << "KGlobalSettings::rereadPathSettings" << endl; + kdDebug() << "TDEGlobalSettings::rereadPathSettings" << endl; delete s_autostartPath; s_autostartPath = 0L; delete s_trashPath; @@ -605,7 +605,7 @@ void KGlobalSettings::rereadPathSettings() s_documentPath = 0L; } -KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings() +TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() { if ( ! s_mouseSettings ) { @@ -613,7 +613,7 @@ KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings() KMouseSettings & s = *s_mouseSettings; // for convenience #ifndef Q_WS_WIN - KConfigGroup g( KGlobal::config(), "Mouse" ); + KConfigGroup g( TDEGlobal::config(), "Mouse" ); TQString setting = g.readEntry("MouseButtonMapping"); if (setting == "RightHanded") s.handed = KMouseSettings::RightHanded; @@ -655,7 +655,7 @@ KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings() return *s_mouseSettings; } -void KGlobalSettings::rereadMouseSettings() +void TDEGlobalSettings::rereadMouseSettings() { #ifndef Q_WS_WIN delete s_mouseSettings; @@ -663,7 +663,7 @@ void KGlobalSettings::rereadMouseSettings() #endif } -bool KGlobalSettings::isMultiHead() +bool TDEGlobalSettings::isMultiHead() { #ifdef Q_WS_WIN return GetSystemMetrics(SM_CMONITORS) > 1; @@ -676,18 +676,18 @@ bool KGlobalSettings::isMultiHead() #endif } -bool KGlobalSettings::wheelMouseZooms() +bool TDEGlobalSettings::wheelMouseZooms() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry( "WheelMouseZooms", KDE_DEFAULT_WHEEL_ZOOM ); } -TQRect KGlobalSettings::splashScreenDesktopGeometry() +TQRect TDEGlobalSettings::splashScreenDesktopGeometry() { TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(KGlobal::config(), "Windows"); + KConfigGroup group(TDEGlobal::config(), "Windows"); int scr = group.readNumEntry("Unmanaged", -3); if (group.readBoolEntry("XineramaEnabled", true) && scr != -2) { if (scr == -3) @@ -701,12 +701,12 @@ TQRect KGlobalSettings::splashScreenDesktopGeometry() } } -TQRect KGlobalSettings::desktopGeometry(const TQPoint& point) +TQRect TDEGlobalSettings::desktopGeometry(const TQPoint& point) { TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(KGlobal::config(), "Windows"); + KConfigGroup group(TDEGlobal::config(), "Windows"); if (group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaPlacementEnabled", true)) { return dw->screenGeometry(dw->screenNumber(point)); @@ -718,12 +718,12 @@ TQRect KGlobalSettings::desktopGeometry(const TQPoint& point) } } -TQRect KGlobalSettings::desktopGeometry(TQWidget* w) +TQRect TDEGlobalSettings::desktopGeometry(TQWidget* w) { TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(KGlobal::config(), "Windows"); + KConfigGroup group(TDEGlobal::config(), "Windows"); if (group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaPlacementEnabled", true)) { if (w) @@ -737,38 +737,38 @@ TQRect KGlobalSettings::desktopGeometry(TQWidget* w) } } -bool KGlobalSettings::showIconsOnPushButtons() +bool TDEGlobalSettings::showIconsOnPushButtons() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ShowIconsOnPushButtons", KDE_DEFAULT_ICON_ON_PUSHBUTTON); } -bool KGlobalSettings::showFilePreview(const KURL &url) +bool TDEGlobalSettings::showFilePreview(const KURL &url) { - KConfigGroup g(KGlobal::config(), "PreviewSettings"); + KConfigGroup g(TDEGlobal::config(), "PreviewSettings"); TQString protocol = url.protocol(); bool defaultSetting = KProtocolInfo::showFilePreview( protocol ); return g.readBoolEntry(protocol, defaultSetting ); } -bool KGlobalSettings::showKonqIconActivationEffect() +bool TDEGlobalSettings::showKonqIconActivationEffect() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT); } -bool KGlobalSettings::opaqueResize() +bool TDEGlobalSettings::opaqueResize() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("OpaqueResize", KDE_DEFAULT_OPAQUE_RESIZE); } -int KGlobalSettings::buttonLayout() +int TDEGlobalSettings::buttonLayout() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry("ButtonLayout", KDE_DEFAULT_BUTTON_LAYOUT); } diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h index 5fad8fa5a..2d3adc5e1 100644 --- a/tdecore/kglobalsettings.h +++ b/tdecore/kglobalsettings.h @@ -45,7 +45,7 @@ class KURL; * * @author David Faure <faure@kde.org> */ -class TDECORE_EXPORT KGlobalSettings +class TDECORE_EXPORT TDEGlobalSettings { public: @@ -74,7 +74,7 @@ class TDECORE_EXPORT KGlobalSettings * { * if( !(e->state() && LeftButton)) return; * - * int delay = KGlobalSettings::dndEventDelay(); + * int delay = TDEGlobalSettings::dndEventDelay(); * TQPoint newPos = e->pos(); * if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay || * newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay) diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index 7525e6760..546ef99eb 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -63,7 +63,7 @@ KIconEffect::~KIconEffect() void KIconEffect::init() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); int i, j, effect=-1; TQStringList groups; @@ -190,7 +190,7 @@ TQImage KIconEffect::apply(TQImage image, int group, int state) const TQImage KIconEffect::apply(TQImage image, int effect, float value, const TQColor col, bool trans) const { - return apply (image, effect, value, col, KGlobalSettings::baseColor(), trans); + return apply (image, effect, value, col, TDEGlobalSettings::baseColor(), trans); } TQImage KIconEffect::apply(TQImage image, int effect, float value, const TQColor col, const TQColor col2, bool trans) const @@ -248,7 +248,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int group, int state) const TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value, const TQColor col, bool trans) const { - return apply (pixmap, effect, value, col, KGlobalSettings::baseColor(), trans); + return apply (pixmap, effect, value, col, TDEGlobalSettings::baseColor(), trans); } TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value, @@ -706,10 +706,10 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay) void KIconEffect::visualActivate(TQWidget * widget, TQRect rect) { - if (!KGlobalSettings::visualActivate()) + if (!TDEGlobalSettings::visualActivate()) return; - uint actSpeed = KGlobalSettings::visualActivateSpeed(); + uint actSpeed = TDEGlobalSettings::visualActivateSpeed(); uint actCount = QMIN(rect.width(), rect.height()) / 2; @@ -774,7 +774,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect) void KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap) { - if (!KGlobalSettings::visualActivate()) + if (!TDEGlobalSettings::visualActivate()) return; // Image too big to display smoothly @@ -783,7 +783,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap) return; } - uint actSpeed = KGlobalSettings::visualActivateSpeed(); + uint actSpeed = TDEGlobalSettings::visualActivateSpeed(); uint actCount = TQMIN(rect.width(), rect.height()) / 4; diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index f413b75f3..01aaa84fd 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -184,11 +184,11 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs ) if (_dirs) d->mpDirs = _dirs; else - d->mpDirs = KGlobal::dirs(); + d->mpDirs = TDEGlobal::dirs(); TQString appname = _appname; if (appname.isEmpty()) - appname = KGlobal::instance()->instanceName(); + appname = TDEGlobal::instance()->instanceName(); // Add the default theme and its base themes to the theme tree KIconTheme *def = new KIconTheme(KIconTheme::current(), appname); @@ -214,7 +214,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs ) // These have to match the order in kicontheme.h static const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", 0L }; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs(config, "dummy"); // loading config and default sizes @@ -349,7 +349,7 @@ void KIconLoader::addExtraDesktopThemes() if ( d->extraDesktopIconsLoaded ) return; TQStringList list; - TQStringList icnlibs = KGlobal::dirs()->resourceDirs("icon"); + TQStringList icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::ConstIterator it; char buf[1000]; int r; @@ -406,15 +406,15 @@ TQString KIconLoader::removeIconExtension(const TQString &name) const TQString ext = name.right(4); - static const TQString &png_ext = KGlobal::staticQString(".png"); - static const TQString &xpm_ext = KGlobal::staticQString(".xpm"); + static const TQString &png_ext = TDEGlobal::staticQString(".png"); + static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); if (ext == png_ext || ext == xpm_ext) extensionLength=4; #ifdef HAVE_LIBART else { - static const TQString &svgz_ext = KGlobal::staticQString(".svgz"); - static const TQString &svg_ext = KGlobal::staticQString(".svg"); + static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); + static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); if (name.right(5) == svgz_ext) extensionLength=5; @@ -437,7 +437,7 @@ TQString KIconLoader::removeIconExtensionInternal(const TQString &name) const #ifndef NDEBUG if (name != name_noext) { - kdDebug(264) << "Application " << KGlobal::instance()->instanceName() + kdDebug(264) << "Application " << TDEGlobal::instance()->instanceName() << " loads icon " << name << " with extension." << endl; } #endif @@ -451,15 +451,15 @@ KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const const TQString *ext[4]; int count=0; - static const TQString &png_ext = KGlobal::staticQString(".png"); + static const TQString &png_ext = TDEGlobal::staticQString(".png"); ext[count++]=&png_ext; #ifdef HAVE_LIBART - static const TQString &svgz_ext = KGlobal::staticQString(".svgz"); + static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); ext[count++]=&svgz_ext; - static const TQString &svg_ext = KGlobal::staticQString(".svg"); + static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); ext[count++]=&svg_ext; #endif - static const TQString &xpm_ext = KGlobal::staticQString(".xpm"); + static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); ext[count++]=&xpm_ext; /* JRT: To follow the XDG spec, the order in which we look for an @@ -495,7 +495,7 @@ KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const inline TQString KIconLoader::unknownIconPath( int size ) const { - static const TQString &str_unknown = KGlobal::staticQString("unknown"); + static const TQString &str_unknown = TDEGlobal::staticQString("unknown"); KIcon icon = findMatchingIcon(str_unknown, size); if (!icon.isValid()) @@ -523,13 +523,13 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size, TQString path; if (group_or_size == KIcon::User) { - static const TQString &png_ext = KGlobal::staticQString(".png"); - static const TQString &xpm_ext = KGlobal::staticQString(".xpm"); + static const TQString &png_ext = TDEGlobal::staticQString(".png"); + static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); path = d->mpDirs->findResource("appicon", name + png_ext); #ifdef HAVE_LIBART - static const TQString &svgz_ext = KGlobal::staticQString(".svgz"); - static const TQString &svg_ext = KGlobal::staticQString(".svg"); + static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); + static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); if (path.isEmpty()) path = d->mpDirs->findResource("appicon", name + svgz_ext); if (path.isEmpty()) @@ -595,7 +595,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si } if (!TQDir::isRelativePath(name)) absolutePath=true; - static const TQString &str_unknown = KGlobal::staticQString("unknown"); + static const TQString &str_unknown = TDEGlobal::staticQString("unknown"); // Special case for "User" icons. if (group == KIcon::User) @@ -1241,7 +1241,7 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS if( !(*it).valid ) { #ifdef NDEBUG - loader = KGlobal::iconLoader(); + loader = TDEGlobal::iconLoader(); iconName = "no_way_man_you_will_get_broken_icon"; #else kdWarning() << "Using already destroyed KIconLoader for loading an icon!" << endl; @@ -1260,7 +1260,7 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS if( !found ) { #ifdef NDEBUG - loader = KGlobal::iconLoader(); + loader = TDEGlobal::iconLoader(); iconName = "no_way_man_you_will_get_broken_icon"; #else kdWarning() << "Using unknown KIconLoader for loading an icon!" << endl; @@ -1391,7 +1391,7 @@ TQPixmap KIconLoader::unknown() if ( TQPixmapCache::find("unknown", pix) ) return pix; - TQString path = KGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true); + TQString path = TDEGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true); if (path.isEmpty()) { kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl; diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h index 2ad23ae38..9cac06c5d 100644 --- a/tdecore/kiconloader.h +++ b/tdecore/kiconloader.h @@ -86,10 +86,10 @@ public: * @param dirs the KStandardDirs object to use. If null the global one is used * * Usually, you use the default iconloader, which can be accessed via - * KGlobal::iconLoader(), so you hardly ever have to create an + * TDEGlobal::iconLoader(), so you hardly ever have to create an * iconloader object yourself. That one is the current TDEInstance's * (typically TDEApplication's) iconloader. - * @see KGlobal::iconLoader() + * @see TDEGlobal::iconLoader() * @see TDEInstance::iconLoader() */ KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0); @@ -299,7 +299,7 @@ public: * 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. + * from TDEGlobal will be taken. */ void reconfigure( const TQString& _appname, KStandardDirs *_dirs ); @@ -447,7 +447,7 @@ public: */ TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -460,14 +460,14 @@ TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance) * Load a desktop icon, and apply the necessary effects to get an IconSet. */ TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader * Load a toolbar icon. */ TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -480,7 +480,7 @@ TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, TDEInstance *instance); * Load a toolbar icon, and apply the necessary effects to get an IconSet. */ TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -488,7 +488,7 @@ TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0, */ TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -501,7 +501,7 @@ TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, TDEInstance *instance); * Load a small icon, and apply the necessary effects to get an IconSet. */ TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -509,7 +509,7 @@ TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0, */ TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -522,14 +522,14 @@ TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance) * Load a main toolbar icon, and apply the effects to get an IconSet. */ TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::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, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -542,12 +542,12 @@ TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, TDEInstance *instance); * Load a user icon, and apply the effects to get an IconSet. */ TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader * Returns the current icon size for a specific group. */ -TDECORE_EXPORT int IconSize(KIcon::Group group, TDEInstance *instance=KGlobal::instance()); +TDECORE_EXPORT int IconSize(KIcon::Group group, TDEInstance *instance=TDEGlobal::instance()); #endif // __KIconLoader_h_Included__ diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index d30e254d0..103d37a05 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -95,7 +95,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) if (!appName.isEmpty() && ( name == "crystalsvg" || name== "hicolor" || name == "locolor" ) ) { - icnlibs = KGlobal::dirs()->resourceDirs("data"); + icnlibs = TDEGlobal::dirs()->resourceDirs("data"); for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { cDir = *it + appName + "/icons/" + name; @@ -105,11 +105,11 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) } // Find the theme description file. These are always global. - icnlibs = KGlobal::dirs()->resourceDirs("icon"); - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-icon"); + icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-icon"); icnlibs += "/usr/share/pixmaps"; // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap"); for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { cDir = *it + name + "/"; @@ -448,7 +448,7 @@ TQString KIconTheme::current() return *_theme; _theme = new TQString(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Icons"); *_theme = config->readEntry("Theme",defaultThemeName()); if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); @@ -470,11 +470,11 @@ TQStringList KIconTheme::list() return *_theme_list; _theme_list = new TQStringList(); - TQStringList icnlibs = KGlobal::dirs()->resourceDirs("icon"); - icnlibs += (KGlobal::dirs()->resourceDirs("xdgdata-icon")); + TQStringList icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); + icnlibs += (TDEGlobal::dirs()->resourceDirs("xdgdata-icon")); icnlibs += "/usr/share/pixmaps"; // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap"); TQStringList::ConstIterator it; for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp index 6d37c3dbc..13e29c049 100644 --- a/tdecore/kinstance.cpp +++ b/tdecore/kinstance.cpp @@ -78,10 +78,10 @@ TDEInstance::TDEInstance( const TQCString& name) { DEBUG_ADD Q_ASSERT(!name.isEmpty()); - if (!KGlobal::_instance) + if (!TDEGlobal::_instance) { - KGlobal::_instance = this; - KGlobal::setActiveInstance(this); + TDEGlobal::_instance = this; + TDEGlobal::setActiveInstance(this); } d = new TDEInstancePrivate (); @@ -99,10 +99,10 @@ TDEInstance::TDEInstance( const TDEAboutData * aboutData ) DEBUG_ADD Q_ASSERT(!_name.isEmpty()); - if (!KGlobal::_instance) + if (!TDEGlobal::_instance) { - KGlobal::_instance = this; - KGlobal::setActiveInstance(this); + TDEGlobal::_instance = this; + TDEGlobal::setActiveInstance(this); } d = new TDEInstancePrivate (); @@ -120,10 +120,10 @@ TDEInstance::TDEInstance( TDEInstance* src ) DEBUG_ADD Q_ASSERT(!_name.isEmpty()); - if (!KGlobal::_instance || KGlobal::_instance == src ) + if (!TDEGlobal::_instance || TDEGlobal::_instance == src ) { - KGlobal::_instance = this; - KGlobal::setActiveInstance(this); + TDEGlobal::_instance = this; + TDEGlobal::setActiveInstance(this); } d = new TDEInstancePrivate (); @@ -164,10 +164,10 @@ TDEInstance::~TDEInstance() delete _dirs; _dirs = 0; - if (KGlobal::_instance == this) - KGlobal::_instance = 0; - if (KGlobal::activeInstance() == this) - KGlobal::setActiveInstance(0); + if (TDEGlobal::_instance == this) + TDEGlobal::_instance = 0; + if (TDEGlobal::activeInstance() == this) + TDEGlobal::setActiveInstance(0); DEBUG_REMOVE } diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h index 36d463d8a..775fe3bdf 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -38,7 +38,7 @@ class TDEGlobalNetworkManager; * Access to KDE global objects for use in shared libraries. In * practical terms, this class is used in KDE components. This allows * components to store things that normally would be accessed by - * KGlobal. + * TDEGlobal. * * @author Torben Weis */ diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index c12cde7e6..d0ec7583d 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -361,7 +361,7 @@ bool initializeMods() XFreeModifiermap( xmk ); - //KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); + //KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); // read in mod that win should be attached to g_bInitializedMods = true; @@ -380,11 +380,11 @@ static void initializeVariations() static void intializeKKeyLabels() { - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - g_rgModInfo[0].sLabel = KGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) ); - g_rgModInfo[1].sLabel = KGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) ); - g_rgModInfo[2].sLabel = KGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) ); - g_rgModInfo[3].sLabel = KGlobal::config()->readEntry( "Label Win", i18n(g_rgModInfo[3].psName) ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + g_rgModInfo[0].sLabel = TDEGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) ); + g_rgModInfo[1].sLabel = TDEGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) ); + g_rgModInfo[2].sLabel = TDEGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) ); + g_rgModInfo[3].sLabel = TDEGlobal::config()->readEntry( "Label Win", i18n(g_rgModInfo[3].psName) ); g_bMacLabels = (g_rgModInfo[2].sLabel == "Command"); g_bInitializedKKeyLabels = true; } diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h index 9f080b88b..3e8f9ff45 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -273,7 +273,7 @@ public: * ".la" will be appended. * @param instance a TDEInstance used to get the standard paths */ - static TQString findLibrary( const char * name, const TDEInstance * instance = KGlobal::instance() ); + static TQString findLibrary( const char * name, const TDEInstance * instance = TDEGlobal::instance() ); protected: KLibLoader( TQObject* parent = 0, const char* name = 0 ); @@ -311,7 +311,7 @@ private: * \code * s_global = new TDEInstance( "kspread" ); * \endcode - * This TDEInstance is comparable to KGlobal used by normal applications. + * This TDEInstance is comparable to TDEGlobal 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 43c21ef2e..6b64abbd8 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -94,7 +94,7 @@ KLocale::KLocale( const TQString & catalog, KConfig * config ) KConfig *cfg = d->config; this_klocale = this; - if (!cfg) cfg = KGlobal::instance()->config(); + if (!cfg) cfg = TDEGlobal::instance()->config(); this_klocale = 0; Q_ASSERT( cfg ); @@ -298,7 +298,7 @@ void KLocale::doFormatInit() const void KLocale::initFormat() { KConfig *config = d->config; - if (!config) config = KGlobal::instance()->config(); + if (!config) config = TDEGlobal::instance()->config(); Q_ASSERT( config ); kdDebug(173) << "KLocale::initFormat" << endl; @@ -306,8 +306,8 @@ void KLocale::initFormat() // make sure the config files are read using the correct locale // ### Why not add a KConfigBase::setLocale( const KLocale * )? // ### Then we could remove this hack - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = this; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = this; KConfigGroupSaver saver(config, "Locale"); @@ -385,7 +385,7 @@ void KLocale::initFormat() d->dateMonthNamePossessive); // end of hack - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } bool KLocale::setCountry(const TQString & country) @@ -695,7 +695,7 @@ void KLocale::removeCatalogue(const TQString &catalog) { if ( d->catalogNames.contains( catalog )) { d->catalogNames.remove( catalog ); - if (KGlobal::_instance) + if (TDEGlobal::_instance) updateCatalogues(); // walk through the KCatalogue instances and weed out everything we no longer need } } @@ -1976,7 +1976,7 @@ TQString KLocale::formatDateTime(const TQDateTime &pDateTime, TQString i18n(const char* text) { - register KLocale *instance = KGlobal::locale(); + register KLocale *instance = TDEGlobal::locale(); if (instance) return instance->translate(text); return TQString::fromUtf8(text); @@ -1984,7 +1984,7 @@ TQString i18n(const char* text) TQString i18n(const char* index, const char *text) { - register KLocale *instance = KGlobal::locale(); + register KLocale *instance = TDEGlobal::locale(); if (instance) return instance->translate(index, text); return TQString::fromUtf8(text); @@ -1992,7 +1992,7 @@ TQString i18n(const char* index, const char *text) TQString i18n(const char* singular, const char* plural, unsigned long n) { - register KLocale *instance = KGlobal::locale(); + register KLocale *instance = TDEGlobal::locale(); if (instance) return instance->translate(singular, plural, n); if (n == 1) @@ -2003,15 +2003,15 @@ TQString i18n(const char* singular, const char* plural, unsigned long n) void KLocale::initInstance() { - if (KGlobal::_locale) + if (TDEGlobal::_locale) return; - TDEInstance *app = KGlobal::instance(); + TDEInstance *app = TDEGlobal::instance(); if (app) { - KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); + TDEGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); // only do this for the global instance - TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding()); + TQTextCodec::setCodecForLocale(TDEGlobal::_locale->codecForEncoding()); } else kdDebug(173) << "no app name available using KLocale - nothing to do\n"; @@ -2022,12 +2022,12 @@ TQString KLocale::langLookup(const TQString &fname, const char *rtype) TQStringList search; // assemble the local search paths - const TQStringList localDoc = KGlobal::dirs()->resourceDirs(rtype); + const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs(rtype); // look up the different languages for (int id=localDoc.count()-1; id >= 0; --id) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( defaultLanguage() ); TQStringList::ConstIterator lang; @@ -2380,7 +2380,7 @@ TQString KLocale::twoAlphaToLanguageName(const TQString &code) const TQStringList KLocale::allCountriesTwoAlpha() const { TQStringList countries; - TQStringList paths = KGlobal::dirs()->findAllResources("locale", "l10n/*/entry.desktop"); + TQStringList paths = TDEGlobal::dirs()->findAllResources("locale", "l10n/*/entry.desktop"); for(TQStringList::ConstIterator it = paths.begin(); it != paths.end(); ++it) { diff --git a/tdecore/klocale.h b/tdecore/klocale.h index ce9dad46b..42619afd4 100644 --- a/tdecore/klocale.h +++ b/tdecore/klocale.h @@ -31,7 +31,7 @@ class TQDate; class TQTime; class TQDateTime; -class KGlobal; +class TDEGlobal; class KConfig; class KConfigBase; class KLocalePrivate; @@ -123,7 +123,7 @@ inline TQString tr2i18n(const char* message, const char* =0) { */ class TDECORE_EXPORT KLocale { - friend class KGlobal; // for initInstance() + friend class TDEGlobal; // for initInstance() public: /** * Constructs a KLocale with the given catalog name. @@ -1173,7 +1173,7 @@ private: protected: /** - * @internal Creates a KLocale object for KGlobal and inits the locale + * @internal Creates a KLocale object for TDEGlobal and inits the locale * pointer. */ static void initInstance(); diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h index 7090b1733..e18c7d888 100644 --- a/tdecore/kmimesourcefactory.h +++ b/tdecore/kmimesourcefactory.h @@ -46,7 +46,7 @@ public: * * @param loader is the iconloader used to find images. */ - KMimeSourceFactory (KIconLoader* loader = KGlobal::iconLoader()); + KMimeSourceFactory (KIconLoader* loader = TDEGlobal::iconLoader()); /** * Destructor. diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp index 073dff626..c06184221 100644 --- a/tdecore/kpalette.cpp +++ b/tdecore/kpalette.cpp @@ -34,7 +34,7 @@ TQStringList KPalette::getPaletteList() { TQStringList paletteList; - KGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList); + TDEGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList); int strip = strlen("colors/"); for(TQStringList::Iterator it = paletteList.begin(); diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp index d8170c0a8..76ad0b167 100644 --- a/tdecore/kprocctrl.cpp +++ b/tdecore/kprocctrl.cpp @@ -33,29 +33,29 @@ #include <tqsocketnotifier.h> -KProcessController *KProcessController::theKProcessController; -int KProcessController::refCount; +TDEProcessController *TDEProcessController::theTDEProcessController; +int TDEProcessController::refCount; -void KProcessController::ref() +void TDEProcessController::ref() { if( !refCount ) { - theKProcessController = new KProcessController; + theTDEProcessController = new TDEProcessController; setupHandlers(); } refCount++; } -void KProcessController::deref() +void TDEProcessController::deref() { refCount--; if( !refCount ) { resetHandlers(); - delete theKProcessController; - theKProcessController = 0; + delete theTDEProcessController; + theTDEProcessController = 0; } } -KProcessController::KProcessController() +TDEProcessController::TDEProcessController() : needcheck( false ) { if( pipe( fd ) ) @@ -75,7 +75,7 @@ KProcessController::KProcessController() TQT_SLOT(slotDoHousekeeping())); } -KProcessController::~KProcessController() +TDEProcessController::~TDEProcessController() { delete notifier; @@ -87,16 +87,16 @@ KProcessController::~KProcessController() extern "C" { static void theReaper( int num ) { - KProcessController::theSigCHLDHandler( num ); + TDEProcessController::theSigCHLDHandler( num ); } } #ifdef Q_OS_UNIX -struct sigaction KProcessController::oldChildHandlerData; +struct sigaction TDEProcessController::oldChildHandlerData; #endif -bool KProcessController::handlerSet = false; +bool TDEProcessController::handlerSet = false; -void KProcessController::setupHandlers() +void TDEProcessController::setupHandlers() { if( handlerSet ) return; @@ -127,7 +127,7 @@ void KProcessController::setupHandlers() #endif } -void KProcessController::resetHandlers() +void TDEProcessController::resetHandlers() { if( !handlerSet ) return; @@ -144,12 +144,12 @@ void KProcessController::resetHandlers() // the pipe is needed to sync the child reaping with our event processing, // as otherwise there are race conditions, locking requirements, and things // generally get harder -void KProcessController::theSigCHLDHandler( int arg ) +void TDEProcessController::theSigCHLDHandler( int arg ) { int saved_errno = errno; char dummy = 0; - ::write( theKProcessController->fd[1], &dummy, 1 ); + ::write( theTDEProcessController->fd[1], &dummy, 1 ); #ifdef Q_OS_UNIX if( oldChildHandlerData.sa_handler != SIG_IGN && @@ -162,12 +162,12 @@ void KProcessController::theSigCHLDHandler( int arg ) errno = saved_errno; } -int KProcessController::notifierFd() const +int TDEProcessController::notifierFd() const { return fd[0]; } -void KProcessController::unscheduleCheck() +void TDEProcessController::unscheduleCheck() { char dummy[16]; // somewhat bigger - just in case several have queued up if( ::read( fd[0], dummy, sizeof(dummy) ) > 0 ) @@ -175,7 +175,7 @@ void KProcessController::unscheduleCheck() } void -KProcessController::rescheduleCheck() +TDEProcessController::rescheduleCheck() { if( needcheck ) { @@ -185,23 +185,23 @@ KProcessController::rescheduleCheck() } } -void KProcessController::slotDoHousekeeping() +void TDEProcessController::slotDoHousekeeping() { char dummy[16]; // somewhat bigger - just in case several have queued up ::read( fd[0], dummy, sizeof(dummy) ); int status; again: - TQValueListIterator<KProcess*> it( kProcessList.begin() ); - TQValueListIterator<KProcess*> eit( kProcessList.end() ); + TQValueListIterator<TDEProcess*> it( kProcessList.begin() ); + TQValueListIterator<TDEProcess*> eit( kProcessList.end() ); while( it != eit ) { - KProcess *prc = *it; + TDEProcess *prc = *it; if( prc->runs && waitpid( prc->pid_, &status, WNOHANG ) > 0 ) { prc->processHasExited( status ); // the callback can nuke the whole process list and even 'this' - if (!theKProcessController) + if (!theTDEProcessController) return; goto again; } @@ -220,7 +220,7 @@ void KProcessController::slotDoHousekeeping() } } -bool KProcessController::waitForProcessExit( int timeout ) +bool TDEProcessController::waitForProcessExit( int timeout ) { #ifdef Q_OS_UNIX for(;;) @@ -258,20 +258,20 @@ bool KProcessController::waitForProcessExit( int timeout ) #endif } -void KProcessController::addKProcess( KProcess* p ) +void TDEProcessController::addTDEProcess( TDEProcess* p ) { kProcessList.append( p ); } -void KProcessController::removeKProcess( KProcess* p ) +void TDEProcessController::removeTDEProcess( TDEProcess* p ) { kProcessList.remove( p ); } -void KProcessController::addProcess( int pid ) +void TDEProcessController::addProcess( int pid ) { unixProcessList.append( pid ); - ref(); // make sure we stay around when the KProcess goes away + ref(); // make sure we stay around when the TDEProcess goes away } #include "kprocctrl.moc" diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h index fbd096cbf..1cb6cc302 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/kprocctrl.h @@ -27,16 +27,16 @@ class TQSocketNotifier; /** - * @short Used internally by KProcess + * @short Used internally by TDEProcess * @internal * @author Christian Czezatke <e9025461@student.tuwien.ac.at> * - * A class for internal use by KProcess only. -- Exactly one instance + * A class for internal use by TDEProcess only. -- Exactly one instance * of this class is created by TDEApplication. * * This class takes care of the actual (UN*X) signal handling. */ -class TDECORE_EXPORT KProcessController : public TQObject +class TDECORE_EXPORT TDEProcessController : public TQObject { Q_OBJECT @@ -57,7 +57,7 @@ public: * Only a single instance of this class is allowed at a time, * and this static variable is used to track the one instance. */ - static KProcessController *theKProcessController; // kde4: rename: instance + static TDEProcessController *theTDEProcessController; // kde4: rename: instance /** * Automatically called upon SIGCHLD. Never call it directly. @@ -71,7 +71,7 @@ public: /** * Wait for any process to exit and handle their exit without * starting an event loop. - * This function may cause KProcess to emit any of its signals. + * This function may cause TDEProcess to emit any of its signals. * * @param timeout the timeout in seconds. -1 means no timeout. * @return true if a process exited, false @@ -95,7 +95,7 @@ public: void rescheduleCheck(); /* - * Obtain the file descriptor KProcessController uses to get notified + * Obtain the file descriptor TDEProcessController uses to get notified * about process exits. select() or poll() on it if you create a custom * event loop that needs to act upon SIGCHLD. * @return the file descriptor of the reading end of the notification pipe @@ -106,11 +106,11 @@ public: /** * @internal */ - void addKProcess( KProcess* ); + void addTDEProcess( TDEProcess* ); /** * @internal */ - void removeKProcess( KProcess* ); + void removeTDEProcess( TDEProcess* ); /** * @internal */ @@ -125,7 +125,7 @@ private: int fd[2]; bool needcheck; TQSocketNotifier *notifier; - TQValueList<KProcess*> kProcessList; + TQValueList<TDEProcess*> kProcessList; TQValueList<int> unixProcessList; static void setupHandlers(); @@ -136,12 +136,12 @@ private: static int refCount; // Disallow instantiation - KProcessController(); - ~KProcessController(); + TDEProcessController(); + ~TDEProcessController(); // Disallow assignment and copy-construction - KProcessController( const KProcessController& ); - KProcessController& operator= ( const KProcessController& ); + TDEProcessController( const TDEProcessController& ); + TDEProcessController& operator= ( const TDEProcessController& ); }; diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp index 3658116ab..b899c637f 100644 --- a/tdecore/kprocess.cpp +++ b/tdecore/kprocess.cpp @@ -85,10 +85,10 @@ // private data // ////////////////// -class KProcessPrivate { +class TDEProcessPrivate { public: - KProcessPrivate() : - usePty(KProcess::NoCommunication), + TDEProcessPrivate() : + usePty(TDEProcess::NoCommunication), addUtmp(false), useShell(false), #ifdef Q_OS_UNIX pty(0), @@ -97,7 +97,7 @@ public: { } - KProcess::Communication usePty; + TDEProcess::Communication usePty; bool addUtmp : 1; bool useShell : 1; @@ -117,7 +117,7 @@ public: // public member functions // ///////////////////////////// -KProcess::KProcess( TQObject* parent, const char *name ) +TDEProcess::TDEProcess( TQObject* parent, const char *name ) : TQObject( parent, name ), run_mode(NotifyOnExit), runs(false), @@ -132,17 +132,17 @@ KProcess::KProcess( TQObject* parent, const char *name ) input_sent(0), input_total(0) { - KProcessController::ref(); - KProcessController::theKProcessController->addKProcess(this); + TDEProcessController::ref(); + TDEProcessController::theTDEProcessController->addTDEProcess(this); - d = new KProcessPrivate; + d = new TDEProcessPrivate; out[0] = out[1] = -1; in[0] = in[1] = -1; err[0] = err[1] = -1; } -KProcess::KProcess() +TDEProcess::TDEProcess() : TQObject(), run_mode(NotifyOnExit), runs(false), @@ -157,10 +157,10 @@ KProcess::KProcess() input_sent(0), input_total(0) { - KProcessController::ref(); - KProcessController::theKProcessController->addKProcess(this); + TDEProcessController::ref(); + TDEProcessController::theTDEProcessController->addTDEProcess(this); - d = new KProcessPrivate; + d = new TDEProcessPrivate; out[0] = out[1] = -1; in[0] = in[1] = -1; @@ -168,19 +168,19 @@ KProcess::KProcess() } void -KProcess::setEnvironment(const TQString &name, const TQString &value) +TDEProcess::setEnvironment(const TQString &name, const TQString &value) { d->env.insert(name, value); } void -KProcess::setWorkingDirectory(const TQString &dir) +TDEProcess::setWorkingDirectory(const TQString &dir) { d->wd = dir; } void -KProcess::setupEnvironment() +TDEProcess::setupEnvironment() { TQMap<TQString,TQString>::Iterator it; for(it = d->env.begin(); it != d->env.end(); ++it) @@ -195,19 +195,19 @@ KProcess::setupEnvironment() } void -KProcess::setRunPrivileged(bool keepPrivileges) +TDEProcess::setRunPrivileged(bool keepPrivileges) { keepPrivs = keepPrivileges; } bool -KProcess::runPrivileged() const +TDEProcess::runPrivileged() const { return keepPrivs; } bool -KProcess::setPriority(int prio) +TDEProcess::setPriority(int prio) { #ifdef Q_OS_UNIX if (runs) { @@ -222,7 +222,7 @@ KProcess::setPriority(int prio) return true; } -KProcess::~KProcess() +TDEProcess::~TDEProcess() { if (run_mode != DontCare) kill(SIGKILL); @@ -233,26 +233,26 @@ KProcess::~KProcess() #endif delete d; - KProcessController::theKProcessController->removeKProcess(this); - KProcessController::deref(); + TDEProcessController::theTDEProcessController->removeTDEProcess(this); + TDEProcessController::deref(); } -void KProcess::detach() +void TDEProcess::detach() { if (runs) { - KProcessController::theKProcessController->addProcess(pid_); + TDEProcessController::theTDEProcessController->addProcess(pid_); runs = false; pid_ = 0; // close without draining commClose(); // Clean up open fd's and socket notifiers. } } -void KProcess::setBinaryExecutable(const char *filename) +void TDEProcess::setBinaryExecutable(const char *filename) { d->executable = filename; } -bool KProcess::setExecutable(const TQString& proc) +bool TDEProcess::setExecutable(const TQString& proc) { if (runs) return false; @@ -265,7 +265,7 @@ bool KProcess::setExecutable(const TQString& proc) return true; } -KProcess &KProcess::operator<<(const TQStringList& args) +TDEProcess &TDEProcess::operator<<(const TQStringList& args) { TQStringList::ConstIterator it = args.begin(); for ( ; it != args.end() ; ++it ) @@ -273,29 +273,29 @@ KProcess &KProcess::operator<<(const TQStringList& args) return *this; } -KProcess &KProcess::operator<<(const TQCString& arg) +TDEProcess &TDEProcess::operator<<(const TQCString& arg) { return operator<< (arg.data()); } -KProcess &KProcess::operator<<(const char* arg) +TDEProcess &TDEProcess::operator<<(const char* arg) { arguments.append(arg); return *this; } -KProcess &KProcess::operator<<(const TQString& arg) +TDEProcess &TDEProcess::operator<<(const TQString& arg) { arguments.append(TQFile::encodeName(arg)); return *this; } -void KProcess::clearArguments() +void TDEProcess::clearArguments() { arguments.clear(); } -bool KProcess::start(RunMode runmode, Communication comm) +bool TDEProcess::start(RunMode runmode, Communication comm) { if (runs) { kdDebug(175) << "Attempted to start an already running process" << endl; @@ -454,11 +454,11 @@ bool KProcess::start(RunMode runmode, Communication comm) if (!runs) { // commClose detected data on the process exit notifification pipe - KProcessController::theKProcessController->unscheduleCheck(); + TDEProcessController::theTDEProcessController->unscheduleCheck(); if (waitpid(pid_, &status, WNOHANG) != 0) // error finishes, too { commClose(); // this time for real (runs is false) - KProcessController::theKProcessController->rescheduleCheck(); + TDEProcessController::theTDEProcessController->rescheduleCheck(); break; } runs = true; // for next commClose() iteration @@ -490,7 +490,7 @@ bool KProcess::start(RunMode runmode, Communication comm) -bool KProcess::kill(int signo) +bool TDEProcess::kill(int signo) { #ifdef Q_OS_UNIX if (runs && pid_ > 0 && !::kill(run_mode == OwnGroup ? -pid_ : pid_, signo)) @@ -501,14 +501,14 @@ bool KProcess::kill(int signo) -bool KProcess::isRunning() const +bool TDEProcess::isRunning() const { return runs; } -pid_t KProcess::pid() const +pid_t TDEProcess::pid() const { return pid_; } @@ -525,7 +525,7 @@ pid_t KProcess::pid() const } while (0) #endif -bool KProcess::wait(int timeout) +bool TDEProcess::wait(int timeout) { if (!runs) return true; @@ -549,7 +549,7 @@ bool KProcess::wait(int timeout) } #ifdef Q_OS_UNIX - int fd = KProcessController::theKProcessController->notifierFd(); + int fd = TDEProcessController::theTDEProcessController->notifierFd(); for(;;) { fd_set fds; @@ -573,14 +573,14 @@ bool KProcess::wait(int timeout) break; // fall through; should happen if tvp->tv_sec < 0 case 0: - KProcessController::theKProcessController->rescheduleCheck(); + TDEProcessController::theTDEProcessController->rescheduleCheck(); return false; default: - KProcessController::theKProcessController->unscheduleCheck(); + TDEProcessController::theTDEProcessController->unscheduleCheck(); if (waitpid(pid_, &status, WNOHANG) != 0) // error finishes, too { processHasExited(status); - KProcessController::theKProcessController->rescheduleCheck(); + TDEProcessController::theTDEProcessController->rescheduleCheck(); return true; } } @@ -591,19 +591,19 @@ bool KProcess::wait(int timeout) -bool KProcess::normalExit() const +bool TDEProcess::normalExit() const { return (pid_ != 0) && !runs && WIFEXITED(status); } -bool KProcess::signalled() const +bool TDEProcess::signalled() const { return (pid_ != 0) && !runs && WIFSIGNALED(status); } -bool KProcess::coreDumped() const +bool TDEProcess::coreDumped() const { #ifdef WCOREDUMP return signalled() && WCOREDUMP(status); @@ -613,19 +613,19 @@ bool KProcess::coreDumped() const } -int KProcess::exitStatus() const +int TDEProcess::exitStatus() const { return WEXITSTATUS(status); } -int KProcess::exitSignal() const +int TDEProcess::exitSignal() const { return WTERMSIG(status); } -bool KProcess::writeStdin(const char *buffer, int buflen) +bool TDEProcess::writeStdin(const char *buffer, int buflen) { // if there is still data pending, writing new data // to stdout is not allowed (since it could also confuse @@ -645,19 +645,19 @@ bool KProcess::writeStdin(const char *buffer, int buflen) return false; } -void KProcess::suspend() +void TDEProcess::suspend() { if (outnot) outnot->setEnabled(false); } -void KProcess::resume() +void TDEProcess::resume() { if (outnot) outnot->setEnabled(true); } -bool KProcess::closeStdin() +bool TDEProcess::closeStdin() { if (communication & Stdin) { communication = (Communication) (communication & ~Stdin); @@ -671,7 +671,7 @@ bool KProcess::closeStdin() return false; } -bool KProcess::closeStdout() +bool TDEProcess::closeStdout() { if (communication & Stdout) { communication = (Communication) (communication & ~Stdout); @@ -685,7 +685,7 @@ bool KProcess::closeStdout() return false; } -bool KProcess::closeStderr() +bool TDEProcess::closeStderr() { if (communication & Stderr) { communication = (Communication) (communication & ~Stderr); @@ -699,7 +699,7 @@ bool KProcess::closeStderr() return false; } -bool KProcess::closePty() +bool TDEProcess::closePty() { #ifdef Q_OS_UNIX if (d->pty && d->pty->masterFd() >= 0) { @@ -714,7 +714,7 @@ bool KProcess::closePty() #endif } -void KProcess::closeAll() +void TDEProcess::closeAll() { closeStdin(); closeStdout(); @@ -728,21 +728,21 @@ void KProcess::closeAll() -void KProcess::slotChildOutput(int fdno) +void TDEProcess::slotChildOutput(int fdno) { if (!childOutput(fdno)) closeStdout(); } -void KProcess::slotChildError(int fdno) +void TDEProcess::slotChildError(int fdno) { if (!childError(fdno)) closeStderr(); } -void KProcess::slotSendData(int) +void TDEProcess::slotSendData(int) { if (input_sent == input_total) { innot->setEnabled(false); @@ -762,7 +762,7 @@ void KProcess::slotSendData(int) } } -void KProcess::setUseShell(bool useShell, const char *shell) +void TDEProcess::setUseShell(bool useShell, const char *shell) { d->useShell = useShell; if (shell && *shell) @@ -787,7 +787,7 @@ void KProcess::setUseShell(bool useShell, const char *shell) } #ifdef Q_OS_UNIX -void KProcess::setUsePty(Communication usePty, bool addUtmp) +void TDEProcess::setUsePty(Communication usePty, bool addUtmp) { d->usePty = usePty; d->addUtmp = addUtmp; @@ -800,13 +800,13 @@ void KProcess::setUsePty(Communication usePty, bool addUtmp) } } -KPty *KProcess::pty() const +KPty *TDEProcess::pty() const { return d->pty; } #endif //Q_OS_UNIX -TQString KProcess::quote(const TQString &arg) +TQString TDEProcess::quote(const TQString &arg) { TQChar q('\''); return TQString(arg).replace(q, "'\\''").prepend(q).append(q); @@ -818,7 +818,7 @@ TQString KProcess::quote(const TQString &arg) ////////////////////////////// -void KProcess::processHasExited(int state) +void TDEProcess::processHasExited(int state) { // only successfully run NotifyOnExit processes ever get here @@ -833,7 +833,7 @@ void KProcess::processHasExited(int state) -int KProcess::childOutput(int fdno) +int TDEProcess::childOutput(int fdno) { if (communication & NoRead) { int len = -1; @@ -856,7 +856,7 @@ int KProcess::childOutput(int fdno) } } -int KProcess::childError(int fdno) +int TDEProcess::childError(int fdno) { char buffer[1025]; int len; @@ -871,7 +871,7 @@ int KProcess::childError(int fdno) } -int KProcess::setupCommunication(Communication comm) +int TDEProcess::setupCommunication(Communication comm) { #ifdef Q_OS_UNIX // PTY stuff // @@ -939,7 +939,7 @@ int KProcess::setupCommunication(Communication comm) -int KProcess::commSetupDoneP() +int TDEProcess::commSetupDoneP() { int rcomm = communication & ~d->usePty; if (rcomm & Stdin) @@ -984,7 +984,7 @@ int KProcess::commSetupDoneP() -int KProcess::commSetupDoneC() +int TDEProcess::commSetupDoneC() { int ok = 1; #ifdef Q_OS_UNIX @@ -1034,7 +1034,7 @@ int KProcess::commSetupDoneC() -void KProcess::commClose() +void TDEProcess::commClose() { closeStdin(); @@ -1044,7 +1044,7 @@ void KProcess::commClose() // buffer doesn't fill up whilst we are waiting for data on the other // (causing a deadlock). Hence we need to use select. - int notfd = KProcessController::theKProcessController->notifierFd(); + int notfd = TDEProcessController::theTDEProcessController->notifierFd(); while ((communication & (Stdout | Stderr)) || runs) { fd_set rfds; @@ -1104,7 +1104,7 @@ void KProcess::commClose() } -void KProcess::virtual_hook( int, void* ) +void TDEProcess::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } @@ -1113,7 +1113,7 @@ void KProcess::virtual_hook( int, void* ) /////////////////////////// KShellProcess::KShellProcess(const char *shellname): - KProcess() + TDEProcess() { setUseShell( true, shellname ? shellname : getenv("SHELL") ); } @@ -1123,15 +1123,15 @@ KShellProcess::~KShellProcess() { TQString KShellProcess::quote(const TQString &arg) { - return KProcess::quote(arg); + return TDEProcess::quote(arg); } bool KShellProcess::start(RunMode runmode, Communication comm) { - return KProcess::start(runmode, comm); + return TDEProcess::start(runmode, comm); } void KShellProcess::virtual_hook( int id, void* data ) -{ KProcess::virtual_hook( id, data ); } +{ TDEProcess::virtual_hook( id, data ); } #include "kprocess.moc" diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h index 7e9941717..ae4a25af6 100644 --- a/tdecore/kprocess.h +++ b/tdecore/kprocess.h @@ -30,7 +30,7 @@ #include "tdelibs_export.h" class TQSocketNotifier; -class KProcessPrivate; +class TDEProcessPrivate; #ifdef Q_OS_UNIX #include <kpty.h> @@ -60,15 +60,15 @@ class KPty; * @li NotifyOnExit -- The child process is invoked and both the * child and the parent process run concurrently. * - * When the child process exits, the KProcess instance + * When the child process exits, the TDEProcess instance * corresponding to it emits the Qt signal processExited(). * Since this signal is @em not emitted from within a UN*X * signal handler, arbitrary function calls can be made. * - * Be aware: When the KProcess object gets destructed, the child + * Be aware: When the TDEProcess object gets destructed, the child * process will be killed if it is still running! * This means in particular, that it usually makes no sense to use - * a KProcess on the stack with NotifyOnExit. + * a TDEProcess on the stack with NotifyOnExit. * * @li OwnGroup -- like NotifyOnExit, but the child process is started * in an own process group (and an own session, FWIW). The behavior of @@ -84,7 +84,7 @@ class KPty; * In this mode the parent can read the child's output, but can't send it any * input. * - * KProcess also provides several functions for determining the exit status + * TDEProcess also provides several functions for determining the exit status * and the pid of the child process it represents. * * Furthermore it is possible to supply command-line arguments to the process @@ -92,12 +92,12 @@ class KPty; * * A small usage example: * \code - * KProcess *proc = new KProcess; + * TDEProcess *proc = new TDEProcess; * * *proc << "my_executable"; * *proc << "These" << "are" << "the" << "command" << "line" << "args"; - * TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), - * pointer_to_my_object, TQT_SLOT(my_objects_slot(KProcess *))); + * TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + * pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *))); * proc->start(); * \endcode * @@ -107,7 +107,7 @@ class KPty; * * <b>Communication with the child process:</b>\n * - * KProcess supports communication with the child process through + * TDEProcess supports communication with the child process through * stdin/stdout/stderr. * * The following functions are provided for getting data from the child @@ -127,7 +127,7 @@ class KPty; * @author Christian Czezatke e9025461@student.tuwien.ac.at * **/ -class TDECORE_EXPORT KProcess : public TQObject +class TDECORE_EXPORT TDEProcess : public TQObject { Q_OBJECT @@ -191,12 +191,12 @@ public: * Constructor * @since 3.2 */ - KProcess( TQObject* parent, const char *name = 0 ); + TDEProcess( TQObject* parent, const char *name = 0 ); /** * Constructor */ // KDE4 merge with the above - KProcess(); + TDEProcess(); /** *Destructor: @@ -206,13 +206,13 @@ public: * only if the run mode is not of type @p DontCare. * Processes started as @p DontCare keep running anyway. */ - virtual ~KProcess(); + virtual ~TDEProcess(); /** @deprecated Use operator<<() instead. - Sets the executable to be started with this KProcess object. + Sets the executable to be started with this TDEProcess object. Returns false if the process is currently running (in that case the executable remains unchanged). @@ -227,33 +227,33 @@ public: * * For example, doing an "ls -l /usr/local/bin" can be achieved by: * \code - * KProcess p; + * TDEProcess p; * ... * p << "ls" << "-l" << "/usr/local/bin" * \endcode * * @param arg the argument to add - * @return a reference to this KProcess + * @return a reference to this TDEProcess **/ - KProcess &operator<<(const TQString& arg); + TDEProcess &operator<<(const TQString& arg); /** * Similar to previous method, takes a char *, supposed to be in locale 8 bit already. */ - KProcess &operator<<(const char * arg); + TDEProcess &operator<<(const char * arg); /** * Similar to previous method, takes a TQCString, supposed to be in locale 8 bit already. * @param arg the argument to add - * @return a reference to this KProcess + * @return a reference to this TDEProcess */ - KProcess &operator<<(const TQCString & arg); + TDEProcess &operator<<(const TQCString & arg); /** * Sets the executable and the command line argument list for this process, * in a single method call, or add a list of arguments. * @param args the arguments to add - * @return a reference to this KProcess + * @return a reference to this TDEProcess **/ - KProcess &operator<<(const TQStringList& args); + TDEProcess &operator<<(const TQStringList& args); /** * Clear a command line argument list that has been set by using @@ -265,7 +265,7 @@ public: * Starts the process. * For a detailed description of the * various run modes and communication semantics, have a look at the - * general description of the KProcess class. Note that if you use + * general description of the TDEProcess class. Note that if you use * setUsePty( Stdout | Stderr, \<bool\> ), you cannot use Stdout | Stderr * here - instead, use Stdout only to receive the mixed output. * @@ -308,10 +308,10 @@ public: * * If it is called after * the process has exited, it returns the process id of the last - * child process that was created by this instance of KProcess. + * child process that was created by this instance of TDEProcess. * * Calling it before any child process has been started by this - * KProcess instance causes pid() to return 0. + * TDEProcess instance causes pid() to return 0. * @return the pid of the process or 0 if no process has been started yet. **/ pid_t pid() const; @@ -535,9 +535,9 @@ public: static TQString quote(const TQString &arg); /** - * Detaches KProcess from child process. All communication is closed. + * Detaches TDEProcess from child process. All communication is closed. * No exit notification is emitted any more for the child process. - * Deleting the KProcess will no longer kill the child process. + * Deleting the TDEProcess will no longer kill the child process. * Note that the current process remains the parent process of the * child process. */ @@ -588,7 +588,7 @@ signals: * start() ) or the Block mode. * @param proc a pointer to the process that has exited **/ - void processExited(KProcess *proc); + void processExited(TDEProcess *proc); /** @@ -609,7 +609,7 @@ signals: * TQString myBuf = TQString::fromLatin1(buffer, buflen); * \endcode **/ - void receivedStdout(KProcess *proc, char *buffer, int buflen); + void receivedStdout(TDEProcess *proc, char *buffer, int buflen); /** * Emitted when output from the child process has @@ -646,7 +646,7 @@ signals: * @param buffer The data received. * @param buflen The number of bytes that are available. **/ - void receivedStderr(KProcess *proc, char *buffer, int buflen); + void receivedStderr(TDEProcess *proc, char *buffer, int buflen); /** * Emitted after all the data that has been @@ -654,7 +654,7 @@ signals: * written to the child process. * @param proc a pointer to the process **/ - void wroteStdin(KProcess *proc); + void wroteStdin(TDEProcess *proc); protected slots: @@ -703,7 +703,7 @@ protected: * true if the process is currently running. You should not * modify this data member directly from derived classes. Please use * isRunning() for reading the value of this data member since it - * will probably be made private in later versions of KProcess. + * will probably be made private in later versions of TDEProcess. */ bool runs; @@ -712,7 +712,7 @@ protected: * You should not modify this data member in derived classes. * Please use pid() instead of directly accessing this * member since it will probably be made private in - * later versions of KProcess. + * later versions of TDEProcess. */ pid_t pid_; @@ -721,7 +721,7 @@ protected: * modify the value of this data member from derived classes. You should * rather use exitStatus() than accessing this data member directly * since it will probably be made private in further versions of - * KProcess. + * TDEProcess. */ int status; @@ -736,7 +736,7 @@ protected: /** * This function is called from start() right before a fork() takes * place. According to the @p comm parameter this function has to initialize - * the in, out and err data members of KProcess. + * the in, out and err data members of TDEProcess. * * This function should return 1 if setting the needed communication channels * was successful. @@ -754,7 +754,7 @@ protected: * * Furthermore, it must also create the TQSocketNotifiers innot, * outnot and errnot and connect their Qt signals to the respective - * KProcess slots. + * TDEProcess slots. * * For a more detailed explanation, it is best to have a look at the default * implementation in kprocess.cpp. @@ -788,12 +788,12 @@ protected: * before closing them. * @li if pid() returns non-zero and runs is true, the communication * links should be monitored for data until the file handle returned by - * KProcessController::theKProcessController->notifierFd() becomes ready + * TDEProcessController::theTDEProcessController->notifierFd() becomes ready * for reading - when it triggers, runs should be reset to false, and * the function should be immediately left without closing anything. * * The previous semantics of this function are forward-compatible, but should - * be avoided, as they are prone to race conditions and can cause KProcess + * be avoided, as they are prone to race conditions and can cause TDEProcess * (and thus the whole program) to lock up under certain circumstances. At the * end the function closes the communication links in any case. Additionally * @li if runs is true, the communication links are monitored for data @@ -879,15 +879,15 @@ protected: int input_total; /** - * KProcessController is a friend of KProcess because it has to have + * TDEProcessController is a friend of TDEProcess because it has to have * access to various data members. */ - friend class KProcessController; + friend class TDEProcessController; protected: virtual void virtual_hook( int id, void* data ); private: - KProcessPrivate *d; + TDEProcessPrivate *d; }; class KShellProcessPrivate; @@ -895,13 +895,13 @@ class KShellProcessPrivate; /** * @obsolete * -* Use KProcess and KProcess::setUseShell(true) instead. +* Use TDEProcess and TDEProcess::setUseShell(true) instead. * -* @short A class derived from KProcess to start child +* @short A class derived from TDEProcess to start child * processes through a shell. * @author Christian Czezatke <e9025461@student.tuwien.ac.at> */ -class TDECORE_EXPORT KShellProcess: public KProcess +class TDECORE_EXPORT KShellProcess: public TDEProcess { Q_OBJECT diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp index 9159edab5..7157662df 100644 --- a/tdecore/kprocio.cpp +++ b/tdecore/kprocio.cpp @@ -31,8 +31,8 @@ class KProcIOPrivate { public: - KProcIOPrivate() : comm(KProcess::All) {} - KProcess::Communication comm; + KProcIOPrivate() : comm(TDEProcess::All) {} + TDEProcess::Communication comm; }; KProcIO::KProcIO ( TQTextCodec *_codec) @@ -67,14 +67,14 @@ KProcIO::resetAll () rbi=0; readsignalon=writeready=true; - disconnect (this, TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (receivedStderr (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (wroteStdin(KProcess *)), - this, TQT_SLOT (sent (KProcess *))); + disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), + this, TQT_SLOT (sent (TDEProcess *))); outbuffer.clear(); @@ -87,19 +87,19 @@ void KProcIO::setComm (Communication comm) bool KProcIO::start (RunMode runmode, bool includeStderr) { - connect (this, TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); if (includeStderr) { - connect (this, TQT_SIGNAL (receivedStderr (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); } - connect (this, TQT_SIGNAL (wroteStdin(KProcess *)), - this, TQT_SLOT (sent (KProcess *))); + connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), + this, TQT_SLOT (sent (TDEProcess *))); - return KProcess::start (runmode, d->comm); + return TDEProcess::start (runmode, d->comm); } bool KProcIO::writeStdin (const TQString &line, bool appendnewline) @@ -131,7 +131,7 @@ bool KProcIO::writeStdin (const TQCString &line, bool appendnewline) if (writeready) { writeready=false; - return KProcess::writeStdin( b->data(), b->size() ); + return TDEProcess::writeStdin( b->data(), b->size() ); } return true; } @@ -146,7 +146,7 @@ bool KProcIO::writeStdin(const TQByteArray &data) if (writeready) { writeready=false; - return KProcess::writeStdin( b->data(), b->size() ); + return TDEProcess::writeStdin( b->data(), b->size() ); } return true; } @@ -163,7 +163,7 @@ void KProcIO::closeWhenDone() return; } -void KProcIO::sent(KProcess *) +void KProcIO::sent(TDEProcess *) { outbuffer.removeFirst(); @@ -180,13 +180,13 @@ void KProcIO::sent(KProcess *) } else { - KProcess::writeStdin(b->data(), b->size()); + TDEProcess::writeStdin(b->data(), b->size()); } } } -void KProcIO::received (KProcess *, char *buffer, int buflen) +void KProcIO::received (TDEProcess *, char *buffer, int buflen) { recvbuffer += TQCString(buffer, buflen+1); @@ -270,7 +270,7 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial) } void KProcIO::virtual_hook( int id, void* data ) -{ KProcess::virtual_hook( id, data ); } +{ TDEProcess::virtual_hook( id, data ); } #include "kprocio.moc" diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h index 3dceb9c1b..4e42ee533 100644 --- a/tdecore/kprocio.h +++ b/tdecore/kprocio.h @@ -30,7 +30,7 @@ class TQTextCodec; * KProcIO * * This class provides a slightly simpler interface to the communication - * functions provided by KProcess. The simplifications are: + * functions provided by TDEProcess. The simplifications are: * @li The buffer for a write is copied to an internal KProcIO * buffer and maintained/freed appropriately. There is no need * to be concerned with wroteStdin() signals _at_all_. @@ -40,14 +40,14 @@ class TQTextCodec; * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs(). * * Aside from these, and the fact that start() takes different - * parameters, use this class just like KProcess. + * parameters, use this class just like TDEProcess. * * @author David Sweet - * @short A slightly simpler interface to KProcess + * @short A slightly simpler interface to TDEProcess **/ -class TDECORE_EXPORT KProcIO : public KProcess +class TDECORE_EXPORT KProcIO : public TDEProcess { Q_OBJECT @@ -63,10 +63,10 @@ public: ~KProcIO(); /** - * Sets the communication mode to be passed to KProcess::start() - * by start(). The default communication mode is KProcess::All. + * Sets the communication mode to be passed to TDEProcess::start() + * by start(). The default communication mode is TDEProcess::All. * You probably want to use this function in conjunction with - * KProcess::setUsePty(). + * TDEProcess::setUsePty(). * @param comm the communication mode */ void setComm (Communication comm); @@ -80,7 +80,7 @@ public: * * @param runmode For a detailed description of the * various run modes, have a look at the - * general description of the KProcess class. + * general description of the TDEProcess class. * @param includeStderr If true, data from both stdout and stderr is * listened to. If false, only stdout is listened to. * @return true on success, false on error. @@ -204,8 +204,8 @@ protected: void controlledEmission (); protected slots: - void received (KProcess *proc, char *buffer, int buflen); - void sent (KProcess *); + void received (TDEProcess *proc, char *buffer, int buflen); + void sent (TDEProcess *); protected: virtual void virtual_hook( int id, void* data ); diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp index f6fc9d5cd..e13540e19 100644 --- a/tdecore/kpty.cpp +++ b/tdecore/kpty.cpp @@ -144,7 +144,7 @@ extern "C" { /////////////////////// #ifdef HAVE_UTEMPTER -class KProcess_Utmp : public KProcess +class TDEProcess_Utmp : public TDEProcess { public: int commSetupDoneC() @@ -440,12 +440,12 @@ void KPty::setCTty() void KPty::login(const char *user, const char *remotehost) { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; + TDEProcess_Utmp utmp; utmp.cmdFd = d->masterFd; utmp << "/usr/lib/utempter/utempter" << "add"; if (remotehost) utmp << remotehost; - utmp.start(KProcess::Block); + utmp.start(TDEProcess::Block); Q_UNUSED(user); Q_UNUSED(remotehost); #elif defined(USE_LOGIN) @@ -485,10 +485,10 @@ void KPty::login(const char *user, const char *remotehost) void KPty::logout() { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; + TDEProcess_Utmp utmp; utmp.cmdFd = d->masterFd; utmp << "/usr/lib/utempter/utempter" << "del"; - utmp.start(KProcess::Block); + utmp.start(TDEProcess::Block); #elif defined(USE_LOGIN) const char *str_ptr = d->ttyName.data(); if (!memcmp(str_ptr, "/dev/", 5)) @@ -572,8 +572,8 @@ int KPty::slaveFd() const // private bool KPty::chownpty(bool grant) { - KProcess proc; + TDEProcess proc; proc << locate("exe", BASE_CHOWN) << (grant?"--grant":"--revoke") << TQString::number(d->masterFd); - return proc.start(KProcess::Block) && proc.normalExit() && !proc.exitStatus(); + return proc.start(TDEProcess::Block) && proc.normalExit() && !proc.exitStatus(); } diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp index 7c3fc67da..9666f7aab 100644 --- a/tdecore/kshortcutlist.cpp +++ b/tdecore/kshortcutlist.cpp @@ -72,7 +72,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo { kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts"); // If the config file still has the old group name: @@ -110,7 +110,7 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC { kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts"); @@ -166,7 +166,7 @@ KAccelShortcutList::KAccelShortcutList( KAccel* pAccel ) d->m_configGroup=pAccel->configGroup(); } -KAccelShortcutList::KAccelShortcutList( KGlobalAccel* pAccel ) +KAccelShortcutList::KAccelShortcutList( TDEGlobalAccel* pAccel ) : m_actions( pAccel->actions() ) { d=new KAccelShortcutListPrivate; diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h index ce8f408a1..497bfaf15 100644 --- a/tdecore/kshortcutlist.h +++ b/tdecore/kshortcutlist.h @@ -40,7 +40,7 @@ class KShortcut; * KAccelShortcutList and KStdAccel::ShortcutList. It gives * you an unified interface for accessing the accelerator lists * of KAccel (using KAccelShortcutList), - * KGlobalAccel (using KAccelShortcutList), and + * TDEGlobalAccel (using KAccelShortcutList), and * KStdAccel (using KStdAccel::ShortcutList). * * @short Base class for accessing accelerator lists @@ -189,11 +189,11 @@ class TDECORE_EXPORT KShortcutList class KAccel; class KAccelActions; -class KGlobalAccel; +class TDEGlobalAccel; /** * KShortcutList implementation to access KAccel and - * KGlobalAccel lists. + * TDEGlobalAccel lists. */ class TDECORE_EXPORT KAccelShortcutList : public KShortcutList { @@ -206,10 +206,10 @@ class TDECORE_EXPORT KAccelShortcutList : public KShortcutList /** * Creates a new KShortcutList that accesses the given - * KGlobalAccel. + * TDEGlobalAccel. * @param accel the accelerators to access */ - KAccelShortcutList( KGlobalAccel* accel ); + KAccelShortcutList( TDEGlobalAccel* accel ); /** * @internal diff --git a/tdecore/kshortcutmenu.cpp b/tdecore/kshortcutmenu.cpp index 3df389f07..4bf18d965 100644 --- a/tdecore/kshortcutmenu.cpp +++ b/tdecore/kshortcutmenu.cpp @@ -34,7 +34,7 @@ KShortcutMenu::KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySe { kdDebug() << seq.toStringInternal() << endl; - TQFont fontTitle = KGlobalSettings::menuFont(); + TQFont fontTitle = TDEGlobalSettings::menuFont(); fontTitle.setBold( true ); pTitle = new TQLabel( "", (TQWidget*)0 ); diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 6b4e13a14..5c17b665d 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -43,7 +43,7 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) // the difference between KConfig and KSimpleConfig is just that // for KSimpleConfig an absolute filename is guaranteed if (!fileName.isNull() && TQDir::isRelativePath(fileName)) { - backEnd->changeFileName( KGlobal::dirs()-> + backEnd->changeFileName( TDEGlobal::dirs()-> saveLocation("config", TQString::null, !bReadOnly)+fileName, "config", false); } else { backEnd->changeFileName(fileName, "config", false); diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp index cad0345ab..9552c4104 100644 --- a/tdecore/ksimpledirwatch.cpp +++ b/tdecore/ksimpledirwatch.cpp @@ -214,7 +214,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() delayRemove = false; m_ref = 0; - KConfigGroup config(KGlobal::config(), TQCString("DirWatch")); + KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); m_PollInterval = config.readNumEntry("PollInterval", 500); diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index 1f948653e..85d6e4249 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -1461,8 +1461,8 @@ void KStandardDirs::addKDEDefaults() void KStandardDirs::checkConfig() const { - if (!addedCustoms && KGlobal::_instance && KGlobal::_instance->_config) - const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::_instance->_config); + if (!addedCustoms && TDEGlobal::_instance && TDEGlobal::_instance->_config) + const_cast<KStandardDirs*>(this)->addCustomized(TDEGlobal::_instance->_config); } static TQStringList lookupProfiles(const TQString &mapFile) diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h index 6c6e71ab2..8d026682c 100644 --- a/tdecore/kstandarddirs.h +++ b/tdecore/kstandarddirs.h @@ -97,7 +97,7 @@ class KStandardDirsPrivate; * 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 TDEAboutData, if - * you use the global KStandardDirs object KGlobal::dirs()). + * you use the global KStandardDirs object TDEGlobal::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 * be "Kicker" instead of the applet's name. Therefore, for applets, you've got @@ -120,7 +120,7 @@ class KStandardDirsPrivate; * home directory of root, usually "/root/.trinity". * Note that the setting of $HOME is ignored in this case. * - * @see KGlobalSettings + * @see TDEGlobalSettings */ class TDECORE_EXPORT KStandardDirs { @@ -175,7 +175,7 @@ public: * The later a suffix is added, the higher its priority. Note, that the * suffix should end with / but doesn't have to start with one (as prefixes * should end with one). So adding a suffix for app_pics would look - * like KGlobal::dirs()->addResourceType("app_pics", "share/app/pics"); + * like TDEGlobal::dirs()->addResourceType("app_pics", "share/app/pics"); * * @param type Specifies a short descriptive string to access * files of this type. @@ -414,7 +414,7 @@ public: * It's a series of addResourceTypes() * and addPrefix() calls. * You normally wouldn't call this function because it's called - * for you from KGlobal. + * for you from TDEGlobal. */ void addKDEDefaults(); @@ -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 TDEInstance* instance = KGlobal::instance() ); +TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::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 TDEInstance* instance = KGlobal::instance() ); +TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::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 TDEInstance* instance = KGlobal::instance() ); +TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = TDEGlobal::instance() ); /*! @} */ diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h index 61b4a8e4a..dd759adf7 100644 --- a/tdecore/kstaticdeleter.h +++ b/tdecore/kstaticdeleter.h @@ -27,14 +27,14 @@ /** * Static deleters are used to manage static resources. They can register - * themselves with KGlobal. KGlobal will call destructObject() when - * KGlobal::deleteStaticDeleters() is called or when it the process + * themselves with TDEGlobal. TDEGlobal will call destructObject() when + * TDEGlobal::deleteStaticDeleters() is called or when it the process * finishes. * * @see KStaticDeleter - * @see KGlobal::registerStaticDeleter() - * @see KGlobal::unregisterStaticDeleter() - * @see KGlobal::deleteStaticDeleters() + * @see TDEGlobal::registerStaticDeleter() + * @see TDEGlobal::unregisterStaticDeleter() + * @see TDEGlobal::deleteStaticDeleters() */ class TDECORE_EXPORT KStaticDeleterBase { public: @@ -42,7 +42,7 @@ public: /** * Should destruct the resources managed by this KStaticDeleterBase. * Usually you also want to call it in your destructor. - * @see KGlobal::deleteStaticDeleters() + * @see TDEGlobal::deleteStaticDeleters() */ virtual void destructObject(); }; @@ -76,7 +76,7 @@ public: KStaticDeleter() { deleteit = 0; globalReference = 0; array = false; } /** * Sets the object to delete and registers the object to be - * deleted to KGlobal. If the given object is 0, the former + * deleted to TDEGlobal. If the given object is 0, the former * registration is unregistered. * @param obj the object to delete * @param isArray tells the destructor to delete an array instead of an object @@ -87,14 +87,14 @@ public: globalReference = 0; array = isArray; if (obj) - KGlobal::registerStaticDeleter(this); + TDEGlobal::registerStaticDeleter(this); else - KGlobal::unregisterStaticDeleter(this); + TDEGlobal::unregisterStaticDeleter(this); return obj; } /** * Sets the object to delete and registers the object to be - * deleted to KGlobal. If the given object is 0, the former + * deleted to TDEGlobal. If the given object is 0, the former * registration is unregistered. * @param globalRef the static pointer where this object is stored * This pointer will be reset to 0 after deletion of the object. @@ -106,9 +106,9 @@ public: deleteit = obj; array = isArray; if (obj) - KGlobal::registerStaticDeleter(this); + TDEGlobal::registerStaticDeleter(this); else - KGlobal::unregisterStaticDeleter(this); + TDEGlobal::unregisterStaticDeleter(this); globalRef = obj; return obj; } @@ -127,7 +127,7 @@ public: deleteit = 0; } virtual ~KStaticDeleter() { - KGlobal::unregisterStaticDeleter(this); + TDEGlobal::unregisterStaticDeleter(this); destructObject(); } private: diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp index cb2d9dbba..fa3abd5af 100644 --- a/tdecore/kstdaccel.cpp +++ b/tdecore/kstdaccel.cpp @@ -126,7 +126,7 @@ static KStdAccelInfo* infoPtr( StdAccel id ) */ static void initialize( StdAccel id ) { - KConfigGroupSaver saver( KGlobal::config(), "Shortcuts" ); + KConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" ); KStdAccelInfo* pInfo = infoPtr( id ); if( !pInfo ) { diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index d33c3c924..c562c539f 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -654,7 +654,7 @@ TQString KStringHandler::from8Bit( const char *str ) if (!str) return TQString::null; if (!*str) { - static const TQString &emptyString = KGlobal::staticQString(""); + static const TQString &emptyString = TDEGlobal::staticQString(""); return emptyString; } return KStringHandler::isUtf8( str ) ? diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp index fe9e50d57..0a2cd2511 100644 --- a/tdecore/ksycoca.cpp +++ b/tdecore/ksycoca.cpp @@ -114,7 +114,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) TQString path; TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - path = KGlobal::dirs()->saveLocation("cache") + "ksycoca"; + path = TDEGlobal::dirs()->saveLocation("cache") + "ksycoca"; else path = TQFile::decodeName(ksycoca_env); @@ -424,7 +424,7 @@ TQStringList KSycoca::allResourceDirs() TQString KSycoca::determineRelativePath( const TQString & _fullpath, const char *_resource ) { TQString sRelativeFilePath; - TQStringList dirs = KGlobal::dirs()->resourceDirs( _resource ); + TQStringList dirs = TDEGlobal::dirs()->resourceDirs( _resource ); TQStringList::ConstIterator dirsit = dirs.begin(); for ( ; dirsit != dirs.end() && sRelativeFilePath.isEmpty(); ++dirsit ) { // might need canonicalPath() ... diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp index 8a4d88c2e..69554fd86 100644 --- a/tdecore/ktempdir.cpp +++ b/tdecore/ktempdir.cpp @@ -63,7 +63,7 @@ KTempDir::KTempDir(TQString directoryPrefix, int mode) mError=0; if (directoryPrefix.isEmpty()) { - directoryPrefix = locateLocal("tmp", KGlobal::instance()->instanceName()); + directoryPrefix = locateLocal("tmp", TDEGlobal::instance()->instanceName()); } (void) create(directoryPrefix , mode); } diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp index db8ba796d..35d66f81c 100644 --- a/tdecore/ktempfile.cpp +++ b/tdecore/ktempfile.cpp @@ -71,7 +71,7 @@ KTempFile::KTempFile(TQString filePrefix, TQString fileExtension, int mode) fileExtension = ".tmp"; if (filePrefix.isEmpty()) { - filePrefix = locateLocal("tmp", KGlobal::instance()->instanceName()); + filePrefix = locateLocal("tmp", TDEGlobal::instance()->instanceName()); } (void) create(filePrefix, fileExtension, mode); } diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index 77a0cca0f..b46e05dd5 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -400,7 +400,7 @@ const KTimezones::ZoneMap KTimezones::allZones() "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'"; // Note the use of blocking here...it is a trivial amount of data! temp.close(); - reader.start(KProcess::Block); + reader.start(TDEProcess::Block); f.setName(temp.name()); if (!temp.status() || !f.open(IO_ReadOnly)) { diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index 7817742bc..9479029a9 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -334,14 +334,14 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de if (decodeDots) { #ifndef KDE_QT_ONLY - static const TQString &encodedDot = KGlobal::staticQString("%2e"); + static const TQString &encodedDot = TDEGlobal::staticQString("%2e"); #else TQString encodedDot("%2e"); #endif if (path.find(encodedDot, 0, false) != -1) { #ifndef KDE_QT_ONLY - static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase! + static const TQString &encodedDOT = TDEGlobal::staticQString("%2E"); // Uppercase! #else TQString encodedDOT("%2E"); #endif @@ -2340,7 +2340,7 @@ KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol) KURL::URIMode mode = Auto; if (protocol == fileProt) return URL; - if (KGlobal::_instance) + if (TDEGlobal::_instance) mode = KProtocolInfo::uriParseMode(protocol); if (mode == Auto ) { #else diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp index 2b07c2580..20aa6388e 100644 --- a/tdecore/kurldrag.cpp +++ b/tdecore/kurldrag.cpp @@ -253,7 +253,7 @@ TQByteArray KURLDrag::encodedData( const char* mime ) const KURL KURLDrag::stringToUrl(const TQCString &s) { if (strncmp(s.data(), "file:", 5) == 0) - return KURL(s, KGlobal::locale()->fileEncodingMib()); + return KURL(s, TDEGlobal::locale()->fileEncodingMib()); return KURL(s, 106); // 106 is mib enum for utf8 codec; } @@ -263,12 +263,12 @@ TQString KURLDrag::urlToString(const KURL &url) if (url.isLocalFile()) { #if 1 - return url.url(0, KGlobal::locale()->fileEncodingMib()); + return url.url(0, TDEGlobal::locale()->fileEncodingMib()); #else // According to the XDND spec, file:/ URLs for DND must have // the hostname part. But in really it just breaks many apps, // so it's disabled for now. - TQString s = url.url(0, KGlobal::locale()->fileEncodingMib()); + TQString s = url.url(0, TDEGlobal::locale()->fileEncodingMib()); if( !s.startsWith( "file://" )) { char hostname[257]; diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index 77c085e08..41075685e 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -84,7 +84,7 @@ void KBlacklistWorker::init() // HACK! // FIXME KDE4: How do I detect there is an instance, without triggering // its creation or an assertion fault? - if (!KGlobal::_instance) + if (!TDEGlobal::_instance) return; static bool beenhere = false; @@ -99,7 +99,7 @@ void KBlacklistWorker::init() void KBlacklistWorker::loadBlacklist() { TQMutexLocker locker(&blacklistMutex); - TQStringList filelist = KGlobal::dirs()->findAllResources("config", "ipv6blacklist"); + TQStringList filelist = TDEGlobal::dirs()->findAllResources("config", "ipv6blacklist"); TQStringList::ConstIterator it = filelist.constBegin(), end = filelist.constEnd(); diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index 8dc501590..7c253ee34 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -1299,7 +1299,7 @@ TQString macAddressForGenericDevice(TQT_DBusObjectPath path) { } TQString tdeDeviceUUIDForMACAddress(TQString macAddress) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); if (!hwdevices) { return TQString::null; } diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 9fe328509..18d2a373f 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -121,8 +121,8 @@ int main(int argc, char **argv) TDEInstance a("tde-config"); a.setConfigReadOnly(TRUE); - (void)KGlobal::dirs(); // trigger the creation - (void)KGlobal::config(); + (void)TDEGlobal::dirs(); // trigger the creation + (void)TDEGlobal::config(); // Get application specific arguments TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -151,7 +151,7 @@ int main(int argc, char **argv) if (args->isSet("localprefix")) { - printResult(KGlobal::dirs()->localtdedir()); + printResult(TDEGlobal::dirs()->localtdedir()); return 0; } @@ -163,7 +163,7 @@ int main(int argc, char **argv) if (args->isSet("types")) { - TQStringList types = KGlobal::dirs()->allTypes(); + TQStringList types = TDEGlobal::dirs()->allTypes(); types.sort(); const char *helptexts[] = { "apps", I18N_NOOP("Applications menu (.desktop files)"), @@ -211,7 +211,7 @@ int main(int argc, char **argv) TQString type = args->getOption("path"); if (!type.isEmpty()) { - printResult(KGlobal::dirs()->resourceDirs(type.latin1()).join(":")); + printResult(TDEGlobal::dirs()->resourceDirs(type.latin1()).join(":")); return 0; } @@ -219,13 +219,13 @@ int main(int argc, char **argv) if (!type.isEmpty()) { if ( type == "desktop" ) - printResult(KGlobalSettings::desktopPath()); + printResult(TDEGlobalSettings::desktopPath()); else if ( type == "autostart" ) - printResult(KGlobalSettings::autostartPath()); + printResult(TDEGlobalSettings::autostartPath()); else if ( type == "trash" ) - printResult(KGlobalSettings::trashPath()); + printResult(TDEGlobalSettings::trashPath()); else if ( type == "document" ) - printResult(KGlobalSettings::documentPath()); + printResult(TDEGlobalSettings::documentPath()); else fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() ); return 0; diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in index 61feeea7f..3d6ba7850 100644 --- a/tdecore/tde-config.cpp.in +++ b/tdecore/tde-config.cpp.in @@ -121,8 +121,8 @@ int main(int argc, char **argv) TDEInstance a("tde-config"); a.setConfigReadOnly(TRUE); - (void)KGlobal::dirs(); // trigger the creation - (void)KGlobal::config(); + (void)TDEGlobal::dirs(); // trigger the creation + (void)TDEGlobal::config(); // Get application specific arguments TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -151,7 +151,7 @@ int main(int argc, char **argv) if (args->isSet("localprefix")) { - printResult(KGlobal::dirs()->localtdedir()); + printResult(TDEGlobal::dirs()->localtdedir()); return 0; } @@ -163,7 +163,7 @@ int main(int argc, char **argv) if (args->isSet("types")) { - TQStringList types = KGlobal::dirs()->allTypes(); + TQStringList types = TDEGlobal::dirs()->allTypes(); types.sort(); const char *helptexts[] = { "apps", I18N_NOOP("Applications menu (.desktop files)"), @@ -210,7 +210,7 @@ int main(int argc, char **argv) TQString type = args->getOption("path"); if (!type.isEmpty()) { - printResult(KGlobal::dirs()->resourceDirs(type.latin1()).join(":")); + printResult(TDEGlobal::dirs()->resourceDirs(type.latin1()).join(":")); return 0; } @@ -218,13 +218,13 @@ int main(int argc, char **argv) if (!type.isEmpty()) { if ( type == "desktop" ) - printResult(KGlobalSettings::desktopPath()); + printResult(TDEGlobalSettings::desktopPath()); else if ( type == "autostart" ) - printResult(KGlobalSettings::autostartPath()); + printResult(TDEGlobalSettings::autostartPath()); else if ( type == "trash" ) - printResult(KGlobalSettings::trashPath()); + printResult(TDEGlobalSettings::trashPath()); else if ( type == "document" ) - printResult(KGlobalSettings::documentPath()); + printResult(TDEGlobalSettings::documentPath()); else fprintf(stderr, "%s", TQString(i18n("%1 - unknown type of userpath\n").arg(type)).local8Bit().data() ); return 0; diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index f9c2859c2..372f779c1 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -287,7 +287,7 @@ TDEGenericDevice* TDEGenericDevice::parentDevice() { } TQPixmap TDEGenericDevice::icon(KIcon::StdSizes size) { - return KGlobal::hardwareDevices()->getDeviceTypeIconFromType(type(), size); + return TDEGlobal::hardwareDevices()->getDeviceTypeIconFromType(type(), size); } bool TDEGenericDevice::blacklistedForUpdate() { @@ -299,7 +299,7 @@ void TDEGenericDevice::internalSetBlacklistedForUpdate(bool bl) { } TQString TDEGenericDevice::friendlyDeviceType() { - return KGlobal::hardwareDevices()->getFriendlyDeviceTypeStringFromType(type()); + return TDEGlobal::hardwareDevices()->getFriendlyDeviceTypeStringFromType(type()); } TQString TDEGenericDevice::busID() { @@ -321,10 +321,10 @@ TQString TDEGenericDevice::friendlyName() { m_friendlyName = friendlyDriverName; } else if (m_modAlias.lower().startsWith("pci")) { - m_friendlyName = KGlobal::hardwareDevices()->findPCIDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); + m_friendlyName = TDEGlobal::hardwareDevices()->findPCIDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); } else if (m_modAlias.lower().startsWith("usb")) { - m_friendlyName = KGlobal::hardwareDevices()->findUSBDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); + m_friendlyName = TDEGlobal::hardwareDevices()->findUSBDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); } else { TQString acpigentype = systemPath(); @@ -333,7 +333,7 @@ TQString TDEGenericDevice::friendlyName() { TQString pnpgentype = acpigentype; pnpgentype.truncate(pnpgentype.find(":")); if (pnpgentype.startsWith("PNP")) { - m_friendlyName = KGlobal::hardwareDevices()->findPNPDeviceName(pnpgentype); + m_friendlyName = TDEGlobal::hardwareDevices()->findPNPDeviceName(pnpgentype); } else if (acpigentype.startsWith("device:")) { acpigentype.remove(0, acpigentype.findRev(":")+1); @@ -706,7 +706,7 @@ TQString TDEStorageDevice::mountPath() { // where <something> is listed in <system path>/dm/name // First, ensure that all device information (mainly holders/slaves) is accurate - KGlobal::hardwareDevices()->rescanDeviceInformation(this); + TDEGlobal::hardwareDevices()->rescanDeviceInformation(this); TQString dmnodename = systemPath(); dmnodename.append("/dm/name"); @@ -746,7 +746,7 @@ TQString TDEStorageDevice::mountPath() { TQStringList slaveDeviceList = holdingDevices(); for ( TQStringList::Iterator slavedevit = slaveDeviceList.begin(); slavedevit != slaveDeviceList.end(); ++slavedevit ) { // Try to locate this device path in the TDE device tree - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericDevice *hwdevice = hwdevices->findBySystemPath(*slavedevit); if ((hwdevice) && (hwdevice->type() == TDEGenericDeviceType::Disk)) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); @@ -792,7 +792,7 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TQString mountOptions } // Update internal mount data - KGlobal::hardwareDevices()->processModifiedMounts(); + TDEGlobal::hardwareDevices()->processModifiedMounts(); ret = mountPath(); @@ -841,7 +841,7 @@ TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString me } // Update internal mount data - KGlobal::hardwareDevices()->processModifiedMounts(); + TDEGlobal::hardwareDevices()->processModifiedMounts(); ret = mountPath(); @@ -879,7 +879,7 @@ bool TDEStorageDevice::unmountDevice(TQString* errRet, int* retcode) { } // Update internal mount data - KGlobal::hardwareDevices()->processModifiedMounts(); + TDEGlobal::hardwareDevices()->processModifiedMounts(); return false; } @@ -1025,7 +1025,7 @@ void TDECPUDevice::setGovernor(TQString gv) { #endif // WITH_UPOWER // Force update of the device information object - KGlobal::hardwareDevices()->processModifiedCPUs(); + TDEGlobal::hardwareDevices()->processModifiedCPUs(); } bool TDECPUDevice::canSetMaximumScalingFrequency() { @@ -1049,7 +1049,7 @@ void TDECPUDevice::setMaximumScalingFrequency(double fr) { } // Force update of the device information object - KGlobal::hardwareDevices()->processModifiedCPUs(); + TDEGlobal::hardwareDevices()->processModifiedCPUs(); } int TDECPUDevice::coreNumber() { @@ -1217,7 +1217,7 @@ bool TDERootSystemDevice::canPowerOff() { // Can we power down this system? // This should probably be checked via DCOP and therefore interface with KDM - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->reparseConfiguration(); // config may have changed in the KControl module config->setGroup("General" ); @@ -3065,7 +3065,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ } } else { - TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data")); + TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data")); TQString hardware_info_directory_suffix("tdehwlib/deviceclasses/"); TQString hardware_info_directory; @@ -3079,7 +3079,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ hardware_info_directory = (*it); hardware_info_directory += hardware_info_directory_suffix; - if (KGlobal::dirs()->exists(hardware_info_directory)) { + if (TDEGlobal::dirs()->exists(hardware_info_directory)) { TQDir d(hardware_info_directory); d.setFilter( TQDir::Files | TQDir::Hidden ); @@ -5126,7 +5126,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) { if (!pnp_id_map) { pnp_id_map = new TDEDeviceIDMap; - TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data")); + TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data")); TQString hardware_info_directory_suffix("tdehwlib/pnpdev/"); TQString hardware_info_directory; TQString database_filename; @@ -5135,7 +5135,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) { hardware_info_directory = (*it); hardware_info_directory += hardware_info_directory_suffix; - if (KGlobal::dirs()->exists(hardware_info_directory)) { + if (TDEGlobal::dirs()->exists(hardware_info_directory)) { database_filename = hardware_info_directory + "pnp.ids"; if (TQFile::exists(database_filename)) { break; @@ -5196,7 +5196,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) { if (!dpy_id_map) { dpy_id_map = new TDEDeviceIDMap; - TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data")); + TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data")); TQString hardware_info_directory_suffix("tdehwlib/pnpdev/"); TQString hardware_info_directory; TQString database_filename; @@ -5205,7 +5205,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) { hardware_info_directory = (*it); hardware_info_directory += hardware_info_directory_suffix; - if (KGlobal::dirs()->exists(hardware_info_directory)) { + if (TDEGlobal::dirs()->exists(hardware_info_directory)) { database_filename = hardware_info_directory + "dpy.ids"; if (TQFile::exists(database_filename)) { break; diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdenetworkconnections.cpp index 80f34b765..2705343f7 100644 --- a/tdecore/tdenetworkconnections.cpp +++ b/tdecore/tdenetworkconnections.cpp @@ -717,7 +717,7 @@ TDENetworkConnection* TDENetworkConnectionManager::findConnectionByUUID(TQString } TDENetworkDevice* TDENetworkConnectionManager::findDeviceByUUID(TQString uuid) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); if (!hwdevices) return NULL; TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network); @@ -1071,7 +1071,7 @@ TDENetworkDevice* TDEGlobalNetworkManager::findDeviceByUUID(TQString uuid) { } TDENetworkWiFiAPInfo* TDEGlobalNetworkManager::findAccessPointByBSSID(TDEMACAddress bssid) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); if (!hwdevices) { return NULL; } diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp index 62b14aa7a..fef409d71 100644 --- a/tdecore/tests/kcalendartest.cpp +++ b/tdecore/tests/kcalendartest.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) { calType = args->getOption("type"); - KGlobal::locale()->setCalendar(calType); + TDEGlobal::locale()->setCalendar(calType); /* * If we like to see some date @@ -65,7 +65,7 @@ int main(int argc, char **argv) { */ if ( args->isSet("date") ) { option = args->getOption("date"); - date = KGlobal::locale()->readDate(option); + date = TDEGlobal::locale()->readDate(option); } else date = TQDate::currentDate(); @@ -83,70 +83,70 @@ void test(TQDate & date) { kdDebug() << "(KLocale) readDate" << endl; - kdDebug() << "Created calendar: " << KGlobal::locale()->calendar()->calendarName() << endl; + kdDebug() << "Created calendar: " << TDEGlobal::locale()->calendar()->calendarName() << endl; - kdDebug() << "Day name for first day of week is " << KGlobal::locale()->calendar()->weekDayName(1) << endl; - kdDebug() << "Short month name for second month is " << KGlobal::locale()->calendar()->weekDayName(1, true) << endl; + kdDebug() << "Day name for first day of week is " << TDEGlobal::locale()->calendar()->weekDayName(1) << endl; + kdDebug() << "Short month name for second month is " << TDEGlobal::locale()->calendar()->weekDayName(1, true) << endl; - kdDebug() << "Month name for second month is " << KGlobal::locale()->calendar()->monthName(2, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name for second month is " << KGlobal::locale()->calendar()->monthName(2, KGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Month name possessive for second month is " << KGlobal::locale()->calendar()->monthNamePossessive(2, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name possessive for second month is " << KGlobal::locale()->calendar()->monthNamePossessive(2, KGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Month name for fifth month is " << KGlobal::locale()->calendar()->monthName(5, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name for fifth month is " << KGlobal::locale()->calendar()->monthName(5, KGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Month name possessive for fifth month is " << KGlobal::locale()->calendar()->monthNamePossessive(5, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name possessive for fifth month is " << KGlobal::locale()->calendar()->monthNamePossessive(5, KGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name for second month is " << TDEGlobal::locale()->calendar()->monthName(2, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name for second month is " << TDEGlobal::locale()->calendar()->monthName(2, TDEGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name possessive for second month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(2, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name possessive for second month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(2, TDEGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name for fifth month is " << TDEGlobal::locale()->calendar()->monthName(5, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name for fifth month is " << TDEGlobal::locale()->calendar()->monthName(5, TDEGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name possessive for fifth month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(5, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name possessive for fifth month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(5, TDEGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Day for date " << date.toString() << " is " << KGlobal::locale()->calendar()->day(date) << endl; - kdDebug() << "Month for date " << date.toString() << " is " << KGlobal::locale()->calendar()->month(date) << endl; - kdDebug() << "Year for date " << date.toString() << " is " << KGlobal::locale()->calendar()->year(date) << endl; + kdDebug() << "Day for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->day(date) << endl; + kdDebug() << "Month for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->month(date) << endl; + kdDebug() << "Year for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->year(date) << endl; - kdDebug() << "Day for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->dayString(date, true) << endl; - kdDebug() << "Month for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->monthString(date, true) << endl; - kdDebug() << "Year for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->yearString(date, true) << endl; + kdDebug() << "Day for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->dayString(date, true) << endl; + kdDebug() << "Month for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->monthString(date, true) << endl; + kdDebug() << "Year for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->yearString(date, true) << endl; - kdDebug() << "Day of week for date " << date.toString() << " is number " << KGlobal::locale()->calendar()->dayOfWeek(date) << endl; - kdDebug() << "Week name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->weekDayName(date) << endl; - kdDebug() << "Short week name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->weekDayName(date, true) << endl; + kdDebug() << "Day of week for date " << date.toString() << " is number " << TDEGlobal::locale()->calendar()->dayOfWeek(date) << endl; + kdDebug() << "Week name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->weekDayName(date) << endl; + kdDebug() << "Short week name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->weekDayName(date, true) << endl; - kdDebug() << "Month name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthName(date) << endl; - kdDebug() << "Short month name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthName(date, true) << endl; - kdDebug() << "Month name possessive for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthNamePossessive(date) << endl; - kdDebug() << "Short month name possessive for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthNamePossessive(date, true) << endl; + kdDebug() << "Month name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthName(date) << endl; + kdDebug() << "Short month name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthName(date, true) << endl; + kdDebug() << "Month name possessive for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthNamePossessive(date) << endl; + kdDebug() << "Short month name possessive for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthNamePossessive(date, true) << endl; - kdDebug() << "It's week number " << KGlobal::locale()->calendar()->weekNumber(date) << endl; + kdDebug() << "It's week number " << TDEGlobal::locale()->calendar()->weekNumber(date) << endl; - kdDebug() << "(KLocale) Formatted date: " << KGlobal::locale()->formatDate(date) << endl; - kdDebug() << "(KLocale) Short formatted date: " << KGlobal::locale()->formatDate(date, true) << endl; + kdDebug() << "(KLocale) Formatted date: " << TDEGlobal::locale()->formatDate(date) << endl; + kdDebug() << "(KLocale) Short formatted date: " << TDEGlobal::locale()->formatDate(date, true) << endl; - kdDebug() << "That month have : " << KGlobal::locale()->calendar()->daysInMonth(date) << " days" << endl; + kdDebug() << "That month have : " << TDEGlobal::locale()->calendar()->daysInMonth(date) << " days" << endl; - kdDebug() << "That year has " << KGlobal::locale()->calendar()->monthsInYear(date) << " months" << endl; - kdDebug() << "There are " << KGlobal::locale()->calendar()->weeksInYear(KGlobal::locale()->calendar()->year(date)) << " weeks that year" << endl; - kdDebug() << "There are " << KGlobal::locale()->calendar()->daysInYear(date) << " days that year" << endl; + kdDebug() << "That year has " << TDEGlobal::locale()->calendar()->monthsInYear(date) << " months" << endl; + kdDebug() << "There are " << TDEGlobal::locale()->calendar()->weeksInYear(TDEGlobal::locale()->calendar()->year(date)) << " weeks that year" << endl; + kdDebug() << "There are " << TDEGlobal::locale()->calendar()->daysInYear(date) << " days that year" << endl; - kdDebug() << "The day of pray is number " << KGlobal::locale()->calendar()->weekDayOfPray() << endl; + kdDebug() << "The day of pray is number " << TDEGlobal::locale()->calendar()->weekDayOfPray() << endl; - kdDebug() << "Max valid year supported is " << KGlobal::locale()->calendar()->maxValidYear() << endl; - kdDebug() << "Min valid year supported is " << KGlobal::locale()->calendar()->minValidYear() << endl; + kdDebug() << "Max valid year supported is " << TDEGlobal::locale()->calendar()->maxValidYear() << endl; + kdDebug() << "Min valid year supported is " << TDEGlobal::locale()->calendar()->minValidYear() << endl; - kdDebug() << "It's the day number " << KGlobal::locale()->calendar()->dayOfYear(date) << " of year" << endl; + kdDebug() << "It's the day number " << TDEGlobal::locale()->calendar()->dayOfYear(date) << " of year" << endl; kdDebug() << "Add 3 days" << endl; - date = KGlobal::locale()->calendar()->addDays(date, 3); - kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl; + date = TDEGlobal::locale()->calendar()->addDays(date, 3); + kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl; kdDebug() << "Then add 3 months" << endl; - date = KGlobal::locale()->calendar()->addMonths(date, 3); - kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl; + date = TDEGlobal::locale()->calendar()->addMonths(date, 3); + kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl; kdDebug() << "And last, add -3 years" << endl; - date = KGlobal::locale()->calendar()->addYears(date, -3); - kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl; + date = TDEGlobal::locale()->calendar()->addYears(date, -3); + kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl; - kdDebug() << "Is lunar based: " << KGlobal::locale()->calendar()->isLunar() << endl; - kdDebug() << "Is lunisolar based: " << KGlobal::locale()->calendar()->isLunisolar() << endl; - kdDebug() << "Is solar based: " << KGlobal::locale()->calendar()->isSolar() << endl; + kdDebug() << "Is lunar based: " << TDEGlobal::locale()->calendar()->isLunar() << endl; + kdDebug() << "Is lunisolar based: " << TDEGlobal::locale()->calendar()->isLunisolar() << endl; + kdDebug() << "Is solar based: " << TDEGlobal::locale()->calendar()->isSolar() << endl; } diff --git a/tdecore/tests/kiconloadertest.cpp b/tdecore/tests/kiconloadertest.cpp index fba38f8bf..27dcdf845 100644 --- a/tdecore/tests/kiconloadertest.cpp +++ b/tdecore/tests/kiconloadertest.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) { TDEApplication app(argc,argv,"kiconloadertest"/*,false,false*/); - KIconLoader * mpLoader = KGlobal::iconLoader(); + KIconLoader * mpLoader = TDEGlobal::iconLoader(); KIcon::Context mContext = KIcon::Application; TQTime dt; dt.start(); diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp index 3c8df342e..bcb7bc9e8 100644 --- a/tdecore/tests/klocaletest.cpp +++ b/tdecore/tests/klocaletest.cpp @@ -70,19 +70,19 @@ void Test::createFields() TQString string; string+="Selected languages: "; - string+=KGlobal::locale()->languages()+"\n"; + string+=TDEGlobal::locale()->languages()+"\n"; // This will show nothing, as there is no klocaletest.mo // but you can copy other *.mo file string+="Used language: "; - string+=KGlobal::locale()->language()+"\n"; + string+=TDEGlobal::locale()->language()+"\n"; string+="Locale encoding: "; - string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n"; + string+=TQString::fromLatin1(TDEGlobal::locale()->encoding())+"\n"; string+="Localized date and time: "; - string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + string+=TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); string+="\nLocalized monetary numbers: "; - string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89); + string+=TDEGlobal::locale()->formatMoney(1234567.89) + " / \n" +TDEGlobal::locale()->formatMoney(-1234567.89); // This will not work // but you can copy other *.mo file string+="\nSome localized strings:\n"; @@ -93,7 +93,7 @@ void Test::createFields() label=new TQLabel(string,this,"Label"); label->setGeometry(10,10,400,400); - label->setFont(KGlobalSettings::generalFont()); + label->setFont(TDEGlobalSettings::generalFont()); label->show(); } @@ -102,47 +102,47 @@ int main( int argc, char ** argv ) KLocale::setMainCatalogue("tdelibs"); TDEApplication a( argc, argv, "klocaletest" ); - KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); - KGlobal::locale()->setCountry(TQString::fromLatin1("C")); - KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); + TDEGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); + TDEGlobal::locale()->setCountry(TQString::fromLatin1("C")); + TDEGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); TQString formatted; - formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00"); - formatted = KGlobal::locale()->formatNumber( 70, 0 ); check("formatNumber(70, 0)",formatted,"70"); - formatted = KGlobal::locale()->formatNumber( 70.2 ); check("formatNumber(70.2)",formatted,"70.20"); - formatted = KGlobal::locale()->formatNumber( 70.24 ); check("formatNumber(70.24)",formatted,"70.24"); - formatted = KGlobal::locale()->formatNumber( 70.245 ); check("formatNumber(70.245)",formatted,"70.25"); /*rounded*/ - formatted = KGlobal::locale()->formatNumber(1234567.89123456789,8); check("formatNumber(1234567.89123456789,8)",formatted,"1,234,567.89123457"); + formatted = TDEGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00"); + formatted = TDEGlobal::locale()->formatNumber( 70, 0 ); check("formatNumber(70, 0)",formatted,"70"); + formatted = TDEGlobal::locale()->formatNumber( 70.2 ); check("formatNumber(70.2)",formatted,"70.20"); + formatted = TDEGlobal::locale()->formatNumber( 70.24 ); check("formatNumber(70.24)",formatted,"70.24"); + formatted = TDEGlobal::locale()->formatNumber( 70.245 ); check("formatNumber(70.245)",formatted,"70.25"); /*rounded*/ + formatted = TDEGlobal::locale()->formatNumber(1234567.89123456789,8); check("formatNumber(1234567.89123456789,8)",formatted,"1,234,567.89123457"); - formatted = KGlobal::locale()->formatNumber("70"); check("formatNumber(\"70\")",formatted,"70.00"); - formatted = KGlobal::locale()->formatNumber("70", true, 2); check("formatNumber(\"70\", true, 2)",formatted,"70.00"); - formatted = KGlobal::locale()->formatNumber("70", true, 0); check("formatNumber(\"70\", true, 0)",formatted,"70"); - formatted = KGlobal::locale()->formatNumber("70.9123", true, 0); check("formatNumber(\"70.9123\", true, 0)",formatted,"71"); /* rounded */ - formatted = KGlobal::locale()->formatNumber("-70.2", true, 2); check("formatNumber(\"-70.2\", true, 2)",formatted,"-70.20"); - formatted = KGlobal::locale()->formatNumber("+70.24", true, 2); check("formatNumber(\"+70.24\", true, 2)",formatted,"70.24"); - formatted = KGlobal::locale()->formatNumber("70.245", true, 2); check("formatNumber(\"70.245\", true, 2)",formatted,"70.25"); /*rounded*/ - formatted = KGlobal::locale()->formatNumber("99.996", true, 2); check("formatNumber(\"99.996\", true, 2)",formatted,"100.00"); /*rounded*/ - formatted = KGlobal::locale()->formatNumber("12345678901234567.89123456789", false, 0); check("formatNumber(\"12345678901234567.89123456789\", false, 0)",formatted,"12,345,678,901,234,567.89123456789"); + formatted = TDEGlobal::locale()->formatNumber("70"); check("formatNumber(\"70\")",formatted,"70.00"); + formatted = TDEGlobal::locale()->formatNumber("70", true, 2); check("formatNumber(\"70\", true, 2)",formatted,"70.00"); + formatted = TDEGlobal::locale()->formatNumber("70", true, 0); check("formatNumber(\"70\", true, 0)",formatted,"70"); + formatted = TDEGlobal::locale()->formatNumber("70.9123", true, 0); check("formatNumber(\"70.9123\", true, 0)",formatted,"71"); /* rounded */ + formatted = TDEGlobal::locale()->formatNumber("-70.2", true, 2); check("formatNumber(\"-70.2\", true, 2)",formatted,"-70.20"); + formatted = TDEGlobal::locale()->formatNumber("+70.24", true, 2); check("formatNumber(\"+70.24\", true, 2)",formatted,"70.24"); + formatted = TDEGlobal::locale()->formatNumber("70.245", true, 2); check("formatNumber(\"70.245\", true, 2)",formatted,"70.25"); /*rounded*/ + formatted = TDEGlobal::locale()->formatNumber("99.996", true, 2); check("formatNumber(\"99.996\", true, 2)",formatted,"100.00"); /*rounded*/ + formatted = TDEGlobal::locale()->formatNumber("12345678901234567.89123456789", false, 0); check("formatNumber(\"12345678901234567.89123456789\", false, 0)",formatted,"12,345,678,901,234,567.89123456789"); double num; bool ok; - num = KGlobal::locale()->readNumber( "12,1", &ok ); check("readNumber(12,1)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,100", &ok ); check("readNumber(12,100)",ok?"yes":"no","yes"); - num = KGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,100000000", &ok ); check("readNumber(12,100000000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,,100,000", &ok ); check("readNumber(12,,100,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,1000,000", &ok ); check("readNumber(12,1000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,0000000,000", &ok ); check("readNumber(12,0000000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,0000000", &ok ); check("readNumber(12,0000000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,146,131.12", &ok ); check("readNumber(12,146,131.12)",ok?"yes":"no","yes"); - num = KGlobal::locale()->readNumber( "1.12345678912", &ok ); + num = TDEGlobal::locale()->readNumber( "12,1", &ok ); check("readNumber(12,1)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,100", &ok ); check("readNumber(12,100)",ok?"yes":"no","yes"); + num = TDEGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,100000000", &ok ); check("readNumber(12,100000000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,,100,000", &ok ); check("readNumber(12,,100,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,1000,000", &ok ); check("readNumber(12,1000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,0000000,000", &ok ); check("readNumber(12,0000000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,0000000", &ok ); check("readNumber(12,0000000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,146,131.12", &ok ); check("readNumber(12,146,131.12)",ok?"yes":"no","yes"); + num = TDEGlobal::locale()->readNumber( "1.12345678912", &ok ); tqDebug( "%s", TQString::number( num, 'g', 12 ).latin1() ); // warning this is the only way to see all decimals check("readNumber(1.12345678912)",ok && num==1.12345678912?"yes":"no","yes"); // bug 95511 - KLocale locale(*KGlobal::locale()); + KLocale locale(*TDEGlobal::locale()); locale.setCurrencySymbol("$$"); num = locale.readMoney("1,234,567.89$$", &ok); check("readMoney(1,234,567.89$$)",ok?"yes":"no","yes"); @@ -151,41 +151,41 @@ int main( int argc, char ** argv ) TQDate date; date.setYMD( 2002, 5, 3 ); - checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + checkDate("readDate( 3, 5, 2002 )",date,TDEGlobal::locale()->readDate( TDEGlobal::locale()->formatDate( date ) ) ); date = TQDate::currentDate(); - checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + checkDate("readDate( TQDate::currentDate() )",date,TDEGlobal::locale()->readDate( TDEGlobal::locale()->formatDate( date ) ) ); TQTime time; - time = KGlobal::locale()->readTime( "11:22:33", &ok ); + time = TDEGlobal::locale()->readTime( "11:22:33", &ok ); check("readTime(\"11:22:33\")", (ok && time == TQTime(11, 22, 33)) ? "yes" : "no", "yes"); - time = KGlobal::locale()->readTime( "11:22", &ok ); + time = TDEGlobal::locale()->readTime( "11:22", &ok ); check("readTime(\"11:22\")", (ok && time == TQTime(11, 22, 0)) ? "yes" : "no", "yes"); - time = KGlobal::locale()->readTime( "foo", &ok ); + time = TDEGlobal::locale()->readTime( "foo", &ok ); check("readTime(\"foo\")", (!ok && !time.isValid()) ? "invalid" : "valid", "invalid"); - time = KGlobal::locale()->readTime( "11:22:33", KLocale::WithoutSeconds, &ok ); + time = TDEGlobal::locale()->readTime( "11:22:33", KLocale::WithoutSeconds, &ok ); check("readTime(\"11:22:33\", WithoutSeconds)", (!ok && !time.isValid()) ? "invalid" : "valid", "invalid"); - time = KGlobal::locale()->readTime( "11:22", KLocale::WithoutSeconds, &ok ); + time = TDEGlobal::locale()->readTime( "11:22", KLocale::WithoutSeconds, &ok ); check("readTime(\"11:22\", WithoutSeconds)", (ok && time == TQTime(11, 22, 0)) ? "yes" : "no", "yes"); - KGlobal::locale()->setTimeFormat( "%H:%M %p" ); + TDEGlobal::locale()->setTimeFormat( "%H:%M %p" ); time = TQTime( 0, 22, 33 ); - TQString timeStr = KGlobal::locale()->formatTime( time, true /*seconds*/, false /*duration*/ ); + TQString timeStr = TDEGlobal::locale()->formatTime( time, true /*seconds*/, false /*duration*/ ); check("formatTime(\"0:22\", as time)", timeStr, "00:22 am" ); - timeStr = KGlobal::locale()->formatTime( time, true /*seconds*/, true /*duration*/ ); + timeStr = TDEGlobal::locale()->formatTime( time, true /*seconds*/, true /*duration*/ ); check("formatTime(\"0:22\", as duration)", timeStr, "00:22" ); kdDebug() << "setLanguage C\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("C")); + TDEGlobal::locale()->setLanguage(TQString::fromLatin1("C")); kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl; kdDebug() << "setLanguage de\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("de")); + TDEGlobal::locale()->setLanguage(TQString::fromLatin1("de")); kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl; diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp index bec7c0dd2..f86cb2f20 100644 --- a/tdecore/tests/kprocesstest.cpp +++ b/tdecore/tests/kprocesstest.cpp @@ -1,5 +1,5 @@ // -// MAIN -- a little demo of the capabilities of the "KProcess" class +// MAIN -- a little demo of the capabilities of the "TDEProcess" class // // version 0.2, Aug 2nd 1997 // $Id$ @@ -32,12 +32,12 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n int main(int argc, char *argv[]) { - KProcess p1, p2, p3, p4; + TDEProcess p1, p2, p3, p4; Dummy dummy; TDEApplication app(argc, argv, "kprocesstest"); - printf("Welcome to the KProcess Demo Application!\n"); + printf("Welcome to the TDEProcess Demo Application!\n"); // // The kghostview demo -- Starts a kghostview instance blocking. -- After @@ -46,39 +46,39 @@ int main(int argc, char *argv[]) // p1 << "kghostview"; - TQObject::connect(&p1, TQT_SIGNAL(processExited(KProcess *)), &dummy, TQT_SLOT(printMessage(KProcess *))); + TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); printf("starting kghostview blocking (close to continue)\n"); - p1.start(KProcess::Block); + p1.start(TDEProcess::Block); printf("restarting kghostview non blocking\n"); p1.start(); // // A konsole with tcsh to demonstrate how to pass command line options to a process - // with "KProcess" (is run blocking) + // with "TDEProcess" (is run blocking) // printf("Starting konsole with /bin/tcsh as shell (close to continue)\n"); p2 << "konsole" << "-e" << "/bin/tcsh"; p2.setWorkingDirectory("/tmp"); - TQObject::connect(&p2, TQT_SIGNAL(processExited(KProcess *)), &dummy, TQT_SLOT(printMessage(KProcess *))); - p2.start(KProcess::Block); + TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + p2.start(TDEProcess::Block); // // Getting the output from a process. "ls" with parameter "-l" is called and it output is captured // p3 << "ls" << "-l"; - TQObject::connect(&p3, TQT_SIGNAL(processExited(KProcess *)), - &dummy, TQT_SLOT(printMessage(KProcess *))); + TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), + &dummy, TQT_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); + TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - p3.start(KProcess::NotifyOnExit, KProcess::AllOutput); + p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); // @@ -93,18 +93,18 @@ int main(int argc, char *argv[]) // p4 << "sort"; - TQObject::connect(&p4, TQT_SIGNAL(processExited(KProcess *)), - &dummy, TQT_SLOT(printMessage(KProcess *))); + TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), + &dummy, TQT_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); + TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(KProcess *)), - &dummy, TQT_SLOT(outputDone(KProcess *))); + TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)), + &dummy, TQT_SLOT(outputDone(TDEProcess *))); - p4.start(KProcess::NotifyOnExit, KProcess::All); + p4.start(TDEProcess::NotifyOnExit, TDEProcess::All); printf("after p4.start"); p4.writeStdin(txt, strlen(txt)); diff --git a/tdecore/tests/kprocesstest.h b/tdecore/tests/kprocesstest.h index 23ac443dd..5817af438 100644 --- a/tdecore/tests/kprocesstest.h +++ b/tdecore/tests/kprocesstest.h @@ -1,5 +1,5 @@ // -// DUMMY -- A dummy class with a slot to demonstrate KProcess signals +// DUMMY -- A dummy class with a slot to demonstrate TDEProcess signals // // version 0.2, Aug 2nd 1997 // @@ -20,20 +20,20 @@ class Dummy : public TQObject Q_OBJECT public slots: - void printMessage(KProcess *proc) + void printMessage(TDEProcess *proc) { printf("Process %d exited!\n", (int)proc->getPid()); } - void gotOutput(KProcess*, char *buffer, int len) + void gotOutput(TDEProcess*, char *buffer, int len) { - char result[1025]; // this is ugly since it relys on the internal buffer size of KProcess, + char result[1025]; // this is ugly since it relys on the internal buffer size of TDEProcess, memcpy(result, buffer, len); // NEVER do that in your own application... ;-) result[len] = '\0'; printf("OUTPUT>>%s", result); } - void outputDone(KProcess *proc) + void outputDone(TDEProcess *proc) /* Slot Procedure for the "sort" example. -- If it is indicated that the "sort" command has absorbed all its input, we send an "EOF" to it to indicate that there is no more diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp index c637e35b2..a4fbb19ad 100644 --- a/tdecore/tests/kprociotest.cpp +++ b/tdecore/tests/kprociotest.cpp @@ -1,5 +1,5 @@ // -// MAIN -- a little demo of the capabilities of the "KProcess" class +// MAIN -- a little demo of the capabilities of the "TDEProcess" class // // version 0.2, Aug 2nd 1997 // $Id$ @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) p << "rev"; - p.connect(&p, TQT_SIGNAL(processExited(KProcess*)), &dummy, TQT_SLOT(printMessage(KProcess*))); + p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*))); p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*))); bool b; diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/kprociotest.h index 9f948e644..fd60bb87b 100644 --- a/tdecore/tests/kprociotest.h +++ b/tdecore/tests/kprociotest.h @@ -1,5 +1,5 @@ // -// DUMMY -- A dummy class with a slot to demonstrate KProcess signals +// DUMMY -- A dummy class with a slot to demonstrate TDEProcess signals // // version 0.2, Aug 2nd 1997 // @@ -20,7 +20,7 @@ class Dummy : public TQObject Q_OBJECT public slots: - void printMessage(KProcess *proc) + void printMessage(TDEProcess *proc) { printf("Process %d exited!\n", (int)proc->getPid()); } diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index 47d709a9b..f1284d394 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -817,9 +817,9 @@ int main(int argc, char *argv[]) check("path",ulong.path(),"/servlet/CookieAccepted"); #if TQT_VERSION < 300 - qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); + qt_set_locale_codec( TDEGlobal::charsets()->codecForName( "iso-8859-1" ) ); #else - TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); + TQTextCodec::setCodecForLocale( TDEGlobal::charsets()->codecForName( "iso-8859-1" ) ); #endif TQString raw = "data:text/html,%00%2540%00"; check("data URL: encode-decode of %00", KURL(raw).url(), raw ); @@ -862,9 +862,9 @@ int main(int argc, char *argv[]) testAdjustPath(); #if TQT_VERSION < 300 - qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) ); + qt_set_locale_codec( TDEGlobal::charsets()->codecForName( "koi8-r" ) ); #else - TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) ); + TQTextCodec::setCodecForLocale( TDEGlobal::charsets()->codecForName( "koi8-r" ) ); #endif baseURL = "file:/home/coolo"; KURL russian = baseURL.directory(false, true) + TQString::fromLocal8Bit( "ÆÇÎ7" ); diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp index 63cdc761f..bdd1e099a 100644 --- a/tdecore/twin.cpp +++ b/tdecore/twin.cpp @@ -483,7 +483,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) if( XGetClassHint( tqt_xdisplay(), win, &hint ) ) { TQString className = hint.res_class; - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); @@ -500,7 +500,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) // If the icon is still a null pixmap, load the 'xapp' icon // as a last resort: if ( result.isNull() ) { - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp index dfdc04698..1da7f28fb 100644 --- a/tdefx/kimageeffect.cpp +++ b/tdefx/kimageeffect.cpp @@ -69,7 +69,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define MOD(x, y) ((x) < 0 ? ((y) - 1 - ((y) - 1 - (x)) % (y)) : (x) % (y)) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function that returns x if it's between low and high values. * low if x is smaller than then low and high if x is bigger than high. */ diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index 9868dbfca..7d58c9f08 100644 --- a/tdelfeditor/tdelfeditor.cpp +++ b/tdelfeditor/tdelfeditor.cpp @@ -541,13 +541,13 @@ int main_console(int argc, char **argv) TDECmdLineArgs::init(&aboutd); TDEApplication app(false, false); - TQStringList rds = KGlobal::dirs()->resourceDirs("icon"); + TQStringList rds = TDEGlobal::dirs()->resourceDirs("icon"); for ( TQStringList::Iterator it = rds.begin(); it != rds.end(); ++it ) { printf(" * %s\n\r", (*it).ascii()); fflush(stdout); } - TQString systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true); + TQString systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true); if (systemIcon.isNull()) { - systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false); + systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false); printf("NOT FOUND, refusing to add unknown icon (this message is harmless)\n\r"); section = ICON_SECTION; clear_resource(handle, section); diff --git a/tdeprint/ChangeLog b/tdeprint/ChangeLog index 5ce11bd36..cc18bd7eb 100644 --- a/tdeprint/ChangeLog +++ b/tdeprint/ChangeLog @@ -108,7 +108,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be> * tdeprintfax: added possibility to view files being faxed and file action (remove and view) are enabled only when needed. * KPrinter: when printing to a file, support encoding and spaces - in file names + system --> KProcess. + in file names + system --> TDEProcess. 07/11/2001 Michael Goffioul <tdeprint@swing.be> * tdeprint: fixed some problems: diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index f0cb1c359..f0057235e 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -47,9 +47,9 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); m_side = new SidePixmap(this); m_doit = new TQPushButton(i18n("&Export"), this); @@ -145,7 +145,7 @@ void CupsAddSmb::slotActionClicked() m_proc.kill(); } -void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) +void CupsAddSmb::slotReceived(TDEProcess*, char *buf, int buflen) { TQString line; int index(0); @@ -309,7 +309,7 @@ void CupsAddSmb::doNextAction() } } -void CupsAddSmb::slotProcessExited(KProcess*) +void CupsAddSmb::slotProcessExited(TDEProcess*) { kdDebug(500) << "PROCESS EXITED (" << m_state << ")" << endl; if (m_proc.normalExit() && m_state != Start && m_status) @@ -470,7 +470,7 @@ bool CupsAddSmb::startProcess() m_actionindex = 0; m_buffer.clear(); kdDebug(500) << "PROCESS STARTED = " << m_proc.args()[0] << endl; - return m_proc.start(KProcess::NotifyOnExit, KProcess::All); + return m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::All); } #include "cupsaddsmb2.moc" diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h index 84166f53c..9aeccdd4a 100644 --- a/tdeprint/cups/cupsaddsmb2.h +++ b/tdeprint/cups/cupsaddsmb2.h @@ -44,9 +44,9 @@ public: static bool exportDest(const TQString& dest, const TQString& datadir); protected slots: - void slotReceived(KProcess*, char*, int); + void slotReceived(TDEProcess*, char*, int); void doNextAction(); - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); void slotActionClicked(); protected: @@ -58,7 +58,7 @@ protected: void showError(const TQString& msg); private: - KProcess m_proc; + TDEProcess m_proc; TQStringList m_buffer; int m_state; TQStringList m_actions; diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index bc91f9ffe..5e6d4659d 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -113,8 +113,8 @@ const char* getPassword(const char*) CupsdDialog::CupsdDialog(TQWidget *parent, const char *name) : KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) { - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("cupsdconf"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("cupsdconf"); setShowIconsInTreeList(true); setRootIsDecorated(false); @@ -136,7 +136,7 @@ CupsdDialog::~CupsdDialog() void CupsdDialog::addConfPage(CupsdPage *page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pixmap(), KIcon::NoGroup, KIcon::SizeMedium @@ -207,9 +207,9 @@ bool CupsdDialog::restartServer(TQString& msg) else { bool success = false; - KProcess proc; + TDEProcess proc; proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart"; - success = proc.start( KProcess::Block ) && proc.normalExit(); + success = proc.start( TDEProcess::Block ) && proc.normalExit(); if( !success ) msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); } @@ -256,7 +256,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString } else { - KGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" + TDEGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" CupsdDialog dlg(parent); if (dlg.setConfigFile(fn) && dlg.exec()) { diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp index 0fde06159..4edaefb58 100644 --- a/tdeprint/cups/ipprequest.cpp +++ b/tdeprint/cups/ipprequest.cpp @@ -208,8 +208,8 @@ void IppRequest::init() request_ = 0; } request_ = ippNew(); - //kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; - TQCString langstr = KGlobal::locale()->language().latin1(); + //kdDebug(500) << "tdeprint: IPP request, lang=" << TDEGlobal::locale()->language() << endl; + TQCString langstr = TDEGlobal::locale()->language().latin1(); cups_lang_t* lang = cupsLangGet(langstr.data()); // default charset to UTF-8 (ugly hack) lang->encoding = CUPS_UTF8; diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp index 5c2de105b..5c2245e8d 100644 --- a/tdeprint/cups/kcupsprinterimpl.cpp +++ b/tdeprint/cups/kcupsprinterimpl.cpp @@ -155,5 +155,5 @@ static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd } } if (!optstr.isEmpty()) - cmd.append(" -o ").append( KProcess::quote( optstr ) ); + cmd.append(" -o ").append( TDEProcess::quote( optstr ) ); } diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index 66acb8daf..e5630652e 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -638,11 +638,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t cups -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp index 6a4de31eb..19e8401d8 100644 --- a/tdeprint/foomatic/kmfoomaticmanager.cpp +++ b/tdeprint/foomatic/kmfoomaticmanager.cpp @@ -77,9 +77,9 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool) } QString cmd = "foomatic-combo-xml -p "; - cmd += KProcess::quote(printer->option("printer")); + cmd += TDEProcess::quote(printer->option("printer")); cmd += " -d "; - cmd += KProcess::quote(printer->option("driver")); + cmd += TDEProcess::quote(printer->option("driver")); KPipeProcess proc(cmd); QDomDocument doc; doc.setContent(&proc); diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 8daa2fe20..661d97764 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -113,8 +113,8 @@ KMFactory::KMFactory() if ( !ok ) settings.writeEntry( "/qt/embedFonts", true ); - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("tdeprint"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("tdeprint"); // create DCOP signal connection connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index d26515a16..84e120e77 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -47,7 +47,7 @@ bool KMSpecialManager::savePrinters() if (getuid() == 0) { confname = locate("data", "tdeprint/specials.desktop"); - if (confname.startsWith(KGlobal::dirs()->localtdedir())) + if (confname.startsWith(TDEGlobal::dirs()->localtdedir())) { // seems there's a problem here m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " @@ -107,8 +107,8 @@ bool KMSpecialManager::loadPrinters() if (m_loaded) return true; bool result(true); - TQString localDir = KGlobal::dirs()->localtdedir(); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); + TQString localDir = TDEGlobal::dirs()->localtdedir(); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); // local files should processed last, so we need to reorder the list // and put local files at the end TQStringList orderedFiles; diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index b64ce075e..ea1ec61e3 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -440,7 +440,7 @@ void KPGeneralPage::initialize() for ( int i=HIGHSIZE_BEGIN+1; i<DEFAULT_SIZE; i+=2 ) m_pagesize->insertItem(i18n(default_size[i])); // set default page size using locale settings - TQString psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize())); + TQString psname = pageSizeToPageName((KPrinter::PageSize)(TDEGlobal::locale()->pageSize())); int index = findOption(default_size, DEFAULT_SIZE, psname); if (index >= 0) m_pagesize->setCurrentItem(index); diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp index 554679ee7..ab70211c8 100644 --- a/tdeprint/kpmarginpage.cpp +++ b/tdeprint/kpmarginpage.cpp @@ -62,7 +62,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) // first retrieve the Qt values for page size and margins TQPrinter prt(TQPrinter::PrinterResolution); prt.setFullPage(true); - prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : ps.toInt())); + prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? TDEGlobal::locale()->pageSize() : ps.toInt())); TQPaintDeviceMetrics metrics(&prt); float w = metrics.width(); float h = metrics.height(); diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index 3a0982661..11b5a6574 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -203,7 +203,7 @@ void KPQtPage::init() for (int i=0; i<KPrinter::NPageSize-1; i++) m_pagesize->insertItem(i18n(page_sizes[i].text)); // default page size to locale settings - m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize()))); + m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(TDEGlobal::locale()->pageSize()))); } else { diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 1e0e141a9..5e77f890a 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -439,7 +439,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) } else { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); expandDialog(!config->readBoolEntry("DialogReduced", (KMFactory::self()->settings()->application != KPrinter::StandAlone))); } @@ -447,7 +447,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) KPrintDialog::~KPrintDialog() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); config->writeEntry("DialogReduced", d->m_reduced); diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 86ef04f66..e62bf635b 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -174,7 +174,7 @@ void KPrinter::loadSettings() setSearchName(option("kde-searchname")); d->m_options.remove("kde-searchname"); - KConfig *conf = KGlobal::config(), *pconf = KMFactory::self()->printConfig(); + KConfig *conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig(); conf->setGroup("KPrinter Settings"); pconf->setGroup("General"); @@ -199,7 +199,7 @@ void KPrinter::saveSettings() } // save latest used printer to config file - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("Printer",searchName()); // latest used print command @@ -850,7 +850,7 @@ void KPrinter::setFromTo(int m, int M) // if no page size defined, use the localized one KPrinter::PageSize KPrinter::pageSize() const -{ return (option("kde-pagesize").isEmpty() ? (PageSize)KGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } +{ return (option("kde-pagesize").isEmpty() ? (PageSize)TDEGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } KPrinter::PageSetType KPrinter::pageSet() const { return (option("kde-pageset").isEmpty() ? AllPages : (PageSetType)(option("kde-pageset").toInt())); } diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 171daf45d..9c62d25f8 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -158,9 +158,9 @@ bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag) } else { - KProcess proc; + TDEProcess proc; proc << (flag?"mv":"cp") << f[0] << p->outputFileName(); - if (!proc.start(KProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) + if (!proc.start(TDEProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) { p->setErrorMessage(i18n("Cannot save print file to %1. Check that you have write access to it.").arg(p->outputFileName())); return false; @@ -573,7 +573,7 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin } TQString KPrinterImpl::quote(const TQString& s) -{ return KProcess::quote(s); } +{ return TDEProcess::quote(s); } void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) { @@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) void KPrinterImpl::loadAppOptions() { - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); TQStringList opts = conf->readListEntry("ApplicationOptions"); for (uint i=0; i<opts.count(); i+=2) @@ -598,7 +598,7 @@ void KPrinterImpl::saveAppOptions() if (it.key().startsWith("app-")) optlist << it.key() << it.data(); - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("ApplicationOptions", optlist); } diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index 32381af28..bd812b939 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -42,10 +42,10 @@ #include <kmimetype.h> KPreviewProc::KPreviewProc() -: KProcess() +: TDEProcess() { m_bOk = false; - connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); } KPreviewProc::~KPreviewProc() @@ -63,7 +63,7 @@ bool KPreviewProc::startPreview() return false; } -void KPreviewProc::slotProcessExited(KProcess* proc) +void KPreviewProc::slotProcessExited(TDEProcess* proc) { kapp->exit_loop(); if ( proc->normalExit() && proc->exitStatus() == 0 ) diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h index 5fd581fe7..ae99fb405 100644 --- a/tdeprint/kprintpreview.h +++ b/tdeprint/kprintpreview.h @@ -47,7 +47,7 @@ private: KPrintPreviewPrivate *d; }; -class KPreviewProc : public KProcess +class KPreviewProc : public TDEProcess { Q_OBJECT public: @@ -57,7 +57,7 @@ public: bool startPreview(); protected slots: - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); private: bool m_bOk; }; diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index fb1df2840..fbee05a0c 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess() : KShellProcess() { // redirect everything to a single buffer - connect(this,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(this,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect( this, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotExited( KProcess* ) ) ); + connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) ); m_state = None; } @@ -53,7 +53,7 @@ bool KPrintProcess::print() return start(NotifyOnExit,All); } -void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) +void KPrintProcess::slotReceivedStderr(TDEProcess *proc, char *buf, int len) { if (proc == this) { @@ -62,7 +62,7 @@ void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) } } -void KPrintProcess::slotExited( KProcess* ) +void KPrintProcess::slotExited( TDEProcess* ) { switch ( m_state ) { diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h index 976b35afe..5ceb3835e 100644 --- a/tdeprint/kprintprocess.h +++ b/tdeprint/kprintprocess.h @@ -50,8 +50,8 @@ signals: void printError( KPrintProcess*, const TQString& ); protected slots: - void slotReceivedStderr(KProcess*, char*, int); - void slotExited( KProcess* ); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotExited( TDEProcess* ); private: QString m_buffer; diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 212b53fb5..f2dcb99ce 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -393,7 +393,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi } else { - format.replace( re, KProcess::quote( dopt->valueText() ) ); + format.replace( re, TDEProcess::quote( dopt->valueText() ) ); } str.append(format).append(" "); } @@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList() { if (d->m_cmdlist.isEmpty()) { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeprint/filters/"); for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) { diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index fcb79a052..a38aa4e26 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -185,9 +185,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer) // 4) change permissions of spool directory TQCString cmd = "chmod -R o-rwx,g+rwX "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); cmd += "&& chown -R lp.lp "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); if (system(cmd.data()) != 0) { setErrorMsg(i18n("Unable to set correct permissions on spool directory %1 for printer <b>%2</b>.").arg(ent->arg("sd")).arg(ent->m_name)); @@ -209,7 +209,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer) return false; } TQCString cmd = "rm -rf "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); system(cmd.data()); delete ent; return true; @@ -225,7 +225,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) cmd += " "; cmd += state ? "up" : "down"; cmd += " "; - cmd += KProcess::quote(printer->printerName()); + cmd += TDEProcess::quote(printer->printerName()); if (proc.open(cmd)) { QTextStream t(&proc); @@ -549,9 +549,9 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) return false; // write various driver files using templates TQCString cmd = "cp "; - cmd += TQFile::encodeName(KProcess::quote(driverDirectory()+"/master-filter")); + cmd += TQFile::encodeName(TDEProcess::quote(driverDirectory()+"/master-filter")); cmd += " "; - cmd += TQFile::encodeName(KProcess::quote(spooldir + "/filter")); + cmd += TQFile::encodeName(TDEProcess::quote(spooldir + "/filter")); if (system(cmd.data()) == 0 && savePrinttoolCfgFile(driverDirectory()+"/general.cfg.in",spooldir,options) && savePrinttoolCfgFile(driverDirectory()+"/postscript.cfg.in",spooldir,options) && diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.h b/tdeprint/lpdunix/klpdunixprinterimpl.h index bbbda4104..c4a1ac671 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.h +++ b/tdeprint/lpdunix/klpdunixprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KLpdUnixPrinterImpl : public KPrinterImpl { diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 54f987c58..7ea114382 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -137,7 +137,7 @@ void KMLprManager::initHandlers() insertHandler(new LPRngToolHandler(this)); // now load external handlers - TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); + TQStringList l = TDEGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); @@ -405,7 +405,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt) { // printcap file saved, entry can be deleted now delete entry; - status = (::system(TQFile::encodeName("rm -rf " + KProcess::quote(sd))) == 0); + status = (::system(TQFile::encodeName("rm -rf " + TDEProcess::quote(sd))) == 0); if (!status) setErrorMsg(i18n("Unable to remove spool directory %1. " "Check that you have write permissions " diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index 05d09c40a..2723eb842 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -235,7 +235,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + " " + op + " " + KProcess::quote(printer)); + TQString result = execute(m_exepath + " " + op + " " + TDEProcess::quote(printer)); int status; switch (LprSettings::self()->mode()) @@ -273,7 +273,7 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm"); return false; } - TQString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_lprmpath + " -P " + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); if (result.find("dequeued") != -1) return true; else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1) @@ -291,7 +291,7 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); TQString answer = lprngAnswer(result, job->printer()); if (answer == "no") { diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp index 30348f591..52a8d06c5 100644 --- a/tdeprint/lpr/lpqhelper.cpp +++ b/tdeprint/lpr/lpqhelper.cpp @@ -83,7 +83,7 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line) void LpqHelper::listJobs(TQPtrList<KMJob>& jobs, const TQString& prname, int limit) { KPipeProcess proc; - if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname))) + if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + TDEProcess::quote(prname))) { TQTextStream t(&proc); TQString line; diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index 49c33822d..4cabeae98 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -225,7 +225,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool) // changing printer name), the template would be also removed TQString origfilename = maticFile(entry); TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - ::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename))); + ::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename))); DrMain *driver = Foomatic2Loader::loadDriver(filename); if (driver) { @@ -258,11 +258,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t lpd -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); @@ -329,7 +329,7 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai inFile.close(); tmpFile.close(); - TQString cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile); + TQString cmd = "mv " + TDEProcess::quote(tmpFile.name()) + " " + TDEProcess::quote(outFile); int status = ::system(TQFile::encodeName(cmd).data()); TQFile::remove(tmpFile.name()); result = (status != -1 && WEXITSTATUS(status) == 0); diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 2bfebcfa4..b60be8510 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -19,7 +19,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) "0.1"); TDECmdLineArgs::addCmdLineOptions(options); - KGlobal::locale()->setMainCatalogue("tdelibs"); + TDEGlobal::locale()->setMainCatalogue("tdelibs"); TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index d26b2082d..cd823d540 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -60,7 +60,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) { if (page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pagePixmap(), KIcon::NoGroup, KIcon::SizeMedium diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 0e72906d7..9c315402f 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -95,7 +95,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena msg = i18n("The executable %1 could not be found in your " "PATH. Check that this program exists and is " "accessible in your PATH variable.").arg(exestr); - else if (!m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + else if (!m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) msg = i18n("Unable to start the creation of the driver " "database. The execution of %1 failed.").arg(exestr); if (!msg.isEmpty()) @@ -124,7 +124,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena return started; } -void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) +void KMDBCreator::slotReceivedStdout(TDEProcess*, char *buf, int len) { // save buffer TQString str( TQCString(buf, len) ); @@ -151,12 +151,12 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) } } -void KMDBCreator::slotReceivedStderr(KProcess*, char*, int) +void KMDBCreator::slotReceivedStderr(TDEProcess*, char*, int) { // just discard it for the moment } -void KMDBCreator::slotProcessExited(KProcess*) +void KMDBCreator::slotProcessExited(TDEProcess*) { // delete the progress dialog if (m_dlg) diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h index 319d270c0..4b1983ae6 100644 --- a/tdeprint/management/kmdbcreator.h +++ b/tdeprint/management/kmdbcreator.h @@ -40,16 +40,16 @@ public: bool status() const { return m_status; } protected slots: - void slotReceivedStdout(KProcess *p, char *bufm, int len); - void slotReceivedStderr(KProcess *p, char *bufm, int len); - void slotProcessExited(KProcess *p); + void slotReceivedStdout(TDEProcess *p, char *bufm, int len); + void slotReceivedStderr(TDEProcess *p, char *bufm, int len); + void slotProcessExited(TDEProcess *p); void slotCancelled(); signals: void dbCreated(); private: - KProcess m_proc; + TDEProcess m_proc; TQProgressDialog *m_dlg; bool m_status; bool m_firstflag; diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index c2bc28b20..22b9ac8e9 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -233,7 +233,7 @@ void KMMainView::initActions() KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); mact->setDelayed(false); connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { KSimpleConfig conf(*it); @@ -698,9 +698,9 @@ void KMMainView::slotServerConfigure() void KMMainView::slotServerConfigureAccess() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/system-config-printer-kde"; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } void KMMainView::slotToggleToolBar(bool on) diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index e0526ad5a..5586f110f 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -57,7 +57,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) ctn->setWidget(w); connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), KIcon::NoGroup, KIcon::SizeMedium diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index fde3a3451..c5b40f942 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -49,11 +49,11 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_state = Idle; m_current = 0; - m_proc = new KProcess(); + m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); + connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); } @@ -91,7 +91,7 @@ void SmbView::startProcess(int state) m_buffer = TQString::null; m_state = state; TQApplication::setOverrideCursor(KCursor::waitCursor()); - m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout); + m_proc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout); emit running(true); } @@ -118,12 +118,12 @@ void SmbView::endProcess() m_proc->clearArguments(); } -void SmbView::slotProcessExited(KProcess*) +void SmbView::slotProcessExited(TDEProcess*) { endProcess(); } -void SmbView::slotReceivedStdout(KProcess*, char *buf, int len) +void SmbView::slotReceivedStdout(TDEProcess*, char *buf, int len) { m_buffer.append(TQString::fromLocal8Bit(buf,len)); } @@ -178,7 +178,7 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { // opening group m_current = item; *m_proc << "nmblookup"+m_wins_server+"-M "; - *m_proc << KProcess::quote(item->text(0)); + *m_proc << TDEProcess::quote(item->text(0)); *m_proc << " -S"; startProcess(ServerListing); } @@ -194,14 +194,14 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { *m_proc << "smbclient -N -L "; } - *m_proc << KProcess::quote (item->text (0)); + *m_proc << TDEProcess::quote (item->text (0)); *m_proc << " -W "; - *m_proc << KProcess::quote (item->parent ()-> + *m_proc << TDEProcess::quote (item->parent ()-> text (0)); if (!krb5ccname) { *m_proc << " -A "; - *m_proc << KProcess:: + *m_proc << TDEProcess:: quote (m_passwdFile->name ()); } startProcess(ShareListing); diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index aea1d920d..9b571f4dd 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -22,7 +22,7 @@ #include <klistview.h> -class KProcess; +class TDEProcess; class KTempFile; class SmbView : public KListView @@ -49,15 +49,15 @@ protected: void processShares(); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotSelectionChanged(TQListViewItem*); private: enum State { GroupListing, ServerListing, ShareListing, Idle }; int m_state; TQListViewItem *m_current; - KProcess *m_proc; + TDEProcess *m_proc; TQString m_buffer; TQString m_login, m_password; KTempFile *m_passwdFile; diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index 141cadc56..3a809e06b 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -206,7 +206,7 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU if ( allowMetricUnit ) { - int mode = (KGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1); + int mode = (TDEGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1); m_top->setMode(mode); m_bottom->setMode(mode); m_left->setMode(mode); diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 241c53dbf..b76c0181a 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -53,9 +53,9 @@ PosterPreview::~PosterPreview() void PosterPreview::init() { - m_process = new KProcess; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotProcessExited( KProcess* ) ) ); + m_process = new TDEProcess; + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0; m_dirty = false; @@ -93,7 +93,7 @@ void PosterPreview::updatePoster() m_process->clearArguments(); *m_process << "poster" << "-F" << "-m" + m_mediasize << "-p" + m_postersize << "-c" + TQString::number( m_cutmargin ) + "%"; - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { m_rows = m_cols = 0; m_dirty = false; @@ -140,11 +140,11 @@ void PosterPreview::drawContents( TQPainter *painter ) for ( int j=0; j<m_cols; j++, x+=m_pw ) { bool selected = ( m_selectedpages.find( i*m_cols+j+1 ) != m_selectedpages.end() ); - p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) ); + p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? TDEGlobalSettings::highlightColor() : white ) ); p->drawRect( x, y, m_pw, m_ph ); if ( pw > 0 && ph > 0 ) p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ), - ( selected ? TQColor(KGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); + ( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); p->setPen( Qt::DotLine ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); p->setPen( Qt::SolidLine ); @@ -206,12 +206,12 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e ) } } -void PosterPreview::slotProcessStderr( KProcess*, char *buf, int len ) +void PosterPreview::slotProcessStderr( TDEProcess*, char *buf, int len ) { m_buffer.append( TQCString( buf, len ) ); } -void PosterPreview::slotProcessExited( KProcess* ) +void PosterPreview::slotProcessExited( TDEProcess* ) { if ( m_process->normalExit() && m_process->exitStatus() == 0 ) parseBuffer(); diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h index d0c362a04..d9a23cb59 100644 --- a/tdeprint/posterpreview.h +++ b/tdeprint/posterpreview.h @@ -23,7 +23,7 @@ #include <tqframe.h> #include <tqvaluelist.h> -class KProcess; +class TDEProcess; class PosterPreview : public TQFrame { @@ -55,15 +55,15 @@ protected: void emitSelectedPages(); protected slots: - void slotProcessStderr( KProcess*, char*, int ); - void slotProcessExited( KProcess* ); + void slotProcessStderr( TDEProcess*, char*, int ); + void slotProcessExited( TDEProcess* ); private: int m_rows, m_cols; int m_pw, m_ph; // page size int m_mw, m_mh; // cur margins TQRect m_posterbb; // poster bounding box (without any margin) - KProcess *m_process; + TDEProcess *m_process; TQString m_buffer; TQString m_postersize, m_mediasize; int m_cutmargin; diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp index e0161a50a..7e46139ef 100644 --- a/tdeprint/printerfilter.cpp +++ b/tdeprint/printerfilter.cpp @@ -44,7 +44,7 @@ void PrinterFilter::update() m_printers = conf->readListEntry("Printers"); // filter enable state is saved on a per application basis, // so this option is retrieve from the application config file - conf = KGlobal::config(); + conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); m_enabled = conf->readBoolEntry("FilterEnabled", false); } @@ -52,7 +52,7 @@ void PrinterFilter::update() void PrinterFilter::setEnabled(bool on) { m_enabled = on; - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("FilterEnabled", m_enabled); } diff --git a/tdeprint/rlpr/krlprprinterimpl.h b/tdeprint/rlpr/krlprprinterimpl.h index 7af98df0c..741a1a3c8 100644 --- a/tdeprint/rlpr/krlprprinterimpl.h +++ b/tdeprint/rlpr/krlprprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KRlprPrinterImpl : public KPrinterImpl { diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 86c8375cb..7777e19ce 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -124,12 +124,12 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla if ( !url.isLocalFile() ) { TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) ); - command.replace( re, KProcess::quote( tmpFilename ) ); + command.replace( re, TDEProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); } else - command.replace( re, KProcess::quote( re.cap( 1 ) ) ); + command.replace( re, TDEProcess::quote( re.cap( 1 ) ) ); } if ( checkFiles( command, files ) ) @@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) i18n("Provide root's Password"), "provideRootsPassword") == KMessageBox::Continue) { - cmd = ("tdesu -c " + KProcess::quote(cmd)); + cmd = ("tdesu -c " + TDEProcess::quote(cmd)); break; } else diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h index 51cd09877..4ef54b894 100644 --- a/tdeprint/tdeprintd.h +++ b/tdeprint/tdeprintd.h @@ -28,7 +28,7 @@ #include <tqintdict.h> class KPrintProcess; -class KProcess; +class TDEProcess; class StatusWindow; class KDEPrintd : public KDEDModule diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index e4bc1e6f2..d9a1e2a72 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("exec")); @@ -196,7 +196,7 @@ void EscpWidget::startCommand(const TQString& arg) m_hasoutput = ( arg == "-i" || arg == "-d" ); for ( TQValueList<TQCString>::ConstIterator it=m_proc.args().begin(); it!=m_proc.args().end(); ++it ) kdDebug() << "ARG: " << *it << endl; - if (m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + if (m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) setEnabled(false); else { @@ -206,7 +206,7 @@ void EscpWidget::startCommand(const TQString& arg) } } -void EscpWidget::slotProcessExited(KProcess*) +void EscpWidget::slotProcessExited(TDEProcess*) { setEnabled(true); if (!m_proc.normalExit() || m_proc.exitStatus() != 0) @@ -229,13 +229,13 @@ void EscpWidget::slotProcessExited(KProcess*) m_hasoutput = false; } -void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStdout(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_outbuffer.append(bufstr); } -void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_errorbuffer.append(bufstr); diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h index 7e3ba55e8..4ad284d00 100644 --- a/tdeprint/tools/escputil/escpwidget.h +++ b/tdeprint/tools/escputil/escpwidget.h @@ -37,16 +37,16 @@ public: void setPrinterName(const TQString&); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotReceivedStderr(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotButtonClicked(); protected: void startCommand(const TQString& arg); private: - KProcess m_proc; + TDEProcess m_proc; KURL m_deviceURL; TQString m_errorbuffer, m_outbuffer; TQLabel *m_printer, *m_device; diff --git a/tdesu/kcookie.cpp b/tdesu/kcookie.cpp index 99b34ec4e..f5a2d547c 100644 --- a/tdesu/kcookie.cpp +++ b/tdesu/kcookie.cpp @@ -100,7 +100,7 @@ void KCookie::getXCookie() if (!memcmp(disp.data(), "localhost:", 10)) disp.remove(0, 9); - TQString cmd = "xauth list "+KProcess::quote(disp); + TQString cmd = "xauth list "+TDEProcess::quote(disp); blockSigChild(); // pclose uses waitpid() if (!(f = popen(TQFile::encodeName(cmd), "r"))) { @@ -163,7 +163,7 @@ void KCookie::getICECookie() if (strncmp((*it).data(), m_dcopTransport.data(), m_dcopTransport.length()) != 0) continue; m_DCOPSrv = *it; - TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(KProcess::quote(m_DCOPSrv)); + TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(TDEProcess::quote(m_DCOPSrv)); blockSigChild(); if (!(f = popen(cmd, "r"))) { diff --git a/tdesu/process.cpp b/tdesu/process.cpp index 692c01553..f1b353396 100644 --- a/tdesu/process.cpp +++ b/tdesu/process.cpp @@ -74,7 +74,7 @@ int PtyProcess::waitMS(int fd,int ms) */ bool PtyProcess::checkPid(pid_t pid) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("super-user-command"); TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND); //sudo does not accept signals from user so we except it diff --git a/tdesu/su.cpp b/tdesu/su.cpp index c4e75772e..5f8d24832 100644 --- a/tdesu/su.cpp +++ b/tdesu/su.cpp @@ -55,7 +55,7 @@ SuProcess::SuProcess(const TQCString &user, const TQCString &command) m_User = user; m_Command = command; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("super-user-command"); superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND); if ( superUserCommand != "sudo" && superUserCommand != "su" ) { @@ -128,8 +128,8 @@ int SuProcess::exec(const char *password, int check) if (::access(command, X_OK) != 0) { - /// command = TQFile::encodeName(KGlobal::dirs()->findExe("su")); - command = TQFile::encodeName( KGlobal::dirs()->findExe(superUserCommand.ascii()) ); + /// command = TQFile::encodeName(TDEGlobal::dirs()->findExe("su")); + command = TQFile::encodeName( TDEGlobal::dirs()->findExe(superUserCommand.ascii()) ); if (command.isEmpty()) return check ? SuNotFound : -1; } diff --git a/tdeui/kaboutapplication.cpp b/tdeui/kaboutapplication.cpp index 4be70c48c..1b7808fd0 100644 --- a/tdeui/kaboutapplication.cpp +++ b/tdeui/kaboutapplication.cpp @@ -40,7 +40,7 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name, Close, Close, parent, name, modal ) { - buildDialog(KGlobal::instance()->aboutData()); + buildDialog(TDEGlobal::instance()->aboutData()); } KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent, diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp index 3ed785891..5e6edaeae 100644 --- a/tdeui/kaboutdialog.cpp +++ b/tdeui/kaboutdialog.cpp @@ -436,7 +436,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) { if( mTitleLabel ) { - TQFont f( KGlobalSettings::generalFont() ); + TQFont f( TDEGlobalSettings::generalFont() ); f.setBold( true ); int fs = f.pointSize(); if (fs == -1) @@ -447,7 +447,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) if( mVersionLabel ) { - TQFont f( KGlobalSettings::generalFont() ); + TQFont f( TDEGlobalSettings::generalFont() ); f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); @@ -502,7 +502,7 @@ TQFrame *KAboutContainerBase::addLicensePage( const TQString &title, TQVBoxLayout* const vbox = new TQVBoxLayout( page, KDialog::spacingHint() ); KTextEdit* const textEdit = new KTextEdit( page, "license" ); - textEdit->setFont( KGlobalSettings::fixedFont() ); + textEdit->setFont( TDEGlobalSettings::fixedFont() ); textEdit->setReadOnly( true ); textEdit->setWordWrap( TQTextEdit::NoWrap ); textEdit->setText( text ); diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp index 89e397450..6fad7d34b 100644 --- a/tdeui/kaction.cpp +++ b/tdeui/kaction.cpp @@ -662,7 +662,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); id = menu->insertItem( d->iconSet( KIcon::Small, 0, instance ), d->text(), this,//dsweet TQT_SLOT( slotPopupActivated() ), keyQt, -1, index ); @@ -702,7 +702,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp index e83a9f05d..4be388afe 100644 --- a/tdeui/kactionclasses.cpp +++ b/tdeui/kactionclasses.cpp @@ -1101,7 +1101,7 @@ void KRecentFilesAction::addURL( const KURL& url ) void KRecentFilesAction::addURL( const KURL& url, const TQString& name ) { - if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) + if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) return; const TQString file = url.pathOrURL(); TQStringList lst = KSelectAction::items(); @@ -1282,7 +1282,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ), isEnabled(), plainText(), @@ -1832,7 +1832,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), @@ -1958,7 +1958,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), @@ -2294,7 +2294,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp index 9cc76902b..9654d0ffd 100644 --- a/tdeui/kactioncollection.cpp +++ b/tdeui/kactioncollection.cpp @@ -462,7 +462,7 @@ void KActionCollection::setInstance( TDEInstance *instance ) if ( instance ) d->m_instance = instance; else - d->m_instance = KGlobal::instance(); + d->m_instance = TDEGlobal::instance(); } TDEInstance *KActionCollection::instance() const diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index 899ba7bd3..7a5928ab3 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -185,9 +185,9 @@ void KAnimWidget::updateIcons() if (parent()->inherits( "KToolBar" )) d->size = ((KToolBar*)parent())->iconSize(); if (!d->size) - d->size = KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + d->size = TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); - TQString path = KGlobal::iconLoader()->iconPath(d->icon_name, -d->size); + TQString path = TDEGlobal::iconLoader()->iconPath(d->icon_name, -d->size); TQImage img(path); if (img.isNull()) diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 37f84a802..3e63af8f9 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -79,11 +79,11 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou d = new KBugReportPrivate; // Use supplied aboutdata, otherwise the one from the active instance - // otherwise the KGlobal one. _activeInstance should neved be 0L in theory. + // otherwise the TDEGlobal one. _activeInstance should neved be 0L in theory. m_aboutData = aboutData ? aboutData - : ( KGlobal::_activeInstance ? KGlobal::_activeInstance->aboutData() - : KGlobal::instance()->aboutData() ); + : ( TDEGlobal::_activeInstance ? TDEGlobal::_activeInstance->aboutData() + : TDEGlobal::instance()->aboutData() ); m_process = 0; TQWidget * parent = plainPage(); d->submitBugButton = 0; @@ -318,9 +318,9 @@ void KBugReport::appChanged(int i) void KBugReport::slotConfigureEmail() { if (m_process) return; - m_process = new KProcess; + m_process = new TDEProcess; *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom())); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom())); if (!m_process->start()) { kdDebug() << "Couldn't start kcmshell.." << endl; @@ -460,9 +460,9 @@ TQString KBugReport::text() const bodyText += line; } - if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { + if (severity == TQString::fromLatin1("i18n") && TDEGlobal::locale()->language() != KLocale::defaultLanguage()) { // Case 1 : i18n bug - TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language()); + TQString package = TQString::fromLatin1("i18n_%1").arg(TDEGlobal::locale()->language()); package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); return TQString::fromLatin1("Package: %1").arg(package) + TQString::fromLatin1("\n" @@ -498,11 +498,11 @@ bool KBugReport::sendBugReport() TQString subject = m_subject->text(); command += " --subject "; - command += KProcess::quote(subject); + command += TDEProcess::quote(subject); command += " --recipient "; - command += KProcess::quote(recipient); + command += TDEProcess::quote(recipient); command += " > "; - command += KProcess::quote(outputfile.name()); + command += TDEProcess::quote(outputfile.name()); fflush(stdin); fflush(stderr); diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h index 2c60b091b..b8ddd39f7 100644 --- a/tdeui/kbugreport.h +++ b/tdeui/kbugreport.h @@ -24,7 +24,7 @@ class TQMultiLineEdit; class TQLineEdit; class TQHButtonGroup; -class KProcess; +class TDEProcess; class TDEAboutData; class KBugReportPrivate; @@ -100,7 +100,7 @@ protected: */ bool sendBugReport(); - KProcess * m_process; + TDEProcess * m_process; const TDEAboutData * m_aboutData; TQMultiLineEdit * m_lineedit; diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 640b9c7ac..0745bccd9 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -35,7 +35,7 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; + KConfigGroupSaver saver ( TDEGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp index a047fe6b8..bba0e5247 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/kcmodule.cpp @@ -65,10 +65,10 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &) init(); if (name && strlen(name)) { d->_instance = new TDEInstance(name); - KGlobal::locale()->insertCatalogue(name); + TDEGlobal::locale()->insertCatalogue(name); } else d->_instance = new TDEInstance("kcmunnamed"); - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); d->managers.setAutoDelete( true ); @@ -82,11 +82,11 @@ KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & if (instance) { - KGlobal::locale()->insertCatalogue(instance->instanceName()); + TDEGlobal::locale()->insertCatalogue(instance->instanceName()); } d->_hasOwnInstance = false; - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); } void KCModule::init() diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index ceded0f58..b28002ebc 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -175,7 +175,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e) { if( (e->state() & Qt::LeftButton) && - (e->pos()-mPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) + (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { // Drag color object KColorDrag *dg = new KColorDrag( color(), this); diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index ec3930fa3..7db3807a7 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -429,7 +429,7 @@ void KColorCells::mouseMoveEvent( TQMouseEvent *e ) if( !(e->state() & Qt::LeftButton)) return; if(inMouse) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if(e->x() > mPos.x()+delay || e->x() < mPos.x()-delay || e->y() > mPos.y()+delay || e->y() < mPos.y()-delay){ // Drag color object @@ -645,7 +645,7 @@ KPaletteTable::readNamedColor( void ) return; // Strings already present } - KGlobal::locale()->insertCatalogue("tdelibs_colors"); + TDEGlobal::locale()->insertCatalogue("tdelibs_colors"); // // Code somewhat inspired by KPalette. @@ -1254,7 +1254,7 @@ void KColorDialog::slotDefaultColorClicked() void KColorDialog::readSettings() { - KConfigGroup group( KGlobal::config(), "Colors" ); + KConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = group.readEntry("CurrentPalette"); d->table->setPalette(palette); @@ -1263,7 +1263,7 @@ KColorDialog::readSettings() void KColorDialog::slotWriteSettings() { - KConfigGroup group( KGlobal::config(), "Colors" ); + KConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = d->table->palette(); if (!group.hasDefault("CurrentPalette") && diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index 198a1e200..5d3914327 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -111,13 +111,13 @@ void KComboBox::setAutoCompletion( bool autocomplete ) { if ( autocomplete ) { - d->klineEdit->setCompletionMode( KGlobalSettings::CompletionAuto ); - setCompletionMode( KGlobalSettings::CompletionAuto ); + d->klineEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); + setCompletionMode( TDEGlobalSettings::CompletionAuto ); } else { - d->klineEdit->setCompletionMode( KGlobalSettings::completionMode() ); - setCompletionMode( KGlobalSettings::completionMode() ); + d->klineEdit->setCompletionMode( TDEGlobalSettings::completionMode() ); + setCompletionMode( TDEGlobalSettings::completionMode() ); } } } @@ -290,8 +290,8 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType )) ); connect( d->klineEdit, - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion )), - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion))); + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); connect( d->klineEdit, TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index de3b07aab..41963a56b 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -251,7 +251,7 @@ public: * @return @p true when completion mode is automatic. */ bool autoCompletion() const { - return completionMode() == KGlobalSettings::CompletionAuto; + return completionMode() == TDEGlobalSettings::CompletionAuto; } /** @@ -331,7 +331,7 @@ public: /** * @returns the completion-box, that is used in completion mode - * KGlobalSettings::CompletionPopup and KGlobalSettings::CompletionPopupAuto. + * TDEGlobalSettings::CompletionPopup and TDEGlobalSettings::CompletionPopupAuto. * This method will create a completion-box by calling * KLineEdit::completionBox, if none is there, yet. * @@ -373,7 +373,7 @@ signals: * The argument is the current text being edited. * * Note that this signal is @em not available when the widget is non-editable - * or the completion mode is set to @p KGlobalSettings::CompletionNone. + * or the completion mode is set to @p TDEGlobalSettings::CompletionNone. */ void completion( const TQString& ); @@ -399,7 +399,7 @@ signals: * Emitted whenever the completion mode is changed by the user * through the context menu. */ - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); /** * Emitted before the context menu is displayed. diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp index 56d52b88a..efcda9ebe 100644 --- a/tdeui/kcompletionbox.cpp +++ b/tdeui/kcompletionbox.cpp @@ -275,7 +275,7 @@ void KCompletionBox::sizeAndPosition() int x = currentPos.x(), y = currentPos.y(); if ( d->m_parent ) { if ( !isVisible() ) { - TQRect screenSize = KGlobalSettings::desktopGeometry(d->m_parent); + TQRect screenSize = TDEGlobalSettings::desktopGeometry(d->m_parent); TQPoint orig = d->m_parent->mapToGlobal( TQPoint(0, d->m_parent->height()) ); x = orig.x() + geom.x(); diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h index 8016ceab2..5f2f5b660 100644 --- a/tdeui/kcompletionbox.h +++ b/tdeui/kcompletionbox.h @@ -36,7 +36,7 @@ class TQEvent; * It is filled with all possible matches for a completion, so the user * can select the one he wants. * - * It is used when KGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto. + * It is used when TDEGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto. * * @author Carsten Pfeiffer <pfeiffer@kde.org> */ diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 1458f88dc..d09b4e9ee 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -46,7 +46,7 @@ TQCursor KCursor::handCursor() if (!hand_cursor) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "General" ); #ifndef Q_WS_WIN // this mask doesn't work too well on win32 @@ -369,7 +369,7 @@ KCursorPrivate::KCursorPrivate() { hideCursorDelay = 5000; // 5s default value - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); enabled = kc->readBoolEntry( TQString::fromLatin1("Autohiding cursor enabled"), true ); diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index ded20474a..1ba83bad1 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -65,7 +65,7 @@ public: void KDatePicker::fillWeeksCombo(const TQDate &date) { // every year can have a different number of weeks - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); // it could be that we had 53,1..52 and now 1..53 which is the same number but different // so always fill with new values @@ -150,9 +150,9 @@ void KDatePicker::init( const TQDate &dt ) line = new KLineEdit(this); val = new KDateValidator(this); table = new KDateTable(this); - fontsize = KGlobalSettings::generalFont().pointSize(); + fontsize = TDEGlobalSettings::generalFont().pointSize(); if (fontsize == -1) - fontsize = TQFontInfo(KGlobalSettings::generalFont()).pointSize(); + fontsize = TQFontInfo(TDEGlobalSettings::generalFont()).pointSize(); fontsize++; // Make a little bigger @@ -247,9 +247,9 @@ KDatePicker::dateChangedSlot(TQDate date) { kdDebug(298) << "KDatePicker::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); - line->setText(KGlobal::locale()->formatDate(date, true)); + line->setText(TDEGlobal::locale()->formatDate(date, true)); selectMonth->setText(calendar->monthName(date, false)); fillWeeksCombo(date); @@ -301,7 +301,7 @@ void KDatePicker::monthForwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); + temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); setDate( temp ); } @@ -310,7 +310,7 @@ void KDatePicker::monthBackwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); + temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); setDate( temp ); } @@ -319,7 +319,7 @@ void KDatePicker::yearForwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); + temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); setDate( temp ); } @@ -328,7 +328,7 @@ void KDatePicker::yearBackwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); + temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); setDate( temp ); } @@ -338,7 +338,7 @@ void KDatePicker::selectWeekClicked() {} // ### in 3.2 obsolete; kept for binar void KDatePicker::weekSelected(int week) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date = table->getDate(); int year = calendar->year(date); @@ -355,7 +355,7 @@ void KDatePicker::selectMonthClicked() { // every year can have different month names (in some calendar systems) - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date = table->getDate(); int i, month, months = calendar->monthsInYear(date); @@ -379,7 +379,7 @@ KDatePicker::selectMonthClicked() void KDatePicker::selectYearClicked() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); if (selectYear->state() == TQButton::Off) { @@ -499,8 +499,8 @@ KDatePicker::setFontSize(int s) for (int i = 1; ; ++i) { - TQString str = KGlobal::locale()->calendar()->monthName(i, - KGlobal::locale()->calendar()->year(table->getDate()), false); + TQString str = TDEGlobal::locale()->calendar()->monthName(i, + TDEGlobal::locale()->calendar()->year(table->getDate()), false); if (str.isNull()) break; r=metrics.boundingRect(str); maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width())); diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index 9387a6322..632c7deea 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -99,7 +99,7 @@ KDateValidator::validate(TQString& text, int&) const TQValidator::State KDateValidator::date(const TQString& text, TQDate& d) const { - TQDate tmp = KGlobal::locale()->readDate(text); + TQDate tmp = TDEGlobal::locale()->readDate(text); if (!tmp.isNull()) { d = tmp; @@ -129,7 +129,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth initAccels(); @@ -145,7 +145,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(TQDate::currentDate()); // this initializes firstday, numdays, numDaysPrevMonth initAccels(); } @@ -169,8 +169,8 @@ void KDateTable::initAccels() int KDateTable::posFromDate( const TQDate &dt ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - const int firstWeekDay = KGlobal::locale()->weekStartDay(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); + const int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int pos = calendar->day( dt ); int offset = (firstday - firstWeekDay + 7) % 7; // make sure at least one day of the previous month is visible. @@ -182,10 +182,10 @@ int KDateTable::posFromDate( const TQDate &dt ) TQDate KDateTable::dateFromPos( int pos ) { TQDate pCellDate; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); calendar->setYMD(pCellDate, calendar->year(date), calendar->month(date), 1); - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int offset = (firstday - firstWeekDay + 7) % 7; // make sure at least one day of the previous month is visible. // adjust this <1 if more days should be forced visible: @@ -211,14 +211,14 @@ KDateTable::paintEmptyArea(TQPainter *paint, int, int, int, int) void KDateTable::paintCell(TQPainter *painter, int row, int col) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQRect rect; TQString text; TQPen pen; int w=cellWidth(); int h=cellHeight(); - TQFont font=KGlobalSettings::generalFont(); + TQFont font=TDEGlobalSettings::generalFont(); // ----- if(row == 0) @@ -226,7 +226,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) font.setBold(true); painter->setFont(font); bool normalday = true; - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int daynum = ( col+firstWeekDay < 8 ) ? col+firstWeekDay : col+firstWeekDay-7; if ( daynum == calendar->weekDayOfPray() || @@ -234,8 +234,8 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) normalday=false; TQBrush brushInvertTitle(colorGroup().base()); - TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); - TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); + TQColor titleColor(isEnabled()?( TDEGlobalSettings::activeTitleColor() ):( TDEGlobalSettings::inactiveTitleColor() ) ); + TQColor textColor(isEnabled()?( TDEGlobalSettings::activeTextColor() ):( TDEGlobalSettings::inactiveTextColor() ) ); if (!normalday) { painter->setPen(textColor); @@ -298,7 +298,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } pen=painter->pen(); - int firstWeekDay=KGlobal::locale()->weekStartDay(); + int firstWeekDay=TDEGlobal::locale()->weekStartDay(); int offset=firstday-firstWeekDay; if(offset<1) offset+=7; @@ -339,13 +339,13 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) void KDateTable::nextMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); setDate(calendar->addMonths( date, 1 )); } void KDateTable::previousMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); setDate(calendar->addMonths( date, -1 )); } @@ -433,7 +433,7 @@ KDateTable::setFontSize(int size) maxCell.setHeight(0); for(count=0; count<7; ++count) { - rect=metrics.boundingRect(KGlobal::locale()->calendar() + rect=metrics.boundingRect(TDEGlobal::locale()->calendar() ->weekDayName(count+1, true)); maxCell.setWidth(QMAX(maxCell.width(), rect.width())); maxCell.setHeight(QMAX(maxCell.height(), rect.height())); @@ -500,7 +500,7 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e) if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) { KPopupMenu *menu = new KPopupMenu(); - menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) ); + menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) ); emit aboutToShowContextMenu( menu, clickedDate ); menu->popup(e->globalPos()); } @@ -524,7 +524,7 @@ KDateTable::setDate(const TQDate& date_) emit(dateChanged(date)); changed=true; } - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); calendar->setYMD(temp, calendar->year(date), calendar->month(date), 1); //temp.setYMD(date.year(), date.month(), 1); @@ -614,7 +614,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); @@ -686,7 +686,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker // ----- activeCol = -1; activeRow = -1; - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); @@ -694,17 +694,17 @@ KDateInternalMonthPicker::KDateInternalMonthPicker setNumCols(3); d = new KDateInternalMonthPrivate(date.year(), date.month(), date.day()); // For monthsInYear != 12 - setNumRows( (KGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3); + setNumRows( (TDEGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3); // enable to find drawing failures: // setTableFlags(Tbl_clipCellPainting); - viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); // for consistency with the datepicker // ----- find the preferred size // (this is slow, possibly, but unfortunately it is needed here): TQFontMetrics metrics(font); for(int i = 1; ; ++i) { - TQString str = KGlobal::locale()->calendar()->monthName(i, - KGlobal::locale()->calendar()->year(date), false); + TQString str = TDEGlobal::locale()->calendar()->monthName(i, + TDEGlobal::locale()->calendar()->year(date), false); if (str.isNull()) break; rect=metrics.boundingRect(str); if(max.width()<rect.width()) max.setWidth(rect.width()); @@ -728,7 +728,7 @@ KDateInternalMonthPicker::getResult() const void KDateInternalMonthPicker::setupPainter(TQPainter *p) { - p->setPen(KGlobalSettings::textColor()); + p->setPen(TDEGlobalSettings::textColor()); } void @@ -745,8 +745,8 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) TQString text; // ----- find the number of the cell: index=3*row+col+1; - text=KGlobal::locale()->calendar()->monthName(index, - KGlobal::locale()->calendar()->year(TQDate(d->year, d->month, + text=TDEGlobal::locale()->calendar()->monthName(index, + TDEGlobal::locale()->calendar()->year(TQDate(d->year, d->month, d->day)), false); painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); if ( activeCol == col && activeRow == row ) @@ -855,7 +855,7 @@ KDateInternalYearSelector::KDateInternalYearSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); // we have to respect the limits of TQDate here, I fear: @@ -879,7 +879,7 @@ KDateInternalYearSelector::yearEnteredSlot() return; } //date.setYMD(year, 1, 1); - KGlobal::locale()->calendar()->setYMD(date, year, 1, 1); + TDEGlobal::locale()->calendar()->setYMD(date, year, 1, 1); if(!date.isValid()) { KNotifyClient::beep(); @@ -982,7 +982,7 @@ void KPopupFrame::popup(const TQPoint &pos) { // Make sure the whole popup is visible. - TQRect d = KGlobalSettings::desktopGeometry(pos); + TQRect d = TDEGlobalSettings::desktopGeometry(pos); int x = pos.x(); int y = pos.y(); diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp index ba46a599b..cb690b0ea 100644 --- a/tdeui/kdatewidget.cpp +++ b/tdeui/kdatewidget.cpp @@ -72,7 +72,7 @@ KDateWidget::KDateWidget( TQDate date, TQWidget *parent, void KDateWidget::init() { d = new KDateWidgetPrivate; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); @@ -96,7 +96,7 @@ void KDateWidget::init() void KDateWidget::init(const TQDate& date) { d = new KDateWidgetPrivate; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); @@ -125,7 +125,7 @@ KDateWidget::~KDateWidget() // ### HPB change TQDate to const TQDate & in KDE 4.0 void KDateWidget::setDate( TQDate date ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); d->m_day->blockSignals(true); d->m_month->blockSignals(true); @@ -151,7 +151,7 @@ TQDate KDateWidget::date() const void KDateWidget::slotDateChanged( ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date; int y,m,day; diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 868eb3b44..0b99c550c 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -342,7 +342,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) seperatorbox->setMargin(0); TQWidget* ticon = new TQWidget( frame ); - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap trinityPixmap = ldr->loadIcon("kmenu", KIcon::Panel, KIcon::SizeLarge, KIcon::DefaultState, 0L, true); // Manually draw the alpha portions of the icon onto the widget background color... @@ -431,7 +431,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent) // Center the dialog TQSize sh = sizeHint(); - TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos()); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); show(); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 1fb00aa6d..c18bead0a 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -656,7 +656,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, } } - setButtonStyle( KGlobalSettings::buttonLayout() ); + setButtonStyle( TDEGlobalSettings::buttonLayout() ); } @@ -1740,7 +1740,7 @@ void KDialogBase::showTile( bool state ) TQSize KDialogBase::configDialogSize( const TQString& groupName ) const { - return configDialogSize( *KGlobal::config(), groupName ); + return configDialogSize( *TDEGlobal::config(), groupName ); } @@ -1764,7 +1764,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config, void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) { - saveDialogSize( *KGlobal::config(), groupName, global ); + saveDialogSize( *TDEGlobal::config(), groupName, global ); } diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index c47a6a2e9..893e049f7 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -831,7 +831,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * If no size is saved for one dimension of the screen, sizeHint() is returned. * * @param groupName Name of the group to read from. The old group - * of KGlobal::config is preserved. + * of TDEGlobal::config is preserved. */ TQSize configDialogSize( const TQString& groupName ) const; @@ -841,7 +841,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * * @param config The KConfig object to read from * @param groupName Name of the group to read from. The old group - * of KGlobal::config is preserved. + * of TDEGlobal::config is preserved. * @since 3.2 */ TQSize configDialogSize( KConfig& config, const TQString& groupName ) const; diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 95ceb33dd..192c24b05 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -1635,7 +1635,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) d->mainDockWidget=0; #ifndef NO_KDE2 - d->splitterOpaqueResize = KGlobalSettings::opaqueResize(); + d->splitterOpaqueResize = TDEGlobalSettings::opaqueResize(); #else d->splitterOpaqueResize = false; #endif @@ -2531,7 +2531,7 @@ void KDockManager::setReadDockConfigMode(int mode) void KDockManager::writeConfig( KConfig* c, TQString group ) { //debug("BEGIN Write Config"); - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); @@ -2672,7 +2672,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) #include <tqmessagebox.h> void KDockManager::readConfig( KConfig* c, TQString group ) { - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h index 4f54e5f13..8f5c288ec 100644 --- a/tdeui/kdockwidget.h +++ b/tdeui/kdockwidget.h @@ -1033,7 +1033,7 @@ public: KDockWidget* getDockWidgetFromName( const TQString& dockName ); /** - * Enables opaque resizing. Opaque resizing defaults to KGlobalSettings::opaqueResize(). + * Enables opaque resizing. Opaque resizing defaults to TDEGlobalSettings::opaqueResize(). * Call this method before you create any dock widgets! */ void setSplitterOpaqueResize(bool b=true); diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index f6d49a97e..f0cd5cae1 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -224,7 +224,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) void KDualColorButton::mouseMoveEvent(TQMouseEvent *ev) { if(!miniCtlFlag){ - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if(ev->x() >= mPos.x()+delay || ev->x() <= mPos.x()-delay || ev->y() >= mPos.y()+delay || ev->y() <= mPos.y()-delay) { KColorDrag *d = new KColorDrag( curColor == Foreground ? diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index b89a5b97a..3f116b903 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -254,8 +254,8 @@ public: */ ToolbarList findToolbars(TQDomNode n) { - static const TQString &tagToolbar = KGlobal::staticQString( "ToolBar" ); - static const TQString &attrNoEdit = KGlobal::staticQString( "noEdit" ); + static const TQString &tagToolbar = TDEGlobal::staticQString( "ToolBar" ); + static const TQString &attrNoEdit = TDEGlobal::staticQString( "noEdit" ); ToolbarList list; for( ; !n.isNull(); n = n.nextSibling() ) @@ -278,9 +278,9 @@ public: */ TQString toolbarName( const XmlData& xmlData, const TQDomElement& it ) const { - static const TQString &tagText = KGlobal::staticQString( "text" ); - static const TQString &tagText2 = KGlobal::staticQString( "Text" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagText = TDEGlobal::staticQString( "text" ); + static const TQString &tagText2 = TDEGlobal::staticQString( "Text" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString name; TQCString txt( it.namedItem( tagText ).toElement().text().utf8() ); @@ -306,7 +306,7 @@ public: */ TQDomElement findElementForToolbarItem( const ToolbarItem* item ) const { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling()) { TQDomElement elem = n.toElement(); @@ -466,7 +466,7 @@ void KEditToolbar::slotDefault() if (TQDir::isRelativePath(file)) { - const TDEInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); + const TDEInstance *instance = client->instance() ? client->instance() : TDEGlobal::instance(); file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); } else @@ -488,7 +488,7 @@ void KEditToolbar::slotDefault() int slash = d->m_file.findRev('/')+1; if (slash) d->m_file = d->m_file.mid(slash); - TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); + TQString xml_file = locateLocal("data", TQString::fromLatin1( TDEGlobal::instance()->instanceName() + '/' ) + d->m_file); if ( TQFile::exists( xml_file ) ) if ( !TQFile::remove( xml_file ) ) @@ -903,7 +903,7 @@ void KEditToolbarWidget::setupLayout() void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); // just in case, we clear our combo m_toolbarCombo->clear(); @@ -942,11 +942,11 @@ void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) void KEditToolbarWidget::loadActionList(TQDomElement& elem) { - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &tagMerge = KGlobal::staticQString( "Merge" ); - static const TQString &tagActionList= KGlobal::staticQString( "ActionList" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); + static const TQString &tagActionList= TDEGlobal::staticQString( "ActionList" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); int sep_num = 0; TQString sep_name("separator_%1"); @@ -966,7 +966,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) TQMap<TQString, bool> active_list; // see if our current action is in this toolbar - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQDomNode n = elem.lastChild(); for( ; !n.isNull(); n = n.previousSibling() ) { @@ -1108,7 +1108,7 @@ void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item) ToolbarItem* toolitem = static_cast<ToolbarItem *>(item); m_removeAction->setEnabled( item ); - static const TQString &tagAction = KGlobal::staticQString( "Action" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); d->m_changeIcon->setEnabled( item && d->m_hasKDialog && toolitem->internalTag() == tagAction ); @@ -1191,11 +1191,11 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before, if (!item) return; - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" ); - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); TQDomElement new_item; // let's handle the separator specially @@ -1238,7 +1238,7 @@ void KEditToolbarWidget::removeActive(ToolbarItem *item) if (!item) return; - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); // we're modified, so let this change emit enableOk(true); @@ -1306,7 +1306,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before ) d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (ToolbarItem*)before )); // and set this container as a noMerge - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); d->m_currentToolbarElem.setAttribute( attrNoMerge, "1"); // update the local doc @@ -1330,7 +1330,7 @@ void KEditToolbarWidget::slotDownButton() void KEditToolbarWidget::updateLocal(TQDomElement& elem) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); XmlDataList::Iterator xit = d->m_xmlFiles.begin(); for ( ; xit != d->m_xmlFiles.end(); ++xit) @@ -1389,7 +1389,7 @@ void KEditToolbarWidget::slotChangeIcon() (*d->m_kdialogProcess) << "--geticon"; (*d->m_kdialogProcess) << "Toolbar"; (*d->m_kdialogProcess) << "Actions"; - if ( !d->m_kdialogProcess->start( KProcess::NotifyOnExit ) ) { + if ( !d->m_kdialogProcess->start( TDEProcess::NotifyOnExit ) ) { kdError(240) << "Can't run " << kdialogExe << endl; delete d->m_kdialogProcess; d->m_kdialogProcess = 0; @@ -1399,11 +1399,11 @@ void KEditToolbarWidget::slotChangeIcon() m_activeList->setEnabled( false ); // don't change the current item m_toolbarCombo->setEnabled( false ); // don't change the current toolbar - connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( KProcess* ) ), - this, TQT_SLOT( slotProcessExited( KProcess* ) ) ); + connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), + this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); } -void KEditToolbarWidget::slotProcessExited( KProcess* ) +void KEditToolbarWidget::slotProcessExited( TDEProcess* ) { m_activeList->setEnabled( true ); m_toolbarCombo->setEnabled( true ); diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index 60a15d5de..cc1a0069a 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -23,7 +23,7 @@ #include <kxmlguiclient.h> #include <kdialogbase.h> -class KProcess; +class TDEProcess; class KActionCollection; class TQComboBox; class TQToolButton; @@ -66,7 +66,7 @@ namespace * \code * void MyClass::slotConfigureToolbars() * { - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(actionCollection()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -76,7 +76,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * createGUI(); - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -91,7 +91,7 @@ namespace * An example would be: * * \code - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(factory()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -100,7 +100,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * // Do NOT call createGUI()! - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -406,7 +406,7 @@ protected slots: void slotChangeIcon(); private slots: - void slotProcessExited( KProcess* ); + void slotProcessExited( TDEProcess* ); protected: // KDE4: make private void setupLayout(); diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp index 9ef3af912..54b2932aa 100644 --- a/tdeui/kfontcombo.cpp +++ b/tdeui/kfontcombo.cpp @@ -373,8 +373,8 @@ void KFontCombo::updateFonts() bool KFontCombo::displayFonts() { - KConfigGroupSaver saver(KGlobal::config(), "KDE"); - return KGlobal::config()->readBoolEntry("DisplayFontItems", true); + KConfigGroupSaver saver(TDEGlobal::config(), "KDE"); + return TDEGlobal::config()->readBoolEntry("DisplayFontItems", true); } void KFontCombo::virtual_hook( int id, void* data ) diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp index eb5b262f8..23d514092 100644 --- a/tdeui/kfontdialog.cpp +++ b/tdeui/kfontdialog.cpp @@ -290,7 +290,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, row ++; sampleEdit = new TQLineEdit( page, "sampleEdit"); - TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); + TQFont tmpFont( TDEGlobalSettings::generalFont().family(), 64, TQFont::Black ); sampleEdit->setFont(tmpFont); //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); @@ -325,12 +325,12 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, vbox->addWidget( xlfdEdit ); // lets initialize the display if possible - setFont( KGlobalSettings::generalFont(), usingFixed ); + setFont( TDEGlobalSettings::generalFont(), usingFixed ); // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h index 189dc1292..e7d53568a 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, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; TQIconSet iconSet() const { return iconSet( KIcon::Small ); } #else - TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; #endif TQString iconName() const; diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index 670439444..0faa137e4 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu() // I use hardcoded menu id's here. Reason is to stay backward // compatible. // - const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : TDEGlobal::instance()->aboutData(); TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); mMenu = new KPopupMenu(); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 0392f7d50..430a23fa0 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -125,7 +125,7 @@ void KIconView::slotSettingsChanged(int category) { if ( category != TDEApplication::SETTINGS_MOUSE ) return; - m_bUseSingle = KGlobalSettings::singleClick(); + m_bUseSingle = TDEGlobalSettings::singleClick(); //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, @@ -150,8 +150,8 @@ void KIconView::slotSettingsChanged(int category) // const TQPoint & ) ) ); } - m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); - m_autoSelectDelay = m_bUseSingle ? KGlobalSettings::autoSelectDelay() : -1; + m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); + m_autoSelectDelay = m_bUseSingle ? TDEGlobalSettings::autoSelectDelay() : -1; if( !m_bUseSingle || !m_bChangeCursorOverItem ) viewport()->unsetCursor(); @@ -467,7 +467,7 @@ KIconViewItem::~KIconViewItem() void KIconViewItem::calcRect( const TQString& text_ ) { - bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect(); + bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); Q_ASSERT( iconView() ); if ( !iconView() ) @@ -704,7 +704,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) { - bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect(); + bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); int textX; if (drawRoundedRect == true) textX = textRect( false ).x() + 4; diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 4c291eda4..6cf02e75e 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -703,7 +703,7 @@ void KJanusWidget::slotFontChanged() { if( mTitleLabel ) { - mTitleLabel->setFont( KGlobalSettings::generalFont() ); + mTitleLabel->setFont( TDEGlobalSettings::generalFont() ); TQFont titleFont( mTitleLabel->font() ); titleFont.setBold( true ); mTitleLabel->setFont( titleFont ); diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 6d197d813..d9ae693f3 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -171,7 +171,7 @@ KKeyChooser::KKeyChooser( KAccel* pAccel, TQWidget* parent, bool bAllowLetterSho insert( pAccel ); } -KKeyChooser::KKeyChooser( KGlobalAccel* pAccel, TQWidget* parent ) +KKeyChooser::KKeyChooser( TDEGlobalAccel* pAccel, TQWidget* parent ) : TQWidget( parent ) { initGUI( ApplicationGlobal, false ); @@ -201,7 +201,7 @@ KKeyChooser::KKeyChooser( KAccel* actions, TQWidget* parent, insert( actions ); } -KKeyChooser::KKeyChooser( KGlobalAccel* actions, TQWidget* parent, +KKeyChooser::KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent, bool bCheckAgainstStdKeys, bool bAllowLetterShortcuts, bool /*bAllowWinKey*/ ) @@ -256,7 +256,7 @@ bool KKeyChooser::insert( KAccel* pAccel ) return insert( pList ); } -bool KKeyChooser::insert( KGlobalAccel* pAccel ) +bool KKeyChooser::insert( TDEGlobalAccel* pAccel ) { KShortcutList* pList = new KAccelShortcutList( pAccel ); d->rgpListsAllocated.append( pList ); @@ -296,7 +296,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) m_type = type; d->bAllowLetterShortcuts = bAllowLetterShortcuts; - d->bPreferFourModifierKeys = KGlobalAccel::useFourModifierKeys(); + d->bPreferFourModifierKeys = TDEGlobalAccel::useFourModifierKeys(); // // TOP LAYOUT MANAGER @@ -587,7 +587,7 @@ void KKeyChooser::readGlobalKeys() void KKeyChooser::readGlobalKeys( TQMap< TQString, KShortcut >& map ) { - TQMap<TQString, TQString> mapEntry = KGlobal::config()->entryMap( "Global Shortcuts" ); + TQMap<TQString, TQString> mapEntry = TDEGlobal::config()->entryMap( "Global Shortcuts" ); TQMap<TQString, TQString>::Iterator it( mapEntry.begin() ); for( uint i = 0; it != mapEntry.end(); ++it, i++ ) map[it.key()] = KShortcut(*it); @@ -679,7 +679,7 @@ void KKeyChooser::syncToConfig( const TQString& sConfigGroup, KConfigBase* pConf { kdDebug(125) << "KKeyChooser::syncToConfig( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); KConfigGroupSaver cgs( pConfig, sConfigGroup ); TQListViewItemIterator it( d->pList ); @@ -1094,7 +1094,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } @@ -1106,14 +1106,14 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } KKeyDialog::~KKeyDialog() { - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); group.writeEntry( "Dialog Size", size(), true, true ); } @@ -1154,7 +1154,7 @@ int KKeyDialog::configure( KAccel* keys, TQWidget* parent, bool bSaveSettings ) return configure( keys, true, parent, bSaveSettings); } -int KKeyDialog::configure( KGlobalAccel* keys, TQWidget* parent, bool bSaveSettings ) +int KKeyDialog::configure( TDEGlobalAccel* keys, TQWidget* parent, bool bSaveSettings ) { return configure( keys, true, parent, bSaveSettings); } @@ -1169,7 +1169,7 @@ int KKeyDialog::configure( KAccel* keys, bool bAllowLetterShortcuts, TQWidget *p return b; } -int KKeyDialog::configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings ) +int KKeyDialog::configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings ) { KKeyDialog dlg( KKeyChooser::ApplicationGlobal, bAllowLetterShortcuts, parent ); dlg.m_pKeyChooser->insert( keys ); diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h index d291a87d9..b457f133b 100644 --- a/tdeui/kkeydialog.h +++ b/tdeui/kkeydialog.h @@ -35,17 +35,17 @@ class KAccel; class KAccelActions; class KActionCollection; class KConfigBase; -class KGlobalAccel; +class TDEGlobalAccel; class KKeySequence; class KShortcut; class KShortcutList; class KKeyChooserItem; /** - * @short Widget for configuration of KAccel and KGlobalAccel. + * @short Widget for configuration of KAccel and TDEGlobalAccel. * * Configure dictionaries of key/action associations for KAccel and - * KGlobalAccel. + * TDEGlobalAccel. * * The class takes care of all aspects of configuration, including * handling key conflicts internally. Connect to the allDefault() @@ -80,7 +80,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget KKeyChooser( KActionCollection* coll, TQWidget* parent, bool bAllowLetterShortcuts = true ); KKeyChooser( KAccel* actions, TQWidget* parent, bool bAllowLetterShortcuts = true ); - KKeyChooser( KGlobalAccel* actions, TQWidget* parent ); + KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent ); KKeyChooser( KShortcutList*, TQWidget* parent, ActionType type = Application, bool bAllowLetterShortcuts = true ); virtual ~KKeyChooser(); @@ -169,7 +169,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget void initGUI( ActionType type, bool bAllowLetterShortcuts ); bool insert( KAccel* ); - bool insert( KGlobalAccel* ); + bool insert( TDEGlobalAccel* ); bool insert( KShortcutList* ); /// @since 3.1 void buildListView( uint iList, const TQString &title = TQString::null ); @@ -234,7 +234,7 @@ private slots: /** * @obsolete */ - KKeyChooser( KGlobalAccel* actions, TQWidget* parent, + KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent, bool bCheckAgainstStdKeys, bool bAllowLetterShortcuts, bool bAllowWinKey = false ); @@ -256,10 +256,10 @@ private slots: typedef KKeyChooser KKeyChooser; /** - * @short Dialog for configuration of KActionCollection, KAccel, and KGlobalAccel. + * @short Dialog for configuration of KActionCollection, KAccel, and TDEGlobalAccel. * * The KKeyDialog class is used for configuring dictionaries of key/action - * associations for KActionCollection, KAccel, and KGlobalAccel. It uses the KKeyChooser widget + * associations for KActionCollection, KAccel, and TDEGlobalAccel. It uses the KKeyChooser widget * and offers buttons to set all keys to defaults and invoke on-line help. * * Several static methods are supplied which provide the most convenient interface @@ -345,7 +345,7 @@ public: * This is an overloaded member function, provided for convenience. * It behaves essentially like the above function. */ - static int configure( KGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true ); + static int configure( TDEGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true ); /** @@ -371,7 +371,7 @@ public: * This is an overloaded member function, provided for convenience. * It behaves essentially like the above function. **/ - static int configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true + static int configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true /** * @deprecated Obsolete. @@ -383,7 +383,7 @@ public: * @deprecated Obsolete. * Please use KKeyDialog::configure instead */ - static KDE_DEPRECATED int configureKeys( KGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) + static KDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) { return configure( keys, parent, save_settings ); } /** * @deprecated Obsolete. diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index bc667aaf0..ece9a3ffe 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -62,7 +62,7 @@ public: if ( !initialized ) { - KConfigGroup config( KGlobal::config(), "General" ); + KConfigGroup config( TDEGlobal::config(), "General" ); backspacePerformsCompletion = config.readBoolEntry( "Backspace performs completion", false ); initialized = true; @@ -132,10 +132,10 @@ void KLineEdit::init() KCursor::setAutoHideCursor( this, true, true ); installEventFilter( this ); - KGlobalSettings::Completion mode = completionMode(); - d->autoSuggest = (mode == KGlobalSettings::CompletionMan || - mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionAuto); + TDEGlobalSettings::Completion mode = completionMode(); + d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan || + mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionAuto); connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors())); TQPalette p = palette(); @@ -147,26 +147,26 @@ void KLineEdit::init() d->drawClickMsg = false; } -void KLineEdit::setCompletionMode( KGlobalSettings::Completion mode ) +void KLineEdit::setCompletionMode( TDEGlobalSettings::Completion mode ) { - KGlobalSettings::Completion oldMode = completionMode(); + TDEGlobalSettings::Completion oldMode = completionMode(); - if ( oldMode != mode && (oldMode == KGlobalSettings::CompletionPopup || - oldMode == KGlobalSettings::CompletionPopupAuto ) && + if ( oldMode != mode && (oldMode == TDEGlobalSettings::CompletionPopup || + oldMode == TDEGlobalSettings::CompletionPopupAuto ) && d->completionBox && d->completionBox->isVisible() ) d->completionBox->hide(); // If the widgets echo mode is not Normal, no completion // feature will be enabled even if one is requested. if ( echoMode() != TQLineEdit::Normal ) - mode = KGlobalSettings::CompletionNone; // Override the request. + mode = TDEGlobalSettings::CompletionNone; // Override the request. if ( kapp && !kapp->authorize("lineedit_text_completion") ) - mode = KGlobalSettings::CompletionNone; + mode = TDEGlobalSettings::CompletionNone; - if ( mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan ) + if ( mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan ) d->autoSuggest = true; else d->autoSuggest = false; @@ -194,11 +194,11 @@ void KLineEdit::setCompletedText( const TQString& t, bool marked ) void KLineEdit::setCompletedText( const TQString& text ) { - KGlobalSettings::Completion mode = completionMode(); - bool marked = ( mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan || - mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ); + TDEGlobalSettings::Completion mode = completionMode(); + bool marked = ( mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan || + mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ); setCompletedText( text, marked ); } @@ -226,15 +226,15 @@ void KLineEdit::rotateText( KCompletionBase::KeyBindingType type ) void KLineEdit::makeCompletion( const TQString& text ) { KCompletion *comp = compObj(); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); - if ( !comp || mode == KGlobalSettings::CompletionNone ) + if ( !comp || mode == TDEGlobalSettings::CompletionNone ) return; // No completion object... TQString match = comp->makeCompletion( text ); - if ( mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ) + if ( mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ) { if ( match.isNull() ) { @@ -254,7 +254,7 @@ void KLineEdit::makeCompletion( const TQString& text ) if ( match.isNull() || match == text ) return; - if ( mode != KGlobalSettings::CompletionShell ) + if ( mode != TDEGlobalSettings::CompletionShell ) setUserSelection(false); if ( d->autoSuggest ) @@ -522,17 +522,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) // Filter key-events if EchoMode is normal and // completion mode is not set to CompletionNone if ( echoMode() == TQLineEdit::Normal && - completionMode() != KGlobalSettings::CompletionNone ) + completionMode() != TDEGlobalSettings::CompletionNone ) { KeyBindingMap keys = getKeyBindings(); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); bool noModifier = (e->state() == Qt::NoButton || e->state() == TQt::ShiftButton || e->state() == TQt::Keypad); - if ( (mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionMan) && noModifier ) + if ( (mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionMan) && noModifier ) { if ( !d->userSelection && hasSelectedText() && ( e->key() == Key_Right || e->key() == Key_Left ) && @@ -571,8 +571,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } - if ( (mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan) && noModifier ) + if ( (mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan) && noModifier ) { TQString keycode = e->text(); if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() || @@ -639,8 +639,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } - else if (( mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ) && + else if (( mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ) && noModifier && !e->text().isEmpty() ) { TQString old_txt = text(); @@ -709,7 +709,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } if ( (e->key() == Key_Backspace || e->key() == Key_Delete ) && - mode == KGlobalSettings::CompletionPopupAuto ) + mode == TDEGlobalSettings::CompletionPopupAuto ) d->autoSuggest=true; e->accept(); @@ -720,7 +720,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) return; } - else if ( mode == KGlobalSettings::CompletionShell ) + else if ( mode == TDEGlobalSettings::CompletionShell ) { // Handles completion. KShortcut cut; @@ -749,7 +749,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } // handle rotation - if ( mode != KGlobalSettings::CompletionNone ) + if ( mode != TDEGlobalSettings::CompletionNone ) { // Handles previous match KShortcut cut; @@ -895,20 +895,20 @@ TQPopupMenu *KLineEdit::createPopupMenu() subMenu->setAccel( KStdAccel::completion(), ShellCompletion ); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); subMenu->setItemChecked( NoCompletion, - mode == KGlobalSettings::CompletionNone ); + mode == TDEGlobalSettings::CompletionNone ); subMenu->setItemChecked( ShellCompletion, - mode == KGlobalSettings::CompletionShell ); + mode == TDEGlobalSettings::CompletionShell ); subMenu->setItemChecked( PopupCompletion, - mode == KGlobalSettings::CompletionPopup ); + mode == TDEGlobalSettings::CompletionPopup ); subMenu->setItemChecked( AutoCompletion, - mode == KGlobalSettings::CompletionAuto ); + mode == TDEGlobalSettings::CompletionAuto ); subMenu->setItemChecked( ShortAutoCompletion, - mode == KGlobalSettings::CompletionMan ); + mode == TDEGlobalSettings::CompletionMan ); subMenu->setItemChecked( PopupAutoCompletion, - mode == KGlobalSettings::CompletionPopupAuto ); - if ( mode != KGlobalSettings::completionMode() ) + mode == TDEGlobalSettings::CompletionPopupAuto ); + if ( mode != TDEGlobalSettings::completionMode() ) { subMenu->insertSeparator(); subMenu->insertItem( i18n("Default"), Default ); @@ -925,30 +925,30 @@ TQPopupMenu *KLineEdit::createPopupMenu() void KLineEdit::completionMenuActivated( int id ) { - KGlobalSettings::Completion oldMode = completionMode(); + TDEGlobalSettings::Completion oldMode = completionMode(); switch ( id ) { case Default: - setCompletionMode( KGlobalSettings::completionMode() ); + setCompletionMode( TDEGlobalSettings::completionMode() ); break; case NoCompletion: - setCompletionMode( KGlobalSettings::CompletionNone ); + setCompletionMode( TDEGlobalSettings::CompletionNone ); break; case AutoCompletion: - setCompletionMode( KGlobalSettings::CompletionAuto ); + setCompletionMode( TDEGlobalSettings::CompletionAuto ); break; case ShortAutoCompletion: - setCompletionMode( KGlobalSettings::CompletionMan ); + setCompletionMode( TDEGlobalSettings::CompletionMan ); break; case ShellCompletion: - setCompletionMode( KGlobalSettings::CompletionShell ); + setCompletionMode( TDEGlobalSettings::CompletionShell ); break; case PopupCompletion: - setCompletionMode( KGlobalSettings::CompletionPopup ); + setCompletionMode( TDEGlobalSettings::CompletionPopup ); break; case PopupAutoCompletion: - setCompletionMode( KGlobalSettings::CompletionPopupAuto ); + setCompletionMode( TDEGlobalSettings::CompletionPopupAuto ); break; default: return; @@ -956,8 +956,8 @@ void KLineEdit::completionMenuActivated( int id ) if ( oldMode != completionMode() ) { - if ( (oldMode == KGlobalSettings::CompletionPopup || - oldMode == KGlobalSettings::CompletionPopupAuto ) && + if ( (oldMode == TDEGlobalSettings::CompletionPopup || + oldMode == TDEGlobalSettings::CompletionPopupAuto ) && d->completionBox && d->completionBox->isVisible() ) d->completionBox->hide(); emit completionModeChanged( completionMode() ); @@ -1101,7 +1101,7 @@ void KLineEdit::setCompletionBox( KCompletionBox *box ) void KLineEdit::userCancelled(const TQString & cancelText) { - if ( completionMode() != KGlobalSettings::CompletionPopupAuto ) + if ( completionMode() != TDEGlobalSettings::CompletionPopupAuto ) { // TODO: this sets modified==false. But maybe it was true before... setText(cancelText); diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h index fc1f4ba4a..84e554316 100644 --- a/tdeui/klineedit.h +++ b/tdeui/klineedit.h @@ -80,7 +80,7 @@ class KURL; * second argument. * * If @p EchoMode for this widget is set to something other than @p TQLineEdit::Normal, - * the completion mode will always be defaulted to KGlobalSettings::CompletionNone. + * the completion mode will always be defaulted to TDEGlobalSettings::CompletionNone. * This is done purposefully to guard against protected entries such as passwords being * cached in KCompletion's list. Hence, if the @p EchoMode is not TQLineEdit::Normal, the * completion mode is automatically disabled. @@ -204,7 +204,7 @@ public: * * See KCompletionBase::setCompletionMode */ - virtual void setCompletionMode( KGlobalSettings::Completion mode ); + virtual void setCompletionMode( TDEGlobalSettings::Completion mode ); /** * Enables/disables the popup (context) menu. @@ -269,7 +269,7 @@ public: /** * @returns the completion-box, that is used in completion mode - * KGlobalSettings::CompletionPopup. + * TDEGlobalSettings::CompletionPopup. * This method will create a completion-box if none is there, yet. * * @param create Set this to false if you don't want the box to be created @@ -320,7 +320,7 @@ public: /** * Set the completion-box to be used in completion mode - * KGlobalSettings::CompletionPopup. + * TDEGlobalSettings::CompletionPopup. * This will do nothing if a completion-box already exists. * * @param box The KCompletionBox to set @@ -382,7 +382,7 @@ signals: * @p setKeyBinding for details. * * Note that this signal is @em not emitted if the completion - * mode is set to @p KGlobalSettings::CompletionNone or + * mode is set to @p TDEGlobalSettings::CompletionNone or * @p echoMode() is @em not normal. */ void textRotation( KCompletionBase::KeyBindingType ); @@ -391,7 +391,7 @@ signals: * Emitted when the user changed the completion mode by using the * popupmenu. */ - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); /** * Emitted before the context menu is displayed. diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp index 04705ad36..d4fb92ef2 100644 --- a/tdeui/klistbox.cpp +++ b/tdeui/klistbox.cpp @@ -73,7 +73,7 @@ void KListBox::slotSettingsChanged(int category) { if (category != TDEApplication::SETTINGS_MOUSE) return; - m_bUseSingle = KGlobalSettings::singleClick(); + m_bUseSingle = TDEGlobalSettings::singleClick(); disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), @@ -99,8 +99,8 @@ void KListBox::slotSettingsChanged(int category) // const TQPoint & ) ) ); } - m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); - m_autoSelectDelay = KGlobalSettings::autoSelectDelay(); + m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); + m_autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); if( !m_bUseSingle || !m_bChangeCursorOverItem ) viewport()->unsetCursor(); diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp index 29f255c3a..8aff145b8 100644 --- a/tdeui/klistview.cpp +++ b/tdeui/klistview.cpp @@ -71,7 +71,7 @@ public: : pCurrentItem (0), autoSelectDelay(0), dragOverItem(0), - dragDelay (KGlobalSettings::dndEventDelay()), + dragDelay (TDEGlobalSettings::dndEventDelay()), editor (new KListViewLineEdit (listview)), cursorInExecuteArea(false), itemsMovable (true), @@ -94,14 +94,14 @@ public: selectionDirection(0), tooltipColumn (0), selectionMode (Single), - contextMenuKey (KGlobalSettings::contextMenuKey()), - showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()), + contextMenuKey (TDEGlobalSettings::contextMenuKey()), + showContextMenusOnPress (TDEGlobalSettings::showContextMenusOnPress()), mDropVisualizerWidth (4), paintAbove (0), paintCurrent (0), paintBelow (0), painting (false), - shadeSortColumn(KGlobalSettings::shadeSortColumn()) + shadeSortColumn(TDEGlobalSettings::shadeSortColumn()) { renameable.append(0); connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int))); @@ -464,7 +464,7 @@ KListView::KListView( TQWidget *parent, const char *name ) connect (this, TQT_SIGNAL (menuShortCutPressed (KListView*, TQListViewItem*)), this, TQT_SLOT (emitContextMenu (KListView*, TQListViewItem*))); - d->alternateBackground = KGlobalSettings::alternateBackgroundColor(); + d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor(); } KListView::~KListView() @@ -544,8 +544,8 @@ void KListView::slotSettingsChanged(int category) switch (category) { case TDEApplication::SETTINGS_MOUSE: - d->dragDelay = KGlobalSettings::dndEventDelay(); - d->bUseSingle = KGlobalSettings::singleClick(); + d->dragDelay = TDEGlobalSettings::dndEventDelay(); + d->bUseSingle = TDEGlobalSettings::singleClick(); disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); @@ -554,9 +554,9 @@ void KListView::slotSettingsChanged(int category) connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); - d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); + d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); if ( !d->disableAutoSelection ) - d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); + d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); if( !d->bUseSingle || !d->bChangeCursorOverItem ) viewport()->unsetCursor(); @@ -564,8 +564,8 @@ void KListView::slotSettingsChanged(int category) break; case TDEApplication::SETTINGS_POPUPMENU: - d->contextMenuKey = KGlobalSettings::contextMenuKey (); - d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress (); + d->contextMenuKey = TDEGlobalSettings::contextMenuKey (); + d->showContextMenusOnPress = TDEGlobalSettings::showContextMenusOnPress (); if (d->showContextMenusOnPress) { @@ -753,7 +753,7 @@ void KListView::leaveEvent( TQEvent *e ) bool KListView::event( TQEvent *e ) { if (e->type() == TQEvent::ApplicationPaletteChange) - d->alternateBackground=KGlobalSettings::alternateBackgroundColor(); + d->alternateBackground=TDEGlobalSettings::alternateBackgroundColor(); return TQListView::event(e); } @@ -2135,7 +2135,7 @@ void KListView::resetAutoSelection() return; d->disableAutoSelection = false; - d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); + d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); } void KListView::doubleClicked( TQListViewItem *item, const TQPoint &pos, int c ) diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index 5d2a1e705..487d4f197 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -430,7 +430,7 @@ KXMLGUIFactory *KMainWindow::guiFactory() int KMainWindow::configureToolbars() { - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); KEditToolbar dlg(actionCollection(), xmlFile(), true, this); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig())); return dlg.exec(); @@ -439,7 +439,7 @@ int KMainWindow::configureToolbars() void KMainWindow::saveNewToolbarConfig() { createGUI(xmlFile()); - applyMainWindowSettings( KGlobal::config() ); + applyMainWindowSettings( TDEGlobal::config() ); } void KMainWindow::setupGUI( int options, const TQString & xmlfile ) { @@ -1026,7 +1026,7 @@ void KMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWind this, TQT_SLOT( setSettingsDirty() ) ); // Now read the previously saved settings - applyMainWindowSettings( KGlobal::config(), groupName ); + applyMainWindowSettings( TDEGlobal::config(), groupName ); } void KMainWindow::resetAutoSaveSettings() @@ -1050,8 +1050,8 @@ void KMainWindow::saveAutoSaveSettings() { Q_ASSERT( d->autoSaveSettings ); //kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl; - saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup ); - KGlobal::config()->sync(); + saveMainWindowSettings( TDEGlobal::config(), d->autoSaveGroup ); + TDEGlobal::config()->sync(); d->settingsDirty = false; if ( d->settingsTimer ) d->settingsTimer->stop(); diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h index 56b5f2666..a90d3dc12 100644 --- a/tdeui/kmainwindow.h +++ b/tdeui/kmainwindow.h @@ -428,7 +428,7 @@ public: * Call this to enable "auto-save" of toolbar/menubar/statusbar settings * (and optionally window size). * If the *bars were moved around/shown/hidden when the window is closed, - * saveMainWindowSettings( KGlobal::config(), groupName ) will be called. + * saveMainWindowSettings( TDEGlobal::config(), groupName ) will be called. * * @param groupName a name that identifies this "type of window". * You can have several types of window in the same application. @@ -731,7 +731,7 @@ public slots: * Example (adding a help button to the first toolbar): * * \code - * KIconLoader &loader = *KGlobal::iconLoader(); + * KIconLoader &loader = *TDEGlobal::iconLoader(); * TQPixmap pixmap = loader.loadIcon( "help" ); * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()), * this, TQT_SLOT(appHelpActivated()), true, i18n("Help") ); diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index 7f6983275..7266d8d91 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -235,7 +235,7 @@ void KMenuBar::show() void KMenuBar::slotReadConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE" ); setTopLevelMenuInternal( config->readBoolEntry( "macStyle", false ) ); } @@ -329,7 +329,7 @@ void KMenuBar::selectionTimeout() if ( d->topLevel ) { d->fallback_mode = true; // KMenuBar is handling its position itself - KConfigGroup xineramaConfig(KGlobal::config(),"Xinerama"); + KConfigGroup xineramaConfig(TDEGlobal::config(),"Xinerama"); int screen = xineramaConfig.readNumEntry("MenubarScreen", TQApplication::desktop()->screenNumber(TQPoint(0,0)) ); TQRect area; diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index 2dd4c8ca5..4037ffdcc 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -82,7 +82,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon) break; } - TQPixmap ret = KGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQPixmap ret = TDEGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if (ret.isNull()) return TQMessageBox::standardIcon(icon); @@ -174,7 +174,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, dialog->font()); - TQRect d = KGlobalSettings::desktopGeometry(dialog); + TQRect d = TDEGlobalSettings::desktopGeometry(dialog); pref_width = d.width() / 3; rt.setWidth(pref_width); @@ -343,7 +343,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); TQString dontAsk = config->readEntry(dontShowAgainName).lower(); if (dontAsk == "yes") { @@ -362,7 +362,7 @@ KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); return config->readBoolEntry(dontShowAgainName, true); } @@ -373,7 +373,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':')); config->sync(); @@ -384,7 +384,7 @@ KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':')); config->sync(); @@ -935,7 +935,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri void KMessageBox::enableAllMessages() { - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; @@ -955,7 +955,7 @@ KMessageBox::enableAllMessages() void KMessageBox::enableMessage(const TQString &dontShowAgainName) { - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h index f9d76688c..574ae9ea8 100644 --- a/tdeui/kmessagebox.h +++ b/tdeui/kmessagebox.h @@ -1094,7 +1094,7 @@ public: /** * Use @p cfg for all settings related to the dontShowAgainName feature. - * If @p cfg is 0 (default) KGlobal::config() will be used. + * If @p cfg is 0 (default) TDEGlobal::config() will be used. * @since 3.2 */ static void setDontShowAskAgainConfig(KConfig* cfg); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 238eeee7a..f6c3d9dd7 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -1129,7 +1129,7 @@ void KDoubleSpinBox::setLineStep( double step ) { TQString KDoubleSpinBox::mapValueToText( int value ) { if ( acceptLocalizedNumbers() ) - return KGlobal::locale() + return TDEGlobal::locale() ->formatNumber( d->mapToDouble( value ), d->mPrecision ); else return TQString().setNum( d->mapToDouble( value ), 'f', d->mPrecision ); @@ -1138,7 +1138,7 @@ TQString KDoubleSpinBox::mapValueToText( int value ) { int KDoubleSpinBox::mapTextToValue( bool * ok ) { double value; if ( acceptLocalizedNumbers() ) - value = KGlobal::locale()->readNumber( cleanText(), ok ); + value = TDEGlobal::locale()->readNumber( cleanText(), ok ); else value = cleanText().toDouble( ok ); if ( !*ok ) return 0; diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp index fdc51022c..89f0ca88c 100644 --- a/tdeui/knumvalidator.cpp +++ b/tdeui/knumvalidator.cpp @@ -214,13 +214,13 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const ok = false; else return TQValidator::Acceptable; - else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case + else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==TDEGlobal::locale()->decimalSymbol())) // another special case return TQValidator::Acceptable; else if (newStr.length()) { val = newStr.toDouble(&ok); if(!ok && d->acceptLocalizedNumbers) - val= KGlobal::locale()->readNumber(newStr,&ok); + val= TDEGlobal::locale()->readNumber(newStr,&ok); } else { val = 0; @@ -326,7 +326,7 @@ void KDoubleValidator::setAcceptLocalizedNumbers( bool accept ) { TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const { TQString s = input; if ( acceptLocalizedNumbers() ) { - KLocale * l = KGlobal::locale(); + KLocale * l = TDEGlobal::locale(); // ok, we have to re-format the number to have: // 1. decimalSymbol == '.' // 2. negativeSign == '-' diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index 5209c515f..50a16fd27 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -80,7 +80,7 @@ class TQPopupMenu; * { * KPanelApplet* init(TQWidget *parent, const TQString& configFile) * { - * KGlobal::locale()->insertCatalogue("exampleapplet"); + * TDEGlobal::locale()->insertCatalogue("exampleapplet"); * return new ExampleApplet(configFile, KPanelApplet::Normal, * KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, * parent, "exampleapplet"); diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index e8d7e5a28..437f3795e 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -80,7 +80,7 @@ class KPanelExtensionPrivate; * { * KPanelExtension* init(TQWidget *parent, const TQString& configFile) * { - * KGlobal::locale()->insertCatalogue("exampleextension"); + * TDEGlobal::locale()->insertCatalogue("exampleextension"); * return new ExampleExtension(configFile, KPanelExtension::Normal, * KPanelExtension::About | KPanelExtension::Help | KPanelExtension::Preferences, * parent, "exampleextension"); diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp index ed13502a4..194801ff2 100644 --- a/tdeui/kpanelmenu.cpp +++ b/tdeui/kpanelmenu.cpp @@ -63,7 +63,7 @@ void KPanelMenu::init(const TQString& path) connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); // setup cache timer - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("menus"); d->clearDelay = config->readNumEntry("MenuCacheTime", 60000); // 1 minute diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 489e14d8f..3b3d74be2 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -110,7 +110,7 @@ KPasswordEdit::KPasswordEdit(TQWidget *parent, const char *name) { init(); - KConfig* const cfg = KGlobal::config(); + KConfig* const cfg = TDEGlobal::config(); KConfigGroupSaver saver(cfg, "Passwords"); const TQString val = cfg->readEntry("EchoMode", "OneStar"); @@ -338,7 +338,7 @@ void KPasswordDialog::init() { m_Row = 0; - KConfig* const cfg = KGlobal::config(); + KConfig* const cfg = TDEGlobal::config(); const KConfigGroupSaver saver(cfg, "Passwords"); bool def = ( qstrcmp( tqAppName(), "tdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) @@ -351,7 +351,7 @@ void KPasswordDialog::init() // Row 1: pixmap + prompt TQLabel *lbl; - const TQPixmap pix( KGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); + const TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); if (!pix.isNull()) { lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index 1e86bc57f..fe2414a67 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -300,7 +300,7 @@ void KPassivePopup::moveNear( TQRect target ) int w = width(); int h = height(); - TQRect r = KGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); + TQRect r = TDEGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); if( d->popupStyle == Balloon ) { @@ -359,7 +359,7 @@ void KPassivePopup::updateMask() { // get screen-geometry for screen our anchor is on // (geometry can differ from screen to screen! - TQRect deskRect = KGlobalSettings::desktopGeometry(d->anchor); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(d->anchor); int xh = 70, xl = 40; if( width() < 80 ) diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp index aafb7f3c2..4164e7db2 100644 --- a/tdeui/kpixmapio.cpp +++ b/tdeui/kpixmapio.cpp @@ -87,7 +87,7 @@ KPixmapIO::KPixmapIO() #ifdef HAVE_MITSHM setShmPolicy(ShmDontKeep); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (!config->readBoolEntry("UseMitShm", true)) return; diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 07127cdc8..c61d140dd 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -114,7 +114,7 @@ void KPushButton::init( const KGuiItem &item ) void KPushButton::readSettings() { - s_useIcons = KGlobalSettings::showIconsOnPushButtons(); + s_useIcons = TDEGlobalSettings::showIconsOnPushButtons(); } void KPushButton::setGuiItem( const KGuiItem& item ) @@ -195,7 +195,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) if ( (e->state() & Qt::LeftButton) && (e->pos() - startPos).manhattanLength() > - KGlobalSettings::dndEventDelay() ) + TDEGlobalSettings::dndEventDelay() ) { startDrag(); setDown( false ); diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h index 2beed9e52..ee7bb3b52 100644 --- a/tdeui/kpushbutton.h +++ b/tdeui/kpushbutton.h @@ -102,7 +102,7 @@ public: /** * Sets the Icon Set for this button. It also takes into account hte - * KGlobalSettings::showIconsOnPushButtons() setting. + * TDEGlobalSettings::showIconsOnPushButtons() setting. */ void setIconSet( const TQIconSet &iconSet ); diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 5ca0c2b85..824e92bfc 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -80,7 +80,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, , clientcombo(0) { d = new KSpellConfigPrivate; - kc = KGlobal::config(); + kc = TDEGlobal::config(); if( !_ksc ) { @@ -277,12 +277,12 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, // but since aspell 0.6 also 3-character ISO-codes can be used if ( (dname.length() == 2) || (dname.length() == 3) ) { lname = dname; - hname = KGlobal::locale()->twoAlphaToLanguageName( lname ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName( lname ); } else if ( (dname.length() == 5) && (dname[2] == '_') ) { lname = dname.left(2); - hname = KGlobal::locale()->twoAlphaToLanguageName(lname); - TQString country = KGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName(lname); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); if ( extension.isEmpty() ) extension = country; else @@ -363,9 +363,9 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, } //We have explicitly chosen English as the default here. - if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") && + if ( ( TDEGlobal::locale()->language() == TQString::fromLatin1("C") && lname==TQString::fromLatin1("en") ) || - KGlobal::locale()->language() == lname ) + TDEGlobal::locale()->language() == lname ) return true; return false; diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index 1d37d03d3..5750c8832 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -54,7 +54,7 @@ KScrollView::~KScrollView() void KScrollView::scrollBy(int dx, int dy) { - KConfigGroup cfg( KGlobal::config(), "KDE" ); + KConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", true )) { TQScrollView::scrollBy( dx, dy ); return; diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp index 27d721626..1ed3b7df7 100644 --- a/tdeui/kshortcutdialog.cpp +++ b/tdeui/kshortcutdialog.cpp @@ -119,7 +119,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T setShortcut( shortcut ); resize( 0, 0 ); - s_showMore = KConfigGroup(KGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); + s_showMore = KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); updateDetails(); #ifdef Q_WS_X11 @@ -129,7 +129,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T KShortcutDialog::~KShortcutDialog() { - KConfigGroup group(KGlobal::config(), "General"); + KConfigGroup group(TDEGlobal::config(), "General"); group.writeEntry("ShowAlternativeShortcutConfig", s_showMore); } diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp index 7a17ad607..b91c74a4d 100644 --- a/tdeui/kspell.cpp +++ b/tdeui/kspell.cpp @@ -296,11 +296,11 @@ KSpell::startIspell() if (trystart == 0) //don't connect these multiple times { - connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(ispellErrors(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(ispellExit (KProcess *)) ); + connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(ispellExit (TDEProcess *)) ); OUTPUT(KSpell2); } @@ -313,7 +313,7 @@ KSpell::startIspell() } void -KSpell::ispellErrors( KProcess *, char *buffer, int buflen ) +KSpell::ispellErrors( TDEProcess *, char *buffer, int buflen ) { buffer[buflen-1] = '\0'; // kdDebug(750) << "ispellErrors [" << buffer << "]\n" << endl; @@ -1313,7 +1313,7 @@ void KSpell::cleanUp() proc->closeStdin(); } -void KSpell::ispellExit( KProcess* ) +void KSpell::ispellExit( TDEProcess* ) { kdDebug() << "KSpell::ispellExit() " << m_status << endl; diff --git a/tdeui/kspell.h b/tdeui/kspell.h index e96b61a2e..fef733507 100644 --- a/tdeui/kspell.h +++ b/tdeui/kspell.h @@ -28,7 +28,7 @@ class TQTextCodec; class KProcIO; -class KProcess; +class TDEProcess; class KSpellDlg; /** @@ -461,9 +461,9 @@ protected slots: void suggestWord( KProcIO * ); void slotStopCancel (int); - void ispellExit (KProcess *); + void ispellExit (TDEProcess *); void emitDeath(); - void ispellErrors (KProcess *, char *, int); + void ispellErrors (TDEProcess *, char *, int); void checkNext(); private slots: diff --git a/tdeui/ksplashscreen.cpp b/tdeui/ksplashscreen.cpp index 6d605dcd7..b88be8e06 100644 --- a/tdeui/ksplashscreen.cpp +++ b/tdeui/ksplashscreen.cpp @@ -27,7 +27,7 @@ KSplashScreen::KSplashScreen(const TQPixmap &pixmap, WFlags f): TQSplashScreen(pixmap, f) { - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); resize(pixmap.width(), pixmap.height()); setGeometry( ( desk.width() / 2 ) - ( width() / 2 ) + desk.left(), ( desk.height() / 2 ) - ( height() / 2 ) + desk.top(), diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp index b70c8ae9c..444f34c6b 100644 --- a/tdeui/kstatusbar.cpp +++ b/tdeui/kstatusbar.cpp @@ -63,7 +63,7 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name ) { // make the size grip stuff configurable // ...but off by default (sven) - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString group(config->group()); config->setGroup(TQString::fromLatin1("StatusBar style")); bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false); diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp index befd93fc1..2f33e4843 100644 --- a/tdeui/kstdaction.cpp +++ b/tdeui/kstdaction.cpp @@ -64,13 +64,13 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch case Preferences: case HelpContents: { - const TDEAboutData *aboutData = KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData(); /* TODO KDE4 const TDEAboutData *aboutData; if ( parent ) aboutData = parent->instance()->aboutData(); else - aboutData = KGlobal::instance()->aboutData(); + aboutData = TDEGlobal::instance()->aboutData(); */ TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(tqApp->name()); sLabel = i18n(pInfo->psLabel).arg(appName); diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index fa43dcaf2..5ce1bc074 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -114,7 +114,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( if (defaultLanguages.count() == 0) { - d->addLanguageButton(KGlobal::locale()->defaultLanguage(), true); + d->addLanguageButton(TDEGlobal::locale()->defaultLanguage(), true); } TQHBoxLayout *addButtonHorizontalLayout = new TQHBoxLayout(); @@ -185,7 +185,7 @@ void KSwitchLanguageDialog::languageOnButtonChanged(const TQString & languageCod { //update all buttons which have matching id //might update buttons which were not changed, but well... - languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode)); + languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode)); } } } @@ -207,7 +207,7 @@ void KSwitchLanguageDialog::slotOk() first = false; } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (d->applicationLanguageList().join(":") != languageString) { @@ -241,7 +241,7 @@ KSwitchLanguageDialogPrivate::KSwitchLanguageDialogPrivate( void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *button) { - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQStringList allLanguages = locale->allLanguagesTwoAlpha(); for ( TQStringList::ConstIterator it = allLanguages.begin(); it != allLanguages.end(); ++it ) { @@ -258,7 +258,7 @@ void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *but TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQStringList languagesList; if (config->hasGroup("Locale")) @@ -272,7 +272,7 @@ TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList() } if (languagesList.empty()) { - languagesList = KGlobal::locale()->languageList(); + languagesList = TDEGlobal::locale()->languageList(); } return languagesList; } @@ -283,7 +283,7 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo KLanguageButton *languageButton = new KLanguageButton(page); - languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode)); + languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode)); fillApplicationLanguages(languageButton); diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index e118fcd74..66b43e26f 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -290,7 +290,7 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, d->checksDone = 0; d->completeRehighlightRequired = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "KSpell" ); d->disablePercentage = config->readNumEntry( "KSpell_AsYouTypeDisablePercentage", 42 ); d->disablePercentage = QMIN( d->disablePercentage, 101 ); @@ -335,7 +335,7 @@ KDictSpellingHighlighter::~KDictSpellingHighlighter() void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) { kdDebug(0) << "KDictSpellingHighlighter::slotSpellReady( " << spell << " )" << endl; - KConfigGroup cg( KGlobal::config(),"KSpell" ); + KConfigGroup cg( TDEGlobal::config(),"KSpell" ); if ( cg.readEntry("KSpell_DoSpellChecking") != "0" ) { if ( d->globalConfig ) { @@ -539,7 +539,7 @@ void KDictSpellingHighlighter::slotLocalSpellConfigChanged() TQString KDictSpellingHighlighter::spellKey() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "KSpell" ); config->reparseConfiguration(); TQString key; diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 668f070dd..e24fde38a 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -95,7 +95,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) { d->on_all_desktops = false; } - setCaption( KGlobal::instance()->aboutData()->programName()); + setCaption( TDEGlobal::instance()->aboutData()->programName()); setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h index a74dc9be6..151cf0166 100644 --- a/tdeui/ksystemtray.h +++ b/tdeui/ksystemtray.h @@ -117,7 +117,7 @@ public: * * @since 3.2 */ - static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=KGlobal::instance() ); + static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=TDEGlobal::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, TDEInstance *instance=KGlobal::instance() ); + static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=TDEGlobal::instance() ); signals: /** diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index a2d20a505..35242da4c 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -123,7 +123,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mDragSwitchTab = 0; } - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -136,7 +136,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } else if ( e->state() == Qt::MidButton ) { if (mReorderStartTab==-1) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index a87a677d6..1be5985ad 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -42,9 +42,9 @@ public: KTabWidgetPrivate() { m_automaticResizeTabs = false; - KConfigGroupSaver groupsaver(KGlobal::config(), "General"); - m_maxLength = KGlobal::config()->readNumEntry("MaximumTabLength", 30); - m_minLength = KGlobal::config()->readNumEntry("MinimumTabLength", 3); + KConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); + m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30); + m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3); m_CurrentMaxLength = m_minLength; } }; diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index 6b3685a81..15f14d711 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -112,7 +112,7 @@ void KTextBrowser::viewportMouseMoveEvent( TQMouseEvent* e) void KTextBrowser::contentsWheelEvent( TQWheelEvent *e ) { - if ( KGlobalSettings::wheelMouseZooms() ) + if ( TDEGlobalSettings::wheelMouseZooms() ) TQTextBrowser::contentsWheelEvent( e ); else // thanks, we don't want to zoom, so skip QTextEdit's impl. TQScrollView::contentsWheelEvent( e ); diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index bc077ddb2..5b1795321 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -252,7 +252,7 @@ TQPopupMenu *KTextEdit::createPopupMenu() void KTextEdit::contentsWheelEvent( TQWheelEvent *e ) { - if ( KGlobalSettings::wheelMouseZooms() ) + if ( TDEGlobalSettings::wheelMouseZooms() ) TQTextEdit::contentsWheelEvent( e ); else // thanks, we don't want to zoom, so skip QTextEdit's impl. TQScrollView::contentsWheelEvent( e ); diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h index 8e42e3a6a..3400e256b 100644 --- a/tdeui/ktimezonewidget.h +++ b/tdeui/ktimezonewidget.h @@ -98,7 +98,7 @@ public: * transformed via an i18n lookup, so the caller should previously have * set the timezone catalogue: * \code - * KGlobal::locale()->insertCatalogue("timezones"); + * TDEGlobal::locale()->insertCatalogue("timezones"); * \endcode * * @return formatted timezone name. diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 3be1d57e6..b9e3bc594 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile) { TQString tipFile = _tipFile; if (tipFile.isEmpty()) - tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; + tipFile = TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips"; loadTips(tipFile); @@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles ) { if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) ) { - addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); + addTips(TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips"); } else { @@ -180,7 +180,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQImage img; int h,s,v; - mBlendedColor = KGlobalSettings::activeTitleColor(); + mBlendedColor = TDEGlobalSettings::activeTitleColor(); mBlendedColor.hsv(&h,&s,&v); mBlendedColor.setHsv(h, int(s*(71/76.0)), int(v*(67/93.0))); @@ -194,11 +194,11 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel)); } - mBaseColor = KGlobalSettings::alternateBackgroundColor(); + mBaseColor = TDEGlobalSettings::alternateBackgroundColor(); mBaseColor.hsv(&h,&s,&v); mBaseColor.setHsv(h, int(s*(10/6.0)), int(v*(93/99.0))); - mTextColor = KGlobalSettings::textColor(); + mTextColor = TDEGlobalSettings::textColor(); mDatabase = db; @@ -206,8 +206,8 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) setCaption(i18n("Tip of the Day")); #ifdef Q_WS_X11 KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *vbox = new TQVBoxLayout(this, marginHint(), spacingHint()); @@ -222,7 +222,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQLabel *titlePane = new TQLabel(this); titlePane->setBackgroundPixmap(locate("data", "tdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); - titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); + titlePane->setFont(TQFont(TDEGlobalSettings::generalFont().family(), 20, TQFont::Bold)); titlePane->setAlignment(TQLabel::AlignCenter); pl->addWidget(titlePane, 100); } @@ -244,7 +244,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) mTipText->setWrapPolicy( TQTextEdit::AtWordOrDocumentBoundary ); mTipText->mimeSourceFactory()->addFilePath( - KGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); + TDEGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); mTipText->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain); mTipText->setHScrollBarMode(TQScrollView::AlwaysOff); mTipText->setLinkUnderline(false); @@ -258,7 +258,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) pal.setColor( TQPalette::Inactive, TQColorGroup::Link, mBlendedColor ); mTipText->setPalette(pal); - TQStringList icons = KGlobal::dirs()->resourceDirs("icon"); + TQStringList icons = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::Iterator it; for (it = icons.begin(); it != icons.end(); ++it) mTipText->mimeSourceFactory()->addFilePath(*it); @@ -273,7 +273,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) resize(550, 230); TQSize sh = size(); - TQRect rect = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect rect = TDEGlobalSettings::splashScreenDesktopGeometry(); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); @@ -374,7 +374,7 @@ static TQString fixTip(TQString tip) if (iconRegExp.search(tip)>-1) { TQString iconName = iconRegExp.cap(1); if (!iconName.isEmpty()) - if (KGlobal::dirs()->findResource("icon", iconName).isEmpty()) + if (TDEGlobal::dirs()->findResource("icon", iconName).isEmpty()) tip.replace("crystalsvg","hicolor"); } diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index 0fd9e5ada..b6c67568d 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -913,9 +913,9 @@ int KToolBar::iconSize() const int KToolBar::iconSizeDefault() const { if (!::qstrcmp(name(), "mainToolBar")) - return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + return TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); - return KGlobal::iconLoader()->currentSize(KIcon::Toolbar); + return TDEGlobal::iconLoader()->currentSize(KIcon::Toolbar); } void KToolBar::setEnableContextMenu(bool enable ) @@ -1020,7 +1020,7 @@ void KToolBar::saveState() } // if that didn't work, we save to the config file - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); saveSettings(config, TQString::null); config->sync(); } @@ -1469,13 +1469,13 @@ void KToolBar::slotReadConfig() // Read appearance settings (hmm, we used to do both here, // but a well behaved application will call applyMainWindowSettings // anyway, right ?) - applyAppearanceSettings(KGlobal::config(), TQString::null ); + applyAppearanceSettings(TDEGlobal::config(), TQString::null ); } void KToolBar::slotAppearanceChanged() { // Read appearance settings from global file. - applyAppearanceSettings(KGlobal::config(), TQString::null, true /* lose local settings */ ); + applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ ); // And remember to save the new look later KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); @@ -1487,24 +1487,24 @@ void KToolBar::slotAppearanceChanged() bool KToolBar::highlightSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); } //static bool KToolBar::transparentSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); } //static KToolBar::IconText KToolBar::iconTextSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + TQString icontext = TDEGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); if ( icontext == "IconTextRight" ) return IconTextRight; else if ( icontext == "IconTextBottom" ) @@ -1527,12 +1527,12 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG // This is the reason for the xmlgui tests below. bool xmlgui = d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty(); - KConfig *gconfig = KGlobal::config(); + KConfig *gconfig = TDEGlobal::config(); - static const TQString &attrIconText = KGlobal::staticQString("IconText"); - static const TQString &attrHighlight = KGlobal::staticQString("Highlighting"); - static const TQString &attrTrans = KGlobal::staticQString("TransparentMoving"); - static const TQString &attrIconSize = KGlobal::staticQString("IconSize"); + static const TQString &attrIconText = TDEGlobal::staticQString("IconText"); + static const TQString &attrHighlight = TDEGlobal::staticQString("Highlighting"); + static const TQString &attrTrans = TDEGlobal::staticQString("TransparentMoving"); + static const TQString &attrIconSize = TDEGlobal::staticQString("IconSize"); // we actually do this in two steps. // First, we read in the global styles [Toolbar style] (from the KControl module). @@ -1670,11 +1670,11 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool { KConfigGroupSaver cgs(config, configGroup); - static const TQString &attrPosition = KGlobal::staticQString("Position"); - static const TQString &attrIndex = KGlobal::staticQString("Index"); - static const TQString &attrOffset = KGlobal::staticQString("Offset"); - static const TQString &attrNewLine = KGlobal::staticQString("NewLine"); - static const TQString &attrHidden = KGlobal::staticQString("Hidden"); + static const TQString &attrPosition = TDEGlobal::staticQString("Position"); + static const TQString &attrIndex = TDEGlobal::staticQString("Index"); + static const TQString &attrOffset = TDEGlobal::staticQString("Offset"); + static const TQString &attrNewLine = TDEGlobal::staticQString("NewLine"); + static const TQString &attrHidden = TDEGlobal::staticQString("Hidden"); TQString position = config->readEntry(attrPosition, d->PositionDefault); int index = config->readNumEntry(attrIndex, -1); @@ -2062,7 +2062,7 @@ KPopupMenu *KToolBar::contextMenu() KPopupMenu *size = new KPopupMenu( context, "size" ); size->insertItem( i18n("Default"), CONTEXT_ICONSIZES ); // Query the current theme for available sizes - KIconTheme *theme = KGlobal::instance()->iconLoader()->theme(); + KIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme(); TQValueList<int> avSizes; if (theme) { diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index aa3717324..5fffdd592 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -207,7 +207,7 @@ public: */ int insertButton(const TQString& icon, int id, bool enabled = true, const TQString& text = TQString::null, int index=-1, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::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, TDEInstance *_instance = KGlobal::instance() ); + int index=-1, TDEInstance *_instance = TDEGlobal::instance() ); /** * Inserts a button (a KToolBarButton) with the specified diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index 66b9d6ee9..5a4240f04 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -69,7 +69,7 @@ public: m_iconSize = 0; m_parent = 0; - m_instance = KGlobal::instance(); + m_instance = TDEGlobal::instance(); } ~KToolBarButtonPrivate() { @@ -209,7 +209,7 @@ void KToolBarButton::modeChange() if (d->m_iconText != KToolBar::IconOnly) { // okay, we have to deal with fonts. let's get our information now - TQFont tmp_font = KGlobalSettings::toolBarFont(); + TQFont tmp_font = TDEGlobalSettings::toolBarFont(); // now parse out our font sizes from our chosen font TQFontMetrics fm(tmp_font); @@ -421,7 +421,7 @@ bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if ((mev->pos() - d->m_mousePressPos).manhattanLength() - > KGlobalSettings::dndEventDelay()) + > TDEGlobalSettings::dndEventDelay()) { openPopup(); return true; @@ -498,7 +498,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption()); int dx, dy; - TQFont tmp_font(KGlobalSettings::toolBarFont()); + TQFont tmp_font(TDEGlobalSettings::toolBarFont()); TQFontMetrics fm(tmp_font); TQRect textRect; int textFlags = 0; @@ -606,11 +606,11 @@ void KToolBarButton::drawButton( TQPainter *_painter ) // Draw the text at the position given by textRect, and using textFlags if (!textLabel().isNull() && !textRect.isNull()) { - _painter->setFont(KGlobalSettings::toolBarFont()); + _painter->setFont(TDEGlobalSettings::toolBarFont()); if (!isEnabled()) _painter->setPen(palette().disabled().dark()); else if(d->m_isRaised) - _painter->setPen(KGlobalSettings::toolBarHighlightColor()); + _painter->setPen(TDEGlobalSettings::toolBarHighlightColor()); else _painter->setPen( colorGroup().buttonText() ); _painter->drawText(textRect, textFlags, textLabel()); diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h index df26fea7c..126f8923a 100644 --- a/tdeui/ktoolbarbutton.h +++ b/tdeui/ktoolbarbutton.h @@ -61,7 +61,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 71f90abd9..0a95a2c70 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -36,7 +36,7 @@ class KURLLabel::Private public: Private (const TQString& url, KURLLabel* label) : URL (url), - LinkColor (KGlobalSettings::linkColor()), + LinkColor (TDEGlobalSettings::linkColor()), HighlightedLinkColor (Qt::red), Tip(url), Cursor (0L), @@ -358,7 +358,7 @@ bool KURLLabel::event (TQEvent *e) p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); p.setColor(TQColorGroup::Foreground, palette().active().foreground()); setPalette(p); - d->LinkColor = KGlobalSettings::linkColor(); + d->LinkColor = TDEGlobalSettings::linkColor(); setLinkColor(d->LinkColor); return true; } diff --git a/tdeui/kwizard.cpp b/tdeui/kwizard.cpp index 21462faad..0e378dbf2 100644 --- a/tdeui/kwizard.cpp +++ b/tdeui/kwizard.cpp @@ -31,7 +31,7 @@ KWizard::KWizard( TQWidget *parent, const char *name, bool modal, WFlags f ) : TQWizard( parent, name, modal, f ) { - bool useIcons = KGlobalSettings::showIconsOnPushButtons(); + bool useIcons = TDEGlobalSettings::showIconsOnPushButtons(); if ( useIcons ) { diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index 43f716870..32083a2c3 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -176,7 +176,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ { TDEInstance *instance = d->m_instance; if ( !instance ) - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); pix = SmallIconSet( icon, 16, instance ); } @@ -351,7 +351,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo } else if ( element.tagName().lower() == d->tagTearOffHandle ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) && KGlobalSettings::insertTearOffHandle()) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) && TDEGlobalSettings::insertTearOffHandle()) return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index ); } else if ( element.tagName().lower() == d->tagMenuTitle ) @@ -373,7 +373,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo { TDEInstance *instance = d->m_instance; if ( !instance ) - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); pix = SmallIcon( icon, instance ); } diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index d8548cadb..da22e83fb 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -41,7 +41,7 @@ class KXMLGUIClientPrivate public: KXMLGUIClientPrivate() { - m_instance = KGlobal::instance(); + m_instance = TDEGlobal::instance(); m_parent = 0L; m_builder = 0L; m_actionCollection = 0; @@ -116,7 +116,7 @@ KActionCollection *KXMLGUIClient::actionCollection() const KAction *KXMLGUIClient::action( const TQDomElement &element ) const { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); return actionCollection()->action( element.attribute( attrName ).latin1() ); } @@ -250,17 +250,17 @@ void KXMLGUIClient::setDOMDocument( const TQDomDocument &document, bool merge ) bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, KActionCollection *actionCollection ) { - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagMerge = KGlobal::staticQString( "Merge" ); - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrAppend = KGlobal::staticQString( "append" ); - static const TQString &attrWeakSeparator = KGlobal::staticQString( "weakSeparator" ); - static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" ); - static const TQString &tagText = KGlobal::staticQString( "text" ); - static const TQString &attrAlreadyVisited = KGlobal::staticQString( "alreadyVisited" ); - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); - static const TQString &attrOne = KGlobal::staticQString( "1" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrAppend = TDEGlobal::staticQString( "append" ); + static const TQString &attrWeakSeparator = TDEGlobal::staticQString( "weakSeparator" ); + static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); + static const TQString &tagText = TDEGlobal::staticQString( "text" ); + static const TQString &attrAlreadyVisited = TDEGlobal::staticQString( "alreadyVisited" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); + static const TQString &attrOne = TDEGlobal::staticQString( "1" ); // there is a possibility that we don't want to merge in the // additive.. rather, we might want to *replace* the base with the @@ -501,9 +501,9 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, TQDomElement KXMLGUIClient::findMatchingElement( const TQDomElement &base, const TQDomElement &additive ) { - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQDomNode n = additive.firstChild(); while ( !n.isNull() ) diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index 3c3f24668..78b918862 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -51,9 +51,9 @@ class KXMLGUIFactoryPrivate : public BuildState public: KXMLGUIFactoryPrivate() { - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); - static const TQString &actionList = KGlobal::staticQString( "actionlist" ); - static const TQString &name = KGlobal::staticQString( "name" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); + static const TQString &actionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &name = TDEGlobal::staticQString( "name" ); m_rootNode = new ContainerNode( 0L, TQString::null, 0L ); m_defaultMergingName = defaultMergingName; @@ -103,7 +103,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInst TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance ) { - const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance(); TQString xml_file; if (!TQDir::isRelativePath(filename)) @@ -142,7 +142,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, const TQString& filename, const TDEInstance *_instance ) { - const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance(); TQString xml_file(filename); if (TQDir::isRelativePath(xml_file)) @@ -224,7 +224,7 @@ KXMLGUIFactory::~KXMLGUIFactory() void KXMLGUIFactory::addClient( KXMLGUIClient *client ) { kdDebug(1002) << "KXMLGUIFactory::addClient( " << client << " )" << endl; // ellis - static const TQString &actionPropElementName = KGlobal::staticQString( "ActionProperties" ); + static const TQString &actionPropElementName = TDEGlobal::staticQString( "ActionProperties" ); if ( client->factory() ) { if ( client->factory() == this ) @@ -497,7 +497,7 @@ void KXMLGUIFactory::unplugActionList( KXMLGUIClient *client, const TQString &na void KXMLGUIFactory::applyActionProperties( const TQDomElement &actionPropElement ) { - static const TQString &tagAction = KGlobal::staticQString( "action" ); + static const TQString &tagAction = TDEGlobal::staticQString( "action" ); for (TQDomNode n = actionPropElement.firstChild(); !n.isNull(); n = n.nextSibling() ) @@ -528,7 +528,7 @@ void KXMLGUIFactory::configureAction( KAction *action, const TQDomNamedNodeMap & void KXMLGUIFactory::configureAction( KAction *action, const TQDomAttr &attribute ) { - static const TQString &attrShortcut = KGlobal::staticQString( "shortcut" ); + static const TQString &attrShortcut = TDEGlobal::staticQString( "shortcut" ); TQString attrName = attribute.name(); // If the attribute is a deprecated "accel", change to "shortcut". @@ -588,8 +588,8 @@ TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) TQDomElement KXMLGUIFactory::findActionByName( TQDomElement& elem, const TQString& sName, bool create ) { - static const TQString& attrName = KGlobal::staticQString( "name" ); - static const TQString& tagAction = KGlobal::staticQString( "Action" ); + static const TQString& attrName = TDEGlobal::staticQString( "name" ); + static const TQString& tagAction = TDEGlobal::staticQString( "Action" ); for( TQDomNode it = elem.firstChild(); !it.isNull(); it = it.nextSibling() ) { TQDomElement e = it.toElement(); if( e.attribute( attrName ) == sName ) diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp index 26d120de7..522fb659d 100644 --- a/tdeui/kxmlguifactory_p.cpp +++ b/tdeui/kxmlguifactory_p.cpp @@ -220,7 +220,7 @@ void ContainerNode::plugActionList( BuildState &state ) void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -262,7 +262,7 @@ void ContainerNode::unplugActionList( BuildState &state ) void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -365,7 +365,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s TQDomElement ContainerNode::findElementForChild( const TQDomElement &baseElement, ContainerNode *childNode ) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); // ### slow for ( TQDomNode n = baseElement.firstChild(); !n.isNull(); @@ -412,7 +412,7 @@ void ContainerNode::unplugActions( BuildState &state ) void ContainerNode::unplugClient( ContainerClient *client ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); assert( builder ); @@ -497,7 +497,7 @@ int ContainerNode::calcMergingIndex( const TQString &mergingName, int BuildHelper::calcMergingIndex( const TQDomElement &element, MergingIndexList::Iterator &it, TQString &group ) { - static const TQString &attrGroup = KGlobal::staticQString( "group" ); + static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); bool haveGroup = false; group = element.attribute( attrGroup ); @@ -521,7 +521,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node ) : containerClient( 0 ), ignoreDefaultMergingIndex( false ), m_state( state ), parentNode( node ) { - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); // create a list of supported container and custom tags customTags = m_state.builderCustomTags; @@ -556,12 +556,12 @@ void BuildHelper::build( const TQDomElement &element ) void BuildHelper::processElement( const TQDomElement &e ) { // some often used QStrings - static const TQString &tagAction = KGlobal::staticQString( "action" ); - static const TQString &tagMerge = KGlobal::staticQString( "merge" ); - static const TQString &tagState = KGlobal::staticQString( "state" ); - static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticQString( "action" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "merge" ); + static const TQString &tagState = TDEGlobal::staticQString( "state" ); + static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString tag( e.tagName().lower() ); TQString currName( e.attribute( attrName ) ); @@ -670,10 +670,10 @@ void BuildHelper::processStateElement( const TQDomElement &element ) void BuildHelper::processMergeElement( const TQString &tag, const TQString &name, const TQDomElement &e ) { - static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); - static const TQString &attrGroup = KGlobal::staticQString( "group" ); + static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); + static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); TQString mergingName( name ); if ( mergingName.isEmpty() ) @@ -734,7 +734,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name void BuildHelper::processContainerElement( const TQDomElement &e, const TQString &tag, const TQString &name ) { - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); ContainerNode *containerNode = parentNode->findContainer( name, tag, &containerList, diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index b8b7d40f8..9e92fb47e 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -94,7 +94,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) connect( cbListView, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggleSingleColumn( bool ) ) ); - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); //Create IconView TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "KIconView", this); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index 234f62543..94314ffbc 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -52,7 +52,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); - m_ro->setCompletionMode( KGlobalSettings::CompletionAuto ); + m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto ); TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); @@ -142,7 +142,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) KCompletion * s_pCompletion = new KCompletion; s_pCompletion->setOrder( KCompletion::Weighted ); s_pCompletion->setItems( historyConfig.readListEntry( "ComboContents" ) ); - s_pCompletion->setCompletionMode( KGlobalSettings::completionMode() ); + s_pCompletion->setCompletionMode( TDEGlobalSettings::completionMode() ); m_konqc->setCompletionObject( s_pCompletion ); TQPixmap pix = SmallIcon("www"); diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp index 582ae19e9..9fc108e52 100644 --- a/tdeui/tests/klistviewtest.cpp +++ b/tdeui/tests/klistviewtest.cpp @@ -28,12 +28,12 @@ int main( int argc, char **argv ) new KListViewItem( view, "Item 1"); new KListViewItem( view, "Item 2", "Some more", "Hi Mom :)" ); - view->restoreLayout( KGlobal::config(), "ListView" ); + view->restoreLayout( TDEGlobal::config(), "ListView" ); new KListViewItem( view, "Item 3" ); dialog.exec(); - view->saveLayout( KGlobal::config(), "ListView" ); + view->saveLayout( TDEGlobal::config(), "ListView" ); return 0; } diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp index 5c1ffa757..617808f40 100644 --- a/tdeui/tests/ktoolbarlabelactiontest.cpp +++ b/tdeui/tests/ktoolbarlabelactiontest.cpp @@ -86,7 +86,7 @@ int main( int argc, char **argv ) { TDEApplication app( argc, argv, "ktoolbarlabelactiontest" ); - KGlobal::instance()->dirs()->addResourceDir("data", "."); + TDEGlobal::instance()->dirs()->addResourceDir("data", "."); MainWindow* mw = new MainWindow; app.setMainWidget(mw); diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index 9f764e774..4c9e83bc1 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -22,7 +22,7 @@ int main( int argc, char **argv ) // KXMLGUIClient looks in the "data" resource for the .rc files // Let's add $PWD (ideally $srcdir instead...) to it - KGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() ); + TDEGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() ); KMainWindow *mainwindow = new KMainWindow; -- cgit v1.2.3 From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson <kb9vqf@pearsoncomputing.net> Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- KDE2PORTING.html | 20 +- KDE3PORTING.html | 10 +- TODO | 12 +- arts/kde/kartsserver.cpp | 2 +- arts/kde/kioinputstream_impl.cpp | 42 +- arts/kde/kioinputstream_impl.h | 12 +- arts/kde/kplayobjectfactory.cc | 4 +- arts/knotify/knotify.cpp | 32 +- arts/knotify/knotify.h | 4 +- dcop/dcopidl/dcopidl_test.h | 4 +- dnssd/settings.kcfgc | 2 +- interfaces/kimproxy/library/kimproxy.cpp | 2 +- interfaces/kio/http.h | 2 +- .../kfileaudiopreview/kfileaudiopreview.cpp | 4 +- interfaces/ktexteditor/configinterface.h | 10 +- interfaces/ktexteditor/editorchooser.cpp | 14 +- interfaces/ktexteditor/editorchooser.h | 6 +- interfaces/ktexteditor/sessionconfiginterface.h | 6 +- kabc/addressbook.cpp | 4 +- kabc/addresseehelper.cpp | 2 +- kabc/addresslineedit.cpp | 8 +- kabc/addresslineedit.h | 6 +- kabc/field.h | 6 +- kabc/kab2kabc.cpp | 4 +- kabc/ldapclient.cpp | 22 +- kabc/ldapclient.h | 6 +- kabc/ldapconfigwidget.cpp | 16 +- kabc/ldapconfigwidget.h | 14 +- kabc/plugins/dir/resourcedir.cpp | 4 +- kabc/plugins/dir/resourcedir.h | 4 +- kabc/plugins/evolution/resourceevo.cpp | 4 +- kabc/plugins/evolution/resourceevo.h | 2 +- kabc/plugins/file/resourcefile.cpp | 4 +- kabc/plugins/file/resourcefile.h | 4 +- kabc/plugins/ldapkio/resourceldapkio.cpp | 244 +++++------ kabc/plugins/ldapkio/resourceldapkio.h | 26 +- kabc/plugins/ldapkio/resourceldapkioconfig.cpp | 2 +- kabc/plugins/net/resourcenet.cpp | 36 +- kabc/plugins/net/resourcenet.h | 10 +- kabc/plugins/sql/resourcesql.cpp | 2 +- kabc/plugins/sql/resourcesql.h | 2 +- kabc/plugins/sql/resourcesqlconfig.cpp | 4 +- kabc/plugins/sql/resourcesqlconfig.h | 4 +- kabc/resource.cpp | 4 +- kabc/resource.h | 4 +- kabc/scripts/field.src.cpp | 12 +- kabc/sound.h | 4 +- kabc/stdaddressbook.cpp | 4 +- kate/interfaces/view.h | 10 +- kate/part/kateconfig.cpp | 20 +- kate/part/kateconfig.h | 14 +- kate/part/katedialogs.cpp | 14 +- kate/part/katedialogs.h | 6 +- kate/part/katedocument.cpp | 36 +- kate/part/katedocument.h | 18 +- kate/part/katefiletype.cpp | 4 +- kate/part/katehighlight.cpp | 18 +- kate/part/katehighlight.h | 4 +- kate/part/katejscript.cpp | 8 +- kate/part/kateluaindentscript.cpp | 2 +- kate/part/kateschema.cpp | 10 +- kate/part/kateschema.h | 6 +- kate/part/katesyntaxdocument.cpp | 2 +- kate/part/kateview.cpp | 6 +- kate/part/kateview.h | 4 +- kate/part/kateviewhelpers.cpp | 2 +- kate/part/test_regression.cpp | 6 +- kate/part/test_regression.h | 12 +- kate/plugins/autobookmarker/autobookmarker.cpp | 4 +- kate/plugins/insertfile/insertfileplugin.cpp | 6 +- kate/plugins/insertfile/insertfileplugin.h | 6 +- kate/plugins/isearch/ISearchPlugin.cpp | 4 +- kate/plugins/wordcompletion/docwordcompletion.cpp | 4 +- kcert/kcertpart.cc | 2 +- kcmshell/main.cpp | 8 +- kconf_update/kconf_update.cpp | 28 +- kded/kded.cpp | 6 +- kdewidgets/kde.widgets | 2 +- kdewidgets/makekdewidgets.cpp | 18 +- kdewidgets/tests/test.widgets | 2 +- kdoctools/kio_help.cpp | 16 +- kdoctools/kio_help.h | 2 +- khtml/css/cssstyleselector.cpp | 4 +- khtml/ecma/kjs_debugwin.cpp | 4 +- khtml/ecma/kjs_navigator.cpp | 2 +- khtml/ecma/xmlhttprequest.cpp | 42 +- khtml/ecma/xmlhttprequest.h | 16 +- khtml/html/html_formimpl.cpp | 8 +- khtml/java/kjavaappletserver.cpp | 4 +- khtml/java/kjavaappletviewer.cpp | 8 +- khtml/java/kjavaappletviewer.h | 4 +- khtml/java/kjavadownloader.cpp | 54 +-- khtml/java/kjavadownloader.h | 16 +- khtml/khtml_ext.cpp | 14 +- khtml/khtml_ext.h | 4 +- khtml/khtml_factory.cpp | 2 +- khtml/khtml_iface.cc | 4 +- khtml/khtml_part.cpp | 120 +++--- khtml/khtml_part.h | 22 +- khtml/khtml_run.cpp | 2 +- khtml/khtml_run.h | 2 +- khtml/khtml_settings.cc | 14 +- khtml/khtml_settings.h | 10 +- khtml/khtmlimage.cpp | 4 +- khtml/khtmlimage.h | 2 +- khtml/khtmlpart_p.h | 8 +- khtml/khtmlview.cpp | 6 +- khtml/kmultipart/kmultipart.cpp | 14 +- khtml/kmultipart/kmultipart.h | 6 +- khtml/misc/knsplugininstaller.cpp | 32 +- khtml/misc/knsplugininstaller.h | 12 +- khtml/misc/loader.cpp | 42 +- khtml/misc/loader.h | 26 +- khtml/test_regression.cpp | 2 +- khtml/testkhtml.cpp | 2 +- khtml/xml/dom_docimpl.cpp | 4 +- kinit/autostart.cpp | 2 +- kinit/kdostartupconfig.cpp | 4 +- kinit/kinit.cpp | 4 +- kinit/kioslave.cpp | 2 +- kinit/klauncher.cpp | 12 +- kinit/klauncher.h | 8 +- kio/DESIGN | 2 +- kio/DESIGN.metadata | 4 +- kio/Mainpage.dox | 6 +- kio/bookmarks/kbookmarkimporter_kde1.cc | 6 +- kio/bookmarks/kbookmarkmanager.cc | 2 +- kio/bookmarks/kbookmarkmenu.cc | 6 +- kio/bookmarks/kbookmarkmenu.h | 2 +- kio/httpfilter/httpfilter.cc | 4 +- kio/kcmodule.desktop | 2 +- kio/kfile/kcombiview.cpp | 4 +- kio/kfile/kcombiview.h | 4 +- kio/kfile/kcustommenueditor.cpp | 4 +- kio/kfile/kcustommenueditor.h | 6 +- kio/kfile/kdiroperator.cpp | 40 +- kio/kfile/kdiroperator.h | 30 +- kio/kfile/kdirselectdialog.cpp | 18 +- kio/kfile/kdirselectdialog.h | 6 +- kio/kfile/kdirsize.cpp | 44 +- kio/kfile/kdirsize.h | 20 +- kio/kfile/kdiskfreesp.cpp | 2 +- kio/kfile/kfiledetailview.cpp | 8 +- kio/kfile/kfiledetailview.h | 4 +- kio/kfile/kfiledialog.cpp | 68 +-- kio/kfile/kfiledialog.h | 10 +- kio/kfile/kfileiconview.cpp | 24 +- kio/kfile/kfileiconview.h | 8 +- kio/kfile/kfilepreview.cpp | 4 +- kio/kfile/kfilepreview.h | 4 +- kio/kfile/kfilespeedbar.cpp | 8 +- kio/kfile/kfilespeedbar.h | 4 +- kio/kfile/kfileview.cpp | 16 +- kio/kfile/kfileview.h | 8 +- kio/kfile/kimagefilepreview.cpp | 20 +- kio/kfile/kimagefilepreview.h | 8 +- kio/kfile/knotifydialog.cpp | 8 +- kio/kfile/knotifydialog.h | 4 +- kio/kfile/kopenwith.cpp | 12 +- kio/kfile/kpropertiesdialog.cpp | 120 +++--- kio/kfile/kpropertiesdialog.h | 14 +- kio/kfile/krecentdirs.cpp | 8 +- kio/kfile/krecentdocument.cpp | 6 +- kio/kfile/kurlbar.cpp | 20 +- kio/kfile/kurlbar.h | 14 +- kio/kfile/tests/kcustommenueditortest.cpp | 2 +- kio/kio/authinfo.cpp | 6 +- kio/kio/authinfo.h | 2 +- kio/kio/chmodjob.cpp | 40 +- kio/kio/chmodjob.h | 12 +- kio/kio/connection.cpp | 6 +- kio/kio/connection.h | 8 +- kio/kio/dataprotocol.cpp | 2 +- kio/kio/dataprotocol.h | 4 +- kio/kio/dataslave.cpp | 6 +- kio/kio/dataslave.h | 8 +- kio/kio/davjob.cpp | 20 +- kio/kio/davjob.h | 12 +- kio/kio/defaultprogress.cpp | 54 +-- kio/kio/defaultprogress.h | 54 +-- kio/kio/forwardingslavebase.cpp | 142 +++---- kio/kio/forwardingslavebase.h | 50 +-- kio/kio/global.cpp | 320 +++++++------- kio/kio/global.h | 24 +- kio/kio/http_slave_defaults.h | 2 +- kio/kio/job.cpp | 458 ++++++++++----------- kio/kio/job.h | 6 +- kio/kio/jobclasses.h | 314 +++++++------- kio/kio/kautomount.cpp | 16 +- kio/kio/kautomount.h | 10 +- kio/kio/kdirlister.cpp | 164 ++++---- kio/kio/kdirlister.h | 26 +- kio/kio/kdirlister_p.h | 24 +- kio/kio/kdirwatch.cpp | 6 +- kio/kio/kemailsettings.cpp | 4 +- kio/kio/kfileitem.cpp | 118 +++--- kio/kio/kfileitem.h | 20 +- kio/kio/kfilemetainfo.cpp | 8 +- kio/kio/kimageio.cpp | 2 +- kio/kio/kmimetype.cpp | 16 +- kio/kio/kmimetype.h | 6 +- kio/kio/kmimetypechooser.cpp | 6 +- kio/kio/knfsshare.cpp | 2 +- kio/kio/kprotocolmanager.cpp | 64 +-- kio/kio/kprotocolmanager.h | 8 +- kio/kio/kremoteencoding.h | 6 +- kio/kio/krun.cpp | 52 +-- kio/kio/krun.h | 14 +- kio/kio/kservice.cpp | 4 +- kio/kio/kservicegroup.cpp | 2 +- kio/kio/kshred.h | 4 +- kio/kio/ktrader.cpp | 6 +- kio/kio/ktraderparse.cpp | 6 +- kio/kio/ktraderparsetree.cpp | 2 +- kio/kio/ktraderparsetree.h | 2 +- kio/kio/kurifilter.h | 4 +- kio/kio/kurlcompletion.cpp | 36 +- kio/kio/kurlcompletion.h | 4 +- kio/kio/kuserprofile.cpp | 2 +- kio/kio/metainfojob.cpp | 20 +- kio/kio/metainfojob.h | 8 +- kio/kio/netaccess.cpp | 102 ++--- kio/kio/netaccess.h | 54 +-- kio/kio/observer.cpp | 92 ++--- kio/kio/observer.h | 68 +-- kio/kio/passdlg.cpp | 6 +- kio/kio/passdlg.h | 2 +- kio/kio/paste.cpp | 42 +- kio/kio/paste.h | 2 +- kio/kio/pastedialog.cpp | 8 +- kio/kio/pastedialog.h | 2 +- kio/kio/previewjob.cpp | 42 +- kio/kio/previewjob.h | 8 +- kio/kio/progressbase.cpp | 138 +++---- kio/kio/progressbase.h | 76 ++-- kio/kio/renamedlg.cpp | 30 +- kio/kio/renamedlg.h | 12 +- kio/kio/renamedlgplugin.h | 6 +- kio/kio/scheduler.cpp | 46 +-- kio/kio/scheduler.h | 66 +-- kio/kio/sessiondata.cpp | 4 +- kio/kio/sessiondata.h | 4 +- kio/kio/skipdlg.cpp | 4 +- kio/kio/skipdlg.h | 2 +- kio/kio/slave.cpp | 34 +- kio/kio/slave.h | 26 +- kio/kio/slavebase.cpp | 38 +- kio/kio/slavebase.h | 24 +- kio/kio/slaveconfig.cpp | 12 +- kio/kio/slaveconfig.h | 2 +- kio/kio/slaveinterface.cpp | 46 +-- kio/kio/slaveinterface.h | 40 +- kio/kio/statusbarprogress.cpp | 12 +- kio/kio/statusbarprogress.h | 14 +- kio/kio/tcpslavebase.cpp | 16 +- kio/kio/tcpslavebase.h | 2 +- kio/kio/thumbcreator.h | 2 +- kio/kioexec/main.cpp | 24 +- kio/kioexec/main.h | 4 +- kio/kpasswdserver/kpasswdserver.cpp | 42 +- kio/kpasswdserver/kpasswdserver.h | 22 +- kio/kssl/TODO | 2 +- kio/kssl/kopenssl.cc | 4 +- kio/kssl/kssl/certkde | 2 +- kio/kssl/ksslcertificatehome.cc | 2 +- kio/kssl/ksslsettings.cc | 2 +- kio/kssl/ksslsettings.h | 2 +- kio/misc/kpac/downloader.cpp | 14 +- kio/misc/kpac/downloader.h | 6 +- kio/misc/ksendbugmail/smtp.cpp | 14 +- kio/misc/ksendbugmail/smtp.h | 6 +- kio/misc/kssld/kssld.cpp | 20 +- kio/misc/ktelnetservice.cpp | 2 +- kio/misc/kwalletd/kwalletd.cpp | 10 +- kio/misc/uiserver.cpp | 84 ++-- kio/misc/uiserver.h | 48 +-- kio/tests/dataprotocoltest.cpp | 12 +- kio/tests/jobtest.cpp | 84 ++-- kio/tests/jobtest.h | 6 +- kio/tests/kdefaultprogresstest.cpp | 2 +- kio/tests/kdirlistertest.cpp | 8 +- kio/tests/kdirlistertest.h | 4 +- kio/tests/kionetrctest.cpp | 4 +- kio/tests/kiopassdlgtest.cpp | 2 +- kio/tests/kioslavetest.cpp | 102 ++--- kio/tests/kioslavetest.h | 16 +- kio/tests/kpropsdlgtest.cpp | 2 +- kio/tests/kurifiltertest.cpp | 2 +- kio/tests/netaccesstest.cpp | 4 +- kio/tests/previewtest.cpp | 6 +- kio/tests/previewtest.h | 2 +- kio/tests/speed.cpp | 30 +- kio/tests/speed.h | 6 +- kioslave/file/file.cc | 220 +++++----- kioslave/file/file.h | 6 +- kioslave/ftp/ftp.cc | 48 +-- kioslave/ftp/ftp.h | 14 +- kioslave/http/http.cc | 62 +-- kioslave/http/http.h | 24 +- kioslave/http/kcookiejar/kcookiejar.cpp | 6 +- kioslave/http/kcookiejar/kcookiejar.h | 6 +- kioslave/http/kcookiejar/kcookieserver.cpp | 2 +- kioslave/http/kcookiejar/kcookieserver.h | 4 +- kioslave/http/kcookiejar/tests/kcookiejartest.cpp | 4 +- kioslave/iso/iso.cpp | 26 +- kioslave/iso/iso.h | 4 +- kioslave/iso/kiso.cpp | 4 +- kioslave/metainfo/metainfo.cpp | 2 +- kioslave/metainfo/metainfo.h | 2 +- kmdi/kmdi/dockcontainer.cpp | 4 +- kmdi/kmdi/dockcontainer.h | 4 +- kmdi/kmdi/guiclient.cpp | 2 +- kmdi/kmdidockcontainer.cpp | 4 +- kmdi/kmdidockcontainer.h | 8 +- kmdi/kmdiguiclient.cpp | 2 +- knewstuff/downloaddialog.cpp | 38 +- knewstuff/downloaddialog.h | 12 +- knewstuff/engine.cpp | 46 +-- knewstuff/engine.h | 18 +- knewstuff/knewstuffgeneric.h | 4 +- knewstuff/knewstuffsecure.cpp | 10 +- knewstuff/provider.cpp | 16 +- knewstuff/provider.h | 6 +- knewstuff/uploaddialog.cpp | 4 +- kparts/browserextension.h | 4 +- kparts/browserrun.cpp | 52 +-- kparts/browserrun.h | 14 +- kparts/componentfactory.h | 2 +- kparts/part.cpp | 16 +- kparts/part.h | 14 +- kparts/plugin.cpp | 2 +- kparts/plugin.h | 2 +- krandr/randr.cpp | 12 +- krandr/randr.h | 14 +- kresources/README.design | 2 +- kresources/configdialog.cpp | 2 +- kresources/configpage.cpp | 4 +- kresources/configpage.h | 6 +- kresources/factory.cpp | 2 +- kresources/factory.h | 4 +- kresources/kcmkresources.cpp | 2 +- kresources/kcmkresources.h | 2 +- kresources/manager.h | 4 +- kresources/managerimpl.cpp | 6 +- kresources/managerimpl.h | 10 +- kresources/resource.cpp | 4 +- kresources/resource.h | 20 +- krsync/krsync.cpp | 10 +- krsync/krsync.h | 12 +- kspell2/settings.cpp | 6 +- kstyles/kthemestyle/kthemebase.cpp | 2 +- kstyles/kthemestyle/kthemebase.h | 4 +- kstyles/kthemestyle/kthemestyle.h | 4 +- kutils/Mainpage.dox | 2 +- kutils/TODO | 14 +- kutils/kcmodulecontainer.cpp | 48 +-- kutils/kcmodulecontainer.h | 54 +-- kutils/kcmoduleinfo.cpp | 58 +-- kutils/kcmoduleinfo.h | 42 +- kutils/kcmoduleloader.cpp | 40 +- kutils/kcmoduleloader.h | 46 +-- kutils/kcmoduleproxy.cpp | 96 ++--- kutils/kcmoduleproxy.h | 70 ++-- kutils/kcmoduleproxyIface.h | 20 +- kutils/kcmoduleproxyIfaceImpl.cpp | 38 +- kutils/kcmoduleproxyIfaceImpl.h | 20 +- kutils/kcmultidialog.cpp | 32 +- kutils/kcmultidialog.h | 16 +- kutils/kplugininfo.cpp | 22 +- kutils/kplugininfo.h | 30 +- kutils/kpluginselector.cpp | 44 +- kutils/kpluginselector.h | 20 +- kutils/kpluginselector_p.h | 12 +- kutils/ksettings/README.dox | 14 +- kutils/ksettings/dialog.cpp | 26 +- kutils/ksettings/dialog.h | 6 +- kutils/ksettings/dispatcher.cpp | 4 +- kutils/ksettings/dispatcher.h | 14 +- kutils/ksettings/pluginpage.cpp | 4 +- kutils/ksettings/pluginpage.h | 12 +- kwallet/client/kwallet.cc | 4 +- libkmid/deviceman.cc | 2 +- tdecore/AUTHORS | 4 +- tdecore/DESIGN.kconfig | 36 +- tdecore/KCONFIG_DESIGN | 32 +- tdecore/README.kiosk | 2 +- tdecore/kaccel.cpp | 4 +- tdecore/kaccel.h | 10 +- tdecore/kaccelaction.cpp | 12 +- tdecore/kaccelaction.h | 10 +- tdecore/kaccelbase.cpp | 4 +- tdecore/kaccelbase.h | 4 +- tdecore/kapplication.cpp | 46 +-- tdecore/kapplication.h | 16 +- tdecore/kcharsets.cpp | 2 +- tdecore/kcheckaccelerators.cpp | 2 +- tdecore/kclipboard.cpp | 2 +- tdecore/kconfig.cpp | 48 +-- tdecore/kconfig.h | 36 +- tdecore/kconfig_compiler/README.dox | 8 +- tdecore/kconfig_compiler/example/autoexample.cpp | 2 +- .../example/exampleprefs_base.kcfgc | 2 +- tdecore/kconfig_compiler/kcfg.xsd | 2 +- tdecore/kconfig_compiler/kconfig_compiler.cpp | 18 +- .../tests/kconfigcompiler_test.cpp | 12 +- .../kconfig_compiler/tests/kconfigcompiler_test.h | 4 +- tdecore/kconfig_compiler/tests/myprefs.h | 4 +- tdecore/kconfig_compiler/tests/test1.cpp.ref | 46 +-- tdecore/kconfig_compiler/tests/test1.h.ref | 2 +- tdecore/kconfig_compiler/tests/test1.kcfgc | 2 +- tdecore/kconfig_compiler/tests/test2.cpp.ref | 34 +- tdecore/kconfig_compiler/tests/test3.cpp.ref | 10 +- tdecore/kconfig_compiler/tests/test3.h.ref | 2 +- tdecore/kconfig_compiler/tests/test4.cpp.ref | 38 +- tdecore/kconfig_compiler/tests/test4.h.ref | 4 +- tdecore/kconfig_compiler/tests/test5.cpp.ref | 38 +- tdecore/kconfig_compiler/tests/test5.h.ref | 4 +- tdecore/kconfig_compiler/tests/test6.cpp.ref | 14 +- tdecore/kconfig_compiler/tests/test6.h.ref | 2 +- tdecore/kconfig_compiler/tests/test7.cpp.ref | 14 +- tdecore/kconfig_compiler/tests/test7.h.ref | 2 +- tdecore/kconfig_compiler/tests/test8a.cpp.ref | 10 +- tdecore/kconfig_compiler/tests/test8a.h.ref | 2 +- tdecore/kconfig_compiler/tests/test8b.cpp.ref | 12 +- tdecore/kconfig_compiler/tests/test8b.h.ref | 2 +- tdecore/kconfig_compiler/tests/test9.cpp.ref | 14 +- tdecore/kconfig_compiler/tests/test9.h.ref | 2 +- tdecore/kconfig_compiler/tests/test9.kcfgc | 2 +- .../kconfig_compiler/tests/test_dpointer.cpp.ref | 80 ++-- tdecore/kconfig_compiler/tests/test_dpointer.h.ref | 4 +- tdecore/kconfigbackend.cpp | 50 +-- tdecore/kconfigbackend.h | 34 +- tdecore/kconfigbase.cpp | 290 ++++++------- tdecore/kconfigbase.h | 108 ++--- tdecore/kconfigdialogmanager.cpp | 38 +- tdecore/kconfigdialogmanager.h | 28 +- tdecore/kconfigskeleton.cpp | 424 +++++++++---------- tdecore/kconfigskeleton.h | 182 ++++---- tdecore/kdebug.areas | 12 +- tdecore/kdebug.cpp | 4 +- tdecore/kdesktopfile.cpp | 8 +- tdecore/kdesktopfile.h | 4 +- tdecore/kdetcompmgr.cpp | 4 +- tdecore/kextsock.cpp | 30 +- tdecore/kextsock.h | 36 +- tdecore/kglobal.cpp | 2 +- tdecore/kglobal.h | 4 +- tdecore/kglobalaccel.cpp | 6 +- tdecore/kglobalaccel.h | 12 +- tdecore/kglobalsettings.cpp | 88 ++-- tdecore/kglobalsettings.h | 2 +- tdecore/kiconeffect.cpp | 4 +- tdecore/kiconloader.cpp | 4 +- tdecore/kiconloader.h | 2 +- tdecore/kicontheme.cpp | 10 +- tdecore/kicontheme.h | 2 +- tdecore/kinstance.cpp | 2 +- tdecore/kinstance.h | 10 +- tdecore/kkeyserver_x11.cpp | 4 +- tdecore/klocale.cpp | 34 +- tdecore/klocale.h | 18 +- tdecore/knotifyclient.cpp | 24 +- tdecore/krootprop.h | 4 +- tdecore/kshortcutlist.cpp | 8 +- tdecore/kshortcutlist.h | 6 +- tdecore/ksimpleconfig.cpp | 14 +- tdecore/ksimpleconfig.h | 10 +- tdecore/ksimpledirwatch.cpp | 2 +- tdecore/ksock.cpp | 70 ++-- tdecore/ksock.h | 64 +-- tdecore/ksockaddr.cpp | 52 +-- tdecore/ksockaddr.h | 56 +-- tdecore/ksocks.cpp | 6 +- tdecore/ksocks.h | 6 +- tdecore/kstandarddirs.cpp | 4 +- tdecore/kstandarddirs.h | 4 +- tdecore/kstdaccel.cpp | 2 +- tdecore/ktempdir.h | 2 +- tdecore/kuniqueapplication.cpp | 2 +- tdecore/kurldrag.h | 2 +- tdecore/network/kbufferedsocket.cpp | 14 +- tdecore/network/kbufferedsocket.h | 10 +- tdecore/network/kclientsocketbase.cpp | 12 +- tdecore/network/kclientsocketbase.h | 40 +- tdecore/network/kdatagramsocket.cpp | 4 +- tdecore/network/kdatagramsocket.h | 12 +- tdecore/network/khttpproxysocketdevice.cpp | 26 +- tdecore/network/khttpproxysocketdevice.h | 10 +- tdecore/network/kmulticastsocket.h | 8 +- tdecore/network/kmulticastsocketdevice.h | 12 +- tdecore/network/kresolver.cpp | 10 +- tdecore/network/kresolver.h | 10 +- tdecore/network/kreverseresolver.cpp | 16 +- tdecore/network/kreverseresolver.h | 6 +- tdecore/network/kserversocket.cpp | 106 ++--- tdecore/network/kserversocket.h | 42 +- tdecore/network/ksockssocketdevice.cpp | 50 +-- tdecore/network/ksockssocketdevice.h | 20 +- tdecore/network/kstreamsocket.h | 6 +- tdecore/network/tdesocketaddress.cpp | 86 ++-- tdecore/network/tdesocketaddress.h | 46 +-- tdecore/network/tdesocketbase.cpp | 66 +-- tdecore/network/tdesocketbase.h | 52 +-- tdecore/network/tdesocketbuffer.cpp | 28 +- tdecore/network/tdesocketbuffer_p.h | 12 +- tdecore/network/tdesocketdevice.cpp | 130 +++--- tdecore/network/tdesocketdevice.h | 80 ++-- .../network-manager/network-manager.cpp | 2 +- tdecore/tdehardwaredevices.cpp | 12 +- tdecore/tests/kconfigtest.cpp | 20 +- tdecore/tests/kconfigtestgui.cpp | 26 +- tdecore/tests/kconfigtestgui.h | 10 +- tdecore/tests/kresolvertest.cpp | 2 +- tdecore/tests/ksocktest.cpp | 2 +- tdecore/tests/kstddirstest.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsdconf.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 +- tdeprint/cups/cupsinfos.cpp | 4 +- tdeprint/cups/kmconfigcups.cpp | 4 +- tdeprint/cups/kmconfigcups.h | 4 +- tdeprint/cups/kmconfigcupsdir.cpp | 4 +- tdeprint/cups/kmconfigcupsdir.h | 4 +- tdeprint/cups/kmcupsconfigwidget.cpp | 2 +- tdeprint/cups/kmcupsconfigwidget.h | 4 +- tdeprint/cups/kmcupsmanager.cpp | 10 +- tdeprint/kmfactory.cpp | 10 +- tdeprint/kmfactory.h | 6 +- tdeprint/kmjobmanager.cpp | 4 +- tdeprint/kmmanager.cpp | 2 +- tdeprint/kprintdialog.cpp | 14 +- tdeprint/kprinter.cpp | 4 +- tdeprint/kprinterimpl.cpp | 6 +- tdeprint/kprintpreview.cpp | 2 +- tdeprint/lpd/kmlpdmanager.cpp | 2 +- tdeprint/lpr/kmconfiglpr.cpp | 4 +- tdeprint/lpr/kmconfiglpr.h | 4 +- tdeprint/lpr/lprsettings.cpp | 2 +- tdeprint/management/kmconfigdialog.cpp | 4 +- tdeprint/management/kmconfigfilter.cpp | 4 +- tdeprint/management/kmconfigfilter.h | 4 +- tdeprint/management/kmconfigfonts.cpp | 4 +- tdeprint/management/kmconfigfonts.h | 4 +- tdeprint/management/kmconfiggeneral.cpp | 4 +- tdeprint/management/kmconfiggeneral.h | 4 +- tdeprint/management/kmconfigjobs.cpp | 4 +- tdeprint/management/kmconfigjobs.h | 4 +- tdeprint/management/kmconfigpage.cpp | 4 +- tdeprint/management/kmconfigpage.h | 6 +- tdeprint/management/kmconfigpreview.cpp | 4 +- tdeprint/management/kmconfigpreview.h | 4 +- tdeprint/management/kmdriverdbwidget.cpp | 4 +- tdeprint/management/kmjobviewer.cpp | 8 +- tdeprint/management/kmmainview.cpp | 4 +- tdeprint/management/kmtimer.cpp | 2 +- tdeprint/management/kmwdrivertest.cpp | 2 +- tdeprint/management/kmwsocketutil.cpp | 2 +- tdeprint/management/networkscanner.cpp | 4 +- tdeprint/printerfilter.cpp | 4 +- tdeprint/rlpr/kmconfigproxy.cpp | 4 +- tdeprint/rlpr/kmconfigproxy.h | 6 +- tdeprint/rlpr/kmproxywidget.cpp | 4 +- tdeprint/rlpr/kmproxywidget.h | 6 +- tdeprint/rlpr/krlprprinterimpl.cpp | 2 +- tdeprint/tdeprintcheck.cpp | 2 +- tdeprint/tdeprintcheck.h | 2 +- tdeprint/tdeprintd.cpp | 16 +- tdesu/process.cpp | 2 +- tdesu/su.cpp | 2 +- tdeui/AUTHORS | 4 +- tdeui/kaction.h | 4 +- tdeui/kactionclasses.cpp | 4 +- tdeui/kactionclasses.h | 16 +- tdeui/kactioncollection.cpp | 4 +- tdeui/kactioncollection.h | 8 +- tdeui/kbugreport.cpp | 2 +- tdeui/kcmenumngr.cpp | 2 +- tdeui/kcmodule.cpp | 66 +-- tdeui/kcmodule.h | 58 +-- tdeui/kcolordialog.cpp | 4 +- tdeui/kcombobox.h | 4 +- tdeui/kconfigdialog.cpp | 58 +-- tdeui/kconfigdialog.h | 56 +-- tdeui/kcursor.cpp | 8 +- tdeui/kdialog.cpp | 2 +- tdeui/kdialogbase.cpp | 8 +- tdeui/kdialogbase.h | 8 +- tdeui/kdockwidget.cpp | 20 +- tdeui/kdockwidget.h | 32 +- tdeui/kdockwidget_p.h | 4 +- tdeui/kfontcombo.cpp | 2 +- tdeui/kfontdialog.cpp | 4 +- tdeui/kkeydialog.cpp | 10 +- tdeui/kkeydialog.h | 6 +- tdeui/klineedit.cpp | 2 +- tdeui/klistview.cpp | 8 +- tdeui/klistview.h | 14 +- tdeui/kmainwindow.cpp | 28 +- tdeui/kmainwindow.h | 24 +- tdeui/kmenubar.cpp | 6 +- tdeui/kmessagebox.cpp | 28 +- tdeui/kmessagebox.h | 6 +- tdeui/kpanelapplet.h | 8 +- tdeui/kpanelextension.cpp | 2 +- tdeui/kpanelextension.h | 8 +- tdeui/kpanelmenu.cpp | 2 +- tdeui/kpassdlg.cpp | 8 +- tdeui/kpixmapio.cpp | 2 +- tdeui/ksconfig.cpp | 4 +- tdeui/ksconfig.h | 4 +- tdeui/kscrollview.cpp | 2 +- tdeui/kshortcutdialog.cpp | 4 +- tdeui/kstatusbar.cpp | 2 +- tdeui/kstdguiitem.h | 2 +- tdeui/kswitchlanguagedialog.cpp | 8 +- tdeui/ksyntaxhighlighter.cpp | 10 +- tdeui/ksystemtray.cpp | 4 +- tdeui/ktabwidget.cpp | 2 +- tdeui/ktip.cpp | 6 +- tdeui/ktoolbar.cpp | 34 +- tdeui/ktoolbar.h | 10 +- tdeui/tests/kcolordlgtest.cpp | 2 +- tdeui/tests/kdockwidgetdemo.cpp | 6 +- tdeui/tests/kfontdialogtest.cpp | 2 +- 623 files changed, 6007 insertions(+), 6007 deletions(-) (limited to 'khtml/java') diff --git a/KDE2PORTING.html b/KDE2PORTING.html index 41b9f5379..f23a2443b 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -31,7 +31,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <LI><A HREF="#khtmlw">khtmlw</A></LI> <LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI> <LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI> -<LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI> +<LI><A HREF="#TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></LI> <LI><A HREF="#libkfm">libkfm</A></LI> <LI><A HREF="#KDialog">KDialog</A></LI> <LI><A HREF="#kcharsets">kcharsets</A></LI> @@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.<P> <TD COLSPAN="2"> <PRE> #include <kglobal.h> - #include <kconfig.h> // Needed to use KConfig + #include <kconfig.h> // Needed to use TDEConfig #include <klocale.h> // Needed to use KLocale #include <kiconloader.h> // Needed to use KIconLoader </PRE> @@ -215,7 +215,7 @@ must have created a TDEApplication object before the methods can be used.<P> <TD> <PRE> ... - KConfig *appcfg = TDEGlobal::config(); + TDEConfig *appcfg = TDEGlobal::config(); TQString mystr = i18n( "This is a string" ); @@ -469,17 +469,17 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></H3> +<H3><A NAME="TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></H3> These classes have been largely re-implemented. The external API remains mostly the same, with the single notable change that the groupIterator and entryIterator methods have been removed and instead replaced by groupList (which returns a TQStringList of groups) and entryMap(const TQString &group) (which returns a TQMap of entries - in the specified group). This is due to internal changes in KConfig + in the specified group). This is due to internal changes in TDEConfig which would make providing iterators possibly rather difficult.<P> - Much more extensive documentation on the KConfig and friends API can + Much more extensive documentation on the TDEConfig and friends API can be found in the kdoc generated documentation from the header files, and in tdecore/KCONFIG_DESIGN.<P> @@ -505,16 +505,16 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P> <STRONG> Replacement table :</STRONG><P> <TABLE BORDER="1"> -<TR><TD>KFM::download </TD><TD>-> KIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR> -<TR><TD>KFM::removeTempFile </TD><TD>-> KIO::NetAccess::removeTempFile</TD></TR> +<TR><TD>KFM::download </TD><TD>-> TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR> +<TR><TD>KFM::removeTempFile </TD><TD>-> TDEIO::NetAccess::removeTempFile</TD></TR> <TR><TD COLSPAN="2" ROWSPAN="0">refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it</TD></TR> <TR><TD>KFM::configure </TD><TD>-> see konqueror DCOP interface</TD></TR> <TR><TD>KFM::openURL </TD><TD>-> "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR> <TR><TD>KFM::refreshDirectory </TD><TD>-> not needed anymore since konqy/kdesktop use KDirWatch</TD></TR> <TR><TD>KFM::openProperties </TD><TD>-> "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)</TD></TR> <TR><TD>KFM::exec </TD><TD>-> "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR> -<TR><TD>KFM::copy, KFM::move </TD><TD>-> KIO::Job (async, see kio/job.h)<BR> - or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR> +<TR><TD>KFM::copy, KFM::move </TD><TD>-> TDEIO::Job (async, see kio/job.h)<BR> + or TDEIO::NetAccess (sync, see kio/netaccess.h)</TD></TR> <TR><TD>DlgLocation </TD><TD>-> Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR> </TABLE> diff --git a/KDE3PORTING.html b/KDE3PORTING.html index 1c96f6ecb..aa16c489a 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -391,7 +391,7 @@ TQString&) is not a slot anymore. <li>setMaxCacheAge( int ) <li>setUseCache( bool ) <li>setMaxCacheSize( int ) -<li>setCacheControl( KIO::CacheControl ) +<li>setCacheControl( TDEIO::CacheControl ) <li>setUseProxy( bool ) <li>setUseReverseProxy( bool ) <li>setProxyType( ProxyType ) @@ -406,7 +406,7 @@ TQString&) is not a slot anymore. <li>In order to support files > 4Gb, the file size / file-offset argument in the signals totalSize, processedSize and canResume, which are used by the io-slaves and passed along to jobs, has been changed from - <b>unsigned long</b> to <b>KIO::filesize_t</b>. + <b>unsigned long</b> to <b>TDEIO::filesize_t</b>. Make sure to check if you use these signals since your compiler will typically not generate a compile-time error for these changes, instead you might get a run-time error when you try to connect to @@ -568,7 +568,7 @@ sorting is utilized by letting its view-items provide a TQString key() method. T KFileView offers the two methods <ul> <li>TQString sortingKey( const TQString& value, bool isDir, int sortSpec )</li> -<li>TQString sortingKey( KIO::filesize_t value, bool isDir, int sortSpec )</li> +<li>TQString sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec )</li> </ul> which the view-classes can use to generate the string for the key() method. The KFile::SortMode enum has been removed, as TQDir::SortSpec is used entirely. @@ -577,8 +577,8 @@ enum has been removed, as TQDir::SortSpec is used entirely. Further changes: <table> <tr><th>Old:</th><th>New:</th></tr> -<tr><td>not existant</td><td>virtual void readConfig( KConfig *, const TQString& group = TQString::null )</td></tr> -<tr><td>not existant</td><td>void writeConfig( KConfig *, const TQString& group = TQString::null)</td></tr> +<tr><td>not existant</td><td>virtual void readConfig( TDEConfig *, const TQString& group = TQString::null )</td></tr> +<tr><td>not existant</td><td>void writeConfig( TDEConfig *, const TQString& group = TQString::null)</td></tr> <tr><td>virtual void setCurrentItem( const TQString& filename, KFileViewItem * )</td><td>Replaced with the two methods below.</td></tr> <tr><td> </td><td>void setCurrentItem( const TQString& filename );</td></tr> <tr><td> </td><td>virtual void setCurrentItem( const KFileViewItem * ) = 0;</td></tr> diff --git a/TODO b/TODO index 26845a9d6..57dd5a13c 100644 --- a/TODO +++ b/TODO @@ -3,7 +3,7 @@ that we would like to make for the next binary incompatible release. - Check for forked classes in kde pim and other modules -- There is no reason why KConfigBase should inherit from QObject, get rid of that. +- There is no reason why TDEConfigBase should inherit from QObject, get rid of that. - Change all FooPrivate *d; -> Private * const d; and place initialization in the constructor (for classes that would benefit from this). To help catch silly @@ -24,7 +24,7 @@ that we would like to make for the next binary incompatible release. See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain Also free the client from the requirement to inherit from KShared. -- Remove all KSocket, KServerSocket, KSocks and KExtendedSocket references +- Remove all TDESocket, TDEServerSocket, KSocks and KExtendedSocket references throughout KDE in favor of KNetwork's socket implementations. Also, revise the namespace usage. thiago.macieira@kdemail.net @@ -88,7 +88,7 @@ that we would like to make for the next binary incompatible release. - Other ideas in this thread: http://lists.kde.org/?l=kde-core-devel&m=107608067302571&w=2 (Contributors to that thread, please add specific items here.) -- KConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc. +- TDEConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc. for the default value, add overloads that use a const reference, so that one can write resize( config->readSizeEntry( "Bleh", size() ); for example. Constructing a null QFont/QPoint/QSize is cheap enough to justify a consistent and usable API (IMHO) . @@ -110,7 +110,7 @@ that we would like to make for the next binary incompatible release. calls (readBoolEntry()). Although not technicaly a binary incompatiblity... just something to bring up for possible change (for the better) - Use KConfigXT instead! /FransE + Use TDEConfigXT instead! /FransE - Is it really necessary to bother people using the KCM APIs with withFallback? I have never heard of it failing and when would you not like to have that fallback? I think @@ -118,7 +118,7 @@ that we would like to make for the next binary incompatible release. - Do we need to have factory arguments in the KCM API? (who would use it anyway?) -- KCModuleInfo should use d-pointer. Perhaps there is more classes. +- TDECModuleInfo should use d-pointer. Perhaps there is more classes. - The config options in kdeglobals needs to be cleaned up a little. Perhaps I'm being picky.. * They should be named properly, for example "enableIcons" instead of "EnableIcons". Or atleast @@ -212,7 +212,7 @@ an alternative help->contents action) - KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :) -- Move KIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint, +- Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint, to merge that code. - Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore. diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index 50a2ae462..cd97d0cc5 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -59,7 +59,7 @@ Arts::SoundServerV2 KArtsServer::server(void) // aRts seems not to be running, let's try to run it // First, let's read the configuration as in kcmarts - KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); + TDEConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); TDEProcess proc; config.setGroup("Arts"); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index 8c131bfd1..ab215a585 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -75,19 +75,19 @@ void KIOInputStream_impl::streamStart() if(m_job != 0) m_job->kill(); - m_job = KIO::get(m_url, false, false); + m_job = TDEIO::get(m_url, false, false); m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg"); m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION)); - TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - TQObject::connect(m_job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotResult(KIO::Job *))); - TQObject::connect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &))); - TQObject::connect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t))); + TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); m_streamStarted = true; } @@ -98,14 +98,14 @@ void KIOInputStream_impl::streamEnd() if(m_job != 0) { - TQObject::disconnect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - TQObject::disconnect(m_job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotResult(KIO::Job *))); - TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &))); - TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t))); + TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotResult(TDEIO::Job *))); + TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); if ( m_streamPulled ) outdata.endPull(); @@ -124,7 +124,7 @@ bool KIOInputStream_impl::openURL(const std::string& url) return true; } -void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data) +void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) { if(m_finished) m_finished = false; @@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data) processQueue(); } -void KIOInputStream_impl::slotResult(KIO::Job *job) +void KIOInputStream_impl::slotResult(TDEIO::Job *job) { // jobs delete themselves after emitting their result m_finished = true; @@ -151,13 +151,13 @@ void KIOInputStream_impl::slotResult(KIO::Job *job) } } -void KIOInputStream_impl::slotScanMimeType(KIO::Job *, const TQString &mimetype) +void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) { kdDebug( 400 ) << "got mimetype: " << mimetype << endl; emit mimeTypeFound(mimetype); } -void KIOInputStream_impl::slotTotalSize(KIO::Job *, KIO::filesize_t size) +void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) { m_size = size; } diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 5377fc808..06052e04b 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -62,14 +62,14 @@ signals: void mimeTypeFound(const TQString & mimetype); private slots: - void slotData(KIO::Job *, const TQByteArray &); - void slotResult(KIO::Job *); - void slotScanMimeType(KIO::Job *, const TQString &mimetype); - void slotTotalSize(KIO::Job *, KIO::filesize_t size); + void slotData(TDEIO::Job *, const TQByteArray &); + void slotResult(TDEIO::Job *); + void slotScanMimeType(TDEIO::Job *, const TQString &mimetype); + void slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size); private: KURL m_url; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; TQByteArray m_data; bool m_finished; bool m_firstBuffer; @@ -79,7 +79,7 @@ private: unsigned int m_packetBuffer; const unsigned int m_packetSize; - KIO::filesize_t m_size; + TDEIO::filesize_t m_size; static const unsigned int PACKET_COUNT; }; diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index 29ee20e3d..c09692946 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -69,7 +69,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri // I hate it // It sucks // kio_media please die - KURL url = KIO::NetAccess::mostLocalURL(_url, 0); + KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0); if(!m_server.isNull()) { @@ -140,7 +140,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons // I hate it // It sucks // kio_media please die - KURL url = KIO::NetAccess::mostLocalURL(_url, 0); + KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0); // return a NULL playobject if the server is NULL if ( d->server.isNull() || url.isEmpty() ) diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 5ff633516..b8c1642f9 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -73,10 +73,10 @@ class KNotifyPrivate { public: - KConfig* globalEvents; - KConfig* globalConfig; - TQMap<TQString, KConfig*> events; - TQMap<TQString, KConfig*> configs; + TDEConfig* globalEvents; + TDEConfig* globalConfig; + TQMap<TQString, TDEConfig*> events; + TQMap<TQString, TDEConfig*> configs; TQString externalPlayer; TDEProcess *externalPlayerProc; @@ -136,8 +136,8 @@ KDE_EXPORT int kdemain(int argc, char **argv) // abort this. #ifndef WITHOUT_ARTS - KConfigGroup config( TDEGlobal::config(), "StartProgress" ); - KConfig artsKCMConfig( "kcmartsrc" ); + TDEConfigGroup config( TDEGlobal::config(), "StartProgress" ); + TDEConfig artsKCMConfig( "kcmartsrc" ); artsKCMConfig.setGroup( "Arts" ); bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true ); if (useArts) @@ -245,8 +245,8 @@ KNotify::KNotify( bool useArts ) : TQObject(), DCOPObject("Notify") { d = new KNotifyPrivate; - d->globalEvents = new KConfig("knotify/eventsrc", true, false, "data"); - d->globalConfig = new KConfig("knotify.eventsrc", true, false); + d->globalEvents = new TDEConfig("knotify/eventsrc", true, false, "data"); + d->globalConfig = new TDEConfig("knotify.eventsrc", true, false); d->externalPlayerProc = 0; d->useArts = useArts; d->inStartup = true; @@ -285,7 +285,7 @@ KNotify::~KNotify() void KNotify::loadConfig() { // load external player settings - KConfig *kc = TDEGlobal::config(); + TDEConfig *kc = TDEGlobal::config(); kc->setGroup("Misc"); d->useExternal = kc->readBoolEntry( "Use external player", false ); d->externalPlayer = kc->readPathEntry("External player"); @@ -313,7 +313,7 @@ void KNotify::reconfigure() // clear loaded config files d->globalConfig->reparseConfiguration(); - for ( TQMapIterator<TQString,KConfig*> it = d->configs.begin(); it != d->configs.end(); ++it ) + for ( TQMapIterator<TQString,TDEConfig*> it = d->configs.begin(); it != d->configs.end(); ++it ) delete it.data(); d->configs.clear(); } @@ -344,8 +344,8 @@ void KNotify::notify(const TQString &event, const TQString &fromApp, } TQString commandline; - KConfig *eventsFile = NULL; - KConfig *configFile = NULL; + TDEConfig *eventsFile = NULL; + TDEConfig *configFile = NULL; // check for valid events if ( !event.isEmpty() ) { @@ -354,13 +354,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp, if ( d->events.contains( fromApp ) ) { eventsFile = d->events[fromApp]; } else { - eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false); + eventsFile=new TDEConfig(locate("data", fromApp+"/eventsrc"),true,false); d->events.insert( fromApp, eventsFile ); } if ( d->configs.contains( fromApp) ) { configFile = d->configs[fromApp]; } else { - configFile=new KConfig(fromApp+".eventsrc",true,false); + configFile=new TDEConfig(fromApp+".eventsrc",true,false); d->configs.insert( fromApp, configFile ); } @@ -588,12 +588,12 @@ bool KNotify::notifyByMessagebox(const TQString &text, int level, WId winId) bool KNotify::notifyByPassivePopup( const TQString &text, const TQString &appName, - KConfig* eventsFile, + TDEConfig* eventsFile, WId senderWinId ) { KIconLoader iconLoader( appName ); if ( eventsFile != NULL ) { - KConfigGroup config( eventsFile, "!Global!" ); + TDEConfigGroup config( eventsFile, "!Global!" ); TQString iconName = config.readEntry( "IconName", appName ); TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small ); TQString title = config.readEntry( "Comment", appName ); diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index a6fec6747..410821af8 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -26,7 +26,7 @@ class KNotifyPrivate; class TDEProcess; -class KConfig; +class TDEConfig; class KNotify : public TQObject, public DCOPObject { @@ -75,7 +75,7 @@ private: bool notifyByLogfile(const TQString &text, const TQString &file); bool notifyByStderr(const TQString &text); bool notifyByPassivePopup(const TQString &text, const TQString &appName, - KConfig* eventsFile, WId winId ); + TDEConfig* eventsFile, WId winId ); bool notifyByExecute(const TQString &command, const TQString& event, const TQString& fromApp, diff --git a/dcop/dcopidl/dcopidl_test.h b/dcop/dcopidl/dcopidl_test.h index 2e896fb52..6f39cab99 100644 --- a/dcop/dcopidl/dcopidl_test.h +++ b/dcop/dcopidl/dcopidl_test.h @@ -14,7 +14,7 @@ class Test2; // this has to work too #include <tqstring.h> -typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap; +typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap; class Test3; // Those namespaces are opened and closed, so they should be just ignored @@ -78,7 +78,7 @@ private: Test3 *doc(); struct KIODownload; - typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap; + typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap; }; class Test2 : public DCOPObject diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc index df47ad3a5..63764fc57 100644 --- a/dnssd/settings.kcfgc +++ b/dnssd/settings.kcfgc @@ -1,7 +1,7 @@ ClassName=Configuration File=kcm_kdnssd.kcfg GlobalEnums=false -Inherits=KConfigSkeleton +Inherits=TDEConfigSkeleton ItemAccessors=false MemberVariables=private Mutators=true diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp index 9acfe00d6..e8118b8bc 100644 --- a/interfaces/kimproxy/library/kimproxy.cpp +++ b/interfaces/kimproxy/library/kimproxy.cpp @@ -643,7 +643,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) TQString KIMProxy::preferredApp() { - KConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE ); + TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE ); store->setGroup( IM_CLIENT_PREFERENCES_SECTION ); TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY ); //kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl; diff --git a/interfaces/kio/http.h b/interfaces/kio/http.h index 15803209c..6a07e9971 100644 --- a/interfaces/kio/http.h +++ b/interfaces/kio/http.h @@ -21,7 +21,7 @@ #define KIOSLAVE_HTTP_H_ -namespace KIO { +namespace TDEIO { /** HTTP / DAV method **/ enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE, diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 061f8405d..2998af9f5 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) } m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); - KConfigGroup config( TDEGlobal::config(), ConfigGroup ); + TDEConfigGroup config( TDEGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() { - KConfigGroup config( TDEGlobal::config(), ConfigGroup ); + TDEConfigGroup config( TDEGlobal::config(), ConfigGroup ); config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() ); delete d; diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/ktexteditor/configinterface.h index cb8538465..4879fa66b 100644 --- a/interfaces/ktexteditor/configinterface.h +++ b/interfaces/ktexteditor/configinterface.h @@ -22,7 +22,7 @@ #include <tdelibs_export.h> class TQCString; -class KConfig; +class TDEConfig; namespace KTextEditor { @@ -60,14 +60,14 @@ class KTEXTEDITOR_EXPORT ConfigInterface Read/Write the config of the part to a given kconfig object to store the settings in a different place than the standard */ - virtual void readConfig (KConfig *) = 0; - virtual void writeConfig (KConfig *) = 0; + virtual void readConfig (TDEConfig *) = 0; + virtual void writeConfig (TDEConfig *) = 0; /** Read/Write session config of only this document/view/plugin */ - virtual void readSessionConfig (KConfig *) = 0; - virtual void writeSessionConfig (KConfig *) = 0; + virtual void readSessionConfig (TDEConfig *) = 0; + virtual void writeSessionConfig (TDEConfig *) = 0; /** Shows a config dialog for the part, changes will be applied diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp index 85466f55d..807d342d0 100644 --- a/interfaces/ktexteditor/editorchooser.cpp +++ b/interfaces/ktexteditor/editorchooser.cpp @@ -47,7 +47,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) : KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes"); - KConfig *config=new KConfig("default_components"); + TDEConfig *config=new TDEConfig("default_components"); config->setGroup("KTextEditor"); TQString editor = config->readPathEntry("embeddedEditor"); @@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){ } void EditorChooser::readAppSetting(const TQString& postfix){ - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); @@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){ } void EditorChooser::writeAppSetting(const TQString& postfix){ - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES"); @@ -105,14 +105,14 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char KTextEditor::Document *tmpDoc=0; - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); cfg->setGroup(previousGroup); if (editor.isEmpty()) { - KConfig *config=new KConfig("default_components"); + TDEConfig *config=new TDEConfig("default_components"); config->setGroup("KTextEditor"); editor = config->readPathEntry("embeddedEditor", "katepart"); delete config; @@ -135,14 +135,14 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject KTextEditor::Editor *tmpEd=0; - KConfig *cfg=kapp->config(); + TDEConfig *cfg=kapp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); cfg->setGroup(previousGroup); if (editor.isEmpty()) { - KConfig *config=new KConfig("default_components"); + TDEConfig *config=new TDEConfig("default_components"); config->setGroup("KTextEditor"); editor = config->readPathEntry("embeddedEditor", "katepart"); delete config; diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h index 0010dd3a8..d56e8d8e5 100644 --- a/interfaces/ktexteditor/editorchooser.h +++ b/interfaces/ktexteditor/editorchooser.h @@ -6,7 +6,7 @@ #include <tqwidget.h> -class KConfig; +class TDEConfig; class TQString; namespace KTextEditor @@ -45,8 +45,8 @@ public: virtual const TQStringList &choices(); virtual void saveSettings(); - void readAppSetting(KConfig *cfg,const TQString& postfix); - void writeAppSetting(KConfig *cfg,const TQString& postfix); + void readAppSetting(TDEConfig *cfg,const TQString& postfix); + void writeAppSetting(TDEConfig *cfg,const TQString& postfix); public slots: virtual void madeChoice(int pos,const TQString &choice); diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/ktexteditor/sessionconfiginterface.h index c79de0011..b4fb52233 100644 --- a/interfaces/ktexteditor/sessionconfiginterface.h +++ b/interfaces/ktexteditor/sessionconfiginterface.h @@ -22,7 +22,7 @@ #include <tdelibs_export.h> class TQCString; -class KConfig; +class TDEConfig; namespace KTextEditor { @@ -53,8 +53,8 @@ class KTEXTEDITOR_EXPORT SessionConfigInterface * In case of the document, that means for example it should reload the file, * restore all marks, ... */ - virtual void readSessionConfig (KConfig *) = 0; - virtual void writeSessionConfig (KConfig *) = 0; + virtual void readSessionConfig (TDEConfig *) = 0; + virtual void writeSessionConfig (TDEConfig *) = 0; private: class PrivateSessionConfigInterface *d; diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 45d4f10e3..b31df2b73 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -41,7 +41,7 @@ struct AddressBook::AddressBookData { Field::List mAllFields; ErrorHandler *mErrorHandler; - KConfig *mConfig; + TDEConfig *mConfig; KRES::Manager<Resource> *mManager; TQPtrList<Resource> mPendingLoadResources; TQPtrList<Resource> mPendingSaveResources; @@ -318,7 +318,7 @@ AddressBook::AddressBook( const TQString &config ) if ( config.isEmpty() ) d->mConfig = 0; else - d->mConfig = new KConfig( config ); + d->mConfig = new TDEConfig( config ); d->mManager = new KRES::Manager<Resource>( "contact" ); d->mManager->readConfig( d->mConfig ); d->end.d->mResources = TQValueList<Resource*>(); diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp index f04adc95f..908795869 100644 --- a/kabc/addresseehelper.cpp +++ b/kabc/addresseehelper.cpp @@ -81,7 +81,7 @@ void AddresseeHelper::initSettings() mPrefixes.insert( "von" ); mPrefixes.insert( "de" ); - KConfig config( "kabcrc", true, false ); // readonly, no kdeglobals + TDEConfig config( "kabcrc", true, false ); // readonly, no kdeglobals config.setGroup( "General" ); addToSet( config.readListEntry( "Prefixes" ), mTitles ); diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index 6f056a404..76d99f634 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -61,13 +61,13 @@ TQTimer* AddressLineEdit::s_LDAPTimer = 0L; LdapSearch* AddressLineEdit::s_LDAPSearch = 0L; TQString* AddressLineEdit::s_LDAPText = 0L; AddressLineEdit* AddressLineEdit::s_LDAPLineEdit = 0L; -KConfig *AddressLineEdit::s_config = 0L; +TDEConfig *AddressLineEdit::s_config = 0L; static KStaticDeleter<KCompletion> completionDeleter; static KStaticDeleter<TQTimer> ldapTimerDeleter; static KStaticDeleter<LdapSearch> ldapSearchDeleter; static KStaticDeleter<TQString> ldapTextDeleter; -static KStaticDeleter<KConfig> configDeleter; +static KStaticDeleter<TDEConfig> configDeleter; AddressLineEdit::AddressLineEdit(TQWidget* parent, bool useCompletion, @@ -136,10 +136,10 @@ AddressLineEdit::~AddressLineEdit() //----------------------------------------------------------------------------- -KConfig* AddressLineEdit::config() +TDEConfig* AddressLineEdit::config() { if ( !s_config ) - configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals + configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals return s_config; } diff --git a/kabc/addresslineedit.h b/kabc/addresslineedit.h index 093acf97b..0cbd5dd43 100644 --- a/kabc/addresslineedit.h +++ b/kabc/addresslineedit.h @@ -30,7 +30,7 @@ #include "klineedit.h" #include "kcompletion.h" -class KConfig; +class TDEConfig; namespace KABC { @@ -61,7 +61,7 @@ public: */ virtual void setFont( const TQFont& ); - static KConfig *config(); + static TDEConfig *config(); public slots: /** @@ -112,7 +112,7 @@ private: static LdapSearch *s_LDAPSearch; static TQString *s_LDAPText; static AddressLineEdit *s_LDAPLineEdit; - static KConfig *s_config; + static TDEConfig *s_config; private: class AddressLineEditPrivate* d; diff --git a/kabc/field.h b/kabc/field.h index 7a622b90f..118ce2d51 100644 --- a/kabc/field.h +++ b/kabc/field.h @@ -26,7 +26,7 @@ #include "addressee.h" -class KConfig; +class TDEConfig; namespace KABC { @@ -134,7 +134,7 @@ public: * @param identifier The unique identifier * @param fields The list of the fields */ - static void saveFields( KConfig *cfg, const TQString &identifier, + static void saveFields( TDEConfig *cfg, const TQString &identifier, const Field::List &fields ); /** * This is the same as above, with the difference, that @@ -149,7 +149,7 @@ public: * @param cfg The config file object * @param identifier The unique identifier */ - static Field::List restoreFields( KConfig *cfg, const TQString &identifier ); + static Field::List restoreFields( TDEConfig *cfg, const TQString &identifier ); /** * This is the same as above, with the difference, that diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index 2447229da..11b80639a 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -123,7 +123,7 @@ void importKMailAddressBook( KABC::AddressBook *ab ) TQString fileName = locateLocal( "data", "kmail/addressbook" ); TQString kmailConfigName = locate( "config", "kmailrc" ); if ( !kmailConfigName.isEmpty() ) { - KConfig cfg( kmailConfigName ); + TDEConfig cfg( kmailConfigName ); cfg.setGroup( "Addressbook" ); fileName = cfg.readPathEntry( "default", fileName ); } @@ -458,7 +458,7 @@ int main( int argc, char **argv ) if ( args->isSet( "disable-autostart" ) ) { kdDebug() << "Disable autostart." << endl; - KConfig *config = app.config(); + TDEConfig *config = app.config(); config->setGroup( "Startup" ); config->writeEntry( "EnableAutostart", false ); } diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp index 39e4c504f..568408ba2 100644 --- a/kabc/ldapclient.cpp +++ b/kabc/ldapclient.cpp @@ -137,12 +137,12 @@ void LdapClient::startQuery( const TQString& filter ) startParseLDIF(); mActive = true; - mJob = KIO::get( url, false, false ); - connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); - connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); - connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ), + mJob = TDEIO::get( url, false, false ); + connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotDone() ) ); } @@ -156,7 +156,7 @@ void LdapClient::cancelQuery() mActive = false; } -void LdapClient::slotData( KIO::Job*, const TQByteArray& data ) +void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data ) { #ifndef NDEBUG // don't create the QString // TQString str( data ); @@ -165,7 +165,7 @@ void LdapClient::slotData( KIO::Job*, const TQByteArray& data ) parseLDIF( data ); } -void LdapClient::slotInfoMessage( KIO::Job*, const TQString & ) +void LdapClient::slotInfoMessage( TDEIO::Job*, const TQString & ) { //tqDebug("Job said \"%s\"", info.latin1()); } @@ -180,8 +180,8 @@ void LdapClient::slotDone() } #endif int err = mJob->error(); - if ( err && err != KIO::ERR_USER_CANCELED ) { - emit error( KIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) ); + if ( err && err != TDEIO::ERR_USER_CANCELED ) { + emit error( TDEIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) ); } emit done(); } @@ -251,7 +251,7 @@ LdapSearch::LdapSearch() } // stolen from KAddressBook - KConfig config( "kabldaprc", true ); + TDEConfig config( "kabldaprc", true ); config.setGroup( "LDAP" ); int numHosts = config.readUnsignedNumEntry( "NumSelectedHosts"); if ( !numHosts ) { diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h index 2054b1302..5f8513599 100644 --- a/kabc/ldapclient.h +++ b/kabc/ldapclient.h @@ -157,8 +157,8 @@ class KABC_EXPORT LdapClient : public TQObject void cancelQuery(); protected slots: - void slotData( KIO::Job*, const TQByteArray &data ); - void slotInfoMessage( KIO::Job*, const TQString &info ); + void slotData( TDEIO::Job*, const TQByteArray &data ); + void slotInfoMessage( TDEIO::Job*, const TQString &info ); void slotDone(); protected: @@ -172,7 +172,7 @@ class KABC_EXPORT LdapClient : public TQObject TQString mScope; TQStringList mAttrs; - TQGuardedPtr<KIO::SimpleJob> mJob; + TQGuardedPtr<TDEIO::SimpleJob> mJob; bool mActive; LdapObject mCurrentObject; diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp index b0a899d8c..eff79a73a 100644 --- a/kabc/ldapconfigwidget.cpp +++ b/kabc/ldapconfigwidget.cpp @@ -243,7 +243,7 @@ void LdapConfigWidget::initWidget() } -void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d ) +void LdapConfigWidget::loadData( TDEIO::Job*, const TQByteArray& d ) { LDIF::ParseVal ret; @@ -261,10 +261,10 @@ void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d ) } while ( ret != LDIF::MoreData ); } -void LdapConfigWidget::loadResult( KIO::Job* job) +void LdapConfigWidget::loadResult( TDEIO::Job* job) { int error = job->error(); - if ( error && error != KIO::ERR_USER_CANCELED ) + if ( error && error != TDEIO::ERR_USER_CANCELED ) mErrorMsg = job->errorString(); else mErrorMsg = ""; @@ -291,12 +291,12 @@ void LdapConfigWidget::sendQuery() kdDebug(5700) << "sendQuery url: " << _url.prettyURL() << endl; mLdif.startParsing(); - KIO::Job *job = KIO::get( _url, true, false ); + TDEIO::Job *job = TDEIO::get( _url, true, false ); job->addMetaData("no-auth-prompt","true"); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( loadData( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( loadResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( loadResult( TDEIO::Job* ) ) ); if ( mProg == NULL ) mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true ); diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h index c4144b027..0fd0dd7e5 100644 --- a/kabc/ldapconfigwidget.h +++ b/kabc/ldapconfigwidget.h @@ -44,7 +44,7 @@ namespace KABC { @short LDAP Configuration widget This class can be used to query the user for LDAP connection parameters. - It's KConfigXT compatible, using widget names starting with kcfg_ + It's TDEConfigXT compatible, using widget names starting with kcfg_ */ class KABC_EXPORT LdapConfigWidget : public TQWidget @@ -223,23 +223,23 @@ namespace KABC { /** * Sets the size limit. - * KConfig widget name: kcfg_ldapsizelimit + * TDEConfig widget name: kcfg_ldapsizelimit */ void setSizeLimit( int sizelimit ); /** * Returns the size limit. - * KConfig widget name: kcfg_ldapsizelimit + * TDEConfig widget name: kcfg_ldapsizelimit */ int sizeLimit() const; /** * Sets the time limit. - * KConfig widget name: kcfg_ldaptimelimit + * TDEConfig widget name: kcfg_ldaptimelimit */ void setTimeLimit( int timelimit ); /** * Returns the time limit. - * KConfig widget name: kcfg_ldaptimelimit + * TDEConfig widget name: kcfg_ldaptimelimit */ int timeLimit() const; @@ -262,8 +262,8 @@ namespace KABC { void setSASL( int state ); void mQueryDNClicked(); void mQueryMechClicked(); - void loadData( KIO::Job*, const TQByteArray& ); - void loadResult( KIO::Job* ); + void loadData( TDEIO::Job*, const TQByteArray& ); + void loadResult( TDEIO::Job* ); private: int mFlags; diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index 0897c9cee..0dfd0352a 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp @@ -56,7 +56,7 @@ extern "C" } -ResourceDir::ResourceDir( const KConfig *config ) +ResourceDir::ResourceDir( const TDEConfig *config ) : Resource( config ), mAsynchronous( false ) { if ( config ) { @@ -100,7 +100,7 @@ ResourceDir::~ResourceDir() mFormat = 0; } -void ResourceDir::writeConfig( KConfig *config ) +void ResourceDir::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h index 96c894e2e..a7b041643 100644 --- a/kabc/plugins/dir/resourcedir.h +++ b/kabc/plugins/dir/resourcedir.h @@ -43,11 +43,11 @@ class KABC_EXPORT ResourceDir : public Resource Q_OBJECT public: - ResourceDir( const KConfig* ); + ResourceDir( const TDEConfig* ); ResourceDir( const TQString &path, const TQString &type = "vcard" ); ~ResourceDir(); - virtual void writeConfig( KConfig* ); + virtual void writeConfig( TDEConfig* ); virtual bool doOpen(); virtual void doClose(); diff --git a/kabc/plugins/evolution/resourceevo.cpp b/kabc/plugins/evolution/resourceevo.cpp index 9a44b2adb..415e9928a 100644 --- a/kabc/plugins/evolution/resourceevo.cpp +++ b/kabc/plugins/evolution/resourceevo.cpp @@ -17,7 +17,7 @@ using namespace KABC; class EvolutionFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new ResourceEvolution( config ); } @@ -36,7 +36,7 @@ extern "C" } } -ResourceEvolution::ResourceEvolution( const KConfig* conf ) +ResourceEvolution::ResourceEvolution( const TDEConfig* conf ) : Resource( conf ), mWrap(0l) { m_isOpen = false; diff --git a/kabc/plugins/evolution/resourceevo.h b/kabc/plugins/evolution/resourceevo.h index 0f5b3a0d2..29e163e1c 100644 --- a/kabc/plugins/evolution/resourceevo.h +++ b/kabc/plugins/evolution/resourceevo.h @@ -7,7 +7,7 @@ namespace Evolution { namespace KABC { class ResourceEvolution : public Resource { public: - ResourceEvolution( const KConfig* config ); + ResourceEvolution( const TDEConfig* config ); ~ResourceEvolution(); bool doOpen(); diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index b391dffa5..3e5b1fa8f 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -46,7 +46,7 @@ using namespace KABC; -ResourceFile::ResourceFile( const KConfig *config ) +ResourceFile::ResourceFile( const TDEConfig *config ) : Resource( config ), mFormat( 0 ), mAsynchronous( false ) { @@ -98,7 +98,7 @@ ResourceFile::~ResourceFile() mFormat = 0; } -void ResourceFile::writeConfig( KConfig *config ) +void ResourceFile::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index b44c22ec1..494c43ea6 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h @@ -47,7 +47,7 @@ class KABC_EXPORT ResourceFile : public Resource @param cfg The config object where custom resource settings are stored. */ - ResourceFile( const KConfig *cfg ); + ResourceFile( const TDEConfig *cfg ); /** Construct file resource on file @arg fileName using format @arg formatName. @@ -62,7 +62,7 @@ class KABC_EXPORT ResourceFile : public Resource /** Writes the config back. */ - virtual void writeConfig( KConfig *cfg ); + virtual void writeConfig( TDEConfig *cfg ); /** Tries to open the file and checks for the proper format. diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index e8da1b6aa..03a49e819 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -47,7 +47,7 @@ using namespace KABC; void tqt_enter_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget ); -class ResourceLDAPKIO::ResourceLDAPKIOPrivate +class ResourceLDAPTDEIO::ResourceLDAPKIOPrivate { public: LDIF mLdif; @@ -69,7 +69,7 @@ class ResourceLDAPKIO::ResourceLDAPKIOPrivate KTempFile *mTmp; }; -ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config ) +ResourceLDAPTDEIO::ResourceLDAPKIO( const TDEConfig *config ) : Resource( config ) { d = new ResourceLDAPKIOPrivate; @@ -115,12 +115,12 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config ) init(); } -ResourceLDAPKIO::~ResourceLDAPKIO() +ResourceLDAPTDEIO::~ResourceLDAPKIO() { delete d; } -void ResourceLDAPKIO::enter_loop() +void ResourceLDAPTDEIO::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); dummy.setFocusPolicy( TQ_NoFocus ); @@ -129,14 +129,14 @@ void ResourceLDAPKIO::enter_loop() tqt_leave_modal(&dummy); } -void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list ) +void ResourceLDAPTDEIO::entries( TDEIO::Job*, const TDEIO::UDSEntryList & list ) { - KIO::UDSEntryListConstIterator it = list.begin(); - KIO::UDSEntryListConstIterator end = list.end(); + TDEIO::UDSEntryListConstIterator it = list.begin(); + TDEIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { - KIO::UDSEntry::ConstIterator it2 = (*it).begin(); + TDEIO::UDSEntry::ConstIterator it2 = (*it).begin(); for( ; it2 != (*it).end(); it2++ ) { - if ( (*it2).m_uds == KIO::UDS_URL ) { + if ( (*it2).m_uds == TDEIO::UDS_URL ) { KURL tmpurl( (*it2).m_str ); d->mResultDn = tmpurl.path(); kdDebug(7125) << "findUid(): " << d->mResultDn << endl; @@ -147,20 +147,20 @@ void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list ) } } -void ResourceLDAPKIO::listResult( KIO::Job *job) +void ResourceLDAPTDEIO::listResult( TDEIO::Job *job) { d->mError = job->error(); - if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) + if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) mErrorMsg = job->errorString(); else mErrorMsg = ""; tqApp->exit_loop(); } -TQString ResourceLDAPKIO::findUid( const TQString &uid ) +TQString ResourceLDAPTDEIO::findUid( const TQString &uid ) { LDAPUrl url( d->mLDAPUrl ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; mErrorMsg = d->mResultDn = ""; @@ -168,21 +168,21 @@ TQString ResourceLDAPKIO::findUid( const TQString &uid ) url.setFilter( "(" + mAttributes[ "uid" ] + "=" + uid + ")" + mFilter ); url.setExtension( "x-dir", "one" ); - kdDebug(7125) << "ResourceLDAPKIO::findUid() uid: " << uid << " url " << + kdDebug(7125) << "ResourceLDAPTDEIO::findUid() uid: " << uid << " url " << url.prettyURL() << endl; - KIO::ListJob * listJob = KIO::listDir( url, false /* no GUI */ ); + TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ ); connect( listJob, - TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), - TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) ); - connect( listJob, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( listResult( KIO::Job* ) ) ); + TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( listResult( TDEIO::Job* ) ) ); enter_loop(); return d->mResultDn; } -TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value, bool mod ) +TQCString ResourceLDAPTDEIO::addEntry( const TQString &attr, const TQString &value, bool mod ) { TQCString tmp; if ( !attr.isEmpty() ) { @@ -193,7 +193,7 @@ TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value return ( tmp ); } -bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr, +bool ResourceLDAPTDEIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr, const TQString &olddn ) { TQCString tmp; @@ -313,14 +313,14 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr, return true; } -void ResourceLDAPKIO::setReadOnly( bool value ) +void ResourceLDAPTDEIO::setReadOnly( bool value ) { //save the original readonly flag, because offline using disables writing d->mReadOnly = true; Resource::setReadOnly( value ); } -void ResourceLDAPKIO::init() +void ResourceLDAPTDEIO::init() { if ( mPort == 0 ) mPort = 389; @@ -417,7 +417,7 @@ void ResourceLDAPKIO::init() kdDebug(7125) << "resource_ldapkio url: " << d->mLDAPUrl.prettyURL() << endl; } -void ResourceLDAPKIO::writeConfig( KConfig *config ) +void ResourceLDAPTDEIO::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); @@ -450,7 +450,7 @@ void ResourceLDAPKIO::writeConfig( KConfig *config ) config->writeEntry( "LdapAttributes", attributes ); } -Ticket *ResourceLDAPKIO::requestSaveTicket() +Ticket *ResourceLDAPTDEIO::requestSaveTicket() { if ( !addressBook() ) { kdDebug(7125) << "no addressbook" << endl; @@ -460,21 +460,21 @@ Ticket *ResourceLDAPKIO::requestSaveTicket() return createTicket( this ); } -void ResourceLDAPKIO::releaseSaveTicket( Ticket *ticket ) +void ResourceLDAPTDEIO::releaseSaveTicket( Ticket *ticket ) { delete ticket; } -bool ResourceLDAPKIO::doOpen() +bool ResourceLDAPTDEIO::doOpen() { return true; } -void ResourceLDAPKIO::doClose() +void ResourceLDAPTDEIO::doClose() { } -void ResourceLDAPKIO::createCache() +void ResourceLDAPTDEIO::createCache() { d->mTmp = NULL; if ( d->mCachePolicy == Cache_NoConnection && d->mAutoCache ) { @@ -483,7 +483,7 @@ void ResourceLDAPKIO::createCache() } } -void ResourceLDAPKIO::activateCache() +void ResourceLDAPTDEIO::activateCache() { if ( d->mTmp && d->mError == 0 ) { d->mTmp->close(); @@ -495,12 +495,12 @@ void ResourceLDAPKIO::activateCache() } } -KIO::Job *ResourceLDAPKIO::loadFromCache() +TDEIO::Job *ResourceLDAPTDEIO::loadFromCache() { - KIO::Job *job = NULL; + TDEIO::Job *job = NULL; if ( d->mCachePolicy == Cache_Always || ( d->mCachePolicy == Cache_NoConnection && - d->mError == KIO::ERR_COULD_NOT_CONNECT ) ) { + d->mError == TDEIO::ERR_COULD_NOT_CONNECT ) ) { d->mAddr = Addressee(); d->mAd = Address( Address::Home ); @@ -510,17 +510,17 @@ KIO::Job *ResourceLDAPKIO::loadFromCache() Resource::setReadOnly( true ); KURL url( d->mCacheDst ); - job = KIO::get( url, true, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) ); + job = TDEIO::get( url, true, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); } return job; } -bool ResourceLDAPKIO::load() +bool ResourceLDAPTDEIO::load() { - kdDebug(7125) << "ResourceLDAPKIO::load()" << endl; - KIO::Job *job; + kdDebug(7125) << "ResourceLDAPTDEIO::load()" << endl; + TDEIO::Job *job; clear(); //clear the addressee @@ -534,18 +534,18 @@ bool ResourceLDAPKIO::load() createCache(); if ( d->mCachePolicy != Cache_Always ) { - job = KIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) ); + job = TDEIO::get( d->mLDAPUrl, true, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } job = loadFromCache(); if ( job ) { - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } if ( mErrorMsg.isEmpty() ) { @@ -558,7 +558,7 @@ bool ResourceLDAPKIO::load() } } -bool ResourceLDAPKIO::asyncLoad() +bool ResourceLDAPTDEIO::asyncLoad() { clear(); //clear the addressee @@ -571,18 +571,18 @@ bool ResourceLDAPKIO::asyncLoad() createCache(); if ( d->mCachePolicy != Cache_Always ) { - KIO::Job *job = KIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( result( KIO::Job* ) ) ); + TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( result( TDEIO::Job* ) ) ); } else { result( NULL ); } return true; } -void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data ) +void ResourceLDAPTDEIO::data( TDEIO::Job *, const TQByteArray &data ) { if ( data.size() ) { d->mLdif.setLDIF( data ); @@ -685,11 +685,11 @@ void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data ) } while ( ret != LDIF::MoreData ); } -void ResourceLDAPKIO::loadCacheResult( KIO::Job *job ) +void ResourceLDAPTDEIO::loadCacheResult( TDEIO::Job *job ) { mErrorMsg = ""; d->mError = job->error(); - if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) { + if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) { mErrorMsg = job->errorString(); } if ( !mErrorMsg.isEmpty() ) @@ -698,12 +698,12 @@ void ResourceLDAPKIO::loadCacheResult( KIO::Job *job ) emit loadingFinished( this ); } -void ResourceLDAPKIO::result( KIO::Job *job ) +void ResourceLDAPTDEIO::result( TDEIO::Job *job ) { mErrorMsg = ""; if ( job ) { d->mError = job->error(); - if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) { + if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) { mErrorMsg = job->errorString(); } } else { @@ -711,11 +711,11 @@ void ResourceLDAPKIO::result( KIO::Job *job ) } activateCache(); - KIO::Job *cjob; + TDEIO::Job *cjob; cjob = loadFromCache(); if ( cjob ) { - connect( cjob, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( loadCacheResult( KIO::Job* ) ) ); + connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) ); } else { if ( !mErrorMsg.isEmpty() ) emit loadingError( this, mErrorMsg ); @@ -724,16 +724,16 @@ void ResourceLDAPKIO::result( KIO::Job *job ) } } -bool ResourceLDAPKIO::save( Ticket* ) +bool ResourceLDAPTDEIO::save( Ticket* ) { kdDebug(7125) << "ResourceLDAPKIO save" << endl; d->mSaveIt = begin(); - KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) ); + TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); + connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); if ( mErrorMsg.isEmpty() ) { kdDebug(7125) << "ResourceLDAPKIO save ok!" << endl; @@ -745,22 +745,22 @@ bool ResourceLDAPKIO::save( Ticket* ) } } -bool ResourceLDAPKIO::asyncSave( Ticket* ) +bool ResourceLDAPTDEIO::asyncSave( Ticket* ) { kdDebug(7125) << "ResourceLDAPKIO asyncSave" << endl; d->mSaveIt = begin(); - KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( saveResult( KIO::Job* ) ) ); + TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); + connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( saveResult( TDEIO::Job* ) ) ); return true; } -void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job ) +void ResourceLDAPTDEIO::syncLoadSaveResult( TDEIO::Job *job ) { d->mError = job->error(); - if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) + if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) mErrorMsg = job->errorString(); else mErrorMsg = ""; @@ -769,16 +769,16 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job ) tqApp->exit_loop(); } -void ResourceLDAPKIO::saveResult( KIO::Job *job ) +void ResourceLDAPTDEIO::saveResult( TDEIO::Job *job ) { d->mError = job->error(); - if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) + if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) emit savingError( this, job->errorString() ); else emit savingFinished( this ); } -void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data ) +void ResourceLDAPTDEIO::saveData( TDEIO::Job*, TQByteArray& data ) { while ( d->mSaveIt != end() && !(*d->mSaveIt).changed() ) d->mSaveIt++; @@ -799,7 +799,7 @@ void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data ) d->mSaveIt++; } -void ResourceLDAPKIO::removeAddressee( const Addressee& addr ) +void ResourceLDAPTDEIO::removeAddressee( const Addressee& addr ) { TQString dn = findUid( addr.uid() ); @@ -815,7 +815,7 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr ) url.setPath( "/" + dn ); url.setExtension( "x-dir", "base" ); url.setScope( LDAPUrl::Base ); - if ( KIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() ); + if ( TDEIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() ); } else { //maybe it's not saved yet mAddrMap.erase( addr.uid() ); @@ -823,216 +823,216 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr ) } -void ResourceLDAPKIO::setUser( const TQString &user ) +void ResourceLDAPTDEIO::setUser( const TQString &user ) { mUser = user; } -TQString ResourceLDAPKIO::user() const +TQString ResourceLDAPTDEIO::user() const { return mUser; } -void ResourceLDAPKIO::setPassword( const TQString &password ) +void ResourceLDAPTDEIO::setPassword( const TQString &password ) { mPassword = password; } -TQString ResourceLDAPKIO::password() const +TQString ResourceLDAPTDEIO::password() const { return mPassword; } -void ResourceLDAPKIO::setDn( const TQString &dn ) +void ResourceLDAPTDEIO::setDn( const TQString &dn ) { mDn = dn; } -TQString ResourceLDAPKIO::dn() const +TQString ResourceLDAPTDEIO::dn() const { return mDn; } -void ResourceLDAPKIO::setHost( const TQString &host ) +void ResourceLDAPTDEIO::setHost( const TQString &host ) { mHost = host; } -TQString ResourceLDAPKIO::host() const +TQString ResourceLDAPTDEIO::host() const { return mHost; } -void ResourceLDAPKIO::setPort( int port ) +void ResourceLDAPTDEIO::setPort( int port ) { mPort = port; } -int ResourceLDAPKIO::port() const +int ResourceLDAPTDEIO::port() const { return mPort; } -void ResourceLDAPKIO::setVer( int ver ) +void ResourceLDAPTDEIO::setVer( int ver ) { d->mVer = ver; } -int ResourceLDAPKIO::ver() const +int ResourceLDAPTDEIO::ver() const { return d->mVer; } -void ResourceLDAPKIO::setSizeLimit( int sizelimit ) +void ResourceLDAPTDEIO::setSizeLimit( int sizelimit ) { d->mSizeLimit = sizelimit; } -int ResourceLDAPKIO::sizeLimit() +int ResourceLDAPTDEIO::sizeLimit() { return d->mSizeLimit; } -void ResourceLDAPKIO::setTimeLimit( int timelimit ) +void ResourceLDAPTDEIO::setTimeLimit( int timelimit ) { d->mTimeLimit = timelimit; } -int ResourceLDAPKIO::timeLimit() +int ResourceLDAPTDEIO::timeLimit() { return d->mTimeLimit; } -void ResourceLDAPKIO::setFilter( const TQString &filter ) +void ResourceLDAPTDEIO::setFilter( const TQString &filter ) { mFilter = filter; } -TQString ResourceLDAPKIO::filter() const +TQString ResourceLDAPTDEIO::filter() const { return mFilter; } -void ResourceLDAPKIO::setIsAnonymous( bool value ) +void ResourceLDAPTDEIO::setIsAnonymous( bool value ) { mAnonymous = value; } -bool ResourceLDAPKIO::isAnonymous() const +bool ResourceLDAPTDEIO::isAnonymous() const { return mAnonymous; } -void ResourceLDAPKIO::setIsTLS( bool value ) +void ResourceLDAPTDEIO::setIsTLS( bool value ) { d->mTLS = value; } -bool ResourceLDAPKIO::isTLS() const +bool ResourceLDAPTDEIO::isTLS() const { return d->mTLS; } -void ResourceLDAPKIO::setIsSSL( bool value ) +void ResourceLDAPTDEIO::setIsSSL( bool value ) { d->mSSL = value; } -bool ResourceLDAPKIO::isSSL() const +bool ResourceLDAPTDEIO::isSSL() const { return d->mSSL; } -void ResourceLDAPKIO::setIsSubTree( bool value ) +void ResourceLDAPTDEIO::setIsSubTree( bool value ) { d->mSubTree = value; } -bool ResourceLDAPKIO::isSubTree() const +bool ResourceLDAPTDEIO::isSubTree() const { return d->mSubTree; } -void ResourceLDAPKIO::setAttributes( const TQMap<TQString, TQString> &attributes ) +void ResourceLDAPTDEIO::setAttributes( const TQMap<TQString, TQString> &attributes ) { mAttributes = attributes; } -TQMap<TQString, TQString> ResourceLDAPKIO::attributes() const +TQMap<TQString, TQString> ResourceLDAPTDEIO::attributes() const { return mAttributes; } -void ResourceLDAPKIO::setRDNPrefix( int value ) +void ResourceLDAPTDEIO::setRDNPrefix( int value ) { d->mRDNPrefix = value; } -int ResourceLDAPKIO::RDNPrefix() const +int ResourceLDAPTDEIO::RDNPrefix() const { return d->mRDNPrefix; } -void ResourceLDAPKIO::setIsSASL( bool value ) +void ResourceLDAPTDEIO::setIsSASL( bool value ) { d->mSASL = value; } -bool ResourceLDAPKIO::isSASL() const +bool ResourceLDAPTDEIO::isSASL() const { return d->mSASL; } -void ResourceLDAPKIO::setMech( const TQString &mech ) +void ResourceLDAPTDEIO::setMech( const TQString &mech ) { d->mMech = mech; } -TQString ResourceLDAPKIO::mech() const +TQString ResourceLDAPTDEIO::mech() const { return d->mMech; } -void ResourceLDAPKIO::setRealm( const TQString &realm ) +void ResourceLDAPTDEIO::setRealm( const TQString &realm ) { d->mRealm = realm; } -TQString ResourceLDAPKIO::realm() const +TQString ResourceLDAPTDEIO::realm() const { return d->mRealm; } -void ResourceLDAPKIO::setBindDN( const TQString &binddn ) +void ResourceLDAPTDEIO::setBindDN( const TQString &binddn ) { d->mBindDN = binddn; } -TQString ResourceLDAPKIO::bindDN() const +TQString ResourceLDAPTDEIO::bindDN() const { return d->mBindDN; } -void ResourceLDAPKIO::setCachePolicy( int pol ) +void ResourceLDAPTDEIO::setCachePolicy( int pol ) { d->mCachePolicy = pol; } -int ResourceLDAPKIO::cachePolicy() const +int ResourceLDAPTDEIO::cachePolicy() const { return d->mCachePolicy; } -void ResourceLDAPKIO::setAutoCache( bool value ) +void ResourceLDAPTDEIO::setAutoCache( bool value ) { d->mAutoCache = value; } -bool ResourceLDAPKIO::autoCache() +bool ResourceLDAPTDEIO::autoCache() { return d->mAutoCache; } -TQString ResourceLDAPKIO::cacheDst() const +TQString ResourceLDAPTDEIO::cacheDst() const { return d->mCacheDst; } diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldapkio/resourceldapkio.h index 2b5685fdc..8519955da 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.h +++ b/kabc/plugins/ldapkio/resourceldapkio.h @@ -26,7 +26,7 @@ #include <kabc/ldif.h> #include <kio/job.h> -class KConfig; +class TDEConfig; namespace KABC { @@ -37,14 +37,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource public: enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always }; - ResourceLDAPKIO( const KConfig* ); + ResourceLDAPKIO( const TDEConfig* ); virtual ~ResourceLDAPKIO(); /** * Call this after you used one of the set... methods */ virtual void init(); - virtual void writeConfig( KConfig* ); + virtual void writeConfig( TDEConfig* ); virtual bool doOpen(); virtual void doClose(); @@ -128,14 +128,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource TQString cacheDst() const; protected slots: - void entries( KIO::Job*, const KIO::UDSEntryList& ); - void data( KIO::Job*, const TQByteArray& ); - void result( KIO::Job* ); - void listResult( KIO::Job* ); - void syncLoadSaveResult( KIO::Job* ); - void saveResult( KIO::Job* ); - void saveData( KIO::Job*, TQByteArray& ); - void loadCacheResult( KIO::Job* ); + void entries( TDEIO::Job*, const TDEIO::UDSEntryList& ); + void data( TDEIO::Job*, const TQByteArray& ); + void result( TDEIO::Job* ); + void listResult( TDEIO::Job* ); + void syncLoadSaveResult( TDEIO::Job* ); + void saveResult( TDEIO::Job* ); + void saveData( TDEIO::Job*, TQByteArray& ); + void loadCacheResult( TDEIO::Job* ); private: TQString mUser; @@ -151,9 +151,9 @@ protected slots: int mGetCounter; //KDE 4: remove bool mErrorOccured; //KDE 4: remove TQString mErrorMsg; - TQMap<KIO::Job*, TQByteArray> mJobMap; //KDE 4: remove + TQMap<TDEIO::Job*, TQByteArray> mJobMap; //KDE 4: remove - KIO::Job *loadFromCache(); + TDEIO::Job *loadFromCache(); void createCache(); void activateCache(); void enter_loop(); diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp index 271328525..7ecd14554 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp @@ -378,7 +378,7 @@ int OfflineDialog::cachePolicy() const void OfflineDialog::loadCache() { - if ( KIO::NetAccess::download( mSrc, mDst, this ) ) { + if ( TDEIO::NetAccess::download( mSrc, mDst, this ) ) { KMessageBox::information( this, i18n("Successfully downloaded directory server contents!") ); } else { diff --git a/kabc/plugins/net/resourcenet.cpp b/kabc/plugins/net/resourcenet.cpp index 914885877..78fb16256 100644 --- a/kabc/plugins/net/resourcenet.cpp +++ b/kabc/plugins/net/resourcenet.cpp @@ -40,16 +40,16 @@ using namespace KABC; class ResourceNet::ResourceNetPrivate { public: - KIO::Job *mLoadJob; + TDEIO::Job *mLoadJob; bool mIsLoading; - KIO::Job *mSaveJob; + TDEIO::Job *mSaveJob; bool mIsSaving; TQString mLastErrorString; }; -ResourceNet::ResourceNet( const KConfig *config ) +ResourceNet::ResourceNet( const TDEConfig *config ) : Resource( config ), mFormat( 0 ), mTempFile( 0 ), d( new ResourceNetPrivate ) @@ -104,7 +104,7 @@ ResourceNet::~ResourceNet() deleteLocalTempFile(); } -void ResourceNet::writeConfig( KConfig *config ) +void ResourceNet::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); @@ -137,7 +137,7 @@ bool ResourceNet::load() { TQString tempFile; - if ( !KIO::NetAccess::download( mUrl, tempFile, 0 ) ) { + if ( !TDEIO::NetAccess::download( mUrl, tempFile, 0 ) ) { addressBook()->error( i18n( "Unable to download file '%1'." ).arg( mUrl.prettyURL() ) ); return false; } @@ -145,7 +145,7 @@ bool ResourceNet::load() TQFile file( tempFile ); if ( !file.open( IO_ReadOnly ) ) { addressBook()->error( i18n( "Unable to open file '%1'." ).arg( tempFile ) ); - KIO::NetAccess::removeTempFile( tempFile ); + TDEIO::NetAccess::removeTempFile( tempFile ); return false; } @@ -153,7 +153,7 @@ bool ResourceNet::load() if ( !result ) addressBook()->error( i18n( "Problems during parsing file '%1'." ).arg( tempFile ) ); - KIO::NetAccess::removeTempFile( tempFile ); + TDEIO::NetAccess::removeTempFile( tempFile ); return result; } @@ -189,11 +189,11 @@ bool ResourceNet::asyncLoad() KURL dest; dest.setPath( mTempFile->name() ); - KIO::Scheduler::checkSlaveOnHold( true ); - d->mLoadJob = KIO::file_copy( mUrl, dest, -1, true, false, false ); + TDEIO::Scheduler::checkSlaveOnHold( true ); + d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false ); d->mIsLoading = true; - connect( d->mLoadJob, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( downloadFinished( KIO::Job* ) ) ); + connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) ); return true; } @@ -247,7 +247,7 @@ bool ResourceNet::save( Ticket* ) return false; } - ok = KIO::NetAccess::upload( tempFile.name(), mUrl, 0 ); + ok = TDEIO::NetAccess::upload( tempFile.name(), mUrl, 0 ); if ( !ok ) addressBook()->error( i18n( "Unable to upload to '%1'." ).arg( mUrl.prettyURL() ) ); @@ -283,11 +283,11 @@ bool ResourceNet::asyncSave( Ticket* ) KURL src; src.setPath( mTempFile->name() ); - KIO::Scheduler::checkSlaveOnHold( true ); + TDEIO::Scheduler::checkSlaveOnHold( true ); d->mIsSaving = true; - d->mSaveJob = KIO::file_copy( src, mUrl, -1, true, false, false ); - connect( d->mSaveJob, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( uploadFinished( KIO::Job* ) ) ); + d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false ); + connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) ); return true; } @@ -344,7 +344,7 @@ TQString ResourceNet::format() const return mFormatName; } -void ResourceNet::downloadFinished( KIO::Job* ) +void ResourceNet::downloadFinished( TDEIO::Job* ) { kdDebug(5700) << "ResourceNet::downloadFinished()" << endl; @@ -370,7 +370,7 @@ void ResourceNet::downloadFinished( KIO::Job* ) deleteLocalTempFile(); } -void ResourceNet::uploadFinished( KIO::Job *job ) +void ResourceNet::uploadFinished( TDEIO::Job *job ) { kdDebug(5700) << "ResourceFile::uploadFinished()" << endl; diff --git a/kabc/plugins/net/resourcenet.h b/kabc/plugins/net/resourcenet.h index 326c3780b..a13bfa175 100644 --- a/kabc/plugins/net/resourcenet.h +++ b/kabc/plugins/net/resourcenet.h @@ -31,7 +31,7 @@ class TQFile; class TQTimer; class KTempFile; -namespace KIO { +namespace TDEIO { class Job; } @@ -47,11 +47,11 @@ class KABC_EXPORT ResourceNet : public Resource Q_OBJECT public: - ResourceNet( const KConfig* ); + ResourceNet( const TDEConfig* ); ResourceNet( const KURL &url, const TQString &format ); ~ResourceNet(); - virtual void writeConfig( KConfig* ); + virtual void writeConfig( TDEConfig* ); virtual bool doOpen(); virtual void doClose(); @@ -88,8 +88,8 @@ class KABC_EXPORT ResourceNet : public Resource void init( const KURL &url, const TQString &format ); private slots: - void downloadFinished( KIO::Job* ); - void uploadFinished( KIO::Job* ); + void downloadFinished( TDEIO::Job* ); + void uploadFinished( TDEIO::Job* ); void signalError(); private: diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp index 55f02bae7..150fe54eb 100644 --- a/kabc/plugins/sql/resourcesql.cpp +++ b/kabc/plugins/sql/resourcesql.cpp @@ -39,7 +39,7 @@ extern "C" } } -ResourceSql::ResourceSql( AddressBook *ab, const KConfig *config ) +ResourceSql::ResourceSql( AddressBook *ab, const TDEConfig *config ) : Resource( ab ), mDb( 0 ) { TQString user, password, db, host; diff --git a/kabc/plugins/sql/resourcesql.h b/kabc/plugins/sql/resourcesql.h index 80ebf9e7a..9f1201844 100644 --- a/kabc/plugins/sql/resourcesql.h +++ b/kabc/plugins/sql/resourcesql.h @@ -35,7 +35,7 @@ class ResourceSql : public Resource public: ResourceSql( AddressBook *ab, const TQString &user, const TQString &password, const TQString &db, const TQString &host ); - ResourceSql( AddressBook *ab, const KConfig * ); + ResourceSql( AddressBook *ab, const TDEConfig * ); bool open(); void close(); diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp index ef1651cde..f62890c3d 100644 --- a/kabc/plugins/sql/resourcesqlconfig.cpp +++ b/kabc/plugins/sql/resourcesqlconfig.cpp @@ -74,7 +74,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name ) mainLayout->addWidget( mDbName, 4, 1 ); } -void ResourceSqlConfig::loadSettings( KConfig *config ) +void ResourceSqlConfig::loadSettings( TDEConfig *config ) { mUser->setText( config->readEntry( "SqlUser" ) ); mPassword->setText( KABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) ); @@ -83,7 +83,7 @@ void ResourceSqlConfig::loadSettings( KConfig *config ) mPort->setValue( config->readNumEntry( "SqlPort" ) ); } -void ResourceSqlConfig::saveSettings( KConfig *config ) +void ResourceSqlConfig::saveSettings( TDEConfig *config ) { config->writeEntry( "SqlUser", mUser->text() ); config->writeEntry( "SqlPassword", KABC::Resource::cryptStr( mPassword->text() ) ); diff --git a/kabc/plugins/sql/resourcesqlconfig.h b/kabc/plugins/sql/resourcesqlconfig.h index 7bd27d969..ae2de7d6d 100644 --- a/kabc/plugins/sql/resourcesqlconfig.h +++ b/kabc/plugins/sql/resourcesqlconfig.h @@ -36,8 +36,8 @@ public: ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: - void loadSettings( KConfig *config ); - void saveSettings( KConfig *config ); + void loadSettings( TDEConfig *config ); + void saveSettings( TDEConfig *config ); private: KLineEdit* mUser; diff --git a/kabc/resource.cpp b/kabc/resource.cpp index d43c68320..57c8588e8 100644 --- a/kabc/resource.cpp +++ b/kabc/resource.cpp @@ -197,7 +197,7 @@ bool Resource::ConstIterator::operator!=( const ConstIterator &it ) } -Resource::Resource( const KConfig *config ) +Resource::Resource( const TDEConfig *config ) : KRES::Resource( config ), mAddressBook( 0 ) { } @@ -236,7 +236,7 @@ Resource::ConstIterator Resource::end() const return it; } -void Resource::writeConfig( KConfig *config ) +void Resource::writeConfig( TDEConfig *config ) { KRES::Resource::writeConfig( config ); } diff --git a/kabc/resource.h b/kabc/resource.h index 0412a22b1..4824ffda8 100644 --- a/kabc/resource.h +++ b/kabc/resource.h @@ -118,7 +118,7 @@ class KABC_EXPORT Resource : public KRES::Resource @param config The config object where the derived classes can read out their settings. */ - Resource( const KConfig *config ); + Resource( const TDEConfig *config ); /** Destructor. @@ -157,7 +157,7 @@ class KABC_EXPORT Resource : public KRES::Resource /** Writes the resource specific config to file. */ - virtual void writeConfig( KConfig *config ); + virtual void writeConfig( TDEConfig *config ); /** Request a ticket, you have to pass through save() to diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp index b0704e393..6362d223c 100644 --- a/kabc/scripts/field.src.cpp +++ b/kabc/scripts/field.src.cpp @@ -428,13 +428,13 @@ void Field::deleteFields() void Field::saveFields( const TQString &identifier, const Field::List &fields ) { - KConfig *cfg = TDEGlobal::config(); - KConfigGroupSaver( cfg, "KABCFields" ); + TDEConfig *cfg = TDEGlobal::config(); + TDEConfigGroupSaver( cfg, "KABCFields" ); saveFields( cfg, identifier, fields ); } -void Field::saveFields( KConfig *cfg, const TQString &identifier, +void Field::saveFields( TDEConfig *cfg, const TQString &identifier, const Field::List &fields ) { TQValueList<int> fieldIds; @@ -458,13 +458,13 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier, Field::List Field::restoreFields( const TQString &identifier ) { - KConfig *cfg = TDEGlobal::config(); - KConfigGroupSaver( cfg, "KABCFields" ); + TDEConfig *cfg = TDEGlobal::config(); + TDEConfigGroupSaver( cfg, "KABCFields" ); return restoreFields( cfg, identifier ); } -Field::List Field::restoreFields( KConfig *cfg, const TQString &identifier ) +Field::List Field::restoreFields( TDEConfig *cfg, const TQString &identifier ) { const TQValueList<int> fieldIds = cfg->readIntListEntry( identifier ); diff --git a/kabc/sound.h b/kabc/sound.h index 133c0facb..98dcf320b 100644 --- a/kabc/sound.h +++ b/kabc/sound.h @@ -40,10 +40,10 @@ namespace KABC { * KAudioPlayer::play( tmp.name() ); * } else if(!sound.url().isEmpty()) { * TQString tmpFile; - * if(!KIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL)) + * if(!TDEIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL)) * { * KMessageBox::error(0L, - * KIO::NetAccess::lastErrorString(), + * TDEIO::NetAccess::lastErrorString(), * i18n("Failed to download sound file"), * KMessageBox::Notify * ); diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 6b574d86f..1cf436455 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp @@ -188,7 +188,7 @@ bool StdAddressBook::automaticSave() // should get const for 4.X Addressee StdAddressBook::whoAmI() { - KConfig config( "kabcrc" ); + TDEConfig config( "kabcrc" ); config.setGroup( "General" ); return findByUid( config.readEntry( "WhoAmI" ) ); @@ -196,7 +196,7 @@ Addressee StdAddressBook::whoAmI() void StdAddressBook::setWhoAmI( const Addressee &addr ) { - KConfig config( "kabcrc" ); + TDEConfig config( "kabcrc" ); config.setGroup( "General" ); config.writeEntry( "WhoAmI", addr.uid() ); diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h index 90c61d5ac..20bcdf531 100644 --- a/kate/interfaces/view.h +++ b/kate/interfaces/view.h @@ -28,7 +28,7 @@ #include <ktexteditor/codecompletioninterface.h> #include <ktexteditor/dynwordwrapinterface.h> -class KConfig; +class TDEConfig; namespace Kate { @@ -189,14 +189,14 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi public: /** - Reads session config out of the KConfig object. This also includes + Reads session config out of the TDEConfig object. This also includes the actual cursor position and the bookmarks. */ - virtual void readSessionConfig(KConfig *) { ; }; + virtual void readSessionConfig(TDEConfig *) { ; }; /** - Writes session config into the KConfig object. + Writes session config into the TDEConfig object. */ - virtual void writeSessionConfig(KConfig *) { ; }; + virtual void writeSessionConfig(TDEConfig *) { ; }; public slots: /** diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index ef6da69c1..81b001c3c 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig () m_pluginsSet.fill (true); // init with defaults from config or really hardcoded ones - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate Document Defaults"); readConfig (config); } @@ -149,7 +149,7 @@ KateDocumentConfig::~KateDocumentConfig () { } -void KateDocumentConfig::readConfig (KConfig *config) +void KateDocumentConfig::readConfig (TDEConfig *config) { configStart (); @@ -191,7 +191,7 @@ void KateDocumentConfig::readConfig (KConfig *config) configEnd (); } -void KateDocumentConfig::writeConfig (KConfig *config) +void KateDocumentConfig::writeConfig (TDEConfig *config) { config->writeEntry("Tab Width", tabWidth()); @@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig () s_global = this; // init with defaults from config or really hardcoded ones - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate View Defaults"); readConfig (config); } @@ -660,7 +660,7 @@ KateViewConfig::~KateViewConfig () { } -void KateViewConfig::readConfig (KConfig *config) +void KateViewConfig::readConfig (TDEConfig *config) { configStart (); @@ -693,7 +693,7 @@ void KateViewConfig::readConfig (KConfig *config) configEnd (); } -void KateViewConfig::writeConfig (KConfig *config) +void KateViewConfig::writeConfig (TDEConfig *config) { config->writeEntry( "Dynamic Word Wrap", dynWordWrap() ); config->writeEntry( "Dynamic Word Wrap Indicators", dynWordWrapIndicators() ); @@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig () s_global = this; // init with defaults from config or really hardcoded ones - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate Renderer Defaults"); readConfig (config); } @@ -1054,7 +1054,7 @@ KateRendererConfig::~KateRendererConfig () delete m_font; } -void KateRendererConfig::readConfig (KConfig *config) +void KateRendererConfig::readConfig (TDEConfig *config) { configStart (); @@ -1067,7 +1067,7 @@ void KateRendererConfig::readConfig (KConfig *config) configEnd (); } -void KateRendererConfig::writeConfig (KConfig *config) +void KateRendererConfig::writeConfig (TDEConfig *config) { config->writeEntry ("Schema", KateFactory::self()->schemaManager()->name(schema())); @@ -1125,7 +1125,7 @@ void KateRendererConfig::setSchemaInternal( int schema ) m_schemaSet = true; m_schema = schema; - KConfig *config (KateFactory::self()->schemaManager()->schema(schema)); + TDEConfig *config (KateFactory::self()->schemaManager()->schema(schema)); TQColor tmp0 (TDEGlobalSettings::baseColor()); TQColor tmp1 (TDEGlobalSettings::highlightColor()); diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h index 56d094cd0..4c1f7294a 100644 --- a/kate/part/kateconfig.h +++ b/kate/part/kateconfig.h @@ -32,7 +32,7 @@ class KateRenderer; class KateFontStruct; class KateFontMetrics; -class KConfig; +class TDEConfig; class TQFont; class TQTextCodec; @@ -115,12 +115,12 @@ class KateDocumentConfig : public KateConfig /** * Read config from object */ - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); /** * Write config to object */ - void writeConfig (KConfig *config); + void writeConfig (TDEConfig *config); protected: void updateConfig (); @@ -304,12 +304,12 @@ class KateViewConfig : public KateConfig /** * Read config from object */ - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); /** * Write config to object */ - void writeConfig (KConfig *config); + void writeConfig (TDEConfig *config); protected: void updateConfig (); @@ -432,12 +432,12 @@ class KateRendererConfig : public KateConfig /** * Read config from object */ - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); /** * Write config to object */ - void writeConfig (KConfig *config); + void writeConfig (TDEConfig *config); protected: void updateConfig (); diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 1ae416264..aa122a7b1 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -1369,7 +1369,7 @@ void KateHlConfigPage::apply () for ( TQIntDictIterator<KateHlData> it( hlDataDict ); it.current(); ++it ) KateHlManager::self()->getHl( it.currentKey() )->setData( it.current() ); - KateHlManager::self()->getKConfig()->sync (); + KateHlManager::self()->getTDEConfig()->sync (); } void KateHlConfigPage::reload () @@ -1453,20 +1453,20 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b new TQLabel(i18n("<b>Note:</b> New versions are selected automatically."), vbox); actionButton (User1)->setIconSet(SmallIconSet("ok")); - transferJob = KIO::get( + transferJob = TDEIO::get( KURL(TQString(HLDOWNLOADPATH) + TQString("update-") + TQString(KATEPART_VERSION) + TQString(".xml")), true, true ); - connect(transferJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(listDataReceived(KIO::Job *, const TQByteArray &))); -// void data( KIO::Job *, const TQByteArray &data); + connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); +// void data( TDEIO::Job *, const TQByteArray &data); resize(450, 400); } KateHlDownloadDialog::~KateHlDownloadDialog(){} -void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data) +void KateHlDownloadDialog::listDataReceived(TDEIO::Job *, const TQByteArray &data) { if (!transferJob || transferJob->isErrorPage()) { @@ -1538,7 +1538,7 @@ void KateHlDownloadDialog::slotUser1() TQString filename=src.fileName(false); TQString dest = destdir+filename; - KIO::NetAccess::download(src,dest, this); + TDEIO::NetAccess::download(src,dest, this); } } diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index 169ffaffc..fc9fa0a1a 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -46,7 +46,7 @@ struct syntaxContextData; class KateDocument; class KateView; -namespace KIO +namespace TDEIO { class Job; class TransferJob; @@ -350,10 +350,10 @@ class KateHlDownloadDialog: public KDialogBase private: class TQListView *list; class TQString listData; - KIO::TransferJob *transferJob; + TDEIO::TransferJob *transferJob; private slots: - void listDataReceived(KIO::Job *, const TQByteArray &data); + void listDataReceived(TDEIO::Job *, const TQByteArray &data); public slots: void slotUser1(); diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index b264e6533..f8f190c14 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -1879,7 +1879,7 @@ void KateDocument::setDontChangeHlOnSave() //END //BEGIN KTextEditor::ConfigInterface stuff -void KateDocument::readConfig(KConfig *config) +void KateDocument::readConfig(TDEConfig *config) { config->setGroup("Kate Document Defaults"); @@ -1895,7 +1895,7 @@ void KateDocument::readConfig(KConfig *config) KateRendererConfig::global()->readConfig (config); } -void KateDocument::writeConfig(KConfig *config) +void KateDocument::writeConfig(TDEConfig *config) { config->setGroup("Kate Document Defaults"); @@ -1913,18 +1913,18 @@ void KateDocument::writeConfig(KConfig *config) void KateDocument::readConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); readConfig (config); } void KateDocument::writeConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); writeConfig (config); config->sync(); } -void KateDocument::readSessionConfig(KConfig *kconfig) +void KateDocument::readSessionConfig(TDEConfig *kconfig) { // restore the url KURL url (kconfig->readEntry("URL")); @@ -1953,7 +1953,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig) addMark( marks[i], KateDocument::markType01 ); } -void KateDocument::writeSessionConfig(KConfig *kconfig) +void KateDocument::writeSessionConfig(TDEConfig *kconfig) { if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) return; @@ -2302,14 +2302,14 @@ bool KateDocument::openURL( const KURL &url ) m_tempFile = new KTempFile (); m_file = m_tempFile->name(); - m_job = KIO::get ( url, false, isProgressInfoEnabled() ); + m_job = TDEIO::get ( url, false, isProgressInfoEnabled() ); // connect to slots - connect( m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotDataKate( KIO::Job*, const TQByteArray& ) ) ); + connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); - connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotFinishedKate( KIO::Job* ) ) ); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); TQWidget *w = widget (); if (!w && !m_views.isEmpty ()) @@ -2324,7 +2324,7 @@ bool KateDocument::openURL( const KURL &url ) } } -void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data ) +void KateDocument::slotDataKate ( TDEIO::Job *, const TQByteArray &data ) { // kdDebug(13020) << "KateDocument::slotData" << endl; @@ -2334,7 +2334,7 @@ void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data ) m_tempFile->file()->writeBlock (data); } -void KateDocument::slotFinishedKate ( KIO::Job * job ) +void KateDocument::slotFinishedKate ( TDEIO::Job * job ) { // kdDebug(13020) << "KateDocument::slotJobFinished" << endl; @@ -2373,7 +2373,7 @@ bool KateDocument::openFile() return openFile (0); } -bool KateDocument::openFile(KIO::Job * job) +bool KateDocument::openFile(TDEIO::Job * job) { m_loading = true; // add new m_file to dirwatch @@ -2520,8 +2520,8 @@ bool KateDocument::save() // get the right permissions, start with safe default mode_t perms = 0600; - KIO::UDSEntry fentry; - if (KIO::NetAccess::stat (url(), fentry, kapp->mainWidget())) + TDEIO::UDSEntry fentry; + if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget())) { kdDebug () << "stating succesfull: " << url() << endl; KFileItem item (fentry, url()); @@ -2530,8 +2530,8 @@ bool KateDocument::save() // first del existing file if any, than copy over the file we have // failure if a: the existing file could not be deleted, b: the file could not be copied - if ( (!KIO::NetAccess::exists( u, false, kapp->mainWidget() ) || KIO::NetAccess::del( u, kapp->mainWidget() )) - && KIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) ) + if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() )) + && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) ) { kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl; } diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index d967a25ab..fec6983e4 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -46,7 +46,7 @@ namespace KTextEditor { class Plugin; } -namespace KIO { class TransferJob; } +namespace TDEIO { class TransferJob; } class KateUndoGroup; class KateCmd; @@ -439,10 +439,10 @@ class KateDocument : public Kate::Document, public slots: void readConfig (); void writeConfig (); - void readConfig (KConfig *); - void writeConfig (KConfig *); - void readSessionConfig (KConfig *); - void writeSessionConfig (KConfig *); + void readConfig (TDEConfig *); + void writeConfig (TDEConfig *); + void readSessionConfig (TDEConfig *); + void writeSessionConfig (TDEConfig *); void configDialog (); // @@ -555,7 +555,7 @@ class KateDocument : public Kate::Document, /* Anders: Reimplemented to do kate specific stuff */ bool saveAs( const KURL &url ); - bool openFile (KIO::Job * job); + bool openFile (TDEIO::Job * job); bool openFile (); bool saveFile (); @@ -565,8 +565,8 @@ class KateDocument : public Kate::Document, void setModified( bool m ); private slots: - void slotDataKate ( KIO::Job* kio_job, const TQByteArray &data ); - void slotFinishedKate ( KIO::Job * job ); + void slotDataKate ( TDEIO::Job* kio_job, const TQByteArray &data ); + void slotFinishedKate ( TDEIO::Job * job ); private: void abortLoadKate(); @@ -1004,7 +1004,7 @@ class KateDocument : public Kate::Document, static TQRegExp kvLineMime; static TQRegExp kvVar; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; KTempFile *m_tempFile; // TemplateInterface diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 11d5e9a46..a00d39bfb 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -72,7 +72,7 @@ KateFileTypeManager::~KateFileTypeManager () // void KateFileTypeManager::update () { - KConfig config ("katefiletyperc", false, false); + TDEConfig config ("katefiletyperc", false, false); TQStringList g (config.groupList()); g.sort (); @@ -101,7 +101,7 @@ void KateFileTypeManager::update () // void KateFileTypeManager::save (TQPtrList<KateFileType> *v) { - KConfig config ("katefiletyperc", false, false); + TDEConfig config ("katefiletyperc", false, false); TQStringList newg; for (uint z=0; z < v->count(); z++) diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index ca1276a6b..08da7e97f 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -1599,7 +1599,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine, void KateHighlighting::loadWildcards() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); TQString extensionString = config->readEntry("Wildcards", iWildcards); @@ -1636,7 +1636,7 @@ TQStringList& KateHighlighting::getPlainExtensions() TQString KateHighlighting::getMimetypes() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); return config->readEntry("Mimetypes", iMimetypes); @@ -1644,7 +1644,7 @@ TQString KateHighlighting::getMimetypes() int KateHighlighting::priority() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); return config->readNumEntry("Priority", m_priority); @@ -1652,7 +1652,7 @@ int KateHighlighting::priority() KateHlData *KateHighlighting::getData() { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); KateHlData *hlData = new KateHlData( @@ -1666,7 +1666,7 @@ KateHlData *KateHighlighting::getData() void KateHighlighting::setData(KateHlData *hlData) { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName); config->writeEntry("Wildcards",hlData->wildcards); @@ -1676,7 +1676,7 @@ void KateHighlighting::setData(KateHlData *hlData) void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &list) { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema)); list.clear(); @@ -1729,7 +1729,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l */ void KateHighlighting::setKateHlItemDataList(uint schema, KateHlItemDataList &list) { - KConfig *config = KateHlManager::self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->getTDEConfig(); config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema)); @@ -3264,7 +3264,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) error->setSelectedTextColor(Qt::red); list.append(error); - KConfig *config = KateHlManager::self()->self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema)); for (uint z = 0; z < defaultStyles(); z++) @@ -3317,7 +3317,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) void KateHlManager::setDefaults(uint schema, KateAttributeList &list) { - KConfig *config = KateHlManager::self()->self()->getKConfig(); + TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema)); for (uint z = 0; z < defaultStyles(); z++) diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index e312e4a01..1b71e454a 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -350,7 +350,7 @@ class KateHlManager : public TQObject static KateHlManager *self(); - inline KConfig *getKConfig() { return &m_config; }; + inline TDEConfig *getTDEConfig() { return &m_config; }; KateHighlighting *getHl(int n); int nameFind(const TQString &name); @@ -396,7 +396,7 @@ class KateHlManager : public TQObject static KateHlManager *s_self; - KConfig m_config; + TDEConfig m_config; TQStringList commonSuffixes; KateSyntaxDocument *syntax; diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index d33f26947..b7703ccdf 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -642,7 +642,7 @@ void KateJScriptManager::collectScripts (bool force) return; // We'll store the scripts list in this config - KConfig config("katepartjscriptrc", false, false); + TDEConfig config("katepartjscriptrc", false, false); // figure out if the kate install is too new config.setGroup ("General"); @@ -685,7 +685,7 @@ void KateJScriptManager::collectScripts (bool force) if (dfi.exists()) { - KConfig df (desktopFile, true, false); + TDEConfig df (desktopFile, true, false); df.setDesktopGroup (); // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback @@ -778,7 +778,7 @@ bool KateJScriptManager::help( Kate::View *, const TQString &cmd, TQString &msg if (!m_scripts[cmd] || !m_scripts[cmd]->desktopFileExists) return false; - KConfig df (m_scripts[cmd]->desktopFilename(), true, false); + TDEConfig df (m_scripts[cmd]->desktopFilename(), true, false); df.setDesktopGroup (); msg = df.readEntry ("X-Kate-Help"); @@ -1016,7 +1016,7 @@ void KateIndentJScriptManager::collectScripts (bool force) // We'll store the scripts list in this config - KConfig config("katepartindentjscriptrc", false, false); + TDEConfig config("katepartindentjscriptrc", false, false); #if 0 // figure out if the kate install is too new config.setGroup ("General"); diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index 178831f69..c06f3864e 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -371,7 +371,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force) <<"================================================="<<endl; // We'll store the scripts list in this config - KConfig config("katepartluaindentscriptrc", false, false); + TDEConfig config("katepartluaindentscriptrc", false, false); #if 0 // figure out if the kate install is too new config.setGroup ("General"); diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index bb3aa2866..fa8b21f64 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -194,7 +194,7 @@ void KateSchemaManager::update (bool readfromfile) // get the right group // special handling of the default schemas ;) // -KConfig *KateSchemaManager::schema (uint number) +TDEConfig *KateSchemaManager::schema (uint number) { if ((number>1) && (number < m_schemas.count())) m_config.setGroup (m_schemas[number]); @@ -440,7 +440,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) mark[6] = Qt::red; SchemaColors c; - KConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); + TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); c.back= config->readColorEntry("Color Background", &tmp0); c.selected = config->readColorEntry("Color Selection", &tmp1); @@ -493,7 +493,7 @@ void KateSchemaConfigColorTab::apply () for ( it = m_schemas.begin(); it != m_schemas.end(); ++it ) { kdDebug(13030)<<"APPLY scheme = "<<it.key()<<endl; - KConfig *config = KateFactory::self()->schemaManager()->schema( it.key() ); + TDEConfig *config = KateFactory::self()->schemaManager()->schema( it.key() ); kdDebug(13030)<<"Using config group "<<config->group()<<endl; SchemaColors c = it.data(); @@ -759,7 +759,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) // Set listview colors // We do that now, because we can now get the "normal text" color. - // TODO this reads of the KConfig object, which should be changed when + // TODO this reads of the TDEConfig object, which should be changed when // the color tab is fixed. TQPalette p ( m_styles->palette() ); TQColor _c ( TDEGlobalSettings::baseColor() ); @@ -905,7 +905,7 @@ void KateSchemaConfigPage::apply() KateRendererConfig::global()->reloadSchema(); // sync the hl config for real - KateHlManager::self()->getKConfig()->sync (); + KateHlManager::self()->getTDEConfig()->sync (); } void KateSchemaConfigPage::reload() diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 566b6ea27..f6eb8ef60 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -55,7 +55,7 @@ class KateSchemaManager /** * return kconfig with right group set or set to Normal if not there */ - KConfig *schema (uint number); + TDEConfig *schema (uint number); void addSchema (const TQString &t); @@ -85,7 +85,7 @@ class KateSchemaManager static TQString printingSchema (); private: - KConfig m_config; + TDEConfig m_config; TQStringList m_schemas; }; @@ -216,7 +216,7 @@ class KateSchemaConfigFontTab : public TQWidget ~KateSchemaConfigFontTab(); public: - void readConfig (KConfig *config); + void readConfig (TDEConfig *config); public slots: void apply(); diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 34f44bf66..4093f8722 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -335,7 +335,7 @@ void KateSyntaxDocument::setupModeList (bool force) return; // We'll store the ModeList in katesyntaxhighlightingrc - KConfig config("katesyntaxhighlightingrc", false, false); + TDEConfig config("katesyntaxhighlightingrc", false, false); // figure our if the kate install is too new config.setGroup ("General"); diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 50f186c8c..ca457acaa 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -930,12 +930,12 @@ void KateView::joinLines() m_doc->joinLines( first, last ); } -void KateView::readSessionConfig(KConfig *config) +void KateView::readSessionConfig(TDEConfig *config) { setCursorPositionInternal (config->readNumEntry("CursorLine"), config->readNumEntry("CursorColumn"), 1); } -void KateView::writeSessionConfig(KConfig *config) +void KateView::writeSessionConfig(TDEConfig *config) { config->writeEntry("CursorLine",m_viewInternal->cursor.line()); config->writeEntry("CursorColumn",m_viewInternal->cursor.col()); @@ -1839,7 +1839,7 @@ void KateView::exportAsHTML () if ( url.isLocalFile() ) return; - KIO::NetAccess::upload( filename, url, 0 ); + TDEIO::NetAccess::upload( filename, url, 0 ); } //END diff --git a/kate/part/kateview.h b/kate/part/kateview.h index aa428096d..f4ec54801 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -370,8 +370,8 @@ class KateView : public Kate::View, // config file / session management functions public: - void readSessionConfig(KConfig *); - void writeSessionConfig(KConfig *); + void readSessionConfig(TDEConfig *); + void writeSessionConfig(TDEConfig *); public slots: int getEol(); diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index a7a88b945..eca6716c4 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) { KateViewConfig::global()->setDefaultMarkType (vec[result-100]); // flush config, otherwise it isn't nessecarily done - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Kate View Defaults"); KateViewConfig::global()->writeConfig( config ); } diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index c996b216e..109a3c8b1 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -650,7 +650,7 @@ int main(int argc, char *argv[]) RegressionTest *RegressionTest::curr = 0; -RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig, +RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig, const TQString &baseDir, const TQString &outputDir, bool _genOutput) : TQObject(part) @@ -723,14 +723,14 @@ RegressionTest::~RegressionTest() delete m_failureSave; } -void RegressionTest::setFailureSnapshotConfig(KConfig *cfg, const TQString &sname) +void RegressionTest::setFailureSnapshotConfig(TDEConfig *cfg, const TQString &sname) { Q_ASSERT(cfg); m_failureComp = cfg; m_failureComp->setGroup(sname); } -void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname) +void RegressionTest::setFailureSnapshotSaver(TDEConfig *cfg, const TQString &sname) { Q_ASSERT(cfg); m_failureSave = cfg; diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h index 0bc717714..2128ce25d 100644 --- a/kate/part/test_regression.h +++ b/kate/part/test_regression.h @@ -165,7 +165,7 @@ class RegressionTest : public TQObject Q_OBJECT public: - RegressionTest(KateDocument *part, KConfig *baseConfig, + RegressionTest(KateDocument *part, TDEConfig *baseConfig, const TQString &baseDir, const TQString &outputDir, bool _genOutput); ~RegressionTest(); @@ -181,21 +181,21 @@ public: void rereadConfig(); static void createMissingDirs(const TQString &path); - void setFailureSnapshotConfig(KConfig *cfg, const TQString &snapshotname); - void setFailureSnapshotSaver(KConfig *cfg, const TQString &snapshotname); + void setFailureSnapshotConfig(TDEConfig *cfg, const TQString &snapshotname); + void setFailureSnapshotSaver(TDEConfig *cfg, const TQString &snapshotname); void createLink( const TQString& test, int failures ); void doFailureReport( const TQString& test, int failures ); KateDocument *m_part; KateView *m_view; - KConfig *m_baseConfig; + TDEConfig *m_baseConfig; TQString m_baseDir; TQString m_outputDir; bool m_genOutput; TQString m_currentBase; - KConfig *m_failureComp; - KConfig *m_failureSave; + TDEConfig *m_failureComp; + TDEConfig *m_failureSave; TQString m_currentOutput; TQString m_currentCategory; diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index a0e61f3d0..2a7a6de45 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -199,7 +199,7 @@ void ABGlobal::readConfig() m_ents = new ABEntityList; else m_ents->clear(); - KConfig *config = new KConfig("ktexteditor_autobookmarkerrc"); + TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc"); uint n( 0 ); while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) ) @@ -225,7 +225,7 @@ void ABGlobal::readConfig() void ABGlobal::writeConfig() { - KConfig *config = new KConfig("ktexteditor_autobookmarkerrc"); + TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc"); // clean the config object TQStringList l = config->groupList(); diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index 6a350831f..082c0ffc9 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -103,12 +103,12 @@ void InsertFilePluginView::slotInsertFile() KURL destURL; destURL.setPath( _tmpfile ); - _job = KIO::file_copy( _file, destURL, 0600, true, false, true ); - connect( _job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished ( KIO::Job * ) ) ); + _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true ); + connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) ); } } -void InsertFilePluginView::slotFinished( KIO::Job *job ) +void InsertFilePluginView::slotFinished( TDEIO::Job *job ) { assert( job == _job ); _job = 0; diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h index 9331f8100..d6751f0d1 100644 --- a/kate/plugins/insertfile/insertfileplugin.h +++ b/kate/plugins/insertfile/insertfileplugin.h @@ -58,13 +58,13 @@ class InsertFilePluginView : public TQObject, public KXMLGUIClient /* display a file dialog, and insert the chosen file */ void slotInsertFile(); private slots: - void slotFinished( KIO::Job *job ); - //slotAborted( KIO::Job *job ); + void slotFinished( TDEIO::Job *job ); + //slotAborted( TDEIO::Job *job ); private: void insertFile(); KURL _file; TQString _tmpfile; - KIO::FileCopyJob *_job; + TDEIO::FileCopyJob *_job; }; #endif // _INSERT_FILE_PLUGIN_H_ diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 249abf9f2..27d0b138d 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -170,12 +170,12 @@ void ISearchPluginView::setView( KTextEditor::View* view ) void ISearchPluginView::readConfig() { - // KConfig* config = instance()->config(); + // TDEConfig* config = instance()->config(); } void ISearchPluginView::writeConfig() { - // KConfig* config = instance()->config(); + // TDEConfig* config = instance()->config(); } void ISearchPluginView::setCaseSensitive( bool caseSensitive ) diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 37da55224..2c2bbcb23 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent, void DocWordCompletionPlugin::readConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup( "DocWordCompletion Plugin" ); m_treshold = config->readNumEntry( "treshold", 3 ); m_autopopup = config->readBoolEntry( "autopopup", true ); @@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig() void DocWordCompletionPlugin::writeConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("DocWordCompletion Plugin"); config->writeEntry("autopopup", m_autopopup ); config->writeEntry("treshold", m_treshold ); diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index 5b31c8166..ca5912206 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -740,7 +740,7 @@ void KCertPart::slotImport() { if (!_silentImport) KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the TDE Control Center."), i18n("Certificate Import")); } else if (_ca) { - KConfig cfg("ksslcalist", true, false); + TDEConfig cfg("ksslcalist", true, false); if (cfg.hasGroup(_ca->getSubject())) { TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to replace it?"); int rc= KMessageBox::warningContinueCancel(_frame, msg, i18n("Certificate Import"),i18n("Replace")); diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp index 2ef0ac781..5d71fbaa7 100644 --- a/kcmshell/main.cpp +++ b/kcmshell/main.cpp @@ -106,7 +106,7 @@ static KService::Ptr locateModule(const TQCString& module) if ( module.left( 4 ) != "kde-" && service->library().isEmpty() ) return locateModule( "kde-" + module ); - if(!KCModuleLoader::testModule( module )) + if(!TDECModuleLoader::testModule( module )) { kdDebug(780) << "According to \"" << module << "\"'s test function, it should Not be loaded." << endl; return 0; @@ -301,7 +301,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) id = args->getOption( "embed-proxy" ).toInt(&idValid); if( idValid ) { - KCModuleProxy *module = new KCModuleProxy( modules.first()->desktopEntryName() ); + TDECModuleProxy *module = new TDECModuleProxy( modules.first()->desktopEntryName() ); module->realModule(); QXEmbed::embedClientIntoWindow( module, id); app.exec(); @@ -318,7 +318,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) i18n("Configure - %1").arg(kapp->caption()), 0, "", true ); for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it) - dlg->addModule(KCModuleInfo(*it)); + dlg->addModule(TDECModuleInfo(*it)); if ( args->isSet( "embed" )) { @@ -339,7 +339,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) if (kapp->iconName() != kapp->name()) setIcon(dlg, kapp->iconName()); else if ( modules.count() == 1 ) - setIcon(dlg, KCModuleInfo( modules.first()).icon()); + setIcon(dlg, TDECModuleInfo( modules.first()).icon()); dlg->exec(); delete dlg; diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp index 15a963678..daf66ca9b 100644 --- a/kconf_update/kconf_update.cpp +++ b/kconf_update/kconf_update.cpp @@ -73,11 +73,11 @@ public: void gotScriptArguments(const TQString &_arguments); void resetOptions(); - void copyGroup(KConfigBase *cfg1, const TQString &grp1, - KConfigBase *cfg2, const TQString &grp2); + void copyGroup(TDEConfigBase *cfg1, const TQString &grp1, + TDEConfigBase *cfg2, const TQString &grp2); protected: - KConfig *config; + TDEConfig *config; TQString currentFilename; bool skip; bool debug; @@ -86,9 +86,9 @@ protected: TQString oldFile; TQString newFile; TQString newFileName; - KConfig *oldConfig1; // Config to read keys from. - KConfig *oldConfig2; // Config to delete keys from. - KConfig *newConfig; + TDEConfig *oldConfig1; // Config to read keys from. + TDEConfig *oldConfig2; // Config to delete keys from. + TDEConfig *newConfig; TQString oldGroup; TQString newGroup; @@ -113,7 +113,7 @@ KonfUpdate::KonfUpdate() oldConfig2 = 0; newConfig = 0; - config = new KConfig("kconf_updaterc"); + config = new TDEConfig("kconf_updaterc"); TQStringList updateFiles; TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs(); @@ -501,7 +501,7 @@ void KonfUpdate::gotFile(const TQString &_file) if (!oldFile.isEmpty()) { - oldConfig2 = new KConfig(oldFile, false, false); + oldConfig2 = new TDEConfig(oldFile, false, false); TQString cfg_id = currentFilename + ":" + id; oldConfig2->setGroup("$Version"); TQStringList ids = oldConfig2->readListEntry("update_info"); @@ -514,7 +514,7 @@ void KonfUpdate::gotFile(const TQString &_file) if (!newFile.isEmpty()) { - newConfig = new KConfig(newFile, false, false); + newConfig = new TDEConfig(newFile, false, false); newConfig->setGroup("$Version"); ids = newConfig->readListEntry("update_info"); if (ids.contains(cfg_id)) @@ -528,7 +528,7 @@ void KonfUpdate::gotFile(const TQString &_file) newConfig = oldConfig2; } - oldConfig1 = new KConfig(oldFile, true, false); + oldConfig1 = new TDEConfig(oldFile, true, false); } else { @@ -703,8 +703,8 @@ void KonfUpdate::gotOptions(const TQString &_options) } } -void KonfUpdate::copyGroup(KConfigBase *cfg1, const TQString &grp1, - KConfigBase *cfg2, const TQString &grp2) +void KonfUpdate::copyGroup(TDEConfigBase *cfg1, const TQString &grp1, + TDEConfigBase *cfg2, const TQString &grp2) { cfg1->setGroup(grp1); cfg2->setGroup(grp2); @@ -905,10 +905,10 @@ void KonfUpdate::gotScript(const TQString &_script) // Merging in new entries. m_bCopy = true; { - KConfig *saveOldConfig1 = oldConfig1; + TDEConfig *saveOldConfig1 = oldConfig1; TQString saveOldGroup = oldGroup; TQString saveNewGroup = newGroup; - oldConfig1 = new KConfig(tmp2.name(), true, false); + oldConfig1 = new TDEConfig(tmp2.name(), true, false); // For all groups... TQStringList grpList = oldConfig1->groupList(); diff --git a/kded/kded.cpp b/kded/kded.cpp index efbde0011..d06c44c38 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -155,7 +155,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun, void Kded::initModules() { m_dontLoad.clear(); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' ); // not the same user like the one running the session (most likely we're run via sudo or something) if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid()) @@ -225,7 +225,7 @@ void Kded::initModules() void Kded::loadSecondPhase() { kdDebug(7020) << "Loading second phase autoload" << endl; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); KService::List kdedModules = KServiceType::offers("KDEDModule"); for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it) { @@ -905,7 +905,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) } TDEInstance *instance = new TDEInstance(&aboutData); - KConfig *config = instance->config(); // Enable translations. + TDEConfig *config = instance->config(); // Enable translations. if (args->isSet("check")) { diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets index 8ca72586d..0a4bf6229 100644 --- a/kdewidgets/kde.widgets +++ b/kdewidgets/kde.widgets @@ -26,7 +26,7 @@ Group=Graphics (KDE) ToolTip=Combo Box (KDE) Group=Input (KDE) -[KCModule] +[TDECModule] ToolTip=KControl Center Module (KDE) IsContainer=true Group=Container (KDE) diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp index bec6988b3..8e2856c53 100644 --- a/kdewidgets/makekdewidgets.cpp +++ b/kdewidgets/makekdewidgets.cpp @@ -117,11 +117,11 @@ static KCmdLineOptions options[] = KCmdLineLastOption }; -static TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ); -static TQString buildWidgetCreate( const TQString &name, KConfig &input ); -static TQString buildWidgetInclude( const TQString &name, KConfig &input ); +static TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group ); +static TQString buildWidgetCreate( const TQString &name, TDEConfig &input ); +static TQString buildWidgetInclude( const TQString &name, TDEConfig &input ); static void buildFile( TQTextStream &stream, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath ); -static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ); +static TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath ); int main( int argc, char **argv ) { new TDEInstance( "makekdewidgets" ); @@ -160,7 +160,7 @@ int main( int argc, char **argv ) { } void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath ) { - KConfig input( fileName, true, false ); + TDEConfig input( fileName, true, false ); input.setGroup( "Global" ); TQMap<TQString, TQString> MainMap; MainMap.insert( "PluginName", input.readEntry( "PluginName", pluginName ) ); @@ -195,7 +195,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam } -TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ) { +TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group ) { input.setGroup( name ); TQMap<TQString, TQString> defMap; defMap.insert( "Group", input.readEntry( "Group", group ).replace( "\"", "\\\"" ) ); @@ -209,7 +209,7 @@ TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &g return KMacroExpander::expandMacros( widgetDef, defMap ); } -TQString buildWidgetCreate( const TQString &name, KConfig &input ) { +TQString buildWidgetCreate( const TQString &name, TDEConfig &input ) { input.setGroup( name ); TQMap<TQString, TQString> createMap; createMap.insert( "ImplClass", input.readEntry( "ImplClass", name ) ); @@ -218,12 +218,12 @@ TQString buildWidgetCreate( const TQString &name, KConfig &input ) { return KMacroExpander::expandMacros( widgetCreate, createMap ); } -TQString buildWidgetInclude( const TQString &name, KConfig &input ) { +TQString buildWidgetInclude( const TQString &name, TDEConfig &input ) { input.setGroup( name ); return "#include <" + input.readEntry( "IncludeFile", name.lower() + ".h" ) + ">"; } -TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ) { +TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath ) { input.setGroup( name ); TQString cleanName = name.lower().replace( ":", "_" ); TQString iconName = input.readEntry( "IconSet", cleanName + ".png" ); diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets index d375f0add..ed320bc64 100644 --- a/kdewidgets/tests/test.widgets +++ b/kdewidgets/tests/test.widgets @@ -26,7 +26,7 @@ Group=Graphics (KDE) ToolTip=Combo Box (KDE) Group=Input (KDE) -[KCModule] +[TDECModule] ToolTip=KControl Center Module (KDE) IsContainer=true Group=Container (KDE) diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index dda8fa324..19712f826 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -35,7 +35,7 @@ #include <libxslt/transform.h> #include "xslt.h" -using namespace KIO; +using namespace TDEIO; TQString HelpProtocol::langLookup(const TQString& fname) { @@ -169,7 +169,7 @@ void HelpProtocol::get( const KURL& url ) if (doc.isEmpty()) { - error( KIO::ERR_DOES_NOT_EXIST, url.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.url() ); return; } @@ -345,24 +345,24 @@ void HelpProtocol::get_file( const KURL& url ) struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, url.path() ); + error( TDEIO::ERR_ACCESS_DENIED, url.path() ); else - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } if ( S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, url.path() ); + error( TDEIO::ERR_IS_DIRECTORY, url.path() ); return; } if ( S_ISFIFO( buff.st_mode ) || S_ISSOCK ( buff.st_mode ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } int fd = open( _path.data(), O_RDONLY); if ( fd < 0 ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } @@ -379,7 +379,7 @@ void HelpProtocol::get_file( const KURL& url ) { if (errno == EINTR) continue; - error( KIO::ERR_COULD_NOT_READ, url.path()); + error( TDEIO::ERR_COULD_NOT_READ, url.path()); close(fd); return; } diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h index 13c198af1..957a0e2e5 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/kio_help.h @@ -18,7 +18,7 @@ #include <kio/global.h> #include <kio/slavebase.h> -class HelpProtocol : public KIO::SlaveBase +class HelpProtocol : public TDEIO::SlaveBase { public: diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index 6559a2b9e..3f4a8cd26 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -2076,7 +2076,7 @@ static TQColor colorForCSSValue( int css_value ) else if ( css_value == CSS_VAL_INFOTEXT ) return TQToolTip::palette().inactive().foreground(); else if ( css_value == CSS_VAL_BACKGROUND ) { - KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support + TDEConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support bckgrConfig.setGroup("Desktop0"); // Desktop background. return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background()); @@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value ) TQColor c = pal.color( uicol->group, uicol->role ); #ifndef APPLE_CHANGES if ( uicol->configEntry ) { - KConfig *globalConfig = TDEGlobal::config(); + TDEConfig *globalConfig = TDEGlobal::config(); globalConfig->setGroup( uicol->configGroup ); c = globalConfig->readColorEntry( uicol->configEntry, &c ); } diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index 674a3f3c6..73a55cf94 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -860,8 +860,8 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch } if (dontShowAgain) { - KConfig *config = kapp->config(); - KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings")); + TDEConfig *config = kapp->config(); + TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings")); config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0)); config->sync(); TQByteArray data; diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index 426c68343..9bd99ada7 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -306,7 +306,7 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo) continue; } // read configuration - KConfig kc( locate ("data", pluginsinfo.toString()) ); + TDEConfig kc( locate ("data", pluginsinfo.toString()) ); unsigned num = (unsigned int) kc.readNumEntry("number"); for ( unsigned n = 0; n < num; n++ ) { kc.setGroup( TQString::number(n) ); diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp index 08ba07519..8a8a86c16 100644 --- a/khtml/ecma/xmlhttprequest.cpp +++ b/khtml/ecma/xmlhttprequest.cpp @@ -42,7 +42,7 @@ #include "KWQLoader.h" #else #include <kio/netaccess.h> -using KIO::NetAccess; +using TDEIO::NetAccess; #endif #define BANNED_HTTP_HEADERS "authorization,proxy-authorization,"\ @@ -81,23 +81,23 @@ XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject) } #ifdef APPLE_CHANGES -void XMLHttpRequestQObject::slotData( KIO::Job* job, const char *data, int size ) +void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const char *data, int size ) { jsObject->slotData(job, data, size); } #else -void XMLHttpRequestQObject::slotData( KIO::Job* job, const TQByteArray &data ) +void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const TQByteArray &data ) { jsObject->slotData(job, data); } #endif -void XMLHttpRequestQObject::slotFinished( KIO::Job* job ) +void XMLHttpRequestQObject::slotFinished( TDEIO::Job* job ) { jsObject->slotFinished(job); } -void XMLHttpRequestQObject::slotRedirection( KIO::Job* job, const KURL& url) +void XMLHttpRequestQObject::slotRedirection( TDEIO::Job* job, const KURL& url) { jsObject->slotRedirection( job, url ); } @@ -344,7 +344,7 @@ void XMLHttpRequest::send(const TQString& _body) const TQString protocol = url.protocol().lower(); // Abandon the request when the protocol is other than "http", - // instead of blindly doing a KIO::get on other protocols like file:/. + // instead of blindly doing a TDEIO::get on other protocols like file:/. if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) { abort(); @@ -359,14 +359,14 @@ void XMLHttpRequest::send(const TQString& _body) TQCString str = _body.utf8(); buf.duplicate(str.data(), str.size() - 1); - job = KIO::http_post( url, buf, false ); + job = TDEIO::http_post( url, buf, false ); if(contentType.isNull()) job->addMetaData( "content-type", "Content-type: text/plain" ); else job->addMetaData( "content-type", contentType ); } else { - job = KIO::get( url, false, false ); + job = TDEIO::get( url, false, false ); } if (!requestHeaders.isEmpty()) { @@ -421,22 +421,22 @@ void XMLHttpRequest::send(const TQString& _body) return; } - qObject->connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); + qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); #ifdef APPLE_CHANGES - qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const char*, int ) ), - TQT_SLOT( slotData( KIO::Job*, const char*, int ) ) ); + qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ), + TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) ); #else - qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); + qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); #endif - qObject->connect( job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) ); + qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); #ifdef APPLE_CHANGES KWQServeRequest(khtml::Cache::loader(), doc->docLoader(), job); #else - KIO::Scheduler::scheduleJob( job ); + TDEIO::Scheduler::scheduleJob( job ); #endif } @@ -610,7 +610,7 @@ void XMLHttpRequest::processSyncLoadResults(const TQByteArray &data, const KURL slotFinished(0); } -void XMLHttpRequest::slotFinished(KIO::Job *) +void XMLHttpRequest::slotFinished(TDEIO::Job *) { if (decoder) { response += decoder->flush(); @@ -625,7 +625,7 @@ void XMLHttpRequest::slotFinished(KIO::Job *) decoder = 0; } -void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url) +void XMLHttpRequest::slotRedirection(TDEIO::Job*, const KURL& url) { if (!urlMatchesDocumentDomain(url)) { abort(); @@ -633,9 +633,9 @@ void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url) } #ifdef APPLE_CHANGES -void XMLHttpRequest::slotData( KIO::Job*, const char *data, int len ) +void XMLHttpRequest::slotData( TDEIO::Job*, const char *data, int len ) #else -void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) +void XMLHttpRequest::slotData(TDEIO::Job*, const TQByteArray &_data) #endif { if (state < Loaded ) { diff --git a/khtml/ecma/xmlhttprequest.h b/khtml/ecma/xmlhttprequest.h index 2c646708e..93420453e 100644 --- a/khtml/ecma/xmlhttprequest.h +++ b/khtml/ecma/xmlhttprequest.h @@ -75,12 +75,12 @@ namespace KJS { XMLHttpRequestQObject *qObject; #ifdef APPLE_CHANGES - void slotData( KIO::Job* job, const char *data, int size ); + void slotData( TDEIO::Job* job, const char *data, int size ); #else - void slotData( KIO::Job* job, const TQByteArray &data ); + void slotData( TDEIO::Job* job, const TQByteArray &data ); #endif - void slotFinished( KIO::Job* ); - void slotRedirection( KIO::Job*, const KURL& ); + void slotFinished( TDEIO::Job* ); + void slotRedirection( TDEIO::Job*, const KURL& ); void processSyncLoadResults(const TQByteArray &data, const KURL &finalURL, const TQString &headers); @@ -103,7 +103,7 @@ namespace KJS { TQString m_mimeTypeOverride; TQString contentType; - KIO::TransferJob * job; + TDEIO::TransferJob * job; XMLHttpRequestState state; JSEventListener *onReadyStateChangeListener; @@ -129,9 +129,9 @@ namespace KJS { XMLHttpRequestQObject(XMLHttpRequest *_jsObject); public slots: - void slotData( KIO::Job* job, const TQByteArray &data ); - void slotFinished( KIO::Job* job ); - void slotRedirection( KIO::Job* job, const KURL& url); + void slotData( TDEIO::Job* job, const TQByteArray &data ); + void slotFinished( TDEIO::Job* job ); + void slotRedirection( TDEIO::Job* job, const KURL& url); private: XMLHttpRequest *jsObject; diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index 7477679bc..c7c232dc9 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -1615,16 +1615,16 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis fileurl = KURL::fromPathOrURL(val); } - KIO::UDSEntry filestat; + TDEIO::UDSEntry filestat; // can't submit file in www-url-form encoded TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget(); if (multipart) { TQCString filearray( "" ); - if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) { + if ( TDEIO::NetAccess::stat(fileurl, filestat, toplevel)) { const KFileItem fileitem(filestat, fileurl, true, false); if ( fileitem.isFile() && - KIO::NetAccess::download(fileurl, local, toplevel) ) { + TDEIO::NetAccess::download(fileurl, local, toplevel) ) { TQFile file(local); filearray.resize(file.size()+1); if ( file.open( IO_ReadOnly ) ) { @@ -1633,7 +1633,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis filearray[readbytes] = '\0'; file.close(); } - KIO::NetAccess::removeTempFile( local ); + TDEIO::NetAccess::removeTempFile( local ); } } encoding += filearray; diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index 56e056a62..a82a80a0e 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -193,7 +193,7 @@ void KJavaAppletServer::freeJavaServer() //instead of immediately quitting here, set a timer to kill us //if there are still no servers- give us one minute //this is to prevent repeated loading and unloading of the jvm - KConfig config( "konquerorrc", true ); + TDEConfig config( "konquerorrc", true ); config.setGroup( "Java/JavaScript Settings" ); if( config.readBoolEntry( "ShutdownAppletServer", true ) ) { @@ -214,7 +214,7 @@ void KJavaAppletServer::checkShutdown() void KJavaAppletServer::setupJava( KJavaProcess *p ) { - KConfig config ( "konquerorrc", true ); + TDEConfig config ( "konquerorrc", true ); config.setGroup( "Java/JavaScript Settings" ); TQString jvm_path = "java"; diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index 05c2eb7d0..979403df4 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -315,12 +315,12 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, if (!server->usingKIO ()) { /* if this page needs authentication */ - KIO::AuthInfo info; + TDEIO::AuthInfo info; TQString errorMsg; TQCString replyType; TQByteArray params; TQByteArray reply; - KIO::AuthInfo authResult; + TDEIO::AuthInfo authResult; //(void) dcopClient(); // Make sure to have a dcop client. info.url = baseurl; @@ -329,9 +329,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, TQDataStream stream(params, IO_WriteOnly); stream << info << m_view->topLevelWidget()->winId(); - if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) { + if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) { kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl; - } else if ( replyType == "KIO::AuthInfo" ) { + } else if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream stream2( reply, IO_ReadOnly ); stream2 >> authResult; applet->setUser (authResult.username); diff --git a/khtml/java/kjavaappletviewer.h b/khtml/java/kjavaappletviewer.h index b76f20363..cf2c20721 100644 --- a/khtml/java/kjavaappletviewer.h +++ b/khtml/java/kjavaappletviewer.h @@ -41,7 +41,7 @@ class KJavaProcess; class KJavaAppletViewer; class TDEAboutData; class TDEInstance; -class KConfig; +class TDEConfig; class CoverWidget; class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension { @@ -107,7 +107,7 @@ private slots: void delayedCreateTimeOut (); private: TQGuardedPtr <CoverWidget> m_view; - KConfig * m_config; + TDEConfig * m_config; KJavaProcess * process; KJavaAppletViewerBrowserExtension * m_browserextension; KJavaAppletViewerLiveConnectExtension * m_liveconnect; diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp index 60334cbf0..a12b585b7 100644 --- a/khtml/java/kjavadownloader.cpp +++ b/khtml/java/kjavadownloader.cpp @@ -58,13 +58,13 @@ public: ~KJavaDownloaderPrivate() { delete url; - if (job) job->kill(); // KIO::Job::kill deletes itself + if (job) job->kill(); // TDEIO::Job::kill deletes itself } private: int loaderID; KURL* url; TQByteArray file; - KIO::TransferJob* job; + TDEIO::TransferJob* job; int responseCode; bool isfirstdata; }; @@ -79,16 +79,16 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url ) d->loaderID = ID; d->url = new KURL( url ); - d->job = KIO::get( *d->url, false, false ); + d->job = TDEIO::get( *d->url, false, false ); d->job->addMetaData("PropagateHttpHeader", "true"); - connect( d->job, TQT_SIGNAL(data( KIO::Job*, const TQByteArray& )), - this, TQT_SLOT(slotData( KIO::Job*, const TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(connected(KIO::Job*)), - this, TQT_SLOT(slotConnected(KIO::Job*))); - connect( d->job, TQT_SIGNAL(mimetype(KIO::Job*, const TQString&)), - this, TQT_SLOT(slotMimetype(KIO::Job*, const TQString&))); - connect( d->job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotResult(KIO::Job*)) ); + connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )), + this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) ); + connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)), + this, TQT_SLOT(slotConnected(TDEIO::Job*))); + connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)), + this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&))); + connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotResult(TDEIO::Job*)) ); } KJavaDownloader::~KJavaDownloader() @@ -96,7 +96,7 @@ KJavaDownloader::~KJavaDownloader() delete d; } -void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb ) +void KJavaDownloader::slotData( TDEIO::Job*, const TQByteArray& qb ) { //kdDebug(6100) << "slotData(" << d->loaderID << ")" << endl; @@ -116,17 +116,17 @@ void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb ) KJavaAppletServer::freeJavaServer(); } -void KJavaDownloader::slotConnected(KIO::Job*) +void KJavaDownloader::slotConnected(TDEIO::Job*) { kdDebug(6100) << "slave connected" << endl; d->responseCode = d->job->error(); } -void KJavaDownloader::slotMimetype(KIO::Job*, const TQString & type) { +void KJavaDownloader::slotMimetype(TDEIO::Job*, const TQString & type) { kdDebug(6100) << "slave mimetype " << type << endl; } -void KJavaDownloader::slotResult( KIO::Job* ) +void KJavaDownloader::slotResult( TDEIO::Job* ) { kdDebug(6100) << "slotResult(" << d->loaderID << ")" << endl; @@ -149,7 +149,7 @@ void KJavaDownloader::slotResult( KIO::Job* ) { server->sendURLData( d->loaderID, FINISHED, d->file ); } - d->job = 0L; // signal KIO::Job::result deletes itself + d->job = 0L; // signal TDEIO::Job::result deletes itself server->removeDataJob( d->loaderID ); // will delete this KJavaAppletServer::freeJavaServer(); } @@ -161,7 +161,7 @@ void KJavaDownloader::jobCommand( int cmd ) case KJAS_STOP: { kdDebug(6100) << "jobCommand(" << d->loaderID << ") stop" << endl; d->job->kill(); - d->job = 0L; // KIO::Job::kill deletes itself + d->job = 0L; // TDEIO::Job::kill deletes itself KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer(); server->removeDataJob( d->loaderID ); // will delete this KJavaAppletServer::freeJavaServer(); @@ -187,12 +187,12 @@ public: ~KJavaUploaderPrivate() { delete url; - if (job) job->kill(); // KIO::Job::kill deletes itself + if (job) job->kill(); // TDEIO::Job::kill deletes itself } int loaderID; KURL* url; TQByteArray file; - KIO::TransferJob* job; + TDEIO::TransferJob* job; bool finished; }; @@ -213,12 +213,12 @@ void KJavaUploader::start() kdDebug(6100) << "KJavaUploader::start(" << d->loaderID << ")" << endl; KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer(); // create a suspended job - d->job = KIO::put( *d->url, -1, false, false, false ); + d->job = TDEIO::put( *d->url, -1, false, false, false ); d->job->suspend(); - connect( d->job, TQT_SIGNAL(dataReq( KIO::Job*, TQByteArray& )), - this, TQT_SLOT(slotDataRequest( KIO::Job*, TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotResult(KIO::Job*)) ); + connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )), + this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) ); + connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotResult(TDEIO::Job*)) ); server->sendURLData( d->loaderID, CONNECTED, d->file ); KJavaAppletServer::freeJavaServer(); } @@ -228,7 +228,7 @@ KJavaUploader::~KJavaUploader() delete d; } -void KJavaUploader::slotDataRequest( KIO::Job*, TQByteArray& qb ) +void KJavaUploader::slotDataRequest( TDEIO::Job*, TQByteArray& qb ) { // send our data and suspend kdDebug(6100) << "slotDataRequest(" << d->loaderID << ") finished:" << d->finished << endl; @@ -256,7 +256,7 @@ void KJavaUploader::data( const TQByteArray& qb ) d->job->resume(); } -void KJavaUploader::slotResult( KIO::Job* ) +void KJavaUploader::slotResult( TDEIO::Job* ) { kdDebug(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl; @@ -276,7 +276,7 @@ void KJavaUploader::slotResult( KIO::Job* ) } else // shouldn't come here kdError(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl; - d->job = 0L; // signal KIO::Job::result deletes itself + d->job = 0L; // signal TDEIO::Job::result deletes itself server->removeDataJob( d->loaderID ); // will delete this KJavaAppletServer::freeJavaServer(); } diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h index f9514304c..ab6553398 100644 --- a/khtml/java/kjavadownloader.h +++ b/khtml/java/kjavadownloader.h @@ -27,13 +27,13 @@ /** * @short A class for handling downloads from KIO * - * This class handles a KIO::get job and passes the data + * This class handles a TDEIO::get job and passes the data * back to the AppletServer. * * @author Wynn Wilkes, wynnw@calderasystems.com */ -namespace KIO { +namespace TDEIO { class Job; } @@ -59,10 +59,10 @@ public: virtual void jobCommand( int cmd ); protected slots: - void slotData( KIO::Job*, const TQByteArray& ); - void slotConnected( KIO::Job* ); - void slotMimetype( KIO::Job*, const TQString& ); - void slotResult( KIO::Job* ); + void slotData( TDEIO::Job*, const TQByteArray& ); + void slotConnected( TDEIO::Job* ); + void slotMimetype( TDEIO::Job*, const TQString& ); + void slotResult( TDEIO::Job* ); private: KJavaDownloaderPrivate* d; @@ -81,8 +81,8 @@ public: virtual void data( const TQByteArray& qb ); void start(); protected slots: - void slotDataRequest( KIO::Job*, TQByteArray& ); - void slotResult( KIO::Job* ); + void slotDataRequest( TDEIO::Job*, TQByteArray& ); + void slotResult( TDEIO::Job* ); private: KJavaUploaderPrivate* d; diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 44c060b61..2e4660f2d 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -437,7 +437,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, // Fill search provider entries - KConfig config("kuriikwsfilterrc"); + TDEConfig config("kuriikwsfilterrc"); config.setGroup("General"); const TQString defaultEngine = config.readEntry("DefaultSearchEngine", "google"); const char keywordDelimiter = config.readNumEntry("KeywordDelimiter", ':'); @@ -648,7 +648,7 @@ KHTMLPopupGUIClient::~KHTMLPopupGUIClient() void KHTMLPopupGUIClient::slotSaveLinkAs() { - KIO::MetaData metaData; + TDEIO::MetaData metaData; metaData["referrer"] = d->m_khtml->referrer(); saveURL( d->m_khtml->widget(), i18n( "Save Link As" ), d->m_url, metaData ); } @@ -668,7 +668,7 @@ void KHTMLPopupGUIClient::slotSendImage() void KHTMLPopupGUIClient::slotSaveImageAs() { - KIO::MetaData metaData; + TDEIO::MetaData metaData; metaData["referrer"] = d->m_khtml->referrer(); saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename ); } @@ -824,7 +824,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, { TQFileInfo info( destURL.path() ); if( info.exists() ) { - // TODO: use KIO::RenameDlg (shows more information) + // TODO: use TDEIO::RenameDlg (shows more information) query = KMessageBox::warningContinueCancel( parent, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ) ); } } @@ -862,7 +862,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, destFile.close(); KURL url2 = KURL(); url2.setPath(destFile.name()); - KIO::file_move(url2, destURL, -1, true /*overwrite*/); + TDEIO::file_move(url2, destURL, -1, true /*overwrite*/); saved = true; } } @@ -876,7 +876,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, bool downloadViaKIO = true; if ( !url.isLocalFile() ) { - KConfig cfg("konquerorrc", false, false); + TDEConfig cfg("konquerorrc", false, false); cfg.setGroup("HTML Settings"); TQString downloadManger = cfg.readPathEntry("DownloadManager"); if (!downloadManger.isEmpty()) @@ -907,7 +907,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, if ( downloadViaKIO ) { - KIO::Job *job = KIO::file_copy( url, destURL, -1, true /*overwrite*/ ); + TDEIO::Job *job = TDEIO::file_copy( url, destURL, -1, true /*overwrite*/ ); job->setMetaData(metadata); job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache. job->addMetaData("cache", "cache"); // Use entry from cache if available. diff --git a/khtml/khtml_ext.h b/khtml/khtml_ext.h index 47ab97228..4878c0ac4 100644 --- a/khtml/khtml_ext.h +++ b/khtml/khtml_ext.h @@ -120,12 +120,12 @@ public: virtual ~KHTMLPopupGUIClient(); static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url, - const TQMap<TQString, TQString> &metaData = KIO::MetaData(), + const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(), const TQString &filter = TQString::null, long cacheId = 0, const TQString &suggestedFilename = TQString::null ); static void saveURL( const KURL &url, const KURL &destination, - const TQMap<TQString, TQString> &metaData = KIO::MetaData(), + const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(), long cacheId = 0 ); private slots: void slotSaveLinkAs(); diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index 6b5662882..63e44025f 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -120,7 +120,7 @@ void KHTMLFactory::ref() // 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 TDEInstance object, which involves destructing - // a KConfig object, which might call TDEGlobal::dirs() (in sync()) which + // a TDEConfig object, which might call TDEGlobal::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 // safe side ;-) -> let's use a simple reference counting scheme diff --git a/khtml/khtml_iface.cc b/khtml/khtml_iface.cc index 2746ba0d2..9576379ec 100644 --- a/khtml/khtml_iface.cc +++ b/khtml/khtml_iface.cc @@ -191,7 +191,7 @@ void KHTMLPartIface::saveBackground(const TQString &destination) if (back.isEmpty()) return; - KIO::MetaData metaData; + TDEIO::MetaData metaData; metaData["referrer"] = part->referrer(); KHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData ); } @@ -203,7 +203,7 @@ void KHTMLPartIface::saveDocument(const TQString &destination) if ( srcURL.fileName(false).isEmpty() ) srcURL.setFileName( "index.html" ); - KIO::MetaData metaData; + TDEIO::MetaData metaData; // Referrer unknown? KHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() ); } diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index bf4566c86..c0733c990 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -306,7 +306,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) d->m_paSetEncoding->insert( d->m_manualDetection ); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if ( config->hasGroup( "HTML Settings" ) ) { config->setGroup( "HTML Settings" ); khtml::Decoder::AutoDetectLanguage language; @@ -434,7 +434,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) this, TQT_SLOT( updateActions() ) ); connect( this, TQT_SIGNAL( completed( bool ) ), this, TQT_SLOT( updateActions() ) ); - connect( this, TQT_SIGNAL( started( KIO::Job * ) ), + connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ), this, TQT_SLOT( updateActions() ) ); d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "khtml/khtml_popupmenu.rc", KHTMLFactory::instance() ) ); @@ -469,7 +469,7 @@ KHTMLPart::~KHTMLPart() { //kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "HTML Settings" ); config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage ); @@ -590,7 +590,7 @@ bool KHTMLPart::openURL( const KURL &url ) KURL mainURL = urls.first(); int error = mainURL.queryItem( "error" ).toInt(); // error=0 isn't a valid error code, so 0 means it's missing from the URL - if ( error == 0 ) error = KIO::ERR_UNKNOWN; + if ( error == 0 ) error = TDEIO::ERR_UNKNOWN; TQString errorText = mainURL.queryItem( "errText", HINT_UTF8 ); urls.pop_front(); d->m_workingURL = KURL::join( urls ); @@ -698,36 +698,36 @@ bool KHTMLPart::openURL( const KURL &url ) if (d->m_restored) { args.metaData().insert("referrer", d->m_pageReferrer); - d->m_cachePolicy = KIO::CC_Cache; + d->m_cachePolicy = TDEIO::CC_Cache; } else if (args.reload) - d->m_cachePolicy = KIO::CC_Reload; + d->m_cachePolicy = TDEIO::CC_Reload; else d->m_cachePolicy = KProtocolManager::cacheControl(); if ( args.doPost() && (m_url.protocol().startsWith("http")) ) { - d->m_job = KIO::http_post( m_url, args.postData, false ); + d->m_job = TDEIO::http_post( m_url, args.postData, false ); d->m_job->addMetaData("content-type", args.contentType() ); } else { - d->m_job = KIO::get( m_url, false, false ); - d->m_job->addMetaData("cache", KIO::getCacheControlString(d->m_cachePolicy)); + d->m_job = TDEIO::get( m_url, false, false ); + d->m_job->addMetaData("cache", TDEIO::getCacheControlString(d->m_cachePolicy)); } if (widget()) d->m_job->setWindow(widget()->topLevelWidget()); d->m_job->addMetaData(args.metaData()); - connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); - connect( d->m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); - connect ( d->m_job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) ); - connect( d->m_job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) ); + connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); d->m_bComplete = false; d->m_bLoadEventEmitted = false; @@ -743,14 +743,14 @@ bool KHTMLPart::openURL( const KURL &url ) d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); - connect( d->m_job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobSpeed( KIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobPercent( KIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotJobDone( KIO::Job* ) ) ); + connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) ); d->m_jobspeed = 0; @@ -758,9 +758,9 @@ bool KHTMLPart::openURL( const KURL &url ) // do a stat to see whether the stylesheet was changed in the meanwhile. if ( args.reload && !settings()->userStyleSheet().isEmpty() ) { KURL url( settings()->userStyleSheet() ); - KIO::StatJob *job = KIO::stat( url, false /* don't show progress */ ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotUserSheetStatDone( KIO::Job * ) ) ); + TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) ); } emit started( 0L ); @@ -876,7 +876,7 @@ TQString KHTMLPart::documentSource() const } else { TQString tmpFile; - if( KIO::NetAccess::download( m_url, tmpFile, NULL ) ) + if( TDEIO::NetAccess::download( m_url, tmpFile, NULL ) ) { TQFile f( tmpFile ); if ( f.open( IO_ReadOnly ) ) @@ -886,7 +886,7 @@ TQString KHTMLPart::documentSource() const sourceStr = stream.read(); f.close(); } - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } } @@ -1511,7 +1511,7 @@ DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const return 0; } -void KHTMLPart::slotInfoMessage(KIO::Job* kio_job, const TQString& msg) +void KHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg) { assert(d->m_job == kio_job); @@ -1562,7 +1562,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec ) d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) ); } -void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data ) +void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data ) { assert ( d->m_job == kio_job ); @@ -1579,8 +1579,8 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data ) begin( d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset ); d->m_job->resume(); - if (d->m_cachePolicy == KIO::CC_Refresh) - d->m_doc->docLoader()->setCachePolicy(KIO::CC_Verify); + if (d->m_cachePolicy == TDEIO::CC_Refresh) + d->m_doc->docLoader()->setCachePolicy(TDEIO::CC_Verify); else d->m_doc->docLoader()->setCachePolicy(d->m_cachePolicy); @@ -1696,12 +1696,12 @@ void KHTMLPart::slotRestoreData(const TQByteArray &data ) } } -void KHTMLPart::showError( KIO::Job* job ) +void KHTMLPart::showError( TDEIO::Job* job ) { kdDebug(6050) << "KHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete << " d->m_bCleared=" << d->m_bCleared << endl; - if (job->error() == KIO::ERR_NO_CONTENT) + if (job->error() == TDEIO::ERR_NO_CONTENT) return; if ( (d->m_doc && d->m_doc->parsing()) || d->m_workingURL.isEmpty() ) // if we got any data already @@ -1728,7 +1728,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU errText += TQString::fromLatin1( "

      " ); errText += i18n( "An error occurred while loading %1:" ).arg( reqUrl.htmlURL() ); errText += TQString::fromLatin1( "

      " ); - errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) ); + errText += TQStyleSheet::convertFromPlainText( TDEIO::buildErrorString( errorCode, text ) ); errText += TQString::fromLatin1( "" ); write(errText); end(); @@ -1749,7 +1749,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU TQString errorName, techName, description; TQStringList causes, solutions; - TQByteArray raw = KIO::rawErrorDetail( errorCode, text, &reqUrl ); + TQByteArray raw = TDEIO::rawErrorDetail( errorCode, text, &reqUrl ); TQDataStream stream(raw, IO_ReadOnly); stream >> errorName >> techName >> description >> causes >> solutions; @@ -1812,7 +1812,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU end(); } -void KHTMLPart::slotFinished( KIO::Job * job ) +void KHTMLPart::slotFinished( TDEIO::Job * job ) { d->m_job = 0L; d->m_jobspeed = 0L; @@ -1826,7 +1826,7 @@ void KHTMLPart::slotFinished( KIO::Job * job ) // KIO cannot change a redirection request from GET to LISTDIR, // we have to take care of it here once we know for sure it is // a directory... - if (job->error() == KIO::ERR_IS_DIRECTORY) + if (job->error() == TDEIO::ERR_IS_DIRECTORY) { KParts::URLArgs args; emit d->m_extension->openURLRequest( d->m_workingURL, args ); @@ -1841,7 +1841,7 @@ void KHTMLPart::slotFinished( KIO::Job * job ) return; } - KIO::TransferJob *tjob = ::tqqt_cast(job); + TDEIO::TransferJob *tjob = ::tqqt_cast(job); if (tjob && tjob->isErrorPage()) { khtml::RenderPart *renderPart = d->m_frame ? static_cast(d->m_frame->m_frame) : 0; if (renderPart) { @@ -1861,7 +1861,7 @@ void KHTMLPart::slotFinished( KIO::Job * job ) d->m_frame->m_jscript->dataReceived(); if ( d->m_doc && d->m_doc->docLoader()->expireDate() && m_url.protocol().lower().startsWith("http")) - KIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate()); + TDEIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate()); d->m_workingURL = KURL(); @@ -2140,14 +2140,14 @@ void KHTMLPart::slotProgressUpdate() emit d->m_extension->loadingProgress( percent ); } -void KHTMLPart::slotJobSpeed( KIO::Job* /*job*/, unsigned long speed ) +void KHTMLPart::slotJobSpeed( TDEIO::Job* /*job*/, unsigned long speed ) { d->m_jobspeed = speed; if (!parentPart()) setStatusBarText(jsStatusBarText(), BarOverrideText); } -void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent ) +void KHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent ) { d->m_jobPercent = percent; @@ -2155,7 +2155,7 @@ void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent ) d->m_progressUpdateTimer.start( 0, true ); } -void KHTMLPart::slotJobDone( KIO::Job* /*job*/ ) +void KHTMLPart::slotJobDone( TDEIO::Job* /*job*/ ) { d->m_jobPercent = 100; @@ -2163,16 +2163,16 @@ void KHTMLPart::slotJobDone( KIO::Job* /*job*/ ) d->m_progressUpdateTimer.start( 0, true ); } -void KHTMLPart::slotUserSheetStatDone( KIO::Job *_job ) +void KHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job ) { - using namespace KIO; + using namespace TDEIO; if ( _job->error() ) { showError( _job ); return; } - const UDSEntry entry = dynamic_cast( _job )->statResult(); + const UDSEntry entry = dynamic_cast( _job )->statResult(); UDSEntry::ConstIterator it = entry.begin(); const UDSEntry::ConstIterator end = entry.end(); for ( ; it != end; ++it ) { @@ -2453,7 +2453,7 @@ void KHTMLPart::slotRedirect() emit completed(); } -void KHTMLPart::slotRedirection(KIO::Job*, const KURL& url) +void KHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url) { // the slave told us that we got redirected //kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl; @@ -3757,7 +3757,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi if ( u.isLocalFile() ) { - // TODO : use KIO::stat() and create a KFileItem out of its result, + // TODO : use TDEIO::stat() and create a KFileItem out of its result, // to use KFileItem::statusBarText() TQCString path = TQFile::encodeName( u.path() ); @@ -3932,7 +3932,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c if ( button == Qt::LeftButton && ( state & ShiftButton ) ) { - KIO::MetaData metaData; + TDEIO::MetaData metaData; metaData["referrer"] = d->m_referrer; KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData ); return false; @@ -4124,7 +4124,7 @@ KURL KHTMLPart::backgroundURL() const void KHTMLPart::slotSaveBackground() { - KIO::MetaData metaData; + TDEIO::MetaData metaData; metaData["referrer"] = d->m_referrer; KHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData ); } @@ -4136,7 +4136,7 @@ void KHTMLPart::slotSaveDocument() if ( srcURL.fileName(false).isEmpty() ) srcURL.setFileName( "index" + defaultExtension() ); - KIO::MetaData metaData; + TDEIO::MetaData metaData; // Referre unknown? KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId ); } @@ -4211,7 +4211,7 @@ void KHTMLPart::slotSaveFrame() if ( srcURL.fileName(false).isEmpty() ) srcURL.setFileName( "index" + defaultExtension() ); - KIO::MetaData metaData; + TDEIO::MetaData metaData; // Referrer unknown? KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" ); } @@ -4391,7 +4391,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const args.serviceType = child->m_serviceType; child->m_args = args; - child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload); + child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload); child->m_serviceName = TQString(); if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" )) child->m_args.metaData()["referrer"] = d->m_referrer; @@ -4518,8 +4518,8 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url if (sb) sb->setStatusBar( d->m_statusBarExtension->statusBar() ); - connect( part, TQT_SIGNAL( started( KIO::Job *) ), - this, TQT_SLOT( slotChildStarted( KIO::Job *) ) ); + connect( part, TQT_SIGNAL( started( TDEIO::Job *) ), + this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) ); connect( part, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotChildCompleted() ) ); connect( part, TQT_SIGNAL( completed(bool) ), @@ -4594,7 +4594,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url return true; } - child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload); + child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload); // make sure the part has a way to find out about the mimetype. // we actually set it in child->m_args in requestObject already, @@ -4776,9 +4776,9 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt KGuiItem(i18n("&Send Unencrypted")), "WarnOnUnencryptedForm"); // Move this setting into KSSL instead - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfigGroupSaver saver( config, grpNotifMsgs ); + TDEConfigGroupSaver saver( config, grpNotifMsgs ); if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) { config->deleteEntry("WarnOnUnencryptedForm"); @@ -5028,7 +5028,7 @@ void KHTMLPart::slotParentCompleted() } } -void KHTMLPart::slotChildStarted( KIO::Job *job ) +void KHTMLPart::slotChildStarted( TDEIO::Job *job ) { khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); @@ -5773,7 +5773,7 @@ void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p) if (!tobe.isEmpty() && d->m_jobspeed) tobe += " "; if (d->m_jobspeed) - tobe += i18n( "(%1/s)" ).arg( KIO::convertSize( d->m_jobspeed ) ); + tobe += i18n( "(%1/s)" ).arg( TDEIO::convertSize( d->m_jobspeed ) ); } tobe = ""+tobe; diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index e65a41c11..d84296f04 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -274,7 +274,7 @@ public: * verbose error description a as page, depending on the users configuration. * @p job is the job that signaled the error situation */ - virtual void showError( KIO::Job* job ); + virtual void showError( TDEIO::Job* job ); /** * Returns a reference to the DOM HTML document (for non-HTML documents, returns null) @@ -1118,7 +1118,7 @@ protected: /** * presents a detailed error message to the user. - * @p errorCode kio error code, eg KIO::ERR_SERVER_TIMEOUT. + * @p errorCode kio error code, eg TDEIO::ERR_SERVER_TIMEOUT. * @p text kio additional information text. * @p url the url that triggered the error. */ @@ -1288,11 +1288,11 @@ private slots: /** * @internal */ - void slotData( KIO::Job*, const TQByteArray &data ); + void slotData( TDEIO::Job*, const TQByteArray &data ); /** * @internal */ - void slotInfoMessage( KIO::Job*, const TQString& msg ); + void slotInfoMessage( TDEIO::Job*, const TQString& msg ); /** * @internal */ @@ -1300,7 +1300,7 @@ private slots: /** * @internal */ - void slotFinished( KIO::Job* ); + void slotFinished( TDEIO::Job* ); /** * @internal */ @@ -1312,7 +1312,7 @@ private slots: /** * @internal */ - void slotRedirection( KIO::Job*, const KURL& ); + void slotRedirection( TDEIO::Job*, const KURL& ); /** * @internal */ @@ -1405,7 +1405,7 @@ private slots: /** * @internal */ - void slotChildStarted( KIO::Job *job ); + void slotChildStarted( TDEIO::Job *job ); /** * @internal */ @@ -1451,22 +1451,22 @@ private slots: /* * @internal */ - void slotJobPercent( KIO::Job*, unsigned long ); + void slotJobPercent( TDEIO::Job*, unsigned long ); /* * @internal */ - void slotJobDone( KIO::Job* ); + void slotJobDone( TDEIO::Job* ); /* * @internal */ - void slotUserSheetStatDone( KIO::Job* ); + void slotUserSheetStatDone( TDEIO::Job* ); /* * @internal */ - void slotJobSpeed( KIO::Job*, unsigned long ); + void slotJobSpeed( TDEIO::Job*, unsigned long ); /** * @internal diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp index 90770d38f..c999562b4 100644 --- a/khtml/khtml_run.cpp +++ b/khtml/khtml_run.cpp @@ -84,7 +84,7 @@ void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename ) } // KDE4: remove -void KHTMLRun::handleError( KIO::Job *job ) +void KHTMLRun::handleError( TDEIO::Job *job ) { KParts::BrowserRun::handleError( job ); } diff --git a/khtml/khtml_run.h b/khtml/khtml_run.h index e1be45fd1..0420e91af 100644 --- a/khtml/khtml_run.h +++ b/khtml/khtml_run.h @@ -47,7 +47,7 @@ public: //KHTMLPart *htmlPart() const; protected: - virtual void handleError( KIO::Job * job ); + virtual void handleError( TDEIO::Job * job ); virtual void save( const KURL & url, const TQString & suggestedFilename ); bool askSave( const KURL & url, KService::Ptr offer, const TQString & mimeType, const TQString & suggestedFilename ); diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 5c5db7341..430271877 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -186,7 +186,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai } } -void KHTMLSettings::readDomainSettings(KConfig *config, bool reset, +void KHTMLSettings::readDomainSettings(TDEConfig *config, bool reset, bool global, KPerDomainSettings &pd_settings) { TQString jsPrefix = global ? TQString::null : TQString::fromLatin1("javascript."); @@ -289,17 +289,17 @@ bool KHTMLSettings::hoverLink() const void KHTMLSettings::init() { - KConfig global( "khtmlrc", true, false ); + TDEConfig global( "khtmlrc", true, false ); init( &global, true ); - KConfig *local = TDEGlobal::config(); + TDEConfig *local = TDEGlobal::config(); if ( !local ) return; init( local, false ); } -void KHTMLSettings::init( KConfig * config, bool reset ) +void KHTMLSettings::init( TDEConfig * config, bool reset ) { TQString group_save = config->group(); if (reset || config->hasGroup("MainView Settings")) @@ -741,7 +741,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const void KHTMLSettings::addAdFilter( const TQString &url ) { - KConfig config( "khtmlrc", false, false ); + TDEConfig config( "khtmlrc", false, false ); config.setGroup( "Filter Settings" ); TQRegExp rx; @@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled) { d->m_jsErrorsEnabled = enabled; // save it - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("HTML Settings"); config->writeEntry("ReportJSErrors", enabled); config->sync(); @@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) { d->m_jsPopupBlockerPassivePopup = enabled; // save it - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Java/JavaScript Settings"); config->writeEntry("PopupBlockerPassivePopup", enabled); config->sync(); diff --git a/khtml/khtml_settings.h b/khtml/khtml_settings.h index bb089e5a8..4d68845f7 100644 --- a/khtml/khtml_settings.h +++ b/khtml/khtml_settings.h @@ -20,7 +20,7 @@ #ifndef __konq_htmlsettings_h__ #define __konq_htmlsettings_h__ -class KConfig; +class TDEConfig; #include #include #include @@ -108,11 +108,11 @@ public: void init(); /** Read settings from @p config. - * @param config is a pointer to KConfig object. + * @param config is a pointer to TDEConfig object. * @param reset if true, settings are always set; if false, * settings are only set if the config file has a corresponding key. */ - void init( KConfig * config, bool reset = true ); + void init( TDEConfig * config, bool reset = true ); /** * Destructor. Don't delete any instance by yourself. @@ -193,13 +193,13 @@ public: /** reads from @p config's current group, forcing initialization * if @p reset is true. - * @param config is a pointer to KConfig object. + * @param config is a pointer to TDEConfig object. * @param reset true if initialization is to be forced. * @param global true if the global domain is to be read. * @param pd_settings will be initialised with the computed (inherited) * settings. */ - void readDomainSettings(KConfig *config, bool reset, + void readDomainSettings(TDEConfig *config, bool reset, bool global, KPerDomainSettings &pd_settings); TQString settingsToCSS() const; diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 4cb4bb3f1..f9593e504 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -158,7 +158,7 @@ bool KHTMLImage::openURL( const KURL &url ) DOM::DocumentImpl *impl = dynamic_cast( m_khtml->document().handle() ); // ### hack ;-) if (!impl) return false; if ( m_ext->urlArgs().reload ) - impl->docLoader()->setCachePolicy( KIO::CC_Reload ); + impl->docLoader()->setCachePolicy( TDEIO::CC_Reload ); khtml::DocLoader *dl = impl->docLoader(); m_image = dl->requestImage( m_url.url() ); @@ -232,7 +232,7 @@ void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e ) } /* -void KHTMLImage::slotImageJobFinished( KIO::Job *job ) +void KHTMLImage::slotImageJobFinished( TDEIO::Job *job ) { if ( job->error() ) { diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h index 6db0cbf5f..5f165bd8d 100644 --- a/khtml/khtmlimage.h +++ b/khtml/khtmlimage.h @@ -81,7 +81,7 @@ protected: private slots: void restoreScrollPosition(); -// void slotImageJobFinished( KIO::Job *job ); +// void slotImageJobFinished( TDEIO::Job *job ); // void updateWindowCaption(); diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h index cebee9455..f914ef296 100644 --- a/khtml/khtmlpart_p.h +++ b/khtml/khtmlpart_p.h @@ -60,7 +60,7 @@ class KURLLabel; class KJavaAppletContext; class KJSErrorDlg; -namespace KIO +namespace TDEIO { class Job; class TransferJob; @@ -198,7 +198,7 @@ public: m_job = 0L; m_bComplete = true; m_bLoadEventEmitted = true; - m_cachePolicy = KIO::CC_Verify; + m_cachePolicy = TDEIO::CC_Verify; m_manager = 0L; m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings()); m_bClearing = false; @@ -356,7 +356,7 @@ public: KHTMLSettings *m_settings; - KIO::TransferJob * m_job; + TDEIO::TransferJob * m_job; TQString m_statusBarText[3]; unsigned long m_jobspeed; @@ -387,7 +387,7 @@ public: KURL m_workingURL; - KIO::CacheControl m_cachePolicy; + TDEIO::CacheControl m_cachePolicy; TQTimer m_redirectionTimer; TQTime m_parsetime; int m_delayRedirect; diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 411d03f2e..4a5c7cf2d 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -994,8 +994,8 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) bool hasHorBar = visibleWidth() < contentsWidth(); bool hasVerBar = visibleHeight() < contentsHeight(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "HTML Settings" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "HTML Settings" ); if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) { d->m_mouseScrollIndicator->show(); d->m_mouseScrollIndicator->unsetCursor(); @@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20; void KHTMLView::scrollBy(int dx, int dy) { - KConfigGroup cfg( TDEGlobal::config(), "KDE" ); + TDEConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", false )) { TQScrollView::scrollBy( dx, dy ); return; diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 65be07e83..32c514f1b 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -163,14 +163,14 @@ bool KMultiPart::openURL( const KURL &url ) // Hmm, args.reload is set to true when reloading, but this doesn't seem to be enough... // I get "HOLD: Reusing held slave for ", and the old data - m_job = KIO::get( url, args.reload, false ); + m_job = TDEIO::get( url, args.reload, false ); emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage - connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotJobFinished( KIO::Job * ) ) ); - connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) ); + connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); m_numberOfFrames = 0; m_numberOfFramesSkipped = 0; @@ -184,7 +184,7 @@ bool KMultiPart::openURL( const KURL &url ) // Yes, libtdenetwork's has such a parser already (MultiPart), // but it works on the complete string, expecting the whole data to be available.... // The version here is asynchronous. -void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) +void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data ) { if (m_boundary.isNull()) { @@ -533,7 +533,7 @@ void KMultiPart::guiActivateEvent( KParts::GUIActivateEvent * ) // m_part->guiActivateEvent( e ); } -void KMultiPart::slotJobFinished( KIO::Job *job ) +void KMultiPart::slotJobFinished( TDEIO::Job *job ) { if ( job->error() ) { diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index 7ba5ba2fe..1e6f83620 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -62,8 +62,8 @@ protected: private slots: void reallySendData( const TQByteArray& line ); //void slotPopupMenu( KXMLGUIClient *cl, const TQPoint &pos, const KURL &u, const TQString &mime, mode_t mode ); - void slotJobFinished( KIO::Job *job ); - void slotData( KIO::Job *, const TQByteArray & ); + void slotJobFinished( TDEIO::Job *job ); + void slotData( TDEIO::Job *, const TQByteArray & ); //void updateWindowCaption(); void slotPartCompleted(); @@ -77,7 +77,7 @@ private: TQGuardedPtr m_part; bool m_isHTMLPart; bool m_partIsLoading; - KIO::Job* m_job; + TDEIO::Job* m_job; TQCString m_boundary; int m_boundaryLength; TQString m_mimeType; // the one handled by m_part - store the kservice instead? diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp index f155008ee..b953f34fb 100644 --- a/khtml/misc/knsplugininstaller.cpp +++ b/khtml/misc/knsplugininstaller.cpp @@ -102,7 +102,7 @@ bool KNSPluginInstallEngine::isActive() { // check if we have a configuration key in the kde registry TQString pluginsListFile; - KConfig cfg("kcmnspluginrc", true); + TDEConfig cfg("kcmnspluginrc", true); cfg.setGroup("Misc"); pluginsListFile = cfg.readPathEntry("PluginsListFile"); return !pluginsListFile.isEmpty(); @@ -117,7 +117,7 @@ const TQValueList& KNSPluginInstallEngine::pluginList() const bool KNSPluginInstallEngine::loadConfig() { TQString pluginsListFile; - KConfig cfg("kcmnspluginrc", true); + TDEConfig cfg("kcmnspluginrc", true); cfg.setGroup("Misc"); pluginsListFile = cfg.readPathEntry("PluginsListFile"); if(!pluginsListFile.isEmpty()) @@ -136,7 +136,7 @@ bool KNSPluginInstallEngine::loadXmlConfig() if(m_pluginsXmlConfig.isEmpty()) { TQString tmpFile; - if(KIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) { + if(TDEIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) { TQFile f(tmpFile); if(!f.open(IO_ReadOnly)) return false; @@ -144,7 +144,7 @@ bool KNSPluginInstallEngine::loadXmlConfig() stream.setEncoding(TQTextStream::UnicodeUTF8); m_pluginsXmlConfig = stream.read(); f.close(); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } else return false; } @@ -232,20 +232,20 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info) tempFile.unlink(); tempFile.close(); // start the download job - m_downloadJob = KIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false ); + m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false ); // connect signals - connect(m_downloadJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(KIO::Job *, unsigned long))); - connect(m_downloadJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDownloadResult(KIO::Job *)) ); + connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long))); + connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) ); kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl; } -void KNSPluginInstallEngine::slotDownLoadProgress(KIO::Job *, unsigned long percent) +void KNSPluginInstallEngine::slotDownLoadProgress(TDEIO::Job *, unsigned long percent) { // propagate the download progression emit installProgress( ((int)percent)/3 ); } -void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job) +void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job) { // test if the download job suceed if(job->error()) { @@ -279,9 +279,9 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job) for( it = pluginFileList.begin(); it != pluginFileList.end(); ++it ) { urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) ); } - m_installFileJob = KIO::copy(urlList , destURL, false ); - connect(m_installFileJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(KIO::Job *, unsigned long))); - connect(m_installFileJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotCopyResult(KIO::Job *)) ); + m_installFileJob = TDEIO::copy(urlList , destURL, false ); + connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long))); + connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) ); } kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl; @@ -289,13 +289,13 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job) m_downloadJob = NULL; } -void KNSPluginInstallEngine::slotCopyProgress(KIO::Job *, unsigned long percent) +void KNSPluginInstallEngine::slotCopyProgress(TDEIO::Job *, unsigned long percent) { // propagate the download progression emit installProgress( ((int)percent)/3 + 33 ); } -void KNSPluginInstallEngine::slotCopyResult(KIO::Job *job) +void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job) { // test if the download job suceed if(job->error()) { @@ -501,14 +501,14 @@ void KNSPluginWizard::showPage(TQWidget *page) TQString tmpFile; if(info.licenceURL().isValid()) // retrieve the licence if we have an url - if(KIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) { + if(TDEIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) { TQFile f(tmpFile); if(f.open(IO_ReadOnly)) { TQTextStream stream(&f); stream.setEncoding(TQTextStream::UnicodeUTF8); licence = stream.read(); f.close(); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } } // else display the licence found in the xml config diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h index 0910a685b..240202468 100644 --- a/khtml/misc/knsplugininstaller.h +++ b/khtml/misc/knsplugininstaller.h @@ -138,8 +138,8 @@ private: KMimeType::Ptr m_mime; KURL m_pluginsListFileURL; TQString m_tmpPluginFileName; - KIO::CopyJob *m_downloadJob; - KIO::CopyJob *m_installFileJob; + TDEIO::CopyJob *m_downloadJob; + TDEIO::CopyJob *m_installFileJob; KNSPluginInfo m_toInstallPluginInfo; TQProcess *m_scanProc; @@ -151,12 +151,12 @@ signals: private slots: // Used to monitor the plugin downloading - void slotDownLoadProgress(KIO::Job *job, unsigned long percent); - void slotDownloadResult(KIO::Job *job); + void slotDownLoadProgress(TDEIO::Job *job, unsigned long percent); + void slotDownloadResult(TDEIO::Job *job); // Used to monitor the plugin installation - void slotCopyProgress(KIO::Job *job, unsigned long percent); - void slotCopyResult(KIO::Job *job); + void slotCopyProgress(TDEIO::Job *job, unsigned long percent); + void slotCopyResult(TDEIO::Job *job); // Used to monitor the plugins scan void readScanProcFromStdout(); diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index b9400f229..79a8c2148 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -208,7 +208,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte // ------------------------------------------------------------------------------------------- -CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, +CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char *accept) : CachedObject(url, CSSStyleSheet, _cachePolicy, 0) { @@ -227,7 +227,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI } CachedCSSStyleSheet::CachedCSSStyleSheet(const DOMString &url, const TQString &stylesheet_data) - : CachedObject(url, CSSStyleSheet, KIO::CC_Verify, stylesheet_data.length()) + : CachedObject(url, CSSStyleSheet, TDEIO::CC_Verify, stylesheet_data.length()) { m_loading = false; m_status = Persistent; @@ -321,7 +321,7 @@ TQString CachedCSSStyleSheet::checkCharset(const TQByteArray& buffer ) const // ------------------------------------------------------------------------------------------- -CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*) +CachedScript::CachedScript(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*) : CachedObject(url, Script, _cachePolicy, 0) { // It's javascript we want. @@ -334,7 +334,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro } CachedScript::CachedScript(const DOMString &url, const TQString &script_data) - : CachedObject(url, Script, KIO::CC_Verify, script_data.length()) + : CachedObject(url, Script, TDEIO::CC_Verify, script_data.length()) { m_loading = false; m_status = Persistent; @@ -466,7 +466,7 @@ static TQString buildAcceptHeader() // ------------------------------------------------------------------------------------- -CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*) +CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*) : TQObject(), CachedObject(url, Image, _cachePolicy, 0) { static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() ); @@ -943,7 +943,7 @@ Request::~Request() DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc) { - m_cachePolicy = KIO::CC_Verify; + m_cachePolicy = TDEIO::CC_Verify; m_expireDate = 0; m_creationDate = time(0); m_bautoloadImages = true; @@ -991,7 +991,7 @@ void DocLoader::insertCachedObject( CachedObject* o ) const bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL) { bool reload = false; - if (m_cachePolicy == KIO::CC_Verify) + if (m_cachePolicy == TDEIO::CC_Verify) { if (!m_reloadedURLs.contains(fullURL)) { @@ -1003,7 +1003,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL) } } } - else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh)) + else if ((m_cachePolicy == TDEIO::CC_Reload) || (m_cachePolicy == TDEIO::CC_Refresh)) { if (!m_reloadedURLs.contains(fullURL)) { @@ -1153,9 +1153,9 @@ void Loader::servePendingRequests() #endif KURL u(req->object->url().string()); - KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/); + TDEIO::TransferJob* job = TDEIO::get( u, false, false /*no GUI*/); - job->addMetaData("cache", KIO::getCacheControlString(req->object->cachePolicy())); + job->addMetaData("cache", TDEIO::getCacheControlString(req->object->cachePolicy())); if (!req->object->accept().isEmpty()) job->addMetaData("accept", req->object->accept()); if ( req->m_docLoader ) @@ -1171,21 +1171,21 @@ void Loader::servePendingRequests() } } - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( KIO::Job*, const TQByteArray &))); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); if ( req->object->schedule() ) - KIO::Scheduler::scheduleJob( job ); + TDEIO::Scheduler::scheduleJob( job ); m_requestsLoading.insert(job, req); } } -void Loader::slotFinished( KIO::Job* job ) +void Loader::slotFinished( TDEIO::Job* job ) { Request *r = m_requestsLoading.take( job ); - KIO::TransferJob* j = static_cast(job); + TDEIO::TransferJob* j = static_cast(job); if ( !r ) return; @@ -1247,7 +1247,7 @@ void Loader::slotFinished( KIO::Job* job ) m_timer.start(0, true); } -void Loader::slotData( KIO::Job*job, const TQByteArray &data ) +void Loader::slotData( TDEIO::Job*job, const TQByteArray &data ) { Request *r = m_requestsLoading[job]; if(!r) { @@ -1303,7 +1303,7 @@ void Loader::cancelRequests( DocLoader* dl ) if ( lIt.current()->m_docLoader == dl ) { //kdDebug( 6060 ) << "canceling loading request for " << lIt.current()->object->url().string() << endl; - KIO::Job *job = static_cast( lIt.currentKey() ); + TDEIO::Job *job = static_cast( lIt.currentKey() ); Cache::removeCacheEntry( lIt.current()->object ); m_requestsLoading.remove( lIt.currentKey() ); job->kill(); @@ -1314,7 +1314,7 @@ void Loader::cancelRequests( DocLoader* dl ) } } -KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const +TDEIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const { TQPtrDictIterator it( m_requestsLoading ); @@ -1323,7 +1323,7 @@ KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const CachedObject *obj = it.current()->object; if ( obj && obj->url() == url ) - return static_cast( it.currentKey() ); + return static_cast( it.currentKey() ); } return 0; @@ -1424,7 +1424,7 @@ void Cache::clear() template CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const char* accept ) { - KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify; + TDEIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : TDEIO::CC_Verify; TQString url = kurl.url(); CachedObject* o = cache->find(url); diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h index e950f1767..833b98b84 100644 --- a/khtml/misc/loader.h +++ b/khtml/misc/loader.h @@ -57,7 +57,7 @@ class TQMovie; class KHTMLPart; -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } @@ -99,7 +99,7 @@ namespace khtml Cached // regular case }; - CachedObject(const DOM::DOMString &url, Type type, KIO::CacheControl _cachePolicy, int size) + CachedObject(const DOM::DOMString &url, Type type, TDEIO::CacheControl _cachePolicy, int size) : m_url(url), m_type(type), m_cachePolicy(_cachePolicy), m_expireDate(0), m_size(size) { @@ -140,7 +140,7 @@ namespace khtml bool free() const { return m_free; } - KIO::CacheControl cachePolicy() const { return m_cachePolicy; } + TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; } void setRequest(Request *_request); @@ -169,7 +169,7 @@ namespace khtml Type m_type; Status m_status; int m_accessCount; - KIO::CacheControl m_cachePolicy; + TDEIO::CacheControl m_cachePolicy; time_t m_expireDate; int m_size; bool m_deleted : 1; @@ -195,7 +195,7 @@ namespace khtml class CachedCSSStyleSheet : public CachedObject { public: - CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, + CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char *accept); CachedCSSStyleSheet(const DOM::DOMString &url, const TQString &stylesheet_data); @@ -226,7 +226,7 @@ namespace khtml class CachedScript : public CachedObject { public: - CachedScript(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept ); + CachedScript(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept ); CachedScript(const DOM::DOMString &url, const TQString &script_data); const DOM::DOMString &script() const { return m_script; } @@ -257,7 +257,7 @@ namespace khtml { Q_OBJECT public: - CachedImage(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept); + CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept); virtual ~CachedImage(); const TQPixmap &pixmap() const; @@ -354,7 +354,7 @@ namespace khtml CachedScript *requestScript( const DOM::DOMString &url, const TQString& charset); bool autoloadImages() const { return m_bautoloadImages; } - KIO::CacheControl cachePolicy() const { return m_cachePolicy; } + TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; } KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; } time_t expireDate() const { return m_expireDate; } KHTMLPart* part() const { return m_part; } @@ -363,7 +363,7 @@ namespace khtml void setCacheCreationDate( time_t ); void setExpireDate( time_t, bool relative ); void setAutoloadImages( bool ); - void setCachePolicy( KIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; } + void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; } void setShowAnimations( KHTMLSettings::KAnimationAdvice ); void pauseAnimations(); void resumeAnimations(); @@ -381,7 +381,7 @@ namespace khtml mutable TQPtrDict m_docObjects; time_t m_expireDate; time_t m_creationDate; - KIO::CacheControl m_cachePolicy; + TDEIO::CacheControl m_cachePolicy; bool m_bautoloadImages : 1; KHTMLSettings::KAnimationAdvice m_showAnimations : 2; KHTMLPart* m_part; @@ -418,7 +418,7 @@ namespace khtml void cancelRequests( DocLoader* dl ); // may return 0L - KIO::Job *jobForRequest( const DOM::DOMString &url ) const; + TDEIO::Job *jobForRequest( const DOM::DOMString &url ) const; signals: void requestStarted( khtml::DocLoader* dl, khtml::CachedObject* obj ); @@ -426,8 +426,8 @@ namespace khtml void requestFailed( khtml::DocLoader* dl, khtml::CachedObject *obj ); protected slots: - void slotFinished( KIO::Job * ); - void slotData( KIO::Job *, const TQByteArray & ); + void slotFinished( TDEIO::Job * ); + void slotData( TDEIO::Job *, const TQByteArray & ); void servePendingRequests(); protected: diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 62785e204..172e63e4a 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -521,7 +521,7 @@ int main(int argc, char *argv[]) a.config()->writeEntry( "kjscupguard_alarmhandler", true ); a.config()->setGroup("HTML Settings"); a.config()->writeEntry("ReportJSErrors", false); - KConfig cfg( "khtmlrc" ); + TDEConfig cfg( "khtmlrc" ); cfg.setGroup("HTML Settings"); cfg.writeEntry( "StandardFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ); cfg.writeEntry( "FixedFont", HTML_DEFAULT_VIEW_FIXED_FONT ); diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index ba5bf063f..e0135d091 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) void Dummy::doBenchmark() { - KConfigGroup settings(TDEGlobal::config(), "bench"); + TDEConfigGroup settings(TDEGlobal::config(), "bench"); results.clear(); TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 3a277ecf5..ff206a1cc 100644 --- a/khtml/xml/dom_docimpl.cpp +++ b/khtml/xml/dom_docimpl.cpp @@ -1718,7 +1718,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con KURL url = v->part()->url(); if ((str == "no-cache") && url.protocol().startsWith("http")) { - KIO::http_update_cache(url, true, 0); + TDEIO::http_update_cache(url, true, 0); } } else if( (strcasecmp(equiv, "set-cookie") == 0)) @@ -2491,7 +2491,7 @@ void DocumentImpl::error(int err, const TQString &text) int exceptioncode = 0; EventImpl *evt = new EventImpl(EventImpl::ERROR_EVENT,false,false); if (err != 0) - evt->setMessage(KIO::buildErrorString(err,text)); + evt->setMessage(TDEIO::buildErrorString(err,text)); else evt->setMessage(text); evt->ref(); diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index 4e8b6c784..3fe0825a4 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -102,7 +102,7 @@ static bool startCondition(const TQString &condition) if (list[0].isEmpty() || list[2].isEmpty()) return true; - KConfig config(list[0], true, false); + TDEConfig config(list[0], true, false); if (!list[1].isEmpty()) config.setGroup(list[1]); diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp index 470e7faba..b74417c3f 100644 --- a/kinit/kdostartupconfig.cpp +++ b/kinit/kdostartupconfig.cpp @@ -95,7 +95,7 @@ int main() return 6; if( group.left( 1 ) == "[" && group.right( 1 ) == "]" ) { // whole config group - KConfig cfg( file ); + TDEConfig cfg( file ); group = group.mid( 1, group.length() - 2 ); TQMap< TQString, TQString > entries = cfg.entryMap( group ); startupconfig << "# " << line << "\n"; @@ -115,7 +115,7 @@ int main() { // a single key if( key.isEmpty()) return 7; - KConfig cfg( file ); + TDEConfig cfg( file ); cfg.setGroup( group ); TQString value = cfg.readEntry( key, def ); startupconfig << "# " << line << "\n"; diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index d7e7c7e1c..1f65658d9 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -171,7 +171,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err ); extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); } /* These are to link libkio even if 'smart' linker is used */ #include -extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); } +extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); } /* * Close fd's which are only useful for the parent process. @@ -1758,7 +1758,7 @@ int main(int argc, char **argv, char **envp) 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, + // (do it only after tdeinit_library_path, that one indirectly uses TDEConfig, // which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance) TDEGlobal::_instance = 0L; // don't change envvars before tdeinit_initsetproctitle() diff --git a/kinit/kioslave.cpp b/kinit/kioslave.cpp index f132abb0d..0cb77db02 100644 --- a/kinit/kioslave.cpp +++ b/kinit/kioslave.cpp @@ -49,7 +49,7 @@ /* These are to link libkio even if 'smart' linker is used */ #include -extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); } +extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); } int main(int argc, char **argv) { diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 3f5510ea0..8c66789e7 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -61,12 +61,12 @@ // Dispose slaves after being idle for SLAVE_MAX_IDLE seconds #define SLAVE_MAX_IDLE 30 -using namespace KIO; +using namespace TDEIO; template class TQPtrList; template class TQPtrList; -IdleSlave::IdleSlave(KSocket *socket) +IdleSlave::IdleSlave(TDESocket *socket) { mConn.init(socket); mConn.connect(this, TQT_SLOT(gotInput())); @@ -194,9 +194,9 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) domainname.close(); domainname.unlink(); #endif - mPoolSocket = new KServerSocket(static_cast(TQFile::encodeName(mPoolSocketName))); - connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)), - TQT_SLOT(acceptSlave(KSocket *))); + mPoolSocket = new TDEServerSocket(static_cast(TQFile::encodeName(mPoolSocketName))); + connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)), + TQT_SLOT(acceptSlave(TDESocket *))); connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout())); @@ -1353,7 +1353,7 @@ KLauncher::waitForSlave(pid_t pid) } void -KLauncher::acceptSlave(KSocket *slaveSocket) +KLauncher::acceptSlave(TDESocket *slaveSocket) { IdleSlave *slave = new IdleSlave(slaveSocket); // Send it a SLAVE_STATUS command. diff --git a/kinit/klauncher.h b/kinit/klauncher.h index 8058bb31e..37b10f059 100644 --- a/kinit/klauncher.h +++ b/kinit/klauncher.h @@ -43,7 +43,7 @@ class IdleSlave : public TQObject { Q_OBJECT public: - IdleSlave(KSocket *socket); + IdleSlave(TDESocket *socket); bool match( const TQString &protocol, const TQString &host, bool connected); void connect( const TQString &app_socket); pid_t pid() const { return mPid;} @@ -59,7 +59,7 @@ protected slots: void gotInput(); protected: - KIO::Connection mConn; + TDEIO::Connection mConn; TQString mProtocol; TQString mHost; bool mConnected; @@ -169,7 +169,7 @@ public slots: void slotKDEInitData(int); void slotAppRegistered(const TQCString &appId); void slotSlaveStatus(IdleSlave *); - void acceptSlave( KSocket *); + void acceptSlave( TDESocket *); void slotSlaveGone(); void idleTimeout(); @@ -182,7 +182,7 @@ protected: KLaunchRequest *lastRequest; TQPtrList mSlaveWaitRequest; TQString mPoolSocketName; - KServerSocket *mPoolSocket; + TDEServerSocket *mPoolSocket; TQPtrList mSlaveList; TQTimer mTimer; TQTimer mAutoTimer; diff --git a/kio/DESIGN b/kio/DESIGN index c84bd2182..08617bbda 100644 --- a/kio/DESIGN +++ b/kio/DESIGN @@ -190,7 +190,7 @@ B. customized progress dialogs This will be similar to what we had before. - ProgressBase class that all other dialogs will inherit. - will contain an initialization method setJob( KIO::Job*) for apps of the + will contain an initialization method setJob( TDEIO::Job*) for apps of the second class (see A.2 above), that will connect job's signals to dialog's slots diff --git a/kio/DESIGN.metadata b/kio/DESIGN.metadata index 9890c961d..783d7f52a 100644 --- a/kio/DESIGN.metadata +++ b/kio/DESIGN.metadata @@ -132,11 +132,11 @@ DefaultRemoteProtocol string Protocol to redirect file:/// URLs to, de Examples: E.g. the following disables cookies: -job = KIO::get( KURL("http://www.kde.org"), false, false); +job = TDEIO::get( KURL("http://www.kde.org"), false, false); job->addMetaData("cookies", "none"); If you want to handle cookies yourself, you can do: -job = KIO::get( KURL("http://www.kde.org"), false, false); +job = TDEIO::get( KURL("http://www.kde.org"), false, false); job->addMetaData("cookies", "manual"); job->addMetaData("setcookies", "Cookie: foo=bar; gnat=gnork"); diff --git a/kio/Mainpage.dox b/kio/Mainpage.dox index bb7f2796f..7545c29ef 100644 --- a/kio/Mainpage.dox +++ b/kio/Mainpage.dox @@ -6,8 +6,8 @@ * this to provide its network-enabled file management. * * The easiest way to use this library from a %Trinity application is via the - * KIO::NetAccess class (for easy synchronous access) or via the - * KIO::Job class (for more complex asynchronous jobs). + * TDEIO::NetAccess class (for easy synchronous access) or via the + * TDEIO::Job class (for more complex asynchronous jobs). * * This library also implements the System Configuration Cache (KSycoca). * @@ -44,7 +44,7 @@ * view based on KIconView. Additionally, there are some compound views, * like a view using the icon-view for files on the right side and another * view for directories on the left. A view, that shows a preview for the - * currently selected file (using KIO::PreviewJob to generate previews) + * currently selected file (using TDEIO::PreviewJob to generate previews) * and any other view to show the files is also available. * * All those views share a common baseclass, named KFileView, which diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc index 49999e675..ac0d29b97 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.cc +++ b/kio/bookmarks/kbookmarkimporter_kde1.cc @@ -81,8 +81,8 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & parentElem.appendChild( groupElem ); TQDomElement textElem = m_pDoc->createElement( "title" ); groupElem.appendChild( textElem ); - textElem.appendChild( m_pDoc->createTextNode( KIO::decodeFileName( ep->d_name ) ) ); - if ( KIO::decodeFileName( ep->d_name ) == "Toolbar" ) + textElem.appendChild( m_pDoc->createTextNode( TDEIO::decodeFileName( ep->d_name ) ) ); + if ( TDEIO::decodeFileName( ep->d_name ) == "Toolbar" ) groupElem.setAttribute("toolbar","yes"); scanIntern( groupElem, file.path() ); } @@ -136,7 +136,7 @@ void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _tex if (icon.right( 4 ) == ".xpm" ) // prevent warnings icon.truncate( icon.length() - 4 ); - TQString text = KIO::decodeFileName( TQString::fromLocal8Bit(_text) ); + TQString text = TDEIO::decodeFileName( TQString::fromLocal8Bit(_text) ); if ( text.length() > 8 && text.right( 8 ) == ".desktop" ) text.truncate( text.length() - 8 ); if ( text.length() > 7 && text.right( 7 ) == ".kdelnk" ) diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 9e6d711d2..a87e0f20e 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -702,7 +702,7 @@ KBookmarkSettings* KBookmarkSettings::s_self = 0; void KBookmarkSettings::readSettings() { - KConfig config("kbookmarkrc", false, false); + TDEConfig config("kbookmarkrc", false, false); config.setGroup("Bookmarks"); // add bookmark dialog usage - no reparse diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index 20ce42a86..5e85bc1f6 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -1099,7 +1099,7 @@ void KBookmarkMenuNSImporter::endFolder() KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &id ) { - KConfig config("kbookmarkrc", false, false); + TDEConfig config("kbookmarkrc", false, false); config.setGroup("Bookmarks"); DynMenuInfo info; @@ -1131,7 +1131,7 @@ KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString & TQStringList KBookmarkMenu::dynamicBookmarksList() { - KConfig config("kbookmarkrc", false, false); + TDEConfig config("kbookmarkrc", false, false); config.setGroup("Bookmarks"); TQStringList mlist; @@ -1145,7 +1145,7 @@ TQStringList KBookmarkMenu::dynamicBookmarksList() void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &newMenu) { - KConfig config("kbookmarkrc", false, false); + TDEConfig config("kbookmarkrc", false, false); // add group unconditionally config.setGroup("DynamicMenu-" + id); diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index fa0368b68..b54398a02 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -50,7 +50,7 @@ class KBookmarkOwner; class KBookmarkMenu; class KPopupMenu; -namespace KIO { class Job; } +namespace TDEIO { class Job; } /** * This class provides a bookmark menu. It is typically used in diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc index 6a5a1346c..0f2adf20a 100644 --- a/kio/httpfilter/httpfilter.cc +++ b/kio/httpfilter/httpfilter.cc @@ -275,7 +275,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d) } } if (!bHasFinished) - emit error( KIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost.")); + emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost.")); return; } if (bHasFinished) @@ -332,7 +332,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d) int result = inflate( &zstr, Z_NO_FLUSH ); if ((result != Z_OK) && (result != Z_STREAM_END)) { - emit error( KIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data.")); + emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data.")); break; } int bytesOut = 8192 - zstr.avail_out; diff --git a/kio/kcmodule.desktop b/kio/kcmodule.desktop index c3ab78532..5cbe9b786 100644 --- a/kio/kcmodule.desktop +++ b/kio/kcmodule.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-TDE-ServiceType=KCModule +X-TDE-ServiceType=TDECModule Name=TDE Control Module Name[af]=TDE Beheer Module Name[ar]=وحدة تحكم كيدي diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp index 8ba9d29bb..3f199fb92 100644 --- a/kio/kfile/kcombiview.cpp +++ b/kio/kfile/kcombiview.cpp @@ -305,14 +305,14 @@ KFileView *KCombiView::focusView( KFileView *preferred ) const return (preferred && w == preferred->widget()) ? preferred : other; } -void KCombiView::readConfig( KConfig *config, const TQString& group ) +void KCombiView::readConfig( TDEConfig *config, const TQString& group ) { left->readConfig( config, group ); if ( right ) right->readConfig( config, group ); } -void KCombiView::writeConfig( KConfig *config, const TQString& group ) +void KCombiView::writeConfig( TDEConfig *config, const TQString& group ) { left->writeConfig( config, group ); if ( right ) diff --git a/kio/kfile/kcombiview.h b/kio/kfile/kcombiview.h index 6186ab740..2747c51ad 100644 --- a/kio/kfile/kcombiview.h +++ b/kio/kfile/kcombiview.h @@ -93,8 +93,8 @@ public: virtual void setSorting( TQDir::SortSpec sort ); - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); void ensureItemVisible( const KFileItem * ); diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index 1c762bfb9..2049860d1 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -119,7 +119,7 @@ void KCustomMenuEditor::refreshButton() } void -KCustomMenuEditor::load(KConfigBase *cfg) +KCustomMenuEditor::load(TDEConfigBase *cfg) { cfg->setGroup(TQString::null); int count = cfg->readNumEntry("NrOfItems"); @@ -147,7 +147,7 @@ KCustomMenuEditor::load(KConfigBase *cfg) } void -KCustomMenuEditor::save(KConfigBase *cfg) +KCustomMenuEditor::save(TDEConfigBase *cfg) { // First clear the whole config file. TQStringList groups = cfg->groupList(); diff --git a/kio/kfile/kcustommenueditor.h b/kio/kfile/kcustommenueditor.h index cc20c6204..9112780b0 100644 --- a/kio/kfile/kcustommenueditor.h +++ b/kio/kfile/kcustommenueditor.h @@ -22,7 +22,7 @@ #include class KListView; -class KConfigBase; +class TDEConfigBase; /* * Dialog for editing custom menus. @@ -42,12 +42,12 @@ public: /** * load the custom menu */ - void load(KConfigBase *); + void load(TDEConfigBase *); /** * save the custom menu */ - void save(KConfigBase *); + void save(TDEConfigBase *); public slots: void slotNewItem(); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index 0f2e9f4e1..1b7e11356 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -90,7 +90,7 @@ public: KActionSeparator *viewActionSeparator; int dropOptions; - KConfig *config; + TDEConfig *config; TQString configGroup; }; @@ -388,13 +388,13 @@ void KDirOperator::mkdir() TQString where = url().pathOrURL(); TQString name = i18n( "New Folder" ); if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() ) - name = KIO::RenameDlg::suggestName( url(), name ); + name = TDEIO::RenameDlg::suggestName( url(), name ); TQString dir = KInputDialog::getText( i18n( "New Folder" ), i18n( "Create new folder in:\n%1" ).arg( where ), name, &ok, this); if (ok) - mkdir( KIO::encodeFileName( dir ), true ); + mkdir( TDEIO::encodeFileName( dir ), true ); } bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) @@ -413,8 +413,8 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) for ( ; it != dirs.end(); ++it ) { url.addPath( *it ); - exists = KIO::NetAccess::exists( url, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() ); + exists = TDEIO::NetAccess::exists( url, false, 0 ); + writeOk = !exists && TDEIO::NetAccess::mkdir( url, topLevelWidget() ); } if ( exists ) // url was already existant @@ -433,13 +433,13 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) return writeOk; } -KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, +TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items, bool ask, bool showProgress ) { return del( items, this, ask, showProgress ); } -KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, +TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items, TQWidget *parent, bool ask, bool showProgress ) { @@ -483,7 +483,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, } if ( doIt ) { - KIO::DeleteJob *job = KIO::del( urls, false, showProgress ); + TDEIO::DeleteJob *job = TDEIO::del( urls, false, showProgress ); job->setWindow (topLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; @@ -502,7 +502,7 @@ void KDirOperator::deleteSelected() del( *list ); } -KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, +TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items, TQWidget *parent, bool ask, bool showProgress ) { @@ -546,7 +546,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, } if ( doIt ) { - KIO::CopyJob *job = KIO::trash( urls, showProgress ); + TDEIO::CopyJob *job = TDEIO::trash( urls, showProgress ); job->setWindow (topLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; @@ -718,7 +718,7 @@ void KDirOperator::pathChanged() // it may be, that we weren't ready at this time TQApplication::restoreOverrideCursor(); - // when KIO::Job emits finished, the slot will restore the cursor + // when TDEIO::Job emits finished, the slot will restore the cursor TQApplication::setOverrideCursor( tqwaitCursor ); if ( !isReadable( currUrl )) { @@ -812,8 +812,8 @@ bool KDirOperator::checkPreviewSupport() KToggleAction *previewAction = static_cast( myActionCollection->action( "preview" )); bool hasPreviewSupport = false; - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver cs( kc, ConfigGroup ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver cs( kc, ConfigGroup ); if ( kc->readBoolEntry( "Show Default Preview", true ) ) hasPreviewSupport = checkPreviewInternal(); @@ -823,7 +823,7 @@ bool KDirOperator::checkPreviewSupport() bool KDirOperator::checkPreviewInternal() const { - TQStringList supported = KIO::PreviewJob::supportedMimeTypes(); + TQStringList supported = TDEIO::PreviewJob::supportedMimeTypes(); // no preview support for directories? if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 ) return false; @@ -1385,8 +1385,8 @@ void KDirOperator::setupMenu(int whichActions) actionMenu->insert( mkdirAction ); if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); - KConfig *globalconfig = TDEGlobal::config(); - KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); + TDEConfig *globalconfig = TDEGlobal::config(); + TDEConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); @@ -1439,7 +1439,7 @@ void KDirOperator::updateViewActions() detailedAction->setChecked( KFile::isDetailView( fv )); } -void KDirOperator::readConfig( KConfig *kc, const TQString& group ) +void KDirOperator::readConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1495,7 +1495,7 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group ) kc->setGroup( oldGroup ); } -void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) +void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1718,13 +1718,13 @@ void KDirOperator::slotRefreshItems( const KFileItemList& items ) m_fileView->updateView( it.current() ); } -void KDirOperator::setViewConfig( KConfig *config, const TQString& group ) +void KDirOperator::setViewConfig( TDEConfig *config, const TQString& group ) { d->config = config; d->configGroup = group; } -KConfig * KDirOperator::viewConfig() +TDEConfig * KDirOperator::viewConfig() { return d->config; } diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index e644f7b98..73798b92c 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -41,7 +41,7 @@ class KActionSeparator; class KActionMenu; class TQWidgetStack; class KProgress; -namespace KIO { +namespace TDEIO { class CopyJob; class DeleteJob; } @@ -60,7 +60,7 @@ namespace KIO { * show either a simple or detailed view and additionally a preview widget * (see setPreviewWidget()). KImageFilePreview is one implementation * of a preview widget, that displays previews for all supported filetypes - * utilizing KIO::PreviewJob. + * utilizing TDEIO::PreviewJob. * * Currently, those classes don't support Drag&Drop out of the box -- there * you have to use your own view-classes. You can use some DnD-aware views @@ -407,16 +407,16 @@ class KIO_EXPORT KDirOperator : public TQWidget * @since 3.1 */ // ### KDE4: make virtual - void setViewConfig( KConfig *config, const TQString& group ); + void setViewConfig( TDEConfig *config, const TQString& group ); /** - * Returns the KConfig object used for saving and restoring view's + * Returns the TDEConfig object used for saving and restoring view's * configuration. - * @returns the KConfig object used for saving and restoring view's + * @returns the TDEConfig object used for saving and restoring view's * configuration. * @since 3.1 */ - KConfig *viewConfig(); + TDEConfig *viewConfig(); /** * Returns the group name used for saving and restoring view's @@ -440,7 +440,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @see setViewConfig * @see writeConfig */ - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); /** * Saves the current settings like sorting, simple or detailed view. @@ -448,7 +448,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @see readConfig * @see setViewConfig */ - virtual void writeConfig( KConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null ); /** @@ -482,18 +482,18 @@ class KIO_EXPORT KDirOperator : public TQWidget bool mkdir( const TQString& directory, bool enterDirectory = true ); /** - * Starts and returns a KIO::DeleteJob to delete the given @p items. + * Starts and returns a TDEIO::DeleteJob to delete the given @p items. * * @param items the list of items to be deleted * @param ask specifies whether a confirmation dialog should be shown * @param showProgress passed to the DeleteJob to show a progress dialog */ // ### KDE4: make virtual - KIO::DeleteJob * del( const KFileItemList& items, + TDEIO::DeleteJob * del( const KFileItemList& items, bool ask = true, bool showProgress = true ); /** - * Starts and returns a KIO::DeleteJob to delete the given @p items. + * Starts and returns a TDEIO::DeleteJob to delete the given @p items. * * @param items the list of items to be deleted * @param parent the parent widget used for the confirmation dialog @@ -502,7 +502,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @since 3.1 */ // ### KDE4: make virtual - KIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent, + TDEIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent, bool ask = true, bool showProgress = true ); /** @@ -563,7 +563,7 @@ class KIO_EXPORT KDirOperator : public TQWidget void setDropOptions(int options); /** - * Starts and returns a KIO::CopyJob to trash the given @p items. + * Starts and returns a TDEIO::CopyJob to trash the given @p items. * * @param items the list of items to be trashed * @param parent the parent widget used for the confirmation dialog @@ -572,7 +572,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @since 3.4 */ // ### KDE4: make virtual - KIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent, + TDEIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent, bool ask = true, bool showProgress = true ); protected: @@ -634,7 +634,7 @@ protected: void prepareCompletionObjects(); /** - * Checks if there support from KIO::PreviewJob for the currently + * Checks if there support from TDEIO::PreviewJob for the currently * shown files, taking mimeFilter() and nameFilter() into account * Enables/disables the preview-action accordingly. */ diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 8f8a8b299..48dd3a2e4 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -267,20 +267,20 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) } } -void KDirSelectDialog::readConfig( KConfig *config, const TQString& group ) +void KDirSelectDialog::readConfig( TDEConfig *config, const TQString& group ) { d->urlCombo->clear(); - KConfigGroup conf( config, group ); + TDEConfigGroup conf( config, group ); d->urlCombo->setHistoryItems( conf.readPathListEntry( "History Items" )); TQSize defaultSize( 400, 450 ); resize( conf.readSizeEntry( "DirSelectDialog Size", &defaultSize )); } -void KDirSelectDialog::saveConfig( KConfig *config, const TQString& group ) +void KDirSelectDialog::saveConfig( TDEConfig *config, const TQString& group ) { - KConfigGroup conf( config, group ); + TDEConfigGroup conf( config, group ); conf.writePathEntry( "History Items", d->urlCombo->historyItems(), ',', true, true); conf.writeEntry( "DirSelectDialog Size", size(), true, true ); @@ -406,9 +406,9 @@ void KDirSelectDialog::slotMkdir() TQString where = url().pathOrURL(); TQString name = i18n( "New Folder" ); if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() ) - name = KIO::RenameDlg::suggestName( url(), name ); + name = TDEIO::RenameDlg::suggestName( url(), name ); - TQString directory = KIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ), + TQString directory = TDEIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ), i18n( "Create new folder in:\n%1" ).arg( where ), name, &ok, this)); if (!ok) @@ -425,8 +425,8 @@ void KDirSelectDialog::slotMkdir() for ( ; it != dirs.end(); ++it ) { folderurl.addPath( *it ); - exists = KIO::NetAccess::exists( folderurl, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() ); + exists = TDEIO::NetAccess::exists( folderurl, false, 0 ); + writeOk = !exists && TDEIO::NetAccess::mkdir( folderurl, topLevelWidget() ); } if ( exists ) // url was already existant @@ -470,7 +470,7 @@ KURL KDirSelectDialog::selectDirectory( const TQString& startDir, myDialog.setCaption( caption ); if ( myDialog.exec() == TQDialog::Accepted ) - return KIO::NetAccess::mostLocalURL(myDialog.url(),parent); + return TDEIO::NetAccess::mostLocalURL(myDialog.url(),parent); else return KURL(); } diff --git a/kio/kfile/kdirselectdialog.h b/kio/kfile/kdirselectdialog.h index 79358f4f3..106fe77fc 100644 --- a/kio/kfile/kdirselectdialog.h +++ b/kio/kfile/kdirselectdialog.h @@ -25,7 +25,7 @@ class TQPopupMenu; class TQVBoxLayout; -class KConfig; +class TDEConfig; class KFileTreeBranch; class KFileTreeView; class KFileTreeViewItem; @@ -111,8 +111,8 @@ private slots: void slotMkdir(); private: - void readConfig( KConfig *config, const TQString& group ); - void saveConfig( KConfig *config, const TQString& group ); + void readConfig( TDEConfig *config, const TQString& group ); + void saveConfig( TDEConfig *config, const TQString& group ); void openNextDir( KFileTreeViewItem *parent ); KFileTreeBranch * createBranch( const KURL& url ); diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 3ab42817b..14936679a 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -24,16 +24,16 @@ #include #include -using namespace KIO; +using namespace TDEIO; KDirSize::KDirSize( const KURL & directory ) - : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L) + : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L) { startNextJob( directory ); } KDirSize::KDirSize( const KFileItemList & lstItems ) - : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) + : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) { TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); } @@ -69,38 +69,38 @@ void KDirSize::processList() void KDirSize::startNextJob( const KURL & url ) { - KIO::ListJob * listJob = KIO::listRecursive( url, false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( KIO::Job *, - const KIO::UDSEntryList& )), - TQT_SLOT( slotEntries( KIO::Job*, - const KIO::UDSEntryList& ))); + TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ ); + connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + const TDEIO::UDSEntryList& )), + TQT_SLOT( slotEntries( TDEIO::Job*, + const TDEIO::UDSEntryList& ))); addSubjob( listJob ); } -void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) +void KDirSize::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list ) { static const TQString& dot = TDEGlobal::staticQString( "." ); static const TQString& dotdot = TDEGlobal::staticQString( ".." ); - KIO::UDSEntryListConstIterator it = list.begin(); - KIO::UDSEntryListConstIterator end = list.end(); + TDEIO::UDSEntryListConstIterator it = list.begin(); + TDEIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { - KIO::UDSEntry::ConstIterator it2 = (*it).begin(); - KIO::filesize_t size = 0; + TDEIO::UDSEntry::ConstIterator it2 = (*it).begin(); + TDEIO::filesize_t size = 0; bool isLink = false; bool isDir = false; TQString name; for( ; it2 != (*it).end(); it2++ ) { switch( (*it2).m_uds ) { - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: name = (*it2).m_str; break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: isLink = !(*it2).m_str.isEmpty(); break; - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: size = ((*it2).m_long); break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: isDir = S_ISDIR((*it2).m_long); break; default: @@ -135,7 +135,7 @@ KDirSize * KDirSize::dirSizeJob( const KFileItemList & lstItems ) } //static -KIO::filesize_t KDirSize::dirSize( const KURL & directory ) +TDEIO::filesize_t KDirSize::dirSize( const KURL & directory ) { KDirSize * dirSize = dirSizeJob( directory ); dirSize->setSync(); @@ -144,9 +144,9 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory ) } -void KDirSize::slotResult( KIO::Job * job ) +void KDirSize::slotResult( TDEIO::Job * job ) { - kdDebug(kfile_area) << " KDirSize::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl; + kdDebug(kfile_area) << " KDirSize::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl; if ( !m_lstItems.isEmpty() ) { subjobs.remove(job); // Remove job, but don't kill this job. @@ -156,11 +156,11 @@ void KDirSize::slotResult( KIO::Job * job ) { if ( !m_bAsync ) tqApp->exit_loop(); - KIO::Job::slotResult( job ); + TDEIO::Job::slotResult( job ); } } void KDirSize::virtual_hook( int id, void* data ) -{ KIO::Job::virtual_hook( id, data ); } +{ TDEIO::Job::virtual_hook( id, data ); } #include "kdirsize.moc" diff --git a/kio/kfile/kdirsize.h b/kio/kfile/kdirsize.h index 64ae80765..41fe87eb6 100644 --- a/kio/kfile/kdirsize.h +++ b/kio/kfile/kdirsize.h @@ -27,7 +27,7 @@ * Computes a directory size (similar to "du", but doesn't give the same results * since we simply sum up the dir and file sizes, whereas du speaks disk blocks) */ -class KIO_EXPORT KDirSize : public KIO::Job +class KIO_EXPORT KDirSize : public TDEIO::Job { Q_OBJECT protected: @@ -39,14 +39,14 @@ public: /** * @return the size we found */ - KIO::filesize_t totalSize() const { return m_totalSize; } + TDEIO::filesize_t totalSize() const { return m_totalSize; } /** * @return the total number of files (counting symlinks to files, sockets * and character devices as files) in this directory and all sub-directories * @since 3.3 */ - KIO::filesize_t totalFiles() const { return m_totalFiles; } + TDEIO::filesize_t totalFiles() const { return m_totalFiles; } /** * @return the total number of sub-directories found (not including the @@ -54,7 +54,7 @@ public: * as directories) * @since 3.3 */ - KIO::filesize_t totalSubdirs() const { return m_totalSubdirs; } + TDEIO::filesize_t totalSubdirs() const { return m_totalSubdirs; } /** * Asynchronous method. Connect to the result signal. @@ -75,7 +75,7 @@ public: * Synchronous method - you get the result as soon as * the call returns. */ - static KIO::filesize_t dirSize( const KURL & directory ); + static TDEIO::filesize_t dirSize( const KURL & directory ); protected: /** @@ -87,15 +87,15 @@ protected: protected slots: - virtual void slotResult( KIO::Job *job ); - void slotEntries( KIO::Job * , const KIO::UDSEntryList &); + virtual void slotResult( TDEIO::Job *job ); + void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList &); void processList(); private: bool m_bAsync; - KIO::filesize_t m_totalSize; - KIO::filesize_t m_totalFiles; - KIO::filesize_t m_totalSubdirs; + TDEIO::filesize_t m_totalSize; + TDEIO::filesize_t m_totalFiles; + TDEIO::filesize_t m_totalSubdirs; KFileItemList m_lstItems; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 21338c058..18245bdcd 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -163,7 +163,7 @@ void KDiskFreeSp::dfDone() KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path ) { KDiskFreeSp * job = new KDiskFreeSp; - TQString mountPoint = KIO::findPathMountPoint( path ); + TQString mountPoint = TDEIO::findPathMountPoint( path ); job->readDF( mountPoint ); return job; } diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 1bc6f6257..099a7cee5 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -130,12 +130,12 @@ KFileDetailView::~KFileDetailView() delete d; } -void KFileDetailView::readConfig( KConfig *config, const TQString& group ) +void KFileDetailView::readConfig( TDEConfig *config, const TQString& group ) { restoreLayout( config, group ); } -void KFileDetailView::writeConfig( KConfig *config, const TQString& group ) +void KFileDetailView::writeConfig( TDEConfig *config, const TQString& group ) { saveLayout( config, group ); } @@ -327,7 +327,7 @@ void KFileDetailView::setSortingKey( KFileListViewItem *item, TQDir::SortSpec spec = KFileView::sorting(); if ( spec & TQDir::Time ) - item->setKey( sortingKey( i->time( KIO::UDS_MODIFICATION_TIME ), + item->setKey( sortingKey( i->time( TDEIO::UDS_MODIFICATION_TIME ), i->isDir(), spec )); else if ( spec & TQDir::Size ) item->setKey( sortingKey( i->size(), i->isDir(), spec )); @@ -399,7 +399,7 @@ void KFileDetailView::slotSortingChanged( int col ) if ( sortSpec & TQDir::Time ) { for ( ; (item = it.current()); ++it ) - viewItem(item)->setKey( sortingKey( item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec )); + viewItem(item)->setKey( sortingKey( item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec )); } else if ( sortSpec & TQDir::Size ) { diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 937c8f56c..9c41cfb91 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -149,8 +149,8 @@ public: void determineIcon( KFileListViewItem *item ); TQScrollView *scrollWidget() const { return (TQScrollView*) this; } - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); signals: /** diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 5e1634144..1538d5dbc 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -97,7 +97,7 @@ enum Buttons { HOTLIST_BUTTON, PATH_COMBO, CONFIGURE_BUTTON }; -template class TQPtrList; +template class TQPtrList; namespace { static void silenceQToolBar(TQtMsgType, const char *) @@ -136,7 +136,7 @@ struct KFileDialogPrivate bool autoSelectExtChecked; // whether or not the _user_ has checked the above box TQString extension; // current extension for this filter - TQPtrList statJobs; + TQPtrList statJobs; KURL::List urlList; //the list of selected urls @@ -185,7 +185,7 @@ KFileDialog::~KFileDialog() { hide(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if (d->urlBar) d->urlBar->save( config ); @@ -402,7 +402,7 @@ void KFileDialog::slotOk() } } - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { // ### after message freeze, add message for directories! @@ -446,7 +446,7 @@ void KFileDialog::slotOk() return; } - KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); + KURL url = TDEIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { KMessageBox::sorry( d->mainWidget, @@ -528,12 +528,12 @@ void KFileDialog::slotOk() if (!kapp->authorizeURLAction("open", KURL(), d->url)) { - TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, d->url.prettyURL()); + TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL()); KMessageBox::error( d->mainWidget, msg); return; } - KIO::StatJob *job = 0L; + TDEIO::StatJob *job = 0L; d->statJobs.clear(); d->filenames = KShell::tildeExpand(locationEdit->currentText()); @@ -546,7 +546,7 @@ void KFileDialog::slotOk() { if (!kapp->authorizeURLAction("open", KURL(), *it)) { - TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, (*it).prettyURL()); + TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL()); KMessageBox::error( d->mainWidget, msg); return; } @@ -554,32 +554,32 @@ void KFileDialog::slotOk() for ( KURL::List::ConstIterator it = list.begin(); it != list.end(); ++it ) { - job = KIO::stat( *it, !(*it).isLocalFile() ); + job = TDEIO::stat( *it, !(*it).isLocalFile() ); job->setWindow (topLevelWidget()); - KIO::Scheduler::scheduleJob( job ); + TDEIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - TQT_SLOT( slotStatResult( KIO::Job *) )); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + TQT_SLOT( slotStatResult( TDEIO::Job *) )); } return; } - job = KIO::stat(d->url,!d->url.isLocalFile()); + job = TDEIO::stat(d->url,!d->url.isLocalFile()); job->setWindow (topLevelWidget()); d->statJobs.append( job ); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*))); } -static bool isDirectory (const KIO::UDSEntry &t) +static bool isDirectory (const TDEIO::UDSEntry &t) { bool isDir = false; - for (KIO::UDSEntry::ConstIterator it = t.begin(); + for (TDEIO::UDSEntry::ConstIterator it = t.begin(); it != t.end(); it++) { - if ((*it).m_uds == KIO::UDS_FILE_TYPE) + if ((*it).m_uds == TDEIO::UDS_FILE_TYPE) { isDir = S_ISDIR ((mode_t) ((*it).m_long)); break; @@ -592,10 +592,10 @@ static bool isDirectory (const KIO::UDSEntry &t) // FIXME : count all errors and show messagebox when d->statJobs.count() == 0 // in case of an error, we cancel the whole operation (clear d->statJobs and // don't call accept) -void KFileDialog::slotStatResult(KIO::Job* job) +void KFileDialog::slotStatResult(TDEIO::Job* job) { kdDebug(kfile_area) << "slotStatResult" << endl; - KIO::StatJob *sJob = static_cast( job ); + TDEIO::StatJob *sJob = static_cast( job ); if ( !d->statJobs.removeRef( sJob ) ) { return; @@ -611,7 +611,7 @@ void KFileDialog::slotStatResult(KIO::Job* job) return; } - KIO::UDSEntry t = sJob->statResult(); + TDEIO::UDSEntry t = sJob->statResult(); if (isDirectory (t)) { if ( ops->dirOnlyMode() ) @@ -672,7 +672,7 @@ void KFileDialog::accept() locationEdit->insertItem( file, 1 ); } - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge initGUI(); // activate GM - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); readRecentFiles( config ); adjustSize(); @@ -1550,7 +1550,7 @@ TQString KFileDialog::selectedFile() const { if ( result() == TQDialog::Accepted ) { - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); if (url.isLocalFile()) return url.path(); else { @@ -1572,7 +1572,7 @@ TQStringList KFileDialog::selectedFiles() const KURL::List urls = parseSelectedURLs(); TQValueListConstIterator it = urls.begin(); while ( it != urls.end() ) { - url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget()); + url = TDEIO::NetAccess::mostLocalURL(*it,topLevelWidget()); if ( url.isLocalFile() ) list.append( url.path() ); ++it; @@ -1698,7 +1698,7 @@ KFile::Mode KFileDialog::mode() const } -void KFileDialog::readConfig( KConfig *kc, const TQString& group ) +void KFileDialog::readConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1749,7 +1749,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) kc->setGroup( oldGroup ); } -void KFileDialog::writeConfig( KConfig *kc, const TQString& group ) +void KFileDialog::writeConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1771,7 +1771,7 @@ void KFileDialog::writeConfig( KConfig *kc, const TQString& group ) } -void KFileDialog::readRecentFiles( KConfig *kc ) +void KFileDialog::readRecentFiles( TDEConfig *kc ) { TQString oldGroup = kc->group(); kc->setGroup( ConfigGroup ); @@ -1786,7 +1786,7 @@ void KFileDialog::readRecentFiles( KConfig *kc ) kc->setGroup( oldGroup ); } -void KFileDialog::saveRecentFiles( KConfig *kc ) +void KFileDialog::saveRecentFiles( TDEConfig *kc ) { TQString oldGroup = kc->group(); kc->setGroup( ConfigGroup ); @@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel() ops->close(); KDialogBase::slotCancel(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -2069,8 +2069,8 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) ) { // exists? - KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + TDEIO::UDSEntry t; + if (TDEIO::NetAccess::stat (url, t, topLevelWidget())) { kdDebug (kfile_area) << "\tfile exists" << endl; @@ -2142,13 +2142,13 @@ void KFileDialog::appendExtension (KURL &url) const bool suppressExtension = (dot == len - 1); const bool unspecifiedExtension = (dot <= 0); - // don't KIO::NetAccess::Stat if unnecessary + // don't TDEIO::NetAccess::Stat if unnecessary if (!(suppressExtension || unspecifiedExtension)) return; // exists? - KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + TDEIO::UDSEntry t; + if (TDEIO::NetAccess::stat (url, t, topLevelWidget())) { kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl; return; diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h index 33e0c9b12..51d817b2f 100644 --- a/kio/kfile/kfiledialog.h +++ b/kio/kfile/kfiledialog.h @@ -854,22 +854,22 @@ protected: /** * Reads configuration and applies it (size, recent directories, ...) */ - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); /** * Saves the current configuration */ - virtual void writeConfig( KConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null ); /** * Reads the recent used files and inserts them into the location combobox */ - virtual void readRecentFiles( KConfig * ); + virtual void readRecentFiles( TDEConfig * ); /** * Saves the entries from the location combobox. */ - virtual void saveRecentFiles( KConfig * ); + virtual void saveRecentFiles( TDEConfig * ); /** * Parses the string "line" for files. If line doesn't contain any ", the @@ -929,7 +929,7 @@ protected slots: void slotFilterChanged(); void fileHighlighted(const KFileItem *i); void fileSelected(const KFileItem *i); - void slotStatResult(KIO::Job* job); + void slotStatResult(TDEIO::Job* job); void slotLoadingFinished(); void fileCompletion( const TQString& ); diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index a9882d56f..5d9977de6 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -102,7 +102,7 @@ public: KRadioAction *smallColumns, *largeRows; KAction *zoomIn, *zoomOut; KToggleAction *previews; - KIO::PreviewJob *job; + TDEIO::PreviewJob *job; KFileIconViewItem *dropItem; TQTimer previewTimer; TQTimer autoOpenTimer; @@ -187,10 +187,10 @@ KFileIconView::~KFileIconView() delete d; } -void KFileIconView::readConfig( KConfig *kc, const TQString& group ) +void KFileIconView::readConfig( TDEConfig *kc, const TQString& group ) { TQString gr = group.isEmpty() ? TQString("KFileIconView") : group; - KConfigGroupSaver cs( kc, gr ); + TDEConfigGroupSaver cs( kc, gr ); TQString small = TQString::fromLatin1("SmallColumns"); d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE ); d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) ); @@ -208,10 +208,10 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group ) showPreviews(); } -void KFileIconView::writeConfig( KConfig *kc, const TQString& group ) +void KFileIconView::writeConfig( TDEConfig *kc, const TQString& group ) { TQString gr = group.isEmpty() ? TQString("KFileIconView") : group; - KConfigGroupSaver cs( kc, gr ); + TDEConfigGroupSaver cs( kc, gr ); TQString viewMode = d->smallColumns->isChecked() ? TQString::fromLatin1("SmallColumns") : @@ -578,7 +578,7 @@ void KFileIconView::slotPreviewsToggled( bool on ) void KFileIconView::showPreviews() { if ( d->previewMimeTypes.isEmpty() ) - d->previewMimeTypes = KIO::PreviewJob::supportedMimeTypes(); + d->previewMimeTypes = TDEIO::PreviewJob::supportedMimeTypes(); stopPreview(); d->previews->setChecked( true ); @@ -591,18 +591,18 @@ void KFileIconView::showPreviews() updateIcons(); } - d->job = KIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); + d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); d->job->setIgnoreMaximumSize(d->ignoreMaximumSize); - connect( d->job, TQT_SIGNAL( result( KIO::Job * )), - this, TQT_SLOT( slotPreviewResult( KIO::Job * ))); + connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )), + this, TQT_SLOT( slotPreviewResult( TDEIO::Job * ))); connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); // connect( d->job, TQT_SIGNAL( failed( const KFileItem* )), // this, TQT_SLOT( slotFailed( const KFileItem* ) )); } -void KFileIconView::slotPreviewResult( KIO::Job *job ) +void KFileIconView::slotPreviewResult( TDEIO::Job *job ) { if ( job == d->job ) d->job = 0L; @@ -683,7 +683,7 @@ void KFileIconView::setSorting( TQDir::SortSpec spec ) if ( spec & TQDir::Time ) { for ( ; (item = it.current()); ++it ) // warning, time_t is often signed -> cast it - viewItem(item)->setKey( sortingKey( (unsigned long)item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), spec )); + viewItem(item)->setKey( sortingKey( (unsigned long)item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), spec )); } else if ( spec & TQDir::Size ) { @@ -775,7 +775,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i, if ( spec & TQDir::Time ) // warning, time_t is often signed -> cast it - item->setKey( sortingKey( (unsigned long) i->time( KIO::UDS_MODIFICATION_TIME ), + item->setKey( sortingKey( (unsigned long) i->time( TDEIO::UDS_MODIFICATION_TIME ), i->isDir(), spec )); else if ( spec & TQDir::Size ) item->setKey( sortingKey( i->size(), i->isDir(), spec )); diff --git a/kio/kfile/kfileiconview.h b/kio/kfile/kfileiconview.h index a4fd34ea1..209e4828a 100644 --- a/kio/kfile/kfileiconview.h +++ b/kio/kfile/kfileiconview.h @@ -68,7 +68,7 @@ private: }; -namespace KIO { +namespace TDEIO { class Job; } @@ -141,8 +141,8 @@ public: virtual void setSorting(TQDir::SortSpec sort); - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); // for KMimeTypeResolver void mimeTypeDeterminationFinished(); @@ -212,7 +212,7 @@ private slots: void slotLargeRows(); void slotPreviewsToggled( bool ); - void slotPreviewResult( KIO::Job * ); + void slotPreviewResult( TDEIO::Job * ); void gotPreview( const KFileItem *item, const TQPixmap& pix ); void slotAutoOpen(); diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index b221a1ebb..04124570b 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -264,12 +264,12 @@ KActionCollection * KFilePreview::actionCollection() const } } -void KFilePreview::readConfig( KConfig *config, const TQString& group ) +void KFilePreview::readConfig( TDEConfig *config, const TQString& group ) { left->readConfig( config, group ); } -void KFilePreview::writeConfig( KConfig *config, const TQString& group ) +void KFilePreview::writeConfig( TDEConfig *config, const TQString& group ) { left->writeConfig( config, group ); } diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h index 123d221f1..79dda2984 100644 --- a/kio/kfile/kfilepreview.h +++ b/kio/kfile/kfilepreview.h @@ -83,8 +83,8 @@ public: virtual void setSorting( TQDir::SortSpec sort ); - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); /** * This overrides KFileView::actionCollection() by returning diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 9ab3b8ee5..567d929eb 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -35,8 +35,8 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) : KURLBar( true, parent, name ) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, ConfigGroup ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, ConfigGroup ); m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults", true ); setIconSize(KIcon::SizeSmallMedium); @@ -121,11 +121,11 @@ KFileSpeedBar::~KFileSpeedBar() { } -void KFileSpeedBar::save( KConfig *config ) +void KFileSpeedBar::save( TDEConfig *config ) { if ( m_initializeSpeedbar && isModified() ) { - KConfigGroup conf( config, ConfigGroup ); + TDEConfigGroup conf( config, ConfigGroup ); // write to kdeglobals conf.writeEntry( "Set speedbar defaults", false, true, true ); } diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index 28c621651..f7a27131b 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -21,7 +21,7 @@ #include -class KConfig; +class TDEConfig; class KIO_EXPORT KFileSpeedBar : public KURLBar { @@ -30,7 +30,7 @@ public: KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 ); ~KFileSpeedBar(); - virtual void save( KConfig *config ); + virtual void save( TDEConfig *config ); virtual TQSize sizeHint() const; private: diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index b32746aa6..a62b8aa50 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -212,8 +212,8 @@ sort_by_name: break; case TQDir::Time: { - time_t t1 = fi1->time( KIO::UDS_MODIFICATION_TIME ); - time_t t2 = fi2->time( KIO::UDS_MODIFICATION_TIME ); + time_t t1 = fi1->time( TDEIO::UDS_MODIFICATION_TIME ); + time_t t2 = fi2->time( TDEIO::UDS_MODIFICATION_TIME ); if ( t1 != t2 ) { bigger = (t1 > t2); break; @@ -228,8 +228,8 @@ sort_by_name: } case TQDir::Size: { - KIO::filesize_t s1 = fi1->size(); - KIO::filesize_t s2 = fi2->size(); + TDEIO::filesize_t s1 = fi1->size(); + TDEIO::filesize_t s2 = fi2->size(); if ( s1 != s2 ) { bigger = (s1 > s2); break; @@ -369,11 +369,11 @@ KActionCollection * KFileView::actionCollection() const return d->actions; } -void KFileView::readConfig( KConfig *, const TQString& ) +void KFileView::readConfig( TDEConfig *, const TQString& ) { } -void KFileView::writeConfig( KConfig *, const TQString& ) +void KFileView::writeConfig( TDEConfig *, const TQString& ) { } @@ -386,12 +386,12 @@ TQString KFileView::sortingKey( const TQString& value, bool isDir, int sortSpec return result.prepend( start ); } -TQString KFileView::sortingKey( KIO::filesize_t value, bool isDir, int sortSpec) +TQString KFileView::sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec) { bool reverse = sortSpec & TQDir::Reversed; bool dirsFirst = sortSpec & TQDir::DirsFirst; char start = (isDir && dirsFirst) ? (reverse ? '2' : '0') : '1'; - return KIO::number( value ).rightJustify( 24, '0' ).prepend( start ); + return TDEIO::number( value ).rightJustify( 24, '0' ).prepend( start ); } void KFileView::setDropOptions(int options) diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index bce408327..5a6bfd002 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -346,8 +346,8 @@ public: KFileViewSignaler * signaler() const { return sig; } - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); /** * Various options for drag and drop support. @@ -392,10 +392,10 @@ public: /** * An overloaded method that takes not a TQString, but a number as sort * criterion. You can use this for file-sizes or dates/times for example. - * If you use a time_t, you need to cast that to KIO::filesize_t because + * If you use a time_t, you need to cast that to TDEIO::filesize_t because * of ambiguity problems. */ - static TQString sortingKey( KIO::filesize_t value, bool isDir,int sortSpec); + static TQString sortingKey( TDEIO::filesize_t value, bool isDir,int sortSpec); /** * @internal diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index c55acaf9e..0cc0ef2a7 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -35,8 +35,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) : KPreviewWidgetBase( parent ), m_job( 0L ) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, ConfigGroup ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, ConfigGroup ); autoMode = config->readBoolEntry( "Automatic Preview", true ); TQVBoxLayout *vb = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -62,7 +62,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) timer = new TQTimer( this ); connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) ); - setSupportedMimeTypes( KIO::PreviewJob::supportedMimeTypes() ); + setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() ); } KImageFilePreview::~KImageFilePreview() @@ -70,8 +70,8 @@ KImageFilePreview::~KImageFilePreview() if ( m_job ) m_job->kill(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, ConfigGroup ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, ConfigGroup ); config->writeEntry( "Automatic Preview", autoPreview->isChecked() ); } @@ -109,8 +109,8 @@ void KImageFilePreview::showPreview( const KURL &url, bool force ) if ( force ) // explicitly requested previews shall always be generated! m_job->setIgnoreMaximumSize( true ); - connect( m_job, TQT_SIGNAL( result( KIO::Job * )), - this, TQT_SLOT( slotResult( KIO::Job * ))); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), + this, TQT_SLOT( slotResult( TDEIO::Job * ))); connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); @@ -142,11 +142,11 @@ TQSize KImageFilePreview::sizeHint() const return TQSize( 20, 200 ); // otherwise it ends up huge??? } -KIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h ) +TDEIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h ) { KURL::List urls; urls.append( url ); - return KIO::filePreview( urls, w, h, 0, 0, true, false ); + return TDEIO::filePreview( urls, w, h, 0, 0, true, false ); } void KImageFilePreview::gotPreview( const KFileItem* item, const TQPixmap& pm ) @@ -164,7 +164,7 @@ void KImageFilePreview::slotFailed( const KFileItem* item ) KIcon::DisabledState )); } -void KImageFilePreview::slotResult( KIO::Job *job ) +void KImageFilePreview::slotResult( TDEIO::Job *job ) { if ( job == m_job ) m_job = 0L; diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index 864fc5d31..a86f4f923 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -23,7 +23,7 @@ class TQTimer; class KFileDialog; class KFileItem; -namespace KIO { class Job; class PreviewJob; } +namespace TDEIO { class Job; class PreviewJob; } /** * Image preview widget for the file dialog. @@ -51,11 +51,11 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase protected: virtual void resizeEvent(TQResizeEvent *e); - virtual KIO::PreviewJob * createJob( const KURL& url, + virtual TDEIO::PreviewJob * createJob( const KURL& url, int w, int h ); private slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); virtual void slotFailed( const KFileItem* ); private: @@ -66,7 +66,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase TQLabel *infoLabel; TQCheckBox *autoPreview; TQPushButton *previewButton; - KIO::PreviewJob *m_job; + TDEIO::PreviewJob *m_job; protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 69d7be4e8..088f9be54 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -915,7 +915,7 @@ void KNotifyWidget::openExecDialog( KURLRequester *requester ) void KNotifyWidget::playSound() { TQString soundPath = m_soundPath->url(); - if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) { + if (!TDEIO::NetAccess::exists( m_soundPath->url(), true, 0 )) { bool foundSound=false; // find the first "sound"-resource that contains files @@ -930,7 +930,7 @@ void KNotifyWidget::playSound() while ( it != soundDirs.end() ) { dir = *it; if ( dir.isReadable() && dir.count() > 2 && - KIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) { + TDEIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) { foundSound=true; soundPath = *it + m_soundPath->url(); break; @@ -1003,8 +1003,8 @@ Application::Application( const TQString &path ) TQString config_file = path; config_file[config_file.find('/')] = '.'; m_events = 0L; - config = new KConfig(config_file, false, false); - kc = new KConfig(path, true, false, "data"); + config = new TDEConfig(config_file, false, false); + kc = new TDEConfig(path, true, false, "data"); kc->setGroup( TQString::fromLatin1("!Global!") ); m_icon = kc->readEntry(TQString::fromLatin1("IconName"), TQString::fromLatin1("misc")); diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index ef5d356fd..acab7e23f 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -168,8 +168,8 @@ namespace KNotify TQString m_appname; EventList *m_events; - KConfig *kc; // The file that defines the events. - KConfig *config; // The file that contains the settings for the events + TDEConfig *kc; // The file that defines the events. + TDEConfig *config; // The file that contains the settings for the events }; diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 9a3fcabd1..efeaa1f02 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -412,8 +412,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // init the history combo and insert it into the URL-Requester KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), @@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") @@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using @@ -813,8 +813,8 @@ void KOpenWithDlg::accept() if ( combo ) { combo->addToHistory( edit->url() ); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); kc->writeEntry(TQString::fromLatin1("CompletionMode"), combo->completionMode()); diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 94b95a2b6..e9296ca90 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -146,7 +146,7 @@ static TQString nameFromFileName(TQString nameStr) if ( nameStr.endsWith(".kdelnk") ) nameStr.truncate( nameStr.length() - 7 ); // Make it human-readable (%2F => '/', ...) - nameStr = KIO::decodeFileName( nameStr ); + nameStr = TDEIO::decodeFileName( nameStr ); return nameStr; } @@ -174,7 +174,7 @@ public: KPropertiesDialog::KPropertiesDialog (KFileItem* item, TQWidget* parent, const char* name, bool modal, bool autoShow) - : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(KIO::decodeFileName(item->url().fileName())), + : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(item->url().fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal) { @@ -206,7 +206,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items, // TODO: replace with "Properties for 1 item". It's very confusing how it has to be translated otherwise // (empty translation before the "\n" is not allowed by msgfmt...) _items.count()>1 ? i18n( "","Properties for %n Selected Items",_items.count()) : - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_items.first()->url().fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal) { @@ -229,16 +229,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url, mode_t /* _mode is now u TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal), m_singleUrl( _url ) { d = new KPropertiesDialogPrivate; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::NetAccess::stat(_url, entry, parent); + TDEIO::NetAccess::stat(_url, entry, parent); m_items.append( new KFileItem( entry, _url ) ); init (modal, autoShow); @@ -249,16 +249,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url, TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal), m_singleUrl( _url ) { d = new KPropertiesDialogPrivate; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::NetAccess::stat(_url, entry, parent); + TDEIO::NetAccess::stat(_url, entry, parent); m_items.append( new KFileItem( entry, _url ) ); init (modal, autoShow); @@ -269,7 +269,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_tempUrl.fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_tempUrl.fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal), @@ -360,7 +360,7 @@ void KPropertiesDialog::setFileNameReadOnly( bool ro ) } } -void KPropertiesDialog::slotStatResult( KIO::Job * ) +void KPropertiesDialog::slotStatResult( TDEIO::Job * ) { } @@ -725,7 +725,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) TQString mimeComment = item->mimeComment(); d->mimeType = item->mimetype(); bool hasTotalSize; - KIO::filesize_t totalSize = item->size(hasTotalSize); + TDEIO::filesize_t totalSize = item->size(hasTotalSize); TQString magicMimeComment; if ( isLocal ) { KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() ); @@ -894,7 +894,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) { TQLabel *lab = new TQLabel(d->m_frame ); if ( d->bMultiple ) - lab->setText( KIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) ); + lab->setText( TDEIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) ); else lab->setText( filename ); nameArea = lab; @@ -992,7 +992,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) if ( !hasDirs ) // Only files [and symlinks] { if(hasTotalSize) { - m_sizeLabel->setText(KIO::convertSizeWithBytes(totalSize)); + m_sizeLabel->setText(TDEIO::convertSizeWithBytes(totalSize)); } m_sizeDetermineButton = 0L; @@ -1034,7 +1034,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) { TQDateTime dt; bool hasTime; - time_t tim = item->time(KIO::UDS_CREATION_TIME, hasTime); + time_t tim = item->time(TDEIO::UDS_CREATION_TIME, hasTime); if ( hasTime ) { l = new TQLabel(i18n("Created:"), d->m_frame ); @@ -1045,7 +1045,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow++, 2); } - tim = item->time(KIO::UDS_MODIFICATION_TIME, hasTime); + tim = item->time(TDEIO::UDS_MODIFICATION_TIME, hasTime); if ( hasTime ) { l = new TQLabel(i18n("Modified:"), d->m_frame ); @@ -1056,7 +1056,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow++, 2); } - tim = item->time(KIO::UDS_ACCESS_TIME, hasTime); + tim = item->time(TDEIO::UDS_ACCESS_TIME, hasTime); if ( hasTime ) { l = new TQLabel(i18n("Accessed:"), d->m_frame ); @@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addMultiCellWidget(sep, curRow, curRow, 0, 2); ++curRow; - TQString mountPoint = KIO::findPathMountPoint( url.path() ); + TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); if (mountPoint != "/") { @@ -1193,8 +1193,8 @@ void KFilePropsPlugin::slotFoundMountPoint( const TQString&, d->m_freeSpaceLabel->setText( // xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part. i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)") - .arg(KIO::convertSizeFromKB(kBAvail)) - .arg(KIO::convertSizeFromKB(kBSize)) + .arg(TDEIO::convertSizeFromKB(kBAvail)) + .arg(TDEIO::convertSizeFromKB(kBSize)) .arg( 100 - (int)(100.0 * kBAvail / kBSize) )); } @@ -1208,34 +1208,34 @@ void KFilePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize, d->m_freeSpaceLabel->setText( // xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part. i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)") - .arg(KIO::convertSizeFromKB(kBAvail)) - .arg(KIO::convertSizeFromKB(kBSize)) + .arg(TDEIO::convertSizeFromKB(kBAvail)) + .arg(TDEIO::convertSizeFromKB(kBSize)) .arg( 100 - (int)(100.0 * kBAvail / kBSize) )); } void KFilePropsPlugin::slotDirSizeUpdate() { - KIO::filesize_t totalSize = d->dirSizeJob->totalSize(); - KIO::filesize_t totalFiles = d->dirSizeJob->totalFiles(); - KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs(); + TDEIO::filesize_t totalSize = d->dirSizeJob->totalSize(); + TDEIO::filesize_t totalFiles = d->dirSizeJob->totalFiles(); + TDEIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs(); m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4") - .arg(KIO::convertSize(totalSize)) + .arg(TDEIO::convertSize(totalSize)) .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } -void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) +void KFilePropsPlugin::slotDirSizeFinished( TDEIO::Job * job ) { if (job->error()) m_sizeLabel->setText( job->errorString() ); else { - KIO::filesize_t totalSize = static_cast(job)->totalSize(); - KIO::filesize_t totalFiles = static_cast(job)->totalFiles(); - KIO::filesize_t totalSubdirs = static_cast(job)->totalSubdirs(); + TDEIO::filesize_t totalSize = static_cast(job)->totalSize(); + TDEIO::filesize_t totalFiles = static_cast(job)->totalFiles(); + TDEIO::filesize_t totalSubdirs = static_cast(job)->totalSubdirs(); m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") - .arg(KIO::convertSize(totalSize)) + .arg(TDEIO::convertSize(totalSize)) .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); @@ -1259,8 +1259,8 @@ void KFilePropsPlugin::slotSizeDetermine() connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDirSizeUpdate() ) ); d->dirSizeUpdateTimer->start(500); - connect( d->dirSizeJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotDirSizeFinished( KIO::Job * ) ) ); + connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); m_sizeStopButton->setEnabled(true); m_sizeDetermineButton->setEnabled(false); @@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine() bool isLocal; KFileItem * item = properties->item(); KURL url = item->mostLocalURL( isLocal ); - TQString mountPoint = KIO::findPathMountPoint( url.path() ); + TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, @@ -1334,10 +1334,10 @@ void KFilePropsPlugin::applyChanges() kdDebug(250) << "oldname = " << oldName << endl; kdDebug(250) << "newname = " << n << endl; if ( oldName != n || m_bFromTemplate ) { // true for any from-template file - KIO::Job * job = 0L; + TDEIO::Job * job = 0L; KURL oldurl = properties->kurl(); - TQString newFileName = KIO::encodeFileName(n); + TQString newFileName = TDEIO::encodeFileName(n); if (d->bDesktopFile && !newFileName.endsWith(".desktop") && !newFileName.endsWith(".kdelnk")) newFileName += ".desktop"; @@ -1353,14 +1353,14 @@ void KFilePropsPlugin::applyChanges() // Don't remove the template !! if ( !m_bFromTemplate ) // (normal renaming) - job = KIO::move( oldurl, properties->kurl() ); + job = TDEIO::move( oldurl, properties->kurl() ); else // Copying a template - job = KIO::copy( oldurl, properties->kurl() ); + job = TDEIO::copy( oldurl, properties->kurl() ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotCopyFinished( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL &, const KURL & ) ), - TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), + TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); // wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -1378,7 +1378,7 @@ void KFilePropsPlugin::applyChanges() slotCopyFinished( 0L ); } -void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) +void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) { kdDebug(250) << "KFilePropsPlugin::slotCopyFinished" << endl; if (job) @@ -1389,7 +1389,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) { job->showErrorDialog( d->m_frame ); // Didn't work. Revert the URL to the old one - properties->updateUrl( static_cast(job)->srcURLs().first() ); + properties->updateUrl( static_cast(job)->srcURLs().first() ); properties->abortApplying(); // Don't apply the changes to the wrong file ! return; } @@ -1431,9 +1431,9 @@ void KFilePropsPlugin::applyIconChanges() if ( !iconButton || !d->bIconChanged ) return; // handle icon changes - only local files (or pseudo-local) for now - // TODO: Use KTempFile and KIO::file_copy with overwrite = true + // TODO: Use KTempFile and TDEIO::file_copy with overwrite = true KURL url = properties->kurl(); - url = KIO::NetAccess::mostLocalURL( url, properties ); + url = TDEIO::NetAccess::mostLocalURL( url, properties ); if (url.isLocalFile()) { TQString path; @@ -1478,7 +1478,7 @@ void KFilePropsPlugin::applyIconChanges() } } -void KFilePropsPlugin::slotFileRenamed( KIO::Job *, const KURL &, const KURL & newUrl ) +void KFilePropsPlugin::slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & newUrl ) { // This is called in case of an existing local file during the copy/move operation, // if the user chooses Rename. @@ -1633,7 +1633,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr } else { //We don't know, for remote files, if they are ours or not. //So we let the user change permissions, and - //KIO::chmod will tell, if he had no right to do it. + //TDEIO::chmod will tell, if he had no right to do it. isMyFile = true; } @@ -2506,17 +2506,17 @@ void KFilePermissionsPropsPlugin::applyChanges() && !permissionChange && !ACLChange && !defaultACLChange ) return; - KIO::Job * job; + TDEIO::Job * job; if (files.count() > 0) { - job = KIO::chmod( files, orFilePermissions, ~andFilePermissions, + job = TDEIO::chmod( files, orFilePermissions, ~andFilePermissions, owner, group, false ); if ( ACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" ); if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2524,15 +2524,15 @@ void KFilePermissionsPropsPlugin::applyChanges() tqt_leave_modal(&dummy); } if (dirs.count() > 0) { - job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions, + job = TDEIO::chmod( dirs, orDirPermissions, ~andDirPermissions, owner, group, recursive ); if ( ACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" ); if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2541,7 +2541,7 @@ void KFilePermissionsPropsPlugin::applyChanges() } } -void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job ) +void KFilePermissionsPropsPlugin::slotChmodResult( TDEIO::Job * job ) { kdDebug(250) << "KFilePermissionsPropsPlugin::slotChmodResult" << endl; if (job->error()) @@ -3042,8 +3042,8 @@ void KDevicePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize, d->m_freeSpaceLabel->setText( // xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part. i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)") - .arg(KIO::convertSizeFromKB(kBAvail)) - .arg(KIO::convertSizeFromKB(kBSize)) + .arg(TDEIO::convertSizeFromKB(kBAvail)) + .arg(TDEIO::convertSizeFromKB(kBSize)) .arg( 100 - (int)(100.0 * kBAvail / kBSize) )); d->m_freeSpaceBar->setProgress(percUsed, 100); @@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index d6a8223dd..df814f7d4 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -48,7 +48,7 @@ class TQComboBox; #define KPropsPage KPropsDlgPlugin -namespace KIO { class Job; } +namespace TDEIO { class Job; } /** * The main properties dialog class. @@ -142,7 +142,7 @@ public: * @param name is the internal name. * @param modal tells the dialog whether it should be modal. * IMPORTANT: This constructor, together with modal=true, leads to a grave - * display bug (due to KIO::stat() being run before the dialog has all the + * display bug (due to TDEIO::stat() being run before the dialog has all the * necessary information). Do not use this combination for now. * For local files with a known mimetype, simply create a KFileItem and pass * it to the other constructor. @@ -412,7 +412,7 @@ private: TQPtrList m_pageList; private slots: - void slotStatResult( KIO::Job * ); // No longer used + void slotStatResult( TDEIO::Job * ); // No longer used protected: virtual void virtual_hook( int id, void* data ); private: @@ -523,10 +523,10 @@ public: protected slots: void slotEditFileType(); - void slotCopyFinished( KIO::Job * ); - void slotFileRenamed( KIO::Job *, const KURL &, const KURL & ); + void slotCopyFinished( TDEIO::Job * ); + void slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ); void slotDirSizeUpdate(); - void slotDirSizeFinished( KIO::Job * ); + void slotDirSizeFinished( TDEIO::Job * ); void slotFoundMountPoint( const TQString& mp, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail ); void slotSizeStop(); @@ -600,7 +600,7 @@ public: private slots: - void slotChmodResult( KIO::Job * ); + void slotChmodResult( TDEIO::Job * ); void slotShowAdvancedPermissions(); private: diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 609668373..6f4a01f3b 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -32,7 +32,7 @@ #define MAX_DIR_HISTORY 3 -static void recentdirs_done(KConfig *config) +static void recentdirs_done(TDEConfig *config) { if (config == TDEGlobal::config()) { @@ -44,9 +44,9 @@ static void recentdirs_done(KConfig *config) } } -static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly) +static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly) { - KConfig *config; + TDEConfig *config; if ((key.length() < 2) || (key[0] != ':')) key = ":default"; if (key[1] == ':') @@ -87,7 +87,7 @@ void KRecentDirs::add(const TQString &fileClass, const TQString &directory) { TQString key = fileClass; TQStringList result; - KConfig *config = recentdirs_readList(key, result, false); + TDEConfig *config = recentdirs_readList(key, result, false); // make sure the dir is first in history result.remove(directory); result.prepend(directory); diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index d91e7551f..1ec4a98c8 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -86,7 +86,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded kdDebug(250) << "KRecentDocument::add for " << openStr << endl; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQString oldGrp = config->group(); config->setGroup(TQString::fromLatin1("RecentDocuments")); bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); @@ -169,8 +169,8 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 1d2cf1547..95f30ee24 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -577,16 +577,16 @@ KURL KURLBar::currentURL() const return item ? item->url() : KURL(); } -void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup ) +void KURLBar::readConfig( TDEConfig *appConfig, const TQString& itemGroup ) { m_isImmutable = appConfig->groupIsImmutable( itemGroup ); - KConfigGroupSaver cs( appConfig, itemGroup ); + TDEConfigGroupSaver cs( appConfig, itemGroup ); d->defaultIconSize = m_iconSize; m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize ); if ( m_useGlobal ) { // read global items - KConfig *globalConfig = TDEGlobal::config(); - KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)")); + TDEConfig *globalConfig = TDEGlobal::config(); + TDEConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)")); int num = globalConfig->readNumEntry( "Number of Entries" ); for ( int i = 0; i < num; i++ ) { readItem( i, globalConfig, false ); @@ -600,7 +600,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup ) } } -void KURLBar::readItem( int i, KConfig *config, bool applicationLocal ) +void KURLBar::readItem( int i, TDEConfig *config, bool applicationLocal ) { TQString number = TQString::number( i ); KURL url = KURL::fromPathOrURL( config->readPathEntry( TQString("URL_") + number )); @@ -610,9 +610,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal ) TQString description = config->readEntry( TQString("Description_") + number ); if (description.isEmpty() && url.protocol()=="beagle") { - KIO::UDSEntry uds; + TDEIO::UDSEntry uds; const KURL kurl("beagle:?beagled-status"); - if (!KIO::NetAccess::stat(kurl, uds)) + if (!TDEIO::NetAccess::stat(kurl, uds)) return; description = i18n("Desktop Search"); @@ -626,9 +626,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal ) config->readNumEntry( TQString("IconGroup_") + number )) ); } -void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup ) +void KURLBar::writeConfig( TDEConfig *config, const TQString& itemGroup ) { - KConfigGroupSaver cs1( config, itemGroup ); + TDEConfigGroupSaver cs1( config, itemGroup ); if(!config->hasDefault("Speedbar IconSize") && m_iconSize == d->defaultIconSize ) config->revertToDefault("Speedbar IconSize"); else @@ -685,7 +685,7 @@ void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup ) m_isModified = false; } -void KURLBar::writeItem( KURLBarItem *item, int i, KConfig *config, +void KURLBar::writeItem( KURLBarItem *item, int i, TDEConfig *config, bool global ) { if ( !item->isPersistent() ) diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index 29a73ff34..df9d15790 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -28,7 +28,7 @@ #include #include -class KConfig; +class TDEConfig; class KURLBar; /** @@ -215,7 +215,7 @@ class KURLBarListBox; * read and write the configuration of all the entries. It can differentiate * between global and local entries -- global entries will be saved in the * global configuration (kdeglobals), while local entries will be saved in - * your application's KConfig object. + * your application's TDEConfig object. * * Due to the configurability, you usually only insert some default entries * once and then solely use the read and writeConfig methods to preserve the @@ -331,27 +331,27 @@ public: * inside the group @p itemGroup. All items in there will be restored. * The reading of every item is delegated to the readItem() method. */ - virtual void readConfig( KConfig *config, const TQString& itemGroup ); + virtual void readConfig( TDEConfig *config, const TQString& itemGroup ); /** * Call this method to save the current configuration into @p config, * inside the group @p iconGroup. The writeItem() method is used * to save each item. */ - virtual void writeConfig( KConfig *config, const TQString& itemGroup ); + virtual void writeConfig( TDEConfig *config, const TQString& itemGroup ); /** * Called from readConfig() to read the i'th from @p config. * After reading a KURLBarItem is created and initialized with the read * values (as well as the given @p applicationLocal). */ - virtual void readItem( int i, KConfig *config, bool applicationLocal ); + virtual void readItem( int i, TDEConfig *config, bool applicationLocal ); /** * Called from writeConfig() to save the KURLBarItem @p item as the * i'th entry in the config-object. * @p global tell whether it should be saved in the global configuration - * or not (using KConfig::writeEntry( key, value, true, global ) ). + * or not (using TDEConfig::writeEntry( key, value, true, global ) ). */ - virtual void writeItem( KURLBarItem *item, int i, KConfig *, bool global ); + virtual void writeItem( KURLBarItem *item, int i, TDEConfig *, bool global ); /** * @returns the current KURLBarItem, or 0L if none. diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp index 9e00687ac..1fc6da496 100644 --- a/kio/kfile/tests/kcustommenueditortest.cpp +++ b/kio/kfile/tests/kcustommenueditortest.cpp @@ -8,7 +8,7 @@ int main(int argc, char** argv) KLocale::setMainCatalogue("tdelibs"); TDEApplication app(argc, argv, "KCustomMenuEditorTest"); KCustomMenuEditor editor(0); - KConfig *cfg = new KConfig("kdesktop_custom_menu2"); + TDEConfig *cfg = new TDEConfig("kdesktop_custom_menu2"); editor.load(cfg); if (editor.exec()) { diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp index 6f0592ac4..483bc682f 100644 --- a/kio/kio/authinfo.cpp +++ b/kio/kio/authinfo.cpp @@ -39,7 +39,7 @@ #define NETRC_READ_BUF_SIZE 4096 -using namespace KIO; +using namespace TDEIO; AuthInfo::AuthInfo() { @@ -72,7 +72,7 @@ AuthInfo& AuthInfo::operator= ( const AuthInfo& info ) return *this; } -TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a) +TQDataStream& TDEIO::operator<< (TQDataStream& s, const AuthInfo& a) { s << a.url << a.username << a.password << a.prompt << a.caption << a.comment << a.commentLabel << a.realmValue << a.digestInfo @@ -81,7 +81,7 @@ TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a) return s; } -TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a) +TQDataStream& TDEIO::operator>> (TQDataStream& s, AuthInfo& a) { TQ_UINT8 verify = 0; TQ_UINT8 ro = 0; diff --git a/kio/kio/authinfo.h b/kio/kio/authinfo.h index 3f92e58d1..130db0857 100644 --- a/kio/kio/authinfo.h +++ b/kio/kio/authinfo.h @@ -26,7 +26,7 @@ #include -namespace KIO { +namespace TDEIO { /** * This class is intended to make it easier to prompt for, cache diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp index e1d343c10..e1c8a64e4 100644 --- a/kio/kio/chmodjob.cpp +++ b/kio/kio/chmodjob.cpp @@ -38,12 +38,12 @@ #include -using namespace KIO; +using namespace TDEIO; ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask, int newOwner, int newGroup, bool recursive, bool showProgressInfo ) - : KIO::Job( showProgressInfo ), state( STATE_LISTING ), + : TDEIO::Job( showProgressInfo ), state( STATE_LISTING ), m_permissions( permissions ), m_mask( mask ), m_newOwner( newOwner ), m_newGroup( newGroup ), m_recursive( recursive ), m_lstItems( lstItems ) @@ -76,11 +76,11 @@ void ChmodJob::processList() if ( item->isDir() && m_recursive ) { //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl; - KIO::ListJob * listJob = KIO::listRecursive( item->url(), false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( KIO::Job *, - const KIO::UDSEntryList& )), - TQT_SLOT( slotEntries( KIO::Job*, - const KIO::UDSEntryList& ))); + TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ ); + connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + const TDEIO::UDSEntryList& )), + TQT_SLOT( slotEntries( TDEIO::Job*, + const TDEIO::UDSEntryList& ))); addSubjob( listJob ); return; // we'll come back later, when this one's finished } @@ -93,28 +93,28 @@ void ChmodJob::processList() chmodNextFile(); } -void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) +void ChmodJob::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list ) { - KIO::UDSEntryListConstIterator it = list.begin(); - KIO::UDSEntryListConstIterator end = list.end(); + TDEIO::UDSEntryListConstIterator it = list.begin(); + TDEIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { - KIO::UDSEntry::ConstIterator it2 = (*it).begin(); + TDEIO::UDSEntry::ConstIterator it2 = (*it).begin(); mode_t permissions = 0; bool isDir = false; bool isLink = false; TQString relativePath; for( ; it2 != (*it).end(); it2++ ) { switch( (*it2).m_uds ) { - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: relativePath = (*it2).m_str; break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: isDir = S_ISDIR((*it2).m_long); break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: isLink = !(*it2).m_str.isEmpty(); break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: permissions = (mode_t)((*it2).m_long); break; default: @@ -182,7 +182,7 @@ void ChmodJob::chmodNextFile() kdDebug(7007) << "ChmodJob::chmodNextFile chmod'ing " << info.url.prettyURL() << " to " << TQString::number(info.permissions,8) << endl; - KIO::SimpleJob * job = KIO::chmod( info.url, info.permissions ); + TDEIO::SimpleJob * job = TDEIO::chmod( info.url, info.permissions ); // copy the metadata for acl and default acl const TQString aclString = queryMetaData( "ACL_STRING" ); const TQString defaultAclString = queryMetaData( "DEFAULT_ACL_STRING" ); @@ -197,7 +197,7 @@ void ChmodJob::chmodNextFile() emitResult(); } -void ChmodJob::slotResult( KIO::Job * job ) +void ChmodJob::slotResult( TDEIO::Job * job ) { if ( job->error() ) { @@ -206,7 +206,7 @@ void ChmodJob::slotResult( KIO::Job * job ) emitResult(); return; } - //kdDebug(7007) << " ChmodJob::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl; + //kdDebug(7007) << " ChmodJob::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl; switch ( state ) { case STATE_LISTING: @@ -227,7 +227,7 @@ void ChmodJob::slotResult( KIO::Job * job ) } // antlarr: KDE 4: Make owner and group be const TQString & -KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int mask, +KIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask, TQString owner, TQString group, bool recursive, bool showProgressInfo ) { @@ -253,6 +253,6 @@ KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, } void ChmodJob::virtual_hook( int id, void* data ) -{ KIO::Job::virtual_hook( id, data ); } +{ TDEIO::Job::virtual_hook( id, data ); } #include "chmodjob.moc" diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h index fdb873b17..c501add6a 100644 --- a/kio/kio/chmodjob.h +++ b/kio/kio/chmodjob.h @@ -28,19 +28,19 @@ #include #include -namespace KIO { +namespace TDEIO { /** * This job changes permissions on a list of files or directories, * optionally in a recursive manner. - * @see KIO::chmod() + * @see TDEIO::chmod() */ - class KIO_EXPORT ChmodJob : public KIO::Job + class KIO_EXPORT ChmodJob : public TDEIO::Job { Q_OBJECT public: /** - * Create new ChmodJobs using the KIO::chmod() function. + * Create new ChmodJobs using the TDEIO::chmod() function. */ ChmodJob( const KFileItemList & lstItems, int permissions, int mask, int newOwner, int newGroup, @@ -51,8 +51,8 @@ namespace KIO { protected slots: - virtual void slotResult( KIO::Job *job ); - void slotEntries( KIO::Job * , const KIO::UDSEntryList & ); + virtual void slotResult( TDEIO::Job *job ); + void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList & ); void processList(); private: diff --git a/kio/kio/connection.cpp b/kio/kio/connection.cpp index b2a84a798..d85f4921c 100644 --- a/kio/kio/connection.cpp +++ b/kio/kio/connection.cpp @@ -43,7 +43,7 @@ #include #include -using namespace KIO; +using namespace TDEIO; Connection::Connection() { @@ -83,7 +83,7 @@ void Connection::close() delete socket; socket = 0; - // KSocket has already closed the file descriptor, but we need to + // TDESocket has already closed the file descriptor, but we need to // close the file-stream as well otherwise we leak memory. // As a result we close the file descriptor twice, but that should // be harmless @@ -121,7 +121,7 @@ void Connection::dequeue() } } -void Connection::init(KSocket *sock) +void Connection::init(TDESocket *sock) { delete notifier; notifier = 0; diff --git a/kio/kio/connection.h b/kio/kio/connection.h index a30131af8..720e4e935 100644 --- a/kio/kio/connection.h +++ b/kio/kio/connection.h @@ -30,10 +30,10 @@ #include #include -class KSocket; +class TDESocket; class TQSocketNotifier; -namespace KIO { +namespace TDEIO { struct KIO_EXPORT Task { int cmd; @@ -62,7 +62,7 @@ namespace KIO { * @param sock the socket to use * @see inited() */ - void init(KSocket *sock); + void init(TDESocket *sock); /** * Initialize the connection to use the given file * descriptors. @@ -143,7 +143,7 @@ namespace KIO { private: int fd_in; FILE *f_out; - KSocket *socket; + TDESocket *socket; TQSocketNotifier *notifier; TQObject *receiver; const char *member; diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp index 0ee463d87..1e3db04d7 100644 --- a/kio/kio/dataprotocol.cpp +++ b/kio/kio/dataprotocol.cpp @@ -42,7 +42,7 @@ # define DISPATCH(f) f #endif -using namespace KIO; +using namespace TDEIO; #ifdef DATAKIOSLAVE extern "C" { diff --git a/kio/kio/dataprotocol.h b/kio/kio/dataprotocol.h index 44dccfcce..472b42886 100644 --- a/kio/kio/dataprotocol.h +++ b/kio/kio/dataprotocol.h @@ -37,14 +37,14 @@ class KURL; # include "kio/dataslave.h" #endif -namespace KIO { +namespace TDEIO { /** This kioslave provides support of data urls as specified by rfc 2397 * @see http://www.ietf.org/rfc/rfc2397.txt * @author Leo Savernik */ #if defined(DATAKIOSLAVE) -class DataProtocol : public KIO::SlaveBase { +class DataProtocol : public TDEIO::SlaveBase { #elif defined(TESTKIO) class DataProtocol : public TestSlave { #else diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp index d16ecc0d4..528368ba5 100644 --- a/kio/kio/dataslave.cpp +++ b/kio/kio/dataslave.cpp @@ -28,7 +28,7 @@ #include -using namespace KIO; +using namespace TDEIO; #define KIO_DATA_POLL_INTERVAL 0 @@ -198,12 +198,12 @@ void DataSlave::virtual_hook( int id, void* data ) { return; } default: - KIO::Slave::virtual_hook( id, data ); + TDEIO::Slave::virtual_hook( id, data ); } } DISPATCH_IMPL1(mimeType, const TQString &, s) -DISPATCH_IMPL1(totalSize, KIO::filesize_t, size) +DISPATCH_IMPL1(totalSize, TDEIO::filesize_t, size) DISPATCH_IMPL(sendMetaData) DISPATCH_IMPL1(data, const TQByteArray &, ba) diff --git a/kio/kio/dataslave.h b/kio/kio/dataslave.h index 71eae6cd3..3567f3faf 100644 --- a/kio/kio/dataslave.h +++ b/kio/kio/dataslave.h @@ -35,7 +35,7 @@ class TQTimer; #define DISPATCH_DECL1(type, paramtype, param) \ void dispatch_##type(paramtype param); -namespace KIO { +namespace TDEIO { /** * This class provides a high performance implementation for the data @@ -46,7 +46,7 @@ namespace KIO { * detail of KIO and subject to change without notice. * @author Leo Savernik */ - class DataSlave : public KIO::Slave { + class DataSlave : public TDEIO::Slave { Q_OBJECT public: DataSlave(); @@ -90,7 +90,7 @@ namespace KIO { struct QueueStruct { QueueType type; TQString s; - KIO::filesize_t size; + TDEIO::filesize_t size; TQByteArray ba; QueueStruct() {} @@ -100,7 +100,7 @@ namespace KIO { DispatchQueue dispatchQueue; DISPATCH_DECL1(mimeType, const TQString &, s) - DISPATCH_DECL1(totalSize, KIO::filesize_t, size) + DISPATCH_DECL1(totalSize, TDEIO::filesize_t, size) DISPATCH_DECL(sendMetaData) DISPATCH_DECL1(data, const TQByteArray &, ba) DISPATCH_DECL(finished) diff --git a/kio/kio/davjob.cpp b/kio/kio/davjob.cpp index 1f3b208a6..f1ba2d2d4 100644 --- a/kio/kio/davjob.cpp +++ b/kio/kio/davjob.cpp @@ -40,7 +40,7 @@ #define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream -using namespace KIO; +using namespace TDEIO; class DavJob::DavJobPrivate { @@ -50,7 +50,7 @@ public: }; DavJob::DavJob( const KURL& url, int method, const TQString& request, bool showProgressInfo ) - : TransferJob( url, KIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo ) + : TransferJob( url, TDEIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo ) { d = new DavJobPrivate; // We couldn't set the args when calling the parent constructor, @@ -86,10 +86,10 @@ void DavJob::slotFinished() istream >> s_url; istream >> s_method; // PROPFIND - if ( (s_cmd == 7) && (s_method == (int)KIO::DAV_PROPFIND) ) { + if ( (s_cmd == 7) && (s_method == (int)TDEIO::DAV_PROPFIND) ) { m_packedArgs.truncate(0); TQDataStream stream( m_packedArgs, IO_WriteOnly ); - stream << (int)7 << m_redirectionURL << (int)KIO::DAV_PROPFIND; + stream << (int)7 << m_redirectionURL << (int)TDEIO::DAV_PROPFIND; } } else if ( ! m_response.setContent( d->str_response, true ) ) { // An error occurred parsing the XML response @@ -114,20 +114,20 @@ void DavJob::slotFinished() /* Convenience methods */ // KDE 4: Make it const TQString & -DavJob* KIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo ) +DavJob* TDEIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo ) { - DavJob *job = new DavJob( url, (int) KIO::DAV_PROPFIND, properties.toString(), showProgressInfo ); + DavJob *job = new DavJob( url, (int) TDEIO::DAV_PROPFIND, properties.toString(), showProgressInfo ); job->addMetaData( "davDepth", depth ); return job; } -DavJob* KIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo ) +DavJob* TDEIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo ) { - return new DavJob( url, (int) KIO::DAV_PROPPATCH, properties.toString(), showProgressInfo ); + return new DavJob( url, (int) TDEIO::DAV_PROPPATCH, properties.toString(), showProgressInfo ); } -DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo ) +DavJob* TDEIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo ) { TQDomDocument doc; TQDomElement searchrequest = doc.createElementNS( "DAV:", "searchrequest" ); @@ -136,7 +136,7 @@ DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& searchelement.appendChild( text ); searchrequest.appendChild( searchelement ); doc.appendChild( searchrequest ); - return new DavJob( url, KIO::DAV_SEARCH, doc.toString(), showProgressInfo ); + return new DavJob( url, TDEIO::DAV_SEARCH, doc.toString(), showProgressInfo ); } #include "davjob.moc" diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h index 98d0fe702..3232f9e00 100644 --- a/kio/kio/davjob.h +++ b/kio/kio/davjob.h @@ -39,7 +39,7 @@ class Observer; class TQTimer; -namespace KIO { +namespace TDEIO { class Slave; class SlaveInterface; @@ -49,9 +49,9 @@ namespace KIO { * Data is sent to the slave on request of the slave ( dataReq). * If data coming from the slave can not be handled, the * reading of data from the slave should be suspended. - * @see KIO::davPropFind() - * @see KIO::davPropPatch() - * @see KIO::davSearch() + * @see TDEIO::davPropFind() + * @see TDEIO::davPropPatch() + * @see TDEIO::davSearch() * @since 3.1 */ class KIO_EXPORT DavJob : public TransferJob { @@ -59,8 +59,8 @@ namespace KIO { public: /** - * Use KIO::davPropFind(), KIO::davPropPatch() and - * KIO::davSearch() to create a new DavJob. + * Use TDEIO::davPropFind(), TDEIO::davPropPatch() and + * TDEIO::davSearch() to create a new DavJob. */ DavJob(const KURL& url, int method, const TQString& request, bool showProgressInfo); diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 3f16f565f..72bec0cfc 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -42,7 +42,7 @@ #include "jobclasses.h" #include "defaultprogress.h" -namespace KIO { +namespace TDEIO { class DefaultProgress::DefaultProgressPrivate { @@ -184,7 +184,7 @@ DefaultProgress::~DefaultProgress() delete d; } -void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) +void DefaultProgress::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ) { // size is measured in bytes if ( m_iTotalSize == size ) @@ -195,7 +195,7 @@ void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) } -void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files ) +void DefaultProgress::slotTotalFiles( TDEIO::Job*, unsigned long files ) { if ( m_iTotalFiles == files ) return; @@ -204,7 +204,7 @@ void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files ) } -void DefaultProgress::slotTotalDirs( KIO::Job*, unsigned long dirs ) +void DefaultProgress::slotTotalDirs( TDEIO::Job*, unsigned long dirs ) { if ( m_iTotalDirs == dirs ) return; @@ -232,18 +232,18 @@ void DefaultProgress::showTotals() //static TQString DefaultProgress::makePercentString( unsigned long percent, - KIO::filesize_t totalSize, + TDEIO::filesize_t totalSize, unsigned long totalFiles ) { if ( totalSize ) - return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , KIO::convertSize( totalSize ) ); + return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , TDEIO::convertSize( totalSize ) ); else if ( totalFiles ) return i18n( "%1 % of 1 file", "%1 % of %n files", totalFiles ).arg( percent ); else return i18n( "%1 %" ).arg( percent ); } -void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent ) +void DefaultProgress::slotPercent( TDEIO::Job*, unsigned long percent ) { TQString caption = makePercentString( percent, m_iTotalSize, m_iTotalFiles ); m_pProgressBar->setValue( percent ); @@ -270,26 +270,26 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent ) } -void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg ) +void DefaultProgress::slotInfoMessage( TDEIO::Job*, const TQString & msg ) { speedLabel->setText( msg ); speedLabel->setAlignment( speedLabel->alignment() & ~TQt::WordBreak ); } -void DefaultProgress::slotProcessedSize( KIO::Job*, KIO::filesize_t bytes ) { +void DefaultProgress::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t bytes ) { if ( m_iProcessedSize == bytes ) return; m_iProcessedSize = bytes; TQString tmp = i18n( "%1 of %2 complete") - .arg( KIO::convertSize(bytes) ) - .arg( KIO::convertSize(m_iTotalSize)); + .arg( TDEIO::convertSize(bytes) ) + .arg( TDEIO::convertSize(m_iTotalSize)); sizeLabel->setText( tmp ); } -void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs ) +void DefaultProgress::slotProcessedDirs( TDEIO::Job*, unsigned long dirs ) { if ( m_iProcessedDirs == dirs ) return; @@ -303,7 +303,7 @@ void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs ) } -void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files ) +void DefaultProgress::slotProcessedFiles( TDEIO::Job*, unsigned long files ) { if ( m_iProcessedFiles == files ) return; @@ -319,18 +319,18 @@ void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files ) } -void DefaultProgress::slotSpeed( KIO::Job*, unsigned long speed ) +void DefaultProgress::slotSpeed( TDEIO::Job*, unsigned long speed ) { if ( speed == 0 ) { speedLabel->setText( i18n( "Stalled") ); } else { - speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( KIO::convertSize( speed )) - .arg( KIO::convertSeconds( KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) ); + speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( TDEIO::convertSize( speed )) + .arg( TDEIO::convertSeconds( TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) ); } } -void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to ) +void DefaultProgress::slotCopying( TDEIO::Job*, const KURL& from, const KURL& to ) { if ( d->noCaptionYet ) { setCaption(i18n("Copy File(s) Progress")); @@ -344,7 +344,7 @@ void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to ) } -void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to ) +void DefaultProgress::slotMoving( TDEIO::Job*, const KURL& from, const KURL& to ) { if ( d->noCaptionYet ) { setCaption(i18n("Move File(s) Progress")); @@ -358,7 +358,7 @@ void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to ) } -void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir ) +void DefaultProgress::slotCreatingDir( TDEIO::Job*, const KURL& dir ) { if ( d->noCaptionYet ) { setCaption(i18n("Creating Folder")); @@ -370,7 +370,7 @@ void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir ) } -void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url ) +void DefaultProgress::slotDeleting( TDEIO::Job*, const KURL& url ) { if ( d->noCaptionYet ) { setCaption(i18n("Delete File(s) Progress")); @@ -381,7 +381,7 @@ void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url ) setDestVisible( false ); } -void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url ) +void DefaultProgress::slotTransferring( TDEIO::Job*, const KURL& url ) { if ( d->noCaptionYet ) { setCaption(i18n("Loading Progress")); @@ -391,31 +391,31 @@ void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url ) setDestVisible( false ); } -void DefaultProgress::slotStating( KIO::Job*, const KURL& url ) +void DefaultProgress::slotStating( TDEIO::Job*, const KURL& url ) { setCaption(i18n("Examining File Progress")); sourceEdit->setText(url.prettyURL()); setDestVisible( false ); } -void DefaultProgress::slotMounting( KIO::Job*, const TQString & dev, const TQString & point ) +void DefaultProgress::slotMounting( TDEIO::Job*, const TQString & dev, const TQString & point ) { setCaption(i18n("Mounting %1").arg(dev)); sourceEdit->setText(point); setDestVisible( false ); } -void DefaultProgress::slotUnmounting( KIO::Job*, const TQString & point ) +void DefaultProgress::slotUnmounting( TDEIO::Job*, const TQString & point ) { setCaption(i18n("Unmounting")); sourceEdit->setText(point); setDestVisible( false ); } -void DefaultProgress::slotCanResume( KIO::Job*, KIO::filesize_t resume ) +void DefaultProgress::slotCanResume( TDEIO::Job*, TDEIO::filesize_t resume ) { if ( resume ) { - resumeLabel->setText( i18n("Resuming from %1").arg(KIO::number(resume)) ); + resumeLabel->setText( i18n("Resuming from %1").arg(TDEIO::number(resume)) ); } else { resumeLabel->setText( i18n("Not resumable") ); } @@ -453,7 +453,7 @@ void DefaultProgress::slotClean() { int s = d->startTime.elapsed(); if (!s) s = 1; - speedLabel->setText(i18n("%1/s (done)").arg(KIO::convertSize(1000 * m_iTotalSize / s))); + speedLabel->setText(i18n("%1/s (done)").arg(TDEIO::convertSize(1000 * m_iTotalSize / s))); } setOnlyClean(false); } diff --git a/kio/kio/defaultprogress.h b/kio/kio/defaultprogress.h index 8dca499bd..68d405b24 100644 --- a/kio/kio/defaultprogress.h +++ b/kio/kio/defaultprogress.h @@ -28,7 +28,7 @@ class KLineEdit; -namespace KIO { +namespace TDEIO { /* * A default implementation of the progress dialog ProgressBase. @@ -58,59 +58,59 @@ public: /// Shared with uiserver.cpp static TQString makePercentString( unsigned long percent, - KIO::filesize_t totalSize, + TDEIO::filesize_t totalSize, unsigned long totalFiles ); public slots: - virtual void slotTotalSize( KIO::Job *job, KIO::filesize_t size ); - virtual void slotTotalFiles( KIO::Job *job, unsigned long files ); - virtual void slotTotalDirs( KIO::Job *job, unsigned long dirs ); + virtual void slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size ); + virtual void slotTotalFiles( TDEIO::Job *job, unsigned long files ); + virtual void slotTotalDirs( TDEIO::Job *job, unsigned long dirs ); - virtual void slotProcessedSize( KIO::Job *job, KIO::filesize_t bytes ); - virtual void slotProcessedFiles( KIO::Job *job, unsigned long files ); - virtual void slotProcessedDirs( KIO::Job *job, unsigned long dirs ); + virtual void slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t bytes ); + virtual void slotProcessedFiles( TDEIO::Job *job, unsigned long files ); + virtual void slotProcessedDirs( TDEIO::Job *job, unsigned long dirs ); - virtual void slotSpeed( KIO::Job *job, unsigned long speed ); - virtual void slotPercent( KIO::Job *job, unsigned long percent ); + virtual void slotSpeed( TDEIO::Job *job, unsigned long speed ); + virtual void slotPercent( TDEIO::Job *job, unsigned long percent ); /** * Called to set an information message. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param msg the message to set */ - virtual void slotInfoMessage( KIO::Job *job, const TQString & msg ); + virtual void slotInfoMessage( TDEIO::Job *job, const TQString & msg ); - virtual void slotCopying( KIO::Job* job, const KURL& src, const KURL& dest ); - virtual void slotMoving( KIO::Job* job, const KURL& src, const KURL& dest ); - virtual void slotDeleting( KIO::Job* job, const KURL& url ); + virtual void slotCopying( TDEIO::Job* job, const KURL& src, const KURL& dest ); + virtual void slotMoving( TDEIO::Job* job, const KURL& src, const KURL& dest ); + virtual void slotDeleting( TDEIO::Job* job, const KURL& url ); /** * Called when the job is transferring. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param url the url to transfer * @since 3.1 */ - void slotTransferring( KIO::Job* job, const KURL& url ); - virtual void slotCreatingDir( KIO::Job* job, const KURL& dir ); + void slotTransferring( TDEIO::Job* job, const KURL& url ); + virtual void slotCreatingDir( TDEIO::Job* job, const KURL& dir ); /** * Called when the job is requesting a stat. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param dir the dir to stat * @since 3.1 */ - virtual void slotStating( KIO::Job* job, const KURL& dir ); + virtual void slotStating( TDEIO::Job* job, const KURL& dir ); /** * Called when the job is mounting. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param dev the device to mount * @param point the mount point */ - virtual void slotMounting( KIO::Job* job, const TQString & dev, const TQString & point ); + virtual void slotMounting( TDEIO::Job* job, const TQString & dev, const TQString & point ); /** * Called when the job is unmounting. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param point the mount point */ - virtual void slotUnmounting( KIO::Job* job, const TQString & point ); - virtual void slotCanResume( KIO::Job* job, KIO::filesize_t from); + virtual void slotUnmounting( TDEIO::Job* job, const TQString & point ); + virtual void slotCanResume( TDEIO::Job* job, TDEIO::filesize_t from); /** * Called when the job is cleaned. @@ -136,11 +136,11 @@ protected: KProgress* m_pProgressBar; - KIO::filesize_t m_iTotalSize; + TDEIO::filesize_t m_iTotalSize; unsigned long m_iTotalFiles; unsigned long m_iTotalDirs; - KIO::filesize_t m_iProcessedSize; + TDEIO::filesize_t m_iProcessedSize; unsigned long m_iProcessedDirs; unsigned long m_iProcessedFiles; diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp index 17f12900a..53121986d 100644 --- a/kio/kio/forwardingslavebase.cpp +++ b/kio/kio/forwardingslavebase.cpp @@ -27,7 +27,7 @@ #include "forwardingslavebase.h" -namespace KIO +namespace TDEIO { class ForwardingSlaveBasePrivate @@ -63,7 +63,7 @@ bool ForwardingSlaveBase::internalRewriteURL(const KURL &url, KURL &newURL) return result; } -void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry, +void ForwardingSlaveBase::prepareUDSEntry(TDEIO::UDSEntry &entry, bool listing) const { kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing==" @@ -73,8 +73,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry, TQString name; KURL url; - KIO::UDSEntry::iterator it = entry.begin(); - KIO::UDSEntry::iterator end = entry.end(); + TDEIO::UDSEntry::iterator it = entry.begin(); + TDEIO::UDSEntry::iterator end = entry.end(); for(; it!=end; ++it) { @@ -82,11 +82,11 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry, switch( (*it).m_uds ) { - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: name = (*it).m_str; kdDebug() << "Name = " << name << endl; break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: url_found = true; url = (*it).m_str; if (listing) @@ -108,8 +108,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry, new_url.addPath( name ); } - KIO::UDSAtom atom; - atom.m_uds = KIO::UDS_LOCAL_PATH; + TDEIO::UDSAtom atom; + atom.m_uds = TDEIO::UDS_LOCAL_PATH; atom.m_long = 0; atom.m_str = new_url.path(); entry.append(atom); @@ -123,7 +123,7 @@ void ForwardingSlaveBase::get(const KURL &url) KURL new_url; if ( internalRewriteURL(url, new_url) ) { - KIO::TransferJob *job = KIO::get(new_url, false, false); + TDEIO::TransferJob *job = TDEIO::get(new_url, false, false); connectTransferJob(job); tqApp->eventLoop()->enterLoop(); @@ -138,7 +138,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions, KURL new_url; if ( internalRewriteURL(url, new_url) ) { - KIO::TransferJob *job = KIO::put(new_url, permissions, overwrite, + TDEIO::TransferJob *job = TDEIO::put(new_url, permissions, overwrite, resume, false); connectTransferJob(job); @@ -153,7 +153,7 @@ void ForwardingSlaveBase::stat(const KURL &url) KURL new_url; if ( internalRewriteURL(url, new_url) ) { - KIO::SimpleJob *job = KIO::stat(new_url, false); + TDEIO::SimpleJob *job = TDEIO::stat(new_url, false); connectSimpleJob(job); tqApp->eventLoop()->enterLoop(); @@ -167,7 +167,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url) KURL new_url; if ( internalRewriteURL(url, new_url) ) { - KIO::TransferJob *job = KIO::mimetype(new_url, false); + TDEIO::TransferJob *job = TDEIO::mimetype(new_url, false); connectTransferJob(job); tqApp->eventLoop()->enterLoop(); @@ -181,7 +181,7 @@ void ForwardingSlaveBase::listDir(const KURL &url) KURL new_url; if ( internalRewriteURL(url, new_url) ) { - KIO::ListJob *job = KIO::listDir(new_url, false); + TDEIO::ListJob *job = TDEIO::listDir(new_url, false); connectListJob(job); tqApp->eventLoop()->enterLoop(); @@ -195,7 +195,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions) KURL new_url; if ( internalRewriteURL(url, new_url) ) { - KIO::SimpleJob *job = KIO::mkdir(new_url, permissions); + TDEIO::SimpleJob *job = TDEIO::mkdir(new_url, permissions); connectSimpleJob(job); tqApp->eventLoop()->enterLoop(); @@ -210,7 +210,7 @@ void ForwardingSlaveBase::rename(const KURL &src, const KURL &dest, KURL new_src, new_dest; if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) ) { - KIO::Job *job = KIO::rename(new_src, new_dest, overwrite); + TDEIO::Job *job = TDEIO::rename(new_src, new_dest, overwrite); connectJob(job); tqApp->eventLoop()->enterLoop(); @@ -225,7 +225,7 @@ void ForwardingSlaveBase::symlink(const TQString &target, const KURL &dest, KURL new_dest; if ( internalRewriteURL(dest, new_dest) ) { - KIO::SimpleJob *job = KIO::symlink(target, new_dest, overwrite, false); + TDEIO::SimpleJob *job = TDEIO::symlink(target, new_dest, overwrite, false); connectSimpleJob(job); tqApp->eventLoop()->enterLoop(); @@ -239,7 +239,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions) KURL new_url; if ( internalRewriteURL(url, new_url) ) { - KIO::SimpleJob *job = KIO::chmod(new_url, permissions); + TDEIO::SimpleJob *job = TDEIO::chmod(new_url, permissions); connectSimpleJob(job); tqApp->eventLoop()->enterLoop(); @@ -254,7 +254,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest, KURL new_src, new_dest; if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) ) { - KIO::Job *job = KIO::file_copy(new_src, new_dest, permissions, + TDEIO::Job *job = TDEIO::file_copy(new_src, new_dest, permissions, overwrite, false); connectJob(job); @@ -271,12 +271,12 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile) { if (isfile) { - KIO::DeleteJob *job = KIO::del(new_url, false, false); + TDEIO::DeleteJob *job = TDEIO::del(new_url, false, false); connectJob(job); } else { - KIO::SimpleJob *job = KIO::rmdir(new_url); + TDEIO::SimpleJob *job = TDEIO::rmdir(new_url); connectSimpleJob(job); } @@ -291,7 +291,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL) KURL new_url; if ( internalRewriteURL(remoteURL, new_url) ) { - KIO::LocalURLJob *job = KIO::localURL(new_url); + TDEIO::LocalURLJob *job = TDEIO::localURL(new_url); connectLocalURLJob(job); tqApp->eventLoop()->enterLoop(); @@ -305,7 +305,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL) ////////////////////////////////////////////////////////////////////////////// -void ForwardingSlaveBase::connectJob(KIO::Job *job) +void ForwardingSlaveBase::connectJob(TDEIO::Job *job) { // We will forward the warning message, no need to let the job // display it itself @@ -320,57 +320,57 @@ void ForwardingSlaveBase::connectJob(KIO::Job *job) kdDebug() << it.key() << " = " << it.data() << endl; #endif - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( slotResult(KIO::Job *) ) ); - connect( job, TQT_SIGNAL( warning(KIO::Job *, const TQString &) ), - this, TQT_SLOT( slotWarning(KIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( infoMessage(KIO::Job *, const TQString &) ), - this, TQT_SLOT( slotInfoMessage(KIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( totalSize(KIO::Job *, KIO::filesize_t) ), - this, TQT_SLOT( slotTotalSize(KIO::Job *, KIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(KIO::Job *, KIO::filesize_t) ), - this, TQT_SLOT( slotProcessedSize(KIO::Job *, KIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( speed(KIO::Job *, unsigned long) ), - this, TQT_SLOT( slotSpeed(KIO::Job *, unsigned long) ) ); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( slotResult(TDEIO::Job *) ) ); + connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ), + this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); + connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), + this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); + connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ), + this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); } -void ForwardingSlaveBase::connectSimpleJob(KIO::SimpleJob *job) +void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( redirection(KIO::Job *, const KURL &) ), - this, TQT_SLOT( slotRedirection(KIO::Job *, const KURL &) ) ); + connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), + this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); } -void ForwardingSlaveBase::connectListJob(KIO::ListJob *job) +void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( entries(KIO::Job *, const KIO::UDSEntryList &) ), - this, TQT_SLOT( slotEntries(KIO::Job *, const KIO::UDSEntryList &) ) ); + connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), + this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); } -void ForwardingSlaveBase::connectTransferJob(KIO::TransferJob *job) +void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ), - this, TQT_SLOT( slotData(KIO::Job *, const TQByteArray &) ) ); - connect( job, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ), - this, TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray &) ) ); - connect( job, TQT_SIGNAL( mimetype(KIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( canResume(KIO::Job *, KIO::filesize_t) ), - this, TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t) ) ); + connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); + connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), + this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); + connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); } -void ForwardingSlaveBase::connectLocalURLJob(KIO::LocalURLJob *job) +void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( localURL(KIO::Job *, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(KIO::Job *, const KURL&, bool) ) ); + connect( job, TQT_SIGNAL( localURL(TDEIO::Job *, const KURL&, bool) ), + this, TQT_SLOT( slotLocalURL(TDEIO::Job *, const KURL&, bool) ) ); } ////////////////////////////////////////////////////////////////////////////// -void ForwardingSlaveBase::slotResult(KIO::Job *job) +void ForwardingSlaveBase::slotResult(TDEIO::Job *job) { if ( job->error() != 0) { @@ -378,10 +378,10 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job) } else { - KIO::StatJob *stat_job = dynamic_cast(job); + TDEIO::StatJob *stat_job = dynamic_cast(job); if ( stat_job!=0L ) { - KIO::UDSEntry entry = stat_job->statResult(); + TDEIO::UDSEntry entry = stat_job->statResult(); prepareUDSEntry(entry); statEntry( entry ); } @@ -391,32 +391,32 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job) tqApp->eventLoop()->exitLoop(); } -void ForwardingSlaveBase::slotWarning(KIO::Job* /*job*/, const TQString &msg) +void ForwardingSlaveBase::slotWarning(TDEIO::Job* /*job*/, const TQString &msg) { warning(msg); } -void ForwardingSlaveBase::slotInfoMessage(KIO::Job* /*job*/, const TQString &msg) +void ForwardingSlaveBase::slotInfoMessage(TDEIO::Job* /*job*/, const TQString &msg) { infoMessage(msg); } -void ForwardingSlaveBase::slotTotalSize(KIO::Job* /*job*/, KIO::filesize_t size) +void ForwardingSlaveBase::slotTotalSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size) { totalSize(size); } -void ForwardingSlaveBase::slotProcessedSize(KIO::Job* /*job*/, KIO::filesize_t size) +void ForwardingSlaveBase::slotProcessedSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size) { processedSize(size); } -void ForwardingSlaveBase::slotSpeed(KIO::Job* /*job*/, unsigned long bytesPerSecond) +void ForwardingSlaveBase::slotSpeed(TDEIO::Job* /*job*/, unsigned long bytesPerSecond) { speed(bytesPerSecond); } -void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url) +void ForwardingSlaveBase::slotRedirection(TDEIO::Job *job, const KURL &url) { redirection(url); @@ -427,13 +427,13 @@ void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url) tqApp->eventLoop()->exitLoop(); } -void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/, - const KIO::UDSEntryList &entries) +void ForwardingSlaveBase::slotEntries(TDEIO::Job* /*job*/, + const TDEIO::UDSEntryList &entries) { - KIO::UDSEntryList final_entries = entries; + TDEIO::UDSEntryList final_entries = entries; - KIO::UDSEntryList::iterator it = final_entries.begin(); - KIO::UDSEntryList::iterator end = final_entries.end(); + TDEIO::UDSEntryList::iterator it = final_entries.begin(); + TDEIO::UDSEntryList::iterator end = final_entries.end(); for(; it!=end; ++it) { @@ -443,28 +443,28 @@ void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/, listEntries( final_entries ); } -void ForwardingSlaveBase::slotData(KIO::Job* /*job*/, const TQByteArray &d) +void ForwardingSlaveBase::slotData(TDEIO::Job* /*job*/, const TQByteArray &d) { data(d); } -void ForwardingSlaveBase::slotDataReq(KIO::Job* /*job*/, TQByteArray &data) +void ForwardingSlaveBase::slotDataReq(TDEIO::Job* /*job*/, TQByteArray &data) { dataReq(); readData(data); } -void ForwardingSlaveBase::slotMimetype (KIO::Job* /*job*/, const TQString &type) +void ForwardingSlaveBase::slotMimetype (TDEIO::Job* /*job*/, const TQString &type) { mimeType(type); } -void ForwardingSlaveBase::slotCanResume (KIO::Job* /*job*/, KIO::filesize_t offset) +void ForwardingSlaveBase::slotCanResume (TDEIO::Job* /*job*/, TDEIO::filesize_t offset) { canResume(offset); } -void ForwardingSlaveBase::slotLocalURL(KIO::Job *, const KURL& url, bool) +void ForwardingSlaveBase::slotLocalURL(TDEIO::Job *, const KURL& url, bool) { SlaveBase::localURL(url); } diff --git a/kio/kio/forwardingslavebase.h b/kio/kio/forwardingslavebase.h index 1e6d303ee..49d01f4e2 100644 --- a/kio/kio/forwardingslavebase.h +++ b/kio/kio/forwardingslavebase.h @@ -25,7 +25,7 @@ #include -namespace KIO +namespace TDEIO { class ForwardingSlaveBasePrivate; @@ -56,7 +56,7 @@ class ForwardingSlaveBasePrivate; * if ( is_special ) * { * // Handle the URL ourselves - * KIO::UDSEntry entry; + * TDEIO::UDSEntry entry; * // Fill entry with UDSAtom instances * statEntry(entry); * finished(); @@ -146,7 +146,7 @@ protected: * @param listing indicate if this entry it created during a listDir * operation */ - virtual void prepareUDSEntry(KIO::UDSEntry &entry, + virtual void prepareUDSEntry(TDEIO::UDSEntry &entry, bool listing=false) const; /** @@ -175,28 +175,28 @@ private: void connectLocalURLJob(LocalURLJob *job); private slots: - // KIO::Job - void slotResult(KIO::Job *job); - void slotWarning(KIO::Job *job, const TQString &msg); - void slotInfoMessage(KIO::Job *job, const TQString &msg); - void slotTotalSize(KIO::Job *job, KIO::filesize_t size); - void slotProcessedSize(KIO::Job *job, KIO::filesize_t size); - void slotSpeed(KIO::Job *job, unsigned long bytesPerSecond); - - // KIO::SimpleJob subclasses - void slotRedirection(KIO::Job *job, const KURL &url); - - // KIO::ListJob - void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries); - - // KIO::TransferJob - void slotData(KIO::Job *job, const TQByteArray &data); - void slotDataReq(KIO::Job *job, TQByteArray &data); - void slotMimetype (KIO::Job *job, const TQString &type); - void slotCanResume (KIO::Job *job, KIO::filesize_t offset); - - // KIO::LocalURLJob - void slotLocalURL(KIO::Job *, const KURL&, bool); + // TDEIO::Job + void slotResult(TDEIO::Job *job); + void slotWarning(TDEIO::Job *job, const TQString &msg); + void slotInfoMessage(TDEIO::Job *job, const TQString &msg); + void slotTotalSize(TDEIO::Job *job, TDEIO::filesize_t size); + void slotProcessedSize(TDEIO::Job *job, TDEIO::filesize_t size); + void slotSpeed(TDEIO::Job *job, unsigned long bytesPerSecond); + + // TDEIO::SimpleJob subclasses + void slotRedirection(TDEIO::Job *job, const KURL &url); + + // TDEIO::ListJob + void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries); + + // TDEIO::TransferJob + void slotData(TDEIO::Job *job, const TQByteArray &data); + void slotDataReq(TDEIO::Job *job, TQByteArray &data); + void slotMimetype (TDEIO::Job *job, const TQString &type); + void slotCanResume (TDEIO::Job *job, TDEIO::filesize_t offset); + + // TDEIO::LocalURLJob + void slotLocalURL(TDEIO::Job *, const KURL&, bool); }; } diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 63ba82921..36706a6cf 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -42,7 +42,7 @@ #include #endif -KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size ) +KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size ) { if ( size >= 1024 ) return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")"; @@ -50,7 +50,7 @@ KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size ) return convertSize( size ); } -KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size ) +KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size ) { double fsize = size; TQString s; @@ -88,20 +88,20 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size ) return s; } -KIO_EXPORT TQString KIO::convertSizeFromKB( KIO::filesize_t kbSize ) +KIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize ) { return convertSize(kbSize * 1024); } -KIO_EXPORT TQString KIO::number( KIO::filesize_t size ) +KIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size ) { char charbuf[256]; sprintf(charbuf, "%lld", size); return TQString::fromLatin1(charbuf); } -KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize, - KIO::filesize_t processedSize, KIO::filesize_t speed ) +KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize, + TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) { if ( (speed != 0) && (totalSize != 0) ) return ( totalSize - processedSize ) / speed; @@ -109,7 +109,7 @@ KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSiz return 0; } -KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds ) +KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds ) { unsigned int days = seconds / 86400; unsigned int hours = (seconds - (days * 86400)) / 3600; @@ -124,12 +124,12 @@ KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds ) return timeStr; } -KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed ) +KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) { TQTime remainingTime; if ( speed != 0 ) { - KIO::filesize_t secs; + TDEIO::filesize_t secs; if ( totalSize == 0 ) { secs = 0; } else { @@ -147,7 +147,7 @@ KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::files return remainingTime; } -KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize) +KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize) { TQString text = items == 0 ? i18n( "No Items" ) : i18n( "One Item", "%n Items", items ); text += " - "; @@ -155,14 +155,14 @@ KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, K if ( showSize && files > 0 ) { text += " "; - text += i18n("(%1 Total)").arg(KIO::convertSize( size ) ); + text += i18n("(%1 Total)").arg(TDEIO::convertSize( size ) ); } text += " - "; text += dirs == 0 ? i18n( "No Folders" ) : i18n("One Folder", "%n Folders", dirs); return text; } -KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str ) +KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str ) { TQString str( _str ); @@ -177,7 +177,7 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str ) return str; } -KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str ) +KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str ) { TQString str; @@ -205,210 +205,210 @@ KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str ) return str; } -KIO_EXPORT TQString KIO::Job::errorString() const +KIO_EXPORT TQString TDEIO::Job::errorString() const { - return KIO::buildErrorString(m_error, m_errorText); + return TDEIO::buildErrorString(m_error, m_errorText); } -KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorText) +KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText) { TQString result; switch( errorCode ) { - case KIO::ERR_CANNOT_OPEN_FOR_READING: + case TDEIO::ERR_CANNOT_OPEN_FOR_READING: result = i18n( "Could not read %1." ).arg( errorText ); break; - case KIO::ERR_CANNOT_OPEN_FOR_WRITING: + case TDEIO::ERR_CANNOT_OPEN_FOR_WRITING: result = i18n( "Could not write to %1." ).arg( errorText ); break; - case KIO::ERR_CANNOT_LAUNCH_PROCESS: + case TDEIO::ERR_CANNOT_LAUNCH_PROCESS: result = i18n( "Could not start process %1." ).arg( errorText ); break; - case KIO::ERR_INTERNAL: + case TDEIO::ERR_INTERNAL: result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.kde.org\n%1" ).arg( errorText ); break; - case KIO::ERR_MALFORMED_URL: + case TDEIO::ERR_MALFORMED_URL: result = i18n( "Malformed URL %1." ).arg( errorText ); break; - case KIO::ERR_UNSUPPORTED_PROTOCOL: + case TDEIO::ERR_UNSUPPORTED_PROTOCOL: result = i18n( "The protocol %1 is not supported." ).arg( errorText ); break; - case KIO::ERR_NO_SOURCE_PROTOCOL: + case TDEIO::ERR_NO_SOURCE_PROTOCOL: result = i18n( "The protocol %1 is only a filter protocol.").arg( errorText ); break; - case KIO::ERR_UNSUPPORTED_ACTION: + case TDEIO::ERR_UNSUPPORTED_ACTION: result = errorText; // result = i18n( "Unsupported action %1" ).arg( errorText ); break; - case KIO::ERR_IS_DIRECTORY: + case TDEIO::ERR_IS_DIRECTORY: result = i18n( "%1 is a folder, but a file was expected." ).arg( errorText ); break; - case KIO::ERR_IS_FILE: + case TDEIO::ERR_IS_FILE: result = i18n( "%1 is a file, but a folder was expected." ).arg( errorText ); break; - case KIO::ERR_DOES_NOT_EXIST: + case TDEIO::ERR_DOES_NOT_EXIST: result = i18n( "The file or folder %1 does not exist." ).arg( errorText ); break; - case KIO::ERR_FILE_ALREADY_EXIST: + case TDEIO::ERR_FILE_ALREADY_EXIST: result = i18n( "A file named %1 already exists." ).arg( errorText ); break; - case KIO::ERR_DIR_ALREADY_EXIST: + case TDEIO::ERR_DIR_ALREADY_EXIST: result = i18n( "A folder named %1 already exists." ).arg( errorText ); break; - case KIO::ERR_UNKNOWN_HOST: + case TDEIO::ERR_UNKNOWN_HOST: result = errorText.isEmpty() ? i18n( "No hostname specified." ) : i18n( "Unknown host %1" ).arg( errorText ); break; - case KIO::ERR_ACCESS_DENIED: + case TDEIO::ERR_ACCESS_DENIED: result = i18n( "Access denied to %1." ).arg( errorText ); break; - case KIO::ERR_WRITE_ACCESS_DENIED: + case TDEIO::ERR_WRITE_ACCESS_DENIED: result = i18n( "Access denied.\nCould not write to %1." ).arg( errorText ); break; - case KIO::ERR_CANNOT_ENTER_DIRECTORY: + case TDEIO::ERR_CANNOT_ENTER_DIRECTORY: result = i18n( "Could not enter folder %1." ).arg( errorText ); break; - case KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM: + case TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM: result = i18n( "The protocol %1 does not implement a folder service." ).arg( errorText ); break; - case KIO::ERR_CYCLIC_LINK: + case TDEIO::ERR_CYCLIC_LINK: result = i18n( "Found a cyclic link in %1." ).arg( errorText ); break; - case KIO::ERR_USER_CANCELED: + case TDEIO::ERR_USER_CANCELED: // Do nothing in this case. The user doesn't need to be told what he just did. break; - case KIO::ERR_CYCLIC_COPY: + case TDEIO::ERR_CYCLIC_COPY: result = i18n( "Found a cyclic link while copying %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_CREATE_SOCKET: + case TDEIO::ERR_COULD_NOT_CREATE_SOCKET: result = i18n( "Could not create socket for accessing %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_CONNECT: + case TDEIO::ERR_COULD_NOT_CONNECT: result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText ); break; - case KIO::ERR_CONNECTION_BROKEN: + case TDEIO::ERR_CONNECTION_BROKEN: result = i18n( "Connection to host %1 is broken." ).arg( errorText ); break; - case KIO::ERR_NOT_FILTER_PROTOCOL: + case TDEIO::ERR_NOT_FILTER_PROTOCOL: result = i18n( "The protocol %1 is not a filter protocol." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_MOUNT: + case TDEIO::ERR_COULD_NOT_MOUNT: result = i18n( "Could not mount device.\nThe reported error was:\n%1" ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_UNMOUNT: + case TDEIO::ERR_COULD_NOT_UNMOUNT: result = i18n( "Could not unmount device.\nThe reported error was:\n%1" ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_READ: + case TDEIO::ERR_COULD_NOT_READ: result = i18n( "Could not read file %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_WRITE: + case TDEIO::ERR_COULD_NOT_WRITE: result = i18n( "Could not write to file %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_BIND: + case TDEIO::ERR_COULD_NOT_BIND: result = i18n( "Could not bind %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_LISTEN: + case TDEIO::ERR_COULD_NOT_LISTEN: result = i18n( "Could not listen %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_ACCEPT: + case TDEIO::ERR_COULD_NOT_ACCEPT: result = i18n( "Could not accept %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_LOGIN: + case TDEIO::ERR_COULD_NOT_LOGIN: result = errorText; break; - case KIO::ERR_COULD_NOT_STAT: + case TDEIO::ERR_COULD_NOT_STAT: result = i18n( "Could not access %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_CLOSEDIR: + case TDEIO::ERR_COULD_NOT_CLOSEDIR: result = i18n( "Could not terminate listing %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_MKDIR: + case TDEIO::ERR_COULD_NOT_MKDIR: result = i18n( "Could not make folder %1." ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_RMDIR: + case TDEIO::ERR_COULD_NOT_RMDIR: result = i18n( "Could not remove folder %1." ).arg( errorText ); break; - case KIO::ERR_CANNOT_RESUME: + case TDEIO::ERR_CANNOT_RESUME: result = i18n( "Could not resume file %1." ).arg( errorText ); break; - case KIO::ERR_CANNOT_RENAME: + case TDEIO::ERR_CANNOT_RENAME: result = i18n( "Could not rename file %1." ).arg( errorText ); break; - case KIO::ERR_CANNOT_CHMOD: + case TDEIO::ERR_CANNOT_CHMOD: result = i18n( "Could not change permissions for %1." ).arg( errorText ); break; - case KIO::ERR_CANNOT_DELETE: + case TDEIO::ERR_CANNOT_DELETE: result = i18n( "Could not delete file %1." ).arg( errorText ); break; - case KIO::ERR_SLAVE_DIED: + case TDEIO::ERR_SLAVE_DIED: result = i18n( "The process for the %1 protocol died unexpectedly." ).arg( errorText ); break; - case KIO::ERR_OUT_OF_MEMORY: + case TDEIO::ERR_OUT_OF_MEMORY: result = i18n( "Error. Out of memory.\n%1" ).arg( errorText ); break; - case KIO::ERR_UNKNOWN_PROXY_HOST: + case TDEIO::ERR_UNKNOWN_PROXY_HOST: result = i18n( "Unknown proxy host\n%1" ).arg( errorText ); break; - case KIO::ERR_COULD_NOT_AUTHENTICATE: + case TDEIO::ERR_COULD_NOT_AUTHENTICATE: result = i18n( "Authorization failed, %1 authentication not supported" ).arg( errorText ); break; - case KIO::ERR_ABORTED: + case TDEIO::ERR_ABORTED: result = i18n( "User canceled action\n%1" ).arg( errorText ); break; - case KIO::ERR_INTERNAL_SERVER: + case TDEIO::ERR_INTERNAL_SERVER: result = i18n( "Internal error in server\n%1" ).arg( errorText ); break; - case KIO::ERR_SERVER_TIMEOUT: + case TDEIO::ERR_SERVER_TIMEOUT: result = i18n( "Timeout on server\n%1" ).arg( errorText ); break; - case KIO::ERR_UNKNOWN: + case TDEIO::ERR_UNKNOWN: result = i18n( "Unknown error\n%1" ).arg( errorText ); break; - case KIO::ERR_UNKNOWN_INTERRUPT: + case TDEIO::ERR_UNKNOWN_INTERRUPT: result = i18n( "Unknown interrupt\n%1" ).arg( errorText ); break; /* - case KIO::ERR_CHECKSUM_MISMATCH: + case TDEIO::ERR_CHECKSUM_MISMATCH: if (errorText) result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg(errorText); else result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg("document"); break; */ - case KIO::ERR_CANNOT_DELETE_ORIGINAL: + case TDEIO::ERR_CANNOT_DELETE_ORIGINAL: result = i18n( "Could not delete original file %1.\nPlease check permissions." ).arg( errorText ); break; - case KIO::ERR_CANNOT_DELETE_PARTIAL: + case TDEIO::ERR_CANNOT_DELETE_PARTIAL: result = i18n( "Could not delete partial file %1.\nPlease check permissions." ).arg( errorText ); break; - case KIO::ERR_CANNOT_RENAME_ORIGINAL: + case TDEIO::ERR_CANNOT_RENAME_ORIGINAL: result = i18n( "Could not rename original file %1.\nPlease check permissions." ).arg( errorText ); break; - case KIO::ERR_CANNOT_RENAME_PARTIAL: + case TDEIO::ERR_CANNOT_RENAME_PARTIAL: result = i18n( "Could not rename partial file %1.\nPlease check permissions." ).arg( errorText ); break; - case KIO::ERR_CANNOT_SYMLINK: + case TDEIO::ERR_CANNOT_SYMLINK: result = i18n( "Could not create symlink %1.\nPlease check permissions." ).arg( errorText ); break; - case KIO::ERR_NO_CONTENT: + case TDEIO::ERR_NO_CONTENT: result = errorText; break; - case KIO::ERR_DISK_FULL: + case TDEIO::ERR_DISK_FULL: result = i18n( "Could not write file %1.\nDisk full." ).arg( errorText ); break; - case KIO::ERR_IDENTICAL_FILES: + case TDEIO::ERR_IDENTICAL_FILES: result = i18n( "The source and destination are the same file.\n%1" ).arg( errorText ); break; - case KIO::ERR_SLAVE_DEFINED: + case TDEIO::ERR_SLAVE_DEFINED: result = errorText; break; - case KIO::ERR_UPGRADE_REQUIRED: + case TDEIO::ERR_UPGRADE_REQUIRED: result = i18n( "%1 is required by the server, but is not available." ).arg(errorText); break; - case KIO::ERR_POST_DENIED: + case TDEIO::ERR_POST_DENIED: result = i18n( "Access to restricted port in POST denied."); break; - case KIO::ERR_OFFLINE_MODE: + case TDEIO::ERR_OFFLINE_MODE: result = i18n( "Could not access %1.\nOffline mode active.").arg( errorText ); break; default: @@ -419,7 +419,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe return result; } -KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol, int cmd) { +KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) { switch (cmd) { case CMD_CONNECT: return i18n("Opening connections is not supported with the protocol %1." ).arg(protocol); @@ -458,7 +458,7 @@ KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol, }/*end switch*/ } -KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/, +KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/, int method /*= -1*/ ) const { TQString errorName, techName, description, ret2; @@ -508,7 +508,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 return ret; } -KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorText, +KIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText, const KURL *reqUrl /*= 0L*/, int /*method = -1*/ ) { TQString url, host, protocol, datetime, domain, path, dir, filename; @@ -612,7 +612,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT TQString sNetwork = i18n( "Check your network connection status." ); switch( errorCode ) { - case KIO::ERR_CANNOT_OPEN_FOR_READING: + case TDEIO::ERR_CANNOT_OPEN_FOR_READING: errorName = i18n( "Cannot Open Resource For Reading" ); description = i18n( "This means that the contents of the requested file " "or folder %1 could not be retrieved, as read " @@ -622,7 +622,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess << sQuerylock << sSysadmin; break; - case KIO::ERR_CANNOT_OPEN_FOR_WRITING: + case TDEIO::ERR_CANNOT_OPEN_FOR_WRITING: errorName = i18n( "Cannot Open Resource For Writing" ); description = i18n( "This means that the file, %1, could " "not be written to as requested, because access with permission to " @@ -631,7 +631,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess << sQuerylock << sSysadmin; break; - case KIO::ERR_CANNOT_LAUNCH_PROCESS: + case TDEIO::ERR_CANNOT_LAUNCH_PROCESS: errorName = i18n( "Cannot Initiate the %1 Protocol" ).arg( protocol ); techName = i18n( "Unable to Launch Process" ); description = i18n( "The program on your computer which provides access " @@ -644,7 +644,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sSysadmin; break; - case KIO::ERR_INTERNAL: + case TDEIO::ERR_INTERNAL: errorName = i18n( "Internal Error" ); description = i18n( "The program on your computer which provides access " "to the %1 protocol has reported an internal error." ) @@ -653,7 +653,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sBugreport; break; - case KIO::ERR_MALFORMED_URL: + case TDEIO::ERR_MALFORMED_URL: errorName = i18n( "Improperly Formatted URL" ); description = i18n( "The Uniform Resource " "Locator (URL) that you entered was not properly " @@ -663,7 +663,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sTypo; break; - case KIO::ERR_UNSUPPORTED_PROTOCOL: + case TDEIO::ERR_UNSUPPORTED_PROTOCOL: errorName = i18n( "Unsupported Protocol %1" ).arg( protocol ); description = i18n( "The protocol %1 is not supported " "by the TDE programs currently installed on this computer." ) @@ -679,7 +679,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT << sUpdate << sSysadmin; break; - case KIO::ERR_NO_SOURCE_PROTOCOL: + case TDEIO::ERR_NO_SOURCE_PROTOCOL: errorName = i18n( "URL Does Not Refer to a Resource." ); techName = i18n( "Protocol is a Filter Protocol" ); description = i18n( "The Uniform Resource " @@ -692,7 +692,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sTypo; break; - case KIO::ERR_UNSUPPORTED_ACTION: + case TDEIO::ERR_UNSUPPORTED_ACTION: errorName = i18n( "Unsupported Action: %1" ).arg( errorText ); description = i18n( "The requested action is not supported by the TDE " "program which is implementing the %1 protocol." ) @@ -704,7 +704,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "outcome." ); break; - case KIO::ERR_IS_DIRECTORY: + case TDEIO::ERR_IS_DIRECTORY: errorName = i18n( "File Expected" ); description = i18n( "The request expected a file, however the " "folder %1 was found instead." ).arg( dir ); @@ -712,7 +712,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sSysadmin; break; - case KIO::ERR_IS_FILE: + case TDEIO::ERR_IS_FILE: errorName = i18n( "Folder Expected" ); description = i18n( "The request expected a folder, however " "the file %1 was found instead." ).arg( filename ); @@ -720,7 +720,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sSysadmin; break; - case KIO::ERR_DOES_NOT_EXIST: + case TDEIO::ERR_DOES_NOT_EXIST: errorName = i18n( "File or Folder Does Not Exist" ); description = i18n( "The specified file or folder %1 " "does not exist." ).arg( dir ); @@ -728,7 +728,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sSysadmin; break; - case KIO::ERR_FILE_ALREADY_EXIST: + case TDEIO::ERR_FILE_ALREADY_EXIST: errorName = i18n( "File Already Exists" ); description = i18n( "The requested file could not be created because a " "file with the same name already exists." ); @@ -738,7 +738,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT << i18n( "Choose an alternate filename for the new file." ); break; - case KIO::ERR_DIR_ALREADY_EXIST: + case TDEIO::ERR_DIR_ALREADY_EXIST: errorName = i18n( "Folder Already Exists" ); description = i18n( "The requested folder could not be created because " "a folder with the same name already exists." ); @@ -748,7 +748,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT << i18n( "Choose an alternate name for the new folder." ); break; - case KIO::ERR_UNKNOWN_HOST: + case TDEIO::ERR_UNKNOWN_HOST: errorName = i18n( "Unknown Host" ); description = i18n( "An unknown host error indicates that the server with " "the requested name, %1, could not be " @@ -759,7 +759,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sNetwork << sSysadmin; break; - case KIO::ERR_ACCESS_DENIED: + case TDEIO::ERR_ACCESS_DENIED: errorName = i18n( "Access Denied" ); description = i18n( "Access was denied to the specified resource, " "%1." ).arg( url ); @@ -772,7 +772,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT if ( !isSlaveNetwork ) solutions << sServeradmin; break; - case KIO::ERR_WRITE_ACCESS_DENIED: + case TDEIO::ERR_WRITE_ACCESS_DENIED: errorName = i18n( "Write Access Denied" ); description = i18n( "This means that an attempt to write to the file " "%1 was rejected." ).arg( filename ); @@ -780,7 +780,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess << sQuerylock << sSysadmin; break; - case KIO::ERR_CANNOT_ENTER_DIRECTORY: + case TDEIO::ERR_CANNOT_ENTER_DIRECTORY: errorName = i18n( "Unable to Enter Folder" ); description = i18n( "This means that an attempt to enter (in other words, " "to open) the requested folder %1 was rejected." ) @@ -789,7 +789,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess << sQuerylock << sSysadmin; break; - case KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM: + case TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM: errorName = i18n( "Folder Listing Unavailable" ); techName = i18n( "Protocol %1 is not a Filesystem" ).arg( protocol ); description = i18n( "This means that a request was made which requires " @@ -799,7 +799,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sBugreport; break; - case KIO::ERR_CYCLIC_LINK: + case TDEIO::ERR_CYCLIC_LINK: errorName = i18n( "Cyclic Link Detected" ); description = i18n( "UNIX environments are commonly able to link a file or " "folder to a separate name and/or location. TDE detected a link or " @@ -809,7 +809,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "cause an infinite loop, and try again." ) << sSysadmin; break; - case KIO::ERR_USER_CANCELED: + case TDEIO::ERR_USER_CANCELED: // Do nothing in this case. The user doesn't need to be told what he just did. // rodda: However, if we have been called, an application is about to display // this information anyway. If we don't return sensible information, the @@ -820,7 +820,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << i18n( "Retry the request." ); break; - case KIO::ERR_CYCLIC_COPY: + case TDEIO::ERR_CYCLIC_COPY: errorName = i18n( "Cyclic Link Detected During Copy" ); description = i18n( "UNIX environments are commonly able to link a file or " "folder to a separate name and/or location. During the requested copy " @@ -831,7 +831,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "cause an infinite loop, and try again." ) << sSysadmin; break; - case KIO::ERR_COULD_NOT_CREATE_SOCKET: + case TDEIO::ERR_COULD_NOT_CREATE_SOCKET: errorName = i18n( "Could Not Create Network Connection" ); techName = i18n( "Could Not Create Socket" ); description = i18n( "This is a fairly technical error in which a required " @@ -841,7 +841,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sNetwork << sSysadmin; break; - case KIO::ERR_COULD_NOT_CONNECT: + case TDEIO::ERR_COULD_NOT_CONNECT: errorName = i18n( "Connection to Server Refused" ); description = i18n( "The server %1 refused to allow this " "computer to make a connection." ).arg( host ); @@ -855,7 +855,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sTryagain << sServeradmin << sSysadmin; break; - case KIO::ERR_CONNECTION_BROKEN: + case TDEIO::ERR_CONNECTION_BROKEN: errorName = i18n( "Connection to Server Closed Unexpectedly" ); description = i18n( "Although a connection was established to " "%1, the connection was closed at an unexpected point " @@ -865,7 +865,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sTryagain << sServeradmin << sSysadmin; break; - case KIO::ERR_NOT_FILTER_PROTOCOL: + case TDEIO::ERR_NOT_FILTER_PROTOCOL: errorName = i18n( "URL Resource Invalid" ); techName = i18n( "Protocol %1 is not a Filter Protocol" ).arg( protocol ); description = i18n( "The Uniform Resource " @@ -880,7 +880,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sTypo << sSysadmin; break; - case KIO::ERR_COULD_NOT_MOUNT: + case TDEIO::ERR_COULD_NOT_MOUNT: errorName = i18n( "Unable to Initialize Input/Output Device" ); techName = i18n( "Could Not Mount Device" ); description = i18n( "The requested device could not be initialized " @@ -899,7 +899,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "on.; and try again." ) << sAccess << sSysadmin; break; - case KIO::ERR_COULD_NOT_UNMOUNT: + case TDEIO::ERR_COULD_NOT_UNMOUNT: errorName = i18n( "Unable to Uninitialize Input/Output Device" ); techName = i18n( "Could Not Unmount Device" ); description = i18n( "The requested device could not be uninitialized " @@ -917,7 +917,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "and try again." ) << sAccess << sSysadmin; break; - case KIO::ERR_COULD_NOT_READ: + case TDEIO::ERR_COULD_NOT_READ: errorName = i18n( "Cannot Read From Resource" ); description = i18n( "This means that although the resource, " "%1, was able to be opened, an error occurred while " @@ -930,7 +930,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sSysadmin; break; - case KIO::ERR_COULD_NOT_WRITE: + case TDEIO::ERR_COULD_NOT_WRITE: errorName = i18n( "Cannot Write to Resource" ); description = i18n( "This means that although the resource, %1" ", was able to be opened, an error occurred while writing to the resource." ) @@ -943,7 +943,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sSysadmin; break; - case KIO::ERR_COULD_NOT_BIND: + case TDEIO::ERR_COULD_NOT_BIND: errorName = i18n( "Could Not Listen for Network Connections" ); techName = i18n( "Could Not Bind" ); description = i18n( "This is a fairly technical error in which a required " @@ -954,7 +954,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sNetwork << sSysadmin; break; - case KIO::ERR_COULD_NOT_LISTEN: + case TDEIO::ERR_COULD_NOT_LISTEN: errorName = i18n( "Could Not Listen for Network Connections" ); techName = i18n( "Could Not Listen" ); description = i18n( "This is a fairly technical error in which a required " @@ -965,7 +965,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sNetwork << sSysadmin; break; - case KIO::ERR_COULD_NOT_ACCEPT: + case TDEIO::ERR_COULD_NOT_ACCEPT: errorName = i18n( "Could Not Accept Network Connection" ); description = i18n( "This is a fairly technical error in which an error " "occurred while attempting to accept an incoming network connection." ); @@ -975,7 +975,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sNetwork << sSysadmin; break; - case KIO::ERR_COULD_NOT_LOGIN: + case TDEIO::ERR_COULD_NOT_LOGIN: errorName = i18n( "Could Not Login: %1" ).arg( errorText ); description = i18n( "An attempt to login to perform the requested " "operation was unsuccessful." ); @@ -987,7 +987,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "are entered correctly." ) << sServeradmin << sSysadmin; break; - case KIO::ERR_COULD_NOT_STAT: + case TDEIO::ERR_COULD_NOT_STAT: errorName = i18n( "Could Not Determine Resource Status" ); techName = i18n( "Could Not Stat Resource" ); description = i18n( "An attempt to determine information about the status " @@ -999,13 +999,13 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "are entered correctly." ) << sSysadmin; break; - case KIO::ERR_COULD_NOT_CLOSEDIR: + case TDEIO::ERR_COULD_NOT_CLOSEDIR: //result = i18n( "Could not terminate listing %1" ).arg( errorText ); errorName = i18n( "Could Not Cancel Listing" ); techName = i18n( "FIXME: Document this" ); break; - case KIO::ERR_COULD_NOT_MKDIR: + case TDEIO::ERR_COULD_NOT_MKDIR: errorName = i18n( "Could Not Create Folder" ); description = i18n( "An attempt to create the requested folder failed." ); causes << cAccess << i18n( "The location where the folder was to be created " @@ -1014,7 +1014,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << i18n( "Retry the request." ) << sAccess; break; - case KIO::ERR_COULD_NOT_RMDIR: + case TDEIO::ERR_COULD_NOT_RMDIR: errorName = i18n( "Could Not Remove Folder" ); description = i18n( "An attempt to remove the specified folder, " "%1, failed." ).arg( dir ); @@ -1026,7 +1026,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "again." ) << sAccess; break; - case KIO::ERR_CANNOT_RESUME: + case TDEIO::ERR_CANNOT_RESUME: errorName = i18n( "Could Not Resume File Transfer" ); description = i18n( "The specified request asked that the transfer of " "file %1 be resumed at a certain point of the " @@ -1037,7 +1037,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "transfer." ); break; - case KIO::ERR_CANNOT_RENAME: + case TDEIO::ERR_CANNOT_RENAME: errorName = i18n( "Could Not Rename Resource" ); description = i18n( "An attempt to rename the specified resource " "%1 failed." ).arg( url ); @@ -1046,7 +1046,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess << sExists; break; - case KIO::ERR_CANNOT_CHMOD: + case TDEIO::ERR_CANNOT_CHMOD: errorName = i18n( "Could Not Alter Permissions of Resource" ); description = i18n( "An attempt to alter the permissions on the specified " "resource %1 failed." ).arg( url ); @@ -1054,7 +1054,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess << sExists; break; - case KIO::ERR_CANNOT_DELETE: + case TDEIO::ERR_CANNOT_DELETE: errorName = i18n( "Could Not Delete Resource" ); description = i18n( "An attempt to delete the specified resource " "%1 failed." ).arg( url ); @@ -1062,7 +1062,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess << sExists; break; - case KIO::ERR_SLAVE_DIED: + case TDEIO::ERR_SLAVE_DIED: errorName = i18n( "Unexpected Program Termination" ); description = i18n( "The program on your computer which provides access " "to the %1 protocol has unexpectedly terminated." ) @@ -1071,7 +1071,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sBugreport; break; - case KIO::ERR_OUT_OF_MEMORY: + case TDEIO::ERR_OUT_OF_MEMORY: errorName = i18n( "Out of Memory" ); description = i18n( "The program on your computer which provides access " "to the %1 protocol could not obtain the memory " @@ -1080,7 +1080,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sBugreport; break; - case KIO::ERR_UNKNOWN_PROXY_HOST: + case TDEIO::ERR_UNKNOWN_PROXY_HOST: errorName = i18n( "Unknown Proxy Host" ); description = i18n( "While retrieving information about the specified " "proxy host, %1, an Unknown Host error was encountered. " @@ -1094,7 +1094,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT << sSysadmin; break; - case KIO::ERR_COULD_NOT_AUTHENTICATE: + case TDEIO::ERR_COULD_NOT_AUTHENTICATE: errorName = i18n( "Authentication Failed: Method %1 Not Supported" ) .arg( errorText ); description = i18n( "Although you may have supplied the correct " @@ -1106,14 +1106,14 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "authentication method." ) << sSysadmin; break; - case KIO::ERR_ABORTED: + case TDEIO::ERR_ABORTED: errorName = i18n( "Request Aborted" ); description = i18n( "The request was not completed because it was " "aborted." ); solutions << i18n( "Retry the request." ); break; - case KIO::ERR_INTERNAL_SERVER: + case TDEIO::ERR_INTERNAL_SERVER: errorName = i18n( "Internal Error in Server" ); description = i18n( "The program on the server which provides access " "to the %1 protocol has reported an internal error: " @@ -1127,7 +1127,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT "submit the bug report directly to them." ); break; - case KIO::ERR_SERVER_TIMEOUT: + case TDEIO::ERR_SERVER_TIMEOUT: errorName = i18n( "Timeout Error" ); description = i18n( "Although contact was made with the server, a " "response was not received within the amount of time allocated for " @@ -1145,7 +1145,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sTryagain << sServeradmin; break; - case KIO::ERR_UNKNOWN: + case TDEIO::ERR_UNKNOWN: errorName = i18n( "Unknown Error" ); description = i18n( "The program on your computer which provides access " "to the %1 protocol has reported an unknown error: " @@ -1154,7 +1154,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sBugreport; break; - case KIO::ERR_UNKNOWN_INTERRUPT: + case TDEIO::ERR_UNKNOWN_INTERRUPT: errorName = i18n( "Unknown Interruption" ); description = i18n( "The program on your computer which provides access " "to the %1 protocol has reported an interruption of " @@ -1163,7 +1163,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sUpdate << sBugreport; break; - case KIO::ERR_CANNOT_DELETE_ORIGINAL: + case TDEIO::ERR_CANNOT_DELETE_ORIGINAL: errorName = i18n( "Could Not Delete Original File" ); description = i18n( "The requested operation required the deleting of " "the original file, most likely at the end of a file move operation. " @@ -1173,7 +1173,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess; break; - case KIO::ERR_CANNOT_DELETE_PARTIAL: + case TDEIO::ERR_CANNOT_DELETE_PARTIAL: errorName = i18n( "Could Not Delete Temporary File" ); description = i18n( "The requested operation required the creation of " "a temporary file in which to save the new file while being " @@ -1183,7 +1183,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess; break; - case KIO::ERR_CANNOT_RENAME_ORIGINAL: + case TDEIO::ERR_CANNOT_RENAME_ORIGINAL: errorName = i18n( "Could Not Rename Original File" ); description = i18n( "The requested operation required the renaming of " "the original file %1, however it could not be " @@ -1192,7 +1192,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess; break; - case KIO::ERR_CANNOT_RENAME_PARTIAL: + case TDEIO::ERR_CANNOT_RENAME_PARTIAL: errorName = i18n( "Could Not Rename Temporary File" ); description = i18n( "The requested operation required the creation of " "a temporary file %1, however it could not be " @@ -1201,7 +1201,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess; break; - case KIO::ERR_CANNOT_SYMLINK: + case TDEIO::ERR_CANNOT_SYMLINK: errorName = i18n( "Could Not Create Link" ); techName = i18n( "Could Not Create Symbolic Link" ); description = i18n( "The requested symbolic link %1 could not be created." ) @@ -1210,12 +1210,12 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT solutions << sAccess; break; - case KIO::ERR_NO_CONTENT: + case TDEIO::ERR_NO_CONTENT: errorName = i18n( "No Content" ); description = errorText; break; - case KIO::ERR_DISK_FULL: + case TDEIO::ERR_DISK_FULL: errorName = i18n( "Disk Full" ); description = i18n( "The requested file %1 could not be " "written to as there is inadequate disk space." ).arg( errorText ); @@ -1225,7 +1225,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT << sSysadmin; break; - case KIO::ERR_IDENTICAL_FILES: + case TDEIO::ERR_IDENTICAL_FILES: errorName = i18n( "Source and Destination Files Identical" ); description = i18n( "The operation could not be completed because the " "source and destination files are the same file." ); @@ -1233,7 +1233,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT break; // We assume that the slave has all the details - case KIO::ERR_SLAVE_DEFINED: + case TDEIO::ERR_SLAVE_DEFINED: errorName = TQString::null; description = errorText; break; @@ -1368,7 +1368,7 @@ extern "C" void endvfsent( ); #endif /* HAVE_GETMNTINFO */ -TQString KIO::findDeviceMountPoint( const TQString& filename ) +TQString TDEIO::findDeviceMountPoint( const TQString& filename ) { TQString result; @@ -1909,13 +1909,13 @@ static TQString get_mount_info(const TQString& filename, #else //!Q_OS_UNIX //dummy -TQString KIO::findDeviceMountPoint( const TQString& filename ) +TQString TDEIO::findDeviceMountPoint( const TQString& filename ) { return TQString::null; } #endif -TQString KIO::findPathMountPoint(const TQString& filename) +TQString TDEIO::findPathMountPoint(const TQString& filename) { #ifdef Q_OS_UNIX MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong; @@ -1926,7 +1926,7 @@ TQString KIO::findPathMountPoint(const TQString& filename) #endif } -bool KIO::manually_mounted(const TQString& filename) +bool TDEIO::manually_mounted(const TQString& filename) { #ifdef Q_OS_UNIX MountState isautofs = Unseen, isslow = Unseen, ismanual = Unseen; @@ -1938,7 +1938,7 @@ bool KIO::manually_mounted(const TQString& filename) #endif } -bool KIO::probably_slow_mounted(const TQString& filename) +bool TDEIO::probably_slow_mounted(const TQString& filename) { #ifdef Q_OS_UNIX MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong; @@ -1950,7 +1950,7 @@ bool KIO::probably_slow_mounted(const TQString& filename) #endif } -bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag) +bool TDEIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag) { #ifdef Q_OS_UNIX MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong; @@ -1973,36 +1973,36 @@ bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag) return false; } -KIO::CacheControl KIO::parseCacheControl(const TQString &cacheControl) +TDEIO::CacheControl TDEIO::parseCacheControl(const TQString &cacheControl) { TQString tmp = cacheControl.lower(); if (tmp == "cacheonly") - return KIO::CC_CacheOnly; + return TDEIO::CC_CacheOnly; if (tmp == "cache") - return KIO::CC_Cache; + return TDEIO::CC_Cache; if (tmp == "verify") - return KIO::CC_Verify; + return TDEIO::CC_Verify; if (tmp == "refresh") - return KIO::CC_Refresh; + return TDEIO::CC_Refresh; if (tmp == "reload") - return KIO::CC_Reload; + return TDEIO::CC_Reload; kdDebug() << "unrecognized Cache control option:"< #endif -using namespace KIO; -template class TQPtrList; +using namespace TDEIO; +template class TQPtrList; //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX #define REPORT_TIMEOUT 200 @@ -102,7 +102,7 @@ public: // (requires a new ctor, and moving the ctor code to some init()). Job* m_parentJob; int m_extraFlags; - KIO::filesize_t m_processedSize; + TDEIO::filesize_t m_processedSize; unsigned long m_userTimestamp; }; @@ -118,16 +118,16 @@ Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0) addMetaData("progress-id", TQString::number(m_progressId)); //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl; // Connect global progress info signals - connect( this, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString & ) ), - Observer::self(), TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString & ) ) ); - connect( this, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) ); + connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), + Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); + connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); } // Don't exit while this job is running if (kapp) @@ -149,12 +149,12 @@ int& Job::extraFlags() return d->m_extraFlags; } -void Job::setProcessedSize(KIO::filesize_t size) +void Job::setProcessedSize(TDEIO::filesize_t size) { d->m_processedSize = size; } -KIO::filesize_t Job::getProcessedSize() +TDEIO::filesize_t Job::getProcessedSize() { return d->m_processedSize; } @@ -164,15 +164,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData) //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl; subjobs.append(job); - connect( job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotResult(KIO::Job*)) ); + connect( job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotResult(TDEIO::Job*)) ); // Forward information from that subjob. - connect( job, TQT_SIGNAL(speed( KIO::Job*, unsigned long )), - TQT_SLOT(slotSpeed(KIO::Job*, unsigned long)) ); + connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )), + TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); - connect( job, TQT_SIGNAL(infoMessage( KIO::Job*, const TQString & )), - TQT_SLOT(slotInfoMessage(KIO::Job*, const TQString &)) ); + connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); if (inheritMetaData) job->mergeMetaData(m_outgoingMetaData); @@ -197,7 +197,7 @@ void Job::removeSubjob( Job *job, bool mergeMetaData, bool emitResultIfLast ) emitResult(); } -void Job::emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize ) +void Job::emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize ) { // calculate percents unsigned long ipercent = m_percent; @@ -269,13 +269,13 @@ void Job::slotResult( Job *job ) removeSubjob(job); } -void Job::slotSpeed( KIO::Job*, unsigned long speed ) +void Job::slotSpeed( TDEIO::Job*, unsigned long speed ) { //kdDebug(7007) << "Job::slotSpeed " << speed << endl; emitSpeed( speed ); } -void Job::slotInfoMessage( KIO::Job*, const TQString & msg ) +void Job::slotInfoMessage( TDEIO::Job*, const TQString & msg ) { emit infoMessage( this, msg ); } @@ -352,7 +352,7 @@ bool Job::isInteractive() const void Job::setWindow(TQWidget *window) { m_window = window; - KIO::Scheduler::registerWindow(window); + TDEIO::Scheduler::registerWindow(window); } TQWidget *Job::window() const @@ -397,7 +397,7 @@ TQString Job::queryMetaData(const TQString &key) return m_incomingMetaData[key]; } -void Job::setMetaData( const KIO::MetaData &_metaData) +void Job::setMetaData( const TDEIO::MetaData &_metaData) { m_outgoingMetaData = _metaData; } @@ -512,11 +512,11 @@ void SimpleJob::start(Slave *slave) if ((extraFlags() & EF_TransferJobDataSent) == 0) { - connect( m_slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) ); + connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( processedSize( KIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( KIO::filesize_t ) ) ); + connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), + TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ), TQT_SLOT( slotSpeed( unsigned long ) ) ); @@ -525,8 +525,8 @@ void SimpleJob::start(Slave *slave) connect( slave, TQT_SIGNAL( needProgressId() ), TQT_SLOT( slotNeedProgressId() ) ); - connect( slave, TQT_SIGNAL(metaData( const KIO::MetaData& ) ), - TQT_SLOT( slotMetaData( const KIO::MetaData& ) ) ); + connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ), + TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); if (m_window) { @@ -648,7 +648,7 @@ void SimpleJob::slotNeedProgressId() m_slave->setProgressId( m_progressId ); } -void SimpleJob::slotTotalSize( KIO::filesize_t size ) +void SimpleJob::slotTotalSize( TDEIO::filesize_t size ) { if (size > m_totalSize) { @@ -657,9 +657,9 @@ void SimpleJob::slotTotalSize( KIO::filesize_t size ) } } -void SimpleJob::slotProcessedSize( KIO::filesize_t size ) +void SimpleJob::slotProcessedSize( TDEIO::filesize_t size ) { - //kdDebug(7007) << "SimpleJob::slotProcessedSize " << KIO::number(size) << endl; + //kdDebug(7007) << "SimpleJob::slotProcessedSize " << TDEIO::number(size) << endl; setProcessedSize(size); emit processedSize( this, size ); if ( size > m_totalSize ) { @@ -674,7 +674,7 @@ void SimpleJob::slotSpeed( unsigned long speed ) emitSpeed( speed ); } -void SimpleJob::slotMetaData( const KIO::MetaData &_metaData) +void SimpleJob::slotMetaData( const TDEIO::MetaData &_metaData) { m_incomingMetaData += _metaData; } @@ -748,48 +748,48 @@ void MkdirJob::slotFinished() } } -SimpleJob *KIO::mkdir( const KURL& url, int permissions ) +SimpleJob *TDEIO::mkdir( const KURL& url, int permissions ) { //kdDebug(7007) << "mkdir " << url << endl; KIO_ARGS << url << permissions; return new MkdirJob(url, CMD_MKDIR, packedArgs, false); } -SimpleJob *KIO::rmdir( const KURL& url ) +SimpleJob *TDEIO::rmdir( const KURL& url ) { //kdDebug(7007) << "rmdir " << url << endl; KIO_ARGS << url << TQ_INT8(false); // isFile is false return new SimpleJob(url, CMD_DEL, packedArgs, false); } -SimpleJob *KIO::chmod( const KURL& url, int permissions ) +SimpleJob *TDEIO::chmod( const KURL& url, int permissions ) { //kdDebug(7007) << "chmod " << url << endl; KIO_ARGS << url << permissions; return new SimpleJob(url, CMD_CHMOD, packedArgs, false); } -SimpleJob *KIO::rename( const KURL& src, const KURL & dest, bool overwrite ) +SimpleJob *TDEIO::rename( const KURL& src, const KURL & dest, bool overwrite ) { //kdDebug(7007) << "rename " << src << " " << dest << endl; KIO_ARGS << src << dest << (TQ_INT8) overwrite; return new SimpleJob(src, CMD_RENAME, packedArgs, false); } -SimpleJob *KIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo ) +SimpleJob *TDEIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo ) { //kdDebug(7007) << "symlink target=" << target << " " << dest << endl; KIO_ARGS << target << dest << (TQ_INT8) overwrite; return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo); } -SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo) +SimpleJob *TDEIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo) { //kdDebug(7007) << "special " << url << endl; return new SimpleJob(url, CMD_SPECIAL, data, showProgressInfo); } -SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo ) +SimpleJob *TDEIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo ) { KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 ) << TQString::fromLatin1(fstype) << dev << point; @@ -799,7 +799,7 @@ SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const T return job; } -SimpleJob *KIO::unmount( const TQString& point, bool showProgressInfo ) +SimpleJob *TDEIO::unmount( const TQString& point, bool showProgressInfo ) { KIO_ARGS << int(2) << point; SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo ); @@ -837,7 +837,7 @@ void LocalURLJob::slotFinished() SimpleJob::slotFinished(); } -LocalURLJob *KIO::localURL( const KURL& remoteUrl ) +LocalURLJob *TDEIO::localURL( const KURL& remoteUrl ) { KIO_ARGS << remoteUrl; return new LocalURLJob(remoteUrl, CMD_LOCALURL, packedArgs, false); @@ -858,15 +858,15 @@ void StatJob::start(Slave *slave) m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); m_outgoingMetaData.replace( "details", TQString::number(m_details) ); - connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ), - TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) ); + connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), + TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); connect( slave, TQT_SIGNAL( redirection(const KURL &) ), TQT_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } -void StatJob::slotStatEntry( const KIO::UDSEntry & entry ) +void StatJob::slotStatEntry( const TDEIO::UDSEntry & entry ) { //kdDebug(7007) << "StatJob::slotStatEntry" << endl; m_statResult = entry; @@ -912,18 +912,18 @@ void StatJob::slotFinished() } } -void StatJob::slotMetaData( const KIO::MetaData &_metaData) { +void StatJob::slotMetaData( const TDEIO::MetaData &_metaData) { SimpleJob::slotMetaData(_metaData); storeSSLSessionFromJob(m_redirectionURL); } -StatJob *KIO::stat(const KURL& url, bool showProgressInfo) +StatJob *TDEIO::stat(const KURL& url, bool showProgressInfo) { // Assume sideIsSource. Gets are more common than puts. return stat( url, true, 2, showProgressInfo ); } -StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo) +StatJob *TDEIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo) { kdDebug(7007) << "stat " << url << endl; KIO_ARGS << url; @@ -935,7 +935,7 @@ StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool s return job; } -SimpleJob *KIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate) +SimpleJob *TDEIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate) { assert( (url.protocol() == "http") || (url.protocol() == "https") ); // Send http update_cache command (2) @@ -1074,7 +1074,7 @@ void TransferJob::sendAsyncData(const TQByteArray &dataForSlave) m_slave->send( MSG_DATA, dataForSlave ); if (extraFlags() & EF_TransferJobDataSent) { - KIO::filesize_t size = getProcessedSize()+dataForSlave.size(); + TDEIO::filesize_t size = getProcessedSize()+dataForSlave.size(); setProcessedSize(size); emit processedSize( this, size ); if ( size > m_totalSize ) { @@ -1181,8 +1181,8 @@ void TransferJob::start(Slave *slave) connect( slave, TQT_SIGNAL( needSubURLData() ), TQT_SLOT( slotNeedSubURLData() ) ); - connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ), - TQT_SLOT( slotCanResume( KIO::filesize_t ) ) ); + connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); if (slave->suspended()) { @@ -1199,14 +1199,14 @@ void TransferJob::start(Slave *slave) void TransferJob::slotNeedSubURLData() { // Job needs data from subURL. - m_subJob = KIO::get( m_subUrl, false, false); + m_subJob = TDEIO::get( m_subUrl, false, false); suspend(); // Put job on hold until we have some data. - connect(m_subJob, TQT_SIGNAL( data(KIO::Job*,const TQByteArray &)), - TQT_SLOT( slotSubURLData(KIO::Job*,const TQByteArray &))); + connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), + TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); addSubjob(m_subJob); } -void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data) +void TransferJob::slotSubURLData(TDEIO::Job*, const TQByteArray &data) { // The Alternating Bitburg protocol in action again. staticData = data; @@ -1214,7 +1214,7 @@ void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data) resume(); // Activate ourselves again. } -void TransferJob::slotMetaData( const KIO::MetaData &_metaData) { +void TransferJob::slotMetaData( const TDEIO::MetaData &_metaData) { SimpleJob::slotMetaData(_metaData); storeSSLSessionFromJob(m_redirectionURL); } @@ -1224,12 +1224,12 @@ void TransferJob::slotErrorPage() m_errorPage = true; } -void TransferJob::slotCanResume( KIO::filesize_t offset ) +void TransferJob::slotCanResume( TDEIO::filesize_t offset ) { emit canResume(this, offset); } -void TransferJob::slotResult( KIO::Job *job) +void TransferJob::slotResult( TDEIO::Job *job) { // This can only be our suburl. assert(job == m_subJob); @@ -1251,7 +1251,7 @@ void TransferJob::slotResult( KIO::Job *job) removeSubjob( job, false, false ); // Remove job, but don't kill this job. } -TransferJob *KIO::get( const KURL& url, bool reload, bool showProgressInfo ) +TransferJob *TDEIO::get( const KURL& url, bool reload, bool showProgressInfo ) { // Send decoded path and encoded query KIO_ARGS << url; @@ -1274,7 +1274,7 @@ public: }; -TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo ) +TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo ) { int _error = 0; @@ -1344,7 +1344,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool for (int cnt=0; bad_ports[cnt]; ++cnt) if (url.port() == bad_ports[cnt]) { - _error = KIO::ERR_POST_DENIED; + _error = TDEIO::ERR_POST_DENIED; break; } @@ -1354,7 +1354,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool static TQValueList< int >* overriden_ports = NULL; if( !override_loaded ) { - KConfig cfg( "kio_httprc", true ); + TDEConfig cfg( "kio_httprc", true ); overriden_ports = new TQValueList< int >; *overriden_ports = cfg.readIntListEntry( "OverriddenPorts" ); override_loaded = true; @@ -1368,7 +1368,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool // filter out non https? protocols if ((url.protocol() != "http") && (url.protocol() != "https" )) - _error = KIO::ERR_POST_DENIED; + _error = TDEIO::ERR_POST_DENIED; bool redirection = false; KURL _url(url); @@ -1379,7 +1379,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool } if (!_error && !kapp->authorizeURLAction("open", KURL(), _url)) - _error = KIO::ERR_ACCESS_DENIED; + _error = TDEIO::ERR_ACCESS_DENIED; // if request is not valid, return an invalid transfer job if (_error) @@ -1411,7 +1411,7 @@ void TransferJob::slotPostRedirection() } -TransferJob *KIO::put( const KURL& url, int permissions, +TransferJob *TDEIO::put( const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; @@ -1428,10 +1428,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotStoredData( KIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotStoredDataReq( KIO::Job *, TQByteArray & ) ) ); + connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) @@ -1441,7 +1441,7 @@ void StoredTransferJob::setData( const TQByteArray& arr ) m_data = arr; } -void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data ) +void StoredTransferJob::slotStoredData( TDEIO::Job *, const TQByteArray &data ) { // check for end-of-data marker: if ( data.size() == 0 ) @@ -1451,7 +1451,7 @@ void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data ) memcpy( m_data.data() + oldSize, data.data(), data.size() ); } -void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data ) +void StoredTransferJob::slotStoredDataReq( TDEIO::Job *, TQByteArray &data ) { // Inspired from kmail's KMKernel::byteArrayToRemoteFile // send the data in 64 KB chunks @@ -1472,7 +1472,7 @@ void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data ) } } -StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgressInfo ) +StoredTransferJob *TDEIO::storedGet( const KURL& url, bool reload, bool showProgressInfo ) { // Send decoded path and encoded query KIO_ARGS << url; @@ -1482,7 +1482,7 @@ StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgre return job; } -StoredTransferJob *KIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions, +StoredTransferJob *TDEIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; @@ -1508,7 +1508,7 @@ void MimetypeJob::start(Slave *slave) void MimetypeJob::slotFinished( ) { //kdDebug(7007) << "MimetypeJob::slotFinished()" << endl; - if ( m_error == KIO::ERR_IS_DIRECTORY ) + if ( m_error == TDEIO::ERR_IS_DIRECTORY ) { // It is in fact a directory. This happens when HTTP redirects to FTP. // Due to the "protocol doesn't support listing" code in KRun, we @@ -1540,7 +1540,7 @@ void MimetypeJob::slotFinished( ) } } -MimetypeJob *KIO::mimetype(const KURL& url, bool showProgressInfo ) +MimetypeJob *TDEIO::mimetype(const KURL& url, bool showProgressInfo ) { KIO_ARGS << url; MimetypeJob * job = new MimetypeJob(url, CMD_MIMETYPE, packedArgs, showProgressInfo); @@ -1559,12 +1559,12 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command, void DirectCopyJob::start( Slave* slave ) { - connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ), - TQT_SLOT( slotCanResume( KIO::filesize_t ) ) ); + connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); SimpleJob::start(slave); } -void DirectCopyJob::slotCanResume( KIO::filesize_t offset ) +void DirectCopyJob::slotCanResume( TDEIO::filesize_t offset ) { emit canResume(this, offset); } @@ -1575,7 +1575,7 @@ void DirectCopyJob::slotCanResume( KIO::filesize_t offset ) class FileCopyJob::FileCopyJobPrivate { public: - KIO::filesize_t m_sourceSize; + TDEIO::filesize_t m_sourceSize; time_t m_modificationTime; SimpleJob *m_delJob; }; @@ -1605,7 +1605,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions, m_putJob = 0; d = new FileCopyJobPrivate; d->m_delJob = 0; - d->m_sourceSize = (KIO::filesize_t) -1; + d->m_sourceSize = (TDEIO::filesize_t) -1; d->m_modificationTime = static_cast( -1 ); TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); } @@ -1677,10 +1677,10 @@ void FileCopyJob::setSourceSize( off_t size ) m_totalSize = size; } -void FileCopyJob::setSourceSize64( KIO::filesize_t size ) +void FileCopyJob::setSourceSize64( TDEIO::filesize_t size ) { d->m_sourceSize = size; - if (size != (KIO::filesize_t) -1) + if (size != (TDEIO::filesize_t) -1) m_totalSize = size; } @@ -1701,8 +1701,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url) m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false); addSubjob( m_copyJob ); connectSubjob( m_copyJob ); - connect( m_copyJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)), - TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t))); + connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } void FileCopyJob::startRenameJob(const KURL &slave_url) @@ -1715,18 +1715,18 @@ void FileCopyJob::startRenameJob(const KURL &slave_url) void FileCopyJob::connectSubjob( SimpleJob * job ) { - connect( job, TQT_SIGNAL(totalSize( KIO::Job*, KIO::filesize_t )), - this, TQT_SLOT( slotTotalSize(KIO::Job*, KIO::filesize_t)) ); + connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(processedSize( KIO::Job*, KIO::filesize_t )), - this, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t)) ); + connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(percent( KIO::Job*, unsigned long )), - this, TQT_SLOT( slotPercent(KIO::Job*, unsigned long)) ); + connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), + this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); } -void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size ) +void FileCopyJob::slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t size ) { setProcessedSize(size); emit processedSize( this, size ); @@ -1736,7 +1736,7 @@ void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size ) emitPercent( size, m_totalSize ); } -void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size ) +void FileCopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ) { if (size > m_totalSize) { @@ -1745,7 +1745,7 @@ void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size ) } } -void FileCopyJob::slotPercent( KIO::Job*, unsigned long pct ) +void FileCopyJob::slotPercent( TDEIO::Job*, unsigned long pct ) { if ( pct > m_percent ) { @@ -1770,18 +1770,18 @@ void FileCopyJob::startDataPump() // The first thing the put job will tell us is whether we can // resume or not (this is always emitted) - connect( m_putJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)), - TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t))); - connect( m_putJob, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray&)), - TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray&))); + connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), + TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); addSubjob( m_putJob ); } -void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset ) +void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) { if ( job == m_putJob || job == m_copyJob ) { - //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << KIO::number(offset) << endl; + //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << TDEIO::number(offset) << endl; if (offset) { RenameDlg_Result res = R_RESUME; @@ -1789,7 +1789,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset ) if (!KProtocolManager::autoResume() && !m_overwrite) { TQString newPath; - KIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this; + TDEIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this; // Ask confirmation about resuming previous transfer res = Observer::self()->open_RenameDlg( job, i18n("File Already Exists"), @@ -1822,18 +1822,18 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset ) m_getJob->addMetaData( "errorPage", "false" ); m_getJob->addMetaData( "AllowCompressedPage", "false" ); // Set size in subjob. This helps if the slave doesn't emit totalSize. - if ( d->m_sourceSize != (KIO::filesize_t)-1 ) + if ( d->m_sourceSize != (TDEIO::filesize_t)-1 ) m_getJob->slotTotalSize( d->m_sourceSize ); if (offset) { //kdDebug(7007) << "Setting metadata for resume to " << (unsigned long) offset << endl; // TODO KDE4: rename to seek or offset and document it // This isn't used only for resuming, but potentially also for extracting (#72302). - m_getJob->addMetaData( "resume", KIO::number(offset) ); + m_getJob->addMetaData( "resume", TDEIO::number(offset) ); // Might or might not get emitted - connect( m_getJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)), - TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t))); + connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } m_putJob->slave()->setOffset( offset ); @@ -1842,10 +1842,10 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset ) connectSubjob( m_getJob ); // Progress info depends on get m_getJob->resume(); // Order a beer - connect( m_getJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)), - TQT_SLOT( slotData(KIO::Job*,const TQByteArray&)) ); - connect( m_getJob, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&) ), - TQT_SLOT(slotMimetype(KIO::Job*,const TQString&)) ); + connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), + TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); } else // copyjob { @@ -1865,7 +1865,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset ) << " m_getJob=" << m_getJob << " m_putJob=" << m_putJob << endl; } -void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data) +void FileCopyJob::slotData( TDEIO::Job * , const TQByteArray &data) { //kdDebug(7007) << "FileCopyJob::slotData" << endl; //kdDebug(7007) << " data size : " << data.size() << endl; @@ -1885,7 +1885,7 @@ void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data) } } -void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data) +void FileCopyJob::slotDataReq( TDEIO::Job * , TQByteArray &data) { //kdDebug(7007) << "FileCopyJob::slotDataReq" << endl; if (!m_resumeAnswerSent && !m_getJob) @@ -1906,12 +1906,12 @@ void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data) m_buffer = TQByteArray(); } -void FileCopyJob::slotMimetype( KIO::Job*, const TQString& type ) +void FileCopyJob::slotMimetype( TDEIO::Job*, const TQString& type ) { emit mimetype( this, type ); } -void FileCopyJob::slotResult( KIO::Job *job) +void FileCopyJob::slotResult( TDEIO::Job *job) { //kdDebug(7007) << "FileCopyJob this=" << this << " ::slotResult(" << job << ")" << endl; // Did job have an error ? @@ -1994,19 +1994,19 @@ void FileCopyJob::slotResult( KIO::Job *job) removeSubjob(job); } -FileCopyJob *KIO::file_copy( const KURL& src, const KURL& dest, int permissions, +FileCopyJob *TDEIO::file_copy( const KURL& src, const KURL& dest, int permissions, bool overwrite, bool resume, bool showProgressInfo) { return new FileCopyJob( src, dest, permissions, false, overwrite, resume, showProgressInfo ); } -FileCopyJob *KIO::file_move( const KURL& src, const KURL& dest, int permissions, +FileCopyJob *TDEIO::file_move( const KURL& src, const KURL& dest, int permissions, bool overwrite, bool resume, bool showProgressInfo) { return new FileCopyJob( src, dest, permissions, true, overwrite, resume, showProgressInfo ); } -SimpleJob *KIO::file_delete( const KURL& src, bool showProgressInfo) +SimpleJob *TDEIO::file_delete( const KURL& src, bool showProgressInfo) { KIO_ARGS << src << TQ_INT8(true); // isFile return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo ); @@ -2025,7 +2025,7 @@ ListJob::ListJob(const KURL& u, bool showProgressInfo, bool _recursive, TQString stream << u; } -void ListJob::slotListEntries( const KIO::UDSEntryList& list ) +void ListJob::slotListEntries( const TDEIO::UDSEntryList& list ) { // Emit progress info (takes care of emit processedSize and percent) m_processedEntries += list.count(); @@ -2074,10 +2074,10 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list ) prefix + filename + "/", includeHidden); Scheduler::scheduleJob(job); - connect(job, TQT_SIGNAL(entries( KIO::Job *, - const KIO::UDSEntryList& )), - TQT_SLOT( gotEntries( KIO::Job*, - const KIO::UDSEntryList& ))); + connect(job, TQT_SIGNAL(entries( TDEIO::Job *, + const TDEIO::UDSEntryList& )), + TQT_SLOT( gotEntries( TDEIO::Job*, + const TDEIO::UDSEntryList& ))); addSubjob(job); } } @@ -2117,13 +2117,13 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list ) } } -void ListJob::gotEntries(KIO::Job *, const KIO::UDSEntryList& list ) +void ListJob::gotEntries(TDEIO::Job *, const TDEIO::UDSEntryList& list ) { // Forward entries received by subjob - faking we received them ourselves emit entries(this, list); } -void ListJob::slotResult( KIO::Job * job ) +void ListJob::slotResult( TDEIO::Job * job ) { // If we can't list a subdir, the result is still ok // This is why we override Job::slotResult() - to skip error checking @@ -2146,7 +2146,7 @@ void ListJob::slotRedirection( const KURL & url ) void ListJob::slotFinished() { // Support for listing archives as directories - if ( m_error == KIO::ERR_IS_FILE && m_url.isLocalFile() ) { + if ( m_error == TDEIO::ERR_IS_FILE && m_url.isLocalFile() ) { KMimeType::Ptr ptr = KMimeType::findByURL( m_url, 0, true, true ); if ( ptr ) { TQString proto = ptr->property("X-TDE-LocalProtocol").toString(); @@ -2178,18 +2178,18 @@ void ListJob::slotFinished() } } -void ListJob::slotMetaData( const KIO::MetaData &_metaData) { +void ListJob::slotMetaData( const TDEIO::MetaData &_metaData) { SimpleJob::slotMetaData(_metaData); storeSSLSessionFromJob(m_redirectionURL); } -ListJob *KIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden ) +ListJob *TDEIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden ) { ListJob * job = new ListJob(url, showProgressInfo,false,TQString::null,includeHidden); return job; } -ListJob *KIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden ) +ListJob *TDEIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden ) { ListJob * job = new ListJob(url, showProgressInfo, true,TQString::null,includeHidden); return job; @@ -2212,10 +2212,10 @@ void ListJob::start(Slave *slave) TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); return; } - connect( slave, TQT_SIGNAL( listEntries( const KIO::UDSEntryList& )), - TQT_SLOT( slotListEntries( const KIO::UDSEntryList& ))); - connect( slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) ); + connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), + TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); + connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); connect( slave, TQT_SIGNAL( redirection(const KURL &) ), TQT_SLOT( slotRedirection(const KURL &) ) ); @@ -2260,11 +2260,11 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a d->m_globalDestinationState = destinationState; if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) ); + connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) ); + connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); } TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); /** @@ -2301,7 +2301,7 @@ void CopyJob::slotStart() m_reportTimer->start(REPORT_TIMEOUT,false); // Stat the dest - KIO::Job * job = KIO::stat( m_dest, false, 2, false ); + TDEIO::Job * job = TDEIO::stat( m_dest, false, 2, false ); //kdDebug(7007) << "CopyJob:stating the dest " << m_dest << endl; addSubjob(job); } @@ -2328,7 +2328,7 @@ void CopyJob::slotResultStating( Job *job ) info.permissions = (mode_t) -1; info.mtime = (time_t) -1; info.ctime = (time_t) -1; - info.size = (KIO::filesize_t)-1; + info.size = (TDEIO::filesize_t)-1; info.uSource = srcurl; info.uDest = m_dest; // Append filename or dirname to destination URL, if allowed @@ -2525,7 +2525,7 @@ void CopyJob::slotReport() } } -void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list) +void CopyJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list) { UDSEntryListConstIterator it = list.begin(); UDSEntryListConstIterator end = list.end(); @@ -2535,7 +2535,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list) info.permissions = -1; info.mtime = (time_t) -1; info.ctime = (time_t) -1; - info.size = (KIO::filesize_t)-1; + info.size = (TDEIO::filesize_t)-1; TQString displayName; KURL url; TQString localPath; @@ -2562,7 +2562,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list) info.permissions = ((*it2).m_long); break; case UDS_SIZE: - info.size = (KIO::filesize_t)((*it2).m_long); + info.size = (TDEIO::filesize_t)((*it2).m_long); m_totalSize += info.size; break; case UDS_MODIFICATION_TIME: @@ -2627,7 +2627,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list) // Otherwise, we end up with e.g. dest=..../Desktop/ itself. // (This can happen when dropping a link to a webpage with no path) if ( destFileName.isEmpty() ) - destFileName = KIO::encodeFileName( info.uSource.prettyURL() ); + destFileName = TDEIO::encodeFileName( info.uSource.prettyURL() ); //kdDebug(7007) << " adding destFileName=" << destFileName << endl; info.uDest.addPath( destFileName ); @@ -2682,7 +2682,7 @@ void CopyJob::statCurrentSrc() info.permissions = -1; info.mtime = (time_t) -1; info.ctime = (time_t) -1; - info.size = (KIO::filesize_t)-1; + info.size = (TDEIO::filesize_t)-1; info.uSource = m_currentSrcURL; info.uDest = m_currentDest; // Append filename or dirname to destination URL, if allowed @@ -2703,7 +2703,7 @@ void CopyJob::statCurrentSrc() // Different protocols, we'll create a .desktop file // We have to change the extension anyway, so while we're at it, // name the file like the URL - info.uDest.addPath( KIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" ); + info.uDest.addPath( TDEIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" ); } } files.append( info ); // Files and any symlinks @@ -2750,8 +2750,8 @@ void CopyJob::statCurrentSrc() } // Stat the next src url - Job * job = KIO::stat( m_currentSrcURL, true, 2, false ); - //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl; + Job * job = TDEIO::stat( m_currentSrcURL, true, 2, false ); + //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl; state = STATE_STATING; addSubjob(job); m_currentDestURL=m_dest; @@ -2790,7 +2790,7 @@ void CopyJob::startRenameJob( const KURL& slave_url ) info.permissions = -1; info.mtime = (time_t) -1; info.ctime = (time_t) -1; - info.size = (KIO::filesize_t)-1; + info.size = (TDEIO::filesize_t)-1; info.uSource = m_currentSrcURL; info.uDest = dest; TQValueList files; @@ -2811,10 +2811,10 @@ void CopyJob::startListing( const KURL & src ) d->m_bURLDirty = true; ListJob * newjob = listRecursive( src, false ); newjob->setUnrestricted(true); - connect(newjob, TQT_SIGNAL(entries( KIO::Job *, - const KIO::UDSEntryList& )), - TQT_SLOT( slotEntries( KIO::Job*, - const KIO::UDSEntryList& ))); + connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + const TDEIO::UDSEntryList& )), + TQT_SLOT( slotEntries( TDEIO::Job*, + const TDEIO::UDSEntryList& ))); addSubjob( newjob ); } @@ -2888,9 +2888,9 @@ void CopyJob::slotResultCreatingDirs( Job * job ) // We need to stat the existing dir, to get its last-modification time KURL existingDest( (*it).uDest ); - SimpleJob * newJob = KIO::stat( existingDest, false, 2, false ); + SimpleJob * newJob = TDEIO::stat( existingDest, false, 2, false ); Scheduler::scheduleJob(newJob); - kdDebug(7007) << "KIO::stat for resolving conflict on " << existingDest << endl; + kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingDest << endl; state = STATE_CONFLICT_CREATING_DIRS; addSubjob(newJob); return; // Don't move to next dir yet ! @@ -2919,7 +2919,7 @@ void CopyJob::slotResultCreatingDirs( Job * job ) createNextDir(); } -void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) +void CopyJob::slotResultConflictCreatingDirs( TDEIO::Job * job ) { // We come here after a conflict has been detected and we've stated the existing dir @@ -2928,11 +2928,11 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) // Its modification time: time_t destmtime = (time_t)-1; time_t destctime = (time_t)-1; - KIO::filesize_t destsize = 0; + TDEIO::filesize_t destsize = 0; TQString linkDest; - UDSEntry entry = ((KIO::StatJob*)job)->statResult(); - KIO::UDSEntry::ConstIterator it2 = entry.begin(); + UDSEntry entry = ((TDEIO::StatJob*)job)->statResult(); + TDEIO::UDSEntry::ConstIterator it2 = entry.begin(); for( ; it2 != entry.end(); it2++ ) { switch ((*it2).m_uds) { case UDS_MODIFICATION_TIME: @@ -3082,7 +3082,7 @@ void CopyJob::createNextDir() { // Create the directory - with default permissions so that we can put files into it // TODO : change permissions once all is finished; but for stuff coming from CDROM it sucks... - KIO::SimpleJob *newjob = KIO::mkdir( udir, -1 ); + TDEIO::SimpleJob *newjob = TDEIO::mkdir( udir, -1 ); Scheduler::scheduleJob(newjob); m_currentDestURL = udir; @@ -3132,16 +3132,16 @@ void CopyJob::slotResultCopyingFiles( Job * job ) assert ( subjobs.isEmpty() ); // We need to stat the existing file, to get its last-modification time KURL existingFile( (*it).uDest ); - SimpleJob * newJob = KIO::stat( existingFile, false, 2, false ); + SimpleJob * newJob = TDEIO::stat( existingFile, false, 2, false ); Scheduler::scheduleJob(newJob); - kdDebug(7007) << "KIO::stat for resolving conflict on " << existingFile << endl; + kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingFile << endl; state = STATE_CONFLICT_COPYING_FILES; addSubjob(newJob); return; // Don't move to next file yet ! } else { - if ( m_bCurrentOperationIsLink && ::tqqt_cast( job ) ) + if ( m_bCurrentOperationIsLink && ::tqqt_cast( job ) ) { // Very special case, see a few lines below // We are deleting the source of a symlink we successfully moved... ignore error @@ -3158,14 +3158,14 @@ void CopyJob::slotResultCopyingFiles( Job * job ) { // Special case for moving links. That operation needs two jobs, unlike others. if ( m_bCurrentOperationIsLink && m_mode == Move - && !::tqqt_cast( job ) // Deleting source not already done + && !::tqqt_cast( job ) // Deleting source not already done ) { subjobs.remove( job ); assert ( subjobs.isEmpty() ); // The only problem with this trick is that the error handling for this del operation // is not going to be right... see 'Very special case' above. - KIO::Job * newjob = KIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ ); + TDEIO::Job * newjob = TDEIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ ); addSubjob( newjob ); return; // Don't move to next file yet ! } @@ -3195,7 +3195,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) copyNextFile(); } -void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job ) +void CopyJob::slotResultConflictCopyingFiles( TDEIO::Job * job ) { // We come here after a conflict has been detected and we've stated the existing file // The file we were trying to create: @@ -3214,10 +3214,10 @@ void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job ) // Its modification time: time_t destmtime = (time_t)-1; time_t destctime = (time_t)-1; - KIO::filesize_t destsize = 0; + TDEIO::filesize_t destsize = 0; TQString linkDest; - UDSEntry entry = ((KIO::StatJob*)job)->statResult(); - KIO::UDSEntry::ConstIterator it2 = entry.begin(); + UDSEntry entry = ((TDEIO::StatJob*)job)->statResult(); + TDEIO::UDSEntry::ConstIterator it2 = entry.begin(); for( ; it2 != entry.end(); it2++ ) { switch ((*it2).m_uds) { case UDS_MODIFICATION_TIME: @@ -3364,7 +3364,7 @@ void CopyJob::copyNextFile() bOverwrite = shouldOverwrite( destFile ); m_bCurrentOperationIsLink = false; - KIO::Job * newjob = 0L; + TDEIO::Job * newjob = 0L; if ( m_mode == Link ) { //kdDebug(7007) << "Linking" << endl; @@ -3376,7 +3376,7 @@ void CopyJob::copyNextFile() ((*it).uSource.pass() == (*it).uDest.pass()) ) { // This is the case of creating a real symlink - KIO::SimpleJob *newJob = KIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ ); + TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ ); newjob = newJob; Scheduler::scheduleJob(newJob); //kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).uSource.path() << " link=" << (*it).uDest << endl; @@ -3476,7 +3476,7 @@ void CopyJob::copyNextFile() ((*it).uSource.pass() == (*it).uDest.pass())) // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link), { - KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ ); + TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ ); Scheduler::scheduleJob(newJob); newjob = newJob; //kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).linkDest << " link=" << (*it).uDest << endl; @@ -3489,7 +3489,7 @@ void CopyJob::copyNextFile() // NOTE: if we are moving stuff, the deletion of the source will be done in slotResultCopyingFiles } else if (m_mode == Move) // Moving a file { - KIO::FileCopyJob * moveJob = KIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ ); + TDEIO::FileCopyJob * moveJob = TDEIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ ); moveJob->setSourceSize64( (*it).size ); newjob = moveJob; //kdDebug(7007) << "CopyJob::copyNextFile : Moving " << (*it).uSource << " to " << (*it).uDest << endl; @@ -3507,7 +3507,7 @@ void CopyJob::copyNextFile() int permissions = (*it).permissions; if ( d->m_defaultPermissions || ( remoteSource && (*it).uDest.isLocalFile() ) ) permissions = -1; - KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ ); + TDEIO::FileCopyJob * copyJob = TDEIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ ); copyJob->setParentJob( this ); // in case of rename dialog copyJob->setSourceSize64( (*it).size ); copyJob->setModificationTime( (*it).mtime ); @@ -3518,10 +3518,10 @@ void CopyJob::copyNextFile() d->m_bURLDirty = true; } addSubjob(newjob); - connect( newjob, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( newjob, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), - this, TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) ); + connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); } else { @@ -3539,7 +3539,7 @@ void CopyJob::deleteNextDir() d->m_bURLDirty = true; // Take first dir to delete out of list - last ones first ! KURL::List::Iterator it = dirsToRemove.fromLast(); - SimpleJob *job = KIO::rmdir( *it ); + SimpleJob *job = TDEIO::rmdir( *it ); Scheduler::scheduleJob(job); dirsToRemove.remove(it); addSubjob( job ); @@ -3604,7 +3604,7 @@ void CopyJob::setNextDirAttribute() } } -void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size ) +void CopyJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size ) { //kdDebug(7007) << "CopyJob::slotProcessedSize " << data_size << endl; m_fileProcessedSize = data_size; @@ -3621,7 +3621,7 @@ void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size ) emitPercent( m_processedSize + m_fileProcessedSize, m_totalSize ); } -void CopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size ) +void CopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ) { //kdDebug(7007) << "slotTotalSize: " << size << endl; // Special case for copying a single file @@ -3753,8 +3753,8 @@ void CopyJob::slotResultRenaming( Job* job ) // we lack mtime info for both the src (not stated) // and the dest (stated but this info wasn't stored) // Let's do it for local files, at least - KIO::filesize_t sizeSrc = (KIO::filesize_t) -1; - KIO::filesize_t sizeDest = (KIO::filesize_t) -1; + TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1; + TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1; time_t ctimeSrc = (time_t) -1; time_t ctimeDest = (time_t) -1; time_t mtimeSrc = (time_t) -1; @@ -3799,7 +3799,7 @@ void CopyJob::slotResultRenaming( Job* job ) // Set m_dest to the chosen destination // This is only for this src url; the next one will revert to d->m_globalDest m_dest.setPath( newPath ); - KIO::Job* job = KIO::stat( m_dest, false, 2, false ); + TDEIO::Job* job = TDEIO::stat( m_dest, false, 2, false ); state = STATE_STATING; destinationState = DEST_NOT_STATED; addSubjob(job); @@ -3829,7 +3829,7 @@ void CopyJob::slotResultRenaming( Job* job ) break; } } - } else if ( err != KIO::ERR_UNSUPPORTED_ACTION ) { + } else if ( err != TDEIO::ERR_UNSUPPORTED_ACTION ) { kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", aborting" << endl; m_error = err; m_errorText = errText; @@ -3837,8 +3837,8 @@ void CopyJob::slotResultRenaming( Job* job ) return; } kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", reverting to normal way, starting with stat" << endl; - //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl; - KIO::Job* job = KIO::stat( m_currentSrcURL, true, 2, false ); + //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl; + TDEIO::Job* job = TDEIO::stat( m_currentSrcURL, true, 2, false ); state = STATE_STATING; addSubjob(job); m_bOnlyRenames = false; @@ -3906,40 +3906,40 @@ void CopyJob::slotResult( Job *job ) } } -void KIO::CopyJob::setDefaultPermissions( bool b ) +void TDEIO::CopyJob::setDefaultPermissions( bool b ) { d->m_defaultPermissions = b; } // KDE4: remove -void KIO::CopyJob::setInteractive( bool b ) +void TDEIO::CopyJob::setInteractive( bool b ) { Job::setInteractive( b ); } -CopyJob *KIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo ) +CopyJob *TDEIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo ) { - //kdDebug(7007) << "KIO::copy src=" << src << " dest=" << dest << endl; + //kdDebug(7007) << "TDEIO::copy src=" << src << " dest=" << dest << endl; KURL::List srcList; srcList.append( src ); return new CopyJob( srcList, dest, CopyJob::Copy, false, showProgressInfo ); } -CopyJob *KIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo ) +CopyJob *TDEIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo ) { - //kdDebug(7007) << "KIO::copyAs src=" << src << " dest=" << dest << endl; + //kdDebug(7007) << "TDEIO::copyAs src=" << src << " dest=" << dest << endl; KURL::List srcList; srcList.append( src ); return new CopyJob( srcList, dest, CopyJob::Copy, true, showProgressInfo ); } -CopyJob *KIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo ) +CopyJob *TDEIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo ) { //kdDebug(7007) << src << " " << dest << endl; return new CopyJob( src, dest, CopyJob::Copy, false, showProgressInfo ); } -CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo ) +CopyJob *TDEIO::move(const KURL& src, const KURL& dest, bool showProgressInfo ) { //kdDebug(7007) << src << " " << dest << endl; KURL::List srcList; @@ -3947,7 +3947,7 @@ CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo ) return new CopyJob( srcList, dest, CopyJob::Move, false, showProgressInfo ); } -CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo ) +CopyJob *TDEIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo ) { //kdDebug(7007) << src << " " << dest << endl; KURL::List srcList; @@ -3955,39 +3955,39 @@ CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo ) return new CopyJob( srcList, dest, CopyJob::Move, true, showProgressInfo ); } -CopyJob *KIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo ) +CopyJob *TDEIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo ) { //kdDebug(7007) << src << " " << dest << endl; return new CopyJob( src, dest, CopyJob::Move, false, showProgressInfo ); } -CopyJob *KIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo ) +CopyJob *TDEIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo ) { KURL::List srcList; srcList.append( src ); return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo ); } -CopyJob *KIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo ) +CopyJob *TDEIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo ) { return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo ); } -CopyJob *KIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo ) +CopyJob *TDEIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo ) { KURL::List srcList; srcList.append( src ); return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo ); } -CopyJob *KIO::trash(const KURL& src, bool showProgressInfo ) +CopyJob *TDEIO::trash(const KURL& src, bool showProgressInfo ) { KURL::List srcList; srcList.append( src ); return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo ); } -CopyJob *KIO::trash(const KURL::List& srcList, bool showProgressInfo ) +CopyJob *TDEIO::trash(const KURL::List& srcList, bool showProgressInfo ) { return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo ); } @@ -4001,21 +4001,21 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn { if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) ); + connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) ); + connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); // See slotReport - /*connect( this, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) ); + /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) ); + connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( deleting( KIO::Job*, const KURL& ) ), - m_observer, TQT_SLOT( slotDeleting( KIO::Job*, const KURL& ) ) );*/ + connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ m_reportTimer=new TQTimer(this); connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); @@ -4065,7 +4065,7 @@ void DeleteJob::slotReport() } -void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list) +void DeleteJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list) { UDSEntryListConstIterator it = list.begin(); UDSEntryListConstIterator end = list.end(); @@ -4098,7 +4098,7 @@ void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list) atomsFound++; break; case UDS_SIZE: - m_totalSize += (KIO::filesize_t)((*it2).m_long); + m_totalSize += (TDEIO::filesize_t)((*it2).m_long); atomsFound++; break; default: @@ -4144,9 +4144,9 @@ void DeleteJob::statNextSrc() } // Stat it state = STATE_STATING; - KIO::SimpleJob * job = KIO::stat( m_currentURL, true, 1, false ); + TDEIO::SimpleJob * job = TDEIO::stat( m_currentURL, true, 1, false ); Scheduler::scheduleJob(job); - //kdDebug(7007) << "KIO::stat (DeleteJob) " << m_currentURL << endl; + //kdDebug(7007) << "TDEIO::stat (DeleteJob) " << m_currentURL << endl; addSubjob(job); //if ( m_progressId ) // Did we get an ID from the observer ? // Observer::self()->slotDeleting( this, *it ); // show asap @@ -4192,7 +4192,7 @@ void DeleteJob::deleteNextFile() } } else { // if remote - or if unlink() failed (we'll use the job's error handling in that case) - job = KIO::file_delete( *it, false /*no GUI*/); + job = TDEIO::file_delete( *it, false /*no GUI*/); Scheduler::scheduleJob(job); m_currentURL=(*it); } @@ -4231,9 +4231,9 @@ void DeleteJob::deleteNextDir() if ( KProtocolInfo::canDeleteRecursive( *it ) ) { // If the ioslave supports recursive deletion of a directory, then // we only need to send a single CMD_DEL command, so we use file_delete :) - job = KIO::file_delete( *it, false /*no gui*/ ); + job = TDEIO::file_delete( *it, false /*no gui*/ ); } else { - job = KIO::rmdir( *it ); + job = TDEIO::rmdir( *it ); } Scheduler::scheduleJob(job); dirs.remove(it); @@ -4260,7 +4260,7 @@ void DeleteJob::deleteNextDir() emitResult(); } -void DeleteJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size ) +void DeleteJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size ) { // Note: this is the same implementation as CopyJob::slotProcessedSize but // it's different from FileCopyJob::slotProcessedSize - which is why this @@ -4307,7 +4307,7 @@ void DeleteJob::slotResult( Job *job ) UDSEntry entry = ((StatJob*)job)->statResult(); bool bDir = false; bool bLink = false; - KIO::filesize_t size = (KIO::filesize_t)-1; + TDEIO::filesize_t size = (TDEIO::filesize_t)-1; UDSEntry::ConstIterator it2 = entry.begin(); int atomsFound(0); for( ; it2 != entry.end(); it2++ ) @@ -4349,10 +4349,10 @@ void DeleteJob::slotResult( Job *job ) ListJob *newjob = listRecursive( url, false ); newjob->setUnrestricted(true); // No KIOSK restrictions Scheduler::scheduleJob(newjob); - connect(newjob, TQT_SIGNAL(entries( KIO::Job *, - const KIO::UDSEntryList& )), - TQT_SLOT( slotEntries( KIO::Job*, - const KIO::UDSEntryList& ))); + connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + const TDEIO::UDSEntryList& )), + TQT_SLOT( slotEntries( TDEIO::Job*, + const TDEIO::UDSEntryList& ))); addSubjob(newjob); } else { ++m_currentStat; @@ -4417,7 +4417,7 @@ void DeleteJob::slotResult( Job *job ) } } -DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo ) +DeleteJob *TDEIO::del( const KURL& src, bool shred, bool showProgressInfo ) { KURL::List srcList; srcList.append( src ); @@ -4425,7 +4425,7 @@ DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo ) return job; } -DeleteJob *KIO::del( const KURL::List& src, bool shred, bool showProgressInfo ) +DeleteJob *TDEIO::del( const KURL::List& src, bool shred, bool showProgressInfo ) { DeleteJob *job = new DeleteJob( src, shred, showProgressInfo ); return job; @@ -4599,7 +4599,7 @@ void MultiGetJob::slotMimetype( const TQString &_mimetype ) emit mimetype(m_currentEntry->id, _mimetype); } -MultiGetJob *KIO::multi_get(long id, const KURL &url, const MetaData &metaData) +MultiGetJob *TDEIO::multi_get(long id, const KURL &url, const MetaData &metaData) { MultiGetJob * job = new MultiGetJob( url, false ); job->get(id, url, metaData); @@ -4778,7 +4778,7 @@ void Job::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } void SimpleJob::virtual_hook( int id, void* data ) -{ KIO::Job::virtual_hook( id, data ); } +{ TDEIO::Job::virtual_hook( id, data ); } void MkdirJob::virtual_hook( int id, void* data ) { SimpleJob::virtual_hook( id, data ); } diff --git a/kio/kio/job.h b/kio/kio/job.h index fed6f82ab..03985b637 100644 --- a/kio/kio/job.h +++ b/kio/kio/job.h @@ -24,7 +24,7 @@ #include -namespace KIO { +namespace TDEIO { /** @@ -80,7 +80,7 @@ namespace KIO { * Create or move a symlink. * This is the lowlevel operation, similar to file_copy and file_move. * It doesn't do any check (other than those the slave does) - * and it doesn't show rename and skip dialogs - use KIO::link for that. + * and it doesn't show rename and skip dialogs - use TDEIO::link for that. * @param target The string that will become the "target" of the link (can be relative) * @param dest The symlink to create. * @param overwrite whether to automatically overwrite if the dest exists @@ -215,7 +215,7 @@ namespace KIO { * * Example: * \code - * job = KIO::http_post( url, postData, false ); + * job = TDEIO::http_post( url, postData, false ); * job->addMetaData("content-type", contentType ); * job->addMetaData("referrer", referrerURL); * \endcode diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 9d6624dc0..9858b1ce1 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -39,7 +39,7 @@ class TQTimer; #define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by kio_trash. -namespace KIO { +namespace TDEIO { class Slave; class SlaveInterface; @@ -50,9 +50,9 @@ namespace KIO { * For all jobs created in an application, the code looks like * * \code - * KIO::Job * job = KIO::someoperation( some parameters ); - * connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - * this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + * TDEIO::Job * job = TDEIO::someoperation( some parameters ); + * connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + * this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); * \endcode * (other connects, specific to the job) * @@ -62,8 +62,8 @@ namespace KIO { * if ( job->error() ) * job->showErrorDialog( this or 0L ); * \endcode - * @see KIO::Scheduler - * @see KIO::Slave + * @see TDEIO::Scheduler + * @see TDEIO::Slave */ class KIO_EXPORT Job : public TQObject { Q_OBJECT @@ -90,7 +90,7 @@ namespace KIO { * Returns the error code, if there has been an error. * Only call this method from the slot connected to result(). * @return the error code for this job, 0 if no error. - * Error codes are defined in KIO::Error. + * Error codes are defined in TDEIO::Error. */ int error() const { return m_error; } @@ -262,7 +262,7 @@ namespace KIO { * @see addMetaData() * @see mergeMetaData() */ - void setMetaData( const KIO::MetaData &metaData); + void setMetaData( const TDEIO::MetaData &metaData); /** * Add key/value pair to the meta data that is sent to the slave. @@ -317,7 +317,7 @@ namespace KIO { * @see processedSize * @since 3.2 */ - KIO::filesize_t getProcessedSize(); + TDEIO::filesize_t getProcessedSize(); signals: /** @@ -325,7 +325,7 @@ namespace KIO { * failed...). Use error to know the result. * @param job the job that emitted this signal */ - void result( KIO::Job *job ); + void result( TDEIO::Job *job ); /** * @deprecated. Don't use ! @@ -334,7 +334,7 @@ namespace KIO { * in this case, ERR_USER_CANCELED. * @param job the job that emitted this signal */ - void canceled( KIO::Job *job ); + void canceled( TDEIO::Job *job ); /** * Emitted to display information about this job, as sent by the slave. @@ -342,7 +342,7 @@ namespace KIO { * @param job the job that emitted this signal * @param msg the info message */ - void infoMessage( KIO::Job *job, const TQString & msg ); + void infoMessage( TDEIO::Job *job, const TQString & msg ); // KDE4: Separate rich-text string from plain-text string, for different widgets. /** @@ -351,7 +351,7 @@ namespace KIO { * @param msg the info message * @since 3.5 */ - void warning( KIO::Job *job, const TQString & msg ); + void warning( TDEIO::Job *job, const TQString & msg ); // KDE4: Separate rich-text string from plain-text string, for different widgets. /** @@ -360,7 +360,7 @@ namespace KIO { * currently unused (in the applications). * @param job the job that emitted this signal */ - void connected( KIO::Job *job ); + void connected( TDEIO::Job *job ); /** * Progress signal showing the overall progress of the job @@ -370,7 +370,7 @@ namespace KIO { * @param job the job that emitted this signal * @param percent the percentage */ - void percent( KIO::Job *job, unsigned long percent ); + void percent( TDEIO::Job *job, unsigned long percent ); /** * Emitted when we know the size of this job (data size for transfers, @@ -378,7 +378,7 @@ namespace KIO { * @param job the job that emitted this signal * @param size the total size in bytes */ - void totalSize( KIO::Job *job, KIO::filesize_t size ); + void totalSize( TDEIO::Job *job, TDEIO::filesize_t size ); /** * Regularly emitted to show the progress of this job @@ -386,14 +386,14 @@ namespace KIO { * @param job the job that emitted this signal * @param size the processed size in bytes */ - void processedSize( KIO::Job *job, KIO::filesize_t size ); + void processedSize( TDEIO::Job *job, TDEIO::filesize_t size ); /** * Emitted to display information about the speed of this job. * @param job the job that emitted this signal * @param speed the speed in bytes/s */ - void speed( KIO::Job *job, unsigned long speed ); + void speed( TDEIO::Job *job, unsigned long speed ); protected slots: /** @@ -404,7 +404,7 @@ namespace KIO { * @param job the subjob * @see result() */ - virtual void slotResult( KIO::Job *job ); + virtual void slotResult( TDEIO::Job *job ); /** * Forward signal from subjob. @@ -412,14 +412,14 @@ namespace KIO { * @param speed the speed in bytes/s * @see speed() */ - void slotSpeed( KIO::Job *job, unsigned long speed ); + void slotSpeed( TDEIO::Job *job, unsigned long speed ); /** * Forward signal from subjob. * @param job the subjob * @param msg the info message * @see infoMessage() */ - void slotInfoMessage( KIO::Job *job, const TQString &msg ); + void slotInfoMessage( TDEIO::Job *job, const TQString &msg ); /** * Remove speed information. @@ -465,7 +465,7 @@ namespace KIO { * @param processedSize the processed size in bytes * @param totalSize the total size in bytes */ - void emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize ); + void emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize ); /** * Utility function for inherited jobs. @@ -485,7 +485,7 @@ namespace KIO { * Set the processed size, does not emit processedSize * @since 3.2 */ - void setProcessedSize(KIO::filesize_t size); + void setProcessedSize(TDEIO::filesize_t size); /** * @internal @@ -525,7 +525,7 @@ namespace KIO { * Other jobs are high-level jobs (CopyJob, DeleteJob, FileCopyJob...) * that manage subjobs but aren't scheduled directly. */ - class KIO_EXPORT SimpleJob : public KIO::Job { + class KIO_EXPORT SimpleJob : public TDEIO::Job { Q_OBJECT public: @@ -598,7 +598,7 @@ namespace KIO { * Can also be called by the parent job, when it knows the size. * @param data_size the total size */ - void slotTotalSize( KIO::filesize_t data_size ); + void slotTotalSize( TDEIO::filesize_t data_size ); protected slots: /** @@ -631,7 +631,7 @@ namespace KIO { * @param data_size the processed size in bytes * @see processedSize() */ - void slotProcessedSize( KIO::filesize_t data_size ); + void slotProcessedSize( TDEIO::filesize_t data_size ); /** * Forward signal from the slave. * @param speed the speed in bytes/s @@ -644,7 +644,7 @@ namespace KIO { * @param _metaData the meta data * @see metaData() */ - virtual void slotMetaData( const KIO::MetaData &_metaData); + virtual void slotMetaData( const TDEIO::MetaData &_metaData); public slots: /** @@ -666,7 +666,7 @@ namespace KIO { KURL m_url; KURL m_subUrl; int m_command; - KIO::filesize_t m_totalSize; + TDEIO::filesize_t m_totalSize; protected: virtual void virtual_hook( int id, void* data ); /* @@ -683,7 +683,7 @@ namespace KIO { /** * A KIO job that retrieves information about a file or directory. - * @see KIO::stat() + * @see TDEIO::stat() */ class KIO_EXPORT StatJob : public SimpleJob { @@ -691,7 +691,7 @@ namespace KIO { public: /** - * Do not use this constructor to create a StatJob, use KIO::stat() instead. + * Do not use this constructor to create a StatJob, use TDEIO::stat() instead. * @param url the url of the file or directory to check * @param command the command to issue * @param packedArgs the arguments @@ -742,7 +742,7 @@ namespace KIO { * @param job the job that is redirected * @param url the new url */ - void redirection( KIO::Job *job, const KURL &url ); + void redirection( TDEIO::Job *job, const KURL &url ); /** * Signals a permanent redirection. @@ -752,13 +752,13 @@ namespace KIO { * @param toUrl the new URL * @since 3.1 */ - void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); + void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); protected slots: - void slotStatEntry( const KIO::UDSEntry & entry ); + void slotStatEntry( const TDEIO::UDSEntry & entry ); void slotRedirection( const KURL &url); virtual void slotFinished(); - virtual void slotMetaData( const KIO::MetaData &_metaData); + virtual void slotMetaData( const TDEIO::MetaData &_metaData); protected: UDSEntry m_statResult; @@ -774,7 +774,7 @@ namespace KIO { /** * A KIO job that creates a directory - * @see KIO::mkdir() + * @see TDEIO::mkdir() * @since 3.3 */ class KIO_EXPORT MkdirJob : public SimpleJob { @@ -783,7 +783,7 @@ namespace KIO { public: /** - * Do not use this constructor to create a MkdirJob, use KIO::mkdir() instead. + * Do not use this constructor to create a MkdirJob, use TDEIO::mkdir() instead. * @param url the url of the file or directory to check * @param command the command to issue * @param packedArgs the arguments @@ -807,7 +807,7 @@ namespace KIO { * @param job the job that is redirected * @param url the new url */ - void redirection( KIO::Job *job, const KURL &url ); + void redirection( TDEIO::Job *job, const KURL &url ); /** * Signals a permanent redirection. @@ -816,7 +816,7 @@ namespace KIO { * @param fromUrl the original URL * @param toUrl the new URL */ - void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); + void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); protected slots: void slotRedirection( const KURL &url); @@ -841,7 +841,7 @@ namespace KIO { public: /** - * Do not create a DirectCopyJob. Use KIO::copy() or KIO::file_copy() instead. + * Do not create a DirectCopyJob. Use TDEIO::copy() or TDEIO::file_copy() instead. */ DirectCopyJob(const KURL& url, int command, const TQByteArray &packedArgs, bool showProgressInfo); @@ -859,10 +859,10 @@ namespace KIO { * Emitted if the job found an existing partial file * and supports resuming. Used by FileCopyJob. */ - void canResume( KIO::Job *job, KIO::filesize_t offset ); + void canResume( TDEIO::Job *job, TDEIO::filesize_t offset ); private slots: - void slotCanResume( KIO::filesize_t offset ); + void slotCanResume( TDEIO::filesize_t offset ); }; @@ -877,7 +877,7 @@ namespace KIO { public: /** - * Do not create a TransferJob. Use KIO::get() or KIO::put() + * Do not create a TransferJob. Use TDEIO::get() or TDEIO::put() * instead. * @param url the url to get or put * @param command the command to issue @@ -902,7 +902,7 @@ namespace KIO { * Called when m_subJob finishes. * @param job the job that finished */ - virtual void slotResult( KIO::Job *job ); + virtual void slotResult( TDEIO::Job *job ); /** * Flow control. Suspend data processing from the slave. @@ -974,7 +974,7 @@ namespace KIO { * should not be certain of data.size() == 0 ever happening (e.g. in case * of an error), so you should rely on result() instead. */ - void data( KIO::Job *job, const TQByteArray &data ); + void data( TDEIO::Job *job, const TQByteArray &data ); /** * Request for data. @@ -987,7 +987,7 @@ namespace KIO { * @param data buffer to fill with data to send to the * slave. An empty buffer indicates end of data. (EOD) */ - void dataReq( KIO::Job *job, TQByteArray &data ); + void dataReq( TDEIO::Job *job, TQByteArray &data ); /** * Signals a redirection. @@ -996,7 +996,7 @@ namespace KIO { * @param job the job that emitted this signal * @param url the new URL */ - void redirection( KIO::Job *job, const KURL &url ); + void redirection( TDEIO::Job *job, const KURL &url ); /** * Signals a permanent redirection. @@ -1006,14 +1006,14 @@ namespace KIO { * @param toUrl the new URL * @since 3.1 */ - void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); + void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); /** * Mimetype determined. * @param job the job that emitted this signal * @param type the mime type */ - void mimetype( KIO::Job *job, const TQString &type ); + void mimetype( TDEIO::Job *job, const TQString &type ); /** * @internal @@ -1022,7 +1022,7 @@ namespace KIO { * and emitted by the "get" job if it supports resuming to * the given offset - in this case @p offset is unused) */ - void canResume( KIO::Job *job, KIO::filesize_t offset ); + void canResume( TDEIO::Job *job, TDEIO::filesize_t offset ); protected slots: @@ -1032,10 +1032,10 @@ namespace KIO { virtual void slotDataReq(); virtual void slotMimetype( const TQString &mimetype ); virtual void slotNeedSubURLData(); - virtual void slotSubURLData(KIO::Job*, const TQByteArray &); - virtual void slotMetaData( const KIO::MetaData &_metaData); + virtual void slotSubURLData(TDEIO::Job*, const TQByteArray &); + virtual void slotMetaData( const TDEIO::MetaData &_metaData); void slotErrorPage(); - void slotCanResume( KIO::filesize_t offset ); + void slotCanResume( TDEIO::filesize_t offset ); void slotPostRedirection(); protected: @@ -1057,14 +1057,14 @@ namespace KIO { * also stores a TQByteArray with the data, making it simpler to use than the * standard TransferJob. * - * For KIO::storedGet it puts the data into the member TQByteArray, so the user + * For TDEIO::storedGet it puts the data into the member TQByteArray, so the user * of this class can get hold of the whole data at once by calling data() * when the result signal is emitted. * You should only use StoredTransferJob to download data if you cannot * process the data by chunks while it's being downloaded, since storing * everything in a TQByteArray can potentially require a lot of memory. * - * For KIO::storedPut the user of this class simply provides the bytearray from + * For TDEIO::storedPut the user of this class simply provides the bytearray from * the start, and the job takes care of uploading it. * You should only use StoredTransferJob to upload data if you cannot * provide the in chunks while it's being uploaded, since storing @@ -1072,7 +1072,7 @@ namespace KIO { * * @since 3.3 */ - class KIO_EXPORT StoredTransferJob : public KIO::TransferJob { + class KIO_EXPORT StoredTransferJob : public TDEIO::TransferJob { Q_OBJECT public: @@ -1092,7 +1092,7 @@ namespace KIO { /** * Set data to be uploaded. This is for put jobs. - * Automatically called by KIO::storedPut(const TQByteArray &, ...), + * Automatically called by TDEIO::storedPut(const TQByteArray &, ...), * do not call this yourself. */ void setData( const TQByteArray& arr ); @@ -1104,8 +1104,8 @@ namespace KIO { TQByteArray data() const { return m_data; } private slots: - void slotStoredData( KIO::Job *job, const TQByteArray &data ); - void slotStoredDataReq( KIO::Job *job, TQByteArray &data ); + void slotStoredData( TDEIO::Job *job, const TQByteArray &data ); + void slotStoredDataReq( TDEIO::Job *job, TQByteArray &data ); private: TQByteArray m_data; int m_uploadOffset; @@ -1114,15 +1114,15 @@ namespace KIO { /** * The MultiGetJob is a TransferJob that allows you to get * several files from a single server. Don't create directly, - * but use KIO::multi_get() instead. - * @see KIO::multi_get() + * but use TDEIO::multi_get() instead. + * @see TDEIO::multi_get() */ class KIO_EXPORT MultiGetJob : public TransferJob { Q_OBJECT public: /** - * Do not create a MultiGetJob directly, use KIO::multi_get() + * Do not create a MultiGetJob directly, use TDEIO::multi_get() * instead. * * @param url the first url to get @@ -1166,7 +1166,7 @@ namespace KIO { /** * File transfer completed. * - * When all files have been processed, result(KIO::Job *) gets + * When all files have been processed, result(TDEIO::Job *) gets * emitted. * @param id the id of the request */ @@ -1202,15 +1202,15 @@ namespace KIO { /** * A MimetypeJob is a TransferJob that allows you to get * the mime type of an URL. Don't create directly, - * but use KIO::mimetype() instead. - * @see KIO::mimetype() + * but use TDEIO::mimetype() instead. + * @see TDEIO::mimetype() */ class KIO_EXPORT MimetypeJob : public TransferJob { Q_OBJECT public: /** - * Do not create a MimetypeJob directly. Use KIO::mimetype() + * Do not create a MimetypeJob directly. Use TDEIO::mimetype() * instead. * @param url the url to get * @param command the command to issue @@ -1244,16 +1244,16 @@ namespace KIO { /** * The FileCopyJob copies data from one place to another. - * @see KIO::file_copy() - * @see KIO::file_move() + * @see TDEIO::file_copy() + * @see TDEIO::file_move() */ class KIO_EXPORT FileCopyJob : public Job { Q_OBJECT public: /** - * Do not create a FileCopyJob directly. Use KIO::file_move() - * or KIO::file_copy() instead. + * Do not create a FileCopyJob directly. Use TDEIO::file_move() + * or TDEIO::file_copy() instead. * @param src the source URL * @param dest the destination URL * @param permissions the permissions of the resulting resource @@ -1272,7 +1272,7 @@ namespace KIO { * @param size the size of the source file * @since 3.2 */ - void setSourceSize64(KIO::filesize_t size); + void setSourceSize64(TDEIO::filesize_t size); /** * Sets the modification time of the file @@ -1310,45 +1310,45 @@ namespace KIO { * * @since 3.5.7 */ - void mimetype( KIO::Job *job, const TQString &type ); + void mimetype( TDEIO::Job *job, const TQString &type ); public slots: void slotStart(); - void slotData( KIO::Job *, const TQByteArray &data); - void slotDataReq( KIO::Job *, TQByteArray &data); - void slotMimetype( KIO::Job *, const TQString& type ); + void slotData( TDEIO::Job *, const TQByteArray &data); + void slotDataReq( TDEIO::Job *, TQByteArray &data); + void slotMimetype( TDEIO::Job *, const TQString& type ); protected slots: /** * Called whenever a subjob finishes. * @param job the job that emitted this signal */ - virtual void slotResult( KIO::Job *job ); + virtual void slotResult( TDEIO::Job *job ); /** * Forward signal from subjob * @param job the job that emitted this signal * @param size the processed size in bytes */ - void slotProcessedSize( KIO::Job *job, KIO::filesize_t size ); + void slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size ); /** * Forward signal from subjob * @param job the job that emitted this signal * @param size the total size */ - void slotTotalSize( KIO::Job *job, KIO::filesize_t size ); + void slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size ); /** * Forward signal from subjob * @param job the job that emitted this signal * @param pct the percentage */ - void slotPercent( KIO::Job *job, unsigned long pct ); + void slotPercent( TDEIO::Job *job, unsigned long pct ); /** * Forward signal from subjob * @param job the job that emitted this signal * @param offset the offset to resume from */ - void slotCanResume( KIO::Job *job, KIO::filesize_t offset ); + void slotCanResume( TDEIO::Job *job, TDEIO::filesize_t offset ); protected: void startCopyJob(); @@ -1374,7 +1374,7 @@ namespace KIO { SimpleJob *m_copyJob; TransferJob *m_getJob; TransferJob *m_putJob; - KIO::filesize_t m_totalSize; + TDEIO::filesize_t m_totalSize; protected: virtual void virtual_hook( int id, void* data ); private: @@ -1384,18 +1384,18 @@ namespace KIO { /** * A ListJob is allows you to get the get the content of a directory. - * Don't create the job directly, but use KIO::listRecursive() or - * KIO::listDir() instead. - * @see KIO::listRecursive() - * @see KIO::listDir() + * Don't create the job directly, but use TDEIO::listRecursive() or + * TDEIO::listDir() instead. + * @see TDEIO::listRecursive() + * @see TDEIO::listDir() */ class KIO_EXPORT ListJob : public SimpleJob { Q_OBJECT public: /** - * Do not create a ListJob directly. Use KIO::listDir() or - * KIO::listRecursive() instead. + * Do not create a ListJob directly. Use TDEIO::listDir() or + * TDEIO::listRecursive() instead. * @param url the url of the directory * @param showProgressInfo true to show progress information to the user * @param recursive true to get the data recursively from child directories, @@ -1439,7 +1439,7 @@ namespace KIO { * @param job the job that emitted this signal * @param list the list of UDSEntries */ - void entries( KIO::Job *job, const KIO::UDSEntryList& list); + void entries( TDEIO::Job *job, const TDEIO::UDSEntryList& list); /** * Signals a redirection. @@ -1448,7 +1448,7 @@ namespace KIO { * @param job the job that is redirected * @param url the new url */ - void redirection( KIO::Job *job, const KURL &url ); + void redirection( TDEIO::Job *job, const KURL &url ); /** * Signals a permanent redirection. @@ -1458,15 +1458,15 @@ namespace KIO { * @param toUrl the new URL * @since 3.1 */ - void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); + void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl ); protected slots: virtual void slotFinished( ); - virtual void slotMetaData( const KIO::MetaData &_metaData); - virtual void slotResult( KIO::Job *job ); - void slotListEntries( const KIO::UDSEntryList& list ); + virtual void slotMetaData( const TDEIO::MetaData &_metaData); + virtual void slotResult( TDEIO::Job *job ); + void slotListEntries( const TDEIO::UDSEntryList& list ); void slotRedirection( const KURL &url ); - void gotEntries( KIO::Job * subjob, const KIO::UDSEntryList& list ); + void gotEntries( TDEIO::Job * subjob, const TDEIO::UDSEntryList& list ); private: bool recursive; @@ -1490,20 +1490,20 @@ namespace KIO { //mode_t type; time_t ctime; time_t mtime; - KIO::filesize_t size; // 0 for dirs + TDEIO::filesize_t size; // 0 for dirs }; /** * CopyJob is used to move, copy or symlink files and directories. - * Don't create the job directly, but use KIO::copy(), - * KIO::move(), KIO::link() and friends. + * Don't create the job directly, but use TDEIO::copy(), + * TDEIO::move(), TDEIO::link() and friends. * - * @see KIO::copy() - * @see KIO::copyAs() - * @see KIO::move() - * @see KIO::moveAs() - * @see KIO::link() - * @see KIO::linkAs() + * @see TDEIO::copy() + * @see TDEIO::copyAs() + * @see TDEIO::move() + * @see TDEIO::moveAs() + * @see TDEIO::link() + * @see TDEIO::linkAs() */ class KIO_EXPORT CopyJob : public Job { Q_OBJECT @@ -1515,21 +1515,21 @@ namespace KIO { enum CopyMode{ Copy, Move, Link }; /** - * Do not create a CopyJob directly. Use KIO::copy(), - * KIO::move(), KIO::link() and friends instead. + * Do not create a CopyJob directly. Use TDEIO::copy(), + * TDEIO::move(), TDEIO::link() and friends instead. * * @param src the list of source URLs * @param dest the destination URL * @param mode specifies whether the job should copy, move or link - * @param asMethod if true, behaves like KIO::copyAs(), - * KIO::moveAs() or KIO::linkAs() + * @param asMethod if true, behaves like TDEIO::copyAs(), + * TDEIO::moveAs() or TDEIO::linkAs() * @param showProgressInfo true to show progress information to the user - * @see KIO::copy() - * @see KIO::copyAs() - * @see KIO::move() - * @see KIO::moveAs() - * @see KIO::link() - * @see KIO::linkAs() + * @see TDEIO::copy() + * @see TDEIO::copyAs() + * @see TDEIO::move() + * @see TDEIO::moveAs() + * @see TDEIO::link() + * @see TDEIO::linkAs() */ CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool asMethod, bool showProgressInfo ); @@ -1579,13 +1579,13 @@ namespace KIO { * @param job the job that emitted this signal * @param files the total number of files */ - void totalFiles( KIO::Job *job, unsigned long files ); + void totalFiles( TDEIO::Job *job, unsigned long files ); /** * Emitted when the toal number of direcotries is known. * @param job the job that emitted this signal * @param dirs the total number of directories */ - void totalDirs( KIO::Job *job, unsigned long dirs ); + void totalDirs( TDEIO::Job *job, unsigned long dirs ); /** * Emitted when it is known which files / directories are going @@ -1594,20 +1594,20 @@ namespace KIO { * @param job the job that emitted this signal * @param files a list of items that are about to be created. */ - void aboutToCreate( KIO::Job *job, const TQValueList &files); + void aboutToCreate( TDEIO::Job *job, const TQValueList &files); /** * Sends the number of processed files. * @param job the job that emitted this signal * @param files the number of processed files */ - void processedFiles( KIO::Job *job, unsigned long files ); + void processedFiles( TDEIO::Job *job, unsigned long files ); /** * Sends the number of processed directories. * @param job the job that emitted this signal * @param dirs the number of processed dirs */ - void processedDirs( KIO::Job *job, unsigned long dirs ); + void processedDirs( TDEIO::Job *job, unsigned long dirs ); /** * The job is copying a file or directory. @@ -1616,7 +1616,7 @@ namespace KIO { * being copied * @param to the destination of the current operation */ - void copying( KIO::Job *job, const KURL& from, const KURL& to ); + void copying( TDEIO::Job *job, const KURL& from, const KURL& to ); /** * The job is creating a symbolic link. * @param job the job that emitted this signal @@ -1624,7 +1624,7 @@ namespace KIO { * being linked * @param to the destination of the current operation */ - void linking( KIO::Job *job, const TQString& target, const KURL& to ); + void linking( TDEIO::Job *job, const TQString& target, const KURL& to ); /** * The job is moving a file or directory. * @param job the job that emitted this signal @@ -1632,20 +1632,20 @@ namespace KIO { * being moved * @param to the destination of the current operation */ - void moving( KIO::Job *job, const KURL& from, const KURL& to ); + void moving( TDEIO::Job *job, const KURL& from, const KURL& to ); /** * The job is creating the directory @p dir. * @param job the job that emitted this signal * @param dir the directory that is currently being created */ - void creatingDir( KIO::Job *job, const KURL& dir ); + void creatingDir( TDEIO::Job *job, const KURL& dir ); /** * The user chose to rename @p from to @p to. * @param job the job that emitted this signal * @param from the original name * @param to the new name */ - void renamed( KIO::Job *job, const KURL& from, const KURL& to ); + void renamed( TDEIO::Job *job, const KURL& from, const KURL& to ); /** * The job emits this signal when copying or moving a file or directory successfully finished. @@ -1659,7 +1659,7 @@ namespace KIO { * @param renamed indicates that the destination URL was created using a * rename operation (i.e. fast directory moving). true if is has been renamed */ - void copyingDone( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ); + void copyingDone( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ); /** * The job is copying or moving a symbolic link, that points to target. * The new link is created in @p to. The existing one is/was in @p from. @@ -1669,26 +1669,26 @@ namespace KIO { * @param target the target * @param to the destination URL */ - void copyingLinkDone( KIO::Job *job, const KURL &from, const TQString& target, const KURL& to ); + void copyingLinkDone( TDEIO::Job *job, const KURL &from, const TQString& target, const KURL& to ); protected: void statCurrentSrc(); void statNextSrc(); // Those aren't slots but submethods for slotResult. - void slotResultStating( KIO::Job * job ); + void slotResultStating( TDEIO::Job * job ); void startListing( const KURL & src ); - void slotResultCreatingDirs( KIO::Job * job ); - void slotResultConflictCreatingDirs( KIO::Job * job ); + void slotResultCreatingDirs( TDEIO::Job * job ); + void slotResultConflictCreatingDirs( TDEIO::Job * job ); void createNextDir(); - void slotResultCopyingFiles( KIO::Job * job ); - void slotResultConflictCopyingFiles( KIO::Job * job ); + void slotResultCopyingFiles( TDEIO::Job * job ); + void slotResultConflictCopyingFiles( TDEIO::Job * job ); void copyNextFile(); - void slotResultDeletingDirs( KIO::Job * job ); + void slotResultDeletingDirs( TDEIO::Job * job ); void deleteNextDir(); void skip( const KURL & sourceURL ); - void slotResultRenaming( KIO::Job * job ); - //void slotResultSettingDirAttributes( KIO::Job * job ); + void slotResultRenaming( TDEIO::Job * job ); + //void slotResultSettingDirAttributes( TDEIO::Job * job ); void setNextDirAttribute(); private: void startRenameJob(const KURL &slave_url); @@ -1698,17 +1698,17 @@ namespace KIO { protected slots: void slotStart(); - void slotEntries( KIO::Job*, const KIO::UDSEntryList& list ); - virtual void slotResult( KIO::Job *job ); + void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& list ); + virtual void slotResult( TDEIO::Job *job ); /** * Forward signal from subjob */ - void slotProcessedSize( KIO::Job*, KIO::filesize_t data_size ); + void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size ); /** * Forward signal from subjob * @param size the total size */ - void slotTotalSize( KIO::Job*, KIO::filesize_t size ); + void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ); void slotReport(); private: @@ -1719,9 +1719,9 @@ namespace KIO { enum { STATE_STATING, STATE_RENAMING, STATE_LISTING, STATE_CREATING_DIRS, STATE_CONFLICT_CREATING_DIRS, STATE_COPYING_FILES, STATE_CONFLICT_COPYING_FILES, STATE_DELETING_DIRS, STATE_SETTING_DIR_ATTRIBUTES } state; - KIO::filesize_t m_totalSize; - KIO::filesize_t m_processedSize; - KIO::filesize_t m_fileProcessedSize; + TDEIO::filesize_t m_totalSize; + TDEIO::filesize_t m_processedSize; + TDEIO::filesize_t m_fileProcessedSize; int m_processedFiles; int m_processedDirs; TQValueList files; @@ -1756,22 +1756,22 @@ namespace KIO { /** * A more complex Job to delete files and directories. - * Don't create the job directly, but use KIO::del() instead. + * Don't create the job directly, but use TDEIO::del() instead. * - * @see KIO::del() + * @see TDEIO::del() */ class KIO_EXPORT DeleteJob : public Job { Q_OBJECT public: /** - * Do not create a DeleteJob directly. Use KIO::del() + * Do not create a DeleteJob directly. Use TDEIO::del() * instead. * * @param src the list of URLs to delete * @param shred true to shred (make sure that data is not recoverable)a * @param showProgressInfo true to show progress information to the user - * @see KIO::del() + * @see TDEIO::del() */ DeleteJob( const KURL::List& src, bool shred, bool showProgressInfo ); @@ -1788,26 +1788,26 @@ namespace KIO { * @param job the job that emitted this signal * @param files the total number of files */ - void totalFiles( KIO::Job *job, unsigned long files ); + void totalFiles( TDEIO::Job *job, unsigned long files ); /** * Emitted when the toal number of direcotries is known. * @param job the job that emitted this signal * @param dirs the total number of directories */ - void totalDirs( KIO::Job *job, unsigned long dirs ); + void totalDirs( TDEIO::Job *job, unsigned long dirs ); /** * Sends the number of processed files. * @param job the job that emitted this signal * @param files the number of processed files */ - void processedFiles( KIO::Job *job, unsigned long files ); + void processedFiles( TDEIO::Job *job, unsigned long files ); /** * Sends the number of processed directories. * @param job the job that emitted this signal * @param dirs the number of processed dirs */ - void processedDirs( KIO::Job *job, unsigned long dirs ); + void processedDirs( TDEIO::Job *job, unsigned long dirs ); /** * Sends the URL of the file that is currently being deleted. @@ -1815,17 +1815,17 @@ namespace KIO { * @param file the URL of the file or directory that is being * deleted */ - void deleting( KIO::Job *job, const KURL& file ); + void deleting( TDEIO::Job *job, const KURL& file ); protected slots: void slotStart(); - void slotEntries( KIO::Job*, const KIO::UDSEntryList& list ); - virtual void slotResult( KIO::Job *job ); + void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& list ); + virtual void slotResult( TDEIO::Job *job ); /** * Forward signal from subjob */ - void slotProcessedSize( KIO::Job*, KIO::filesize_t data_size ); + void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size ); void slotReport(); private: @@ -1836,9 +1836,9 @@ namespace KIO { private: enum { STATE_STATING, STATE_LISTING, STATE_DELETING_FILES, STATE_DELETING_DIRS } state; - KIO::filesize_t m_totalSize; - KIO::filesize_t m_processedSize; - KIO::filesize_t m_fileProcessedSize; + TDEIO::filesize_t m_totalSize; + TDEIO::filesize_t m_processedSize; + TDEIO::filesize_t m_fileProcessedSize; int m_processedFiles; int m_processedDirs; int m_totalFilesDirs; @@ -1860,7 +1860,7 @@ namespace KIO { /** * A KIO job that finds a local URL - * @see KIO::localURL() + * @see TDEIO::localURL() * @since R14.0.0 */ class KIO_EXPORT LocalURLJob : public SimpleJob { @@ -1869,7 +1869,7 @@ namespace KIO { public: /** - * Do not use this constructor to create a LocalURLJob, use KIO::localURL() instead. + * Do not use this constructor to create a LocalURLJob, use TDEIO::localURL() instead. * @param url the url of the file or directory to check * @param command the command to issue * @param packedArgs the arguments @@ -1891,7 +1891,7 @@ namespace KIO { * @param url the local url * @param isLocal true if the returned URL is local, false if not */ - void localURL( KIO::Job *job, const KURL &url, bool isLocal ); + void localURL( TDEIO::Job *job, const KURL &url, bool isLocal ); protected slots: void slotLocalURL( const KURL &url, bool isLocal ); diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp index a4782c313..e8b1d2af0 100644 --- a/kio/kio/kautomount.cpp +++ b/kio/kio/kautomount.cpp @@ -38,11 +38,11 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString& //kdDebug(7015) << "KAutoMount device=" << _device << " mountpoint=" << _mountpoint << endl; m_bShowFilemanagerWindow = _show_filemanager_window; - KIO::Job* job = KIO::mount( _readonly, _format.ascii(), _device, _mountpoint ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } -void KAutoMount::slotResult( KIO::Job * job ) +void KAutoMount::slotResult( TDEIO::Job * job ) { if ( job->error() ) { emit error(); @@ -51,12 +51,12 @@ void KAutoMount::slotResult( KIO::Job * job ) else { KURL mountpoint; - mountpoint.setPath( KIO::findDeviceMountPoint( m_strDevice ) ); + mountpoint.setPath( TDEIO::findDeviceMountPoint( m_strDevice ) ); //kdDebug(7015) << "KAutoMount: m_strDevice=" << m_strDevice << " -> mountpoint=" << mountpoint << endl; Q_ASSERT( mountpoint.isValid() ); if ( mountpoint.path().isEmpty() ) - kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't find it. " + kdWarning(7015) << m_strDevice << " was correctly mounted, but TDEIO::findDeviceMountPoint didn't find it. " << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl; else if ( m_bShowFilemanagerWindow ) KRun::runURL( mountpoint, "inode/directory" ); @@ -80,11 +80,11 @@ void KAutoMount::slotResult( KIO::Job * job ) KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desktopFile ) : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint ) { - KIO::Job * job = KIO::unmount( m_mountpoint ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + TDEIO::Job * job = TDEIO::unmount( m_mountpoint ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } -void KAutoUnmount::slotResult( KIO::Job * job ) +void KAutoUnmount::slotResult( TDEIO::Job * job ) { if ( job->error() ) { emit error(); diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h index c5aa30583..68eecdbbd 100644 --- a/kio/kio/kautomount.h +++ b/kio/kio/kautomount.h @@ -30,14 +30,14 @@ #ifdef Q_OS_UNIX -namespace KIO { +namespace TDEIO { class Job; } /** * This class implements synchronous mounting of devices, * as well as showing a file-manager window after mounting a device, optionally. - * It is a wrapper around the asychronous KIO::special() call for mount, + * It is a wrapper around the asychronous TDEIO::special() call for mount, * used by KMimeType. * * @short This class implements synchronous mounting of devices. @@ -68,7 +68,7 @@ signals: void error(); protected slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); protected: TQString m_strDevice; @@ -82,7 +82,7 @@ private: /** * This class implements synchronous unmounting of devices, - * It is a wrapper around the asychronous KIO::special() call for unmount, + * It is a wrapper around the asychronous TDEIO::special() call for unmount, * used by KMimeType. * * @short This class implements synchronous unmounting of devices, @@ -107,7 +107,7 @@ signals: void error(); protected slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); private: TQString m_desktopFile; TQString m_mountpoint; diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index b6905b3a3..90cfca041 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -224,8 +224,8 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, if ( lister->d->url == _url ) lister->d->rootFileItem = 0; - KIO::ListJob* job = KIO::listDir( _url, false /* no default GUI */ ); - jobs.insert( job, TQValueList() ); + TDEIO::ListJob* job = TDEIO::listDir( _url, false /* no default GUI */ ); + jobs.insert( job, TQValueList() ); lister->jobStarted( job ); lister->connectJob( job ); @@ -233,12 +233,12 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, if ( lister->d->window ) job->setWindow( lister->d->window ); - connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList & ) ), - this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList & ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL & ) ), - this, TQT_SLOT( slotRedirection( KIO::Job *, const KURL & ) ) ); + connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), + this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); emit lister->started( _url ); @@ -253,7 +253,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, urlsCurrentlyListed[urlStr]->append( lister ); - KIO::ListJob *job = jobForUrl( urlStr ); + TDEIO::ListJob *job = jobForUrl( urlStr ); Q_ASSERT( job ); lister->jobStarted( job ); @@ -322,7 +322,7 @@ void KDirListerCache::stop( KDirLister *lister ) bool ret = listers->removeRef( lister ); Q_ASSERT( ret ); - KIO::ListJob *job = jobForUrl( url ); + TDEIO::ListJob *job = jobForUrl( url ); if ( job ) lister->jobDone( job ); @@ -388,7 +388,7 @@ void KDirListerCache::stop( KDirLister *lister, const KURL& _u ) holders->append( lister ); - KIO::ListJob *job = jobForUrl( urlStr ); + TDEIO::ListJob *job = jobForUrl( urlStr ); if ( job ) lister->jobDone( job ); @@ -472,7 +472,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not itemsInUse.remove( urlStr ); // this job is a running update - KIO::ListJob *job = jobForUrl( urlStr ); + TDEIO::ListJob *job = jobForUrl( urlStr ); if ( job ) { lister->jobDone( job ); @@ -499,7 +499,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // Generally keep a watch, except when it would prevent // unmounting a removable device (#37780) const bool isLocal = item->url.isLocalFile(); - const bool isManuallyMounted = isLocal && KIO::manually_mounted( item->url.path() ); + const bool isManuallyMounted = isLocal && TDEIO::manually_mounted( item->url.path() ); bool containsManuallyMounted = false; if ( !isManuallyMounted && item->lstItems && isLocal ) { @@ -509,7 +509,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // of the time this is just a stat per subdir) KFileItemListIterator kit( *item->lstItems ); for ( ; kit.current() && !containsManuallyMounted; ++kit ) - if ( (*kit)->isDir() && KIO::manually_mounted( (*kit)->url().path() ) ) + if ( (*kit)->isDir() && TDEIO::manually_mounted( (*kit)->url().path() ) ) containsManuallyMounted = true; } @@ -554,7 +554,7 @@ void KDirListerCache::updateDirectory( const KURL& _dir ) // restart the job for _dir if it is running already bool killed = false; TQWidget *window = 0; - KIO::ListJob *job = jobForUrl( urlStr ); + TDEIO::ListJob *job = jobForUrl( urlStr ); if ( job ) { window = job->window(); @@ -577,13 +577,13 @@ void KDirListerCache::updateDirectory( const KURL& _dir ) Q_ASSERT( !listers || (listers && killed) ); - job = KIO::listDir( _dir, false /* no default GUI */ ); - jobs.insert( job, TQValueList() ); + job = TDEIO::listDir( _dir, false /* no default GUI */ ); + jobs.insert( job, TQValueList() ); - connect( job, TQT_SIGNAL(entries( KIO::Job *, const KIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( KIO::Job *, const KIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( KIO::Job * )), - this, TQT_SLOT(slotUpdateResult( KIO::Job * )) ); + connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQT_SIGNAL(result( TDEIO::Job * )), + this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl; @@ -930,9 +930,9 @@ void KDirListerCache::slotFileDeleted( const TQString& _file ) FilesRemoved( u ); } -void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entries ) +void KDirListerCache::slotEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries ) { - KURL url = joburl( static_cast(job) ); + KURL url = joburl( static_cast(job) ); url.adjustPath(-1); TQString urlStr = url.url(); @@ -954,17 +954,17 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri static const TQString& dot = TDEGlobal::staticQString("."); static const TQString& dotdot = TDEGlobal::staticQString(".."); - KIO::UDSEntryListConstIterator it = entries.begin(); - KIO::UDSEntryListConstIterator end = entries.end(); + TDEIO::UDSEntryListConstIterator it = entries.begin(); + TDEIO::UDSEntryListConstIterator end = entries.end(); for ( ; it != end; ++it ) { TQString name; // find out about the name - KIO::UDSEntry::ConstIterator entit = (*it).begin(); + TDEIO::UDSEntry::ConstIterator entit = (*it).begin(); for( ; entit != (*it).end(); ++entit ) - if ( (*entit).m_uds == KIO::UDS_NAME ) + if ( (*entit).m_uds == TDEIO::UDS_NAME ) { name = (*entit).m_str; break; @@ -1000,10 +1000,10 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri kdl->emitItems(); } -void KDirListerCache::slotResult( KIO::Job *j ) +void KDirListerCache::slotResult( TDEIO::Job *j ) { Q_ASSERT( j ); - KIO::ListJob *job = static_cast( j ); + TDEIO::ListJob *job = static_cast( j ); jobs.remove( job ); KURL jobUrl = joburl( job ); @@ -1067,10 +1067,10 @@ void KDirListerCache::slotResult( KIO::Job *j ) #endif } -void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) +void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url ) { Q_ASSERT( j ); - KIO::ListJob *job = static_cast( j ); + TDEIO::ListJob *job = static_cast( j ); KURL oldUrl = job->url(); // here we really need the old url! KURL newUrl = url; @@ -1175,7 +1175,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) // get the job if one's running for newUrl already (can be a list-job or an update-job), but // do not return this 'job', which would happen because of the use of redirectionURL() - KIO::ListJob *oldJob = jobForUrl( newUrl.url(), job ); + TDEIO::ListJob *oldJob = jobForUrl( newUrl.url(), job ); // listers of newUrl with oldJob: forget about the oldJob and use the already running one // which will be converted to an updateJob @@ -1305,10 +1305,10 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) // make the job an update job job->disconnect( this ); - connect( job, TQT_SIGNAL(entries( KIO::Job *, const KIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( KIO::Job *, const KIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( KIO::Job * )), - this, TQT_SLOT(slotUpdateResult( KIO::Job * )) ); + connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQT_SIGNAL(result( TDEIO::Job * )), + this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); // FIXME: autoUpdate-Counts!! @@ -1385,7 +1385,7 @@ void KDirListerCache::emitRedirections( const KURL &oldUrl, const KURL &url ) TQString oldUrlStr = oldUrl.url(-1); TQString urlStr = url.url(-1); - KIO::ListJob *job = jobForUrl( oldUrlStr ); + TDEIO::ListJob *job = jobForUrl( oldUrlStr ); if ( job ) killJob( job ); @@ -1454,15 +1454,15 @@ void KDirListerCache::removeDirFromCache( const KURL& dir ) } } -void KDirListerCache::slotUpdateEntries( KIO::Job* job, const KIO::UDSEntryList& list ) +void KDirListerCache::slotUpdateEntries( TDEIO::Job* job, const TDEIO::UDSEntryList& list ) { - jobs[static_cast(job)] += list; + jobs[static_cast(job)] += list; } -void KDirListerCache::slotUpdateResult( KIO::Job * j ) +void KDirListerCache::slotUpdateResult( TDEIO::Job * j ) { Q_ASSERT( j ); - KIO::ListJob *job = static_cast( j ); + TDEIO::ListJob *job = static_cast( j ); KURL jobUrl = joburl( job ); jobUrl.adjustPath(-1); // need remove trailing slashes again, in case of redirections @@ -1544,8 +1544,8 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) KFileItem *item = 0, *tmp; - TQValueList buf = jobs[job]; - TQValueListIterator it = buf.begin(); + TQValueList buf = jobs[job]; + TQValueListIterator it = buf.begin(); for ( ; it != buf.end(); ++it ) { // Form the complete url @@ -1641,10 +1641,10 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) // private -KIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, KIO::ListJob *not_job ) +TDEIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, TDEIO::ListJob *not_job ) { - KIO::ListJob *job; - TQMap< KIO::ListJob *, TQValueList >::Iterator it = jobs.begin(); + TDEIO::ListJob *job; + TQMap< TDEIO::ListJob *, TQValueList >::Iterator it = jobs.begin(); while ( it != jobs.end() ) { job = it.key(); @@ -1655,7 +1655,7 @@ KIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, KIO::ListJob *not return 0; } -const KURL& KDirListerCache::joburl( KIO::ListJob *job ) +const KURL& KDirListerCache::joburl( TDEIO::ListJob *job ) { if ( job->redirectionURL().isValid() ) return job->redirectionURL(); @@ -1663,7 +1663,7 @@ const KURL& KDirListerCache::joburl( KIO::ListJob *job ) return job->url(); } -void KDirListerCache::killJob( KIO::ListJob *job ) +void KDirListerCache::killJob( TDEIO::ListJob *job ) { jobs.remove( job ); job->disconnect( this ); @@ -1806,7 +1806,7 @@ void KDirListerCache::printDebug() kdDebug(7004) << " " << it2.currentKey() << " " << it2.current()->count() << " listers: " << list << endl; } - TQMap< KIO::ListJob *, TQValueList >::Iterator jit = jobs.begin(); + TQMap< TDEIO::ListJob *, TQValueList >::Iterator jit = jobs.begin(); kdDebug(7004) << "Jobs: " << endl; for ( ; jit != jobs.end() ; ++jit ) kdDebug(7004) << " " << jit.key() << " listing " << joburl( jit.key() ).prettyURL() << ": " << (*jit).count() << " entries." << endl; @@ -1867,9 +1867,9 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload ) // If a local path is available, monitor that instead of the given remote URL... KURL realURL = _url; if (!realURL.isLocalFile()) { - KIO::LocalURLJob* localURLJob = KIO::localURL(_url); + TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url); if (localURLJob) { - connect(localURLJob, TQT_SIGNAL(localURL(KIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(KIO::Job*, const KURL&, bool))); + connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::Job*, const KURL&, bool))); connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); d->localURLSlotFired = false; while (!d->localURLSlotFired) { @@ -1885,7 +1885,7 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload ) return s_pCache->listDir( this, realURL, _keep, _reload ); } -void KDirLister::slotLocalURL(KIO::Job *job, const KURL& url, bool isLocal) { +void KDirLister::slotLocalURL(TDEIO::Job *job, const KURL& url, bool isLocal) { d->localURLSlotFired = true; d->localURLResultURL = url; d->localURLResultIsLocal = isLocal; @@ -2248,7 +2248,7 @@ bool KDirLister::validURL( const KURL& _url ) const return s_pCache->validURL( this, _url ); } -void KDirLister::handleError( KIO::Job *job ) +void KDirLister::handleError( TDEIO::Job *job ) { if ( d->autoErrorHandling ) job->showErrorDialog( d->errorParent ); @@ -2382,20 +2382,20 @@ void KDirLister::emitDeleteItem( KFileItem *item ) // ================ private slots ================ // -void KDirLister::slotInfoMessage( KIO::Job *, const TQString& message ) +void KDirLister::slotInfoMessage( TDEIO::Job *, const TQString& message ) { emit infoMessage( message ); } -void KDirLister::slotPercent( KIO::Job *job, unsigned long pcnt ) +void KDirLister::slotPercent( TDEIO::Job *job, unsigned long pcnt ) { - d->jobData[static_cast(job)].percent = pcnt; + d->jobData[static_cast(job)].percent = pcnt; int result = 0; - KIO::filesize_t size = 0; + TDEIO::filesize_t size = 0; - TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); + TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); while ( dataIt != d->jobData.end() ) { result += (*dataIt).percent * (*dataIt).totalSize; @@ -2410,12 +2410,12 @@ void KDirLister::slotPercent( KIO::Job *job, unsigned long pcnt ) emit percent( result ); } -void KDirLister::slotTotalSize( KIO::Job *job, KIO::filesize_t size ) +void KDirLister::slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size ) { - d->jobData[static_cast(job)].totalSize = size; + d->jobData[static_cast(job)].totalSize = size; - KIO::filesize_t result = 0; - TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); + TDEIO::filesize_t result = 0; + TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); while ( dataIt != d->jobData.end() ) { result += (*dataIt).totalSize; @@ -2425,12 +2425,12 @@ void KDirLister::slotTotalSize( KIO::Job *job, KIO::filesize_t size ) emit totalSize( result ); } -void KDirLister::slotProcessedSize( KIO::Job *job, KIO::filesize_t size ) +void KDirLister::slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size ) { - d->jobData[static_cast(job)].processedSize = size; + d->jobData[static_cast(job)].processedSize = size; - KIO::filesize_t result = 0; - TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); + TDEIO::filesize_t result = 0; + TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); while ( dataIt != d->jobData.end() ) { result += (*dataIt).processedSize; @@ -2440,12 +2440,12 @@ void KDirLister::slotProcessedSize( KIO::Job *job, KIO::filesize_t size ) emit processedSize( result ); } -void KDirLister::slotSpeed( KIO::Job *job, unsigned long spd ) +void KDirLister::slotSpeed( TDEIO::Job *job, unsigned long spd ) { - d->jobData[static_cast(job)].speed = spd; + d->jobData[static_cast(job)].speed = spd; int result = 0; - TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); + TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin(); while ( dataIt != d->jobData.end() ) { result += (*dataIt).speed; @@ -2460,12 +2460,12 @@ uint KDirLister::numJobs() return d->jobData.count(); } -void KDirLister::jobDone( KIO::ListJob *job ) +void KDirLister::jobDone( TDEIO::ListJob *job ) { d->jobData.remove( job ); } -void KDirLister::jobStarted( KIO::ListJob *job ) +void KDirLister::jobStarted( TDEIO::ListJob *job ) { KDirListerPrivate::JobData jobData; jobData.speed = 0; @@ -2477,18 +2477,18 @@ void KDirLister::jobStarted( KIO::ListJob *job ) d->complete = false; } -void KDirLister::connectJob( KIO::ListJob *job ) +void KDirLister::connectJob( TDEIO::ListJob *job ) { - connect( job, TQT_SIGNAL(infoMessage( KIO::Job *, const TQString& )), - this, TQT_SLOT(slotInfoMessage( KIO::Job *, const TQString& )) ); - connect( job, TQT_SIGNAL(percent( KIO::Job *, unsigned long )), - this, TQT_SLOT(slotPercent( KIO::Job *, unsigned long )) ); - connect( job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t )), - this, TQT_SLOT(slotTotalSize( KIO::Job *, KIO::filesize_t )) ); - connect( job, TQT_SIGNAL(processedSize( KIO::Job *, KIO::filesize_t )), - this, TQT_SLOT(slotProcessedSize( KIO::Job *, KIO::filesize_t )) ); - connect( job, TQT_SIGNAL(speed( KIO::Job *, unsigned long )), - this, TQT_SLOT(slotSpeed( KIO::Job *, unsigned long )) ); + connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), + this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); + connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )), + this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); + connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )), + this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); } void KDirLister::setMainWindow( TQWidget *window ) diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h index 2271b2a70..87aa6c694 100644 --- a/kio/kio/kdirlister.h +++ b/kio/kio/kdirlister.h @@ -29,7 +29,7 @@ #include -namespace KIO { class Job; class ListJob; } +namespace TDEIO { class Job; class ListJob; } /** * The dir lister deals with the kiojob used to list and update a directory @@ -520,13 +520,13 @@ signals: * Emitted when we know the size of the jobs. * @param size the total size in bytes */ - void totalSize( KIO::filesize_t size ); + void totalSize( TDEIO::filesize_t size ); /** * Regularly emitted to show the progress of this KDirLister. * @param size the processed size in bytes */ - void processedSize( KIO::filesize_t size ); + void processedSize( TDEIO::filesize_t size ); /** * Emitted to display information about the speed of the jobs. @@ -598,24 +598,24 @@ protected: virtual bool validURL( const KURL& ) const; /** Reimplement to customize error handling */ - virtual void handleError( KIO::Job * ); + virtual void handleError( TDEIO::Job * ); protected: virtual void virtual_hook( int id, void *data ); private slots: - void slotInfoMessage( KIO::Job *, const TQString& ); - void slotPercent( KIO::Job *, unsigned long ); - void slotTotalSize( KIO::Job *, KIO::filesize_t ); - void slotProcessedSize( KIO::Job *, KIO::filesize_t ); - void slotSpeed( KIO::Job *, unsigned long ); - void slotLocalURL( KIO::Job *, const KURL&, bool ); + void slotInfoMessage( TDEIO::Job *, const TQString& ); + void slotPercent( TDEIO::Job *, unsigned long ); + void slotTotalSize( TDEIO::Job *, TDEIO::filesize_t ); + void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t ); + void slotSpeed( TDEIO::Job *, unsigned long ); + void slotLocalURL( TDEIO::Job *, const KURL&, bool ); void slotLocalURLKIODestroyed( ); private: - void jobStarted( KIO::ListJob * ); - void connectJob( KIO::ListJob * ); - void jobDone( KIO::ListJob * ); + void jobStarted( TDEIO::ListJob * ); + void connectJob( TDEIO::ListJob * ); + void jobDone( TDEIO::ListJob * ); uint numJobs(); diff --git a/kio/kio/kdirlister_p.h b/kio/kio/kdirlister_p.h index 047c83148..47bd4d452 100644 --- a/kio/kio/kdirlister_p.h +++ b/kio/kio/kdirlister_p.h @@ -34,7 +34,7 @@ class TQTimer; class KDirLister; -namespace KIO { class Job; class ListJob; } +namespace TDEIO { class Job; class ListJob; } class KDirLister::KDirListerPrivate @@ -90,10 +90,10 @@ public: struct JobData { long unsigned int percent, speed; - KIO::filesize_t processedSize, totalSize; + TDEIO::filesize_t processedSize, totalSize; }; - TQMap jobData; + TQMap jobData; // file item for the root itself (".") KFileItem *rootFileItem; @@ -195,18 +195,18 @@ private slots: void slotFileDirtyDelayed(); - void slotEntries( KIO::Job *job, const KIO::UDSEntryList &entries ); - void slotResult( KIO::Job *j ); - void slotRedirection( KIO::Job *job, const KURL &url ); + void slotEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries ); + void slotResult( TDEIO::Job *j ); + void slotRedirection( TDEIO::Job *job, const KURL &url ); - void slotUpdateEntries( KIO::Job *job, const KIO::UDSEntryList &entries ); - void slotUpdateResult( KIO::Job *job ); + void slotUpdateEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries ); + void slotUpdateResult( TDEIO::Job *job ); private: - KIO::ListJob *jobForUrl( const TQString& url, KIO::ListJob *not_job = 0 ); - const KURL& joburl( KIO::ListJob *job ); + TDEIO::ListJob *jobForUrl( const TQString& url, TDEIO::ListJob *not_job = 0 ); + const KURL& joburl( TDEIO::ListJob *job ); - void killJob( KIO::ListJob *job ); + void killJob( TDEIO::ListJob *job ); // check if _url is held by some lister and return true, // otherwise schedule a delayed update and return false @@ -324,7 +324,7 @@ private: }; static const unsigned short MAX_JOBS_PER_LISTER; - TQMap jobs; + TQMap jobs; // an item is a complete directory TQDict itemsInUse; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index 580de16cc..1ea5805f3 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -109,7 +109,7 @@ #include "kdirwatch.h" #include "kdirwatch_p.h" -#include "global.h" // KIO::probably_slow_mounted +#include "global.h" // TDEIO::probably_slow_mounted #define NO_NOTIFY (time_t) 0 @@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() delayRemove = false; m_ref = 0; - KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); + TDEConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); m_PollInterval = config.readNumEntry("PollInterval", 500); @@ -744,7 +744,7 @@ bool KDirWatchPrivate::useINotify( Entry* e ) bool KDirWatchPrivate::useStat(Entry* e) { if ( e->path.startsWith("/media/") || (e->path == "/media") - || (KIO::probably_slow_mounted(e->path)) ) + || (TDEIO::probably_slow_mounted(e->path)) ) useFreq(e, m_nfsPollInterval); else useFreq(e, m_PollInterval); diff --git a/kio/kio/kemailsettings.cpp b/kio/kio/kemailsettings.cpp index 2f1ffe7a0..f8ad9f7dd 100644 --- a/kio/kio/kemailsettings.cpp +++ b/kio/kio/kemailsettings.cpp @@ -36,7 +36,7 @@ class KEMailSettingsPrivate { public: KEMailSettingsPrivate() : m_pConfig( 0 ) {} ~KEMailSettingsPrivate() { delete m_pConfig; } - KConfig *m_pConfig; + TDEConfig *m_pConfig; TQStringList profiles; TQString m_sDefaultProfile, m_sCurrentProfile; }; @@ -242,7 +242,7 @@ KEMailSettings::KEMailSettings() p = new KEMailSettingsPrivate(); p->m_sCurrentProfile=TQString::null; - p->m_pConfig = new KConfig("emaildefaults"); + p->m_pConfig = new TDEConfig("emaildefaults"); TQStringList groups = p->m_pConfig->groupList(); for (TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it) { diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index 50ee1a5d2..fa08ae961 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -58,7 +58,7 @@ class KFileItem::KFileItemPrivate { TQString iconName; }; -KFileItem::KFileItem( const KIO::UDSEntry& _entry, const KURL& _url, +KFileItem::KFileItem( const TDEIO::UDSEntry& _entry, const KURL& _url, bool _determineMimeTypeOnDemand, bool _urlIsDirectory ) : m_entry( _entry ), m_url( _url ), @@ -80,7 +80,7 @@ KFileItem::KFileItem( mode_t _mode, mode_t _permissions, const KURL& _url, bool m_entry(), // warning ! m_url( _url ), m_strName( _url.fileName() ), - m_strText( KIO::decodeFileName( m_strName ) ), + m_strText( TDEIO::decodeFileName( m_strName ) ), m_pMimeType( 0 ), m_fileMode ( _mode ), m_permissions( _permissions ), @@ -97,7 +97,7 @@ KFileItem::KFileItem( mode_t _mode, mode_t _permissions, const KURL& _url, bool KFileItem::KFileItem( const KURL &url, const TQString &mimeType, mode_t mode ) : m_url( url ), m_strName( url.fileName() ), - m_strText( KIO::decodeFileName( m_strName ) ), + m_strText( TDEIO::decodeFileName( m_strName ) ), m_pMimeType( 0 ), m_fileMode( mode ), m_permissions( KFileItem::Unknown ), @@ -134,7 +134,7 @@ KFileItem::~KFileItem() void KFileItem::init( bool _determineMimeTypeOnDemand ) { m_access = TQString::null; - m_size = (KIO::filesize_t) -1; + m_size = (TDEIO::filesize_t) -1; // metaInfo = KFileMetaInfo(); for ( int i = 0; i < NumFlags; i++ ) m_time[i] = (time_t) -1; @@ -195,63 +195,63 @@ void KFileItem::init( bool _determineMimeTypeOnDemand ) void KFileItem::readUDSEntry( bool _urlIsDirectory ) { - // extract the mode and the filename from the KIO::UDS Entry + // extract the mode and the filename from the TDEIO::UDS Entry bool UDS_URL_seen = false; if (&m_entry == NULL) return; - KIO::UDSEntry::ConstIterator it = m_entry.begin(); + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); for( ; it != m_entry.end(); ++it ) { switch ((*it).m_uds) { - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: m_fileMode = (mode_t)((*it).m_long); break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: m_permissions = (mode_t)((*it).m_long); break; - case KIO::UDS_USER: + case TDEIO::UDS_USER: m_user = ((*it).m_str); break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: m_group = ((*it).m_str); break; - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: m_strName = (*it).m_str; - m_strText = KIO::decodeFileName( m_strName ); + m_strText = TDEIO::decodeFileName( m_strName ); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: UDS_URL_seen = true; m_url = KURL((*it).m_str); if ( m_url.isLocalFile() ) m_bIsLocalURL = true; break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: m_pMimeType = KMimeType::mimeType((*it).m_str); m_bMimeTypeKnown = true; break; - case KIO::UDS_GUESSED_MIME_TYPE: + case TDEIO::UDS_GUESSED_MIME_TYPE: m_guessedMimeType = (*it).m_str; break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: m_bLink = !(*it).m_str.isEmpty(); // we don't store the link dest break; - case KIO::UDS_ICON_NAME: + case TDEIO::UDS_ICON_NAME: if ( !d ) d = new KFileItemPrivate(); d->iconName = (*it).m_str; break; - case KIO::UDS_HIDDEN: + case TDEIO::UDS_HIDDEN: if ( (*it).m_long ) m_hidden = Hidden; else @@ -280,7 +280,7 @@ void KFileItem::refresh() // Everything could have changed... // Clearing m_entry makes it possible to detect changes in the size of the file, // the time information, etc. - m_entry = KIO::UDSEntry(); + m_entry = TDEIO::UDSEntry(); init( false ); } @@ -299,19 +299,19 @@ void KFileItem::setURL( const KURL &url ) void KFileItem::setName( const TQString& name ) { m_strName = name; - m_strText = KIO::decodeFileName( m_strName ); + m_strText = TDEIO::decodeFileName( m_strName ); } TQString KFileItem::linkDest() const { if (&m_entry == NULL) return TQString::null; - // Extract it from the KIO::UDSEntry - KIO::UDSEntry::ConstIterator it = m_entry.begin(); + // Extract it from the TDEIO::UDSEntry + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); for( ; it != m_entry.end(); ++it ) - if ( (*it).m_uds == KIO::UDS_LINK_DEST ) + if ( (*it).m_uds == TDEIO::UDS_LINK_DEST ) return (*it).m_str; - // If not in the KIO::UDSEntry, or if UDSEntry empty, use readlink() [if local URL] + // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use readlink() [if local URL] if ( m_bIsLocalURL ) { char buf[1000]; @@ -335,33 +335,33 @@ TQString KFileItem::localPath() const { if (&m_entry == NULL) return TQString::null; - // Extract the local path from the KIO::UDSEntry - KIO::UDSEntry::ConstIterator it = m_entry.begin(); - const KIO::UDSEntry::ConstIterator end = m_entry.end(); + // Extract the local path from the TDEIO::UDSEntry + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); + const TDEIO::UDSEntry::ConstIterator end = m_entry.end(); for( ; it != end; ++it ) - if ( (*it).m_uds == KIO::UDS_LOCAL_PATH ) + if ( (*it).m_uds == TDEIO::UDS_LOCAL_PATH ) return (*it).m_str; } return TQString::null; } -KIO::filesize_t KFileItem::size(bool &exists) const +TDEIO::filesize_t KFileItem::size(bool &exists) const { exists = true; - if ( m_size != (KIO::filesize_t) -1 ) + if ( m_size != (TDEIO::filesize_t) -1 ) return m_size; if (&m_entry == NULL) return 0L; - // Extract it from the KIO::UDSEntry - KIO::UDSEntry::ConstIterator it = m_entry.begin(); + // Extract it from the TDEIO::UDSEntry + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); for( ; it != m_entry.end(); ++it ) - if ( (*it).m_uds == KIO::UDS_SIZE ) { + if ( (*it).m_uds == TDEIO::UDS_SIZE ) { m_size = (*it).m_long; return m_size; } - // If not in the KIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL] + // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL] if ( m_bIsLocalURL ) { KDE_struct_stat buf; @@ -375,9 +375,9 @@ KIO::filesize_t KFileItem::size(bool &exists) const bool KFileItem::hasExtendedACL() const { if (&m_entry == NULL) return false; - KIO::UDSEntry::ConstIterator it = m_entry.begin(); + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); for( ; it != m_entry.end(); it++ ) - if ( (*it).m_uds == KIO::UDS_EXTENDED_ACL ) { + if ( (*it).m_uds == TDEIO::UDS_EXTENDED_ACL ) { return true; } return false; @@ -388,10 +388,10 @@ KACL KFileItem::ACL() const if ( hasExtendedACL() ) { if (&m_entry == NULL) return KACL( m_permissions ); - // Extract it from the KIO::UDSEntry - KIO::UDSEntry::ConstIterator it = m_entry.begin(); + // Extract it from the TDEIO::UDSEntry + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); for( ; it != m_entry.end(); ++it ) - if ( (*it).m_uds == KIO::UDS_ACL_STRING ) + if ( (*it).m_uds == TDEIO::UDS_ACL_STRING ) return KACL((*it).m_str); } // create one from the basic permissions @@ -402,15 +402,15 @@ KACL KFileItem::defaultACL() const { if (&m_entry == NULL) return KACL(); - // Extract it from the KIO::UDSEntry - KIO::UDSEntry::ConstIterator it = m_entry.begin(); + // Extract it from the TDEIO::UDSEntry + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); for( ; it != m_entry.end(); ++it ) - if ( (*it).m_uds == KIO::UDS_DEFAULT_ACL_STRING ) + if ( (*it).m_uds == TDEIO::UDS_DEFAULT_ACL_STRING ) return KACL((*it).m_str); return KACL(); } -KIO::filesize_t KFileItem::size() const +TDEIO::filesize_t KFileItem::size() const { bool exists; return size(exists); @@ -427,13 +427,13 @@ time_t KFileItem::time( unsigned int which, bool &hasTime ) const unsigned int mappedWhich = 0; switch( which ) { - case KIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: mappedWhich = Modification; break; - case KIO::UDS_ACCESS_TIME: + case TDEIO::UDS_ACCESS_TIME: mappedWhich = Access; break; - case KIO::UDS_CREATION_TIME: + case TDEIO::UDS_CREATION_TIME: mappedWhich = Creation; break; } @@ -443,29 +443,29 @@ time_t KFileItem::time( unsigned int which, bool &hasTime ) const if (&m_entry == NULL) return static_cast(0); - // Extract it from the KIO::UDSEntry - KIO::UDSEntry::ConstIterator it = m_entry.begin(); + // Extract it from the TDEIO::UDSEntry + TDEIO::UDSEntry::ConstIterator it = m_entry.begin(); for( ; it != m_entry.end(); ++it ) if ( (*it).m_uds == which ) { m_time[mappedWhich] = static_cast((*it).m_long); return m_time[mappedWhich]; } - // If not in the KIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL] + // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL] if ( m_bIsLocalURL ) { KDE_struct_stat buf; if ( KDE_stat( TQFile::encodeName(m_url.path(-1)), &buf ) == 0 ) { - if(which == KIO::UDS_CREATION_TIME) { + if(which == TDEIO::UDS_CREATION_TIME) { // We can't determine creation time for local files hasTime = false; m_time[mappedWhich] = static_cast(0); return m_time[mappedWhich]; } - m_time[mappedWhich] = (which == KIO::UDS_MODIFICATION_TIME) ? + m_time[mappedWhich] = (which == TDEIO::UDS_MODIFICATION_TIME) ? buf.st_mtime : - /* which == KIO::UDS_ACCESS_TIME)*/ + /* which == TDEIO::UDS_ACCESS_TIME)*/ buf.st_atime; return m_time[mappedWhich]; } @@ -843,9 +843,9 @@ TQString KFileItem::getStatusBarInfo() else if ( S_ISREG( m_fileMode ) ) { bool hasSize; - KIO::filesize_t sizeValue = size(hasSize); + TDEIO::filesize_t sizeValue = size(hasSize); if(hasSize) - text += TQString(" (%1) ").arg( KIO::convertSize( sizeValue ) ); + text += TQString(" (%1) ").arg( TDEIO::convertSize( sizeValue ) ); text += mimeComment(); } else if ( S_ISDIR ( m_fileMode ) ) @@ -887,12 +887,12 @@ TQString KFileItem::getToolTipText(int maxcount) if ( !S_ISDIR ( m_fileMode ) ) { bool hasSize; - KIO::filesize_t sizeValue = size(hasSize); + TDEIO::filesize_t sizeValue = size(hasSize); if(hasSize) tip += start + i18n("Size:") + mid + - KIO::convertSizeWithBytes(sizeValue) + end; + TDEIO::convertSizeWithBytes(sizeValue) + end; } - TQString timeStr = timeString( KIO::UDS_MODIFICATION_TIME); + TQString timeStr = timeString( TDEIO::UDS_MODIFICATION_TIME); if(!timeStr.isEmpty()) tip += start + i18n("Modified:") + mid + timeStr + end; @@ -966,7 +966,7 @@ bool KFileItem::cmp( const KFileItem & item ) && m_hidden == item.m_hidden && size(hasSize1) == item.size(hasSize2) && hasSize1 == hasSize2 - && time(KIO::UDS_MODIFICATION_TIME, hasTime1) == item.time(KIO::UDS_MODIFICATION_TIME, hasTime2) + && time(TDEIO::UDS_MODIFICATION_TIME, hasTime1) == item.time(TDEIO::UDS_MODIFICATION_TIME, hasTime2) && hasTime1 == hasTime2 && (!d || !item.d || d->iconName == item.d->iconName) ); @@ -1014,7 +1014,7 @@ void KFileItem::assign( const KFileItem & item ) } } -void KFileItem::setUDSEntry( const KIO::UDSEntry& _entry, const KURL& _url, +void KFileItem::setUDSEntry( const TDEIO::UDSEntry& _entry, const KURL& _url, bool _determineMimeTypeOnDemand, bool _urlIsDirectory ) { m_entry = _entry; diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h index cf6344669..5e75ac16f 100644 --- a/kio/kio/kfileitem.h +++ b/kio/kio/kfileitem.h @@ -34,7 +34,7 @@ /** * A KFileItem is a generic class to handle a file, local or remote. - * In particular, it makes it easier to handle the result of KIO::listDir + * In particular, it makes it easier to handle the result of TDEIO::listDir * (UDSEntry isn't very friendly to use). * It includes many file attributes such as mimetype, icon, text, mode, link... */ @@ -45,7 +45,7 @@ public: /** * Creates an item representing a file, from a UDSEntry. - * This is the preferred constructor when using KIO::listDir(). + * This is the preferred constructor when using TDEIO::listDir(). * * @param _entry the KIO entry used to get the file, contains info about it * @param _url the file url @@ -54,7 +54,7 @@ public: * @param _urlIsDirectory specifies if the url is just the directory of the * fileitem and the filename from the UDSEntry should be used. */ - KFileItem( const KIO::UDSEntry& _entry, const KURL& _url, + KFileItem( const TDEIO::UDSEntry& _entry, const KURL& _url, bool _determineMimeTypeOnDemand = false, bool _urlIsDirectory = false ); @@ -239,14 +239,14 @@ public: * Returns the size of the file, if known. * @return the file size, or 0 if not known */ - KIO::filesize_t size() const; + TDEIO::filesize_t size() const; /** * Returns the size of the file, if known, and sets @p hasSize to false if not known * @param @hasSize This is set to true if the size is known, and false if not known * @return the file size, or 0 if not known */ - KIO::filesize_t size(bool &hasSize) const; + TDEIO::filesize_t size(bool &hasSize) const; //FIXME KDE4 deprecate this in favor of time(unsigned int which, bool &hasSize) /** @@ -273,7 +273,7 @@ public: * @returns a formatted string of the requested time, TQString::null if time is not known * @see time */ - TQString timeString( unsigned int which = KIO::UDS_MODIFICATION_TIME ) const; + TQString timeString( unsigned int which = TDEIO::UDS_MODIFICATION_TIME ) const; /** * Returns true if the file is a local file. @@ -396,7 +396,7 @@ public: * by position. * @return the UDS entry */ - const KIO::UDSEntry & entry() const { return m_entry; } + const TDEIO::UDSEntry & entry() const { return m_entry; } /** * Used when updating a directory. marked == seen when refreshing. @@ -536,7 +536,7 @@ public: * fileitem and the filename from the UDSEntry should be used. * @since 3.4.1 */ - void setUDSEntry( const KIO::UDSEntry& entry, const KURL& url, + void setUDSEntry( const TDEIO::UDSEntry& entry, const KURL& url, bool determineMimeTypeOnDemand = false, bool urlIsDirectory = false ); @@ -576,7 +576,7 @@ private: /** * We keep a copy of the UDSEntry since we need it for getStatusBarInfo */ - KIO::UDSEntry m_entry; + TDEIO::UDSEntry m_entry; /** * The url of the file */ @@ -643,7 +643,7 @@ private: enum { Modification = 0, Access = 1, Creation = 2, NumFlags = 3 }; mutable time_t m_time[3]; - mutable KIO::filesize_t m_size; + mutable TDEIO::filesize_t m_size; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index c345ef89e..0ccbb577b 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -1626,12 +1626,12 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle else if (unit() == KFileMimeTypeInfo::Bytes) { // convertSize already adds the correct suffix - return KIO::convertSize(value.toInt()); + return TDEIO::convertSize(value.toInt()); } else if (unit() == KFileMimeTypeInfo::KiloBytes) { // convertSizeFromKB already adds the correct suffix - return KIO::convertSizeFromKB(value.toInt()); + return TDEIO::convertSizeFromKB(value.toInt()); } else s = TDEGlobal::locale()->formatNumber( value.toInt() , 0); @@ -1643,9 +1643,9 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle case TQVariant::ULongLong : if ( unit() == KFileMimeTypeInfo::Bytes ) - return KIO::convertSize( value.toULongLong() ); + return TDEIO::convertSize( value.toULongLong() ); else if ( unit() == KFileMimeTypeInfo::KiloBytes ) - return KIO::convertSizeFromKB( value.toULongLong() ); + return TDEIO::convertSizeFromKB( value.toULongLong() ); else s = TDEGlobal::locale()->formatNumber( value.toULongLong(), 0 ); break; diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index 75622bf7d..cdbaa8ea3 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -37,7 +37,7 @@ KImageIOFormat::KImageIOFormat( const TQString &path) bLibLoaded = false; mReadFunc = 0; mWriteFunc = 0; - KConfig config(path, true, false); + TDEConfig config(path, true, false); config.setGroup("Image Format"); mType = config.readEntry("Type"); diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index 37867cd23..397fbc9e9 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -533,8 +533,8 @@ TQString KMimeType::favIconForURL( const KURL& url ) static bool check = true; if ( check ) { check = false; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "HTML Settings" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "HTML Settings" ); useFavIcons = config->readBoolEntry( "EnableFavicon", true ); } @@ -717,7 +717,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const TQString dev = cfg.readEntry( "Dev" ); if ( !icon.isEmpty() && !unmount_icon.isEmpty() && !dev.isEmpty() ) { - TQString mp = KIO::findDeviceMountPoint( dev ); + TQString mp = TDEIO::findDeviceMountPoint( dev ); // Is the device not mounted ? if ( mp.isNull() ) return unmount_icon; @@ -831,7 +831,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf return retval; } - TQString mp = KIO::findDeviceMountPoint( dev ); + TQString mp = TDEIO::findDeviceMountPoint( dev ); // Is the device already mounted ? if ( !mp.isNull() ) { @@ -933,7 +933,7 @@ TQValueList KDEDesktopMimeType::builtinServices( co } else { - TQString mp = KIO::findDeviceMountPoint( dev ); + TQString mp = TDEIO::findDeviceMountPoint( dev ); // not mounted ? if ( mp.isEmpty() ) { @@ -968,12 +968,12 @@ TQValueList KDEDesktopMimeType::userDefinedServices return userDefinedServices( path, cfg, bLocalFiles ); } -TQValueList KDEDesktopMimeType::userDefinedServices( const TQString& path, KConfig& cfg, bool bLocalFiles ) +TQValueList KDEDesktopMimeType::userDefinedServices( const TQString& path, TDEConfig& cfg, bool bLocalFiles ) { return userDefinedServices( path, cfg, bLocalFiles, KURL::List() ); } -TQValueList KDEDesktopMimeType::userDefinedServices( const TQString& path, KConfig& cfg, bool bLocalFiles, const KURL::List & file_list ) +TQValueList KDEDesktopMimeType::userDefinedServices( const TQString& path, TDEConfig& cfg, bool bLocalFiles, const KURL::List & file_list ) { TQValueList result; @@ -1114,7 +1114,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT KMessageBoxWrapper::error( 0, tmp ); return; } - TQString mp = KIO::findDeviceMountPoint( dev ); + TQString mp = TDEIO::findDeviceMountPoint( dev ); if ( _service.m_type == ST_MOUNT ) { diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h index b5ffdc9df..1d53f3713 100644 --- a/kio/kio/kmimetype.h +++ b/kio/kio/kmimetype.h @@ -561,11 +561,11 @@ public: static TQValueList userDefinedServices( const TQString& path, bool bLocalFiles ); /** - * Overload of userDefinedServices for speed purposes: it takes a KConfig* so that + * Overload of userDefinedServices for speed purposes: it takes a TDEConfig* so that * the caller can check things in the file without having it parsed twice. * @since 3.4 */ - static TQValueList userDefinedServices( const TQString& path, KConfig& config, bool bLocalFiles ); + static TQValueList userDefinedServices( const TQString& path, TDEConfig& config, bool bLocalFiles ); /** * Overload of userDefinedServices but also allows you to pass a list of urls for this file. @@ -573,7 +573,7 @@ public: * the X-TDE-GetActionMenu extension. * @since 3.5 */ - static TQValueList userDefinedServices( const TQString& path, KConfig& config, bool bLocalFiles, const KURL::List & file_list); + static TQValueList userDefinedServices( const TQString& path, TDEConfig& config, bool bLocalFiles, const KURL::List & file_list); /** * @param path is the path of the desktop entry. diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 0cb010913..b22bbd8dc 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -261,7 +261,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); + TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -280,7 +280,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); + TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -288,7 +288,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( KMimeTypeChooserDialog::~KMimeTypeChooserDialog() { - KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); + TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); group.writeEntry("size", size()); } diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp index f0fdfce6d..394120009 100644 --- a/kio/kio/knfsshare.cpp +++ b/kio/kio/knfsshare.cpp @@ -52,7 +52,7 @@ KNFSSharePrivate::KNFSSharePrivate() * @return wether an 'exports' file was found. **/ bool KNFSSharePrivate::findExportsFile() { - KConfig config("knfsshare"); + TDEConfig config("knfsshare"); config.setGroup("General"); exportsFile = config.readPathEntry("exportsFile"); diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index 252bdbfbd..a4f8169f5 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -44,8 +44,8 @@ public: ~KProtocolManagerPrivate(); - KConfig *config; - KConfig *http_config; + TDEConfig *config; + TDEConfig *http_config; bool init_busy; KURL url; TQString protocol; @@ -80,29 +80,29 @@ void KProtocolManager::reparseConfiguration() kpmpksd.destructObject(); // Force the slave config to re-read its config... - KIO::SlaveConfig::self()->reset (); + TDEIO::SlaveConfig::self()->reset (); } -KConfig *KProtocolManager::config() +TDEConfig *KProtocolManager::config() { if (!d) d = new KProtocolManagerPrivate; if (!d->config) { - d->config = new KConfig("kioslaverc", true, false); + d->config = new TDEConfig("kioslaverc", true, false); } return d->config; } -KConfig *KProtocolManager::http_config() +TDEConfig *KProtocolManager::http_config() { if (!d) d = new KProtocolManagerPrivate; if (!d->http_config) { - d->http_config = new KConfig("kio_httprc", false, false); + d->http_config = new TDEConfig("kio_httprc", false, false); } return d->http_config; } @@ -111,7 +111,7 @@ KConfig *KProtocolManager::http_config() int KProtocolManager::readTimeout() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); int val = cfg->readNumEntry( "ReadTimeout", DEFAULT_READ_TIMEOUT ); return QMAX(MIN_TIMEOUT_VALUE, val); @@ -119,7 +119,7 @@ int KProtocolManager::readTimeout() int KProtocolManager::connectTimeout() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); int val = cfg->readNumEntry( "ConnectTimeout", DEFAULT_CONNECT_TIMEOUT ); return QMAX(MIN_TIMEOUT_VALUE, val); @@ -127,7 +127,7 @@ int KProtocolManager::connectTimeout() int KProtocolManager::proxyConnectTimeout() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); int val = cfg->readNumEntry( "ProxyConnectTimeout", DEFAULT_PROXY_CONNECT_TIMEOUT ); return QMAX(MIN_TIMEOUT_VALUE, val); @@ -135,7 +135,7 @@ int KProtocolManager::proxyConnectTimeout() int KProtocolManager::responseTimeout() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); int val = cfg->readNumEntry( "ResponseTimeout", DEFAULT_RESPONSE_TIMEOUT ); return QMAX(MIN_TIMEOUT_VALUE, val); @@ -150,21 +150,21 @@ bool KProtocolManager::useProxy() bool KProtocolManager::useReverseProxy() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( "Proxy Settings" ); return cfg->readBoolEntry("ReversedException", false); } KProtocolManager::ProxyType KProtocolManager::proxyType() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( "Proxy Settings" ); return static_cast(cfg->readNumEntry( "ProxyType" )); } KProtocolManager::ProxyAuthMode KProtocolManager::proxyAuthMode() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( "Proxy Settings" ); return static_cast(cfg->readNumEntry( "AuthMode" )); } @@ -173,40 +173,40 @@ KProtocolManager::ProxyAuthMode KProtocolManager::proxyAuthMode() bool KProtocolManager::useCache() { - KConfig *cfg = http_config(); + TDEConfig *cfg = http_config(); return cfg->readBoolEntry( "UseCache", true ); } -KIO::CacheControl KProtocolManager::cacheControl() +TDEIO::CacheControl KProtocolManager::cacheControl() { - KConfig *cfg = http_config(); + TDEConfig *cfg = http_config(); TQString tmp = cfg->readEntry("cache"); if (tmp.isEmpty()) return DEFAULT_CACHE_CONTROL; - return KIO::parseCacheControl(tmp); + return TDEIO::parseCacheControl(tmp); } TQString KProtocolManager::cacheDir() { - KConfig *cfg = http_config(); + TDEConfig *cfg = http_config(); return cfg->readPathEntry("CacheDir", TDEGlobal::dirs()->saveLocation("cache","http")); } int KProtocolManager::maxCacheAge() { - KConfig *cfg = http_config(); + TDEConfig *cfg = http_config(); return cfg->readNumEntry( "MaxCacheAge", DEFAULT_MAX_CACHE_AGE ); // 14 days } int KProtocolManager::maxCacheSize() { - KConfig *cfg = http_config(); + TDEConfig *cfg = http_config(); return cfg->readNumEntry( "MaxCacheSize", DEFAULT_MAX_CACHE_SIZE ); // 5 MB } TQString KProtocolManager::noProxyForRaw() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( "Proxy Settings" ); return cfg->readEntry( "NoProxyFor" ); @@ -230,7 +230,7 @@ TQString KProtocolManager::proxyFor( const TQString& protocol ) else if (scheme == "webdavs") scheme = "https"; - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( "Proxy Settings" ); return cfg->readEntry( scheme + "Proxy" ); } @@ -417,11 +417,11 @@ TQString KProtocolManager::slaveProtocol(const KURL &url, TQString &proxy) TQString KProtocolManager::userAgentForHost( const TQString& hostname ) { - TQString sendUserAgent = KIO::SlaveConfig::self()->configData("http", hostname.lower(), "SendUserAgent").lower(); + TQString sendUserAgent = TDEIO::SlaveConfig::self()->configData("http", hostname.lower(), "SendUserAgent").lower(); if (sendUserAgent == "false") return TQString::null; - TQString useragent = KIO::SlaveConfig::self()->configData("http", hostname.lower(), "UserAgent"); + TQString useragent = TDEIO::SlaveConfig::self()->configData("http", hostname.lower(), "UserAgent"); // Return the default user-agent if none is specified // for the requested host. @@ -433,7 +433,7 @@ TQString KProtocolManager::userAgentForHost( const TQString& hostname ) TQString KProtocolManager::defaultUserAgent( ) { - TQString modifiers = KIO::SlaveConfig::self()->configData("http", TQString::null, "UserAgentKeys"); + TQString modifiers = TDEIO::SlaveConfig::self()->configData("http", TQString::null, "UserAgentKeys"); return defaultUserAgent(modifiers); } @@ -492,14 +492,14 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) bool KProtocolManager::markPartial() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); return cfg->readBoolEntry( "MarkPartial", true ); } int KProtocolManager::minimumKeepSize() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); return cfg->readNumEntry( "MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE ); // 5000 byte @@ -507,28 +507,28 @@ int KProtocolManager::minimumKeepSize() bool KProtocolManager::autoResume() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); return cfg->readBoolEntry( "AutoResume", false ); } bool KProtocolManager::persistentConnections() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); return cfg->readBoolEntry( "PersistentConnections", true ); } bool KProtocolManager::persistentProxyConnection() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( TQString::null ); return cfg->readBoolEntry( "PersistentProxyConnection", false ); } TQString KProtocolManager::proxyConfigScript() { - KConfig *cfg = config(); + TDEConfig *cfg = config(); cfg->setGroup( "Proxy Settings" ); return cfg->readEntry( "Proxy Config Script" ); } diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h index ec59342af..e1d425ebd 100644 --- a/kio/kio/kprotocolmanager.h +++ b/kio/kio/kprotocolmanager.h @@ -28,7 +28,7 @@ /** @deprecated Use KProtocolManager::defaultUserAgent() instead. */ #define DEFAULT_USERAGENT_STRING "" -class KConfig; +class TDEConfig; /** * Provides information about I/O (Internet, etc.) settings chosen/set @@ -311,7 +311,7 @@ public: * Returns the Cache control directive to be used. * @return the cache control value */ - static KIO::CacheControl cacheControl(); + static TDEIO::CacheControl cacheControl(); /*============================ DOWNLOAD CONFIG ==============================*/ @@ -382,8 +382,8 @@ public: * @internal * (Shared with SlaveConfig) */ - static KConfig *config(); + static TDEConfig *config(); private: - static KConfig *http_config(); + static TDEConfig *http_config(); }; #endif diff --git a/kio/kio/kremoteencoding.h b/kio/kio/kremoteencoding.h index 35191d8e5..6f5eea5fd 100644 --- a/kio/kio/kremoteencoding.h +++ b/kio/kio/kremoteencoding.h @@ -31,11 +31,11 @@ class KRemoteEncodingPrivate; * Certain protocols do not specify an appropriate encoding for decoding * their 8-bit data into proper Unicode forms. Therefore, ioslaves should * use this class in order to convert those forms into QStrings before - * creating the respective KIO::UDSEntry. The same is true for decoding + * creating the respective TDEIO::UDSEntry. The same is true for decoding * URLs to its components. * - * Each KIO::SlaveBase has one object of this kind, even if it is not necessary. - * It can be accessed through KIO::SlaveBase::remoteEncoding. + * Each TDEIO::SlaveBase has one object of this kind, even if it is not necessary. + * It can be accessed through TDEIO::SlaveBase::remoteEncoding. * * @short A class for handling remote filenames * @author Thiago Macieira diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 2f6e9861a..f99f636db 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -476,7 +476,7 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List */ if (_service.terminal()) { - KConfigGroupSaver gs(TDEGlobal::config(), "General"); + TDEConfigGroupSaver gs(TDEGlobal::config(), "General"); TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole"); if (terminal == "konsole") terminal += " -caption=%c %i %m"; @@ -727,7 +727,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" ) { // Maybe we can resolve to a local URL? - KURL localURL = KIO::NetAccess::mostLocalURL( url, 0 ); + KURL localURL = TDEIO::NetAccess::mostLocalURL( url, 0 ); if ( localURL != url ) { *it = localURL; kdDebug(7010) << "Changed to " << localURL << endl; @@ -1003,7 +1003,7 @@ void KRun::init() } if ( !kapp->authorizeURLAction( "open", KURL(), m_strURL)) { - TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, m_strURL.prettyURL()); + TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, m_strURL.prettyURL()); d->m_showingError = true; KMessageBoxWrapper::error( d->m_window, msg ); d->m_showingError = false; @@ -1119,10 +1119,10 @@ void KRun::init() kdDebug(7010) << "Testing directory (stating)" << endl; // It may be a directory or a file, let's stat - KIO::StatJob *job = KIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo ); + TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo ); job->setWindow (d->m_window); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotStatResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl; } @@ -1168,12 +1168,12 @@ void KRun::scanFile() } kdDebug(7010) << this << " Scanning file " << m_strURL.url() << endl; - KIO::TransferJob *job = KIO::get( m_strURL, false /*reload*/, m_bProgressInfo ); + TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo ); job->setWindow (d->m_window); - connect(job, TQT_SIGNAL( result(KIO::Job *)), - this, TQT_SLOT( slotScanFinished(KIO::Job *))); - connect(job, TQT_SIGNAL( mimetype(KIO::Job *, const TQString &)), - this, TQT_SLOT( slotScanMimeType(KIO::Job *, const TQString &))); + connect(job, TQT_SIGNAL( result(TDEIO::Job *)), + this, TQT_SLOT( slotScanFinished(TDEIO::Job *))); + connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), + this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); m_job = job; kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl; } @@ -1217,7 +1217,7 @@ void KRun::slotTimeout() } } -void KRun::slotStatResult( KIO::Job * job ) +void KRun::slotStatResult( TDEIO::Job * job ) { m_job = 0L; if (job->error()) @@ -1237,24 +1237,24 @@ void KRun::slotStatResult( KIO::Job * job ) } else { kdDebug(7010) << "Finished" << endl; - if(!dynamic_cast(job)) + if(!dynamic_cast(job)) kdFatal() << "job is a " << typeid(*job).name() << " should be a StatJob" << endl; TQString knownMimeType; - KIO::UDSEntry entry = ((KIO::StatJob*)job)->statResult(); - KIO::UDSEntry::ConstIterator it = entry.begin(); + TDEIO::UDSEntry entry = ((TDEIO::StatJob*)job)->statResult(); + TDEIO::UDSEntry::ConstIterator it = entry.begin(); for( ; it != entry.end(); it++ ) { switch( (*it).m_uds ) { - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: if ( S_ISDIR( (mode_t)((*it).m_long) ) ) m_bIsDirectory = true; // it's a dir else m_bScanFile = true; // it's a file break; - case KIO::UDS_MIME_TYPE: // mimetype already known? (e.g. print:/manager) + case TDEIO::UDS_MIME_TYPE: // mimetype already known? (e.g. print:/manager) knownMimeType = (*it).m_str; break; - case KIO::UDS_LOCAL_PATH: + case TDEIO::UDS_LOCAL_PATH: d->m_localPath = (*it).m_str; break; default: @@ -1277,7 +1277,7 @@ void KRun::slotStatResult( KIO::Job * job ) } } -void KRun::slotScanMimeType( KIO::Job *, const TQString &mimetype ) +void KRun::slotScanMimeType( TDEIO::Job *, const TQString &mimetype ) { if ( mimetype.isEmpty() ) kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a kioslave bug." << endl; @@ -1285,7 +1285,7 @@ void KRun::slotScanMimeType( KIO::Job *, const TQString &mimetype ) m_job = 0; } -void KRun::slotScanFinished( KIO::Job *job ) +void KRun::slotScanFinished( TDEIO::Job *job ) { m_job = 0; if (job->error()) @@ -1352,19 +1352,19 @@ void KRun::foundMimeType( const TQString& type ) // We don't know if this is a file or a directory. Let's test this first. // (For instance a tar.gz is a directory contained inside a file) // It may be a directory or a file, let's stat - KIO::StatJob *job = KIO::stat( m_strURL, m_bProgressInfo ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotStatResult( KIO::Job * ) ) ); + TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; return; } */ - KIO::TransferJob *job = ::tqqt_cast( m_job ); + TDEIO::TransferJob *job = ::tqqt_cast( m_job ); if ( job ) { job->putOnHold(); - KIO::Scheduler::publishSlaveOnHold(); + TDEIO::Scheduler::publishSlaveOnHold(); m_job = 0; } @@ -1440,7 +1440,7 @@ void KRun::abort() void KRun::setEnableExternalBrowser(bool b) { if (b) - d->m_externalBrowser = KConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication"); + d->m_externalBrowser = TDEConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication"); else d->m_externalBrowser = TQString::null; } diff --git a/kio/kio/krun.h b/kio/kio/krun.h index 9e4bf8c44..44bff6dee 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -32,7 +32,7 @@ class TDEProcess; class KService; -namespace KIO { +namespace TDEIO { class Job; class StatJob; } @@ -77,7 +77,7 @@ public: * * @param showProgressInfo * Whether to show progress information when determining the - * type of the file (i.e. when using KIO::stat and KIO::mimetype) + * type of the file (i.e. when using TDEIO::stat and TDEIO::mimetype) * Before you set this to false to avoid a dialog box, think about * a very slow FTP server... * It is always better to provide progress info in such cases. @@ -104,7 +104,7 @@ public: * * @param showProgressInfo * Whether to show progress information when determining the - * type of the file (i.e. when using KIO::stat and KIO::mimetype) + * type of the file (i.e. when using TDEIO::stat and TDEIO::mimetype) * Before you set this to false to avoid a dialog box, think about * a very slow FTP server... * It is always better to provide progress info in such cases. @@ -401,9 +401,9 @@ signals: protected slots: void slotTimeout(); - void slotScanFinished( KIO::Job * ); - void slotScanMimeType( KIO::Job *, const TQString &type ); - virtual void slotStatResult( KIO::Job * ); + void slotScanFinished( TDEIO::Job * ); + void slotScanMimeType( TDEIO::Job *, const TQString &type ); + virtual void slotStatResult( TDEIO::Job * ); protected: virtual void init(); @@ -424,7 +424,7 @@ protected: bool m_bAutoDelete; bool m_bProgressInfo; bool m_bFinished; - KIO::Job * m_job; + TDEIO::Job * m_job; TQTimer m_timer; /** diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index 9324f964d..a5216981f 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -474,7 +474,7 @@ int KService::initialPreferenceForMimeType( const TQString& mimeType ) const return 0; } -class KServiceReadProperty : public KConfigBase +class KServiceReadProperty : public TDEConfigBase { public: KServiceReadProperty(const TQString &_key, const TQCString &_value) @@ -570,7 +570,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const } } - // Then we use a homebuild class based on KConfigBase to convert the TQString. + // Then we use a homebuild class based on TDEConfigBase to convert the TQString. // For some often used property types we do the conversion ourselves. TQMap::ConstIterator it = m_mapProps.find( _name ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp index af69e1765..e85991f82 100644 --- a/kio/kio/kservicegroup.cpp +++ b/kio/kio/kservicegroup.cpp @@ -128,7 +128,7 @@ int KServiceGroup::childCount() { if (m_childCount == -1) { - KConfig global("kdeglobals"); + TDEConfig global("kdeglobals"); global.setGroup("KDE"); bool showUnimportant = global.readBoolEntry("showUnimportant", true); diff --git a/kio/kio/kshred.h b/kio/kio/kshred.h index c38c610ed..c7669122a 100644 --- a/kio/kio/kshred.h +++ b/kio/kio/kshred.h @@ -112,7 +112,7 @@ class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove * Shows progress of the shredding. * @param bytes the number of bytes written to the file */ - void processedSize(KIO::filesize_t bytes); + void processedSize(TDEIO::filesize_t bytes); /** * Shows a message in the progress dialog @@ -139,7 +139,7 @@ class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove /** * @internal for the size of the file */ - KIO::filesize_t fileSize; + TDEIO::filesize_t fileSize; /** * @internal for keeping track of progress diff --git a/kio/kio/ktrader.cpp b/kio/kio/ktrader.cpp index dbe096075..585c6a499 100644 --- a/kio/kio/ktrader.cpp +++ b/kio/kio/ktrader.cpp @@ -29,7 +29,7 @@ template class KStaticDeleter; -using namespace KIO; +using namespace TDEIO; class KTraderSorter { @@ -118,10 +118,10 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString& ParseTreeBase::Ptr prefs; if ( !_constraint.isEmpty() ) - constr = KIO::parseConstraints( _constraint ); + constr = TDEIO::parseConstraints( _constraint ); if ( !_preferences.isEmpty() ) - prefs = KIO::parsePreferences( _preferences ); + prefs = TDEIO::parsePreferences( _preferences ); KServiceTypeProfile::OfferList lst; KTrader::OfferList ret; diff --git a/kio/kio/ktraderparse.cpp b/kio/kio/ktraderparse.cpp index 64d9e449f..627791c00 100644 --- a/kio/kio/ktraderparse.cpp +++ b/kio/kio/ktraderparse.cpp @@ -30,12 +30,12 @@ extern "C" #include "ktraderparsetree.h" #include -using namespace KIO; +using namespace TDEIO; static ParseTreeBase::Ptr *pTree = 0; static const char* sCode = 0; -ParseTreeBase::Ptr KIO::parseConstraints( const TQString& _constr ) +ParseTreeBase::Ptr TDEIO::parseConstraints( const TQString& _constr ) { TQCString str = _constr.utf8(); sCode = str.data(); @@ -45,7 +45,7 @@ ParseTreeBase::Ptr KIO::parseConstraints( const TQString& _constr ) return *pTree; } -ParseTreeBase::Ptr KIO::parsePreferences( const TQString& _prefs ) +ParseTreeBase::Ptr TDEIO::parsePreferences( const TQString& _prefs ) { TQCString str = _prefs.utf8(); sCode = str.data(); diff --git a/kio/kio/ktraderparsetree.cpp b/kio/kio/ktraderparsetree.cpp index 711ec5356..0a04b7918 100644 --- a/kio/kio/ktraderparsetree.cpp +++ b/kio/kio/ktraderparsetree.cpp @@ -19,7 +19,7 @@ #include "ktraderparsetree.h" -namespace KIO { +namespace TDEIO { bool ParseTreeOR::eval( ParseContext *_context ) const { diff --git a/kio/kio/ktraderparsetree.h b/kio/kio/ktraderparsetree.h index 3af4273d0..8cc466abd 100644 --- a/kio/kio/ktraderparsetree.h +++ b/kio/kio/ktraderparsetree.h @@ -31,7 +31,7 @@ #include "ktrader.h" -namespace KIO { +namespace TDEIO { class ParseTreeBase; diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h index cff151cb7..0084129bf 100644 --- a/kio/kio/kurifilter.h +++ b/kio/kio/kurifilter.h @@ -39,7 +39,7 @@ class KURIFilterPrivate; class KURIFilterDataPrivate; -class KCModule; +class TDECModule; /** * A basic message object used for exchanging filtering @@ -410,7 +410,7 @@ public: * * @return A configuration module, 0 if the filter isn't configurable. */ - virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; } + virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; } /** * Returns the name of the configuration module for the filter. diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 0443e0fce..2dc4185cc 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -459,7 +459,7 @@ public: bool replace_home; bool complete_url; // if true completing a URL (i.e. 'prepend' is a URL), otherwise a path - KIO::ListJob *list_job; // kio job to list directories + TDEIO::ListJob *list_job; // kio job to list directories TQString prepend; // text to prepend to listed items TQString compl_text; // text to pass on to KCompletion @@ -519,8 +519,8 @@ void KURLCompletion::init() d->mode = KURLCompletion::FileCompletion; // Read settings - KConfig *c = TDEGlobal::config(); - KConfigGroupSaver cgs( c, "URLCompletion" ); + TDEConfig *c = TDEGlobal::config(); + TDEConfigGroupSaver cgs( c, "URLCompletion" ); d->url_auto_completion = c->readBoolEntry("alwaysAutoComplete", true); d->popup_append_slash = c->readBoolEntry("popupAppendSlash", true); @@ -1226,12 +1226,12 @@ void KURLCompletion::listURLs( * * Receive files listed by KIO and call addMatches() */ -void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries) +void KURLCompletion::slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList& entries) { TQStringList matches; - KIO::UDSEntryListConstIterator it = entries.begin(); - KIO::UDSEntryListConstIterator end = entries.end(); + TDEIO::UDSEntryListConstIterator it = entries.begin(); + TDEIO::UDSEntryListConstIterator end = entries.end(); TQString filter = d->list_urls_filter; @@ -1245,21 +1245,21 @@ void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries) bool is_exe = false; bool is_dir = false; - KIO::UDSEntry e = *it; - KIO::UDSEntry::ConstIterator it_2 = e.begin(); + TDEIO::UDSEntry e = *it; + TDEIO::UDSEntry::ConstIterator it_2 = e.begin(); for( ; it_2 != e.end(); it_2++ ) { switch ( (*it_2).m_uds ) { - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: name = (*it_2).m_str; break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: is_exe = ((*it_2).m_long & MODE_EXE) != 0; break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: is_dir = ((*it_2).m_long & S_IFDIR) != 0; break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: url = (*it_2).m_str; break; } @@ -1301,7 +1301,7 @@ void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries) * Start a new list job if there are still urls in * d->list_urls, otherwise call finished() */ -void KURLCompletion::slotIOFinished( KIO::Job * job ) +void KURLCompletion::slotIOFinished( TDEIO::Job * job ) { // kdDebug() << "slotIOFinished() " << endl; @@ -1322,18 +1322,18 @@ void KURLCompletion::slotIOFinished( KIO::Job * job ) // kdDebug() << "Start KIO: " << kurl->prettyURL() << endl; - d->list_job = KIO::listDir( *kurl, false ); + d->list_job = TDEIO::listDir( *kurl, false ); d->list_job->addMetaData("no-auth-prompt", "true"); assert( d->list_job ); connect( d->list_job, - TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotIOFinished(KIO::Job*)) ); + TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotIOFinished(TDEIO::Job*)) ); connect( d->list_job, - TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)), - TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&)) ); + TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); delete kurl; } diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h index 2e042c3bc..62eda9f8d 100644 --- a/kio/kio/kurlcompletion.h +++ b/kio/kio/kurlcompletion.h @@ -176,8 +176,8 @@ protected: virtual void customEvent( TQCustomEvent *e ); protected slots: - void slotEntries( KIO::Job *, const KIO::UDSEntryList& ); - void slotIOFinished( KIO::Job * ); + void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ); + void slotIOFinished( TDEIO::Job * ); private: diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index fe07c3ad1..efc4cbae3 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -53,7 +53,7 @@ void KServiceTypeProfile::initStatic() profileDeleter.setObject(s_lstProfiles, new KServiceTypeProfileList); s_lstProfiles->setAutoDelete( true ); - KConfig config( "profilerc", true, false); + TDEConfig config( "profilerc", true, false); static const TQString & defaultGroup = TDEGlobal::staticQString(""); diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 3998584e3..545c841b0 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -31,9 +31,9 @@ #include "metainfojob.moc" -using namespace KIO; +using namespace TDEIO; -struct KIO::MetaInfoJobPrivate +struct TDEIO::MetaInfoJobPrivate { KFileItemList items; // all the items we got KFileItemListIterator* currentItem; // argh! No default constructor @@ -42,7 +42,7 @@ struct KIO::MetaInfoJobPrivate }; MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems) - : KIO::Job(false /* no GUI */) + : TDEIO::Job(false /* no GUI */) { d = new MetaInfoJobPrivate; d->deleteItems = deleteItems; @@ -113,7 +113,7 @@ void MetaInfoJob::determineNextFile() getMetaInfo(); } -void MetaInfoJob::slotResult( KIO::Job *job ) +void MetaInfoJob::slotResult( TDEIO::Job *job ) { subjobs.remove(job); Q_ASSERT(subjobs.isEmpty()); // We should have only one job at a time ... @@ -129,17 +129,17 @@ void MetaInfoJob::getMetaInfo() URL.setProtocol("metainfo"); URL.setPath(d->currentItem->current()->url().path()); - KIO::TransferJob* job = KIO::get(URL, false, false); + TDEIO::TransferJob* job = TDEIO::get(URL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotMetaInfo(KIO::Job *, const TQByteArray &))); + connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); job->addMetaData("mimeType", d->currentItem->current()->mimetype()); } -void MetaInfoJob::slotMetaInfo(KIO::Job*, const TQByteArray &data) +void MetaInfoJob::slotMetaInfo(TDEIO::Job*, const TQByteArray &data) { KFileMetaInfo info; TQDataStream s(data, IO_ReadOnly); @@ -169,12 +169,12 @@ TQStringList MetaInfoJob::supportedMimeTypes() return result; } -KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KFileItemList &items) +KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items) { return new MetaInfoJob(items, false); } -KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KURL::List &items) +KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items) { KFileItemList fileItems; for (KURL::List::ConstIterator it = items.begin(); it != items.end(); ++it) diff --git a/kio/kio/metainfojob.h b/kio/kio/metainfojob.h index 3b96713fb..0f7d485b3 100644 --- a/kio/kio/metainfojob.h +++ b/kio/kio/metainfojob.h @@ -25,14 +25,14 @@ #include #include -namespace KIO { +namespace TDEIO { /** * MetaInfoJob is a KIO Job to retrieve meta information from files. * * @short KIO Job to retrieve meta information from files. * @since 3.1 */ - class KIO_EXPORT MetaInfoJob : public KIO::Job + class KIO_EXPORT MetaInfoJob : public TDEIO::Job { Q_OBJECT public: @@ -85,11 +85,11 @@ namespace KIO { void getMetaInfo(); protected slots: - virtual void slotResult( KIO::Job *job ); + virtual void slotResult( TDEIO::Job *job ); private slots: void start(); - void slotMetaInfo(KIO::Job *, const TQByteArray &); + void slotMetaInfo(TDEIO::Job *, const TQByteArray &); private: void determineNextFile(); diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index a7ddb3987..11c20be49 100644 --- a/kio/kio/netaccess.cpp +++ b/kio/kio/netaccess.cpp @@ -43,7 +43,7 @@ #include "kio/netaccess.h" -using namespace KIO; +using namespace TDEIO; TQString * NetAccess::lastErrorMsg; int NetAccess::lastErrorCode = 0; @@ -190,12 +190,12 @@ bool NetAccess::exists( const KURL & url, bool source, TQWidget* window ) return kioNet.statInternal( url, 0 /*no details*/, source, window ); } -bool NetAccess::stat( const KURL & url, KIO::UDSEntry & entry ) +bool NetAccess::stat( const KURL & url, TDEIO::UDSEntry & entry ) { return NetAccess::stat( url, entry, 0 ); } -bool NetAccess::stat( const KURL & url, KIO::UDSEntry & entry, TQWidget* window ) +bool NetAccess::stat( const KURL & url, TDEIO::UDSEntry & entry, TQWidget* window ) { NetAccess kioNet; bool ret = kioNet.statInternal( url, 2 /*all details*/, true /*source*/, window ); @@ -211,7 +211,7 @@ KURL NetAccess::mostLocalURL(const KURL & url, TQWidget* window) return url; } - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (!stat(url, entry, window)) { return url; @@ -219,12 +219,12 @@ KURL NetAccess::mostLocalURL(const KURL & url, TQWidget* window) TQString path; - // Extract the local path from the KIO::UDSEntry - KIO::UDSEntry::ConstIterator it = entry.begin(); - const KIO::UDSEntry::ConstIterator end = entry.end(); + // Extract the local path from the TDEIO::UDSEntry + TDEIO::UDSEntry::ConstIterator it = entry.begin(); + const TDEIO::UDSEntry::ConstIterator end = entry.end(); for ( ; it != end; ++it ) { - if ( (*it).m_uds == KIO::UDS_LOCAL_PATH ) + if ( (*it).m_uds == TDEIO::UDS_LOCAL_PATH ) { path = (*it).m_str; break; @@ -305,13 +305,13 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis { bJobOK = true; // success unless further error occurs - KIO::Scheduler::checkSlaveOnHold(true); - KIO::Job * job = move - ? KIO::file_move( src, target, permissions, overwrite, resume ) - : KIO::file_copy( src, target, permissions, overwrite, resume ); + TDEIO::Scheduler::checkSlaveOnHold(true); + TDEIO::Job * job = move + ? TDEIO::file_move( src, target, permissions, overwrite, resume ) + : TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -322,12 +322,12 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target, { bJobOK = true; // success unless further error occurs - KIO::Job * job = move - ? KIO::move( src, target ) - : KIO::copy( src, target ); + TDEIO::Job * job = move + ? TDEIO::move( src, target ) + : TDEIO::copy( src, target ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -337,12 +337,12 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source, TQWidget* window ) { bJobOK = true; // success unless further error occurs - KIO::StatJob * job = KIO::stat( url, !url.isLocalFile() && !url.url().startsWith("beagle:?") ); + TDEIO::StatJob * job = TDEIO::stat( url, !url.isLocalFile() && !url.url().startsWith("beagle:?") ); job->setWindow (window); job->setDetails( details ); job->setSide( source ); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -350,10 +350,10 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source, bool NetAccess::delInternal( const KURL & url, TQWidget* window ) { bJobOK = true; // success unless further error occurs - KIO::Job * job = KIO::del( url ); + TDEIO::Job * job = TDEIO::del( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -362,10 +362,10 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions, TQWidget* window ) { bJobOK = true; // success unless further error occurs - KIO::Job * job = KIO::mkdir( url, permissions ); + TDEIO::Job * job = TDEIO::mkdir( url, permissions ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -374,17 +374,17 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window ) { bJobOK = true; // success unless further error occurs m_mimetype = TQString::fromLatin1("unknown"); - KIO::Job * job = KIO::mimetype( url ); + TDEIO::Job * job = TDEIO::mimetype( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); - connect( job, TQT_SIGNAL( mimetype (KIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype (KIO::Job *, const TQString &) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQT_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), + this, TQT_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); enter_loop(); return m_mimetype; } -void NetAccess::slotMimetype( KIO::Job *, const TQString & type ) +void NetAccess::slotMimetype( TDEIO::Job *, const TQString & type ) { m_mimetype = type; } @@ -412,13 +412,13 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman stream << int('X') << tempPathUrl << command; - KIO::Job * job = KIO::special( tempPathUrl, packedArgs, true ); + TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true ); job->setWindow( window ); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); - // since the KIO::special does not provide feedback we need to download the result + // since the TDEIO::special does not provide feedback we need to download the result if( NetAccess::download( tempPathUrl, target, window ) ) { TQFile resultFile( target ); @@ -459,21 +459,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* } } - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); TQMetaObject *meta = job->metaObject(); - static const char dataSignal[] = "data(KIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)"; + static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)"; if ( meta->findSignal( dataSignal ) != -1 ) { - connect( job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)), - this, TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) ); + connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); } - static const char redirSignal[] = "redirection(KIO::Job*,const KURL&)"; + static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)"; if ( meta->findSignal( redirSignal ) != -1 ) { - connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)), - this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) ); + connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)), + this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); } enter_loop(); @@ -499,7 +499,7 @@ void NetAccess::enter_loop() tqt_leave_modal(&dummy); } -void NetAccess::slotResult( KIO::Job * job ) +void NetAccess::slotResult( TDEIO::Job * job ) { lastErrorCode = job->error(); bJobOK = !job->error(); @@ -509,8 +509,8 @@ void NetAccess::slotResult( KIO::Job * job ) lastErrorMsg = new TQString; *lastErrorMsg = job->errorString(); } - if ( job->isA("KIO::StatJob") ) - m_entry = static_cast(job)->statResult(); + if ( job->isA("TDEIO::StatJob") ) + m_entry = static_cast(job)->statResult(); if ( m_metaData ) *m_metaData = job->metaData(); @@ -518,7 +518,7 @@ void NetAccess::slotResult( KIO::Job * job ) tqApp->exit_loop(); } -void NetAccess::slotData( KIO::Job*, const TQByteArray& data ) +void NetAccess::slotData( TDEIO::Job*, const TQByteArray& data ) { if ( data.isEmpty() ) return; @@ -528,7 +528,7 @@ void NetAccess::slotData( KIO::Job*, const TQByteArray& data ) std::memcpy( m_data.data() + offset, data.data(), data.size() ); } -void NetAccess::slotRedirection( KIO::Job*, const KURL& url ) +void NetAccess::slotRedirection( TDEIO::Job*, const KURL& url ) { m_url = url; } diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h index 110c18053..ba8988dfc 100644 --- a/kio/kio/netaccess.h +++ b/kio/kio/netaccess.h @@ -32,7 +32,7 @@ class TQWidget; class KURL; template class TQMap; -namespace KIO { +namespace TDEIO { class Job; @@ -40,9 +40,9 @@ namespace KIO { * Net Transparency. * * NetAccess allows you to do simple file operation (load, save, - * copy, delete...) without working with KIO::Job directly. - * Whereas a KIO::Job is asynchronous, meaning that the - * developer has to connect slots for it, KIO::NetAccess provides + * copy, delete...) without working with TDEIO::Job directly. + * Whereas a TDEIO::Job is asynchronous, meaning that the + * developer has to connect slots for it, TDEIO::NetAccess provides * synchronous downloads and uploads, as well as temporary file * creation and removal. The functions appear to be blocking, * but the Qt event loop continues running while the operations @@ -83,12 +83,12 @@ public: * * \code * TQString tmpFile; - * if( KIO::NetAccess::download( u, tmpFile, window ) ) + * if( TDEIO::NetAccess::download( u, tmpFile, window ) ) * { * loadFile( tmpFile ); - * KIO::NetAccess::removeTempFile( tmpFile ); + * TDEIO::NetAccess::removeTempFile( tmpFile ); * } else { - * KMessageBox::error(this, KIO::NetAccess::lastErrorString() ); + * KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() ); * } * \endcode * @@ -123,7 +123,7 @@ public: /** * Removes the specified file if and only if it was created - * by KIO::NetAccess as a temporary file for a former download. + * by TDEIO::NetAccess as a temporary file for a former download. * * Note: This means that if you created your temporary with KTempFile, * use KTempFile::unlink() or KTempFile::setAutoDelete() to have @@ -165,7 +165,7 @@ public: * Overwrite is false, so this will fail if @p target exists. * * This one takes two URLs and is a direct equivalent - * of KIO::file_copy (not KIO::copy!). + * of TDEIO::file_copy (not TDEIO::copy!). * It will be renamed file_copy in KDE4, so better use file_copy. * * @param src URL Referencing the file to upload. @@ -188,13 +188,13 @@ public: // KDE4: merge with above /** - * Full-fledged equivalent of KIO::file_copy + * Full-fledged equivalent of TDEIO::file_copy */ static bool file_copy( const KURL& src, const KURL& dest, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget* window = 0L ); /** - * Full-fledged equivalent of KIO::file_move. + * Full-fledged equivalent of TDEIO::file_move. * Moves or renames *one file*. * @since 3.2 */ @@ -207,7 +207,7 @@ public: * Overwrite is false, so this will fail if @p target exists. * * This one takes two URLs and is a direct equivalent - * of KIO::copy!. + * of TDEIO::copy!. * This means that it can copy files and directories alike * (it should have been named copy()). * @@ -234,14 +234,14 @@ public: static bool dircopy( const KURL::List& src, const KURL& target, TQWidget* window = 0L ); /** - * Full-fledged equivalent of KIO::move. + * Full-fledged equivalent of TDEIO::move. * Moves or renames one file or directory. * @since 3.2 */ static bool move( const KURL& src, const KURL& target, TQWidget* window = 0L ); /** - * Full-fledged equivalent of KIO::move. + * Full-fledged equivalent of TDEIO::move. * Moves or renames a list of files or directories. * @since 3.2 */ @@ -253,7 +253,7 @@ public: * @param url the URL we are testing * @param source if true, we want to read from that URL. * If false, we want to write to it. - * IMPORTANT: see documentation for KIO::stat for more details about this. + * IMPORTANT: see documentation for TDEIO::stat for more details about this. * @param window main window associated with this job. This is used to * automatically cache and discard authentication information * as needed. If NULL, authentication information will be @@ -284,7 +284,7 @@ public: /** * Tests whether a URL exists and return information on it. * - * This is a convenience function for KIO::stat + * This is a convenience function for TDEIO::stat * (it saves creating a slot and testing for the job result). * * @param url The URL we are testing. @@ -297,17 +297,17 @@ public: * again be prompted for passwords as needed. * @return true if successful, false for failure */ - static bool stat(const KURL& url, KIO::UDSEntry & entry, TQWidget* window); + static bool stat(const KURL& url, TDEIO::UDSEntry & entry, TQWidget* window); /** * @deprecated. Use the function above instead. */ - static bool stat(const KURL& url, KIO::UDSEntry & entry) KDE_DEPRECATED; + static bool stat(const KURL& url, TDEIO::UDSEntry & entry) KDE_DEPRECATED; /** * Tries to map a local URL for the given URL. * - * This is a convenience function for KIO::stat + parsing the + * This is a convenience function for TDEIO::stat + parsing the * resulting UDSEntry. * * @param url The URL we are testing. @@ -325,7 +325,7 @@ public: /** * Deletes a file or a directory in a synchronous way. * - * This is a convenience function for KIO::del + * This is a convenience function for TDEIO::del * (it saves creating a slot and testing for the job result). * * @param url The file or directory to delete. @@ -349,7 +349,7 @@ public: /** * Creates a directory in a synchronous way. * - * This is a convenience function for @p KIO::mkdir + * This is a convenience function for @p TDEIO::mkdir * (it saves creating a slot and testing for the job result). * * @param url The directory to create. @@ -397,7 +397,7 @@ public: * and after the function returns it will contain all the data fetched by this job. * * - * KIO::Job *job = KIO::get( url, false, false ); + * TDEIO::Job *job = TDEIO::get( url, false, false ); * TQMap metaData; * metaData.insert( "PropagateHttpHeader", "true" ); * if ( NetAccess::synchronousRun( job, 0, &data, &url, &metaData ) ) { @@ -435,7 +435,7 @@ public: * * Determines the mimetype of a given URL. * - * This is a convenience function for KIO::mimetype. You + * This is a convenience function for TDEIO::mimetype. You * should call this only when really necessary. * KMimeType::findByURL can determine extension a lot faster, but * less reliably for remote files. Only when findByURL() returns @@ -514,10 +514,10 @@ private: friend class I_like_this_class; private slots: - void slotResult( KIO::Job * job ); - void slotMimetype( KIO::Job * job, const TQString & type ); - void slotData( KIO::Job*, const TQByteArray& ); - void slotRedirection( KIO::Job*, const KURL& ); + void slotResult( TDEIO::Job * job ); + void slotMimetype( TDEIO::Job * job, const TQString & type ); + void slotData( TDEIO::Job*, const TQByteArray& ); + void slotRedirection( TDEIO::Job*, const KURL& ); private: UDSEntry m_entry; diff --git a/kio/kio/observer.cpp b/kio/kio/observer.cpp index 599703f9b..347db9df9 100644 --- a/kio/kio/observer.cpp +++ b/kio/kio/observer.cpp @@ -41,15 +41,15 @@ #include #include -using namespace KIO; +using namespace TDEIO; -template class TQIntDict; +template class TQIntDict; Observer * Observer::s_pObserver = 0L; const int KDEBUG_OBSERVER = 7007; // Should be 7028 -Observer::Observer() : DCOPObject("KIO::Observer") +Observer::Observer() : DCOPObject("TDEIO::Observer") { // Register app as able to receive DCOP messages if (kapp && !kapp->dcopClient()->isAttached()) @@ -78,7 +78,7 @@ Observer::Observer() : DCOPObject("KIO::Observer") m_uiserver = new UIServer_stub( "kio_uiserver", "UIServer" ); } -int Observer::newJob( KIO::Job * job, bool showProgress ) +int Observer::newJob( TDEIO::Job * job, bool showProgress ) { // Tell the UI Server about this new job, and give it the application id // at the same time @@ -98,7 +98,7 @@ void Observer::jobFinished( int progressId ) void Observer::killJob( int progressId ) { - KIO::Job * job = m_dctJobs[ progressId ]; + TDEIO::Job * job = m_dctJobs[ progressId ]; if (!job) { kdWarning() << "Can't find job to kill ! There is no job with progressId=" << progressId << " in this process" << endl; @@ -109,111 +109,111 @@ void Observer::killJob( int progressId ) MetaData Observer::metadata( int progressId ) { - KIO::Job * job = m_dctJobs[ progressId ]; + TDEIO::Job * job = m_dctJobs[ progressId ]; assert(job); return job->metaData(); } -void Observer::slotTotalSize( KIO::Job* job, KIO::filesize_t size ) +void Observer::slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size ) { - //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalSize " << job << " " << KIO::number(size) << endl; + //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalSize " << job << " " << TDEIO::number(size) << endl; m_uiserver->totalSize64( job->progressId(), size ); } -void Observer::slotTotalFiles( KIO::Job* job, unsigned long files ) +void Observer::slotTotalFiles( TDEIO::Job* job, unsigned long files ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalFiles " << job << " " << files << endl; m_uiserver->totalFiles( job->progressId(), files ); } -void Observer::slotTotalDirs( KIO::Job* job, unsigned long dirs ) +void Observer::slotTotalDirs( TDEIO::Job* job, unsigned long dirs ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalDirs " << job << " " << dirs << endl; m_uiserver->totalDirs( job->progressId(), dirs ); } -void Observer::slotProcessedSize( KIO::Job* job, KIO::filesize_t size ) +void Observer::slotProcessedSize( TDEIO::Job* job, TDEIO::filesize_t size ) { - //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedSize " << job << " " << job->progressId() << " " << KIO::number(size) << endl; + //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedSize " << job << " " << job->progressId() << " " << TDEIO::number(size) << endl; m_uiserver->processedSize64( job->progressId(), size ); } -void Observer::slotProcessedFiles( KIO::Job* job, unsigned long files ) +void Observer::slotProcessedFiles( TDEIO::Job* job, unsigned long files ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedFiles " << job << " " << files << endl; m_uiserver->processedFiles( job->progressId(), files ); } -void Observer::slotProcessedDirs( KIO::Job* job, unsigned long dirs ) +void Observer::slotProcessedDirs( TDEIO::Job* job, unsigned long dirs ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedDirs " << job << " " << dirs << endl; m_uiserver->processedDirs( job->progressId(), dirs ); } -void Observer::slotSpeed( KIO::Job* job, unsigned long speed ) +void Observer::slotSpeed( TDEIO::Job* job, unsigned long speed ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotSpeed " << job << " " << speed << endl; m_uiserver->speed( job->progressId(), speed ); } -void Observer::slotPercent( KIO::Job* job, unsigned long percent ) +void Observer::slotPercent( TDEIO::Job* job, unsigned long percent ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotPercent " << job << " " << percent << endl; m_uiserver->percent( job->progressId(), percent ); } -void Observer::slotInfoMessage( KIO::Job* job, const TQString & msg ) +void Observer::slotInfoMessage( TDEIO::Job* job, const TQString & msg ) { m_uiserver->infoMessage( job->progressId(), msg ); } -void Observer::slotCopying( KIO::Job* job, const KURL& from, const KURL& to ) +void Observer::slotCopying( TDEIO::Job* job, const KURL& from, const KURL& to ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCopying " << job << " " << from.url() << " " << to.url() << endl; m_uiserver->copying( job->progressId(), from, to ); } -void Observer::slotMoving( KIO::Job* job, const KURL& from, const KURL& to ) +void Observer::slotMoving( TDEIO::Job* job, const KURL& from, const KURL& to ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotMoving " << job << " " << from.url() << " " << to.url() << endl; m_uiserver->moving( job->progressId(), from, to ); } -void Observer::slotDeleting( KIO::Job* job, const KURL& url ) +void Observer::slotDeleting( TDEIO::Job* job, const KURL& url ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotDeleting " << job << " " << url.url() << endl; m_uiserver->deleting( job->progressId(), url ); } -void Observer::slotTransferring( KIO::Job* job, const KURL& url ) +void Observer::slotTransferring( TDEIO::Job* job, const KURL& url ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTransferring " << job << " " << url.url() << endl; m_uiserver->transferring( job->progressId(), url ); } -void Observer::slotCreatingDir( KIO::Job* job, const KURL& dir ) +void Observer::slotCreatingDir( TDEIO::Job* job, const KURL& dir ) { //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCreatingDir " << job << " " << dir.url() << endl; m_uiserver->creatingDir( job->progressId(), dir ); } -void Observer::slotCanResume( KIO::Job* job, KIO::filesize_t offset ) +void Observer::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) { - //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCanResume " << job << " " << KIO::number(offset) << endl; + //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCanResume " << job << " " << TDEIO::number(offset) << endl; m_uiserver->canResume64( job->progressId(), offset ); } -void Observer::stating( KIO::Job* job, const KURL& url ) +void Observer::stating( TDEIO::Job* job, const KURL& url ) { m_uiserver->stating( job->progressId(), url ); } -void Observer::mounting( KIO::Job* job, const TQString & dev, const TQString & point ) +void Observer::mounting( TDEIO::Job* job, const TQString & dev, const TQString & point ) { m_uiserver->mounting( job->progressId(), dev, point ); } -void Observer::unmounting( KIO::Job* job, const TQString & point ) +void Observer::unmounting( TDEIO::Job* job, const TQString & point ) { m_uiserver->unmounting( job->progressId(), point ); } @@ -235,11 +235,11 @@ bool Observer::openPassDlg( const TQString& prompt, TQString& user, return result; } -bool Observer::openPassDlg( KIO::AuthInfo& info ) +bool Observer::openPassDlg( TDEIO::AuthInfo& info ) { kdDebug(KDEBUG_OBSERVER) << "Observer::openPassDlg: User= " << info.username << ", Message= " << info.prompt << endl; - int result = KIO::PasswordDialog::getNameAndPassword( info.username, info.password, + int result = TDEIO::PasswordDialog::getNameAndPassword( info.username, info.password, &info.keepPassword, info.prompt, info.readOnly, info.caption, info.comment, info.commentLabel ); @@ -264,39 +264,39 @@ int Observer::messageBox( int progressId, int type, const TQString &text, { kdDebug() << "Observer::messageBox " << type << " " << text << " - " << caption << endl; int result = -1; - KConfig *config = new KConfig("kioslaverc"); + TDEConfig *config = new TDEConfig("kioslaverc"); KMessageBox::setDontShowAskAgainConfig(config); switch (type) { - case KIO::SlaveBase::QuestionYesNo: + case TDEIO::SlaveBase::QuestionYesNo: result = KMessageBox::questionYesNo( 0L, // parent ? text, caption, buttonYes, buttonNo, dontAskAgainName ); break; - case KIO::SlaveBase::WarningYesNo: + case TDEIO::SlaveBase::WarningYesNo: result = KMessageBox::warningYesNo( 0L, // parent ? text, caption, buttonYes, buttonNo, dontAskAgainName ); break; - case KIO::SlaveBase::WarningContinueCancel: + case TDEIO::SlaveBase::WarningContinueCancel: result = KMessageBox::warningContinueCancel( 0L, // parent ? text, caption, buttonYes, dontAskAgainName ); break; - case KIO::SlaveBase::WarningYesNoCancel: + case TDEIO::SlaveBase::WarningYesNoCancel: result = KMessageBox::warningYesNoCancel( 0L, // parent ? text, caption, buttonYes, buttonNo, dontAskAgainName ); break; - case KIO::SlaveBase::Information: + case TDEIO::SlaveBase::Information: KMessageBox::information( 0L, // parent ? text, caption, dontAskAgainName ); result = 1; // whatever break; - case KIO::SlaveBase::SSLMessageBox: + case TDEIO::SlaveBase::SSLMessageBox: { TQCString observerAppId = caption.utf8(); // hack, see slaveinterface.cpp - // Contact the object "KIO::Observer" in the application + // Contact the object "TDEIO::Observer" in the application // Yes, this could be the same application we are, but not necessarily. - Observer_stub observer( observerAppId, "KIO::Observer" ); + Observer_stub observer( observerAppId, "TDEIO::Observer" ); - KIO::MetaData meta = observer.metadata( progressId ); + TDEIO::MetaData meta = observer.metadata( progressId ); KSSLInfoDlg *kid = new KSSLInfoDlg(meta["ssl_in_use"].upper()=="TRUE", 0L /*parent?*/, 0L, true); KSSLCertificate *x = KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit()); if (x) { @@ -367,12 +367,12 @@ int Observer::messageBox( int progressId, int type, const TQString &text, #endif } -RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job, +RenameDlg_Result Observer::open_RenameDlg( TDEIO::Job* job, const TQString & caption, const TQString& src, const TQString & dest, RenameDlg_Mode mode, TQString& newDest, - KIO::filesize_t sizeSrc, - KIO::filesize_t sizeDest, + TDEIO::filesize_t sizeSrc, + TDEIO::filesize_t sizeDest, time_t ctimeSrc, time_t ctimeDest, time_t mtimeSrc, @@ -387,7 +387,7 @@ RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job, m_uiserver->setJobVisible( job->progressId(), false ); // We now do it in process => KDE4: move this code out of Observer (back to job.cpp), so that // opening the rename dialog doesn't start uiserver for nothing if progressId=0 (e.g. F2 in konq) - RenameDlg_Result res = KIO::open_RenameDlg( caption, src, dest, mode, + RenameDlg_Result res = TDEIO::open_RenameDlg( caption, src, dest, mode, newDest, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest ); @@ -396,7 +396,7 @@ RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job, return res; } -SkipDlg_Result Observer::open_SkipDlg( KIO::Job* job, +SkipDlg_Result Observer::open_SkipDlg( TDEIO::Job* job, bool _multi, const TQString& _error_text ) { @@ -404,8 +404,8 @@ SkipDlg_Result Observer::open_SkipDlg( KIO::Job* job, // Hide existing dialog box if any if (job && job->progressId()) m_uiserver->setJobVisible( job->progressId(), false ); - // We now do it in process. So this method is a useless wrapper around KIO::open_RenameDlg. - SkipDlg_Result res = KIO::open_SkipDlg( _multi, _error_text ); + // We now do it in process. So this method is a useless wrapper around TDEIO::open_RenameDlg. + SkipDlg_Result res = TDEIO::open_SkipDlg( _multi, _error_text ); if (job && job->progressId()) m_uiserver->setJobVisible( job->progressId(), true ); return res; diff --git a/kio/kio/observer.h b/kio/kio/observer.h index 94b8cede9..8c20e6f92 100644 --- a/kio/kio/observer.h +++ b/kio/kio/observer.h @@ -32,12 +32,12 @@ class UIServer_stub; class KURL; -namespace KIO { +namespace TDEIO { class Job; } /** - * Observer for KIO::Job progress information. + * Observer for TDEIO::Job progress information. * * This class, of which there is always only one instance, * "observes" what jobs do and forwards this information @@ -47,9 +47,9 @@ namespace KIO { * kill method when the user presses Cancel. * * Usually jobs are automatically registered by the - * KIO::Scheduler, so you do not have to care about that. + * TDEIO::Scheduler, so you do not have to care about that. * - * @short Observer for KIO::Job progress information + * @short Observer for TDEIO::Job progress information * @author David Faure */ class KIO_EXPORT Observer : public TQObject, public DCOPObject { @@ -75,7 +75,7 @@ public: * @param showProgress true to show progress, false otherwise * @return the progress ID assigned by the UI Server to the Job. */ - int newJob( KIO::Job * job, bool showProgress ); + int newJob( TDEIO::Job * job, bool showProgress ); /** * Called by the job destructor, to tell the UI Server that @@ -85,7 +85,7 @@ public: void jobFinished( int progressId ); /** - * @deprecated use KIO::AutoInfo + * @deprecated use TDEIO::AutoInfo */ bool openPassDlg( const TQString& prompt, TQString& user, TQString& pass, bool readOnly ); @@ -95,10 +95,10 @@ public: * @param info the authentication information * @return true if successful ("ok" clicked), false otherwise */ - bool openPassDlg( KIO::AuthInfo& info ); + bool openPassDlg( TDEIO::AuthInfo& info ); /** - * Popup a message box. See KIO::SlaveBase. + * Popup a message box. See TDEIO::SlaveBase. * This doesn't use DCOP anymore, it shows the dialog in the application's process. * Otherwise, other apps would block when trying to communicate with UIServer. * @param progressId the progress ID of the job, as returned by newJob() @@ -112,7 +112,7 @@ public: const TQString &buttonYes, const TQString &buttonNo ); /** - * Popup a message box. See KIO::SlaveBase. + * Popup a message box. See TDEIO::SlaveBase. * This doesn't use DCOP anymore, it shows the dialog in the application's process. * Otherwise, other apps would block when trying to communicate with UIServer. * @param progressId the progress ID of the job, as returned by newJob() @@ -132,13 +132,13 @@ public: * @internal * See renamedlg.h */ - KIO::RenameDlg_Result open_RenameDlg( KIO::Job * job, + TDEIO::RenameDlg_Result open_RenameDlg( TDEIO::Job * job, const TQString & caption, const TQString& src, const TQString & dest, - KIO::RenameDlg_Mode mode, + TDEIO::RenameDlg_Mode mode, TQString& newDest, - KIO::filesize_t sizeSrc = (KIO::filesize_t) -1, - KIO::filesize_t sizeDest = (KIO::filesize_t) -1, + TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1, + TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1, time_t ctimeSrc = (time_t) -1, time_t ctimeDest = (time_t) -1, time_t mtimeSrc = (time_t) -1, @@ -149,7 +149,7 @@ public: * @internal * See skipdlg.h */ - KIO::SkipDlg_Result open_SkipDlg( KIO::Job * job, + TDEIO::SkipDlg_Result open_SkipDlg( TDEIO::Job * job, bool multi, const TQString & error_text ); @@ -164,7 +164,7 @@ k_dcop: * Called by the UI Server (using DCOP) to get all the metadata of the job * @param progressId the progress IDof the job, as returned by newJob() */ - KIO::MetaData metadata( int progressId ); + TDEIO::MetaData metadata( int progressId ); protected: @@ -174,35 +174,35 @@ protected: UIServer_stub * m_uiserver; - TQIntDict< KIO::Job > m_dctJobs; + TQIntDict< TDEIO::Job > m_dctJobs; public slots: - void slotTotalSize( KIO::Job*, KIO::filesize_t size ); - void slotTotalFiles( KIO::Job*, unsigned long files ); - void slotTotalDirs( KIO::Job*, unsigned long dirs ); + void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ); + void slotTotalFiles( TDEIO::Job*, unsigned long files ); + void slotTotalDirs( TDEIO::Job*, unsigned long dirs ); - void slotProcessedSize( KIO::Job*, KIO::filesize_t size ); - void slotProcessedFiles( KIO::Job*, unsigned long files ); - void slotProcessedDirs( KIO::Job*, unsigned long dirs ); + void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t size ); + void slotProcessedFiles( TDEIO::Job*, unsigned long files ); + void slotProcessedDirs( TDEIO::Job*, unsigned long dirs ); - void slotSpeed( KIO::Job*, unsigned long speed ); - void slotPercent( KIO::Job*, unsigned long percent ); - void slotInfoMessage( KIO::Job*, const TQString & msg ); + void slotSpeed( TDEIO::Job*, unsigned long speed ); + void slotPercent( TDEIO::Job*, unsigned long percent ); + void slotInfoMessage( TDEIO::Job*, const TQString & msg ); - void slotCopying( KIO::Job*, const KURL& from, const KURL& to ); - void slotMoving( KIO::Job*, const KURL& from, const KURL& to ); - void slotDeleting( KIO::Job*, const KURL& url ); + void slotCopying( TDEIO::Job*, const KURL& from, const KURL& to ); + void slotMoving( TDEIO::Job*, const KURL& from, const KURL& to ); + void slotDeleting( TDEIO::Job*, const KURL& url ); /// @since 3.1 - void slotTransferring( KIO::Job*, const KURL& url ); - void slotCreatingDir( KIO::Job*, const KURL& dir ); + void slotTransferring( TDEIO::Job*, const KURL& url ); + void slotCreatingDir( TDEIO::Job*, const KURL& dir ); // currently unused - void slotCanResume( KIO::Job*, KIO::filesize_t offset ); + void slotCanResume( TDEIO::Job*, TDEIO::filesize_t offset ); public: - void stating( KIO::Job*, const KURL& url ); - void mounting( KIO::Job*, const TQString & dev, const TQString & point ); - void unmounting( KIO::Job*, const TQString & point ); + void stating( TDEIO::Job*, const KURL& url ); + void mounting( TDEIO::Job*, const TQString & dev, const TQString & point ); + void unmounting( TDEIO::Job*, const TQString & point ); protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index 28d32d377..1b5679028 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -33,7 +33,7 @@ #include #include -using namespace KIO; +using namespace TDEIO; struct PasswordDialog::PasswordDialogPrivate { @@ -74,8 +74,8 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->nRow = 0; d->keepCheckBox = 0; - KConfig* cfg = TDEGlobal::config(); - KConfigGroupSaver saver( cfg, "Passwords" ); + TDEConfig* cfg = TDEGlobal::config(); + TDEConfigGroupSaver saver( cfg, "Passwords" ); d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint()); d->layout->addColSpacing(1, 5); diff --git a/kio/kio/passdlg.h b/kio/kio/passdlg.h index bbd811328..b071ddef0 100644 --- a/kio/kio/passdlg.h +++ b/kio/kio/passdlg.h @@ -24,7 +24,7 @@ class TQGridLayout; -namespace KIO { +namespace TDEIO { /** * A dialog for requesting a login and a password from the end user. diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp index f39aa0746..55102c5ed 100644 --- a/kio/kio/paste.cpp +++ b/kio/kio/paste.cpp @@ -54,10 +54,10 @@ static KURL getNewFileName( const KURL &u, const TQString& text ) KURL myurl(u); myurl.addPath( file ); - if (KIO::NetAccess::exists(myurl, false, 0)) + if (TDEIO::NetAccess::exists(myurl, false, 0)) { kdDebug(7007) << "Paste will overwrite file. Prompting..." << endl; - KIO::RenameDlg_Result res = KIO::R_OVERWRITE; + TDEIO::RenameDlg_Result res = TDEIO::R_OVERWRITE; TQString newPath; // Ask confirmation about resuming previous transfer @@ -65,13 +65,13 @@ static KURL getNewFileName( const KURL &u, const TQString& text ) 0L, i18n("File Already Exists"), u.pathOrURL(), myurl.pathOrURL(), - (KIO::RenameDlg_Mode) (KIO::M_OVERWRITE | KIO::M_SINGLE), newPath); + (TDEIO::RenameDlg_Mode) (TDEIO::M_OVERWRITE | TDEIO::M_SINGLE), newPath); - if ( res == KIO::R_RENAME ) + if ( res == TDEIO::R_RENAME ) { myurl = newPath; } - else if ( res == KIO::R_CANCEL ) + else if ( res == TDEIO::R_CANCEL ) { return KURL(); } @@ -81,7 +81,7 @@ static KURL getNewFileName( const KURL &u, const TQString& text ) } // The finaly step: write _data to tempfile and move it to neW_url -static KIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _data ) +static TDEIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _data ) { KTempFile tempFile; tempFile.dataStream()->writeRawBytes( _data.data(), _data.size() ); @@ -90,11 +90,11 @@ static KIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _ KURL orig_url; orig_url.setPath(tempFile.name()); - return KIO::move( orig_url, new_url ); + return TDEIO::move( orig_url, new_url ); } #ifndef QT_NO_MIMECLIPBOARD -static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, +static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, const TQValueVector& formats, const TQString& text, TQWidget* widget, @@ -113,7 +113,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, TQString dialogText( text ); if ( dialogText.isEmpty() ) dialogText = i18n( "Filename for clipboard content:" ); - KIO::PasteDialog dlg( TQString::null, dialogText, TQString::null, formatLabels, widget, clipboard ); + TDEIO::PasteDialog dlg( TQString::null, dialogText, TQString::null, formatLabels, widget, clipboard ); if ( dlg.exec() != KDialogBase::Accepted ) return 0; @@ -143,7 +143,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, #endif // KDE4: remove -KIO_EXPORT bool KIO::isClipboardEmpty() +KIO_EXPORT bool TDEIO::isClipboardEmpty() { #ifndef QT_NO_MIMECLIPBOARD TQMimeSource *data = TQApplication::clipboard()->data(); @@ -161,7 +161,7 @@ KIO_EXPORT bool KIO::isClipboardEmpty() #ifndef QT_NO_MIMECLIPBOARD // The main method for dropping -KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url, +TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url, const TQString& dialogText, TQWidget* widget, bool clipboard ) { TQByteArray ba; @@ -207,7 +207,7 @@ KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url, #endif // The main method for pasting -KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move ) +KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move ) { if ( !dest_url.isValid() ) { KMessageBox::error( 0L, i18n( "Malformed URL\n%1" ).arg( dest_url.url() ) ); @@ -225,11 +225,11 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move ) return 0; } - KIO::Job *res = 0; + TDEIO::Job *res = 0; if ( move ) - res = KIO::move( urls, dest_url ); + res = TDEIO::move( urls, dest_url ); else - res = KIO::copy( urls, dest_url ); + res = TDEIO::copy( urls, dest_url ); // If moving, erase the clipboard contents, the original files don't exist anymore if ( move ) @@ -256,10 +256,10 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move ) } -KIO_EXPORT void KIO::pasteData( const KURL& u, const TQByteArray& _data ) +KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data ) { KURL new_url = getNewFileName( u, TQString::null ); - // We could use KIO::put here, but that would require a class + // We could use TDEIO::put here, but that would require a class // for the slotData call. With NetAccess, we can do a synchronous call. if (new_url.isEmpty()) @@ -270,15 +270,15 @@ KIO_EXPORT void KIO::pasteData( const KURL& u, const TQByteArray& _data ) tempFile.dataStream()->writeRawBytes( _data.data(), _data.size() ); tempFile.close(); - (void) KIO::NetAccess::upload( tempFile.name(), new_url, 0 ); + (void) TDEIO::NetAccess::upload( tempFile.name(), new_url, 0 ); } -KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& _data ) +KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data ) { return pasteDataAsync( u, _data, TQString::null ); } -KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text ) +KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text ) { KURL new_url = getNewFileName( u, text ); @@ -288,7 +288,7 @@ KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& return pasteDataAsyncTo( new_url, _data ); } -KIO_EXPORT TQString KIO::pasteActionText() +KIO_EXPORT TQString TDEIO::pasteActionText() { TQMimeSource *data = TQApplication::clipboard()->data(); KURL::List urls; diff --git a/kio/kio/paste.h b/kio/kio/paste.h index 3fad2c8b6..36befcd65 100644 --- a/kio/kio/paste.h +++ b/kio/kio/paste.h @@ -27,7 +27,7 @@ class TQMimeSource; // KDE4 TODO pass a parent widget to all methods that will display a message box -namespace KIO { +namespace TDEIO { class Job; class CopyJob; diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp index 480eaaba8..0252baff1 100644 --- a/kio/kio/pastedialog.cpp +++ b/kio/kio/pastedialog.cpp @@ -28,7 +28,7 @@ #include #include -KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, +TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, const TQString &value, const TQStringList& items, TQWidget *parent, bool clipboard ) @@ -66,17 +66,17 @@ KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, this, TQT_SLOT( slotClipboardDataChanged() ) ); } -void KIO::PasteDialog::slotClipboardDataChanged() +void TDEIO::PasteDialog::slotClipboardDataChanged() { m_clipboardChanged = true; } -TQString KIO::PasteDialog::lineEditText() const +TQString TDEIO::PasteDialog::lineEditText() const { return m_lineEdit->text(); } -int KIO::PasteDialog::comboItem() const +int TDEIO::PasteDialog::comboItem() const { return m_comboBox->currentItem(); } diff --git a/kio/kio/pastedialog.h b/kio/kio/pastedialog.h index 4f8b79b2e..2e7bdfda1 100644 --- a/kio/kio/pastedialog.h +++ b/kio/kio/pastedialog.h @@ -25,7 +25,7 @@ class TQComboBox; class KLineEdit; class TQLabel; -namespace KIO { +namespace TDEIO { /** * @internal diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index c266947f3..de4800ab1 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -53,16 +53,16 @@ #include "previewjob.moc" -namespace KIO { struct PreviewItem; } -using namespace KIO; +namespace TDEIO { struct PreviewItem; } +using namespace TDEIO; -struct KIO::PreviewItem +struct TDEIO::PreviewItem { KFileItem *item; KService::Ptr plugin; }; -struct KIO::PreviewJobPrivate +struct TDEIO::PreviewJobPrivate { enum { STATE_STATORIG, // if the thumbnail exists STATE_GETORIG, // if we create it @@ -118,7 +118,7 @@ struct KIO::PreviewJobPrivate PreviewJob::PreviewJob( const KFileItemList &items, int width, int height, int iconSize, int iconAlpha, bool scale, bool save, const TQStringList *enabledPlugins, bool deleteItems ) - : KIO::Job( false /* no GUI */ ) + : TDEIO::Job( false /* no GUI */ ) { d = new PreviewJobPrivate; d->tOrig = 0; @@ -244,8 +244,8 @@ void PreviewJob::startPreview() } // Read configuration value for the maximum allowed size - KConfig * config = TDEGlobal::config(); - KConfigGroupSaver cgs( config, "PreviewSettings" ); + TDEConfig * config = TDEGlobal::config(); + TDEConfigGroupSaver cgs( config, "PreviewSettings" ); d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); if (bNeedCache) @@ -306,13 +306,13 @@ void PreviewJob::determineNextFile() d->currentItem = d->items.first(); d->succeeded = false; d->items.remove(d->items.begin()); - KIO::Job *job = KIO::stat( d->currentItem.item->url(), false ); + TDEIO::Job *job = TDEIO::stat( d->currentItem.item->url(), false ); job->addMetaData( "no-auth-prompt", "true" ); addSubjob(job); } } -void PreviewJob::slotResult( KIO::Job *job ) +void PreviewJob::slotResult( TDEIO::Job *job ) { subjobs.remove( job ); Q_ASSERT ( subjobs.isEmpty() ); // We should have only one job at a time ... @@ -326,18 +326,18 @@ void PreviewJob::slotResult( KIO::Job *job ) determineNextFile(); return; } - KIO::UDSEntry entry = ((KIO::StatJob*)job)->statResult(); - KIO::UDSEntry::ConstIterator it = entry.begin(); + TDEIO::UDSEntry entry = ((TDEIO::StatJob*)job)->statResult(); + TDEIO::UDSEntry::ConstIterator it = entry.begin(); d->tOrig = 0; int found = 0; for( ; it != entry.end() && found < 2; it++ ) { - if ( (*it).m_uds == KIO::UDS_MODIFICATION_TIME ) + if ( (*it).m_uds == TDEIO::UDS_MODIFICATION_TIME ) { d->tOrig = (time_t)((*it).m_long); found++; } - else if ( (*it).m_uds == KIO::UDS_SIZE ) + else if ( (*it).m_uds == TDEIO::UDS_SIZE ) { if ( filesize_t((*it).m_long) > d->maximumSize && !d->ignoreMaximumSize && @@ -372,7 +372,7 @@ void PreviewJob::slotResult( KIO::Job *job ) return; } - createThumbnail( static_cast(job)->destURL().path() ); + createThumbnail( static_cast(job)->destURL().path() ); return; } case PreviewJobPrivate::STATE_CREATETHUMB: @@ -436,7 +436,7 @@ void PreviewJob::getOrCreateThumbnail() KURL localURL; localURL.setPath( d->tempName = localFile.name() ); const KURL currentURL = item->url(); - KIO::Job * job = KIO::file_copy( currentURL, localURL, -1, true, + TDEIO::Job * job = TDEIO::file_copy( currentURL, localURL, -1, true, false, false /* No GUI */ ); job->addMetaData("thumbnail","1"); addSubjob(job); @@ -450,9 +450,9 @@ void PreviewJob::createThumbnail( TQString pixPath ) KURL thumbURL; thumbURL.setProtocol("thumbnail"); thumbURL.setPath(pixPath); - KIO::TransferJob *job = KIO::get(thumbURL, false, false); + TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(KIO::Job *, const TQByteArray &))); + connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool(); job->addMetaData("mimeType", d->currentItem.item->mimetype()); job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width)); @@ -486,7 +486,7 @@ void PreviewJob::createThumbnail( TQString pixPath ) #endif } -void PreviewJob::slotThumbData(KIO::Job *, const TQByteArray &data) +void PreviewJob::slotThumbData(TDEIO::Job *, const TQByteArray &data) { bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool() && @@ -573,7 +573,7 @@ void PreviewJob::kill( bool quietly ) Job::kill( quietly ); } -PreviewJob *KIO::filePreview( const KFileItemList &items, int width, int height, +PreviewJob *TDEIO::filePreview( const KFileItemList &items, int width, int height, int iconSize, int iconAlpha, bool scale, bool save, const TQStringList *enabledPlugins ) { @@ -581,7 +581,7 @@ PreviewJob *KIO::filePreview( const KFileItemList &items, int width, int height, scale, save, enabledPlugins); } -PreviewJob *KIO::filePreview( const KURL::List &items, int width, int height, +PreviewJob *TDEIO::filePreview( const KURL::List &items, int width, int height, int iconSize, int iconAlpha, bool scale, bool save, const TQStringList *enabledPlugins ) { @@ -593,5 +593,5 @@ PreviewJob *KIO::filePreview( const KURL::List &items, int width, int height, } void PreviewJob::virtual_hook( int id, void* data ) -{ KIO::Job::virtual_hook( id, data ); } +{ TDEIO::Job::virtual_hook( id, data ); } diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h index d7686505e..a0a137ff4 100644 --- a/kio/kio/previewjob.h +++ b/kio/kio/previewjob.h @@ -29,12 +29,12 @@ class TQPixmap; -namespace KIO { +namespace TDEIO { /*! * This class catches a preview (thumbnail) for files. * @short KIO Job to get a thumbnail picture */ - class KIO_EXPORT PreviewJob : public KIO::Job + class KIO_EXPORT PreviewJob : public TDEIO::Job { Q_OBJECT public: @@ -117,11 +117,11 @@ namespace KIO { void createThumbnail( TQString ); protected slots: - virtual void slotResult( KIO::Job *job ); + virtual void slotResult( TDEIO::Job *job ); private slots: void startPreview(); - void slotThumbData(KIO::Job *, const TQByteArray &); + void slotThumbData(TDEIO::Job *, const TQByteArray &); private: void determineNextFile(); diff --git a/kio/kio/progressbase.cpp b/kio/kio/progressbase.cpp index f01c00a7a..146f4182e 100644 --- a/kio/kio/progressbase.cpp +++ b/kio/kio/progressbase.cpp @@ -19,7 +19,7 @@ #include "jobclasses.h" #include "progressbase.h" -namespace KIO { +namespace TDEIO { ProgressBase::ProgressBase( TQWidget *parent ) : TQWidget( parent ) @@ -34,93 +34,93 @@ ProgressBase::ProgressBase( TQWidget *parent ) } -void ProgressBase::setJob( KIO::Job *job ) +void ProgressBase::setJob( TDEIO::Job *job ) { // first connect all slots - connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) ); + connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; } -void ProgressBase::setJob( KIO::CopyJob *job ) +void ProgressBase::setJob( TDEIO::CopyJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( copying( KIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotCopying( KIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( moving( KIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotMoving( KIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( creatingDir( KIO::Job*, const KURL& ) ), - TQT_SLOT( slotCreatingDir( KIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), + TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), + TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), + TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; } -void ProgressBase::setJob( KIO::DeleteJob *job ) +void ProgressBase::setJob( TDEIO::DeleteJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( deleting( KIO::Job*, const KURL& ) ), - TQT_SLOT( slotDeleting( KIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ), - TQT_SLOT( slotFinished( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), + TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -150,7 +150,7 @@ void ProgressBase::finished() { } } -void ProgressBase::slotFinished( KIO::Job* ) { +void ProgressBase::slotFinished( TDEIO::Job* ) { finished(); } diff --git a/kio/kio/progressbase.h b/kio/kio/progressbase.h index d9e3d8f96..cbcab06be 100644 --- a/kio/kio/progressbase.h +++ b/kio/kio/progressbase.h @@ -24,13 +24,13 @@ #include class KURL; -namespace KIO { +namespace TDEIO { class Job; class CopyJob; class DeleteJob; } -namespace KIO +namespace TDEIO { enum Progress { DEFAULT = 1, @@ -53,7 +53,7 @@ namespace KIO * Custom progress dialog will be used like this : * \code * // create job -* CopyJob* job = KIO::copy(...); +* CopyJob* job = TDEIO::copy(...); * // create a dialog * MyCustomProgress *customProgress; * customProgress = new MyCustomProgress(); @@ -81,20 +81,20 @@ public: ~ProgressBase() {} /** - * Assign a KIO::Job to this progress dialog. + * Assign a TDEIO::Job to this progress dialog. * @param job the job to assign */ - void setJob( KIO::Job *job ); + void setJob( TDEIO::Job *job ); /** - * Assign a KIO::Job to this progress dialog. + * Assign a TDEIO::Job to this progress dialog. * @param job the job to assign */ - void setJob( KIO::CopyJob *job ); + void setJob( TDEIO::CopyJob *job ); /** - * Assign a KIO::Job to this progress dialog. + * Assign a TDEIO::Job to this progress dialog. * @param job the job to assign */ - void setJob( KIO::DeleteJob *job ); + void setJob( TDEIO::DeleteJob *job ); // should we stop the job when the dialog is closed ? void setStopOnClose( bool stopOnClose ) { m_bStopOnClose = stopOnClose; } @@ -103,7 +103,7 @@ public: // should we delete the dialog or just clean it when the job is finished ? /** * This controls whether the dialog should be deleted or only cleaned when - * the KIO::Job is finished (or canceled). + * the TDEIO::Job is finished (or canceled). * * If your dialog is an embedded widget and not a separate window, you should * setOnlyClean(true) in the constructor of your custom dialog. @@ -143,101 +143,101 @@ public slots: // progress slots /** * Called to set the total size. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param size the total size in bytes */ - virtual void slotTotalSize( KIO::Job* job, KIO::filesize_t size ) { + virtual void slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size ) { Q_UNUSED(job);Q_UNUSED(size);} /** * Called to set the total number of files. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param files the number of files */ - virtual void slotTotalFiles( KIO::Job* job, unsigned long files ) { + virtual void slotTotalFiles( TDEIO::Job* job, unsigned long files ) { Q_UNUSED(job);Q_UNUSED(files);} /** * Called to set the total number of directories. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param dirs the number of directories */ - virtual void slotTotalDirs( KIO::Job* job, unsigned long dirs ) { + virtual void slotTotalDirs( TDEIO::Job* job, unsigned long dirs ) { Q_UNUSED(job);Q_UNUSED(dirs);} /** * Called to set the processed size. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param bytes the processed size in bytes */ - virtual void slotProcessedSize( KIO::Job* job, KIO::filesize_t bytes ) { + virtual void slotProcessedSize( TDEIO::Job* job, TDEIO::filesize_t bytes ) { Q_UNUSED(job);Q_UNUSED(bytes);} /** * Called to set the number of processed files. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param files the number of files */ - virtual void slotProcessedFiles( KIO::Job* job, unsigned long files ) { + virtual void slotProcessedFiles( TDEIO::Job* job, unsigned long files ) { Q_UNUSED(job);Q_UNUSED(files);} /** * Called to set the number of processed directories. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param dirs the number of directories */ - virtual void slotProcessedDirs( KIO::Job* job, unsigned long dirs ) { + virtual void slotProcessedDirs( TDEIO::Job* job, unsigned long dirs ) { Q_UNUSED(job);Q_UNUSED(dirs);} /** * Called to set the speed. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param speed the speed in bytes/second */ - virtual void slotSpeed( KIO::Job* job, unsigned long speed ) { + virtual void slotSpeed( TDEIO::Job* job, unsigned long speed ) { Q_UNUSED(job);Q_UNUSED(speed);} /** * Called to set the percentage. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param percent the percentage */ - virtual void slotPercent( KIO::Job* job, unsigned long percent ) { + virtual void slotPercent( TDEIO::Job* job, unsigned long percent ) { Q_UNUSED(job);Q_UNUSED(percent);} /** * Called when the job is copying. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param src the source of the operation * @param dest the destination of the operation */ - virtual void slotCopying( KIO::Job* job, const KURL& src, const KURL& dest ) { + virtual void slotCopying( TDEIO::Job* job, const KURL& src, const KURL& dest ) { Q_UNUSED(job);Q_UNUSED(src);Q_UNUSED(dest);} /** * Called when the job is moving. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param src the source of the operation * @param dest the destination of the operation */ - virtual void slotMoving( KIO::Job* job, const KURL& src, const KURL& dest ) { + virtual void slotMoving( TDEIO::Job* job, const KURL& src, const KURL& dest ) { Q_UNUSED(job);Q_UNUSED(src);Q_UNUSED(dest);} /** * Called when the job is deleting. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param url the URL to delete */ - virtual void slotDeleting( KIO::Job* job, const KURL& url) { + virtual void slotDeleting( TDEIO::Job* job, const KURL& url) { Q_UNUSED(job);Q_UNUSED(url);} /** * Called when the job is creating a directory. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param dir the URL of the directory to create */ - virtual void slotCreatingDir( KIO::Job* job, const KURL& dir ) { + virtual void slotCreatingDir( TDEIO::Job* job, const KURL& dir ) { Q_UNUSED(job);Q_UNUSED(dir);} /** * Called when the job is resuming.. - * @param job the KIO::Job + * @param job the TDEIO::Job * @param from the position to resume from in bytes */ - virtual void slotCanResume( KIO::Job* job, KIO::filesize_t from) { + virtual void slotCanResume( TDEIO::Job* job, TDEIO::filesize_t from) { Q_UNUSED(job);Q_UNUSED(from);} signals: @@ -247,13 +247,13 @@ signals: void stopped(); protected slots: - void slotFinished( KIO::Job* ); + void slotFinished( TDEIO::Job* ); protected: virtual void closeEvent( TQCloseEvent * ); - KIO::Job* m_pJob; + TDEIO::Job* m_pJob; private: bool m_bOnlyClean; diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index 9eb7a2c73..7bba95460 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -52,7 +52,7 @@ #include #endif -using namespace KIO; +using namespace TDEIO; class RenameDlg::RenameDlgPrivate { @@ -84,14 +84,14 @@ class RenameDlg::RenameDlgPrivate RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, const TQString &_src, const TQString &_dest, RenameDlg_Mode _mode, - KIO::filesize_t sizeSrc, - KIO::filesize_t sizeDest, + TDEIO::filesize_t sizeSrc, + TDEIO::filesize_t sizeDest, time_t ctimeSrc, time_t ctimeDest, time_t mtimeSrc, time_t mtimeDest, bool _modal) - : TQDialog ( parent, "KIO::RenameDialog" , _modal ) + : TQDialog ( parent, "TDEIO::RenameDialog" , _modal ) { d = new RenameDlgPrivate( ); d->modal = _modal; @@ -243,9 +243,9 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, gridLayout->addMultiCellWidget( lb1, 1, 3, 0, 0 ); // takes the first column on rows 1-3 int row = 1; - if ( sizeDest != (KIO::filesize_t)-1 ) + if ( sizeDest != (TDEIO::filesize_t)-1 ) { - TQLabel * lb = new TQLabel( i18n("size %1").arg( KIO::convertSize(sizeDest) ), this ); + TQLabel * lb = new TQLabel( i18n("size %1").arg( TDEIO::convertSize(sizeDest) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; @@ -279,9 +279,9 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, row = 6; - if ( sizeSrc != (KIO::filesize_t)-1 ) + if ( sizeSrc != (TDEIO::filesize_t)-1 ) { - TQLabel * lb = new TQLabel( i18n("size %1").arg( KIO::convertSize(sizeSrc) ), this ); + TQLabel * lb = new TQLabel( i18n("size %1").arg( TDEIO::convertSize(sizeSrc) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } @@ -323,7 +323,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, d->m_pLineEdit = new TQLineEdit( this ); layout2->addWidget( d->m_pLineEdit ); TQString fileName = d->dest.fileName(); - d->m_pLineEdit->setText( KIO::decodeFileName( fileName ) ); + d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) ); if ( d->bRename || d->bOverwrite ) connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(enableRenameButton(const TQString &))); @@ -391,7 +391,7 @@ RenameDlg::~RenameDlg() void RenameDlg::enableRenameButton(const TQString &newDest) { - if ( newDest != KIO::decodeFileName( d->dest.fileName() ) && !newDest.isEmpty() ) + if ( newDest != TDEIO::decodeFileName( d->dest.fileName() ) && !newDest.isEmpty() ) { d->bRename->setEnabled( true ); d->bRename->setDefault( true ); @@ -410,7 +410,7 @@ KURL RenameDlg::newDestURL() { KURL newDest( d->dest ); TQString fileName = d->m_pLineEdit->text(); - newDest.setFileName( KIO::encodeFileName( fileName ) ); + newDest.setFileName( TDEIO::encodeFileName( fileName ) ); return newDest; } @@ -523,7 +523,7 @@ static TQString mime( const KURL& src ) { KMimeType::Ptr type = KMimeType::findByURL( src ); //if( type->name() == KMimeType::defaultMimeType() ){ // ok no mimetype - // TQString ty = KIO::NetAccess::mimetype(d->src ); + // TQString ty = TDEIO::NetAccess::mimetype(d->src ); // return ty; return type->name(); } @@ -544,12 +544,12 @@ void RenameDlg::pluginHandling() } -RenameDlg_Result KIO::open_RenameDlg( const TQString & _caption, +RenameDlg_Result TDEIO::open_RenameDlg( const TQString & _caption, const TQString & _src, const TQString & _dest, RenameDlg_Mode _mode, TQString& _new, - KIO::filesize_t sizeSrc, - KIO::filesize_t sizeDest, + TDEIO::filesize_t sizeSrc, + TDEIO::filesize_t sizeDest, time_t ctimeSrc, time_t ctimeDest, time_t mtimeSrc, diff --git a/kio/kio/renamedlg.h b/kio/kio/renamedlg.h index 373abf446..b2347539b 100644 --- a/kio/kio/renamedlg.h +++ b/kio/kio/renamedlg.h @@ -29,7 +29,7 @@ #include -namespace KIO { +namespace TDEIO { // KDE4: get rid of M_OVERWRITE_ITSELF, trigger it internally if src==dest enum RenameDlg_Mode { M_OVERWRITE = 1, M_OVERWRITE_ITSELF = 2, M_SKIP = 4, M_SINGLE = 8, M_MULTI = 16, M_RESUME = 32, M_NORENAME = 64 }; @@ -69,8 +69,8 @@ public: // KDE4: make those KURLs, and use pathOrURL() internally. const TQString & src, const TQString & dest, RenameDlg_Mode mode, - KIO::filesize_t sizeSrc = (KIO::filesize_t) -1, - KIO::filesize_t sizeDest = (KIO::filesize_t) -1, + TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1, + TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1, time_t ctimeSrc = (time_t) -1, time_t ctimeDest = (time_t) -1, time_t mtimeSrc = (time_t) -1, @@ -116,7 +116,7 @@ private: /** * \addtogroup renamedlg "RenameDlg related Functions" * @{ - * \relates KIO::RenameDlg + * \relates TDEIO::RenameDlg * Construct a modal, parent-less "rename" dialog, and return * a result code, as well as the new dest. Much easier to use than the * class RenameDlg directly. @@ -139,8 +139,8 @@ KIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption, // KDE4: make those KURLs const TQString& src, const TQString & dest, RenameDlg_Mode mode, TQString& newDestPath, - KIO::filesize_t sizeSrc = (KIO::filesize_t) -1, - KIO::filesize_t sizeDest = (KIO::filesize_t) -1, + TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1, + TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1, time_t ctimeSrc = (time_t) -1, time_t ctimeDest = (time_t) -1, time_t mtimeSrc = (time_t) -1, diff --git a/kio/kio/renamedlgplugin.h b/kio/kio/renamedlgplugin.h index b4dd8b9fb..ab50e6b6a 100644 --- a/kio/kio/renamedlgplugin.h +++ b/kio/kio/renamedlgplugin.h @@ -43,11 +43,11 @@ public: * This function will be called by RenameDlg. The params are infos about the files. * @return If the plugin want's to display it return true, if not return false */ - virtual bool initialize(KIO::RenameDlg_Mode /*mod*/ , const TQString &/*_src*/, const TQString &/*_dest*/, + virtual bool initialize(TDEIO::RenameDlg_Mode /*mod*/ , const TQString &/*_src*/, const TQString &/*_dest*/, const TQString &/*mimeSrc*/, const TQString &/*mimeDest*/, - KIO::filesize_t /*sizeSrc*/, - KIO::filesize_t /*sizeDest*/, + TDEIO::filesize_t /*sizeSrc*/, + TDEIO::filesize_t /*sizeDest*/, time_t /*ctimeSrc*/, time_t /*ctimeDest*/, time_t /*mtimeSrc*/, diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 9b518b1ef..09560cb8b 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -40,13 +40,13 @@ // to the system wide slave pool. (3 minutes) #define MAX_SLAVE_IDLE (3*60) -using namespace KIO; +using namespace TDEIO; -template class TQDict; +template class TQDict; Scheduler *Scheduler::instance = 0; -class KIO::SlaveList: public TQPtrList +class TDEIO::SlaveList: public TQPtrList { public: SlaveList() { } @@ -67,7 +67,7 @@ class KIO::SlaveList: public TQPtrList // We schedule slaves based on (2) but tell the slave about (1) via // Slave::setProtocol(). -class KIO::Scheduler::JobData +class TDEIO::Scheduler::JobData { public: JobData() : checkOnHold(false) { } @@ -78,13 +78,13 @@ public: bool checkOnHold; }; -class KIO::Scheduler::ExtraJobData: public TQPtrDict +class TDEIO::Scheduler::ExtraJobData: public TQPtrDict { public: ExtraJobData() { setAutoDelete(true); } }; -class KIO::Scheduler::ProtocolInfo +class TDEIO::Scheduler::ProtocolInfo { public: ProtocolInfo() : maxSlaves(1), skipCount(0) @@ -99,16 +99,16 @@ public: TQString protocol; }; -class KIO::Scheduler::ProtocolInfoDict : public TQDict +class TDEIO::Scheduler::ProtocolInfoDict : public TQDict { public: ProtocolInfoDict() { } - KIO::Scheduler::ProtocolInfo *get( const TQString &protocol); + TDEIO::Scheduler::ProtocolInfo *get( const TQString &protocol); }; -KIO::Scheduler::ProtocolInfo * -KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol) +TDEIO::Scheduler::ProtocolInfo * +TDEIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol) { ProtocolInfo *info = find(protocol); if (!info) @@ -124,7 +124,7 @@ KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol) Scheduler::Scheduler() - : DCOPObject( "KIO::Scheduler" ), + : DCOPObject( "TDEIO::Scheduler" ), TQObject(kapp, "scheduler"), slaveTimer(0, "Scheduler::slaveTimer"), coSlaveTimer(0, "Scheduler::coSlaveTimer"), @@ -211,7 +211,7 @@ void Scheduler::_doJob(SimpleJob *job) { slaveTimer.start(0, true); #ifndef NDEBUG if (newJobs.count() > 150) - kdDebug() << "WARNING - KIO::Scheduler got more than 150 jobs! This shows a misuse in your app (yes, a job is a TQObject)." << endl; + kdDebug() << "WARNING - TDEIO::Scheduler got more than 150 jobs! This shows a misuse in your app (yes, a job is a TQObject)." << endl; #endif } @@ -272,7 +272,7 @@ void Scheduler::startStep() { (void) startJobDirect(); } - TQDictIterator it(*protInfoDict); + TQDictIterator it(*protInfoDict); while(it.current()) { if (startJobScheduled(it.current())) return; @@ -280,7 +280,7 @@ void Scheduler::startStep() } } -void Scheduler::setupSlave(KIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const KIO::MetaData *config) +void Scheduler::setupSlave(TDEIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const TDEIO::MetaData *config) { TQString host = url.host(); int port = url.port(); @@ -497,13 +497,13 @@ Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) { // Make sure that the job wants to do a GET or a POST, and with no offset bool bCanReuse = (job->command() == CMD_GET); - KIO::TransferJob * tJob = dynamic_cast(job); + TDEIO::TransferJob * tJob = dynamic_cast(job); if ( tJob ) { bCanReuse = (job->command() == CMD_GET || job->command() == CMD_SPECIAL); if ( bCanReuse ) { - KIO::MetaData outgoing = tJob->outgoingMetaData(); + TDEIO::MetaData outgoing = tJob->outgoingMetaData(); TQString resume = (!outgoing.contains("resume")) ? TQString() : outgoing["resume"]; kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl; bCanReuse = (resume.isEmpty() || resume == "0"); @@ -541,8 +541,8 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL { slaveList->append(slave); idleSlaves->append(slave); - connect(slave, TQT_SIGNAL(slaveDied(KIO::Slave *)), - TQT_SLOT(slotSlaveDied(KIO::Slave *))); + connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)), + TQT_SLOT(slotSlaveDied(TDEIO::Slave *))); connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); @@ -607,7 +607,7 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave) } } -void Scheduler::slotSlaveDied(KIO::Slave *slave) +void Scheduler::slotSlaveDied(TDEIO::Slave *slave) { assert(!slave->isAlive()); ProtocolInfo *protInfo = protInfoDict->get(slave->slaveProtocol()); @@ -662,7 +662,7 @@ void Scheduler::_scheduleCleanup() } } -void Scheduler::_putSlaveOnHold(KIO::SimpleJob *job, const KURL &url) +void Scheduler::_putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url) { Slave *slave = job->slave(); slave->disconnect(job); @@ -695,7 +695,7 @@ void Scheduler::_removeSlaveOnHold() } Slave * -Scheduler::_getConnectedSlave(const KURL &url, const KIO::MetaData &config ) +Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config ) { TQString proxy; TQString protocol = KProtocolManager::slaveProtocol(url, proxy); @@ -792,7 +792,7 @@ Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg) } bool -Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) +Scheduler::_assignJobToSlave(TDEIO::Slave *slave, SimpleJob *job) { // kdDebug(7006) << "_assignJobToSlave( " << job << ", " << slave << ")" << endl; TQString dummy; @@ -822,7 +822,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) } bool -Scheduler::_disconnectSlave(KIO::Slave *slave) +Scheduler::_disconnectSlave(TDEIO::Slave *slave) { // kdDebug(7006) << "_disconnectSlave( " << slave << ")" << endl; JobList *list = coSlaves.take(slave); diff --git a/kio/kio/scheduler.h b/kio/kio/scheduler.h index 4a4f104ba..9871cd1c2 100644 --- a/kio/kio/scheduler.h +++ b/kio/kio/scheduler.h @@ -30,7 +30,7 @@ #include -namespace KIO { +namespace TDEIO { class Slave; class SlaveList; @@ -38,7 +38,7 @@ namespace KIO { class SessionData; /** - * The KIO::Scheduler manages io-slaves for the application. + * The TDEIO::Scheduler manages io-slaves for the application. * It also queues jobs and assigns the job to a slave when one * becomes available. * @@ -46,12 +46,12 @@ namespace KIO { * *

      1. Direct

      * This is the default. When you create a job the - * KIO::Scheduler will be notified and will find either an existing + * TDEIO::Scheduler will be notified and will find either an existing * slave that is idle or it will create a new slave for the job. * * Example: * \code - * TransferJob *job = KIO::get(KURL("http://www.kde.org")); + * TransferJob *job = TDEIO::get(KURL("http://www.kde.org")); * \endcode * * @@ -64,8 +64,8 @@ namespace KIO { * * Example: * \code - * TransferJob *job = KIO::get(KURL("http://www.kde.org")); - * KIO::Scheduler::scheduleJob(job); + * TransferJob *job = TDEIO::get(KURL("http://www.kde.org")); + * TDEIO::Scheduler::scheduleJob(job); * \endcode * *

      3. Connection Oriented

      @@ -80,32 +80,32 @@ namespace KIO { * * Example: * \code - * Slave *slave = KIO::Scheduler::getConnectedSlave( + * Slave *slave = TDEIO::Scheduler::getConnectedSlave( * KURL("pop3://bastian:password@mail.kde.org")); - * TransferJob *job1 = KIO::get( + * TransferJob *job1 = TDEIO::get( * KURL("pop3://bastian:password@mail.kde.org/msg1")); - * KIO::Scheduler::assignJobToSlave(slave, job1); - * TransferJob *job2 = KIO::get( + * TDEIO::Scheduler::assignJobToSlave(slave, job1); + * TransferJob *job2 = TDEIO::get( * KURL("pop3://bastian:password@mail.kde.org/msg2")); - * KIO::Scheduler::assignJobToSlave(slave, job2); - * TransferJob *job3 = KIO::get( + * TDEIO::Scheduler::assignJobToSlave(slave, job2); + * TransferJob *job3 = TDEIO::get( * KURL("pop3://bastian:password@mail.kde.org/msg3")); - * KIO::Scheduler::assignJobToSlave(slave, job3); + * TDEIO::Scheduler::assignJobToSlave(slave, job3); * * // ... Wait for jobs to finish... * - * KIO::Scheduler::disconnectSlave(slave); + * TDEIO::Scheduler::disconnectSlave(slave); * \endcode * * Note that you need to explicitly disconnect the slave when the * connection goes down, so your error handler should contain: * \code - * if (error == KIO::ERR_CONNECTION_BROKEN) - * KIO::Scheduler::disconnectSlave(slave); + * if (error == TDEIO::ERR_CONNECTION_BROKEN) + * TDEIO::Scheduler::disconnectSlave(slave); * \endcode * - * @see KIO::Slave - * @see KIO::Job + * @see TDEIO::Slave + * @see TDEIO::Job **/ class KIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject { @@ -150,7 +150,7 @@ namespace KIO { * @param job the finished job * @param slave the slave that executed the @p job */ - static void jobFinished(KIO::SimpleJob *job, KIO::Slave *slave) + static void jobFinished(TDEIO::SimpleJob *job, TDEIO::Slave *slave) { self()->_jobFinished(job, slave); } /** @@ -164,7 +164,7 @@ namespace KIO { * @param job the job that should be stopped * @param url the URL that is handled by the @p url */ - static void putSlaveOnHold(KIO::SimpleJob *job, const KURL &url) + static void putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url) { self()->_putSlaveOnHold(job, url); } /** @@ -193,7 +193,7 @@ namespace KIO { * @see assignJobToSlave() * @see disconnectSlave() */ - static KIO::Slave *getConnectedSlave(const KURL &url, const KIO::MetaData &config = MetaData() ) + static TDEIO::Slave *getConnectedSlave(const KURL &url, const TDEIO::MetaData &config = MetaData() ) { return self()->_getConnectedSlave(url, config); } /* @@ -212,7 +212,7 @@ namespace KIO { * @see slaveConnected() * @see slaveError() */ - static bool assignJobToSlave(KIO::Slave *slave, KIO::SimpleJob *job) + static bool assignJobToSlave(TDEIO::Slave *slave, TDEIO::SimpleJob *job) { return self()->_assignJobToSlave(slave, job); } /* @@ -227,7 +227,7 @@ namespace KIO { * @see getConnectedSlave * @see assignJobToSlave */ - static bool disconnectSlave(KIO::Slave *slave) + static bool disconnectSlave(TDEIO::Slave *slave) { return self()->_disconnectSlave(slave); } /** @@ -236,7 +236,7 @@ namespace KIO { * the that was started. * Register the mainwindow @p wid with the KIO subsystem * Do not call this, it is called automatically from - * void KIO::Job::setWindow(TQWidget*). + * void TDEIO::Job::setWindow(TQWidget*). * @param wid the window to register * @since 3.1 */ @@ -287,15 +287,15 @@ namespace KIO { virtual QCStringList functions(); public slots: - void slotSlaveDied(KIO::Slave *slave); + void slotSlaveDied(TDEIO::Slave *slave); void slotSlaveStatus(pid_t pid, const TQCString &protocol, const TQString &host, bool connected); signals: - void slaveConnected(KIO::Slave *slave); - void slaveError(KIO::Slave *slave, int error, const TQString &errorMsg); + void slaveConnected(TDEIO::Slave *slave); + void slaveError(TDEIO::Slave *slave, int error, const TQString &errorMsg); protected: - void setupSlave(KIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const KIO::MetaData *config=0); + void setupSlave(TDEIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const TDEIO::MetaData *config=0); bool startJobScheduled(ProtocolInfo *protInfo); bool startJobDirect(); Scheduler(); @@ -319,13 +319,13 @@ namespace KIO { void _doJob(SimpleJob *job); void _scheduleJob(SimpleJob *job); void _cancelJob(SimpleJob *job); - void _jobFinished(KIO::SimpleJob *job, KIO::Slave *slave); + void _jobFinished(TDEIO::SimpleJob *job, TDEIO::Slave *slave); void _scheduleCleanup(); - void _putSlaveOnHold(KIO::SimpleJob *job, const KURL &url); + void _putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url); void _removeSlaveOnHold(); - Slave *_getConnectedSlave(const KURL &url, const KIO::MetaData &metaData ); - bool _assignJobToSlave(KIO::Slave *slave, KIO::SimpleJob *job); - bool _disconnectSlave(KIO::Slave *slave); + Slave *_getConnectedSlave(const KURL &url, const TDEIO::MetaData &metaData ); + bool _assignJobToSlave(TDEIO::Slave *slave, TDEIO::SimpleJob *job); + bool _disconnectSlave(TDEIO::Slave *slave); void _checkSlaveOnHold(bool b); void _publishSlaveOnHold(); void _registerWindow(TQWidget *wid); diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index d3c398fc4..e2517cc73 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -37,7 +37,7 @@ #include "sessiondata.h" #include "sessiondata.moc" -namespace KIO { +namespace TDEIO { /***************************** SessionData::AuthData ************************/ struct SessionData::AuthData @@ -264,7 +264,7 @@ void SessionData::reset() { d->initDone = true; // Get Cookie settings... - KConfig* cfg = new KConfig("kcookiejarrc", true, false); + TDEConfig* cfg = new TDEConfig("kcookiejarrc", true, false); cfg->setGroup( "Cookie Policy" ); d->useCookie = cfg->readBoolEntry( "Cookies", true ); delete cfg; diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h index 80433679c..80b28ace6 100644 --- a/kio/kio/sessiondata.h +++ b/kio/kio/sessiondata.h @@ -24,7 +24,7 @@ #include #include -namespace KIO { +namespace TDEIO { class SlaveConfig; @@ -40,7 +40,7 @@ public: SessionData(); ~SessionData(); - virtual void configDataFor( KIO::MetaData &configData, const TQString &proto, + virtual void configDataFor( TDEIO::MetaData &configData, const TQString &proto, const TQString &host ); virtual void reset(); diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp index 0fe7b230b..f4a14a229 100644 --- a/kio/kio/skipdlg.cpp +++ b/kio/kio/skipdlg.cpp @@ -36,7 +36,7 @@ #include #endif -using namespace KIO; +using namespace TDEIO; SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, bool _modal ) : KDialog ( parent, "" , _modal ) @@ -132,7 +132,7 @@ void SkipDlg::b2Pressed() emit result( this, 2 ); } -SkipDlg_Result KIO::open_SkipDlg( bool _multi, const TQString& _error_text ) +SkipDlg_Result TDEIO::open_SkipDlg( bool _multi, const TQString& _error_text ) { Q_ASSERT(kapp); diff --git a/kio/kio/skipdlg.h b/kio/kio/skipdlg.h index dbf583ef0..e1199de97 100644 --- a/kio/kio/skipdlg.h +++ b/kio/kio/skipdlg.h @@ -25,7 +25,7 @@ class TQPushButton; class TQWidget; -namespace KIO { +namespace TDEIO { enum SkipDlg_Result { S_SKIP = 1, S_AUTO_SKIP = 2, S_CANCEL = 0 }; diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index 8306c8650..6e834f5fa 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -59,7 +59,7 @@ #define _PATH_TMP "/tmp" #endif -using namespace KIO; +using namespace TDEIO; #define SLAVE_CONNECTION_TIMEOUT_MIN 2 @@ -73,7 +73,7 @@ using namespace KIO; #define SLAVE_CONNECTION_TIMEOUT_MAX 3600 #endif -namespace KIO { +namespace TDEIO { /** * @internal @@ -87,7 +87,7 @@ namespace KIO { }; } -void Slave::accept(KSocket *socket) +void Slave::accept(TDESocket *socket) { #ifndef Q_WS_WIN slaveconn.init(socket); @@ -138,7 +138,7 @@ void Slave::timeout() deref(); } -Slave::Slave(KServerSocket *socket, const TQString &protocol, const TQString &socketname) +Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString &socketname) : SlaveInterface(&slaveconn), serv(socket), contacted(false), d(new SlavePrivate(false)) { @@ -152,12 +152,12 @@ Slave::Slave(KServerSocket *socket, const TQString &protocol, const TQString &so m_pid = 0; m_port = 0; #ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( KSocket* )), - TQT_SLOT(accept(KSocket*) ) ); + connect(serv, TQT_SIGNAL(accepted( TDESocket* )), + TQT_SLOT(accept(TDESocket*) ) ); #endif } -Slave::Slave(bool /*derived*/, KServerSocket *socket, const TQString &protocol, +Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol, const TQString &socketname) : SlaveInterface(&slaveconn), serv(socket), contacted(false), d(new SlavePrivate(true)) @@ -174,8 +174,8 @@ Slave::Slave(bool /*derived*/, KServerSocket *socket, const TQString &protocol, m_port = 0; if (serv != 0) { #ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( KSocket* )), - TQT_SLOT(accept(KSocket*) ) ); + connect(serv, TQT_SIGNAL(accepted( TDESocket* )), + TQT_SLOT(accept(TDESocket*) ) ); #endif } } @@ -368,7 +368,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if ( socketfile.status() != 0 ) { error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno)); - error = KIO::ERR_CANNOT_LAUNCH_PROCESS; + error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS; return 0; } @@ -377,7 +377,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error #endif #ifndef Q_WS_WIN - KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data()); + TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); #else @@ -399,7 +399,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (_name.isEmpty()) { error_text = i18n("Unknown protocol '%1'.").arg(protocol); - error = KIO::ERR_CANNOT_LAUNCH_PROCESS; + error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS; delete slave; return 0; } @@ -407,7 +407,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (lib_path.isEmpty()) { error_text = i18n("Can not find io-slave for protocol '%1'.").arg(protocol); - error = KIO::ERR_CANNOT_LAUNCH_PROCESS; + error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS; return 0; } @@ -435,7 +435,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (!client->call(launcher, launcher, "requestSlave(TQString,TQString,TQString)", params, replyType, reply)) { error_text = i18n("Cannot talk to klauncher"); - error = KIO::ERR_SLAVE_DEFINED; + error = TDEIO::ERR_SLAVE_DEFINED; delete slave; return 0; } @@ -446,7 +446,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (!pid) { error_text = i18n("Unable to create io-slave:\nklauncher said: %1").arg(errorStr); - error = KIO::ERR_CANNOT_LAUNCH_PROCESS; + error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS; delete slave; return 0; } @@ -479,7 +479,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) #endif #ifndef Q_WS_WIN - KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data()); + TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); #else @@ -513,7 +513,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) } void Slave::virtual_hook( int id, void* data ) { - KIO::SlaveInterface::virtual_hook( id, data ); + TDEIO::SlaveInterface::virtual_hook( id, data ); } #include "slave.moc" diff --git a/kio/kio/slave.h b/kio/kio/slave.h index e5cdc332c..bbede6637 100644 --- a/kio/kio/slave.h +++ b/kio/kio/slave.h @@ -32,16 +32,16 @@ #include "kio/slaveinterface.h" #include "kio/connection.h" -class KServerSocket; -class KSocket; +class TDEServerSocket; +class TDESocket; -namespace KIO { +namespace TDEIO { - /** Attention developers: If you change the implementation of KIO::Slave, - * do *not* use connection() or slaveconn but the respective KIO::Slave + /** Attention developers: If you change the implementation of TDEIO::Slave, + * do *not* use connection() or slaveconn but the respective TDEIO::Slave * accessor methods. Otherwise classes derived from Slave might break. (LS) */ - class KIO_EXPORT Slave : public KIO::SlaveInterface + class KIO_EXPORT Slave : public TDEIO::SlaveInterface { Q_OBJECT @@ -53,11 +53,11 @@ namespace KIO { * @internal * @since 3.2 */ - Slave(bool derived, KServerSocket *unixdomain, const TQString &protocol, + Slave(bool derived, TDEServerSocket *unixdomain, const TQString &protocol, const TQString &socketname); // TODO(BIC): Remove in KDE 4 public: - Slave(KServerSocket *unixdomain, + Slave(TDEServerSocket *unixdomain, const TQString &protocol, const TQString &socketname); virtual ~Slave(); @@ -202,7 +202,7 @@ namespace KIO { void setConnected(bool c) { contacted = c; } /** @deprecated This method is obsolete, use the accessor methods - * within KIO::Slave instead. Old code directly accessing connection() + * within TDEIO::Slave instead. Old code directly accessing connection() * will not be able to access special protocols. */ KDE_DEPRECATED Connection *connection() { return &slaveconn; } // TODO(BIC): remove before KDE 4 @@ -211,11 +211,11 @@ namespace KIO { void deref() { m_refCount--; if (!m_refCount) delete this; } public slots: - void accept(KSocket *socket); + void accept(TDESocket *socket); void gotInput(); void timeout(); signals: - void slaveDied(KIO::Slave *slave); + void slaveDied(TDEIO::Slave *slave); protected: void unlinkSocket(); @@ -227,14 +227,14 @@ namespace KIO { int m_port; TQString m_user; TQString m_passwd; - KServerSocket *serv; + TDEServerSocket *serv; TQString m_socket; pid_t m_pid; bool contacted; bool dead; time_t contact_started; time_t idle_since; - KIO::Connection slaveconn; + TDEIO::Connection slaveconn; int m_refCount; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index d2e807077..07d784527 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -66,7 +66,7 @@ #endif #endif -using namespace KIO; +using namespace TDEIO; template class TQPtrList >; typedef TQValueList AuthKeysList; @@ -74,9 +74,9 @@ typedef TQMap AuthKeysMap; #define KIO_DATA TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream #define KIO_FILESIZE_T(x) (unsigned long)(x & 0xffffffff) << (unsigned long)(x >> 32) -namespace KIO { +namespace TDEIO { -class SlaveBaseConfig : public KConfigBase +class SlaveBaseConfig : public TDEConfigBase { public: SlaveBaseConfig(SlaveBase *_slave) @@ -124,8 +124,8 @@ public: KURL onHoldUrl; struct timeval last_tv; - KIO::filesize_t totalSize; - KIO::filesize_t sentListEntries; + TDEIO::filesize_t totalSize; + TDEIO::filesize_t sentListEntries; DCOPClient *dcopClient; KRemoteEncoding *remotefile; time_t timeout; @@ -341,8 +341,8 @@ void SlaveBase::dispatchLoop() void SlaveBase::connectSlave(const TQString& path) { -#ifdef Q_OS_UNIX //TODO: KSocket not yet available on WIN32 - appconn->init(new KSocket(TQFile::encodeName(path).data())); +#ifdef Q_OS_UNIX //TODO: TDESocket not yet available on WIN32 + appconn->init(new TDESocket(TQFile::encodeName(path).data())); if (!appconn->inited()) { kdDebug(7019) << "SlaveBase: failed to connect to " << path << endl; @@ -389,7 +389,7 @@ bool SlaveBase::hasMetaData(const TQString &key) { return const_cast(this)->hasMetaData( key ); } -KConfigBase *SlaveBase::config() +TDEConfigBase *SlaveBase::config() { return d->config; } @@ -485,7 +485,7 @@ void SlaveBase::canResume() m_pConnection->send( MSG_CANRESUME ); } -void SlaveBase::totalSize( KIO::filesize_t _bytes ) +void SlaveBase::totalSize( TDEIO::filesize_t _bytes ) { KIO_DATA << KIO_FILESIZE_T(_bytes); slaveWriteError = false; @@ -501,7 +501,7 @@ void SlaveBase::totalSize( KIO::filesize_t _bytes ) d->sentListEntries=0; } -void SlaveBase::processedSize( KIO::filesize_t _bytes ) +void SlaveBase::processedSize( TDEIO::filesize_t _bytes ) { bool emitSignal=false; struct timeval tv; @@ -872,7 +872,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg ) else stream << info << errorMsg << windowId << s_seqNr << userTimestamp; - bool callOK = d->dcopClient->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo, TQString, long int, long int, unsigned long int)", + bool callOK = d->dcopClient->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo, TQString, long int, long int, unsigned long int)", params, replyType, reply ); if (progressId) @@ -884,7 +884,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg ) return false; } - if ( replyType == "KIO::AuthInfo" ) + if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream stream2( reply, IO_ReadOnly ); stream2 >> authResult >> s_seqNr; @@ -892,7 +892,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg ) else { kdError(7019) << "DCOP function queryAuthInfo(...) returns " - << replyType << ", expected KIO::AuthInfo" << endl; + << replyType << ", expected TDEIO::AuthInfo" << endl; return false; } @@ -930,9 +930,9 @@ int SlaveBase::messageBox( const TQString &text, MessageBoxType type, const TQSt return 0; // communication failure } -bool SlaveBase::canResume( KIO::filesize_t offset ) +bool SlaveBase::canResume( TDEIO::filesize_t offset ) { - kdDebug(7019) << "SlaveBase::canResume offset=" << KIO::number(offset) << endl; + kdDebug(7019) << "SlaveBase::canResume offset=" << TDEIO::number(offset) << endl; d->needSendCanResume = false; KIO_DATA << KIO_FILESIZE_T(offset); m_pConnection->send( MSG_RESUME, data ); @@ -1216,14 +1216,14 @@ bool SlaveBase::checkCachedAuthentication( AuthInfo& info ) TQDataStream stream(params, IO_WriteOnly); stream << info << windowId << userTimestamp; - if ( !d->dcopClient->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int, unsigned long int)", + if ( !d->dcopClient->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int, unsigned long int)", params, replyType, reply ) ) { kdWarning(7019) << "Can't communicate with kded_kpasswdserver!" << endl; return false; } - if ( replyType == "KIO::AuthInfo" ) + if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream stream2( reply, IO_ReadOnly ); stream2 >> authResult; @@ -1231,7 +1231,7 @@ bool SlaveBase::checkCachedAuthentication( AuthInfo& info ) else { kdError(7019) << "DCOP function checkAuthInfo(...) returns " - << replyType << ", expected KIO::AuthInfo" << endl; + << replyType << ", expected TDEIO::AuthInfo" << endl; return false; } if (!authResult.isModified()) @@ -1253,7 +1253,7 @@ bool SlaveBase::cacheAuthentication( const AuthInfo& info ) TQDataStream stream(params, IO_WriteOnly); stream << info << windowId; - d->dcopClient->send( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo, long int)", params ); + d->dcopClient->send( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo, long int)", params ); return true; } diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index b6e48d5b6..332646875 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -28,7 +28,7 @@ class DCOPClient; class KRemoteEncoding; -namespace KIO { +namespace TDEIO { class Connection; class SlaveBasePrivate; @@ -93,7 +93,7 @@ public: * Call to signal an error. * This also finishes the job, no need to call finished. * - * If the Error code is KIO::ERR_SLAVE_DEFINED then the + * If the Error code is TDEIO::ERR_SLAVE_DEFINED then the * _text should contain the complete translated text of * of the error message. This message will be displayed * in an KTextBrowser which allows rich text complete @@ -101,9 +101,9 @@ public: * mailer, "exec:/command arg1 arg2" will be forked and * all other links will call the default browser. * - * @see KIO::Error + * @see TDEIO::Error * @see KTextBrowser - * @param _errid the error code from KIO::Error + * @param _errid the error code from TDEIO::Error * @param _text the rich text error message */ void error( int _errid, const TQString &_text ); @@ -154,7 +154,7 @@ public: * In this case, the boolean returns whether we can indeed resume or not * (we can't if the protocol doing the get() doesn't support setting an offset) */ - bool canResume( KIO::filesize_t offset ); + bool canResume( TDEIO::filesize_t offset ); /* * Call this at the beginning of get(), if the "resume" metadata was set @@ -171,13 +171,13 @@ public: * of the file * Call in listDir too, when you know the total number of items. */ - void totalSize( KIO::filesize_t _bytes ); + void totalSize( TDEIO::filesize_t _bytes ); /** * Call this during get and copy, once in a while, * to give some info about the current state. * Don't emit it in listDir, listEntries speaks for itself. */ - void processedSize( KIO::filesize_t _bytes ); + void processedSize( TDEIO::filesize_t _bytes ); /** * Only use this if you can't know in advance the size of the @@ -317,7 +317,7 @@ public: * The application provides the slave with all configuration information * relevant for the current protocol and host. */ - KConfigBase* config(); + TDEConfigBase* config(); /** * Returns an object that can translate remote filenames into proper @@ -621,7 +621,7 @@ public: * simple example: * * \code - * KIO::AuthInfo authInfo; + * TDEIO::AuthInfo authInfo; * if ( openPassDlg( authInfo ) ) * { * kdDebug() << TQString::fromLatin1("User: ") @@ -635,7 +635,7 @@ public: * comment as follows: * * \code - * KIO::AuthInfo authInfo; + * TDEIO::AuthInfo authInfo; * authInfo.caption= "Acme Password Dialog"; * authInfo.username= "Wile E. Coyote"; * TQString errorMsg = "You entered an incorrect password."; @@ -661,13 +661,13 @@ public: * @return @p true if user clicks on "OK", @p false otherwsie. * @since 3.1 */ - bool openPassDlg( KIO::AuthInfo& info, const TQString &errorMsg ); + bool openPassDlg( TDEIO::AuthInfo& info, const TQString &errorMsg ); /** * Same as above function except it does not need error message. * BIC: Combine this function with the above for KDE4. */ - bool openPassDlg( KIO::AuthInfo& info ); + bool openPassDlg( TDEIO::AuthInfo& info ); /** * Checks for cached authentication based on parameters diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index 9ce4a86a0..c0ec44779 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -31,9 +31,9 @@ #include "slaveconfig.h" -using namespace KIO; +using namespace TDEIO; -namespace KIO { +namespace TDEIO { class SlaveConfigProtocol { @@ -47,10 +47,10 @@ public: public: MetaData global; TQDict host; - KConfig *configFile; + TDEConfig *configFile; }; -static void readConfig(KConfig *config, const TQString & group, MetaData *metaData) +static void readConfig(TDEConfig *config, const TQString & group, MetaData *metaData) { *metaData += config->entryMap(group); } @@ -71,7 +71,7 @@ void SlaveConfigPrivate::readGlobalConfig() { global.clear(); // Read stuff... - KConfig *config = KProtocolManager::config(); + TDEConfig *config = KProtocolManager::config(); readConfig(TDEGlobal::config(), "Socks", &global); // Socks settings. if ( config ) readConfig(config, "", &global); @@ -84,7 +84,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_pro { TQString filename = KProtocolInfo::config(_protocol); scp = new SlaveConfigProtocol; - scp->configFile = new KConfig(filename, true, false); + scp->configFile = new TDEConfig(filename, true, false); protocol.insert(_protocol, scp); } // Read global stuff... diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h index a7ded457d..59abb74ac 100644 --- a/kio/kio/slaveconfig.h +++ b/kio/kio/slaveconfig.h @@ -24,7 +24,7 @@ #include #include -namespace KIO { +namespace TDEIO { class SlaveConfigPrivate; /** diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp index 05036cf8a..5ba2f6e86 100644 --- a/kio/kio/slaveinterface.cpp +++ b/kio/kio/slaveinterface.cpp @@ -32,10 +32,10 @@ #include #include -using namespace KIO; +using namespace TDEIO; -TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ) +TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e ) { // On 32-bit platforms we send UDS_SIZE with UDS_SIZE_LARGE in front // of it to carry the 32 msb. We can't send a 64 bit UDS_SIZE because @@ -44,21 +44,21 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ) // environment. TQ_UINT32 size = 0; - KIO::UDSEntry::ConstIterator it = e.begin(); + TDEIO::UDSEntry::ConstIterator it = e.begin(); for( ; it != e.end(); ++it ) { size++; - if ((*it).m_uds == KIO::UDS_SIZE) + if ((*it).m_uds == TDEIO::UDS_SIZE) size++; } s << size; it = e.begin(); for( ; it != e.end(); ++it ) { - if ((*it).m_uds == KIO::UDS_SIZE) + if ((*it).m_uds == TDEIO::UDS_SIZE) { - KIO::UDSAtom a; - a.m_uds = KIO::UDS_SIZE_LARGE; + TDEIO::UDSAtom a; + a.m_uds = TDEIO::UDS_SIZE_LARGE; a.m_long = (*it).m_long >> 32; s << a; } @@ -67,7 +67,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ) return s; } -TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) +TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e ) { e.clear(); TQ_UINT32 size; @@ -81,15 +81,15 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) TQ_LLONG msb = 0; for(TQ_UINT32 i = 0; i < size; i++) { - KIO::UDSAtom a; + TDEIO::UDSAtom a; s >> a; - if (a.m_uds == KIO::UDS_SIZE_LARGE) + if (a.m_uds == TDEIO::UDS_SIZE_LARGE) { msb = a.m_long; } else { - if (a.m_uds == KIO::UDS_SIZE) + if (a.m_uds == TDEIO::UDS_SIZE) { if (a.m_long < 0) a.m_long += (TQ_LLONG) 1 << 32; @@ -104,7 +104,7 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) static const unsigned int max_nums = 8; -class KIO::SlaveInterfacePrivate +class TDEIO::SlaveInterfacePrivate { public: SlaveInterfacePrivate() { @@ -120,9 +120,9 @@ public: struct timeval start_time; uint nums; long times[max_nums]; - KIO::filesize_t sizes[max_nums]; + TDEIO::filesize_t sizes[max_nums]; size_t last_time; - KIO::filesize_t filesize, offset; + TDEIO::filesize_t filesize, offset; TQTimer speed_timer; }; @@ -146,16 +146,16 @@ SlaveInterface::~SlaveInterface() delete d; } -static KIO::filesize_t readFilesize_t(TQDataStream &stream) +static TDEIO::filesize_t readFilesize_t(TQDataStream &stream) { - KIO::filesize_t result; + TDEIO::filesize_t result; unsigned long ul; stream >> ul; result = ul; if (stream.atEnd()) return result; stream >> ul; - result += ((KIO::filesize_t)ul) << 32; + result += ((TDEIO::filesize_t)ul) << 32; return result; } @@ -199,7 +199,7 @@ void SlaveInterface::calcSpeed() d->times[d->nums] = diff; d->sizes[d->nums++] = d->filesize - d->offset; - KIO::filesize_t lspeed = 1000 * (d->sizes[d->nums-1] - d->sizes[0]) / (d->times[d->nums-1] - d->times[0]); + TDEIO::filesize_t lspeed = 1000 * (d->sizes[d->nums-1] - d->sizes[0]) / (d->times[d->nums-1] - d->times[0]); // kdDebug() << "proceeed " << (long)d->filesize << " " << diff << " " // << long(d->sizes[d->nums-1] - d->sizes[0]) << " " @@ -293,7 +293,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) case INF_TOTAL_SIZE: { - KIO::filesize_t size = readFilesize_t(stream); + TDEIO::filesize_t size = readFilesize_t(stream); gettimeofday(&d->start_time, 0); d->last_time = 0; d->filesize = d->offset; @@ -307,7 +307,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) break; case INF_PROCESSED_SIZE: { - KIO::filesize_t size = readFilesize_t(stream); + TDEIO::filesize_t size = readFilesize_t(stream); emit processedSize( size ); d->filesize = size; } @@ -423,12 +423,12 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) return true; } -void SlaveInterface::setOffset( KIO::filesize_t o) +void SlaveInterface::setOffset( TDEIO::filesize_t o) { d->offset = o; } -KIO::filesize_t SlaveInterface::offset() const { return d->offset; } +TDEIO::filesize_t SlaveInterface::offset() const { return d->offset; } void SlaveInterface::requestNetwork(const TQString &host, const TQString &slaveid) { @@ -510,7 +510,7 @@ void SlaveInterface::messageBox( int type, const TQString &text, const TQString TQDataStream stream( packedArgs, IO_WriteOnly ); TQString caption( _caption ); - if ( type == KIO::SlaveBase::SSLMessageBox ) + if ( type == TDEIO::SlaveBase::SSLMessageBox ) caption = TQString::fromUtf8(kapp->dcopClient()->appId()); // hack, see observer.cpp emit needProgressId(); diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h index 9d278adfc..79d797e08 100644 --- a/kio/kio/slaveinterface.h +++ b/kio/kio/slaveinterface.h @@ -30,7 +30,7 @@ #include #include -namespace KIO { +namespace TDEIO { class Connection; // better there is one ... @@ -85,7 +85,7 @@ class SlaveInterfacePrivate; /** * There are two classes that specifies the protocol between application - * (KIO::Job) and kioslave. SlaveInterface is the class to use on the application + * (TDEIO::Job) and kioslave. SlaveInterface is the class to use on the application * end, SlaveBase is the one to use on the slave end. * * A call to foo() results in a call to slotFoo() on the other end. @@ -109,8 +109,8 @@ public: */ void sendResumeAnswer( bool resume ); - void setOffset( KIO::filesize_t offset ); - KIO::filesize_t offset() const; + void setOffset( TDEIO::filesize_t offset ); + TDEIO::filesize_t offset() const; signals: /////////// @@ -123,19 +123,19 @@ signals: void connected(); void finished(); void slaveStatus(pid_t, const TQCString &, const TQString &, bool); - void listEntries( const KIO::UDSEntryList& ); - void statEntry( const KIO::UDSEntry& ); + void listEntries( const TDEIO::UDSEntryList& ); + void statEntry( const TDEIO::UDSEntry& ); void needSubURLData(); void needProgressId(); - void canResume( KIO::filesize_t ) ; + void canResume( TDEIO::filesize_t ) ; /////////// // Info sent by the slave ////////// - void metaData( const KIO::MetaData & ); - void totalSize( KIO::filesize_t ) ; - void processedSize( KIO::filesize_t ) ; + void metaData( const TDEIO::MetaData & ); + void totalSize( TDEIO::filesize_t ) ; + void processedSize( TDEIO::filesize_t ) ; void redirection( const KURL& ) ; void localURL( const KURL&, bool ) ; @@ -172,7 +172,7 @@ protected: * using default values: * * \code - * KIO::AuthInfo authInfo; + * TDEIO::AuthInfo authInfo; * bool result = openPassDlg( authInfo ); * if ( result ) * { @@ -203,7 +203,7 @@ protected: * @param info See AuthInfo. * @return true if user clicks on "OK", false otherwsie. */ - void openPassDlg( KIO::AuthInfo& info ); + void openPassDlg( TDEIO::AuthInfo& info ); /** * @deprecated. Use openPassDlg( AuthInfo& ) instead. @@ -252,16 +252,16 @@ private: } -inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a ) +inline TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSAtom &a ) { TQ_INT32 l; s >> a.m_uds; - if ( a.m_uds & KIO::UDS_LONG ) { + if ( a.m_uds & TDEIO::UDS_LONG ) { s >> l; a.m_long = l; a.m_str = TQString::null; - } else if ( a.m_uds & KIO::UDS_STRING ) { + } else if ( a.m_uds & TDEIO::UDS_STRING ) { s >> a.m_str; a.m_long = 0; } else {} // DIE! @@ -270,13 +270,13 @@ inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a ) return s; } -inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a ) +inline TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSAtom &a ) { s << a.m_uds; - if ( a.m_uds & KIO::UDS_LONG ) + if ( a.m_uds & TDEIO::UDS_LONG ) s << (TQ_INT32) a.m_long; - else if ( a.m_uds & KIO::UDS_STRING ) + else if ( a.m_uds & TDEIO::UDS_STRING ) s << a.m_str; else {} // DIE! // assert( 0 ); @@ -284,7 +284,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a ) return s; } -KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ); -KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ); +KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e ); +KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e ); #endif diff --git a/kio/kio/statusbarprogress.cpp b/kio/kio/statusbarprogress.cpp index 777f96e58..66517ca03 100644 --- a/kio/kio/statusbarprogress.cpp +++ b/kio/kio/statusbarprogress.cpp @@ -30,7 +30,7 @@ #include "jobclasses.h" #include "statusbarprogress.h" -namespace KIO { +namespace TDEIO { StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) : ProgressBase( parent ) { @@ -71,7 +71,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) } -void StatusbarProgress::setJob( KIO::Job *job ) +void StatusbarProgress::setJob( TDEIO::Job *job ) { ProgressBase::setJob( job ); @@ -118,20 +118,20 @@ void StatusbarProgress::slotClean() { } -void StatusbarProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) { +void StatusbarProgress::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ) { m_iTotalSize = size; // size is measured in bytes } -void StatusbarProgress::slotPercent( KIO::Job*, unsigned long percent ) { +void StatusbarProgress::slotPercent( TDEIO::Job*, unsigned long percent ) { m_pProgressBar->setValue( percent ); } -void StatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) { +void StatusbarProgress::slotSpeed( TDEIO::Job*, unsigned long speed ) { if ( speed == 0 ) { // spped is measured in bytes-per-second m_pLabel->setText( i18n( " Stalled ") ); } else { - m_pLabel->setText( i18n( " %1/s ").arg( KIO::convertSize( speed )) ); + m_pLabel->setText( i18n( " %1/s ").arg( TDEIO::convertSize( speed )) ); } } diff --git a/kio/kio/statusbarprogress.h b/kio/kio/statusbarprogress.h index 6fb460283..58bd77fa9 100644 --- a/kio/kio/statusbarprogress.h +++ b/kio/kio/statusbarprogress.h @@ -27,7 +27,7 @@ class TQPushButton; class TQLabel; class KProgress; -namespace KIO { +namespace TDEIO { class Job; @@ -49,7 +49,7 @@ class Job; * statusBar()->insertWidget( statusProgress, statusProgress->width() , 0 ); * ... * // create job and connect it to the progress -* CopyJob* job = KIO::copy(...); +* CopyJob* job = TDEIO::copy(...); * statusProgress->setJob( job ); * ... * \endcode @@ -76,20 +76,20 @@ public: * Sets the job to monitor. * @param job the job to monitor */ - void setJob( KIO::Job *job ); + void setJob( TDEIO::Job *job ); public slots: virtual void slotClean(); - virtual void slotTotalSize( KIO::Job* job, KIO::filesize_t size ); - virtual void slotPercent( KIO::Job* job, unsigned long percent ); - virtual void slotSpeed( KIO::Job* job, unsigned long speed ); + virtual void slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size ); + virtual void slotPercent( TDEIO::Job* job, unsigned long percent ); + virtual void slotSpeed( TDEIO::Job* job, unsigned long speed ); protected: KProgress* m_pProgressBar; TQLabel* m_pLabel; TQPushButton* m_pButton; - KIO::filesize_t m_iTotalSize; + TDEIO::filesize_t m_iTotalSize; enum Mode { None, Label, Progress }; diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index dc556ea23..8d3cc49ff 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -60,7 +60,7 @@ #include "kio/tcpslavebase.h" -using namespace KIO; +using namespace TDEIO; class TCPSlaveBase::TcpSlaveBasePrivate { @@ -327,7 +327,7 @@ bool TCPSlaveBase::connectToHost( const TQString &host, "WarnOnLeaveSSLMode" ); // Move this setting into KSSL instead - KConfig *config = new KConfig("kioslaverc"); + TDEConfig *config = new TDEConfig("kioslaverc"); config->setGroup("Notification Messages"); if (!config->readBoolEntry("WarnOnLeaveSSLMode", true)) { @@ -369,7 +369,7 @@ bool TCPSlaveBase::connectToHost( const TQString &host, m_iSock = ks.fd(); // store the IP for later - const KSocketAddress *sa = ks.peerAddress(); + const TDESocketAddress *sa = ks.peerAddress(); if (sa) d->ip = sa->nodeName(); else @@ -671,7 +671,7 @@ KSSLCertificateHome::KSSLAuthAction aa; // We're almost committed. If we can read the cert, we'll send it now. KSSLPKCS12 *pkcs = KSSLCertificateHome::getCertificateByName(certname); if (!pkcs && KSSLCertificateHome::hasCertificateByName(certname)) { // We need the password - KIO::AuthInfo ai; + TDEIO::AuthInfo ai; bool first = true; do { ai.prompt = i18n("Enter the certificate password:"); @@ -906,7 +906,7 @@ int TCPSlaveBase::verifyCertificate() arg << theurl << mOutgoingMetaData; arg << metaData("window-id").toInt(); d->dcc->call("kio_uiserver", "UIServer", - "showSSLInfoDialog(TQString,KIO::MetaData,int)", + "showSSLInfoDialog(TQString,TDEIO::MetaData,int)", data, ignoretype, ignore); } } while (result == KMessageBox::Yes); @@ -1033,7 +1033,7 @@ int TCPSlaveBase::verifyCertificate() arg << theurl << mOutgoingMetaData; arg << metaData("window-id").toInt(); d->dcc->call("kio_uiserver", "UIServer", - "showSSLInfoDialog(TQString,KIO::MetaData,int)", + "showSSLInfoDialog(TQString,TDEIO::MetaData,int)", data, ignoretype, ignore); } } while (result == KMessageBox::Yes); @@ -1090,7 +1090,7 @@ int TCPSlaveBase::verifyCertificate() i18n("C&onnect"), "WarnOnEnterSSLMode" ); // Move this setting into KSSL instead - KConfig *config = new KConfig("kioslaverc"); + TDEConfig *config = new TDEConfig("kioslaverc"); config->setGroup("Notification Messages"); if (!config->readBoolEntry("WarnOnEnterSSLMode", true)) { @@ -1117,7 +1117,7 @@ int TCPSlaveBase::verifyCertificate() arg << theurl << mOutgoingMetaData; arg << metaData("window-id").toInt(); d->dcc->call("kio_uiserver", "UIServer", - "showSSLInfoDialog(TQString,KIO::MetaData,int)", + "showSSLInfoDialog(TQString,TDEIO::MetaData,int)", data, ignoretype, ignore); } } while (result != KMessageBox::No); diff --git a/kio/kio/tcpslavebase.h b/kio/kio/tcpslavebase.h index fd148b00d..8a4e436ce 100644 --- a/kio/kio/tcpslavebase.h +++ b/kio/kio/tcpslavebase.h @@ -31,7 +31,7 @@ #include -namespace KIO { +namespace TDEIO { /** * There are two classes that specifies the protocol between application (job) diff --git a/kio/kio/thumbcreator.h b/kio/kio/thumbcreator.h index 3ad6ca8aa..79d499e7f 100644 --- a/kio/kio/thumbcreator.h +++ b/kio/kio/thumbcreator.h @@ -26,7 +26,7 @@ class TQString; class TQImage; /** * This is the baseclass for "thumbnail-plugins" in KDE. Using the class - * KIO::PreviewJob allows you to generate small images (thumbnails) + * TDEIO::PreviewJob allows you to generate small images (thumbnails) * for any kind of file, where a "ThumbCreator" is available. Have a look * at tdebase/kioslave/thumbnail/ for existing ThumbCreators. * diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 22c539a75..40badcbe0 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -61,11 +61,11 @@ static KCmdLineOptions options[] = int jobCounter = 0; -TQPtrList* jobList = 0L; +TQPtrList* jobList = 0L; KIOExec::KIOExec() { - jobList = new TQPtrList; + jobList = new TQPtrList; jobList->setAutoDelete( false ); // jobs autodelete themselves TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -83,7 +83,7 @@ KIOExec::KIOExec() { KURL url = args->url(i); // we need to map system:/ etc to make sure we get this right - url = KIO::NetAccess::mostLocalURL( url, 0 ); + url = TDEIO::NetAccess::mostLocalURL( url, 0 ); //kdDebug() << "url=" << url.url() << " filename=" << url.fileName() << endl; // A local file, not an URL ? @@ -105,7 +105,7 @@ KIOExec::KIOExec() else // We must fetch the file { - TQString fileName = KIO::encodeFileName( url.fileName() ); + TQString fileName = TDEIO::encodeFileName( url.fileName() ); if ( !suggestedFileName.isEmpty() ) fileName = suggestedFileName; // Build the destination filename, in ~/.trinity/cache-*/krun/ @@ -122,10 +122,10 @@ KIOExec::KIOExec() KURL dest; dest.setPath( tmp ); kdDebug() << "Copying " << url.prettyURL() << " to " << dest << endl; - KIO::Job *job = KIO::file_copy( url, dest ); + TDEIO::Job *job = TDEIO::file_copy( url, dest ); jobList->append( job ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } } } @@ -143,16 +143,16 @@ KIOExec::KIOExec() slotResult( 0L ); } -void KIOExec::slotResult( KIO::Job * job ) +void KIOExec::slotResult( TDEIO::Job * job ) { if (job && job->error()) { // That error dialog would be queued, i.e. not immediate... //job->showErrorDialog(); - if ( (job->error() != KIO::ERR_USER_CANCELED) ) + if ( (job->error() != TDEIO::ERR_USER_CANCELED) ) KMessageBox::error( 0L, job->errorString() ); - TQString path = static_cast(job)->destURL().path(); + TQString path = static_cast(job)->destURL().path(); TQValueList::Iterator it = fileList.begin(); for(;it != fileList.end(); ++it) @@ -164,7 +164,7 @@ void KIOExec::slotResult( KIO::Job * job ) if ( it != fileList.end() ) fileList.remove( it ); else - kdDebug() << static_cast(job)->destURL().path() << " not found in list" << endl; + kdDebug() << static_cast(job)->destURL().path() << " not found in list" << endl; } counter++; @@ -246,9 +246,9 @@ void KIOExec::slotRunApp() { kdDebug() << TQString(TQString("src='%1' dest='%2'").arg(src).arg(dest.url())).ascii() << endl; // Do it the synchronous way. - if ( !KIO::NetAccess::upload( src, dest, 0 ) ) + if ( !TDEIO::NetAccess::upload( src, dest, 0 ) ) { - KMessageBox::error( 0L, KIO::NetAccess::lastErrorString() ); + KMessageBox::error( 0L, TDEIO::NetAccess::lastErrorString() ); continue; // don't delete the temp file } } diff --git a/kio/kioexec/main.h b/kio/kioexec/main.h index 6a5dee65e..beb6a2297 100644 --- a/kio/kioexec/main.h +++ b/kio/kioexec/main.h @@ -6,7 +6,7 @@ #include #include -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KIOExec : public TQObject { @@ -15,7 +15,7 @@ public: KIOExec(); public slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); void slotRunApp(); protected: diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp index 0f7b2cc58..7b140c467 100644 --- a/kio/kpasswdserver/kpasswdserver.cpp +++ b/kio/kpasswdserver/kpasswdserver.cpp @@ -100,7 +100,7 @@ static TQString makeMapKey( const char* key, int entryNumber ) return str; } -static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const KIO::AuthInfo &info ) +static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const TDEIO::AuthInfo &info ) { if ( !wallet->hasFolder( KWallet::Wallet::PasswordFolder() ) ) if ( !wallet->createFolder( KWallet::Wallet::PasswordFolder() ) ) @@ -175,14 +175,14 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const return false; } -KIO::AuthInfo -KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId) +TDEIO::AuthInfo +KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId) { return checkAuthInfo(info, windowId, 0); } -KIO::AuthInfo -KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long usertime) +TDEIO::AuthInfo +KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long usertime) { kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username << ", WindowId = " << windowId << endl; @@ -242,14 +242,14 @@ KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long us return copyAuthInfo(result); } -KIO::AuthInfo -KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr) +TDEIO::AuthInfo +KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr) { return queryAuthInfo(info, errorMsg, windowId, seqNr, 0 ); } -KIO::AuthInfo -KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime) +TDEIO::AuthInfo +KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime) { kdDebug(130) << "KPasswdServer::queryAuthInfo: User= " << info.username << ", Message= " << info.prompt << ", WindowId = " << windowId << endl; @@ -285,7 +285,7 @@ KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowI } void -KPasswdServer::addAuthInfo(KIO::AuthInfo info, long windowId) +KPasswdServer::addAuthInfo(TDEIO::AuthInfo info, long windowId) { kdDebug(130) << "KPasswdServer::addAuthInfo: User= " << info.username << ", RealmValue= " << info.realmValue << ", WindowId = " << windowId << endl; @@ -316,7 +316,7 @@ KPasswdServer::processRequest() if (!request) return; - KIO::AuthInfo &info = request->info; + TDEIO::AuthInfo &info = request->info; kdDebug(130) << "KPasswdServer::processRequest: User= " << info.username << ", Message= " << info.prompt << endl; @@ -366,7 +366,7 @@ KPasswdServer::processRequest() hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins ); } - KIO::PasswordDialog dlg( info.prompt, username, info.keepPassword ); + TDEIO::PasswordDialog dlg( info.prompt, username, info.keepPassword ); if (info.caption.isEmpty()) dlg.setPlainCaption( i18n("Authorization Dialog") ); else @@ -428,7 +428,7 @@ KPasswdServer::processRequest() TQDataStream stream2(replyData, IO_WriteOnly); stream2 << info << m_seqNr; - replyType = "KIO::AuthInfo"; + replyType = "TDEIO::AuthInfo"; request->client->endTransaction( request->transaction, replyType, replyData); @@ -479,11 +479,11 @@ KPasswdServer::processRequest() else { updateAuthExpire(waitRequest->key, result, waitRequest->windowId, false); - KIO::AuthInfo info = copyAuthInfo(result); + TDEIO::AuthInfo info = copyAuthInfo(result); stream2 << info; } - replyType = "KIO::AuthInfo"; + replyType = "TDEIO::AuthInfo"; waitRequest->client->endTransaction( waitRequest->transaction, replyType, replyData); @@ -497,7 +497,7 @@ KPasswdServer::processRequest() } -TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info ) +TQString KPasswdServer::createCacheKey( const TDEIO::AuthInfo &info ) { if( !info.url.isValid() ) { // Note that a null key will break findAuthInfoItem later on... @@ -524,10 +524,10 @@ TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info ) return key; } -KIO::AuthInfo +TDEIO::AuthInfo KPasswdServer::copyAuthInfo(const AuthInfo *i) { - KIO::AuthInfo result; + TDEIO::AuthInfo result; result.url = i->url; result.username = i->username; result.password = i->password; @@ -539,7 +539,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i) } const KPasswdServer::AuthInfo * -KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) +KPasswdServer::findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info) { AuthInfoList *authList = m_authDict.find(key); if (!authList) @@ -577,7 +577,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) } void -KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) +KPasswdServer::removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info) { AuthInfoList *authList = m_authDict.find(key); if (!authList) @@ -604,7 +604,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info void -KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled) +KPasswdServer::addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled) { AuthInfoList *authList = m_authDict.find(key); if (!authList) diff --git a/kio/kpasswdserver/kpasswdserver.h b/kio/kpasswdserver/kpasswdserver.h index cf44681bf..46e7191db 100644 --- a/kio/kpasswdserver/kpasswdserver.h +++ b/kio/kpasswdserver/kpasswdserver.h @@ -46,11 +46,11 @@ public: k_dcop: // KDE4 merge - KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long, unsigned long); - KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long); - KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long, unsigned long); - KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long); - void addAuthInfo(KIO::AuthInfo, long); + TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long, unsigned long); + TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long); + TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long, unsigned long); + TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long); + void addAuthInfo(TDEIO::AuthInfo, long); public slots: void processRequest(); @@ -60,11 +60,11 @@ public slots: protected: struct AuthInfo; - TQString createCacheKey( const KIO::AuthInfo &info ); - const AuthInfo *findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info); - void removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info); - void addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled); - KIO::AuthInfo copyAuthInfo(const AuthInfo *); + TQString createCacheKey( const TDEIO::AuthInfo &info ); + const AuthInfo *findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info); + void removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info); + void addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled); + TDEIO::AuthInfo copyAuthInfo(const AuthInfo *); void updateAuthExpire(const TQString &key, const AuthInfo *, long windowId, bool keep); int findWalletEntry( const TQMap& map, const TQString& username ); bool openWallet( WId windowId ); @@ -100,7 +100,7 @@ protected: DCOPClient *client; DCOPClientTransaction *transaction; TQString key; - KIO::AuthInfo info; + TDEIO::AuthInfo info; TQString errorMsg; long windowId; long seqNr; diff --git a/kio/kssl/TODO b/kio/kssl/TODO index f24761473..7e2270575 100644 --- a/kio/kssl/TODO +++ b/kio/kssl/TODO @@ -15,7 +15,7 @@ - is not working. -- Namespace it all to KIO::SSL:: in KDE4 +- Namespace it all to TDEIO::SSL:: in KDE4 - Remove SSLv2 diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc index e327cd68b..9983edceb 100644 --- a/kio/kssl/kopenssl.cc +++ b/kio/kssl/kopenssl.cc @@ -273,12 +273,12 @@ KOpenSSLProxy::KOpenSSLProxy() { KLibLoader *ll = KLibLoader::self(); _ok = false; TQStringList libpaths, libnamesc, libnamess; -KConfig *cfg; +TDEConfig *cfg; _cryptoLib = 0L; _sslLib = 0L; - cfg = new KConfig("cryptodefaults", false, false); + cfg = new TDEConfig("cryptodefaults", false, false); cfg->setGroup("OpenSSL"); TQString upath = cfg->readPathEntry("Path"); if (!upath.isEmpty()) diff --git a/kio/kssl/kssl/certkde b/kio/kssl/kssl/certkde index 2a46393f9..37c924f83 100755 --- a/kio/kssl/kssl/certkde +++ b/kio/kssl/kssl/certkde @@ -3,7 +3,7 @@ eval 'exec perl -S $0 ${1+"$@"}' if $running_under_some_shell; ## -## Generate the KDE CA list KConfig file +## Generate the KDE CA list TDEConfig file ## %CERT = (); diff --git a/kio/kssl/ksslcertificatehome.cc b/kio/kssl/ksslcertificatehome.cc index c722e2c6b..39470c5ab 100644 --- a/kio/kssl/ksslcertificatehome.cc +++ b/kio/kssl/ksslcertificatehome.cc @@ -186,7 +186,7 @@ KSimpleConfig cfg("ksslauthmap", false); TQString KSSLCertificateHome::getDefaultCertificateName(KSSLAuthAction *aa) { -KConfig cfg("cryptodefaults", false); +TDEConfig cfg("cryptodefaults", false); cfg.setGroup("Auth"); if (aa) { diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 26f6114a1..eb91ea9cb 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -96,7 +96,7 @@ public: KSSLSettings::KSSLSettings(bool readConfig) { d = new KSSLSettingsPrivate; - m_cfg = new KConfig("cryptodefaults", false, false); + m_cfg = new TDEConfig("cryptodefaults", false, false); if (!TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) { //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl; diff --git a/kio/kssl/ksslsettings.h b/kio/kssl/ksslsettings.h index 44345937b..1b56a7a3a 100644 --- a/kio/kssl/ksslsettings.h +++ b/kio/kssl/ksslsettings.h @@ -208,7 +208,7 @@ public: void save(); private: - KConfig *m_cfg; + TDEConfig *m_cfg; bool m_bUseSSLv2, m_bUseSSLv3, m_bUseTLSv1; bool m_bWarnOnEnter, m_bWarnOnUnencrypted, m_bWarnOnLeave, m_bWarnOnMixed; bool m_bWarnSelfSigned, m_bWarnRevoked, m_bWarnExpired; diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp index 19417b1fb..c150a732c 100644 --- a/kio/misc/kpac/downloader.cpp +++ b/kio/misc/kpac/downloader.cpp @@ -43,10 +43,10 @@ namespace KPAC m_script = TQString::null; m_scriptURL = url; - KIO::TransferJob* job = KIO::get( url, false, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( result( KIO::Job* ) ) ); + TDEIO::TransferJob* job = TDEIO::get( url, false, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) ); } void Downloader::failed() @@ -59,16 +59,16 @@ namespace KPAC m_error = error; } - void Downloader::data( KIO::Job*, const TQByteArray& data ) + void Downloader::data( TDEIO::Job*, const TQByteArray& data ) { unsigned offset = m_data.size(); m_data.resize( offset + data.size() ); std::memcpy( m_data.data() + offset, data.data(), data.size() ); } - void Downloader::result( KIO::Job* job ) + void Downloader::result( TDEIO::Job* job ) { - if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() ) + if ( !job->error() && !static_cast< TDEIO::TransferJob* >( job )->isErrorPage() ) { bool dummy; m_script = TDEGlobal::charsets()->codecForName( diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h index 82418882f..808e09378 100644 --- a/kio/misc/kpac/downloader.h +++ b/kio/misc/kpac/downloader.h @@ -25,7 +25,7 @@ #include -namespace KIO { class Job; } +namespace TDEIO { class Job; } namespace KPAC { @@ -48,8 +48,8 @@ namespace KPAC void setError( const TQString& ); private slots: - void data( KIO::Job*, const TQByteArray& ); - void result( KIO::Job* ); + void data( TDEIO::Job*, const TQByteArray& ); + void result( TDEIO::Job* ); private: TQByteArray m_data; diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp index 36a417b88..d282782fc 100644 --- a/kio/misc/ksendbugmail/smtp.cpp +++ b/kio/misc/ksendbugmail/smtp.cpp @@ -158,7 +158,7 @@ void SMTP::connectTimerTick(void) } kdDebug() << "connecting to " << serverHost << ":" << hostPort << " ..... " << endl; - sock = new KSocket(serverHost.ascii(), hostPort); + sock = new TDESocket(serverHost.ascii(), hostPort); if(sock == 0L || sock->socket() < 0) { timeOutTimer.stop(); @@ -173,8 +173,8 @@ void SMTP::connectTimerTick(void) state = INIT; serverState = NONE; - connect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *))); - connect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *))); + connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); + connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); // sock->enableRead(true); timeOutTimer.stop(); kdDebug() << "connected" << endl; @@ -202,7 +202,7 @@ void SMTP::interactTimedOut(void) emit error(INTERACTTIMEOUT); } -void SMTP::socketRead(KSocket *socket) +void SMTP::socketRead(TDESocket *socket) { int n, nl; @@ -228,11 +228,11 @@ void SMTP::socketRead(KSocket *socket) interactTimer.start(timeOut, true); } -void SMTP::socketClose(KSocket *socket) +void SMTP::socketClose(TDESocket *socket) { timeOutTimer.stop(); - disconnect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *))); - disconnect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *))); + disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); + disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); socket->enableRead(false); kdDebug() << "connection terminated" << endl; connected = false; diff --git a/kio/misc/ksendbugmail/smtp.h b/kio/misc/ksendbugmail/smtp.h index 707d20ae4..acdb4a3c3 100644 --- a/kio/misc/ksendbugmail/smtp.h +++ b/kio/misc/ksendbugmail/smtp.h @@ -104,8 +104,8 @@ public slots: void connectTimedOut(); void interactTimedOut(); - void socketRead(KSocket *); - void socketClose(KSocket *); + void socketRead(TDESocket *); + void socketClose(TDESocket *); signals: void connectionClosed(); @@ -131,7 +131,7 @@ private: TQString domainName; - KSocket *sock; + TDESocket *sock; TQTimer connectTimer; TQTimer timeOutTimer; TQTimer interactTimer; diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 40c52a1be..22bf6ab84 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -61,7 +61,7 @@ extern "C" { } -static void updatePoliciesConfig(KConfig *cfg) { +static void updatePoliciesConfig(TDEConfig *cfg) { TQStringList groups = cfg->groupList(); for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) { @@ -641,7 +641,7 @@ TQFile out(path); if (!out.open(IO_WriteOnly)) return false; -KConfig cfg("ksslcalist", true, false); +TDEConfig cfg("ksslcalist", true, false); TQStringList x = cfg.groupList(); @@ -677,7 +677,7 @@ KSSLCertificate *x = KSSLCertificate::fromString(certificate.local8Bit()); if (!x) return false; -KConfig cfg("ksslcalist", false, false); +TDEConfig cfg("ksslcalist", false, false); cfg.setGroup(x->getSubject()); cfg.writeEntry("x509", certificate); @@ -766,7 +766,7 @@ bool KSSLD::caRemoveFromFile(TQString filename) { TQStringList KSSLD::caList() { TQStringList x; -KConfig cfg("ksslcalist", true, false); +TDEConfig cfg("ksslcalist", true, false); x = cfg.groupList(); x.remove(""); @@ -776,7 +776,7 @@ return x; bool KSSLD::caUseForSSL(TQString subject) { -KConfig cfg("ksslcalist", true, false); +TDEConfig cfg("ksslcalist", true, false); if (!cfg.hasGroup(subject)) return false; @@ -788,7 +788,7 @@ return cfg.readBoolEntry("site", false); bool KSSLD::caUseForEmail(TQString subject) { -KConfig cfg("ksslcalist", true, false); +TDEConfig cfg("ksslcalist", true, false); if (!cfg.hasGroup(subject)) return false; @@ -800,7 +800,7 @@ return cfg.readBoolEntry("email", false); bool KSSLD::caUseForCode(TQString subject) { -KConfig cfg("ksslcalist", true, false); +TDEConfig cfg("ksslcalist", true, false); if (!cfg.hasGroup(subject)) return false; @@ -811,7 +811,7 @@ return cfg.readBoolEntry("code", false); bool KSSLD::caRemove(TQString subject) { -KConfig cfg("ksslcalist", false, false); +TDEConfig cfg("ksslcalist", false, false); if (!cfg.hasGroup(subject)) return false; @@ -823,7 +823,7 @@ return true; TQString KSSLD::caGetCert(TQString subject) { -KConfig cfg("ksslcalist", true, false); +TDEConfig cfg("ksslcalist", true, false); if (!cfg.hasGroup(subject)) return TQString::null; @@ -834,7 +834,7 @@ return cfg.readEntry("x509", TQString::null); bool KSSLD::caSetUse(TQString subject, bool ssl, bool email, bool code) { -KConfig cfg("ksslcalist", false, false); +TDEConfig cfg("ksslcalist", false, false); if (!cfg.hasGroup(subject)) return false; diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp index ea8708863..cf1b5694c 100644 --- a/kio/misc/ktelnetservice.cpp +++ b/kio/misc/ktelnetservice.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) if (args->count() != 1) return 1; - KConfig *config = new KConfig("kdeglobals", true); + TDEConfig *config = new TDEConfig("kdeglobals", true); config->setGroup("General"); TQString terminal = config->readPathEntry("TerminalApplication", "konsole"); diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index e87f96c31..afa634c64 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, setupDialog( wiz, wId, appid, modal ); int rc = wiz->exec(); if (rc == TQDialog::Accepted) { - KConfig cfg("kwalletrc"); + TDEConfig cfg("kwalletrc"); cfg.setGroup("Wallet"); cfg.writeEntry("First Use", false); cfg.writeEntry("Enabled", wiz->_useWallet->isChecked()); @@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, return -1; } } else if (_firstUse) { - KConfig cfg("kwalletrc"); + TDEConfig cfg("kwalletrc"); _firstUse = false; cfg.setGroup("Wallet"); cfg.writeEntry("First Use", false); @@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W if (response == 0 || response == 1) { if (response == 1) { - KConfig cfg("kwalletrc"); + TDEConfig cfg("kwalletrc"); cfg.setGroup("Auto Allow"); TQStringList apps = cfg.readListEntry(wallet); if (!apps.contains(thisApp)) { @@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W } } } else if (response == 3) { - KConfig cfg("kwalletrc"); + TDEConfig cfg("kwalletrc"); cfg.setGroup("Auto Deny"); TQStringList apps = cfg.readListEntry(wallet); if (!apps.contains(thisApp)) { @@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() { void KWalletD::reconfigure() { - KConfig cfg("kwalletrc"); + TDEConfig cfg("kwalletrc"); cfg.setGroup("Wallet"); _firstUse = cfg.readBoolEntry("First Use", true); _enabled = cfg.readBoolEntry("Enabled", true); diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index 3e890c553..e898e5a50 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -192,7 +192,7 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString m_defaultProgressVisible = showDefault; // create dialog, but don't show it - defaultProgress = new KIO::DefaultProgress( false ); + defaultProgress = new TDEIO::DefaultProgress( false ); defaultProgress->setOnlyClean( true ); connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) ); connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) ); @@ -217,11 +217,11 @@ ProgressItem::~ProgressItem() { } -void ProgressItem::setTotalSize( KIO::filesize_t size ) { +void ProgressItem::setTotalSize( TDEIO::filesize_t size ) { m_iTotalSize = size; // It's already in the % column... - //setText( listProgress->lv_total, KIO::convertSize( m_iTotalSize ) ); + //setText( listProgress->lv_total, TDEIO::convertSize( m_iTotalSize ) ); defaultProgress->slotTotalSize( 0, m_iTotalSize ); } @@ -239,10 +239,10 @@ void ProgressItem::setTotalDirs( unsigned long dirs ) { } -void ProgressItem::setProcessedSize( KIO::filesize_t size ) { +void ProgressItem::setProcessedSize( TDEIO::filesize_t size ) { m_iProcessedSize = size; - setText( ListProgress::TB_TOTAL, KIO::convertSize( size ) ); + setText( ListProgress::TB_TOTAL, TDEIO::convertSize( size ) ); defaultProgress->slotProcessedSize( 0, size ); } @@ -264,7 +264,7 @@ void ProgressItem::setProcessedDirs( unsigned long dirs ) { void ProgressItem::setPercent( unsigned long percent ) { - const TQString tmps = KIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles ); + const TQString tmps = TDEIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles ); setText( ListProgress::TB_PROGRESS, tmps ); defaultProgress->slotPercent( 0, percent ); @@ -281,15 +281,15 @@ void ProgressItem::setInfoMessage( const TQString & msg ) { void ProgressItem::setSpeed( unsigned long bytes_per_second ) { m_iSpeed = bytes_per_second; - m_remainingSeconds = KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed ); + m_remainingSeconds = TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed ); TQString tmps, tmps2; if ( m_iSpeed == 0 ) { tmps = i18n( "Stalled"); tmps2 = tmps; } else { - tmps = i18n( "%1/s").arg( KIO::convertSize( m_iSpeed )); - tmps2 = KIO::convertSeconds( m_remainingSeconds ); + tmps = i18n( "%1/s").arg( TDEIO::convertSize( m_iSpeed )); + tmps2 = TDEIO::convertSeconds( m_remainingSeconds ); } setText( ListProgress::TB_SPEED, tmps ); setText( ListProgress::TB_REMAINING_TIME, tmps2 ); @@ -382,7 +382,7 @@ void ProgressItem::setUnmounting( const TQString & point ) { defaultProgress->slotUnmounting( 0, point ); } -void ProgressItem::setCanResume( KIO::filesize_t offset ) { +void ProgressItem::setCanResume( TDEIO::filesize_t offset ) { /* TQString tmps; // set canResume @@ -527,7 +527,7 @@ void ListProgress::applySettings() } void ListProgress::readSettings() { - KConfig config("uiserverrc"); + TDEConfig config("uiserverrc"); // read listview geometry properties config.setGroup( "ProgressList" ); @@ -560,7 +560,7 @@ void ListProgress::columnWidthChanged(int column) } void ListProgress::writeSettings() { - KConfig config("uiserverrc"); + TDEConfig config("uiserverrc"); // write listview geometry properties config.setGroup( "ProgressList" ); @@ -830,9 +830,9 @@ void UIServer::jobFinished( int id ) void UIServer::totalSize( int id, unsigned long size ) { totalSize64(id, size); } -void UIServer::totalSize64( int id, KIO::filesize_t size ) +void UIServer::totalSize64( int id, TDEIO::filesize_t size ) { -// kdDebug(7024) << "UIServer::totalSize " << id << " " << KIO::number(size) << endl; +// kdDebug(7024) << "UIServer::totalSize " << id << " " << TDEIO::number(size) << endl; ProgressItem *item = findItem( id ); if ( item ) { @@ -863,9 +863,9 @@ void UIServer::totalDirs( int id, unsigned long dirs ) void UIServer::processedSize( int id, unsigned long size ) { processedSize64(id, size); } -void UIServer::processedSize64( int id, KIO::filesize_t size ) +void UIServer::processedSize64( int id, TDEIO::filesize_t size ) { - //kdDebug(7024) << "UIServer::processedSize " << id << " " << KIO::number(size) << endl; + //kdDebug(7024) << "UIServer::processedSize " << id << " " << TDEIO::number(size) << endl; ProgressItem *item = findItem( id ); if ( item ) { @@ -926,7 +926,7 @@ void UIServer::infoMessage( int id, const TQString & msg ) void UIServer::canResume( int id, unsigned long offset ) { canResume64(id, offset); } -void UIServer::canResume64( int id, KIO::filesize_t offset ) +void UIServer::canResume64( int id, TDEIO::filesize_t offset ) { //kdDebug(7024) << "UIServer::canResume " << id << " " << offset << endl; @@ -1018,8 +1018,8 @@ void UIServer::unmounting( int id, TQString point ) void UIServer::killJob( TQCString observerAppId, int progressId ) { - // Contact the object "KIO::Observer" in the application - Observer_stub observer( observerAppId, "KIO::Observer" ); + // Contact the object "TDEIO::Observer" in the application + Observer_stub observer( observerAppId, "TDEIO::Observer" ); // Tell it to kill the job observer.killJob( progressId ); } @@ -1029,7 +1029,7 @@ void UIServer::slotJobCanceled( ProgressItem *item ) { // kill the corresponding job killJob( item->appId(), item->jobId() ); - // KIO::Job, when killed, should call back jobFinished(), but we can't + // TDEIO::Job, when killed, should call back jobFinished(), but we can't // really rely on that - the app may have crashed delete item; } @@ -1071,7 +1071,7 @@ void UIServer::slotUpdate() { } int iTotalFiles = 0; - KIO::filesize_t iTotalSize = 0; + TDEIO::filesize_t iTotalSize = 0; int iTotalSpeed = 0; unsigned int totalRemTime = 0; // in seconds @@ -1095,11 +1095,11 @@ void UIServer::slotUpdate() { // update statusbar statusBar()->changeItem( i18n( " Files: %1 ").arg( iTotalFiles ), ID_TOTAL_FILES); - statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( KIO::convertSize( iTotalSize ) ), + statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( TDEIO::convertSize( iTotalSize ) ), ID_TOTAL_SIZE); - statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( KIO::convertSeconds( totalRemTime ) ), + statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( TDEIO::convertSeconds( totalRemTime ) ), ID_TOTAL_TIME); - statusBar()->changeItem( i18n( " %1/s ").arg( KIO::convertSize( iTotalSpeed ) ), + statusBar()->changeItem( i18n( " %1/s ").arg( TDEIO::convertSize( iTotalSpeed ) ), ID_TOTAL_SPEED); } @@ -1145,12 +1145,12 @@ void UIServer::slotSelection() { // This code is deprecated, slaves go to Observer::openPassDlg now, // but this is kept for compat (DCOP calls to kio_uiserver). -TQByteArray UIServer::openPassDlg( const KIO::AuthInfo &info ) +TQByteArray UIServer::openPassDlg( const TDEIO::AuthInfo &info ) { kdDebug(7024) << "UIServer::openPassDlg: User= " << info.username << ", Msg= " << info.prompt << endl; - KIO::AuthInfo inf(info); - int result = KIO::PasswordDialog::getNameAndPassword( inf.username, inf.password, + TDEIO::AuthInfo inf(info); + int result = TDEIO::PasswordDialog::getNameAndPassword( inf.username, inf.password, &inf.keepPassword, inf.prompt, inf.readOnly, inf.caption, inf.comment, inf.commentLabel ); @@ -1169,12 +1169,12 @@ int UIServer::messageBox( int progressId, int type, const TQString &text, const return Observer::messageBox( progressId, type, text, caption, buttonYes, buttonNo ); } -void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta) +void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta) { return showSSLInfoDialog(url,meta,0); } -void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta, int mainwindow) +void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta, int mainwindow) { KSSLInfoDlg *kid = new KSSLInfoDlg(meta["ssl_in_use"].upper()=="TRUE", 0L /*parent?*/, 0L, true); KSSLCertificate *x = KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit()); @@ -1269,8 +1269,8 @@ TQByteArray UIServer::open_RenameDlg64( int id, const TQString & caption, const TQString& src, const TQString & dest, int mode, - KIO::filesize_t sizeSrc, - KIO::filesize_t sizeDest, + TDEIO::filesize_t sizeSrc, + TDEIO::filesize_t sizeDest, unsigned long ctimeSrc, unsigned long ctimeDest, unsigned long mtimeSrc, @@ -1282,17 +1282,17 @@ TQByteArray UIServer::open_RenameDlg64( int id, if ( item ) setItemVisible( item, false ); TQString newDest; - kdDebug(7024) << "Calling KIO::open_RenameDlg" << endl; - KIO::RenameDlg_Result result = KIO::open_RenameDlg( caption, src, dest, - (KIO::RenameDlg_Mode) mode, newDest, + kdDebug(7024) << "Calling TDEIO::open_RenameDlg" << endl; + TDEIO::RenameDlg_Result result = TDEIO::open_RenameDlg( caption, src, dest, + (TDEIO::RenameDlg_Mode) mode, newDest, sizeSrc, sizeDest, (time_t)ctimeSrc, (time_t)ctimeDest, (time_t)mtimeSrc, (time_t)mtimeDest ); - kdDebug(7024) << "KIO::open_RenameDlg done" << endl; + kdDebug(7024) << "TDEIO::open_RenameDlg done" << endl; TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream << TQ_UINT8(result) << newDest; - if ( item && result != KIO::R_CANCEL ) + if ( item && result != TDEIO::R_CANCEL ) setItemVisible( item, true ); return data; } @@ -1305,16 +1305,16 @@ int UIServer::open_SkipDlg( int id, ProgressItem *item = findItem( id ); if ( item ) setItemVisible( item, false ); - kdDebug(7024) << "Calling KIO::open_SkipDlg" << endl; - KIO::SkipDlg_Result result = KIO::open_SkipDlg( (bool)multi, error_text ); - if ( item && result != KIO::S_CANCEL ) + kdDebug(7024) << "Calling TDEIO::open_SkipDlg" << endl; + TDEIO::SkipDlg_Result result = TDEIO::open_SkipDlg( (bool)multi, error_text ); + if ( item && result != TDEIO::S_CANCEL ) setItemVisible( item, true ); - return (KIO::SkipDlg_Result) result; + return (TDEIO::SkipDlg_Result) result; } void UIServer::readSettings() { - KConfig config("uiserverrc"); + TDEConfig config("uiserverrc"); config.setGroup( "UIServer" ); m_showStatusBar=config.readBoolEntry("ShowStatusBar",false); m_showToolBar=config.readBoolEntry("ShowToolBar",true); @@ -1326,7 +1326,7 @@ void UIServer::readSettings() { } void UIServer::writeSettings() { - KConfig config("uiserverrc"); + TDEConfig config("uiserverrc"); config.setGroup( "UIServer" ); config.writeEntry("InitialWidth",width()); config.writeEntry("InitialHeight",height()); diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h index 85e255a43..c7cfaf5c0 100644 --- a/kio/misc/uiserver.h +++ b/kio/misc/uiserver.h @@ -37,7 +37,7 @@ class KSqueezedTextLabel; class ProgressItem; class UIServer; -namespace KIO { +namespace TDEIO { class Job; class DefaultProgress; } @@ -122,11 +122,11 @@ public: void setDefaultProgressVisible( bool visible ); bool isVisible() const { return m_visible; } - void setTotalSize( KIO::filesize_t bytes ); + void setTotalSize( TDEIO::filesize_t bytes ); void setTotalFiles( unsigned long files ); void setTotalDirs( unsigned long dirs ); - void setProcessedSize( KIO::filesize_t size ); + void setProcessedSize( TDEIO::filesize_t size ); void setProcessedFiles( unsigned long files ); void setProcessedDirs( unsigned long dirs ); @@ -143,11 +143,11 @@ public: void setMounting( const TQString & dev, const TQString & point ); void setUnmounting( const TQString & point ); - void setCanResume( KIO::filesize_t offset ); + void setCanResume( TDEIO::filesize_t offset ); - KIO::filesize_t totalSize() { return m_iTotalSize; } + TDEIO::filesize_t totalSize() { return m_iTotalSize; } unsigned long totalFiles() { return m_iTotalFiles; } - KIO::filesize_t processedSize() { return m_iProcessedSize; } + TDEIO::filesize_t processedSize() { return m_iProcessedSize; } unsigned long processedFiles() { return m_iProcessedFiles; } unsigned long speed() { return m_iSpeed; } unsigned int remainingSeconds() { return m_remainingSeconds; } @@ -179,12 +179,12 @@ protected: ListProgress *listProgress; // associated default progress dialog - KIO::DefaultProgress *defaultProgress; + TDEIO::DefaultProgress *defaultProgress; // we store these values for calculation of totals ( for statusbar ) - KIO::filesize_t m_iTotalSize; + TDEIO::filesize_t m_iTotalSize; unsigned long m_iTotalFiles; - KIO::filesize_t m_iProcessedSize; + TDEIO::filesize_t m_iProcessedSize; unsigned long m_iProcessedFiles; unsigned long m_iSpeed; int m_remainingSeconds; @@ -230,7 +230,7 @@ k_dcop: /** * Signal a new job * @param appId the DCOP application id of the job's parent application - * @see KIO::Observer::newJob + * @see TDEIO::Observer::newJob * @param showProgress whether to popup the progress for the job. * Usually true, but may be false when we use kio_uiserver for * other things, like SSL dialogs. @@ -241,12 +241,12 @@ k_dcop: ASYNC jobFinished( int id ); ASYNC totalSize( int id, unsigned long size ); - ASYNC totalSize64( int id, KIO::filesize_t size ); + ASYNC totalSize64( int id, TDEIO::filesize_t size ); ASYNC totalFiles( int id, unsigned long files ); ASYNC totalDirs( int id, unsigned long dirs ); ASYNC processedSize( int id, unsigned long bytes ); - ASYNC processedSize64( int id, KIO::filesize_t bytes ); + ASYNC processedSize64( int id, TDEIO::filesize_t bytes ); ASYNC processedFiles( int id, unsigned long files ); ASYNC processedDirs( int id, unsigned long dirs ); @@ -265,14 +265,14 @@ k_dcop: ASYNC unmounting( int id, TQString point ); ASYNC canResume( int id, unsigned long offset ); - ASYNC canResume64( int id, KIO::filesize_t offset ); + ASYNC canResume64( int id, TDEIO::filesize_t offset ); /** * @deprecated (it blocks other apps). - * Use KIO::PasswordDialog::getNameAndPassword instead. + * Use TDEIO::PasswordDialog::getNameAndPassword instead. * To be removed in KDE 4.0. */ - TQByteArray openPassDlg( const KIO::AuthInfo &info ); + TQByteArray openPassDlg( const TDEIO::AuthInfo &info ); /** * Popup a message box. @@ -296,15 +296,15 @@ k_dcop: /** * @deprecated (it blocks other apps). - * Use KIO::open_RenameDlg instead. + * Use TDEIO::open_RenameDlg instead. * To be removed in KDE 4.0. */ TQByteArray open_RenameDlg64( int id, const TQString & caption, const TQString& src, const TQString & dest, - int /* KIO::RenameDlg_Mode */ mode, - KIO::filesize_t sizeSrc, - KIO::filesize_t sizeDest, + int /* TDEIO::RenameDlg_Mode */ mode, + TDEIO::filesize_t sizeSrc, + TDEIO::filesize_t sizeDest, unsigned long /* time_t */ ctimeSrc, unsigned long /* time_t */ ctimeDest, unsigned long /* time_t */ mtimeSrc, @@ -312,13 +312,13 @@ k_dcop: ); /** * @deprecated (it blocks other apps). - * Use KIO::open_RenameDlg instead. + * Use TDEIO::open_RenameDlg instead. * To be removed in KDE 4.0. */ TQByteArray open_RenameDlg( int id, const TQString & caption, const TQString& src, const TQString & dest, - int /* KIO::RenameDlg_Mode */ mode, + int /* TDEIO::RenameDlg_Mode */ mode, unsigned long sizeSrc, unsigned long sizeDest, unsigned long /* time_t */ ctimeSrc, @@ -329,7 +329,7 @@ k_dcop: /** * @deprecated (it blocks other apps). - * Use KIO::open_SkipDlg instead. + * Use TDEIO::open_SkipDlg instead. * To be removed in KDE 4.0. */ int open_SkipDlg( int id, @@ -350,12 +350,12 @@ k_dcop: /** * Show a SSL Information Dialog */ - void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data, int mainwindow); + void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data, int mainwindow); /** * @deprecated */ - void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data); + void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data); /* * Show an SSL Certificate Selection Dialog diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp index 0c8470a61..dfacd92e4 100644 --- a/kio/tests/dataprotocoltest.cpp +++ b/kio/tests/dataprotocoltest.cpp @@ -39,7 +39,7 @@ public: testStrings("MIME Type: ",mime_type_expected,type); } - void totalSize(KIO::filesize_t bytes) { + void totalSize(TDEIO::filesize_t bytes) { // cout << "content size: " << bytes << " bytes" << endl; } @@ -47,7 +47,7 @@ public: // meta_data[key] = value; // cout << "§ " << key << " = " << value << endl; TQString prefix = "Metadata[\""+key+"\"]: "; - KIO::MetaData::Iterator it = attributes_expected.find(key); + TDEIO::MetaData::Iterator it = attributes_expected.find(key); if (it != attributes_expected.end()) { testStrings(prefix,it.data(),value); // remove key from map @@ -60,8 +60,8 @@ public: void sendMetaData() { // check here if attributes_expected contains any excess keys - KIO::MetaData::ConstIterator it = attributes_expected.begin(); - KIO::MetaData::ConstIterator end = attributes_expected.end(); + TDEIO::MetaData::ConstIterator it = attributes_expected.begin(); + TDEIO::MetaData::ConstIterator end = attributes_expected.end(); for (; it != end; ++it) { cout << endl << "Metadata[\"" << it.key() << "\"] was expected but not defined"; @@ -93,7 +93,7 @@ private: // -- testcase related members TQString mime_type_expected; // expected mime type /** contains all attributes and values the testcase has to set */ - KIO::MetaData attributes_expected; + TDEIO::MetaData attributes_expected; /** contains the content as it is expected to be returned */ TQByteArray content_expected; int passed; // # of passed tests @@ -150,7 +150,7 @@ public: /** * sets all attribute-value pairs the testcase must deliver. */ - void setExpectedAttributes(const KIO::MetaData &attres) { + void setExpectedAttributes(const TDEIO::MetaData &attres) { attributes_expected = attres; } diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index cd9a99bb8..a0da57244 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -135,9 +135,9 @@ void JobTest::runAll() void JobTest::cleanup() { - KIO::NetAccess::del( homeTmpDir(), 0 ); - KIO::NetAccess::del( otherTmpDir(), 0 ); - KIO::NetAccess::del( systemTmpDir(), 0 ); + TDEIO::NetAccess::del( homeTmpDir(), 0 ); + TDEIO::NetAccess::del( otherTmpDir(), 0 ); + TDEIO::NetAccess::del( systemTmpDir(), 0 ); } static void setTimeStamp( const TQString& path ) @@ -194,19 +194,19 @@ void JobTest::get() createTestFile( filePath ); KURL u; u.setPath( filePath ); m_result = -1; - KIO::StoredTransferJob* job = KIO::storedGet( u ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotGetResult( KIO::Job* ) ) ); + TDEIO::StoredTransferJob* job = TDEIO::storedGet( u ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) ); kapp->eventLoop()->enterLoop(); assert( m_result == 0 ); // no error assert( m_data.size() == 11 ); assert( TQCString( m_data ) == "Hello world" ); } -void JobTest::slotGetResult( KIO::Job* job ) +void JobTest::slotGetResult( TDEIO::Job* job ) { m_result = job->error(); - m_data = static_cast(job)->data(); + m_data = static_cast(job)->data(); kapp->eventLoop()->exitLoop(); } @@ -220,7 +220,7 @@ void JobTest::copyLocalFile( const TQString& src, const TQString& dest ) d.setPath( dest ); // copy the file with file_copy - bool ok = KIO::NetAccess::file_copy( u, d ); + bool ok = TDEIO::NetAccess::file_copy( u, d ); assert( ok ); assert( TQFile::exists( dest ) ); assert( TQFile::exists( src ) ); // still there @@ -234,9 +234,9 @@ void JobTest::copyLocalFile( const TQString& src, const TQString& dest ) assert( srcInfo.lastModified() == destInfo.lastModified() ); } - // cleanup and retry with KIO::copy() + // cleanup and retry with TDEIO::copy() TQFile::remove( dest ); - ok = KIO::NetAccess::dircopy( u, d, 0 ); + ok = TDEIO::NetAccess::dircopy( u, d, 0 ); assert( ok ); assert( TQFile::exists( dest ) ); assert( TQFile::exists( src ) ); // still there @@ -262,7 +262,7 @@ void JobTest::copyLocalDirectory( const TQString& src, const TQString& _dest, in else assert( !TQFile::exists( dest ) ); - bool ok = KIO::NetAccess::dircopy( u, d, 0 ); + bool ok = TDEIO::NetAccess::dircopy( u, d, 0 ); assert( ok ); if ( flags & AlreadyExists ) { @@ -341,13 +341,13 @@ void JobTest::moveLocalFile( const TQString& src, const TQString& dest ) d.setPath( dest ); // move the file with file_move - bool ok = KIO::NetAccess::file_move( u, d ); + bool ok = TDEIO::NetAccess::file_move( u, d ); assert( ok ); assert( TQFile::exists( dest ) ); assert( !TQFile::exists( src ) ); // not there anymore - // move it back with KIO::move() - ok = KIO::NetAccess::move( d, u, 0 ); + // move it back with TDEIO::move() + ok = TDEIO::NetAccess::move( d, u, 0 ); assert( ok ); assert( !TQFile::exists( dest ) ); assert( TQFile::exists( src ) ); // it's back @@ -363,15 +363,15 @@ static void moveLocalSymlink( const TQString& src, const TQString& dest ) d.setPath( dest ); // move the symlink with move, NOT with file_move - bool ok = KIO::NetAccess::move( u, d ); + bool ok = TDEIO::NetAccess::move( u, d ); if ( !ok ) - kdWarning() << KIO::NetAccess::lastError() << endl; + kdWarning() << TDEIO::NetAccess::lastError() << endl; assert( ok ); assert ( KDE_lstat( TQFile::encodeName( dest ), &buf ) == 0 ); assert( !TQFile::exists( src ) ); // not there anymore - // move it back with KIO::move() - ok = KIO::NetAccess::move( d, u, 0 ); + // move it back with TDEIO::move() + ok = TDEIO::NetAccess::move( d, u, 0 ); assert( ok ); assert ( KDE_lstat( TQFile::encodeName( dest ), &buf ) != 0 ); // doesn't exist anymore assert ( KDE_lstat( TQFile::encodeName( src ), &buf ) == 0 ); // it's back @@ -388,7 +388,7 @@ void JobTest::moveLocalDirectory( const TQString& src, const TQString& dest ) KURL d; d.setPath( dest ); - bool ok = KIO::NetAccess::move( u, d, 0 ); + bool ok = TDEIO::NetAccess::move( u, d, 0 ); assert( ok ); assert( TQFile::exists( dest ) ); assert( TQFileInfo( dest ).isDir() ); @@ -455,12 +455,12 @@ void JobTest::moveFileNoPermissions() KURL d; d.setPath( dest ); - KIO::CopyJob* job = KIO::move( u, d, 0 ); + TDEIO::CopyJob* job = TDEIO::move( u, d, 0 ); job->setInteractive( false ); // no skip dialog, thanks TQMap metaData; - bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); assert( !ok ); - assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED ); // OK this is fishy. Just like mv(1), KIO's behavior depends on whether // a direct rename(2) was used, or a full copy+del. In the first case // there is no destination file created, but in the second case the @@ -482,12 +482,12 @@ void JobTest::moveDirectoryNoPermissions() KURL d; d.setPath( dest ); - KIO::CopyJob* job = KIO::move( u, d, 0 ); + TDEIO::CopyJob* job = TDEIO::move( u, d, 0 ); job->setInteractive( false ); // no skip dialog, thanks TQMap metaData; - bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); assert( !ok ); - assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED ); assert( TQFile::exists( dest ) ); // see moveFileNoPermissions assert( TQFile::exists( src ) ); } @@ -497,10 +497,10 @@ void JobTest::listRecursive() const TQString src = homeTmpDir(); KURL u; u.setPath( src ); - KIO::ListJob* job = KIO::listRecursive( u ); - connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::ListJob* job = TDEIO::listRecursive( u ); + connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); m_names.sort(); check( "listRecursive", m_names.join( "," ), ".,..," @@ -510,18 +510,18 @@ void JobTest::listRecursive() "fileFromHome,fileFromHome_copied" ); } -void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst ) +void JobTest::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst ) { - for( KIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { - KIO::UDSEntry::ConstIterator it2 = (*it).begin(); + for( TDEIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + TDEIO::UDSEntry::ConstIterator it2 = (*it).begin(); TQString displayName; KURL url; for( ; it2 != (*it).end(); it2++ ) { switch ((*it2).m_uds) { - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: displayName = (*it2).m_str; break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: url = (*it2).m_str; break; } @@ -564,10 +564,10 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) kdDebug() << "copying " << u << " to " << d << endl; // copy the file with file_copy - KIO::FileCopyJob* job = KIO::file_copy( u, d ); - connect( job, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&)), - this, TQT_SLOT(slotMimetype(KIO::Job*,const TQString&)) ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d ); + connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); TQString dest = realSystemPath() + "fileFromHome_copied"; @@ -587,9 +587,9 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) assert( m_mimetype == "application/octet-stream" ); //assert( m_mimetype == "text/plain" ); - // cleanup and retry with KIO::copy() + // cleanup and retry with TDEIO::copy() TQFile::remove( dest ); - ok = KIO::NetAccess::dircopy( u, d, 0 ); + ok = TDEIO::NetAccess::dircopy( u, d, 0 ); assert( ok ); assert( TQFile::exists( dest ) ); assert( TQFile::exists( src ) ); // still there @@ -604,7 +604,7 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) kio_resolve_local_urls = true; } -void JobTest::slotMimetype(KIO::Job* job, const TQString& type) +void JobTest::slotMimetype(TDEIO::Job* job, const TQString& type) { assert( job ); m_mimetype = type; diff --git a/kio/tests/jobtest.h b/kio/tests/jobtest.h index 83ec2da7c..61051fbaf 100644 --- a/kio/tests/jobtest.h +++ b/kio/tests/jobtest.h @@ -54,9 +54,9 @@ public: void copyFileToSystem(); private slots: - void slotEntries( KIO::Job*, const KIO::UDSEntryList& lst ); - void slotGetResult( KIO::Job* ); - void slotMimetype(KIO::Job*,const TQString&); + void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst ); + void slotGetResult( TDEIO::Job* ); + void slotMimetype(TDEIO::Job*,const TQString&); private: TQString homeTmpDir() const; diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp index e62408204..79ad44e3c 100644 --- a/kio/tests/kdefaultprogresstest.cpp +++ b/kio/tests/kdefaultprogresstest.cpp @@ -3,7 +3,7 @@ #include #include -using namespace KIO; +using namespace TDEIO; int main(int argc, char **argv) { diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 01d0a36e9..000fb200c 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -82,10 +82,10 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) debug, TQT_SLOT( infoMessage( const TQString& ) ) ); connect( lister, TQT_SIGNAL( percent( int ) ), debug, TQT_SLOT( percent( int ) ) ); - connect( lister, TQT_SIGNAL( totalSize( KIO::filesize_t ) ), - debug, TQT_SLOT( totalSize( KIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( processedSize( KIO::filesize_t ) ), - debug, TQT_SLOT( processedSize( KIO::filesize_t ) ) ); + connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), + debug, TQT_SLOT( totalSize( TDEIO::filesize_t ) ) ); + connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), + debug, TQT_SLOT( processedSize( TDEIO::filesize_t ) ) ); connect( lister, TQT_SIGNAL( speed( int ) ), debug, TQT_SLOT( speed( int ) ) ); diff --git a/kio/tests/kdirlistertest.h b/kio/tests/kdirlistertest.h index 12e72c911..065f7478d 100644 --- a/kio/tests/kdirlistertest.h +++ b/kio/tests/kdirlistertest.h @@ -88,10 +88,10 @@ public slots: void percent( int percent ) { cout << "*** percent: " << percent << endl; } - void totalSize( KIO::filesize_t size ) + void totalSize( TDEIO::filesize_t size ) { cout << "*** totalSize: " << (long)size << endl; } - void processedSize( KIO::filesize_t size ) + void processedSize( TDEIO::filesize_t size ) { cout << "*** processedSize: " << (long)size << endl; } void speed( int bytes_per_second ) diff --git a/kio/tests/kionetrctest.cpp b/kio/tests/kionetrctest.cpp index 82c669c74..2d96c8495 100644 --- a/kio/tests/kionetrctest.cpp +++ b/kio/tests/kionetrctest.cpp @@ -8,8 +8,8 @@ void output( const KURL& u ) { kdDebug() << "Looking up auto login for: " << u.url() << endl; - KIO::NetRC::AutoLogin l; - bool result = KIO::NetRC::self()->lookup( u, l, true ); + TDEIO::NetRC::AutoLogin l; + bool result = TDEIO::NetRC::self()->lookup( u, l, true ); if ( !result ) { kdDebug() << "Either no .netrc and/or .kionetrc file was " diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp index 2bbdaa658..adb14a306 100644 --- a/kio/tests/kiopassdlgtest.cpp +++ b/kio/tests/kiopassdlgtest.cpp @@ -15,7 +15,7 @@ int main ( int argc, char** argv ) TQString usr, pass, comment, label; label = "Site:"; comment = "localhost"; - int res = KIO::PasswordDialog::getNameAndPassword( usr, pass, 0L, + int res = TDEIO::PasswordDialog::getNameAndPassword( usr, pass, 0L, TQString::null, false, TQString::null, comment, label ); diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index 72a7ffb05..27a99eabc 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -26,7 +26,7 @@ #include "kioslavetest.h" -using namespace KIO; +using namespace TDEIO; KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) : KMainWindow(0, "") @@ -165,10 +165,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) setCentralWidget( main_widget ); slave = 0; -// slave = KIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org")); - KIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(KIO::Slave*)), +// slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org")); + TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)), this, TQT_SLOT(slotSlaveConnected())); - KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave*,int,const TQString&)), + TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), this, TQT_SLOT(slotSlaveError())); } @@ -183,7 +183,7 @@ void KioslaveTest::slotQuit(){ job->kill( true ); // kill the job quietly } if (slave) - KIO::Scheduler::disconnectSlave(slave); + TDEIO::Scheduler::disconnectSlave(slave); kapp->quit(); } @@ -241,70 +241,70 @@ void KioslaveTest::startJob() { switch ( selectedOperation ) { case List: - myJob = KIO::listDir( src ); - connect(myJob, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)), - TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&))); + myJob = TDEIO::listDir( src ); + connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case ListRecursive: - myJob = KIO::listRecursive( src ); - connect(myJob, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)), - TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&))); + myJob = TDEIO::listRecursive( src ); + connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case Stat: - myJob = KIO::stat( src, false, 2 ); + myJob = TDEIO::stat( src, false, 2 ); break; case Get: - myJob = KIO::get( src, true ); - connect(myJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( KIO::Job*, const TQByteArray &))); + myJob = TDEIO::get( src, true ); + connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); break; case Put: putBuffer = 0; - myJob = KIO::put( src, -1, true, false); - connect(myJob, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray &)), - TQT_SLOT( slotDataReq( KIO::Job*, TQByteArray &))); + myJob = TDEIO::put( src, -1, true, false); + connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), + TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); break; case Copy: - job = KIO::copy( src, dest, observe ); + job = TDEIO::copy( src, dest, observe ); break; case Move: - job = KIO::move( src, dest, observe ); + job = TDEIO::move( src, dest, observe ); break; case Delete: - job = KIO::del( src, false, observe ); + job = TDEIO::del( src, false, observe ); break; case Shred: - job = KIO::del(src, true, observe); + job = TDEIO::del(src, true, observe); break; case Mkdir: - myJob = KIO::mkdir( src ); + myJob = TDEIO::mkdir( src ); break; case Mimetype: - myJob = KIO::mimetype( src ); + myJob = TDEIO::mimetype( src ); break; } if (myJob) { if (slave) - KIO::Scheduler::assignJobToSlave(slave, myJob); + TDEIO::Scheduler::assignJobToSlave(slave, myJob); job = myJob; } - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( canceled( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); if (progressMode == ProgressStatus) { statusProgress->setJob( job ); @@ -314,7 +314,7 @@ void KioslaveTest::startJob() { } -void KioslaveTest::slotResult( KIO::Job * _job ) +void KioslaveTest::slotResult( TDEIO::Job * _job ) { if ( _job->error() ) { @@ -322,12 +322,12 @@ void KioslaveTest::slotResult( KIO::Job * _job ) } else if ( selectedOperation == Stat ) { - UDSEntry entry = ((KIO::StatJob*)_job)->statResult(); + UDSEntry entry = ((TDEIO::StatJob*)_job)->statResult(); printUDSEntry( entry ); } else if ( selectedOperation == Mimetype ) { - kdDebug() << "mimetype is " << ((KIO::MimetypeJob*)_job)->mimetype() << endl; + kdDebug() << "mimetype is " << ((TDEIO::MimetypeJob*)_job)->mimetype() << endl; } if (job == _job) @@ -357,62 +357,62 @@ static void printACL( const TQString& acl ) } -void KioslaveTest::printUDSEntry( const KIO::UDSEntry & entry ) +void KioslaveTest::printUDSEntry( const TDEIO::UDSEntry & entry ) { - KIO::UDSEntry::ConstIterator it = entry.begin(); + TDEIO::UDSEntry::ConstIterator it = entry.begin(); for( ; it != entry.end(); it++ ) { switch ((*it).m_uds) { - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: kdDebug() << "File Type : " << (mode_t)((*it).m_long) << endl; if ( S_ISDIR( (mode_t)((*it).m_long) ) ) { kdDebug() << "is a dir" << endl; } break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: kdDebug() << "Access permissions : " << (*it).m_long << endl; break; - case KIO::UDS_EXTENDED_ACL: + case TDEIO::UDS_EXTENDED_ACL: if( (*it).m_long == 1 ) kdDebug() << "Has extended ACL information." << endl; break; - case KIO::UDS_ACL_STRING: + case TDEIO::UDS_ACL_STRING: kdDebug() << "ACL: " << ( (*it).m_str.ascii() ) << endl; printACL( (*it).m_str ); break; - case KIO::UDS_DEFAULT_ACL_STRING: + case TDEIO::UDS_DEFAULT_ACL_STRING: kdDebug() << "Default ACL: " << ( (*it).m_str.ascii() ) << endl; printACL( (*it).m_str ); break; - case KIO::UDS_USER: + case TDEIO::UDS_USER: kdDebug() << "User : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: kdDebug() << "Group : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: kdDebug() << "Name : " << ((*it).m_str.ascii() ) << endl; //m_strText = decodeFileName( (*it).m_str ); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: kdDebug() << "URL : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: kdDebug() << "MimeType : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: kdDebug() << "LinkDest : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_SIZE: - kdDebug() << "Size: " << KIO::convertSize((*it).m_long) << endl; + case TDEIO::UDS_SIZE: + kdDebug() << "Size: " << TDEIO::convertSize((*it).m_long) << endl; break; } } } -void KioslaveTest::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) { +void KioslaveTest::slotEntries(TDEIO::Job* job, const TDEIO::UDSEntryList& list) { - KURL url = static_cast( job )->url(); + KURL url = static_cast( job )->url(); KProtocolInfo::ExtraFieldList extraFields = KProtocolInfo::extraFields(url); UDSEntryListConstIterator it=list.begin(); for (; it != list.end(); ++it) { @@ -433,7 +433,7 @@ void KioslaveTest::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) { } } -void KioslaveTest::slotData(KIO::Job*, const TQByteArray &data) +void KioslaveTest::slotData(TDEIO::Job*, const TQByteArray &data) { if (data.size() == 0) { @@ -445,7 +445,7 @@ void KioslaveTest::slotData(KIO::Job*, const TQByteArray &data) } } -void KioslaveTest::slotDataReq(KIO::Job*, TQByteArray &data) +void KioslaveTest::slotDataReq(TDEIO::Job*, TQByteArray &data) { const char *fileDataArray[] = { diff --git a/kio/tests/kioslavetest.h b/kio/tests/kioslavetest.h index 02fae7f23..79533bbc5 100644 --- a/kio/tests/kioslavetest.h +++ b/kio/tests/kioslavetest.h @@ -41,7 +41,7 @@ protected: void closeEvent( TQCloseEvent * ); - void printUDSEntry( const KIO::UDSEntry & entry ); + void printUDSEntry( const TDEIO::UDSEntry & entry ); // info stuff TQLabel *lb_from; @@ -84,25 +84,25 @@ protected slots: void startJob(); void stopJob(); - void slotResult( KIO::Job * ); - void slotEntries( KIO::Job *, const KIO::UDSEntryList& ); - void slotData( KIO::Job *, const TQByteArray &data ); - void slotDataReq( KIO::Job *, TQByteArray &data ); + void slotResult( TDEIO::Job * ); + void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ); + void slotData( TDEIO::Job *, const TQByteArray &data ); + void slotDataReq( TDEIO::Job *, TQByteArray &data ); void slotQuit(); void slotSlaveConnected(); void slotSlaveError(); private: - KIO::Job *job; + TDEIO::Job *job; TQWidget *main_widget; - KIO::StatusbarProgress *statusProgress; + TDEIO::StatusbarProgress *statusProgress; int selectedOperation; int progressMode; int putBuffer; - KIO::Slave *slave; + TDEIO::Slave *slave; }; #endif // _KIOSLAVETEST_H diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp index 66b02bae0..811f03923 100644 --- a/kio/tests/kpropsdlgtest.cpp +++ b/kio/tests/kpropsdlgtest.cpp @@ -25,7 +25,7 @@ int main ( int argc, char** argv ) KURL u = args->url( 0 ); // This is the test for the KPropertiesDialog constructor that is now - // documented to NOT work. Passing only a URL means a KIO::stat will happen, + // documented to NOT work. Passing only a URL means a TDEIO::stat will happen, // and asking for the dialog to be modal too creates problems. // (A non-modal, URL-only dialog is the one kicker uses for app buttons, no problem there) KPropertiesDialog* dlg = new KPropertiesDialog( u, 0, 0, true /*modal*/, false /*we do exec ourselves*/ ); diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index 9f4e09013..a5ed8da9d 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -354,7 +354,7 @@ int main(int argc, char **argv) filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" ); // Clean up - KIO::NetAccess::del( tdehome, 0 ); + TDEIO::NetAccess::del( tdehome, 0 ); kdDebug() << "All tests done. Go home..." << endl; return 0; diff --git a/kio/tests/netaccesstest.cpp b/kio/tests/netaccesstest.cpp index a9aeb66d4..c83f45aae 100644 --- a/kio/tests/netaccesstest.cpp +++ b/kio/tests/netaccesstest.cpp @@ -31,8 +31,8 @@ int main(int argc, char **argv) for ( uint i = 0; i < 4 ; ++i ) { kdDebug() << "file_copy" << endl; - if ( !KIO::NetAccess::file_copy(srcURL, tmpURL, -1, true, false, 0) ) - kdError() << "file_copy failed: " << KIO::NetAccess::lastErrorString() << endl; + if ( !TDEIO::NetAccess::file_copy(srcURL, tmpURL, -1, true, false, 0) ) + kdError() << "file_copy failed: " << TDEIO::NetAccess::lastErrorString() << endl; else { TQFile f( tmpURL.path() ); if (!f.open(IO_ReadOnly)) diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp index 52dea6ac7..62f6c3d62 100644 --- a/kio/tests/previewtest.cpp +++ b/kio/tests/previewtest.cpp @@ -30,13 +30,13 @@ void PreviewTest::slotGenerate() { KURL::List urls; urls.append(m_url->text()); - KIO::PreviewJob *job = KIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*))); + TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed())); } -void PreviewTest::slotResult(KIO::Job*) +void PreviewTest::slotResult(TDEIO::Job*) { kdDebug() << "PreviewTest::slotResult(...)" << endl; } diff --git a/kio/tests/previewtest.h b/kio/tests/previewtest.h index 27d797403..a749e95a3 100644 --- a/kio/tests/previewtest.h +++ b/kio/tests/previewtest.h @@ -14,7 +14,7 @@ public: private slots: void slotGenerate(); - void slotResult(KIO::Job *); + void slotResult(TDEIO::Job *); void slotPreview( const KFileItem *, const TQPixmap & ); void slotFailed(); diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp index ae94d83e6..44a7d9330 100644 --- a/kio/tests/speed.cpp +++ b/kio/tests/speed.cpp @@ -25,21 +25,21 @@ #include #include -using namespace KIO; +using namespace TDEIO; SpeedTest::SpeedTest( const KURL & url ) : TQObject(0, "speed") { Job *job = listRecursive( url ); //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS ! - connect(job, TQT_SIGNAL( result( KIO::Job*)), - TQT_SLOT( finished( KIO::Job* ) )); - /*connect(job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)), - TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList&))); + connect(job, TQT_SIGNAL( result( TDEIO::Job*)), + TQT_SLOT( finished( TDEIO::Job* ) )); + /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); */ } -void SpeedTest::entries(KIO::Job*, const UDSEntryList& list) { +void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) { UDSEntryListConstIterator it=list.begin(); for (; it != list.end(); ++it) { @@ -65,7 +65,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - TDECmdLineArgs::init( argc, argv, "speedapp", "A KIO::listRecursive testing tool", "0.0" ); + TDECmdLineArgs::init( argc, argv, "speedapp", "A TDEIO::listRecursive testing tool", "0.0" ); TDECmdLineArgs::addCmdLineOptions( options ); @@ -79,15 +79,15 @@ int main(int argc, char **argv) { else url = "file:" + TQDir::currentDirPath(); - kdDebug() << url.url() << " is probably " << (KIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n"; - kdDebug() << url.url() << " is " << (KIO::manually_mounted(url.path()) ? "manually" : "system") << " mounted\n"; - TQString mp = KIO::findDeviceMountPoint(url.path()); + kdDebug() << url.url() << " is probably " << (TDEIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n"; + kdDebug() << url.url() << " is " << (TDEIO::manually_mounted(url.path()) ? "manually" : "system") << " mounted\n"; + TQString mp = TDEIO::findDeviceMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for device " << url.url() << " found\n"; } else kdDebug() << mp << " is the mount point for device " << url.url() << endl; - mp = KIO::findPathMountPoint(url.path()); + mp = TDEIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -95,7 +95,7 @@ int main(int argc, char **argv) { // SpeedTest test( url ); // app.exec(); - mp = KIO::findPathMountPoint(url.path()); + mp = TDEIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -105,7 +105,7 @@ int main(int argc, char **argv) { url.setPath(TQDir::homeDirPath()); - mp = KIO::findPathMountPoint(url.path()); + mp = TDEIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -113,7 +113,7 @@ int main(int argc, char **argv) { // SpeedTest test( url ); // app.exec(); - mp = KIO::findPathMountPoint(url.path()); + mp = TDEIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else @@ -126,7 +126,7 @@ int main(int argc, char **argv) { else url = "file:" + TQDir::currentDirPath(); - mp = KIO::findPathMountPoint(url.path()); + mp = TDEIO::findPathMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for path " << url.url() << " found\n"; } else diff --git a/kio/tests/speed.h b/kio/tests/speed.h index 69b12465f..5b928a18e 100644 --- a/kio/tests/speed.h +++ b/kio/tests/speed.h @@ -5,7 +5,7 @@ #include #include -namespace KIO { +namespace TDEIO { class Job; } @@ -16,8 +16,8 @@ public: SpeedTest(const KURL & url); private slots: - void entries( KIO::Job *, const KIO::UDSEntryList& ); - void finished( KIO::Job *job ); + void entries( TDEIO::Job *, const TDEIO::UDSEntryList& ); + void finished( TDEIO::Job *job ); }; diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc index 9b906ffb5..73a037b91 100644 --- a/kioslave/file/file.cc +++ b/kioslave/file/file.cc @@ -96,7 +96,7 @@ #include #include -using namespace KIO; +using namespace TDEIO; #define MAX_IPC_SIZE (1024*32) @@ -192,16 +192,16 @@ void FileProtocol::chmod( const KURL& url, int permissions ) switch (errno) { case EPERM: case EACCES: - error( KIO::ERR_ACCESS_DENIED, url.path() ); + error( TDEIO::ERR_ACCESS_DENIED, url.path() ); break; case ENOTSUP: - error( KIO::ERR_UNSUPPORTED_ACTION, url.path() ); + error( TDEIO::ERR_UNSUPPORTED_ACTION, url.path() ); break; case ENOSPC: - error( KIO::ERR_DISK_FULL, url.path() ); + error( TDEIO::ERR_DISK_FULL, url.path() ); break; default: - error( KIO::ERR_CANNOT_CHMOD, url.path() ); + error( TDEIO::ERR_CANNOT_CHMOD, url.path() ); } } else finished(); @@ -217,13 +217,13 @@ void FileProtocol::mkdir( const KURL& url, int permissions ) if ( KDE_stat( _path.data(), &buff ) == -1 ) { if ( ::mkdir( _path.data(), 0777 /*umask will be applied*/ ) != 0 ) { if ( errno == EACCES ) { - error( KIO::ERR_ACCESS_DENIED, url.path() ); + error( TDEIO::ERR_ACCESS_DENIED, url.path() ); return; } else if ( errno == ENOSPC ) { - error( KIO::ERR_DISK_FULL, url.path() ); + error( TDEIO::ERR_DISK_FULL, url.path() ); return; } else { - error( KIO::ERR_COULD_NOT_MKDIR, url.path() ); + error( TDEIO::ERR_COULD_NOT_MKDIR, url.path() ); return; } } else { @@ -237,10 +237,10 @@ void FileProtocol::mkdir( const KURL& url, int permissions ) if ( S_ISDIR( buff.st_mode ) ) { kdDebug(7101) << "ERR_DIR_ALREADY_EXIST" << endl; - error( KIO::ERR_DIR_ALREADY_EXIST, url.path() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, url.path() ); return; } - error( KIO::ERR_FILE_ALREADY_EXIST, url.path() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, url.path() ); return; } @@ -258,24 +258,24 @@ void FileProtocol::get( const KURL& url ) KDE_struct_stat buff; if ( KDE_stat( _path.data(), &buff ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, url.path() ); + error( TDEIO::ERR_ACCESS_DENIED, url.path() ); else - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } if ( S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, url.path() ); + error( TDEIO::ERR_IS_DIRECTORY, url.path() ); return; } if ( !S_ISREG( buff.st_mode ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } int fd = KDE_open( _path.data(), O_RDONLY); if ( fd < 0 ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } @@ -288,20 +288,20 @@ void FileProtocol::get( const KURL& url ) KMimeType::Ptr mt = KMimeType::findByURL( url, buff.st_mode, true /* local URL */ ); emit mimeType( mt->name() ); - KIO::filesize_t processed_size = 0; + TDEIO::filesize_t processed_size = 0; TQString resumeOffset = metaData("resume"); if ( !resumeOffset.isEmpty() ) { bool ok; - KIO::fileoffset_t offset = resumeOffset.toLongLong(&ok); + TDEIO::fileoffset_t offset = resumeOffset.toLongLong(&ok); if (ok && (offset > 0) && (offset < buff.st_size)) { if (KDE_lseek(fd, offset, SEEK_SET) == offset) { canResume (); processed_size = offset; - kdDebug( 7101 ) << "Resume offset: " << KIO::number(offset) << endl; + kdDebug( 7101 ) << "Resume offset: " << TDEIO::number(offset) << endl; } } } @@ -318,7 +318,7 @@ void FileProtocol::get( const KURL& url ) { if (errno == EINTR) continue; - error( KIO::ERR_COULD_NOT_READ, url.path()); + error( TDEIO::ERR_COULD_NOT_READ, url.path()); close(fd); return; } @@ -332,7 +332,7 @@ void FileProtocol::get( const KURL& url ) processed_size += n; processedSize( processed_size ); - //kdDebug( 7101 ) << "Processed: " << KIO::number (processed_size) << endl; + //kdDebug( 7101 ) << "Processed: " << TDEIO::number (processed_size) << endl; } data( TQByteArray() ); @@ -395,7 +395,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum if (bPartExists && !_resume && !_overwrite && buff_part.st_size > 0 && S_ISREG(buff_part.st_mode)) { kdDebug(7101) << "FileProtocol::put : calling canResume with " - << KIO::number(buff_part.st_size) << endl; + << TDEIO::number(buff_part.st_size) << endl; // Maybe we can use this partial file for resuming // Tell about the size we have, and the app will tell us @@ -409,9 +409,9 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum if ( bOrigExists && !_overwrite && !_resume) { if (S_ISDIR(buff_orig.st_mode)) - error( KIO::ERR_DIR_ALREADY_EXIST, dest_orig ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dest_orig ); else - error( KIO::ERR_FILE_ALREADY_EXIST, dest_orig ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dest_orig ); return; } @@ -479,9 +479,9 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum kdDebug(7101) << "####################### COULD NOT WRITE " << dest << " _mode=" << _mode << endl; kdDebug(7101) << "errno==" << errno << "(" << strerror(errno) << ")" << endl; if ( errno == EACCES ) - error( KIO::ERR_WRITE_ACCESS_DENIED, dest ); + error( TDEIO::ERR_WRITE_ACCESS_DENIED, dest ); else - error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest ); return; } } @@ -490,13 +490,13 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum { if ( errno == ENOSPC ) // disk full { - error( KIO::ERR_DISK_FULL, dest_orig); + error( TDEIO::ERR_DISK_FULL, dest_orig); result = -2; // means: remove dest file } else { kdWarning(7101) << "Couldn't write. Error:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, dest_orig); + error( TDEIO::ERR_COULD_NOT_WRITE, dest_orig); result = -1; } } @@ -534,7 +534,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum if ( close(fd) ) { kdWarning(7101) << "Error when closing file descriptor:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, dest_orig); + error( TDEIO::ERR_COULD_NOT_WRITE, dest_orig); return; } @@ -550,7 +550,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum if ( ::rename( _dest.data(), _dest_orig.data() ) ) { kdWarning(7101) << " Couldn't rename " << _dest << " to " << _dest_orig << endl; - error( KIO::ERR_CANNOT_RENAME_PARTIAL, dest_orig ); + error( TDEIO::ERR_CANNOT_RENAME_PARTIAL, dest_orig ); return; } } @@ -561,7 +561,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum if (::chmod(_dest_orig.data(), _mode) != 0) { // couldn't chmod. Eat the error if the filesystem apparently doesn't support it. - if ( KIO::testFileSystemFlag( _dest_orig, KIO::SupportsChmod ) ) + if ( TDEIO::testFileSystemFlag( _dest_orig, TDEIO::SupportsChmod ) ) warning( i18n( "Could not change permissions for\n%1" ).arg( dest_orig ) ); } } @@ -602,18 +602,18 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, if ( KDE_stat( _src.data(), &buff_src ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, src.path() ); + error( TDEIO::ERR_ACCESS_DENIED, src.path() ); else - error( KIO::ERR_DOES_NOT_EXIST, src.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, src.path() ); return; } if ( S_ISDIR( buff_src.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, src.path() ); + error( TDEIO::ERR_IS_DIRECTORY, src.path() ); return; } if ( S_ISFIFO( buff_src.st_mode ) || S_ISSOCK ( buff_src.st_mode ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, src.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.path() ); return; } @@ -623,19 +623,19 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, { if (S_ISDIR(buff_dest.st_mode)) { - error( KIO::ERR_DIR_ALREADY_EXIST, dest.path() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.path() ); return; } if ( same_inode( buff_dest, buff_src) ) { - error( KIO::ERR_IDENTICAL_FILES, dest.path() ); + error( TDEIO::ERR_IDENTICAL_FILES, dest.path() ); return; } if (!_overwrite) { - error( KIO::ERR_FILE_ALREADY_EXIST, dest.path() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.path() ); return; } @@ -651,7 +651,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, int src_fd = KDE_open( _src.data(), O_RDONLY); if ( src_fd < 0 ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, src.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.path() ); return; } @@ -670,9 +670,9 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, if ( dest_fd < 0 ) { kdDebug(7101) << "###### COULD NOT WRITE " << dest.url() << endl; if ( errno == EACCES ) { - error( KIO::ERR_WRITE_ACCESS_DENIED, dest.path() ); + error( TDEIO::ERR_WRITE_ACCESS_DENIED, dest.path() ); } else { - error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.path() ); } close(src_fd); return; @@ -692,7 +692,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, #endif totalSize( buff_src.st_size ); - KIO::filesize_t processed_size = 0; + TDEIO::filesize_t processed_size = 0; char buffer[ MAX_IPC_SIZE ]; int n; #ifdef USE_SENDFILE @@ -723,17 +723,17 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, kdDebug(7101) << "sendfile() error:" << strerror(errno) << endl; if ( errno == ENOSPC ) // disk full { - error( KIO::ERR_DISK_FULL, dest.path()); + error( TDEIO::ERR_DISK_FULL, dest.path()); remove( _dest.data() ); } else { - error( KIO::ERR_SLAVE_DEFINED, + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Cannot copy file from %1 to %2. (Errno: %3)") .arg( src.path() ).arg( dest.path() ).arg( errno ) ); } } else #endif - error( KIO::ERR_COULD_NOT_READ, src.path()); + error( TDEIO::ERR_COULD_NOT_READ, src.path()); close(src_fd); close(dest_fd); #ifdef USE_POSIX_ACL @@ -753,13 +753,13 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, if ( errno == ENOSPC ) // disk full { - error( KIO::ERR_DISK_FULL, dest.path()); + error( TDEIO::ERR_DISK_FULL, dest.path()); remove( _dest.data() ); } else { kdWarning(7101) << "Couldn't write[2]. Error:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, dest.path()); + error( TDEIO::ERR_COULD_NOT_WRITE, dest.path()); } #ifdef USE_POSIX_ACL if (acl) acl_free(acl); @@ -778,7 +778,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, if (close( dest_fd)) { kdWarning(7101) << "Error when closing file descriptor[2]:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, dest.path()); + error( TDEIO::ERR_COULD_NOT_WRITE, dest.path()); #ifdef USE_POSIX_ACL if (acl) acl_free(acl); #endif @@ -795,7 +795,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, ) { // Eat the error if the filesystem apparently doesn't support chmod. - if ( KIO::testFileSystemFlag( _dest, KIO::SupportsChmod ) ) + if ( TDEIO::testFileSystemFlag( _dest, TDEIO::SupportsChmod ) ) warning( i18n( "Could not change permissions for\n%1" ).arg( dest.path() ) ); } } @@ -824,9 +824,9 @@ void FileProtocol::rename( const KURL &src, const KURL &dest, KDE_struct_stat buff_src; if ( KDE_lstat( _src.data(), &buff_src ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, src.path() ); + error( TDEIO::ERR_ACCESS_DENIED, src.path() ); else - error( KIO::ERR_DOES_NOT_EXIST, src.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, src.path() ); return; } @@ -836,19 +836,19 @@ void FileProtocol::rename( const KURL &src, const KURL &dest, { if (S_ISDIR(buff_dest.st_mode)) { - error( KIO::ERR_DIR_ALREADY_EXIST, dest.path() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.path() ); return; } if ( same_inode( buff_dest, buff_src) ) { - error( KIO::ERR_IDENTICAL_FILES, dest.path() ); + error( TDEIO::ERR_IDENTICAL_FILES, dest.path() ); return; } if (!_overwrite) { - error( KIO::ERR_FILE_ALREADY_EXIST, dest.path() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.path() ); return; } } @@ -856,16 +856,16 @@ void FileProtocol::rename( const KURL &src, const KURL &dest, if ( ::rename( _src.data(), _dest.data())) { if (( errno == EACCES ) || (errno == EPERM)) { - error( KIO::ERR_ACCESS_DENIED, dest.path() ); + error( TDEIO::ERR_ACCESS_DENIED, dest.path() ); } else if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename")); + error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename")); } else if (errno == EROFS) { // The file is on a read-only filesystem - error( KIO::ERR_CANNOT_DELETE, src.path() ); + error( TDEIO::ERR_CANNOT_DELETE, src.path() ); } else { - error( KIO::ERR_CANNOT_RENAME, src.path() ); + error( TDEIO::ERR_CANNOT_RENAME, src.path() ); } return; } @@ -886,7 +886,7 @@ void FileProtocol::symlink( const TQString &target, const KURL &dest, bool overw // Try to delete the destination if ( unlink( TQFile::encodeName( dest.path() ) ) != 0 ) { - error( KIO::ERR_CANNOT_DELETE, dest.path() ); + error( TDEIO::ERR_CANNOT_DELETE, dest.path() ); return; } // Try again - this won't loop forever since unlink succeeded @@ -897,16 +897,16 @@ void FileProtocol::symlink( const TQString &target, const KURL &dest, bool overw KDE_struct_stat buff_dest; KDE_lstat( TQFile::encodeName( dest.path() ), &buff_dest ); if (S_ISDIR(buff_dest.st_mode)) - error( KIO::ERR_DIR_ALREADY_EXIST, dest.path() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.path() ); else - error( KIO::ERR_FILE_ALREADY_EXIST, dest.path() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.path() ); return; } } else { // Some error occurred while we tried to symlink - error( KIO::ERR_CANNOT_SYMLINK, dest.path() ); + error( TDEIO::ERR_CANNOT_SYMLINK, dest.path() ); return; } } @@ -927,11 +927,11 @@ void FileProtocol::del( const KURL& url, bool isfile) if ( unlink( _path.data() ) == -1 ) { if ((errno == EACCES) || (errno == EPERM)) - error( KIO::ERR_ACCESS_DENIED, url.path()); + error( TDEIO::ERR_ACCESS_DENIED, url.path()); else if (errno == EISDIR) - error( KIO::ERR_IS_DIRECTORY, url.path()); + error( TDEIO::ERR_IS_DIRECTORY, url.path()); else - error( KIO::ERR_CANNOT_DELETE, url.path() ); + error( TDEIO::ERR_CANNOT_DELETE, url.path() ); return; } } else { @@ -944,10 +944,10 @@ void FileProtocol::del( const KURL& url, bool isfile) if ( ::rmdir( _path.data() ) == -1 ) { if ((errno == EACCES) || (errno == EPERM)) - error( KIO::ERR_ACCESS_DENIED, url.path()); + error( TDEIO::ERR_ACCESS_DENIED, url.path()); else { kdDebug( 7101 ) << "could not rmdir " << perror << endl; - error( KIO::ERR_COULD_NOT_RMDIR, url.path() ); + error( TDEIO::ERR_COULD_NOT_RMDIR, url.path() ); return; } } @@ -1001,7 +1001,7 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString & // because there's no real performance penalty in kio_file for returning the complete // details. Please consider doing it in your kioslave if you're using this one as a model :) UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = filename; entry.append( atom ); @@ -1019,7 +1019,7 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString & buffer2[ n ] = 0; } - atom.m_uds = KIO::UDS_LINK_DEST; + atom.m_uds = TDEIO::UDS_LINK_DEST; atom.m_str = TQFile::decodeName( buffer2 ); entry.append( atom ); @@ -1029,15 +1029,15 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString & type = S_IFMT - 1; access = S_IRWXU | S_IRWXG | S_IRWXO; - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = type; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = access; entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = 0L; entry.append( atom ); @@ -1053,15 +1053,15 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString & type = buff.st_mode & S_IFMT; // extract file type access = buff.st_mode & 07777; // extract permissions - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = type; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = access; entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = buff.st_size; entry.append( atom ); @@ -1073,19 +1073,19 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString & #endif notype: - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = buff.st_mtime; entry.append( atom ); - atom.m_uds = KIO::UDS_USER; + atom.m_uds = TDEIO::UDS_USER; atom.m_str = getUserName( buff.st_uid ); entry.append( atom ); - atom.m_uds = KIO::UDS_GROUP; + atom.m_uds = TDEIO::UDS_GROUP; atom.m_str = getGroupName( buff.st_gid ); entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS_TIME; + atom.m_uds = TDEIO::UDS_ACCESS_TIME; atom.m_long = buff.st_atime; entry.append( atom ); @@ -1123,40 +1123,40 @@ void FileProtocol::stat( const KURL & url ) UDSEntry entry; if ( !createUDSEntry( url.fileName(), _path, entry, details, true /*with acls*/ ) ) { - error( KIO::ERR_DOES_NOT_EXIST, url.path(-1) ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path(-1) ); return; } #if 0 ///////// debug code - KIO::UDSEntry::ConstIterator it = entry.begin(); + TDEIO::UDSEntry::ConstIterator it = entry.begin(); for( ; it != entry.end(); it++ ) { switch ((*it).m_uds) { - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: kdDebug(7101) << "File Type : " << (mode_t)((*it).m_long) << endl; break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: kdDebug(7101) << "Access permissions : " << (mode_t)((*it).m_long) << endl; break; - case KIO::UDS_USER: + case TDEIO::UDS_USER: kdDebug(7101) << "User : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: kdDebug(7101) << "Group : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: kdDebug(7101) << "Name : " << ((*it).m_str.ascii() ) << endl; //m_strText = decodeFileName( (*it).m_str ); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: kdDebug(7101) << "URL : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: kdDebug(7101) << "MimeType : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: kdDebug(7101) << "LinkDest : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_EXTENDED_ACL: + case TDEIO::UDS_EXTENDED_ACL: kdDebug(7101) << "Contains extended ACL " << endl; break; } @@ -1188,12 +1188,12 @@ void FileProtocol::listDir( const KURL& url) KDE_struct_stat buff; if ( KDE_stat( _path.data(), &buff ) == -1 ) { - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } if ( !S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_IS_FILE, url.path() ); + error( TDEIO::ERR_IS_FILE, url.path() ); return; } @@ -1211,7 +1211,7 @@ void FileProtocol::listDir( const KURL& url) break; #endif default: - error( KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() ); + error( TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() ); break; } return; @@ -1280,7 +1280,7 @@ void FileProtocol::testDir( const TQString& path ) TQCString _path( TQFile::encodeName(path)); KDE_struct_stat buff; if ( KDE_stat( _path.data(), &buff ) == -1 ) { - error( KIO::ERR_DOES_NOT_EXIST, path ); + error( TDEIO::ERR_DOES_NOT_EXIST, path ); return; } @@ -1335,12 +1335,12 @@ void FileProtocol::special( const TQByteArray &data) TQString filename; stream >> filename; KShred shred( filename ); - connect( &shred, TQT_SIGNAL( processedSize( KIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( KIO::filesize_t ) ) ); + connect( &shred, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), + this, TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); connect( &shred, TQT_SIGNAL( infoMessage( const TQString & ) ), this, TQT_SLOT( slotInfoMessage( const TQString & ) ) ); if (!shred.shred()) - error( KIO::ERR_CANNOT_DELETE, filename ); + error( TDEIO::ERR_CANNOT_DELETE, filename ); else finished(); break; @@ -1351,7 +1351,7 @@ void FileProtocol::special( const TQByteArray &data) } // Connected to KShred -void FileProtocol::slotProcessedSize( KIO::filesize_t bytes ) +void FileProtocol::slotProcessedSize( TDEIO::filesize_t bytes ) { kdDebug(7101) << "FileProtocol::slotProcessedSize (" << (unsigned int) bytes << ")" << endl; processedSize( bytes ); @@ -1382,7 +1382,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c kdDebug(7101) << "VOLMGT: no media in " << devname.data() << endl; err = i18n("No Media inserted or Media not recognized."); - error( KIO::ERR_COULD_NOT_MOUNT, err ); + error( TDEIO::ERR_COULD_NOT_MOUNT, err ); return; } else { kdDebug(7101) << "VOLMGT: " << devname.data() @@ -1393,7 +1393,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c } else { err = i18n("\"vold\" is not running."); kdDebug(7101) << "VOLMGT: " << err << endl; - error( KIO::ERR_COULD_NOT_MOUNT, err ); + error( TDEIO::ERR_COULD_NOT_MOUNT, err ); return; } #else @@ -1425,7 +1425,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c path += TQString::fromLatin1(":") + epath; TQString mountProg = TDEGlobal::dirs()->findExe("mount", path); if (mountProg.isEmpty()){ - error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\"")); + error( TDEIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\"")); return; } @@ -1472,7 +1472,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c else { // Didn't work - or maybe we just got a warning - TQString mp = KIO::findDeviceMountPoint( _dev ); + TQString mp = TDEIO::findDeviceMountPoint( _dev ); // Is the device mounted ? if ( !mp.isEmpty() && mount_ret == 0) { @@ -1501,7 +1501,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c } else { - error( KIO::ERR_COULD_NOT_MOUNT, err ); + error( TDEIO::ERR_COULD_NOT_MOUNT, err ); return; } } @@ -1536,7 +1536,7 @@ void FileProtocol::unmount( const TQString& _point ) if( (mnttab = KDE_fopen( MNTTAB, "r" )) == NULL ) { err = "couldn't open mnttab"; kdDebug(7101) << "VOLMGT: " << err << endl; - error( KIO::ERR_COULD_NOT_UNMOUNT, err ); + error( TDEIO::ERR_COULD_NOT_UNMOUNT, err ); return; } @@ -1561,7 +1561,7 @@ void FileProtocol::unmount( const TQString& _point ) kdDebug(7101) << "VOLMGT: " << TQFile::encodeName(_point).data() << ": " << err << endl; - error( KIO::ERR_COULD_NOT_UNMOUNT, err ); + error( TDEIO::ERR_COULD_NOT_UNMOUNT, err ); return; } @@ -1599,7 +1599,7 @@ void FileProtocol::unmount( const TQString& _point ) */ err = i18n("\"vold\" is not running."); kdDebug(7101) << "VOLMGT: " << err << endl; - error( KIO::ERR_COULD_NOT_UNMOUNT, err ); + error( TDEIO::ERR_COULD_NOT_UNMOUNT, err ); return; } #else @@ -1610,7 +1610,7 @@ void FileProtocol::unmount( const TQString& _point ) TQString umountProg = TDEGlobal::dirs()->findExe("umount", path); if (umountProg.isEmpty()) { - error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\"")); + error( TDEIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\"")); return; } buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(TDEProcess::quote(_point)).data(), tmp ); @@ -1646,7 +1646,7 @@ void FileProtocol::unmount( const TQString& _point ) if ( err.isEmpty() ) finished(); else - error( KIO::ERR_COULD_NOT_UNMOUNT, err ); + error( TDEIO::ERR_COULD_NOT_UNMOUNT, err ); } /************************************* @@ -1805,19 +1805,19 @@ static void appendACLAtoms( const TQCString & path, UDSEntry& entry, mode_t type if ( acl || defaultAcl ) { kdDebug(7101) << path.data() << " has extended ACL entries " << endl; - atom.m_uds = KIO::UDS_EXTENDED_ACL; + atom.m_uds = TDEIO::UDS_EXTENDED_ACL; atom.m_long = 1; entry.append( atom ); } if ( withACL ) { if ( acl ) { - atom.m_uds = KIO::UDS_ACL_STRING; + atom.m_uds = TDEIO::UDS_ACL_STRING; atom.m_str = aclAsString( acl ); entry.append( atom ); kdDebug(7101) << path.data() << "ACL: " << atom.m_str << endl; } if ( defaultAcl ) { - atom.m_uds = KIO::UDS_DEFAULT_ACL_STRING; + atom.m_uds = TDEIO::UDS_DEFAULT_ACL_STRING; atom.m_str = aclAsString( defaultAcl ); entry.append( atom ); kdDebug(7101) << path.data() << "DEFAULT ACL: " << atom.m_str << endl; diff --git a/kioslave/file/file.h b/kioslave/file/file.h index 350703da5..9f9d98995 100644 --- a/kioslave/file/file.h +++ b/kioslave/file/file.h @@ -40,7 +40,7 @@ // Note that this header file is installed, so think twice // before breaking binary compatibility (read: it is forbidden :) -class FileProtocol : public TQObject, public KIO::SlaveBase +class FileProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT public: @@ -76,12 +76,12 @@ public: bool pmount( const TQString &dev ); protected slots: - void slotProcessedSize( KIO::filesize_t _bytes ); + void slotProcessedSize( TDEIO::filesize_t _bytes ); void slotInfoMessage( const TQString & msg ); protected: - bool createUDSEntry( const TQString & filename, const TQCString & path, KIO::UDSEntry & entry, + bool createUDSEntry( const TQString & filename, const TQCString & path, TDEIO::UDSEntry & entry, short int details, bool withACL ); int setACL( const char *path, mode_t perm, bool _directoryDefault ); diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc index 62ff5c59c..3d29e2b65 100644 --- a/kioslave/ftp/ftp.cc +++ b/kioslave/ftp/ftp.cc @@ -83,7 +83,7 @@ // JPF: somebody should find a better solution for this or move this to KIO // JPF: anyhow, in KDE 3.2.0 I found diffent MAX_IPC_SIZE definitions! -namespace KIO { +namespace TDEIO { enum buffersizes { /** * largest buffer size that should be used to transfer data between @@ -131,9 +131,9 @@ namespace KIO { } } -KIO::filesize_t Ftp::UnknownSize = (KIO::filesize_t)-1; +TDEIO::filesize_t Ftp::UnknownSize = (TDEIO::filesize_t)-1; -using namespace KIO; +using namespace TDEIO; extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } @@ -849,7 +849,7 @@ int Ftp::ftpOpenPASVDataConnection() assert(m_data == NULL); // ... but no data connection // Check that we can do PASV - const KSocketAddress *sa = m_control->peerAddress(); + const TDESocketAddress *sa = m_control->peerAddress(); if (sa != NULL && sa->family() != PF_INET) return ERR_INTERNAL; // no PASV for non-PF_INET connections @@ -910,7 +910,7 @@ int Ftp::ftpOpenEPSVDataConnection() assert(m_control != NULL); // must have control connection socket assert(m_data == NULL); // ... but no data connection - const KSocketAddress *sa = m_control->peerAddress(); + const TDESocketAddress *sa = m_control->peerAddress(); int portnum; // we are sure sa is a KInetSocketAddress, because we asked for KExtendedSocket::inetSocket // when we connected @@ -1127,7 +1127,7 @@ int Ftp::ftpAcceptConnect() } bool Ftp::ftpOpenCommand( const char *_command, const TQString & _path, char _mode, - int errorcode, KIO::fileoffset_t _offset ) + int errorcode, TDEIO::fileoffset_t _offset ) { int errCode = 0; if( !ftpDataMode(_mode) ) @@ -1428,15 +1428,15 @@ void Ftp::ftpShortStatAnswer( const TQString& filename, bool isDir ) UDSEntry entry; UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = filename; entry.append( atom ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = isDir ? S_IFDIR : S_IFREG; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; entry.append( atom ); @@ -1484,22 +1484,22 @@ void Ftp::stat( const KURL &url) UDSEntry entry; UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = TQString::null; entry.append( atom ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; entry.append( atom ); - atom.m_uds = KIO::UDS_USER; + atom.m_uds = TDEIO::UDS_USER; atom.m_str = "root"; entry.append( atom ); - atom.m_uds = KIO::UDS_GROUP; + atom.m_uds = TDEIO::UDS_GROUP; entry.append( atom ); // no size @@ -1551,15 +1551,15 @@ void Ftp::stat( const KURL &url) UDSEntry entry; UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = filename; entry.append( atom ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; entry.append( atom ); @@ -1987,7 +1987,7 @@ void Ftp::get( const KURL & url ) ftpCloseCommand(); // must close command! } -Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t llOffset) +Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, TDEIO::fileoffset_t llOffset) { // Calls error() by itself! if( !ftpOpenConnection(loginImplicit) ) @@ -2028,12 +2028,12 @@ Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fi if (!m_size) m_size = UnknownSize; } - KIO::filesize_t bytesLeft = 0; + TDEIO::filesize_t bytesLeft = 0; if ( m_size != UnknownSize ) bytesLeft = m_size - llOffset; kdDebug(7102) << "ftpGet: starting with offset=" << llOffset << endl; - KIO::fileoffset_t processed_size = llOffset; + TDEIO::fileoffset_t processed_size = llOffset; TQByteArray array; bool mimetypeEmitted = false; @@ -2137,7 +2137,7 @@ void Ftp::mimetype( const KURL& url ) } char buffer[ 2048 ]; TQByteArray array; - // Get one chunk of data only and send it, KIO::Job will determine the + // Get one chunk of data only and send it, TDEIO::Job will determine the // mimetype from it using KMimeMagic int n = m_data->read( buffer, 2048 ); array.setRawData(buffer, n); @@ -2284,7 +2284,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url, } else dest = dest_orig; - KIO::fileoffset_t offset = 0; + TDEIO::fileoffset_t offset = 0; // set the mode according to offset if( resume && m_size > 0 ) @@ -2304,7 +2304,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url, return statusServerError; kdDebug(7102) << "ftpPut: starting with offset=" << offset << endl; - KIO::fileoffset_t processed_size = offset; + TDEIO::fileoffset_t processed_size = offset; TQByteArray buffer; int result; @@ -2621,7 +2621,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop initialMode = 0666; // open the output file ... - KIO::fileoffset_t hCopyOffset = 0; + TDEIO::fileoffset_t hCopyOffset = 0; if(bResume) { iCopyFile = KDE_open( sPart.data(), O_RDWR ); // append if resuming diff --git a/kioslave/ftp/ftp.h b/kioslave/ftp/ftp.h index 44f0bdc71..8a847e6da 100644 --- a/kioslave/ftp/ftp.h +++ b/kioslave/ftp/ftp.h @@ -43,7 +43,7 @@ struct FtpEntry TQString group; TQString link; - KIO::filesize_t size; + TDEIO::filesize_t size; mode_t type; mode_t access; time_t date; @@ -233,7 +233,7 @@ private: //=============================================================================== // Ftp //=============================================================================== -class Ftp : public KIO::SlaveBase +class Ftp : public TDEIO::SlaveBase { // Ftp() {} @@ -369,7 +369,7 @@ private: * @return true if the command was accepted by the server. */ bool ftpOpenCommand( const char *command, const TQString & path, char mode, - int errorcode, KIO::fileoffset_t offset = 0 ); + int errorcode, TDEIO::fileoffset_t offset = 0 ); /** * The counterpart to openCommand. @@ -436,7 +436,7 @@ private: /** * Helper to fill an UDSEntry */ - void ftpCreateUDSEntry( const TQString & filename, FtpEntry& ftpEnt, KIO::UDSEntry& entry, bool isDir ); + void ftpCreateUDSEntry( const TQString & filename, FtpEntry& ftpEnt, TDEIO::UDSEntry& entry, bool isDir ); void ftpShortStatAnswer( const TQString& filename, bool isDir ); @@ -482,7 +482,7 @@ private: * @param hCopyOffset local file only: non-zero for resume * @return 0 for success, -1 for server error, -2 for client error */ - StatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t hCopyOffset); + StatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, TDEIO::fileoffset_t hCopyOffset); /** * This is the internal implementation of put() - see copy(). @@ -575,8 +575,8 @@ private: // data members bool m_bPasv; bool m_bUseProxy; - KIO::filesize_t m_size; - static KIO::filesize_t UnknownSize; + TDEIO::filesize_t m_size; + static TDEIO::filesize_t UnknownSize; enum { diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index f6e714988..cbff13fdf 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -90,7 +90,7 @@ #include -using namespace KIO; +using namespace TDEIO; extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); @@ -185,7 +185,7 @@ static TQString sanitizeCustomHTTPHeader(const TQString& _header) } -#define NO_SIZE ((KIO::filesize_t) -1) +#define NO_SIZE ((TDEIO::filesize_t) -1) #ifdef HAVE_STRTOLL #define STRTOLL strtoll @@ -465,7 +465,7 @@ bool HTTPProtocol::checkRequestURL( const KURL& u ) if (m_request.hostname.isEmpty()) { - error( KIO::ERR_UNKNOWN_HOST, i18n("No host specified.")); + error( TDEIO::ERR_UNKNOWN_HOST, i18n("No host specified.")); return false; } @@ -619,15 +619,15 @@ void HTTPProtocol::stat(const KURL& url) // When downloading we assume it exists UDSEntry entry; UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = url.fileName(); entry.append( atom ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFREG; // a file entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRUSR | S_IRGRP | S_IROTH; // readable by everybody entry.append( atom ); @@ -762,7 +762,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat ) KURL thisURL ( urlStr, encoding ); - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; if ( thisURL.isValid() ) { // don't list the base dir of a listDir() @@ -811,7 +811,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat ) } } -void HTTPProtocol::davGeneric( const KURL& url, KIO::HTTP_METHOD method ) +void HTTPProtocol::davGeneric( const KURL& url, TDEIO::HTTP_METHOD method ) { kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::davGeneric " << url.url() << endl; @@ -877,7 +877,7 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry& if ( hasMetaData( "davRequestResponse" ) ) { - atom.m_uds = KIO::UDS_XML_PROPERTIES; + atom.m_uds = TDEIO::UDS_XML_PROPERTIES; TQDomDocument doc; doc.appendChild(prop); atom.m_str = doc.toString(); @@ -899,14 +899,14 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry& if ( property.tagName() == "creationdate" ) { // Resource creation date. Should be is ISO 8601 format. - atom.m_uds = KIO::UDS_CREATION_TIME; + atom.m_uds = TDEIO::UDS_CREATION_TIME; atom.m_long = parseDateTime( property.text(), property.attribute("dt") ); entry.append( atom ); } else if ( property.tagName() == "getcontentlength" ) { // Content length (file size) - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = property.text().toULong(); entry.append( atom ); } @@ -952,7 +952,7 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry& else if ( property.tagName() == "getlastmodified" ) { // Last modification date - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = parseDateTime( property.text(), property.attribute("dt") ); entry.append( atom ); @@ -1009,27 +1009,27 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry& setMetaData( "davLockCount", TQString("%1").arg(lockCount) ); setMetaData( "davSupportedLockCount", TQString("%1").arg(supportedLockCount) ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = isDirectory ? S_IFDIR : S_IFREG; entry.append( atom ); if ( foundExecutable || isDirectory ) { // File was executable, or is a directory. - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = 0700; entry.append(atom); } else { - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = 0600; entry.append(atom); } if ( !isDirectory && !mimeType.isEmpty() ) { - atom.m_uds = KIO::UDS_MIME_TYPE; + atom.m_uds = TDEIO::UDS_MIME_TYPE; atom.m_str = mimeType; entry.append( atom ); } @@ -1553,7 +1553,7 @@ TQString HTTPProtocol::davError( int code /* = -1 */, TQString url ) url = m_request.url.url(); TQString action, errorString; - KIO::Error kError; + TDEIO::Error kError; // for 412 Precondition Failed TQString ow = i18n( "Otherwise, the request would have succeeded." ); @@ -1742,7 +1742,7 @@ TQString HTTPProtocol::davError( int code /* = -1 */, TQString url ) void HTTPProtocol::httpError() { TQString action, errorString; - KIO::Error kError; + TDEIO::Error kError; switch ( m_request.method ) { case HTTP_PUT: @@ -2187,10 +2187,10 @@ bool HTTPProtocol::httpOpen() { m_request.fcache = checkCacheEntry( ); - bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly); + bool bCacheOnly = (m_request.cache == TDEIO::CC_CacheOnly); bool bOffline = isOffline(m_request.doProxy ? m_proxyURL : m_request.url); - if (bOffline && (m_request.cache != KIO::CC_Reload)) - m_request.cache = KIO::CC_CacheOnly; + if (bOffline && (m_request.cache != TDEIO::CC_Reload)) + m_request.cache = TDEIO::CC_CacheOnly; if (m_request.cache == CC_Reload && m_request.fcache) { @@ -2198,7 +2198,7 @@ bool HTTPProtocol::httpOpen() fclose(m_request.fcache); m_request.fcache = 0; } - if ((m_request.cache == KIO::CC_CacheOnly) || (m_request.cache == KIO::CC_Cache)) + if ((m_request.cache == TDEIO::CC_CacheOnly) || (m_request.cache == TDEIO::CC_Cache)) m_request.bMustRevalidate = false; m_request.bCachedWrite = true; @@ -2429,8 +2429,8 @@ bool HTTPProtocol::httpOpen() if ( m_request.offset > 0 ) { - header += TQString("Range: bytes=%1-\r\n").arg(KIO::number(m_request.offset)); - kdDebug(7103) << "kio_http : Range = " << KIO::number(m_request.offset) << endl; + header += TQString("Range: bytes=%1-\r\n").arg(TDEIO::number(m_request.offset)); + kdDebug(7103) << "kio_http : Range = " << TDEIO::number(m_request.offset) << endl; } if ( m_request.cache == CC_Reload ) @@ -4092,7 +4092,7 @@ void HTTPProtocol::special( const TQByteArray &data ) KURL url; int method; stream >> url >> method; - davGeneric( url, (KIO::HTTP_METHOD) method ); + davGeneric( url, (TDEIO::HTTP_METHOD) method ); break; } case 99: // Close Connection @@ -4343,7 +4343,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ ) bool useMD5 = !m_sContentMD5.isEmpty(); // Deal with the size of the file. - KIO::filesize_t sz = m_request.offset; + TDEIO::filesize_t sz = m_request.offset; if ( sz ) m_iSize += sz; @@ -4354,7 +4354,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ ) if ( !dataInternal ) { if ( (m_iSize > 0) && (m_iSize != NO_SIZE)) { totalSize(m_iSize); - infoMessage( i18n( "Retrieving %1 from %2...").arg(KIO::convertSize(m_iSize)) + infoMessage( i18n( "Retrieving %1 from %2...").arg(TDEIO::convertSize(m_iSize)) .arg( m_request.hostname ) ); } else @@ -4411,7 +4411,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ ) m_iBytesLeft = NO_SIZE; kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::readBody: retrieve data. " - << KIO::number(m_iBytesLeft) << " left." << endl; + << TDEIO::number(m_iBytesLeft) << " left." << endl; // Main incoming loop... Gather everything while we can... m_cpMimeBuffer = false; @@ -4527,7 +4527,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ ) if (m_iBytesLeft == 0) { - kdDebug(7113) << "("<reparseConfiguration(); diff --git a/kioslave/http/kcookiejar/kcookiejar.h b/kioslave/http/kcookiejar/kcookiejar.h index eb64485ea..bb16d75d3 100644 --- a/kioslave/http/kcookiejar/kcookiejar.h +++ b/kioslave/http/kcookiejar/kcookiejar.h @@ -31,7 +31,7 @@ #include #include -class KConfig; +class TDEConfig; class KCookieJar; class KHttpCookie; class KHttpCookieList; @@ -146,12 +146,12 @@ public: /** * Save the cookie configuration */ - void saveConfig(KConfig *_config); + void saveConfig(TDEConfig *_config); /** * Load the cookie configuration */ - void loadConfig(KConfig *_config, bool reparse = false); + void loadConfig(TDEConfig *_config, bool reparse = false); /** * Looks for cookies in the cookie jar which are appropriate for _url. diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp b/kioslave/http/kcookiejar/kcookieserver.cpp index da9c16ce7..94df40b63 100644 --- a/kioslave/http/kcookiejar/kcookieserver.cpp +++ b/kioslave/http/kcookiejar/kcookieserver.cpp @@ -88,7 +88,7 @@ KCookieServer::KCookieServer(const TQCString &name) mAdvicePending = false; mTimer = new TQTimer(); connect( mTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotSave())); - mConfig = new KConfig("kcookiejarrc"); + mConfig = new TDEConfig("kcookiejarrc"); mCookieJar->loadConfig( mConfig ); TQString filename = locateLocal("data", "kcookiejar/cookies"); diff --git a/kioslave/http/kcookiejar/kcookieserver.h b/kioslave/http/kcookiejar/kcookieserver.h index 0c36f10b1..2cbb9ccf1 100644 --- a/kioslave/http/kcookiejar/kcookieserver.h +++ b/kioslave/http/kcookiejar/kcookieserver.h @@ -34,7 +34,7 @@ class KHttpCookie; class TQTimer; class RequestList; class DCOPClient; -class KConfig; +class TDEConfig; class KCookieServer : public KDEDModule { @@ -86,7 +86,7 @@ protected: TQTimer *mTimer; bool mAdvicePending; DCOPClient *mOldCookieServer; - KConfig *mConfig; + TDEConfig *mConfig; private: virtual int newInstance(TQValueList) { return 0; } diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp index 05f0ac0ea..236e2406b 100644 --- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp +++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp @@ -36,7 +36,7 @@ static const char *description = "KCookiejar regression test"; static KCookieJar *jar; static TQCString *lastYear; static TQCString *nextYear; -static KConfig *config = 0; +static TDEConfig *config = 0; static KCmdLineOptions options[] = @@ -87,7 +87,7 @@ static void clearConfig() delete config; TQString file = locateLocal("config", "kcookiejar-testconfig"); TQFile::remove(file); - config = new KConfig(file); + config = new TDEConfig(file); config->setGroup("Cookie Policy"); config->writeEntry("RejectCrossDomainCookies", false); config->writeEntry("AcceptSessionCookies", false); diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp index f5f7f8757..59f5f781e 100644 --- a/kioslave/iso/iso.cpp +++ b/kioslave/iso/iso.cpp @@ -54,7 +54,7 @@ static const unsigned char zisofs_magic[8] = { 0x37, 0xE4, 0x53, 0x96, 0xC9, 0xDB, 0xD6, 0x07 }; -using namespace KIO; +using namespace TDEIO; extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } @@ -241,7 +241,7 @@ void kio_isoProtocol::listDir( const KURL & url ) kdDebug() << "Checking (stat) on " << _path << endl; struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } // It's a real dir -> redirect @@ -278,12 +278,12 @@ void kio_isoProtocol::listDir( const KURL & url ) const KArchiveEntry* e = root->entry( path ); if ( !e ) { - error( KIO::ERR_DOES_NOT_EXIST, path ); + error( TDEIO::ERR_DOES_NOT_EXIST, path ); return; } if ( ! e->isDirectory() ) { - error( KIO::ERR_IS_FILE, path ); + error( TDEIO::ERR_IS_FILE, path ); return; } dir = (KArchiveDirectory*)e; @@ -328,17 +328,17 @@ void kio_isoProtocol::stat( const KURL & url ) struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) { kdDebug() << "isdir=" << S_ISDIR( buff.st_mode ) << " errno=" << strerror(errno) << endl; - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } // Real directory. Return just enough information for KRun to work UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = url.fileName(); entry.append( atom ); kdDebug() << "kio_isoProtocol::stat returning name=" << url.fileName() << endl; - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = buff.st_mode & S_IFMT; entry.append( atom ); @@ -363,7 +363,7 @@ void kio_isoProtocol::stat( const KURL & url ) } if ( !isoEntry ) { - error( KIO::ERR_DOES_NOT_EXIST, path ); + error( TDEIO::ERR_DOES_NOT_EXIST, path ); return; } createUDSEntry( isoEntry, entry ); @@ -412,7 +412,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat pptr = pointer_block.data(); } else { - error(KIO::ERR_COULD_NOT_READ, path); + error(TDEIO::ERR_COULD_NOT_READ, path); return; } } else { @@ -474,7 +474,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat } if (pos!=size) { - error(KIO::ERR_COULD_NOT_READ, path); + error(TDEIO::ERR_COULD_NOT_READ, path); return; } @@ -492,7 +492,7 @@ void kio_isoProtocol::get( const KURL & url ) TQString path; if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) ) { - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } @@ -501,12 +501,12 @@ void kio_isoProtocol::get( const KURL & url ) if ( !isoEntry ) { - error( KIO::ERR_DOES_NOT_EXIST, path ); + error( TDEIO::ERR_DOES_NOT_EXIST, path ); return; } if ( isoEntry->isDirectory() ) { - error( KIO::ERR_IS_DIRECTORY, path ); + error( TDEIO::ERR_IS_DIRECTORY, path ); return; } diff --git a/kioslave/iso/iso.h b/kioslave/iso/iso.h index 2a488bd9d..136c32736 100644 --- a/kioslave/iso/iso.h +++ b/kioslave/iso/iso.h @@ -28,7 +28,7 @@ class KIso; -class kio_isoProtocol : public KIO::SlaveBase +class kio_isoProtocol : public TDEIO::SlaveBase { public: kio_isoProtocol( const TQCString &pool, const TQCString &app ); @@ -40,7 +40,7 @@ public: protected: void getFile( const KIsoFile *isoFileEntry, const TQString &path ); - void createUDSEntry( const KArchiveEntry * isoEntry, KIO::UDSEntry & entry ); + void createUDSEntry( const KArchiveEntry * isoEntry, TDEIO::UDSEntry & entry ); bool checkNewFile( TQString fullPath, TQString & path, int startsec ); KIso * m_isoFile; diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp index 9ec1f1c3e..b19ec589b 100644 --- a/kioslave/iso/kiso.cpp +++ b/kioslave/iso/kiso.cpp @@ -324,9 +324,9 @@ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) { void KIso::readParams() { - KConfig *config; + TDEConfig *config; - config = new KConfig("kio_isorc"); + config = new TDEConfig("kio_isorc"); showhidden=config->readBoolEntry("showhidden",false); showrr=config->readBoolEntry("showrr",true); diff --git a/kioslave/metainfo/metainfo.cpp b/kioslave/metainfo/metainfo.cpp index 9bc99981f..66e5357f9 100644 --- a/kioslave/metainfo/metainfo.cpp +++ b/kioslave/metainfo/metainfo.cpp @@ -33,7 +33,7 @@ // mimeType - the mime type of the file, so we need not extra determine it // what - what to load -using namespace KIO; +using namespace TDEIO; extern "C" { diff --git a/kioslave/metainfo/metainfo.h b/kioslave/metainfo/metainfo.h index 491da62eb..a77647180 100644 --- a/kioslave/metainfo/metainfo.h +++ b/kioslave/metainfo/metainfo.h @@ -23,7 +23,7 @@ #include -class MetaInfoProtocol : public KIO::SlaveBase +class MetaInfoProtocol : public TDEIO::SlaveBase { public: MetaInfoProtocol(const TQCString &pool, const TQCString &app); diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 79e319964..c9523f230 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -460,7 +460,7 @@ void DockContainer::setPixmap(KDockWidget* widget ,const TQPixmap& pixmap) tab->setIcon(pixmap.isNull()?SmallIcon("misc"):pixmap); } -void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) +void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix) { // group name TQString grp=cfg->group(); @@ -504,7 +504,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) cfg->setGroup(grp); } -void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix) +void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix) { TQString grp=cfg->group(); cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); diff --git a/kmdi/kmdi/dockcontainer.h b/kmdi/kmdi/dockcontainer.h index ac27f8644..9b7478378 100644 --- a/kmdi/kmdi/dockcontainer.h +++ b/kmdi/kmdi/dockcontainer.h @@ -91,8 +91,8 @@ class DockContainer: public TQWidget, public KDockContainer void hideIfNeeded(); - virtual void save(KConfig *,const TQString& group_or_prefix); - virtual void load(KConfig *,const TQString& group_or_prefix); + virtual void save(TDEConfig *,const TQString& group_or_prefix); + virtual void load(TDEConfig *,const TQString& group_or_prefix); void setStyle(int); protected: diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 1233bc64b..64b375ef0 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -139,7 +139,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) // try to read the action shortcut KShortcut sc; - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); sc = KShortcut( cfg->readEntry( aname, "" ) ); diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 7c3da3878..af086ee51 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -624,7 +624,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); } -void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) +void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); @@ -671,7 +671,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) } -void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) +void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); diff --git a/kmdi/kmdidockcontainer.h b/kmdi/kmdidockcontainer.h index cb0d6e4ce..8dfe6664b 100644 --- a/kmdi/kmdidockcontainer.h +++ b/kmdi/kmdidockcontainer.h @@ -88,22 +88,22 @@ public: void hideIfNeeded(); /** - * Save the config using a KConfig object + * Save the config using a TDEConfig object * * The combination of the group_or_prefix variable and the parent * dockwidget's name will be the group the configuration is saved in * \param group_or_prefix the prefix to append to the parent dockwidget's name */ - virtual void save( KConfig *, const TQString& group_or_prefix ); + virtual void save( TDEConfig *, const TQString& group_or_prefix ); /** - * Load the config using a KConfig object + * Load the config using a TDEConfig object * * The combination of the group_or_prefix variable and the parent * dockwidget's name will be the group the configuration is loaded from * \param group_or_prefix the prefix to append to the parent dockwidget's name */ - virtual void load( KConfig *, const TQString& group_or_prefix ); + virtual void load( TDEConfig *, const TQString& group_or_prefix ); /** * Save the config to a QDomElement diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index 0057172d6..c2c34c55f 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -251,7 +251,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) // try to read the action shortcut KShortcut sc; - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup( "Shortcuts" ); // if ( cfg->hasKey( aname ) ) diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index 6a54e3a78..f8e03295c 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -52,8 +52,8 @@ struct DownloadDialog::Private TQWidget *m_page; KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l; TQPtrList m_installlist; - TQMap m_variantjobs; - TQMap m_variants; + TQMap m_variantjobs; + TQMap m_variants; TQMap m_newproviders; }; @@ -237,7 +237,7 @@ void DownloadDialog::addProvider(Provider *p) { if(!p->icon().protocol().isEmpty()) { - ret = KIO::NetAccess::download(p->icon(), tmp, this); + ret = TDEIO::NetAccess::download(p->icon(), tmp, this); if(ret) pix = TQPixmap(tmp); } else @@ -331,7 +331,7 @@ void DownloadDialog::addProvider(Provider *p) TQTimer::singleShot(100, this, TQT_SLOT(slotFinish())); } -void DownloadDialog::slotResult(KIO::Job *job) +void DownloadDialog::slotResult(TDEIO::Job *job) { TQDomDocument dom; TQDomElement knewstuff; @@ -459,7 +459,7 @@ void DownloadDialog::addEntry(Entry *entry) kdDebug() << "added entry " << entry->name() << endl; } -void DownloadDialog::slotData(KIO::Job *job, const TQByteArray &a) +void DownloadDialog::slotData(TDEIO::Job *job, const TQByteArray &a) { TQCString tmp(a, a.size() + 1); m_data[job].append(TQString::fromUtf8(tmp)); @@ -539,8 +539,8 @@ void DownloadDialog::slotInstall() KURL source = e->payload(); KURL dest = KURL(m_s->downloadDestination(e)); - KIO::FileCopyJob *job = KIO::file_copy(source, dest, -1, true); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotInstalled(KIO::Job*))); + TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*))); } } @@ -580,12 +580,12 @@ void DownloadDialog::install(Entry *e) d->m_lvtmp_d->setEnabled( true ); } -void DownloadDialog::slotInstalled(KIO::Job *job) +void DownloadDialog::slotInstalled(TDEIO::Job *job) { bool ret = job && (job->error() == 0); if(ret) { - KIO::FileCopyJob *cjob = ::tqqt_cast(job); + TDEIO::FileCopyJob *cjob = ::tqqt_cast(job); if(cjob) { ret = m_s->install(cjob->destURL().path()); @@ -673,7 +673,7 @@ void DownloadDialog::slotSelected() } else { - ret = KIO::NetAccess::download(e->preview(lang), tmp, this); + ret = TDEIO::NetAccess::download(e->preview(lang), tmp, this); } TQString desc = TQString("%1
      ").arg(e->name(lang)); @@ -770,7 +770,7 @@ void DownloadDialog::slotPage(TQWidget *w) void DownloadDialog::loadProvider(Provider *p) { - TQMap::Iterator it; + TQMap::Iterator it; for(it = d->m_variantjobs.begin(); it != d->m_variantjobs.end(); it++) { @@ -810,15 +810,15 @@ void DownloadDialog::loadProvider(Provider *p) TQString url = it.key(); TQStringList urlvariants = it.data(); - KIO::TransferJob *variantjob = KIO::get(url); + TDEIO::TransferJob *variantjob = TDEIO::get(url); d->m_newproviders[p] = p; d->m_variantjobs[variantjob] = p; d->m_variants[variantjob] = urlvariants; m_data[variantjob] = ""; - connect(variantjob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*))); - connect(variantjob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } if(variants.count() == 0) return; @@ -827,7 +827,7 @@ void DownloadDialog::loadProvider(Provider *p) kdDebug() << "-- reached old downloadurl section; variants left: " << variants.count() << endl; - KIO::TransferJob *job = KIO::get(p->downloadUrl()); + TDEIO::TransferJob *job = TDEIO::get(p->downloadUrl()); d->m_newproviders[p] = p; d->m_variantjobs[job] = p; @@ -835,9 +835,9 @@ void DownloadDialog::loadProvider(Provider *p) //m_jobs[job] = p; // not used anymore due to variants m_data[job] = ""; - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*))); - connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void DownloadDialog::setType(TQString type) diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h index 1f879d938..cfcd4858f 100644 --- a/knewstuff/downloaddialog.h +++ b/knewstuff/downloaddialog.h @@ -23,7 +23,7 @@ #include #include -namespace KIO +namespace TDEIO { class Job; } @@ -211,11 +211,11 @@ class KDE_EXPORT DownloadDialog : public KDialogBase void slotOk(); private slots: - void slotResult(KIO::Job *job); - void slotData(KIO::Job *job, const TQByteArray &a); + void slotResult(TDEIO::Job *job); + void slotData(TDEIO::Job *job, const TQByteArray &a); void slotInstall(); void slotDetails(); - void slotInstalled(KIO::Job *job); + void slotInstalled(TDEIO::Job *job); void slotTab(); void slotSelected(); void slotPage(TQWidget *w); @@ -244,8 +244,8 @@ class KDE_EXPORT DownloadDialog : public KDialogBase TQMap m_providers; TQMap m_rts; TQMap* > m_buttons; - TQMap m_jobs; - TQMap m_data; + TQMap m_jobs; + TQMap m_data; TQString m_filter; Engine *m_engine; Private *d; diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp index e460c2318..7152a0ccd 100644 --- a/knewstuff/engine.cpp +++ b/knewstuff/engine.cpp @@ -104,18 +104,18 @@ void Engine::getMetaInformation( Provider::List *providers ) for ( p = providers->first(); p; p = providers->next() ) { if ( p->downloadUrl().isEmpty() ) continue; - KIO::TransferJob *job = KIO::get( p->downloadUrl(), false, false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotNewStuffJobResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotNewStuffJobData( KIO::Job *, const TQByteArray & ) ) ); + TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) ); mNewStuffJobData.insert( job, "" ); mProviderJobs[ job ] = p; } } -void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ) +void Engine::slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data ) { if ( data.isEmpty() ) return; @@ -126,7 +126,7 @@ void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ) mNewStuffJobData[ job ].append( TQString::fromUtf8( str ) ); } -void Engine::slotNewStuffJobResult( KIO::Job *job ) +void Engine::slotNewStuffJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error downloading new stuff descriptions." << endl; @@ -199,12 +199,12 @@ void Engine::download( Entry *entry ) kdDebug() << " SOURCE: " << source.url() << endl; kdDebug() << " DESTINATION: " << destination.url() << endl; - KIO::FileCopyJob *job = KIO::file_copy( source, destination, -1, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotDownloadJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) ); } -void Engine::slotDownloadJobResult( KIO::Job *job ) +void Engine::slotDownloadJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error downloading new stuff payload." << endl; @@ -321,9 +321,9 @@ void Engine::upload( Entry *entry ) KURL destination = mUploadProvider->uploadUrl(); destination.setFileName( fi.fileName() ); - KIO::FileCopyJob *job = KIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadPayloadJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) ); } else { emit uploadFinished( false ); } @@ -364,7 +364,7 @@ bool Engine::createMetaFile( Entry *entry ) return true; } -void Engine::slotUploadPayloadJobResult( KIO::Job *job ) +void Engine::slotUploadPayloadJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error uploading new stuff payload." << endl; @@ -383,12 +383,12 @@ void Engine::slotUploadPayloadJobResult( KIO::Job *job ) KURL previewDestination = mUploadProvider->uploadUrl(); previewDestination.setFileName( fi.fileName() ); - KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); - connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadPreviewJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); + connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) ); } -void Engine::slotUploadPreviewJobResult( KIO::Job *job ) +void Engine::slotUploadPreviewJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error uploading new stuff preview." << endl; @@ -402,12 +402,12 @@ void Engine::slotUploadPreviewJobResult( KIO::Job *job ) KURL metaDestination = mUploadProvider->uploadUrl(); metaDestination.setFileName( fi.fileName() ); - KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); - connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadMetaJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); + connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) ); } -void Engine::slotUploadMetaJobResult( KIO::Job *job ) +void Engine::slotUploadMetaJobResult( TDEIO::Job *job ) { mUploadMetaFile = TQString::null; if ( job->error() ) { diff --git a/knewstuff/engine.h b/knewstuff/engine.h index f4b0b4920..374f9122d 100644 --- a/knewstuff/engine.h +++ b/knewstuff/engine.h @@ -27,7 +27,7 @@ #include "entry.h" #include "provider.h" -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KNewStuff; @@ -143,14 +143,14 @@ class KDE_EXPORT Engine : public TQObject void getMetaInformation( Provider::List *providers ); void selectUploadProvider( Provider::List *providers ); - void slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ); - void slotNewStuffJobResult( KIO::Job *job ); + void slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data ); + void slotNewStuffJobResult( TDEIO::Job *job ); - void slotDownloadJobResult( KIO::Job *job ); + void slotDownloadJobResult( TDEIO::Job *job ); - void slotUploadPayloadJobResult( KIO::Job *job ); - void slotUploadPreviewJobResult (KIO::Job *job ); - void slotUploadMetaJobResult( KIO::Job *job ); + void slotUploadPayloadJobResult( TDEIO::Job *job ); + void slotUploadPreviewJobResult (TDEIO::Job *job ); + void slotUploadMetaJobResult( TDEIO::Job *job ); protected: bool createMetaFile( Entry * ); @@ -160,8 +160,8 @@ class KDE_EXPORT Engine : public TQObject ProviderLoader *mProviderLoader; - TQMap mNewStuffJobData; - TQMap mProviderJobs; + TQMap mNewStuffJobData; + TQMap mProviderJobs; TQPtrList mNewStuffList; diff --git a/knewstuff/knewstuffgeneric.h b/knewstuff/knewstuffgeneric.h index 6347bf539..053f83a05 100644 --- a/knewstuff/knewstuffgeneric.h +++ b/knewstuff/knewstuffgeneric.h @@ -23,7 +23,7 @@ #include "knewstuff.h" -class KConfig; +class TDEConfig; /** * @short Basic KNewStuff class with predefined actions. @@ -80,7 +80,7 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff private: TQString destinationPath( KNS::Entry *entry ); - KConfig *mConfig; + TDEConfig *mConfig; }; #endif diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index 5010b5084..f467530c8 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result) emit installFinished(); } else { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->deleteGroup("KNewStuffStatus"); cfg->setGroup("KNewStuffStatus"); for (TQMap::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) @@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); @@ -179,7 +179,7 @@ void KNewStuffSecure::uploadResource(const TQString& fileName) m_tempDir->setAutoDelete(true); TQFileInfo f(fileName); m_signedFileName = m_tempDir->name() + "/" + f.fileName(); - KIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true); + TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true); Security::ref()->signFile(m_signedFileName); } @@ -215,7 +215,7 @@ void KNewStuffSecure::slotFileSigned(int result) file.close(); } tar.close(); - KIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); + TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); KNewStuff::upload(m_signedFileName, TQString::null); disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); } @@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory() { if (m_tempDir) { - KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); + TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); delete m_tempDir; m_tempDir = 0L; } diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index b9dd24ed8..a29183532 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -219,7 +219,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) mProviders.clear(); mJobData = ""; - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup("KNewStuff"); TQString providersUrl = providersList; @@ -236,16 +236,16 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl; - KIO::TransferJob *job = KIO::get( KURL( providersUrl ), false, false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) ); + TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), false, false ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); // job->dumpObjectInfo(); } -void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data ) +void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data ) { kdDebug() << "ProviderLoader::slotJobData()" << endl; @@ -256,7 +256,7 @@ void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data ) mJobData.append( TQString::fromUtf8( str ) ); } -void ProviderLoader::slotJobResult( KIO::Job *job ) +void ProviderLoader::slotJobResult( TDEIO::Job *job ) { if ( job->error() ) { job->showErrorDialog( TQT_TQWIDGET(parent()) ); diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 829e52d71..2a0d54a12 100644 --- a/knewstuff/provider.h +++ b/knewstuff/provider.h @@ -28,7 +28,7 @@ #include -namespace KIO { class Job; } +namespace TDEIO { class Job; } namespace KNS { @@ -198,8 +198,8 @@ class KDE_EXPORT ProviderLoader : public TQObject void providersLoaded( Provider::List * ); protected slots: - void slotJobData( KIO::Job *, const TQByteArray & ); - void slotJobResult( KIO::Job * ); + void slotJobData( TDEIO::Job *, const TQByteArray & ); + void slotJobResult( TDEIO::Job * ); private: TQWidget *mParentWidget; diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp index 0a9ec85c0..f82e466ff 100644 --- a/knewstuff/uploaddialog.cpp +++ b/knewstuff/uploaddialog.cpp @@ -136,7 +136,7 @@ void UploadDialog::slotOk() entry->setSummary( mSummaryEdit->text(), mLanguageCombo->currentText() ); if ( mPayloadUrl.isValid() ) { - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup( TQString("KNewStuffUpload:%1").arg(mPayloadUrl.fileName()) ); conf->writeEntry("name", mNameEdit->text()); conf->writeEntry("author", mAuthorEdit->text()); @@ -164,7 +164,7 @@ void UploadDialog::setPayloadFile( const TQString &payloadFile ) { mPayloadUrl = payloadFile; - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup( TQString("KNewStuffUpload:%1").arg(mPayloadUrl.fileName()) ); TQString name = conf->readEntry("name"); TQString author = conf->readEntry("author"); diff --git a/kparts/browserextension.h b/kparts/browserextension.h index bc5e9cc92..d225c8e84 100644 --- a/kparts/browserextension.h +++ b/kparts/browserextension.h @@ -129,7 +129,7 @@ struct KPARTS_EXPORT URLArgs /** * Meta-data to associate with the next KIO operation - * @see KIO::TransferJob etc. + * @see TDEIO::TransferJob etc. */ TQMap &metaData(); @@ -569,7 +569,7 @@ signals: * Since the part emits the jobid in the started() signal, * progress information is automatically displayed. * - * However, if you don't use a KIO::Job in the part, + * However, if you don't use a TDEIO::Job in the part, * you can use loadingProgress() and speedProgress() * to display progress information. */ diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index 8bec0e790..582460c6d 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -75,7 +75,7 @@ void BrowserRun::init() // is either malformed, or points to a non-existing local file... // So we need to reimplement some of the checks, to handle m_bHideErrorDialog if ( !m_strURL.isValid() ) { - redirectToError( KIO::ERR_MALFORMED_URL, m_strURL.url() ); + redirectToError( TDEIO::ERR_MALFORMED_URL, m_strURL.url() ); return; } if ( !m_bIsLocalFile && !m_bFault && m_strURL.isLocalFile() ) @@ -86,7 +86,7 @@ void BrowserRun::init() if ( stat( TQFile::encodeName(m_strURL.path()), &buff ) == -1 ) { kdDebug(1000) << "BrowserRun::init : " << m_strURL.prettyURL() << " doesn't exist." << endl; - redirectToError( KIO::ERR_DOES_NOT_EXIST, m_strURL.path() ); + redirectToError( TDEIO::ERR_DOES_NOT_EXIST, m_strURL.path() ); return; } m_mode = buff.st_mode; // while we're at it, save it for KRun::init() to use it @@ -132,38 +132,38 @@ void BrowserRun::scanFile() m_args.metaData().insert("PropagateHttpHeader", "TRUE"); } - KIO::TransferJob *job; + TDEIO::TransferJob *job; if ( m_args.doPost() && m_strURL.protocol().startsWith("http")) { - job = KIO::http_post( m_strURL, m_args.postData, false ); + job = TDEIO::http_post( m_strURL, m_args.postData, false ); job->addMetaData( "content-type", m_args.contentType() ); } else - job = KIO::get(m_strURL, m_args.reload, false); + job = TDEIO::get(m_strURL, m_args.reload, false); if ( m_bRemoveReferrer ) m_args.metaData().remove("referrer"); job->addMetaData( m_args.metaData() ); job->setWindow( m_window ); - connect( job, TQT_SIGNAL( result( KIO::Job *)), - this, TQT_SLOT( slotBrowserScanFinished(KIO::Job *))); - connect( job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &)), - this, TQT_SLOT( slotBrowserMimetype(KIO::Job *, const TQString &))); + connect( job, TQT_SIGNAL( result( TDEIO::Job *)), + this, TQT_SLOT( slotBrowserScanFinished(TDEIO::Job *))); + connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), + this, TQT_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &))); m_job = job; } -void BrowserRun::slotBrowserScanFinished(KIO::Job *job) +void BrowserRun::slotBrowserScanFinished(TDEIO::Job *job) { kdDebug(1000) << "BrowserRun::slotBrowserScanFinished" << endl; - if ( job->error() == KIO::ERR_IS_DIRECTORY ) + if ( job->error() == TDEIO::ERR_IS_DIRECTORY ) { // It is in fact a directory. This happens when HTTP redirects to FTP. // Due to the "protocol doesn't support listing" code in BrowserRun, we // assumed it was a file. kdDebug(1000) << "It is in fact a directory!" << endl; // Update our URL in case of a redirection - m_strURL = static_cast(job)->url(); + m_strURL = static_cast(job)->url(); m_job = 0; foundMimeType( "inode/directory" ); } @@ -176,10 +176,10 @@ void BrowserRun::slotBrowserScanFinished(KIO::Job *job) } } -void BrowserRun::slotBrowserMimetype( KIO::Job *_job, const TQString &type ) +void BrowserRun::slotBrowserMimetype( TDEIO::Job *_job, const TQString &type ) { Q_ASSERT( _job == m_job ); - KIO::TransferJob *job = static_cast(m_job); + TDEIO::TransferJob *job = static_cast(m_job); // Update our URL in case of a redirection //kdDebug(1000) << "old URL=" << m_strURL.url() << endl; //kdDebug(1000) << "new URL=" << job->url().url() << endl; @@ -242,10 +242,10 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& KTempFile tempFile( TQString::null, extension ); KURL destURL; destURL.setPath( tempFile.name() ); - KIO::Job *job = KIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ ); + TDEIO::Job *job = TDEIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ ); job->setWindow (m_window); - connect( job, TQT_SIGNAL( result( KIO::Job *)), - this, TQT_SLOT( slotCopyToTempFileResult(KIO::Job *)) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job *)), + this, TQT_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) ); return Delayed; // We'll continue after the job has finished } } @@ -259,7 +259,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& return Handled; } - KIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold. + TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold. return NotHandled; } @@ -377,7 +377,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam // only use the downloadmanager for non-local urls if ( !url.isLocalFile() ) { - KConfig cfg("konquerorrc", false, false); + TDEConfig cfg("konquerorrc", false, false); cfg.setGroup("HTML Settings"); TQString downloadManger = cfg.readPathEntry("DownloadManager"); if (!downloadManger.isEmpty()) @@ -405,7 +405,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam kdDebug(1000) << "Calling command " << cmd << endl; // slave is already on hold (slotBrowserMimetype()) - KIO::Scheduler::publishSlaveOnHold(); + TDEIO::Scheduler::publishSlaveOnHold(); KRun::runCommand(cmd); return; } @@ -424,7 +424,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam KURL destURL( dlg->selectedURL() ); if ( destURL.isValid() ) { - KIO::Job *job = KIO::copy( url, destURL ); + TDEIO::Job *job = TDEIO::copy( url, destURL ); job->setWindow (window); job->setAutoErrorHandlingEnabled( true ); } @@ -432,7 +432,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam delete dlg; } -void BrowserRun::slotStatResult( KIO::Job *job ) +void BrowserRun::slotStatResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug(1000) << "BrowserRun::slotStatResult : " << job->errorString() << endl; @@ -441,14 +441,14 @@ void BrowserRun::slotStatResult( KIO::Job *job ) KRun::slotStatResult( job ); } -void BrowserRun::handleError( KIO::Job * job ) +void BrowserRun::handleError( TDEIO::Job * job ) { if ( !job ) { // Shouldn't happen, see docu. kdWarning(1000) << "BrowserRun::handleError called with job=0! hideErrorDialog=" << d->m_bHideErrorDialog << endl; return; } - if (d->m_bHideErrorDialog && job->error() != KIO::ERR_NO_CONTENT) + if (d->m_bHideErrorDialog && job->error() != TDEIO::ERR_NO_CONTENT) { redirectToError( job->error(), job->errorText() ); return; @@ -483,13 +483,13 @@ void BrowserRun::redirectToError( int error, const TQString& errorText ) foundMimeType( "text/html" ); } -void BrowserRun::slotCopyToTempFileResult(KIO::Job *job) +void BrowserRun::slotCopyToTempFileResult(TDEIO::Job *job) { if ( job->error() ) { job->showErrorDialog( m_window ); } else { // Same as KRun::foundMimeType but with a different URL - (void) (KRun::runURL( static_cast(job)->destURL(), m_sMimeType )); + (void) (KRun::runURL( static_cast(job)->destURL(), m_sMimeType )); } m_bFault = true; // see above m_bFinished = true; diff --git a/kparts/browserrun.h b/kparts/browserrun.h index 79a7386c6..23709fd2b 100644 --- a/kparts/browserrun.h +++ b/kparts/browserrun.h @@ -47,7 +47,7 @@ namespace KParts { * @param url the URL we're probing * @param args URL args - includes data for a HTTP POST, etc. * @param part the part going to open this URL - can be 0L if not created yet - * @param window the mainwindow - passed to KIO::Job::setWindow() + * @param window the mainwindow - passed to TDEIO::Job::setWindow() * @param removeReferrer if true, the "referrer" metadata from @p args isn't passed on * @param trustedSource if false, a warning will be shown before launching an executable * Always pass false for @p trustedSource, except for local directory views. @@ -61,7 +61,7 @@ namespace KParts { * @param url the URL we're probing * @param args URL args - includes data for a HTTP POST, etc. * @param part the part going to open this URL - can be 0L if not created yet - * @param window the mainwindow - passed to KIO::Job::setWindow() + * @param window the mainwindow - passed to TDEIO::Job::setWindow() * @param removeReferrer if true, the "referrer" metadata from @p args isn't passed on * @param trustedSource if false, a warning will be shown before launching an executable. * Always pass false for @p trustedSource, except for local directory views. @@ -155,7 +155,7 @@ namespace KParts { * It is strongly recommended to reimplement this method if * you passed hideErrorDialog=true. */ - virtual void handleError( KIO::Job * job ); + virtual void handleError( TDEIO::Job * job ); /** * NotHandled means that foundMimeType should call KRun::foundMimeType, @@ -169,10 +169,10 @@ namespace KParts { NonEmbeddableResult handleNonEmbeddable( const TQString& mimeType ); protected slots: - void slotBrowserScanFinished(KIO::Job *job); - void slotBrowserMimetype(KIO::Job *job, const TQString &type); - void slotCopyToTempFileResult(KIO::Job *job); - virtual void slotStatResult( KIO::Job *job ); + void slotBrowserScanFinished(TDEIO::Job *job); + void slotBrowserMimetype(TDEIO::Job *job, const TQString &type); + void slotCopyToTempFileResult(TDEIO::Job *job); + virtual void slotStatResult( TDEIO::Job *job ); protected: KParts::URLArgs m_args; diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h index 67f98a90f..da3c5c7d5 100644 --- a/kparts/componentfactory.h +++ b/kparts/componentfactory.h @@ -307,7 +307,7 @@ namespace KParts * \endcode * * @param serviceType the type of service for which to find a plugin - * @param constraint an optional constraint to pass to the trader (see KIO::KTrader) + * @param constraint an optional constraint to pass to the trader (see TDEIO::KTrader) * @param parent the parent object for the part itself * @param name the name that will be given to the part * @param args A list of string arguments, passed to the factory and possibly diff --git a/kparts/part.cpp b/kparts/part.cpp index 68e9dbbf2..b7bdc7cfa 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -289,8 +289,8 @@ public: { } - KIO::FileCopyJob * m_job; - KIO::FileCopyJob * m_uploadJob; + TDEIO::FileCopyJob * m_job; + TDEIO::FileCopyJob * m_uploadJob; KURL m_originalURL; // for saveAs TQString m_originalFilePath; // for saveAs bool m_showProgressInfo : 1; @@ -364,10 +364,10 @@ bool ReadOnlyPart::openURL( const KURL &url ) KURL destURL; destURL.setPath( m_file ); - d->m_job = KIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo ); + d->m_job = TDEIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo ); d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 ); emit started( d->m_job ); - connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) ); + connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); return true; } } @@ -397,7 +397,7 @@ bool ReadOnlyPart::closeURL() return true; } -void ReadOnlyPart::slotJobFinished( KIO::Job * job ) +void ReadOnlyPart::slotJobFinished( TDEIO::Job * job ) { kdDebug(1000) << "ReadOnlyPart::slotJobFinished" << endl; assert( job == d->m_job ); @@ -637,14 +637,14 @@ bool ReadWritePart::saveToURL() // Uh oh, some error happened. return false; } - d->m_uploadJob = KIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ ); + d->m_uploadJob = TDEIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ ); d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 ); - connect( d->m_uploadJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) ); + connect( d->m_uploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } -void ReadWritePart::slotUploadFinished( KIO::Job * ) +void ReadWritePart::slotUploadFinished( TDEIO::Job * ) { if (d->m_uploadJob->error()) { diff --git a/kparts/part.h b/kparts/part.h index 8a58063af..7b5e39b2f 100644 --- a/kparts/part.h +++ b/kparts/part.h @@ -34,7 +34,7 @@ class KActionCollection; class TQEvent; struct QUnknownInterface; -namespace KIO { +namespace TDEIO { class Job; } @@ -96,7 +96,7 @@ protected: /** * We have three different policies, whether to load new plugins or not. The - * value in the KConfig object of the TDEInstance object always overrides + * value in the TDEConfig object of the TDEInstance object always overrides * LoadPlugins and LoadPluginsIfEnabled. */ enum PluginLoadingMode { @@ -452,10 +452,10 @@ private: // Makes no sense for inherited classes to call those. But make it prot signals: /** * The part emits this when starting data. - * If using a KIO::Job, it sets the job in the signal, so that + * If using a TDEIO::Job, it sets the job in the signal, so that * progress information can be shown. Otherwise, job is 0. **/ - void started( KIO::Job * ); + void started( TDEIO::Job * ); /** * Emit this when you have completed loading data. @@ -482,7 +482,7 @@ signals: void canceled( const TQString &errMsg ); protected slots: - void slotJobFinished( KIO::Job * job ); + void slotJobFinished( TDEIO::Job * job ); protected: /** @@ -667,7 +667,7 @@ protected: * @return true on success, false on failure. * On failure the function should inform the user about the * problem with an appropriate message box. Standard error - * messages can be constructed using KIO::buildErrorString() + * messages can be constructed using TDEIO::buildErrorString() * in combination with the error codes defined in kio/global.h */ virtual bool saveFile() = 0; @@ -686,7 +686,7 @@ protected slots: /** * @internal */ - void slotUploadFinished( KIO::Job * job ); + void slotUploadFinished( TDEIO::Job * job ); private: void prepareSaving(); diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index b36d4dbc6..0dc729de1 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -226,7 +226,7 @@ void Plugin::setInstance( TDEInstance *instance ) void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault ) { - KConfigGroup cfgGroup( instance->config(), "KParts Plugins" ); + TDEConfigGroup cfgGroup( instance->config(), "KParts Plugins" ); TQValueList plugins = pluginInfos( instance ); TQValueList::ConstIterator pIt = plugins.begin(); TQValueList::ConstIterator pEnd = plugins.end(); diff --git a/kparts/plugin.h b/kparts/plugin.h index efebf5af4..df1200ee9 100644 --- a/kparts/plugin.h +++ b/kparts/plugin.h @@ -111,7 +111,7 @@ public: * Plugin objects children of @p parent, and insert the plugin as a child GUI client * of @p parentGUIClient. * - * This method uses the KConfig object of the given instance, to find out which + * This method uses the TDEConfig object of the given instance, to find out which * plugins are enabled and which are disabled. What happens by default (i.e. * for new plugins that are not in that config file) is controlled by * @p enableNewPluginsByDefault. It can be overridden by the plugin if it diff --git a/krandr/randr.cpp b/krandr/randr.cpp index dd54f87be..334da5a79 100644 --- a/krandr/randr.cpp +++ b/krandr/randr.cpp @@ -649,7 +649,7 @@ KDE_EXPORT bool RandRScreen::proposeSize(int newSize) return false; } -KDE_EXPORT void RandRScreen::load(KConfig& config) +KDE_EXPORT void RandRScreen::load(TDEConfig& config) { config.setGroup(TQString("Screen%1").arg(m_screen)); @@ -659,7 +659,7 @@ KDE_EXPORT void RandRScreen::load(KConfig& config) proposeRotation(rotationDegreeToIndex(config.readNumEntry("rotation", 0)) + (config.readBoolEntry("reflectX") ? ReflectX : 0) + (config.readBoolEntry("reflectY") ? ReflectY : 0)); } -KDE_EXPORT void RandRScreen::save(KConfig& config) const +KDE_EXPORT void RandRScreen::save(TDEConfig& config) const { config.setGroup(TQString("Screen%1").arg(m_screen)); config.writeEntry("width", currentPixelWidth()); @@ -782,7 +782,7 @@ KDE_EXPORT RandRScreen* RandRDisplay::currentScreen() return m_currentScreen; } -KDE_EXPORT bool RandRDisplay::loadDisplay(KConfig& config, bool loadScreens) +KDE_EXPORT bool RandRDisplay::loadDisplay(TDEConfig& config, bool loadScreens) { if (loadScreens) for (RandRScreen* s = m_screens.first(); s; s = m_screens.next()) @@ -791,19 +791,19 @@ KDE_EXPORT bool RandRDisplay::loadDisplay(KConfig& config, bool loadScreens) return applyOnStartup(config); } -KDE_EXPORT bool RandRDisplay::applyOnStartup(KConfig& config) +KDE_EXPORT bool RandRDisplay::applyOnStartup(TDEConfig& config) { config.setGroup("Display"); return config.readBoolEntry("ApplyOnStartup", false); } -KDE_EXPORT bool RandRDisplay::syncTrayApp(KConfig& config) +KDE_EXPORT bool RandRDisplay::syncTrayApp(TDEConfig& config) { config.setGroup("Display"); return config.readBoolEntry("SyncTrayApp", false); } -KDE_EXPORT void RandRDisplay::saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp) +KDE_EXPORT void RandRDisplay::saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp) { Q_ASSERT(!config.isReadOnly()); diff --git a/krandr/randr.h b/krandr/randr.h index b4c830f02..bec5f1b61 100644 --- a/krandr/randr.h +++ b/krandr/randr.h @@ -211,8 +211,8 @@ public: /** * Configuration functions. */ - void load(KConfig& config); - void save(KConfig& config) const; + void load(TDEConfig& config); + void save(TDEConfig& config) const; private: RandRScreenPrivate* d; @@ -271,15 +271,15 @@ public: /** * Loads saved settings. * - * @param config the KConfig object to load from + * @param config the TDEConfig object to load from * @param loadScreens whether to call RandRScreen::load() for each screen * @retuns true if the settings should be applied on KDE startup. */ - bool loadDisplay(KConfig& config, bool loadScreens = true); - void saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp); + bool loadDisplay(TDEConfig& config, bool loadScreens = true); + void saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp); - static bool applyOnStartup(KConfig& config); - static bool syncTrayApp(KConfig& config); + static bool applyOnStartup(TDEConfig& config); + static bool syncTrayApp(TDEConfig& config); void applyProposed(bool confirm = true); diff --git a/kresources/README.design b/kresources/README.design index b2163c8b7..f883c7d13 100644 --- a/kresources/README.design +++ b/kresources/README.design @@ -41,7 +41,7 @@ Both Exchange-based calendar resources are objects of the same type, but with different settings. These resources are persistent, and they are managed by the ResourceManager for the calendar resource family. The list of resources, and the settings for -each resource, are stored by the resource manager using KConfig, +each resource, are stored by the resource manager using TDEConfig, in $HOME/.trinity/share/config/. The resource manager is a singleton object for every resource family. diff --git a/kresources/configdialog.cpp b/kresources/configdialog.cpp index bbebc47a3..0d306d29c 100644 --- a/kresources/configdialog.cpp +++ b/kresources/configdialog.cpp @@ -36,7 +36,7 @@ using namespace KRES; ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, - /*const TQString& type,*/ Resource* resource, /*KConfig *config, */const char *name ) + /*const TQString& type,*/ Resource* resource, /*TDEConfig *config, */const char *name ) : KDialogBase( parent, name, true, i18n( "Resource Configuration" ), Ok|Cancel, Ok, false )/*, mConfig( config )*/, mResource( resource ) { diff --git a/kresources/configpage.cpp b/kresources/configpage.cpp index a3db58de6..ba3b89a47 100644 --- a/kresources/configpage.cpp +++ b/kresources/configpage.cpp @@ -145,7 +145,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mLastItem = 0; - mConfig = new KConfig( "kcmkresourcesrc" ); + mConfig = new TDEConfig( "kcmkresourcesrc" ); mConfig->setGroup( "General" ); load(); @@ -223,7 +223,7 @@ void ConfigPage::loadManager( const TQString& family ) ResourcePageInfo *info = new ResourcePageInfo; info->mManager = mCurrentManager; - info->mConfig = new KConfig( KRES::ManagerImpl::defaultConfigFile( family ) ); + info->mConfig = new TDEConfig( KRES::ManagerImpl::defaultConfigFile( family ) ); info->mManager->readConfig( info->mConfig ); mInfoMap.append( KSharedPtr(info) ); diff --git a/kresources/configpage.h b/kresources/configpage.h index ec1fb3799..d00372ac6 100644 --- a/kresources/configpage.h +++ b/kresources/configpage.h @@ -43,7 +43,7 @@ class KRESOURCES_EXPORT ResourcePageInfo : public KShared ResourcePageInfo(); ~ResourcePageInfo(); Manager *mManager; - KConfig *mConfig; + TDEConfig *mConfig; }; class Resource; @@ -89,8 +89,8 @@ class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver* mCurrentManager; - KConfig* mCurrentConfig; - KConfig* mConfig; + TDEConfig* mCurrentConfig; + TDEConfig* mConfig; TQString mFamily; TQStringList mFamilyMap; TQValueList > mInfoMap; diff --git a/kresources/factory.cpp b/kresources/factory.cpp index fa3ee6eaf..e76d318a7 100644 --- a/kresources/factory.cpp +++ b/kresources/factory.cpp @@ -125,7 +125,7 @@ TQString Factory::typeDescription( const TQString &type ) const return ptr->comment(); } -Resource *Factory::resource( const TQString& type, const KConfig *config ) +Resource *Factory::resource( const TQString& type, const TDEConfig *config ) { kdDebug(5650) << "Factory::resource( " << type << ", config )" << endl; diff --git a/kresources/factory.h b/kresources/factory.h index 925ff2e82..694b470a4 100644 --- a/kresources/factory.h +++ b/kresources/factory.h @@ -49,7 +49,7 @@ namespace KRES { * * // to allow a transparent configuration of resources, we have * // to use a kconfig object. - * KConfig config( "tst" ); + * TDEConfig config( "tst" ); * config.writePathEntry( "FileName", "/home/foobar/test.vcf" );// resource dependend * config.writeEntry( "FileFormat", "vcard" ); // resource dependend * @@ -87,7 +87,7 @@ class KRESOURCES_EXPORT Factory * @param config The config object where the resource get it settings from, * or 0 if a resource with default values should be created. */ - Resource *resource( const TQString& type, const KConfig *config ); + Resource *resource( const TQString& type, const TDEConfig *config ); /** * Returns a list of all available resource types. diff --git a/kresources/kcmkresources.cpp b/kresources/kcmkresources.cpp index ec6a7be48..1baf11f41 100644 --- a/kresources/kcmkresources.cpp +++ b/kresources/kcmkresources.cpp @@ -33,7 +33,7 @@ typedef KGenericFactory ResourcesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kresources, ResourcesFactory( "kcmkresources" ) ) KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQStringList& ) - : KCModule( ResourcesFactory::instance(), parent, name ) + : TDECModule( ResourcesFactory::instance(), parent, name ) { TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigPage = new KRES::ConfigPage( this ); diff --git a/kresources/kcmkresources.h b/kresources/kcmkresources.h index 97a3183e0..38279d29a 100644 --- a/kresources/kcmkresources.h +++ b/kresources/kcmkresources.h @@ -24,7 +24,7 @@ #include -class KRESOURCES_EXPORT KCMKResources : public KCModule +class KRESOURCES_EXPORT KCMKResources : public TDECModule { Q_OBJECT diff --git a/kresources/manager.h b/kresources/manager.h index ab1562716..0363d959e 100644 --- a/kresources/manager.h +++ b/kresources/manager.h @@ -227,7 +227,7 @@ class Manager : private ManagerNotifier Recreate Resource objects from configuration file. If cfg is 0, read standard configuration file determined by family name. */ - void readConfig( KConfig *cfg = 0 ) + void readConfig( TDEConfig *cfg = 0 ) { mImpl->readConfig( cfg ); } @@ -236,7 +236,7 @@ class Manager : private ManagerNotifier Write configuration of Resource objects to configuration file. If cfg is 0, write to standard configuration file determined by family name. */ - void writeConfig( KConfig *cfg = 0 ) + void writeConfig( TDEConfig *cfg = 0 ) { mImpl->writeConfig( cfg ); } diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp index 8fa2e03c0..1f7b08444 100644 --- a/kresources/managerimpl.cpp +++ b/kresources/managerimpl.cpp @@ -88,13 +88,13 @@ void ManagerImpl::createStandardConfig() { if ( !mStdConfig ) { TQString file = defaultConfigFile( mFamily ); - mStdConfig = new KConfig( file ); + mStdConfig = new TDEConfig( file ); } mConfig = mStdConfig; } -void ManagerImpl::readConfig( KConfig *cfg ) +void ManagerImpl::readConfig( TDEConfig *cfg ) { kdDebug(5650) << "ManagerImpl::readConfig()" << endl; @@ -123,7 +123,7 @@ void ManagerImpl::readConfig( KConfig *cfg ) mConfigRead = true; } -void ManagerImpl::writeConfig( KConfig *cfg ) +void ManagerImpl::writeConfig( TDEConfig *cfg ) { kdDebug(5650) << "ManagerImpl::writeConfig()" << endl; diff --git a/kresources/managerimpl.h b/kresources/managerimpl.h index e86ea3d9d..4fdd4d96c 100644 --- a/kresources/managerimpl.h +++ b/kresources/managerimpl.h @@ -30,7 +30,7 @@ #include "manageriface.h" #include -class KConfig; +class TDEConfig; namespace KRES { @@ -49,8 +49,8 @@ class KRESOURCES_EXPORT ManagerImpl : virtual public ManagerIface ManagerImpl( ManagerNotifier *, const TQString &family ); ~ManagerImpl(); - void readConfig( KConfig * ); - void writeConfig( KConfig * ); + void readConfig( TDEConfig * ); + void writeConfig( TDEConfig * ); void add( Resource *resource ); void remove( Resource *resource ); @@ -90,8 +90,8 @@ class KRESOURCES_EXPORT ManagerImpl : virtual public ManagerIface ManagerNotifier *mNotifier; TQString mFamily; - KConfig *mConfig; - KConfig *mStdConfig; + TDEConfig *mConfig; + TDEConfig *mStdConfig; Resource *mStandard; Factory *mFactory; Resource::List mResources; diff --git a/kresources/resource.cpp b/kresources/resource.cpp index 83d24cbf5..e652f61f5 100644 --- a/kresources/resource.cpp +++ b/kresources/resource.cpp @@ -44,7 +44,7 @@ class Resource::ResourcePrivate bool mIsOpen; }; -Resource::Resource( const KConfig* config ) +Resource::Resource( const TDEConfig* config ) : TQObject( 0, "" ), d( new ResourcePrivate ) { d->mOpenCount = 0; @@ -71,7 +71,7 @@ Resource::~Resource() d = 0; } -void Resource::writeConfig( KConfig* config ) +void Resource::writeConfig( TDEConfig* config ) { kdDebug(5650) << "Resource::writeConfig()" << endl; diff --git a/kresources/resource.h b/kresources/resource.h index f5587ed09..9fd50db69 100644 --- a/kresources/resource.h +++ b/kresources/resource.h @@ -28,7 +28,7 @@ #include -class KConfig; +class TDEConfig; namespace KRES { @@ -72,9 +72,9 @@ class ConfigWidget; class ResourceExample : public KRES::Resource { public: - ResourceExample( const KConfig * ); + ResourceExample( const TDEConfig * ); ~ResourceExample(); - void writeConfig( KConfig *config ); + void writeConfig( TDEConfig *config ); private: TQString mLocation; @@ -88,7 +88,7 @@ class ResourceExample : public KRES::Resource #include "resourceexample.h" -ResourceExample::ResourceExample( const KConfig *config ) +ResourceExample::ResourceExample( const TDEConfig *config ) : Resource( config ) { if ( config ) { @@ -100,7 +100,7 @@ ResourceExample::ResourceExample( const KConfig *config ) } } -void ResourceExample::writeConfig( KConfig *config ) +void ResourceExample::writeConfig( TDEConfig *config ) { KRES::Resource::writeConfig( config ); config->writePathEntry( "Location", mLocation ); @@ -113,7 +113,7 @@ extern "C" return new ResourceExampleConfig( parent, "Configure Example Resource" ); } - KRES::Resource *resource( const KConfig *config ) { + KRES::Resource *resource( const TDEConfig *config ) { return new ResourceExample( config ); } } @@ -266,7 +266,7 @@ class KRESOURCES_EXPORT Resource : public TQObject * @param config Configuration to read persistence information from. * If config is 0, create object using default settings. */ - Resource( const KConfig *config ); + Resource( const TDEConfig *config ); /** * Destructor. @@ -279,7 +279,7 @@ class KRESOURCES_EXPORT Resource : public TQObject * or Terrible Things(TM) will happen. * @param config Configuration to write persistence information to. */ - virtual void writeConfig( KConfig *config ); + virtual void writeConfig( TDEConfig *config ); /** * Open this resource, if it not already open. Increase the open @@ -384,7 +384,7 @@ class KRESOURCES_EXPORT Resource : public TQObject class KRESOURCES_EXPORT PluginFactoryBase : public KLibFactory { public: - virtual Resource *resource( const KConfig *config ) = 0; + virtual Resource *resource( const TDEConfig *config ) = 0; virtual ConfigWidget *configWidget( TQWidget *parent ) = 0; @@ -404,7 +404,7 @@ template class PluginFactory : public PluginFactoryBase { public: - Resource *resource( const KConfig *config ) + Resource *resource( const TDEConfig *config ) { return new TR( config ); } diff --git a/krsync/krsync.cpp b/krsync/krsync.cpp index a9bf295a2..d184a0507 100644 --- a/krsync/krsync.cpp +++ b/krsync/krsync.cpp @@ -428,7 +428,7 @@ KDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncfla /** writes one chunk of data to stdin of child process */ -KDE_EXPORT void KRsync::writeChild(const char *buf, KIO::fileoffset_t len) { +KDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) { if (outBufPos >= 0 && outBuf) { #if 0 TQString debug; @@ -445,7 +445,7 @@ KDE_EXPORT void KRsync::writeChild(const char *buf, KIO::fileoffset_t len) { /** manages initial communication setup including password queries */ -KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { +KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len) { TQString buf; buf.setLatin1(buffer,len); int pos; @@ -560,7 +560,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, KIO::fileoffset_t /** manages initial communication setup including password queries */ -KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath) { +KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath) { TQString buf; buf.setLatin1(buffer,len); int pos; @@ -775,7 +775,7 @@ KDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){ KDE_EXPORT void KRsync::saveSettings() { - KConfig cfg ("rsyncrc", false, false); + TDEConfig cfg ("rsyncrc", false, false); cfg.setGroup ("General"); cfg.writeEntry("LocalFolders", cfgfolderlist, CONFIGURATION_FILE_SEPARATOR); cfg.writeEntry("AutoSyncOnLogout", cfgautosync_onlogout_list, CONFIGURATION_FILE_SEPARATOR); @@ -787,7 +787,7 @@ KDE_EXPORT void KRsync::loadSettings() if (m_bSettingsLoaded) return; - KConfig cfg ("rsyncrc", false, false); + TDEConfig cfg ("rsyncrc", false, false); cfg.setGroup ("General"); cfgfolderlist = cfg.readListEntry("LocalFolders", CONFIGURATION_FILE_SEPARATOR); diff --git a/krsync/krsync.h b/krsync/krsync.h index 6bca00827..50ff7a7d9 100644 --- a/krsync/krsync.h +++ b/krsync/krsync.h @@ -103,17 +103,17 @@ public: int addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval); TQString findSyncMethodByName(TQString folderurl); /** manages initial communication setup including password queries */ - int establishConnectionRsync(char *buffer, KIO::fileoffset_t len); + int establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len); /** manages initial communication setup including password queries */ - int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath); + int establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath); /** creates the unidirectional sync subprocess */ bool syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath); /** creates the bidirectional sync subprocess */ bool syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath); /** writes one chunk of data to stdin of child process */ - void writeChild(const char *buf, KIO::fileoffset_t len); + void writeChild(const char *buf, TDEIO::fileoffset_t len); /** AuthInfo object used for logging in */ - KIO::AuthInfo connectionAuth; + TDEIO::AuthInfo connectionAuth; /** Clean up connection */ @@ -158,9 +158,9 @@ private: /** buffer for data to be written */ const char *outBuf; /** current write position in buffer */ - KIO::fileoffset_t outBufPos; + TDEIO::fileoffset_t outBufPos; /** length of buffer */ - KIO::fileoffset_t outBufLen; + TDEIO::fileoffset_t outBufLen; /** use su if true else use ssh */ //bool local; /** // FIXME: just a workaround for konq deficiencies */ diff --git a/kspell2/settings.cpp b/kspell2/settings.cpp index dd54cf53f..63b45e89d 100644 --- a/kspell2/settings.cpp +++ b/kspell2/settings.cpp @@ -180,7 +180,7 @@ bool Settings::ignore( const TQString& word ) void Settings::readIgnoreList() { - KConfigGroup conf( d->config, "Spelling" ); + TDEConfigGroup conf( d->config, "Spelling" ); TQString ignoreEntry = TQString( "ignore_%1" ).arg( d->defaultLanguage ); TQStringList ignores = conf.readListEntry( ignoreEntry ); setQuietIgnoreList( ignores ); @@ -189,7 +189,7 @@ void Settings::readIgnoreList() void Settings::save() { if ( d->modified ) { - KConfigGroup conf( d->config, "Spelling" ); + TDEConfigGroup conf( d->config, "Spelling" ); conf.writeEntry( "defaultClient", d->defaultClient ); conf.writeEntry( "defaultLanguage", d->defaultLanguage ); conf.writeEntry( "checkUppercase", d->checkUppercase ); @@ -203,7 +203,7 @@ void Settings::save() void Settings::loadConfig() { - KConfigGroup conf( d->config, "Spelling" ); + TDEConfigGroup conf( d->config, "Spelling" ); d->defaultClient = conf.readEntry( "defaultClient", TQString::null ); d->defaultLanguage = conf.readEntry( diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 544f692e0..7ca3ffb06 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -60,7 +60,7 @@ Bugs: Can't delete old slider image when calculating the rotated one for some reason. */ -//Shamelessly stolen from KConfigBase +//Shamelessly stolen from TDEConfigBase static TQColor readColorEntry( TQSettings* s, const char *pKey, const TQColor* pDefault ) { diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index 1e002cd4a..e9ea55d5b 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -280,7 +280,7 @@ public: Background, RotSliderGroove, RotInactiveTab, RotActiveTab, WIDGETS}; /** - * The scaling type specified by the KConfig file. + * The scaling type specified by the TDEConfig file. * * @param widget A Widgets enum value. * @@ -288,7 +288,7 @@ public: */ ScaleHint scaleHint( WidgetType widget ) const; /** - * The gradient type specified by the KConfig file. + * The gradient type specified by the TDEConfig file. * * @param widget A Widgets enum value. * diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index 457064a56..c978601a8 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -72,8 +72,8 @@ public: /** * Constructs a new KThemeStyle object. * - * @param configDir The directory which has the KConfig file. - * @param configFile A KConfig file to use as the theme configuration. + * @param configDir The directory which has the TDEConfig file. + * @param configFile A TDEConfig file to use as the theme configuration. * Defaults to ~/.kderc. */ KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null ); diff --git a/kutils/Mainpage.dox b/kutils/Mainpage.dox index 935908d1d..77abe5777 100644 --- a/kutils/Mainpage.dox +++ b/kutils/Mainpage.dox @@ -1,6 +1,6 @@ /** @mainpage Some random bits and pieces -Some utility classes for KSettings, KCModule and KPlugin. +Some utility classes for KSettings, TDECModule and KPlugin. @authors Matthias Kretz \
      diff --git a/kutils/TODO b/kutils/TODO index 82f28e129..7d9f473ab 100644 --- a/kutils/TODO +++ b/kutils/TODO @@ -1,25 +1,25 @@ This is a list of random changes to do in KDE 4 with the various KCM* classes. -* KCModuleinfo; +* TDECModuleinfo; - Make it inherit KService; saves a lot of code, simplifies ctors/overloads in surrounding classes - Implement docPath in KService - Get rid of loadAll() and do lazy loading in each getter -* Merge KCModuleProxy and its DCOP Object class(MI) +* Merge TDECModuleProxy and its DCOP Object class(MI) -* Get rid of `QStringlist arguments` in KCModule and all the helper classes(simplify API) +* Get rid of `QStringlist arguments` in TDECModule and all the helper classes(simplify API) * Move stuff to d pointers.. Too much hackish solutions otherwise * Get rid of bool fallback argument in helper classes(never fails, simplify API) -* Re-implement the QScrollView(d->view) in KCModuleProxy; the protection against violation of HIG-clause. It needs kde-core-devel approval. +* Re-implement the QScrollView(d->view) in TDECModuleProxy; the protection against violation of HIG-clause. It needs kde-core-devel approval. -* The API in KCModule, KCModuleProxy, and the various desktop entries, concerning root loading are butt ugly. It needs cleaning and simplification. +* The API in TDECModule, TDECModuleProxy, and the various desktop entries, concerning root loading are butt ugly. It needs cleaning and simplification. -* There's big confusion regarding /when/ the changed(bool) signal should be emitted, abd by /whom/. This can't be fixed properly in 3.x since it means breaking behavior. In KDE 4 it must be made clear if KCModuleProxy should take care of emitting appropriate signals for load()/save()/defaults, or if modules manually should handle it(is there a reason?). +* There's big confusion regarding /when/ the changed(bool) signal should be emitted, abd by /whom/. This can't be fixed properly in 3.x since it means breaking behavior. In KDE 4 it must be made clear if TDECModuleProxy should take care of emitting appropriate signals for load()/save()/defaults, or if modules manually should handle it(is there a reason?). -* Root modules in KCModuleProxy doesn't support D&D, or it is perhaps implemented in QXEmbed? Anyway, this is what the XEmbed Protocol Specification says: +* Root modules in TDECModuleProxy doesn't support D&D, or it is perhaps implemented in QXEmbed? Anyway, this is what the XEmbed Protocol Specification says: Solving the drag-and-drop problem, however, is quite easy, since the XDND protocol was carefully designed in a way that makes it possible to support embedded windows. Basically, the embedder has to operate as drag-and-drop proxy for the client. Any XDND messages like XdndEnter, Xdnd,Leave, etc. simply have to be passed through. A toolkit's XDND implementation has to take this situation in consideration. diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp index 8df54f231..b91ffb641 100644 --- a/kutils/kcmodulecontainer.cpp +++ b/kutils/kcmodulecontainer.cpp @@ -40,10 +40,10 @@ #include "kcmodulecontainer.moc" /***********************************************************************/ -class KCModuleContainer::KCModuleContainerPrivate +class TDECModuleContainer::TDECModuleContainerPrivate { public: - KCModuleContainerPrivate( const TQStringList& mods ) + TDECModuleContainerPrivate( const TQStringList& mods ) : modules( mods ) , tabWidget( 0 ) , buttons( 0 ) @@ -70,22 +70,22 @@ class KCModuleContainer::KCModuleContainerPrivate /***********************************************************************/ -KCModuleContainer::KCModuleContainer( TQWidget* parent, const char* name, +TDECModuleContainer::TDECModuleContainer( TQWidget* parent, const char* name, const TQString& mods ) - : KCModule( parent, name ) + : TDECModule( parent, name ) { - d = new KCModuleContainerPrivate( TQStringList::split( ",", TQString(mods).remove( " " )) ); + d = new TDECModuleContainerPrivate( TQStringList::split( ",", TQString(mods).remove( " " )) ); init(); } -KCModuleContainer::KCModuleContainer( TQWidget* parent, const char* name, +TDECModuleContainer::TDECModuleContainer( TQWidget* parent, const char* name, const TQStringList& mods ) - : KCModule( parent, name ), d( new KCModuleContainerPrivate( mods ) ) + : TDECModule( parent, name ), d( new TDECModuleContainerPrivate( mods ) ) { init(); } -void KCModuleContainer::init() +void TDECModuleContainer::init() { d->topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "topLayout" ); d->tabWidget = new TQTabWidget(this, "tabWidget"); @@ -104,7 +104,7 @@ void KCModuleContainer::init() } -void KCModuleContainer::finalize() +void TDECModuleContainer::finalize() { setButtons( d->buttons ); if ( d->hasRootKCM ) /* Add a root mode button */ @@ -121,7 +121,7 @@ void KCModuleContainer::finalize() } } -void KCModuleContainer::addModule( const TQString& module ) +void TDECModuleContainer::addModule( const TQString& module ) { /* In case it doesn't exist we just silently drop it. * This allows people to easily extend containers. @@ -129,15 +129,15 @@ void KCModuleContainer::addModule( const TQString& module ) */ if ( !KService::serviceByDesktopName( module ) ) { - kdDebug(713) << "KCModuleContainer: module '" << + kdDebug(713) << "TDECModuleContainer: module '" << module << "' was not found and thus not loaded" << endl; return; } - if( !KCModuleLoader::testModule( module )) + if( !TDECModuleLoader::testModule( module )) return; - KCModuleProxy* proxy = new KCModuleProxy( module, false, d->tabWidget, module.latin1()); + TDECModuleProxy* proxy = new TDECModuleProxy( module, false, d->tabWidget, module.latin1()); allModules.append( proxy ); d->tabWidget->addTab( proxy, TQIconSet(TDEGlobal::iconLoader()->loadIcon( @@ -147,7 +147,7 @@ void KCModuleContainer::addModule( const TQString& module ) d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() ); - connect( proxy, TQT_SIGNAL(changed(KCModuleProxy *)), TQT_SLOT(moduleChanged(KCModuleProxy *))); + connect( proxy, TQT_SIGNAL(changed(TDECModuleProxy *)), TQT_SLOT(moduleChanged(TDECModuleProxy *))); /* Collect our buttons - we go for the common deliminator */ d->buttons = d->buttons | proxy->realModule()->buttons(); @@ -159,7 +159,7 @@ void KCModuleContainer::addModule( const TQString& module ) } -void KCModuleContainer::tabSwitched( TQWidget * module ) +void TDECModuleContainer::tabSwitched( TQWidget * module ) { if ( !d->hasRootKCM ) return; @@ -168,7 +168,7 @@ void KCModuleContainer::tabSwitched( TQWidget * module ) disconnect( d->btnRootMode, 0, 0, 0 ); /* Welcome to the real world huh baby? */ - KCModuleProxy* mod = (KCModuleProxy *) module; + TDECModuleProxy* mod = (TDECModuleProxy *) module; if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() ) { @@ -186,20 +186,20 @@ void KCModuleContainer::tabSwitched( TQWidget * module ) } -void KCModuleContainer::runAsRoot() +void TDECModuleContainer::runAsRoot() { if ( d->tabWidget->currentPage() ) - ( (KCModuleProxy *) d->tabWidget->currentPage() )->runAsRoot(); + ( (TDECModuleProxy *) d->tabWidget->currentPage() )->runAsRoot(); d->btnRootMode->setEnabled( false ); } -void KCModuleContainer::rootExited() +void TDECModuleContainer::rootExited() { connect( d->btnRootMode, TQT_SIGNAL( clicked() ), TQT_SLOT( runAsRoot() )); d->btnRootMode->setEnabled( true ); } -void KCModuleContainer::save() +void TDECModuleContainer::save() { ModuleList list = changedModules; ModuleList::iterator it; @@ -212,7 +212,7 @@ void KCModuleContainer::save() } -void KCModuleContainer::load() +void TDECModuleContainer::load() { ModuleList list = allModules; ModuleList::iterator it; @@ -224,7 +224,7 @@ void KCModuleContainer::load() emit changed( false ); } -void KCModuleContainer::defaults() +void TDECModuleContainer::defaults() { ModuleList list = allModules; ModuleList::iterator it; @@ -237,7 +237,7 @@ void KCModuleContainer::defaults() } -void KCModuleContainer::moduleChanged(KCModuleProxy * proxy) +void TDECModuleContainer::moduleChanged(TDECModuleProxy * proxy) { changedModules.append( proxy ); if( changedModules.isEmpty() ) @@ -246,7 +246,7 @@ void KCModuleContainer::moduleChanged(KCModuleProxy * proxy) emit changed(true); } -KCModuleContainer::~KCModuleContainer() +TDECModuleContainer::~TDECModuleContainer() { delete d; } diff --git a/kutils/kcmodulecontainer.h b/kutils/kcmodulecontainer.h index 7b8551b21..956b23efd 100644 --- a/kutils/kcmodulecontainer.h +++ b/kutils/kcmodulecontainer.h @@ -31,60 +31,60 @@ class TQTabWidget; class TQWidget; class TQVBoxLayout; -class KCModuleProxy; +class TDECModuleProxy; /** * @ingroup kcmodule - * @brief KCModuleContainer is a convenience class encapsulating several KCModules. + * @brief TDECModuleContainer is a convenience class encapsulating several TDECModules. * - * The KCModuleContainer class is a convenience class for organizing a multiple set - * of KCModule. KCModuleContainer is a sub class of KCModule and builds an interface mainly + * The TDECModuleContainer class is a convenience class for organizing a multiple set + * of TDECModule. TDECModuleContainer is a sub class of TDECModule and builds an interface mainly * consisting of a tab widget where each tab contains one of the modules specified via one of the - * constructors. KCModuleContainer can handle modules which requires root permissions. What you + * constructors. TDECModuleContainer can handle modules which requires root permissions. What you * most likely want is the KCMODULECONTAINER macro. \n * Sometimes it is of interest to detect in runtime whether a module should be loaded or not. This - * can be achieved by sub classing KCModuleContainer, doing the probing/testing checks and then manually + * can be achieved by sub classing TDECModuleContainer, doing the probing/testing checks and then manually * call addModule for each module which should be displayed. When all calls to addModule is done, call * finalize() which performs some necessary final steps. * * @author Frans Englich * @since 3.4 */ -class KUTILS_EXPORT KCModuleContainer : public KCModule +class KUTILS_EXPORT TDECModuleContainer : public TDECModule { Q_OBJECT public: /** - * Creates a KCModuleContainer with tabs, each one containing one of the + * Creates a TDECModuleContainer with tabs, each one containing one of the * specified modules in @p mods. * * @param parent the parent TQWidget. * @param name the module's name. - * @param mods The list of KCModules to be loaded. The name of each - * KCModule is its service name, that is the name of the desktop file without + * @param mods The list of TDECModules to be loaded. The name of each + * TDECModule is its service name, that is the name of the desktop file without * the ".desktop" part * */ - KCModuleContainer( TQWidget* parent, const char* name, const TQStringList& mods ); + TDECModuleContainer( TQWidget* parent, const char* name, const TQStringList& mods ); /** * This is a convenience function, instead of building a TQStringList you * can specify the modules in a comma separated TQString. For example; * \code - * KCModuleContainer* cont = KCModuleContainer( this, "kcm_misc", TQString("kcm_energy, kcm_keyboard ,kcm_useraccount, kcm_mouse") ); + * TDECModuleContainer* cont = TDECModuleContainer( this, "kcm_misc", TQString("kcm_energy, kcm_keyboard ,kcm_useraccount, kcm_mouse") ); * \endcode * The other constructor takes its modules in a QStringlist which also can be constructed from a * string and thus you will have to be explicit on the data type. * - * What you probably want is the KCMODULECONTAINER macro which builds an KCModule + * What you probably want is the KCMODULECONTAINER macro which builds an TDECModule * for you, taking the modules you want as argument. * * @param parent The parent widget * @param name The service name * @param mods The modules to load - * @return The KCModule containing the requested modules. + * @return The TDECModule containing the requested modules. */ - KCModuleContainer( TQWidget *parent, const char* name, const TQString& mods = TQString() ); + TDECModuleContainer( TQWidget *parent, const char* name, const TQString& mods = TQString() ); /** * Adds the specified module to the tab widget. Setting the tab icon, text, @@ -98,7 +98,7 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule /** * Default destructor. */ - virtual ~KCModuleContainer(); + virtual ~TDECModuleContainer(); /** * Reimplemented for internal purposes. @@ -122,16 +122,16 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule /** * Sets this KCM's buttons and adds a AdminMode button - * if necessary. If KCModuleContainer is subclassed finalize() + * if necessary. If TDECModuleContainer is subclassed finalize() * should be called in the constructor after all calls to addModule * have been done. Call it once. */ void finalize(); - typedef TQValueList ModuleList; + typedef TQValueList ModuleList; /** - * A list containing KCModuleProxy objects which + * A list containing TDECModuleProxy objects which * have changed and must be saved. */ ModuleList changedModules; @@ -148,7 +148,7 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule */ void tabSwitched( TQWidget * module ); - void moduleChanged(KCModuleProxy *proxy); + void moduleChanged(TDECModuleProxy *proxy); /** * Called when the user clicks our custom root button. @@ -164,19 +164,19 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule void init(); - class KCModuleContainerPrivate; - KCModuleContainerPrivate *d; + class TDECModuleContainerPrivate; + TDECModuleContainerPrivate *d; }; /** * @ingroup kcmodule - * This macro creates an factory declaration which when run creates an KCModule with specified + * This macro creates an factory declaration which when run creates an TDECModule with specified * modules. For example: * \code * KCMODULECONTAINER( "kcm_fonts, kcm_keyboard,kcm_fonts", misc_modules) * \endcode - * would create a KCModule with three tabs, each containing one of the specified KCMs. Each + * would create a TDECModule with three tabs, each containing one of the specified KCMs. Each * use of the macro must be accompanied by a desktop file where the factory name equals * the second argument in the macro(in this example, misc_modules). \n * The module container takes care of testing the contained modules when being shown, as well @@ -188,16 +188,16 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule #define KCMODULECONTAINER( modules, factoryName ) \ extern "C" \ { \ - KCModule *create_## factoryName(TQWidget *parent, const char *name) \ + TDECModule *create_## factoryName(TQWidget *parent, const char *name) \ { \ - return new KCModuleContainer( parent, name, TQString( modules ) ); \ + return new TDECModuleContainer( parent, name, TQString( modules ) ); \ } \ \ bool test_## factoryName() \ { \ TQStringList modList = TQStringList::split( ",", TQString(modules).remove( " " )); \ for ( TQStringList::Iterator it = modList.begin(); it != modList.end(); ++it ) \ - if ( KCModuleLoader::testModule( *it ) ) \ + if ( TDECModuleLoader::testModule( *it ) ) \ return true; \ return false; \ } \ diff --git a/kutils/kcmoduleinfo.cpp b/kutils/kcmoduleinfo.cpp index c34069c09..c1892df36 100644 --- a/kutils/kcmoduleinfo.cpp +++ b/kutils/kcmoduleinfo.cpp @@ -31,13 +31,13 @@ #include "kcmoduleinfo.h" -class KCModuleInfo::KCModuleInfoPrivate +class TDECModuleInfo::TDECModuleInfoPrivate { public: - KCModuleInfoPrivate() : + TDECModuleInfoPrivate() : testModule( false ) {} - ~KCModuleInfoPrivate() + ~TDECModuleInfoPrivate() { } TQString factoryName; @@ -45,34 +45,34 @@ class KCModuleInfo::KCModuleInfoPrivate }; -KCModuleInfo::KCModuleInfo() +TDECModuleInfo::TDECModuleInfo() { _allLoaded = false; - d = new KCModuleInfoPrivate; + d = new TDECModuleInfoPrivate; } -KCModuleInfo::KCModuleInfo(const TQString& desktopFile) +TDECModuleInfo::TDECModuleInfo(const TQString& desktopFile) { KService::Ptr service = KService::serviceByStorageId(desktopFile); if(!service) setName(desktopFile); init(service); } -KCModuleInfo::KCModuleInfo( KService::Ptr moduleInfo ) +TDECModuleInfo::TDECModuleInfo( KService::Ptr moduleInfo ) { init(moduleInfo); } -KCModuleInfo::KCModuleInfo( const KCModuleInfo &rhs ) +TDECModuleInfo::TDECModuleInfo( const TDECModuleInfo &rhs ) { - d = new KCModuleInfoPrivate; + d = new TDECModuleInfoPrivate; ( *this ) = rhs; } // this re-implementation exists to ensure that other code always calls // our re-implementation, so in case we add data to the d pointer in the future // we can be sure that we get called when we are copied. -KCModuleInfo &KCModuleInfo::operator=( const KCModuleInfo &rhs ) +TDECModuleInfo &TDECModuleInfo::operator=( const TDECModuleInfo &rhs ) { _keywords = rhs._keywords; _name = rhs._name; @@ -92,7 +92,7 @@ KCModuleInfo &KCModuleInfo::operator=( const KCModuleInfo &rhs ) return *this; } -TQString KCModuleInfo::factoryName() const +TQString TDECModuleInfo::factoryName() const { if( d->factoryName.isEmpty() ) { @@ -104,25 +104,25 @@ TQString KCModuleInfo::factoryName() const return d->factoryName; } -bool KCModuleInfo::operator==( const KCModuleInfo & rhs ) const +bool TDECModuleInfo::operator==( const TDECModuleInfo & rhs ) const { return ( ( _name == rhs._name ) && ( _lib == rhs._lib ) && ( _fileName == rhs._fileName ) ); } -bool KCModuleInfo::operator!=( const KCModuleInfo & rhs ) const +bool TDECModuleInfo::operator!=( const TDECModuleInfo & rhs ) const { return ! operator==( rhs ); } -KCModuleInfo::~KCModuleInfo() +TDECModuleInfo::~TDECModuleInfo() { delete d; } -void KCModuleInfo::init(KService::Ptr s) +void TDECModuleInfo::init(KService::Ptr s) { _allLoaded = false; - d = new KCModuleInfoPrivate; + d = new TDECModuleInfoPrivate; if ( s ) _service = s; @@ -147,7 +147,7 @@ void KCModuleInfo::init(KService::Ptr s) } void -KCModuleInfo::loadAll() +TDECModuleInfo::loadAll() { if( !_service ) /* We have a bogus service. All get functions will return empty/zero values */ return; @@ -180,19 +180,19 @@ KCModuleInfo::loadAll() } TQString -KCModuleInfo::docPath() const +TDECModuleInfo::docPath() const { if (!_allLoaded) - const_cast(this)->loadAll(); + const_cast(this)->loadAll(); return _doc; } TQString -KCModuleInfo::handle() const +TDECModuleInfo::handle() const { if (!_allLoaded) - const_cast(this)->loadAll(); + const_cast(this)->loadAll(); if (_handle.isEmpty()) return _lib; @@ -201,38 +201,38 @@ KCModuleInfo::handle() const } int -KCModuleInfo::weight() const +TDECModuleInfo::weight() const { if (!_allLoaded) - const_cast(this)->loadAll(); + const_cast(this)->loadAll(); return _weight; } bool -KCModuleInfo::needsRootPrivileges() const +TDECModuleInfo::needsRootPrivileges() const { if (!_allLoaded) - const_cast(this)->loadAll(); + const_cast(this)->loadAll(); return _needsRootPrivileges; } bool -KCModuleInfo::isHiddenByDefault() const +TDECModuleInfo::isHiddenByDefault() const { if (!_allLoaded) - const_cast(this)->loadAll(); + const_cast(this)->loadAll(); return _isHiddenByDefault; } -bool KCModuleInfo::needsTest() const +bool TDECModuleInfo::needsTest() const { return d->testModule; } -void KCModuleInfo::setNeedsTest( bool val ) +void TDECModuleInfo::setNeedsTest( bool val ) { d->testModule = val; } diff --git a/kutils/kcmoduleinfo.h b/kutils/kcmoduleinfo.h index b2e79ee46..a17f6af7a 100644 --- a/kutils/kcmoduleinfo.h +++ b/kutils/kcmoduleinfo.h @@ -32,12 +32,12 @@ class TQStringList; /** * @ingroup kcmodule - * A class that provides information about a KCModule + * A class that provides information about a TDECModule * - * KCModuleInfo provides various technical information, such as icon, library - * etc. about a KCModule.n + * TDECModuleInfo provides various technical information, such as icon, library + * etc. about a TDECModule.n * @note Any values set with the set* functions is not - * written back with KCModuleInfo it only reads value from the desktop file. + * written back with TDECModuleInfo it only reads value from the desktop file. * * @internal * @author Matthias Hoelzer-Kluepfel @@ -46,19 +46,19 @@ class TQStringList; * @since 3.2 * */ -class KUTILS_EXPORT KCModuleInfo +class KUTILS_EXPORT TDECModuleInfo { public: /** - * Constructs a KCModuleInfo. - * @note a KCModuleInfo object will have to be manually deleted, it is not + * Constructs a TDECModuleInfo. + * @note a TDECModuleInfo object will have to be manually deleted, it is not * done automatically for you. * @param desktopFile the desktop file representing the module, or * the name of the module. */ - KCModuleInfo(const TQString& desktopFile); + TDECModuleInfo(const TQString& desktopFile); /** * Same as above but takes a KService::Ptr as argument. @@ -67,27 +67,27 @@ public: * * @param moduleInfo specifies the module */ - KCModuleInfo( KService::Ptr moduleInfo ); + TDECModuleInfo( KService::Ptr moduleInfo ); /** - * Same as above but takes a KCModuleInfo as argument. + * Same as above but takes a TDECModuleInfo as argument. * * @param rhs specifies the module */ - KCModuleInfo( const KCModuleInfo &rhs ); + TDECModuleInfo( const TDECModuleInfo &rhs ); /** - * Same as above but creates an empty KCModuleInfo. + * Same as above but creates an empty TDECModuleInfo. * You should not normally call this. * @since 3.4 */ - KCModuleInfo(); + TDECModuleInfo(); /** * Assignment operator */ - KCModuleInfo &operator=( const KCModuleInfo &rhs ); + TDECModuleInfo &operator=( const TDECModuleInfo &rhs ); /** * Equal operator @@ -95,17 +95,17 @@ public: * @return true if @p rhs equals itself */ - bool operator==( const KCModuleInfo &rhs ) const; + bool operator==( const TDECModuleInfo &rhs ) const; /** * @return true if @p rhs is not equal itself */ - bool operator!=( const KCModuleInfo &rhs ) const; + bool operator!=( const TDECModuleInfo &rhs ) const; /** * Default destructor. */ - ~KCModuleInfo(); + ~TDECModuleInfo(); /** * @return the filename of the .desktop file that describes the KCM @@ -262,7 +262,7 @@ protected: void setDocPath(const TQString &p) { _doc = p; } /** - * Reads the service entries specific for KCModule from the desktop file. + * Reads the service entries specific for TDECModule from the desktop file. * The usual desktop entries are read in init. */ void loadAll(); @@ -276,7 +276,7 @@ private: private: - // KDE4 These needs to be moved to KCModuleInfoPrivate + // KDE4 These needs to be moved to TDECModuleInfoPrivate TQStringList _keywords; TQString _name, _icon, _lib, _handle, _fileName, _doc, _comment; bool _needsRootPrivileges : 1; @@ -286,8 +286,8 @@ private: KService::Ptr _service; - class KCModuleInfoPrivate; - KCModuleInfoPrivate *d; + class TDECModuleInfoPrivate; + TDECModuleInfoPrivate *d; }; diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp index 2238616c2..da31a72c2 100644 --- a/kutils/kcmoduleloader.cpp +++ b/kutils/kcmoduleloader.cpp @@ -39,11 +39,11 @@ * When something goes wrong in loading the module, this one * jumps in as a "dummy" module. */ -class KCMError : public KCModule +class KCMError : public TDECModule { public: KCMError( const TQString& msg, const TQString& details, TQWidget* parent ) - : KCModule( parent, "KCMError" ) + : TDECModule( parent, "KCMError" ) { TQVBoxLayout* topLayout = new TQVBoxLayout( this ); topLayout->addWidget( new TQLabel( msg, this ) ); @@ -55,7 +55,7 @@ class KCMError : public KCModule -KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname, +TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &libname, KLibLoader *loader, ErrorReporting report, TQWidget * parent, const char * name, const TQStringList & args ) { @@ -72,7 +72,7 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname, KLibFactory *factory = lib->factory(); if ( factory ) { - KCModule *module = KParts::ComponentFactory::createInstanceFromFactory( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args ); + TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args ); if (module) return module; } @@ -87,8 +87,8 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname, if (create) { // create the module - KCModule* (*func)(TQWidget *, const char *); - func = (KCModule* (*)(TQWidget *, const char *)) create; + TDECModule* (*func)(TQWidget *, const char *); + func = (TDECModule* (*)(TQWidget *, const char *)) create; return func( parent, name ? name : mod.handle().latin1() ); } else @@ -113,12 +113,12 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname, return 0; } -KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args ) +TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args ) { return loadModule( mod, None, withfallback, parent, name, args ); } -KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting report, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args ) +TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, ErrorReporting report, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args ) { /* * Simple libraries as modules are the easiest case: @@ -153,7 +153,7 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep KLibLoader *loader = KLibLoader::self(); - KCModule *module = load(mod, "kcm_%1", loader, report, parent, name, args ); + TDECModule *module = load(mod, "kcm_%1", loader, report, parent, name, args ); /* * Only try to load libkcm_* if it exists, otherwise KLibLoader::lastErrorMessage would say * "libkcm_foo not found" instead of the real problem with loading kcm_foo. @@ -189,19 +189,19 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep return 0; } -KCModule* KCModuleLoader::loadModule(const TQString &module, TQWidget *parent, +TDECModule* TDECModuleLoader::loadModule(const TQString &module, TQWidget *parent, const char *name, const TQStringList & args) { - return loadModule(KCModuleInfo(module), None, false, parent, name, args); + return loadModule(TDECModuleInfo(module), None, false, parent, name, args); } -KCModule* KCModuleLoader::loadModule(const TQString &module, ErrorReporting +TDECModule* TDECModuleLoader::loadModule(const TQString &module, ErrorReporting report, TQWidget *parent, const char *name, const TQStringList & args) { - return loadModule(KCModuleInfo(module), report, false, parent, name, args); + return loadModule(TDECModuleInfo(module), report, false, parent, name, args); } -void KCModuleLoader::unloadModule(const KCModuleInfo &mod) +void TDECModuleLoader::unloadModule(const TDECModuleInfo &mod) { // get the library loader instance KLibLoader *loader = KLibLoader::self(); @@ -214,7 +214,7 @@ void KCModuleLoader::unloadModule(const KCModuleInfo &mod) loader->unloadLibrary(TQFile::encodeName(libname.arg(mod.library()))); } -void KCModuleLoader::showLastLoaderError(TQWidget *parent) +void TDECModuleLoader::showLastLoaderError(TQWidget *parent) { KMessageBox::detailedError(parent, i18n("There was an error loading the module."),i18n("

      The diagnostics is:
      %1" @@ -227,12 +227,12 @@ void KCModuleLoader::showLastLoaderError(TQWidget *parent) } -bool KCModuleLoader::testModule( const TQString& module ) +bool TDECModuleLoader::testModule( const TQString& module ) { - return testModule( KCModuleInfo( module ) ); + return testModule( TDECModuleInfo( module ) ); } -bool KCModuleLoader::testModule( const KCModuleInfo& module ) +bool TDECModuleLoader::testModule( const TDECModuleInfo& module ) { if (!module.service()) { @@ -250,7 +250,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module ) /** * If something fails we return true - we can't risk functionality becoming * unavailable because of a buggy test. Furthermore, the error needs to - * show so it is discovered. KCModuleProxy will detect the error and load + * show so it is discovered. TDECModuleProxy will detect the error and load * a corresponding KCMError. * */ KLibLoader* loader = KLibLoader::self(); @@ -281,7 +281,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module ) } } -KCModule* KCModuleLoader::reportError( ErrorReporting report, const TQString & text, +TDECModule* TDECModuleLoader::reportError( ErrorReporting report, const TQString & text, TQString details, TQWidget * parent ) { if( details.isNull() ) diff --git a/kutils/kcmoduleloader.h b/kutils/kcmoduleloader.h index 9e0871241..b4b57e21a 100644 --- a/kutils/kcmoduleloader.h +++ b/kutils/kcmoduleloader.h @@ -31,23 +31,23 @@ class KLibLoader; * @ingroup kcmodule * @brief Loads a KControl Module. * - * KCModuleLoader tries in several ways - * to locate and load a KCModule. If loading fails a + * TDECModuleLoader tries in several ways + * to locate and load a TDECModule. If loading fails a * zero pointer is returned. \n - * It is very unlikely KCModuleLoader is what you want - * and @ref KCModuleProxy suits your needs. + * It is very unlikely TDECModuleLoader is what you want + * and @ref TDECModuleProxy suits your needs. * * @author Matthias Hoelzer-Kluepfel * @author Frans Englich * @since 3.2 * @internal **/ -class KUTILS_EXPORT KCModuleLoader +class KUTILS_EXPORT TDECModuleLoader { public: /** - * Loads a @ref KCModule. If loading fails a zero pointer is returned. + * Loads a @ref TDECModule. If loading fails a zero pointer is returned. * @param module what module to load * @param withFallback if true and loading failed a separate window * with the module may appear and a zero pointer is a returned @@ -55,17 +55,17 @@ class KUTILS_EXPORT KCModuleLoader * @param name The widget's name * @param args A list of arguments for the module to load * - * @return a pointer to the loaded @ref KCModule + * @return a pointer to the loaded @ref TDECModule * * @deprecated use the function which explicitly states the error reporting * method */ - static KCModule *loadModule(const KCModuleInfo &module, bool withFallback=true, + static TDECModule *loadModule(const TDECModuleInfo &module, bool withFallback=true, TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ) KDE_DEPRECATED; /** - * Loads a @ref KCModule. If loading fails a zero pointer is returned. + * Loads a @ref TDECModule. If loading fails a zero pointer is returned. * @param module what module to load * with the module may appear and a zero pointer is a returned * @param parent The parent widget @@ -75,7 +75,7 @@ class KUTILS_EXPORT KCModuleLoader * @deprecated use the function which explicitly states the error reporting * method */ - static KCModule *loadModule(const TQString &module, TQWidget *parent = 0, + static TDECModule *loadModule(const TQString &module, TQWidget *parent = 0, const char *name = 0, const TQStringList & args = TQStringList()) KDE_DEPRECATED; /** @@ -88,7 +88,7 @@ class KUTILS_EXPORT KCModuleLoader None = 0, /** * the error report is shown instead of the - * KCModule that should have * been loaded + * TDECModule that should have * been loaded */ Inline = 1, /** @@ -102,7 +102,7 @@ class KUTILS_EXPORT KCModuleLoader }; /** - * Loads a @ref KCModule. If loading fails a zero pointer is returned. + * Loads a @ref TDECModule. If loading fails a zero pointer is returned. * @param module what module to load * @param report see ErrorReporting * @param withFallback if true and loading failed a separate window @@ -111,15 +111,15 @@ class KUTILS_EXPORT KCModuleLoader * @param name The widget's name * @param args A list of arguments for the module to load * - * @return a pointer to the loaded @ref KCModule + * @return a pointer to the loaded @ref TDECModule * @since 3.4 */ - static KCModule *loadModule(const KCModuleInfo &module, ErrorReporting + static TDECModule *loadModule(const TDECModuleInfo &module, ErrorReporting report, bool withFallback=true, TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** - * Loads a @ref KCModule. If loading fails a zero pointer is returned. + * Loads a @ref TDECModule. If loading fails a zero pointer is returned. * @param module what module to load * @param report see ErrorReporting * with the module may appear and a zero pointer is a returned @@ -127,10 +127,10 @@ class KUTILS_EXPORT KCModuleLoader * @param name The widget's name * @param args A list of arguments for the module to load * - * @return a pointer to the loaded @ref KCModule + * @return a pointer to the loaded @ref TDECModule * @since 3.4 */ - static KCModule *loadModule(const TQString &module, ErrorReporting + static TDECModule *loadModule(const TQString &module, ErrorReporting report, TQWidget *parent = 0, const char *name = 0, const TQStringList & args = TQStringList()); @@ -138,7 +138,7 @@ class KUTILS_EXPORT KCModuleLoader * Unloads the module's library * @param mod What module to unload for */ - static void unloadModule(const KCModuleInfo &mod); + static void unloadModule(const TDECModuleInfo &mod); /** * Display a message box explaining an error occured and possible @@ -151,7 +151,7 @@ class KUTILS_EXPORT KCModuleLoader /** - * Checks whether an KCModule should be shown by running its + * Checks whether an TDECModule should be shown by running its * test function. If it is unsure whether a module should be shown, it should * be made available, leaving the decision to the user. * If false is returned, the module should not be loaded in any interface. @@ -187,10 +187,10 @@ class KUTILS_EXPORT KCModuleLoader * @returns true if the module should be loaded * @since 3.4 */ - static bool testModule( const KCModuleInfo& module ); + static bool testModule( const TDECModuleInfo& module ); /** - * Returns a KCModule containing the messages @p report and @p text. + * Returns a TDECModule containing the messages @p report and @p text. * * @param report the type of error reporting, see ErrorReporting * @param text the main message @@ -200,7 +200,7 @@ class KUTILS_EXPORT KCModuleLoader * @since 3.4 * @internal */ - static KCModule* reportError( ErrorReporting report, const TQString & text, + static TDECModule* reportError( ErrorReporting report, const TQString & text, TQString details, TQWidget * parent ); private: @@ -209,7 +209,7 @@ class KUTILS_EXPORT KCModuleLoader * Internal loader called by the public loaders. * @internal */ - static KCModule* load(const KCModuleInfo &mod, const TQString &libname, + static TDECModule* load(const TDECModuleInfo &mod, const TQString &libname, KLibLoader *loader, ErrorReporting report, TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index f034c9a5f..df6b2bb98 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -55,10 +55,10 @@ #include "kcmoduleproxyIfaceImpl.h" /***************************************************************/ -class KCModuleProxy::KCModuleProxyPrivate +class TDECModuleProxy::TDECModuleProxyPrivate { public: - KCModuleProxyPrivate( const KCModuleInfo & info ) + TDECModuleProxyPrivate( const TDECModuleInfo & info ) : args( 0 ) , kcm( 0 ) //, view( 0 ) @@ -78,7 +78,7 @@ class KCModuleProxy::KCModuleProxyPrivate , isInitialized( false ) {} - ~KCModuleProxyPrivate() + ~TDECModuleProxyPrivate() { delete rootInfo; // Delete before embedWidget! delete embedWidget; // Delete before embedFrame! @@ -91,17 +91,17 @@ class KCModuleProxy::KCModuleProxyPrivate } TQStringList args; - KCModule *kcm; + TDECModule *kcm; QXEmbed *embedWidget; TDEProcess *rootProcess; TQVBox *embedFrame; - KCModuleProxyIfaceImpl *dcopObject; + TDECModuleProxyIfaceImpl *dcopObject; DCOPClient *dcopClient; TQVBoxLayout *topLayout; /* Contains TQScrollView view, and root stuff */ - KCModuleProxyRootCommunicatorImpl *rootCommunicator; + TDECModuleProxyRootCommunicatorImpl *rootCommunicator; TQLabel *rootInfo; TQCString dcopName; - KCModuleInfo modInfo; + TDECModuleInfo modInfo; bool withFallback; bool changed; bool rootMode; @@ -115,7 +115,7 @@ class KCModuleProxy::KCModuleProxyPrivate /* TODO: - - How KCModuleProxy behaves wrt memory leaks and behavior, when exiting + - How TDECModuleProxy behaves wrt memory leaks and behavior, when exiting from root mode is not tested, because no code make use of it. It needs work, if it should be used. @@ -137,7 +137,7 @@ class KCModuleProxy::KCModuleProxyPrivate */ /***************************************************************/ -KCModule * KCModuleProxy::realModule() const +TDECModule * TDECModuleProxy::realModule() const { /* @@ -157,11 +157,11 @@ KCModule * KCModuleProxy::realModule() const TQApplication::setOverrideCursor( Qt::WaitCursor ); - KCModuleProxy * that = const_cast( this ); + TDECModuleProxy * that = const_cast( this ); if( !d->isInitialized ) { - d->dcopName = TQString(moduleInfo().handle().prepend("KCModuleProxy-")).utf8(); + d->dcopName = TQString(moduleInfo().handle().prepend("TDECModuleProxy-")).utf8(); d->topLayout = new TQVBoxLayout( that, 0, 0, "topLayout" ); d->isInitialized = true; @@ -180,9 +180,9 @@ KCModule * KCModuleProxy::realModule() const * or, it was an random application which had picked that name */ kdDebug(711) << "Module not already loaded, loading module" << endl; - d->dcopObject = new KCModuleProxyIfaceImpl( d->dcopName, that ); + d->dcopObject = new TDECModuleProxyIfaceImpl( d->dcopName, that ); - d->kcm = KCModuleLoader::loadModule( moduleInfo(), KCModuleLoader::Inline, d->withFallback, + d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback, that, name(), d->args ); connect( d->kcm, TQT_SIGNAL( changed( bool ) ), @@ -248,7 +248,7 @@ KCModule * KCModuleProxy::realModule() const { stream >> result; - d->kcm = KCModuleLoader::reportError( KCModuleLoader::Inline, + d->kcm = TDECModuleLoader::reportError( TDECModuleLoader::Inline, i18n( "Argument is application name", "This configuration section is " "already opened in %1" ).arg( result ), " ", that ); @@ -256,7 +256,7 @@ KCModule * KCModuleProxy::realModule() const } else { - kdDebug(711) << "Calling KCModuleProxy's DCOP interface for fetching the name failed." << endl; + kdDebug(711) << "Calling TDECModuleProxy's DCOP interface for fetching the name failed." << endl; d->bogusOccupier = true; TQApplication::restoreOverrideCursor(); return realModule(); @@ -268,7 +268,7 @@ KCModule * KCModuleProxy::realModule() const return d->kcm; } -void KCModuleProxy::applicationRemoved( const TQCString& app ) +void TDECModuleProxy::applicationRemoved( const TQCString& app ) { if( app == d->dcopName ) { @@ -282,7 +282,7 @@ void KCModuleProxy::applicationRemoved( const TQCString& app ) } } -void KCModuleProxy::showEvent( TQShowEvent * ev ) +void TDECModuleProxy::showEvent( TQShowEvent * ev ) { kdDebug(711) << k_funcinfo << endl; @@ -296,7 +296,7 @@ void KCModuleProxy::showEvent( TQShowEvent * ev ) } -void KCModuleProxy::runAsRoot() +void TDECModuleProxy::runAsRoot() { if ( !moduleInfo().needsRootPrivileges() ) return; @@ -378,7 +378,7 @@ void KCModuleProxy::runAsRoot() { d->rootMode = true; kapp->dcopClient(); - d->rootCommunicator = new KCModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this ); + d->rootCommunicator = new TDECModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this ); } delete lblBusy; @@ -395,7 +395,7 @@ void KCModuleProxy::runAsRoot() TQApplication::restoreOverrideCursor(); } -void KCModuleProxy::rootExited() +void TDECModuleProxy::rootExited() { kdDebug(711) << k_funcinfo << endl; @@ -426,15 +426,15 @@ void KCModuleProxy::rootExited() emit childClosed(); } -KCModuleProxy::~KCModuleProxy() +TDECModuleProxy::~TDECModuleProxy() { deleteClient(); - KCModuleLoader::unloadModule(moduleInfo()); + TDECModuleLoader::unloadModule(moduleInfo()); delete d; } -void KCModuleProxy::deleteClient() +void TDECModuleProxy::deleteClient() { if( d->embedWidget ) XKillClient(tqt_xdisplay(), d->embedWidget->embeddedWinId()); @@ -456,7 +456,7 @@ void KCModuleProxy::deleteClient() } -void KCModuleProxy::moduleChanged( bool c ) +void TDECModuleProxy::moduleChanged( bool c ) { if( d->changed == c ) return; @@ -466,21 +466,21 @@ void KCModuleProxy::moduleChanged( bool c ) emit changed( this ); } -void KCModuleProxy::moduleDestroyed() +void TDECModuleProxy::moduleDestroyed() { d->kcm = 0; } -KCModuleProxy::KCModuleProxy( const KService::Ptr & service, bool withFallback, +TDECModuleProxy::TDECModuleProxy( const KService::Ptr & service, bool withFallback, TQWidget * parent, const char * name, const TQStringList & args) : TQWidget( parent, name ) { - init( KCModuleInfo( service )); + init( TDECModuleInfo( service )); d->args = args; d->withFallback = withFallback; } -KCModuleProxy::KCModuleProxy( const KCModuleInfo & info, bool withFallback, +TDECModuleProxy::TDECModuleProxy( const TDECModuleInfo & info, bool withFallback, TQWidget * parent, const char * name, const TQStringList & args ) : TQWidget( parent, name ) { @@ -489,21 +489,21 @@ KCModuleProxy::KCModuleProxy( const KCModuleInfo & info, bool withFallback, d->withFallback = withFallback; } -KCModuleProxy::KCModuleProxy( const TQString& serviceName, bool withFallback, +TDECModuleProxy::TDECModuleProxy( const TQString& serviceName, bool withFallback, TQWidget * parent, const char * name, const TQStringList & args) : TQWidget( parent, name ) { - init( KCModuleInfo( serviceName )); + init( TDECModuleInfo( serviceName )); d->args = args; d->withFallback = withFallback; } -void KCModuleProxy::init( const KCModuleInfo& info ) +void TDECModuleProxy::init( const TDECModuleInfo& info ) { kdDebug(711) << k_funcinfo << endl; - d = new KCModuleProxyPrivate( info ); + d = new TDECModuleProxyPrivate( info ); /* This is all we do for now; all the heavy work is * done in realModule(). It's called when the module @@ -513,7 +513,7 @@ void KCModuleProxy::init( const KCModuleInfo& info ) } -void KCModuleProxy::load() +void TDECModuleProxy::load() { if( d->rootMode ) @@ -525,7 +525,7 @@ void KCModuleProxy::load() } } -void KCModuleProxy::save() +void TDECModuleProxy::save() { if( d->rootMode ) callRootModule( "save()" ); @@ -536,7 +536,7 @@ void KCModuleProxy::save() } } -void KCModuleProxy::callRootModule( const TQCString& function ) +void TDECModuleProxy::callRootModule( const TQCString& function ) { TQByteArray sendData, replyData; TQCString replyType; @@ -549,7 +549,7 @@ void KCModuleProxy::callRootModule( const TQCString& function ) } -void KCModuleProxy::defaults() +void TDECModuleProxy::defaults() { if( d->rootMode ) callRootModule( "defaults()" ); @@ -557,7 +557,7 @@ void KCModuleProxy::defaults() d->kcm->defaults(); } -TQString KCModuleProxy::quickHelp() const +TQString TDECModuleProxy::quickHelp() const { if( !d->rootMode ) @@ -586,7 +586,7 @@ TQString KCModuleProxy::quickHelp() const } } -const TDEAboutData * KCModuleProxy::aboutData() const +const TDEAboutData * TDECModuleProxy::aboutData() const { if( !d->rootMode ) return realModule() ? realModule()->aboutData() : 0; @@ -598,48 +598,48 @@ const TDEAboutData * KCModuleProxy::aboutData() const } -int KCModuleProxy::buttons() const +int TDECModuleProxy::buttons() const { return realModule() ? realModule()->buttons() : - KCModule::Help | KCModule::Default | KCModule::Apply ; + TDECModule::Help | TDECModule::Default | TDECModule::Apply ; } -TQString KCModuleProxy::rootOnlyMsg() const +TQString TDECModuleProxy::rootOnlyMsg() const { return realModule() ? realModule()->rootOnlyMsg() : TQString::null; } -bool KCModuleProxy::useRootOnlyMsg() const +bool TDECModuleProxy::useRootOnlyMsg() const { return realModule() ? realModule()->useRootOnlyMsg() : true; } -TDEInstance * KCModuleProxy::instance() const +TDEInstance * TDECModuleProxy::instance() const { return realModule() ? realModule()->instance() : 0; } -bool KCModuleProxy::changed() const +bool TDECModuleProxy::changed() const { return d->changed; } -const KCModuleInfo& KCModuleProxy::moduleInfo() const +const TDECModuleInfo& TDECModuleProxy::moduleInfo() const { return d->modInfo; } -bool KCModuleProxy::rootMode() const +bool TDECModuleProxy::rootMode() const { return d->rootMode; } -TQCString KCModuleProxy::dcopName() const +TQCString TDECModuleProxy::dcopName() const { return d->dcopName; } -void KCModuleProxy::emitQuickHelpChanged() +void TDECModuleProxy::emitQuickHelpChanged() { emit quickHelpChanged(); } diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h index baf532e34..2ffeabf56 100644 --- a/kutils/kcmoduleproxy.h +++ b/kutils/kcmoduleproxy.h @@ -28,56 +28,56 @@ #include class TDEAboutData; -class KCModule; -class KCModuleInfo; +class TDECModule; +class TDECModuleInfo; class TDEInstance; class TDEProcess; /** * @ingroup kcmodule * - * @brief Encapsulates a KCModule for embedding. + * @brief Encapsulates a TDECModule for embedding. * - * KCModuleProxy is a wrapper for KCModule intended for cases where + * TDECModuleProxy is a wrapper for TDECModule intended for cases where * modules are to be displayed. It ensures layout is consistent, handles * root/administrator modules and in general takes care of the details - * needed for making a module available in an interface. A KCModuleProxy + * needed for making a module available in an interface. A TDECModuleProxy * can be treated as a TQWidget, without worrying about the details specific - * for modules such as library loading. KCModuleProxy is not a sub class of KCModule - * but its API closely resembles KCModule's.\n + * for modules such as library loading. TDECModuleProxy is not a sub class of TDECModule + * but its API closely resembles TDECModule's.\n * Usually, an instance is created by passing one of the constructors a KService::Ptr, - * KCModuleInfo or simply the name of the module and then added to the layout as any + * TDECModuleInfo or simply the name of the module and then added to the layout as any * other widget. \n - * When the user have changed the module, changed( bool ) as well as changed ( KCModuleProxy * ) - * is emitted. KCModuleProxy does not take care of prompting for saving - if the object is deleted while + * When the user have changed the module, changed( bool ) as well as changed ( TDECModuleProxy * ) + * is emitted. TDECModuleProxy does not take care of prompting for saving - if the object is deleted while * changes is not saved the changes will be lost. changed() returns true if changes are unsaved. \n * \n - * KCModuleProxy does not take care of authorization of KCModules. \n - * KCModuleProxy do lazy loading, meaning the library will not be loaded or + * TDECModuleProxy does not take care of authorization of TDECModules. \n + * TDECModuleProxy do lazy loading, meaning the library will not be loaded or * any other initialization done before its show() function is called. This means * modules will only be loaded when they are actually needed as well as it is possible to - * load many KCModuleProxy without any speed penalty. + * load many TDECModuleProxy without any speed penalty. * - * KCModuleProxy should be used in all cases where modules are embedded in order to + * TDECModuleProxy should be used in all cases where modules are embedded in order to * promote code efficiency and usability consistency. * * @author Frans Englich * @author Matthias Kretz * */ -class KUTILS_EXPORT KCModuleProxy : public TQWidget +class KUTILS_EXPORT TDECModuleProxy : public TQWidget { Q_OBJECT - friend class KCModuleProxyRootCommunicatorImpl; + friend class TDECModuleProxyRootCommunicatorImpl; public: /** - * Constructs a KCModuleProxy from a KCModuleInfo class. + * Constructs a TDECModuleProxy from a TDECModuleInfo class. * - * @param info The KCModuleInfo to construct the module from. + * @param info The TDECModuleInfo to construct the module from. * @param withFallback If set to true and loading of the module fails, * a alternative will be tried, resulting in the module appearing in its * own window, if at all. @@ -87,12 +87,12 @@ public: * @param args This is used in the implementation and is internal. * Use the default. */ - KCModuleProxy( const KCModuleInfo & info, bool withFallback = true, + TDECModuleProxy( const TDECModuleInfo & info, bool withFallback = true, TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** - * Constructs a KCModuleProxy from a module's service name, which is + * Constructs a TDECModuleProxy from a module's service name, which is * equivalent to the desktop file for the kcm without the ".desktop" part. * Otherwise equal to the one above. * @@ -106,12 +106,12 @@ public: * @param args This is used in the implementation and is internal. * Use the default. */ - KCModuleProxy( const TQString& serviceName, bool withFallback = true, + TDECModuleProxy( const TQString& serviceName, bool withFallback = true, TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** - * Constructs a KCModuleProxy from KService. Otherwise equal to the one above. + * Constructs a TDECModuleProxy from KService. Otherwise equal to the one above. * * @param service The KService to construct from. * @param withFallback If set to true and loading of the module fails, @@ -123,14 +123,14 @@ public: * @param args This is used in the implementation and is internal. * Use the default. */ - KCModuleProxy( const KService::Ptr& service, bool withFallback = true, + TDECModuleProxy( const KService::Ptr& service, bool withFallback = true, TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** * Default destructor */ - ~KCModuleProxy(); + ~TDECModuleProxy(); /** * Calling it will cause the contained module to @@ -181,7 +181,7 @@ public: // this one's available via moduleInfo()-> and realModule()-> /** - * Returns the embedded KCModule's TDEInstance. + * Returns the embedded TDECModule's TDEInstance. * @return The module's TDEInstance. * @deprecated */ @@ -215,13 +215,13 @@ public: * * @return the encapsulated module. */ - KCModule* realModule() const; + TDECModule* realModule() const; /** - * @return a KCModuleInfo for the encapsulated + * @return a TDECModuleInfo for the encapsulated * module */ - const KCModuleInfo& moduleInfo() const; + const TDECModuleInfo& moduleInfo() const; /** * Returns the DCOP the module's DCOPClient @@ -250,7 +250,7 @@ public slots: /** * Calling this, results in deleting the contained * module, and unregistering from DCOP. A similar result is achieved - * by deleting the KCModuleProxy itself. + * by deleting the TDECModuleProxy itself. * * @since 3.4 */ @@ -265,11 +265,11 @@ signals: /** * This is emitted in the same situations as in the one above. Practical - * when several KCModuleProxys are loaded. + * when several TDECModuleProxys are loaded. * * @since 3.4 */ - void changed( KCModuleProxy* mod ); + void changed( TDECModuleProxy* mod ); /** * When a module running with root privileges and exits, returns to normal mode, the @@ -301,7 +301,7 @@ protected: * @internal * @since 3.4 */ - void init( const KCModuleInfo& info ); + void init( const TDECModuleInfo& info ); /** @@ -313,7 +313,7 @@ protected: private slots: /** - * Calls the function @p function of the root module's KCModuleProxy + * Calls the function @p function of the root module's TDECModuleProxy * DCOP interface. * * @param function the function signature of the function to call. @@ -350,8 +350,8 @@ private slots: private: - class KCModuleProxyPrivate; - KCModuleProxyPrivate * d; + class TDECModuleProxyPrivate; + TDECModuleProxyPrivate * d; }; #endif // KCMODULEPROXY_H diff --git a/kutils/kcmoduleproxyIface.h b/kutils/kcmoduleproxyIface.h index ff597b5c6..5bf24ac91 100644 --- a/kutils/kcmoduleproxyIface.h +++ b/kutils/kcmoduleproxyIface.h @@ -24,16 +24,16 @@ /** * @ingroup kcmodule - * @brief DCOP Interface for KCModule. + * @brief DCOP Interface for TDECModule. * - * A module (which is loaded via KCModuleProxy) does always have + * A module (which is loaded via TDECModuleProxy) does always have * this DCOP interface, whether it's in root mode or not. * * @since 3.4 * @internal * @author Frans Englich */ -class KCModuleProxyIface : virtual public DCOPObject +class TDECModuleProxyIface : virtual public DCOPObject { K_DCOP @@ -81,7 +81,7 @@ k_dcop_signals: * * @param c true if the module is modified, false if its not. * @param module a string identifying the module which was changed. This - * is typically "KCModuleProx-X" where X is the module's name. + * is typically "TDECModuleProx-X" where X is the module's name. */ virtual void changed( bool c ); @@ -93,25 +93,25 @@ k_dcop_signals: * @ingroup kcmodule * @brief DCOP interface for communicating with the real module running in root mode. * - * When a KCModuleProxy tells kcmshell to load "itself" and embed into the - * KCModuleProxy, this DCOP interface is used to communicate to the real KCModuleProxy, since - * the KCModuleProxy which told kcmshell to load itself, is nothing but a shell. + * When a TDECModuleProxy tells kcmshell to load "itself" and embed into the + * TDECModuleProxy, this DCOP interface is used to communicate to the real TDECModuleProxy, since + * the TDECModuleProxy which told kcmshell to load itself, is nothing but a shell. * * Currently is only the changed signal routed, but it's possible to proxy - * the rest of the KCModuleProxy API, if it turns out necessary. + * the rest of the TDECModuleProxy API, if it turns out necessary. * * @since 3.4 * @internal * @author Frans Englich */ -class KCModuleProxyRootDispatcher : virtual public DCOPObject +class TDECModuleProxyRootDispatcher : virtual public DCOPObject { K_DCOP k_dcop: /** - * KCModuleProxyIface::changed() gets connected to this. + * TDECModuleProxyIface::changed() gets connected to this. */ virtual void changed( bool c ) = 0; diff --git a/kutils/kcmoduleproxyIfaceImpl.cpp b/kutils/kcmoduleproxyIfaceImpl.cpp index c9de5ba7a..5e1ca4986 100644 --- a/kutils/kcmoduleproxyIfaceImpl.cpp +++ b/kutils/kcmoduleproxyIfaceImpl.cpp @@ -30,10 +30,10 @@ #include -KCModuleProxyIfaceImpl::KCModuleProxyIfaceImpl( const TQCString& name, - KCModuleProxy* const client ) +TDECModuleProxyIfaceImpl::TDECModuleProxyIfaceImpl( const TQCString& name, + TDECModuleProxy* const client ) : DCOPObject( name ), TQObject( 0, name ), - p( const_cast( client )) + p( const_cast( client )) { connect( p, TQT_SIGNAL( changed(bool)), TQT_SLOT( changedRelay(bool))); @@ -41,40 +41,40 @@ KCModuleProxyIfaceImpl::KCModuleProxyIfaceImpl( const TQCString& name, TQT_SLOT( quickHelpRelay())); } -void KCModuleProxyIfaceImpl::save() +void TDECModuleProxyIfaceImpl::save() { kdDebug(711) << k_funcinfo << endl; p->save(); } -void KCModuleProxyIfaceImpl::load() +void TDECModuleProxyIfaceImpl::load() { kdDebug(711) << k_funcinfo << endl; p->load(); } -void KCModuleProxyIfaceImpl::defaults() +void TDECModuleProxyIfaceImpl::defaults() { kdDebug(711) << k_funcinfo << endl; p->defaults(); } -TQString KCModuleProxyIfaceImpl::applicationName() +TQString TDECModuleProxyIfaceImpl::applicationName() { return kapp->caption(); } -TQString KCModuleProxyIfaceImpl::quickHelp() +TQString TDECModuleProxyIfaceImpl::quickHelp() { return p->quickHelp(); } -bool KCModuleProxyIfaceImpl::changed() +bool TDECModuleProxyIfaceImpl::changed() { return p->changed(); } -void KCModuleProxyIfaceImpl::changedRelay( bool c ) +void TDECModuleProxyIfaceImpl::changedRelay( bool c ) { TQByteArray data; TQDataStream stream(data, IO_WriteOnly); @@ -82,7 +82,7 @@ void KCModuleProxyIfaceImpl::changedRelay( bool c ) emitDCOPSignal( "changed(bool)", data ); } -void KCModuleProxyIfaceImpl::quickHelpRelay() +void TDECModuleProxyIfaceImpl::quickHelpRelay() { TQByteArray data; emitDCOPSignal( "quickHelpChanged()", data ); @@ -94,18 +94,18 @@ void KCModuleProxyIfaceImpl::quickHelpRelay() /***************************************************************/ -KCModuleProxyRootCommunicatorImpl::KCModuleProxyRootCommunicatorImpl - ( const TQCString& name, KCModuleProxy* const client ) +TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl + ( const TQCString& name, TDECModuleProxy* const client ) : DCOPObject( name ), TQObject( 0, name ), - p( const_cast( client )) + p( const_cast( client )) { /* - * Connect kcmshell's KCModuleProxy's change signal + * Connect kcmshell's TDECModuleProxy's change signal * to us, such that we act as a proxy for - * KCModuleProxy's API. + * TDECModuleProxy's API. */ - /* Note, we don't use KCModuleProxy::d->dcopClient */ + /* Note, we don't use TDECModuleProxy::d->dcopClient */ kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), "changed(bool)", objId(), "changed(bool)", false ); @@ -114,13 +114,13 @@ KCModuleProxyRootCommunicatorImpl::KCModuleProxyRootCommunicatorImpl } /* Reimplementations of DCOP members */ -void KCModuleProxyRootCommunicatorImpl::changed( bool c ) +void TDECModuleProxyRootCommunicatorImpl::changed( bool c ) { kdDebug(711) << k_funcinfo << endl; p->moduleChanged( c ); } -void KCModuleProxyRootCommunicatorImpl::quickHelpChanged() +void TDECModuleProxyRootCommunicatorImpl::quickHelpChanged() { kdDebug(711) << k_funcinfo << endl; p->emitQuickHelpChanged(); diff --git a/kutils/kcmoduleproxyIfaceImpl.h b/kutils/kcmoduleproxyIfaceImpl.h index bbfe51a28..9de3d58dd 100644 --- a/kutils/kcmoduleproxyIfaceImpl.h +++ b/kutils/kcmoduleproxyIfaceImpl.h @@ -21,14 +21,14 @@ #include "kcmoduleproxyIface.h" -class KCModuleProxy; +class TDECModuleProxy; /***************************************************************/ /** @internal @ingroup internal */ -class KCModuleProxyIfaceImpl: public TQObject, virtual public KCModuleProxyIface +class TDECModuleProxyIfaceImpl: public TQObject, virtual public TDECModuleProxyIface { - /* KDE4 Merge KCModuleProxyIfaceImpl with KCModuleProxy(MI) + /* KDE4 Merge TDECModuleProxyIfaceImpl with TDECModuleProxy(MI) * if it doesn't break what DCOPClient it binds to. * Update: This is probably not possible, since we don't want the DCOPObject when * we're running in root mode. */ @@ -38,7 +38,7 @@ class KCModuleProxyIfaceImpl: public TQObject, virtual public KCModuleProxyIface public: /* Reimplementations of DCOP members */ - KCModuleProxyIfaceImpl( const TQCString& name, KCModuleProxy* const client ); + TDECModuleProxyIfaceImpl( const TQCString& name, TDECModuleProxy* const client ); virtual void save(); @@ -59,14 +59,14 @@ public slots: void changedRelay( bool c ); /** - * Simply relays KCModuleProxy's signal with the same name. + * Simply relays TDECModuleProxy's signal with the same name. */ void quickHelpRelay(); private: - KCModuleProxy* p; + TDECModuleProxy* p; }; /***************************************************************/ @@ -76,20 +76,20 @@ private: /***************************************************************/ /** @internal @ingroup internal */ -class KCModuleProxyRootCommunicatorImpl: public TQObject, - virtual public KCModuleProxyRootDispatcher +class TDECModuleProxyRootCommunicatorImpl: public TQObject, + virtual public TDECModuleProxyRootDispatcher { Q_OBJECT public: - KCModuleProxyRootCommunicatorImpl( const TQCString& name, KCModuleProxy* const client ); + TDECModuleProxyRootCommunicatorImpl( const TQCString& name, TDECModuleProxy* const client ); /* Reimplementations of DCOP members */ virtual void changed( bool c ); virtual void quickHelpChanged(); -KCModuleProxy* p; +TDECModuleProxy* p; }; /***************************************************************/ diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp index 511af866b..5fe862177 100644 --- a/kutils/kcmultidialog.cpp +++ b/kutils/kcmultidialog.cpp @@ -51,7 +51,7 @@ class KCMultiDialog::KCMultiDialogPrivate {} bool hasRootKCM; - KCModuleProxy* currentModule; + TDECModuleProxy* currentModule; }; @@ -141,7 +141,7 @@ void KCMultiDialog::apply() ModuleList::Iterator end = m_modules.end(); for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it ) { - KCModuleProxy * m = ( *it ).kcm; + TDECModuleProxy * m = ( *it ).kcm; if( m->changed() ) { m->save(); @@ -228,10 +228,10 @@ void KCMultiDialog::addModule(const TQString& path, bool withfallback, TQStringL KService::Ptr service = KService::serviceByStorageId( complete ); - addModule( KCModuleInfo( service ), TQStringList(), withfallback, args ); + addModule( TDECModuleInfo( service ), TQStringList(), withfallback, args ); } -void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo, +void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo, TQStringList parentmodulenames, bool withfallback, TQStringList args) { kdDebug(710) << "KCMultiDialog::addModule " @@ -243,7 +243,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo, if ( !kapp->authorizeControlModule( moduleinfo.service()->menuId() )) return; - if( !KCModuleLoader::testModule( moduleinfo )) + if( !TDECModuleLoader::testModule( moduleinfo )) return; TQFrame* page = 0; @@ -271,17 +271,17 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo, break; } if(!page) { - KCModuleLoader::unloadModule(moduleinfo); + TDECModuleLoader::unloadModule(moduleinfo); return; } - KCModuleProxy * module; + TDECModuleProxy * module; if( m_orphanModules.contains( moduleinfo.service() ) ) { - // the KCModule already exists - it was removed from the dialog in + // the TDECModule already exists - it was removed from the dialog in // removeAllModules module = m_orphanModules[ moduleinfo.service() ]; m_orphanModules.remove( moduleinfo.service() ); - kdDebug( 710 ) << "Use KCModule from the list of orphans for " << + kdDebug( 710 ) << "Use TDECModule from the list of orphans for " << moduleinfo.moduleName() << ": " << module << endl; module->reparent( page, 0, TQPoint( 0, 0 ), true ); @@ -294,7 +294,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo, } else { - module = new KCModuleProxy( moduleinfo, withfallback, page, 0, args ); + module = new TDECModuleProxy( moduleinfo, withfallback, page, 0, args ); TQStringList parentComponents = moduleinfo.service()->property( "X-TDE-ParentComponents" ).toStringList(); moduleParentComponents.insert( module, @@ -327,7 +327,7 @@ void KCMultiDialog::removeAllModules() for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it ) { kdDebug( 710 ) << "remove 2" << endl; - KCModuleProxy * kcm = ( *it ).kcm; + TDECModuleProxy * kcm = ( *it ).kcm; TQObject * page = TQT_TQOBJECT(kcm->parent()); kcm->hide(); if( page ) @@ -337,7 +337,7 @@ void KCMultiDialog::removeAllModules() delete page; } m_orphanModules[ ( *it ).service ] = kcm; - kdDebug( 710 ) << "added KCModule to the list of orphans: " << + kdDebug( 710 ) << "added TDECModule to the list of orphans: " << kcm << endl; } m_modules.clear(); @@ -354,19 +354,19 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) { kdDebug(710) << k_funcinfo << endl; - TQObject * obj = page->child( 0, "KCModuleProxy" ); + TQObject * obj = page->child( 0, "TDECModuleProxy" ); if( ! obj ) return; - KCModuleProxy * module = ::tqqt_cast(obj); + TDECModuleProxy * module = ::tqqt_cast(obj); if( ! module ) return; d->currentModule = module; enableButton( KDialogBase::Help, - d->currentModule->buttons() & KCModule::Help ); + d->currentModule->buttons() & TDECModule::Help ); enableButton( KDialogBase::Default, - d->currentModule->buttons() & KCModule::Default ); + d->currentModule->buttons() & TDECModule::Default ); disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 ); diff --git a/kutils/kcmultidialog.h b/kutils/kcmultidialog.h index c26836e31..7c89621ca 100644 --- a/kutils/kcmultidialog.h +++ b/kutils/kcmultidialog.h @@ -29,8 +29,8 @@ #include #include -class KCModuleProxy; -class KCModuleInfo; +class TDECModuleProxy; +class TDECModuleInfo; /** * @ingroup kcmodule @@ -126,7 +126,7 @@ public: /** * Add a module. * - * @param moduleinfo Pass a KCModuleInfo object which will be + * @param moduleinfo Pass a TDECModuleInfo object which will be * used for creating the module. It will be added * to the list of modules the dialog will show. * @@ -140,7 +140,7 @@ public: * * @param args List of arguments to pass to the module. **/ - void addModule(const KCModuleInfo& moduleinfo, TQStringList + void addModule(const TDECModuleInfo& moduleinfo, TQStringList parentmodulenames = TQStringList(), bool withfallback=false, TQStringList args = TQStringList()); /** @@ -156,7 +156,7 @@ public: signals: /** - * Emitted after all KCModules have been told to save their configuration. + * Emitted after all TDECModules have been told to save their configuration. * * The applyClicked and okClicked signals are emitted before the * configuration is saved. @@ -164,7 +164,7 @@ signals: void configCommitted(); /** - * Emitted after the KCModules have been told to save their configuration. + * Emitted after the TDECModules have been told to save their configuration. * It is emitted once for every instance the KCMs that were changed belong * to. * @@ -265,14 +265,14 @@ private: struct CreatedModule { - KCModuleProxy * kcm; + TDECModuleProxy * kcm; KService::Ptr service; /* KDE 4 Move to Private class */ }; typedef TQValueList ModuleList; ModuleList m_modules; - typedef TQMap OrphanMap; + typedef TQMap OrphanMap; OrphanMap m_orphanModules; TQPtrDict moduleParentComponents; diff --git a/kutils/kplugininfo.cpp b/kutils/kplugininfo.cpp index acdf57dc2..aec0a095c 100644 --- a/kutils/kplugininfo.cpp +++ b/kutils/kplugininfo.cpp @@ -60,7 +60,7 @@ class KPluginInfo::KPluginInfoPrivate bool enabledbydefault; bool pluginenabled; - KConfig * config; + TDEConfig * config; TQString configgroup; KService::Ptr service; TQValueList kcmservices; @@ -151,7 +151,7 @@ KPluginInfo::~KPluginInfo() delete d; } -TQValueList KPluginInfo::fromServices( const KService::List & services, KConfig * config, const TQString & group ) +TQValueList KPluginInfo::fromServices( const KService::List & services, TDEConfig * config, const TQString & group ) { TQValueList infolist; KPluginInfo * info; @@ -165,7 +165,7 @@ TQValueList KPluginInfo::fromServices( const KService::List & serv return infolist; } -TQValueList KPluginInfo::fromFiles( const TQStringList & files, KConfig * config, const TQString & group ) +TQValueList KPluginInfo::fromFiles( const TQStringList & files, TDEConfig * config, const TQString & group ) { TQValueList infolist; for( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) @@ -177,7 +177,7 @@ TQValueList KPluginInfo::fromFiles( const TQStringList & files, KC return infolist; } -TQValueList KPluginInfo::fromKPartsInstanceName( const TQString & name, KConfig * config, const TQString & group ) +TQValueList KPluginInfo::fromKPartsInstanceName( const TQString & name, TDEConfig * config, const TQString & group ) { TQStringList files = TDEGlobal::dirs()->findAllResources( "data", name + "/kpartplugins/*.desktop", true, false ); @@ -276,7 +276,7 @@ const TQValueList & KPluginInfo::kcmServices() const { if ( !d->kcmservicesCached ) { - d->kcmservices = KTrader::self()->query( "KCModule", "'" + d->pluginName + + d->kcmservices = KTrader::self()->query( "TDECModule", "'" + d->pluginName + "' in [X-TDE-ParentComponents]" ); kdDebug( 703 ) << "found " << d->kcmservices.count() << " offers for " << d->pluginName << endl; @@ -287,13 +287,13 @@ const TQValueList & KPluginInfo::kcmServices() const return d->kcmservices; } -void KPluginInfo::setConfig( KConfig * config, const TQString & group ) +void KPluginInfo::setConfig( TDEConfig * config, const TQString & group ) { d->config = config; d->configgroup = group; } -KConfig * KPluginInfo::config() const +TDEConfig * KPluginInfo::config() const { return d->config; } @@ -316,14 +316,14 @@ TQVariant KPluginInfo::operator[]( const TQString & key ) const return property( key ); } -void KPluginInfo::save( KConfigGroup * config ) +void KPluginInfo::save( TDEConfigGroup * config ) { kdDebug( 703 ) << k_funcinfo << endl; if( 0 == config ) { if( 0 == d->config ) { - kdWarning( 703 ) << "no KConfigGroup, cannot save" << endl; + kdWarning( 703 ) << "no TDEConfigGroup, cannot save" << endl; return; } d->config->setGroup( d->configgroup ); @@ -333,14 +333,14 @@ void KPluginInfo::save( KConfigGroup * config ) config->writeEntry( d->pluginName + "Enabled", isPluginEnabled() ); } -void KPluginInfo::load( KConfigGroup * config ) +void KPluginInfo::load( TDEConfigGroup * config ) { kdDebug( 703 ) << k_funcinfo << endl; if( 0 == config ) { if( 0 == d->config ) { - kdWarning( 703 ) << "no KConfigGroup, cannot load" << endl; + kdWarning( 703 ) << "no TDEConfigGroup, cannot load" << endl; return; } d->config->setGroup( d->configgroup ); diff --git a/kutils/kplugininfo.h b/kutils/kplugininfo.h index bebd11cb6..0ba051d2c 100644 --- a/kutils/kplugininfo.h +++ b/kutils/kplugininfo.h @@ -26,7 +26,7 @@ #include #include -class KConfigGroup; +class TDEConfigGroup; /** * @ingroup main @@ -120,7 +120,7 @@ class KUTILS_EXPORT KPluginInfo * KService objects. If you get a trader offer of the plugins you want * to use you can just pass them to this function. */ - static KPluginInfo::List fromServices( const KService::List & services, KConfig * config = 0, const TQString & group = TQString::null ); + static KPluginInfo::List fromServices( const KService::List & services, TDEConfig * config = 0, const TQString & group = TQString::null ); /** * @return A list of KPluginInfo objects constructed from a list of @@ -128,14 +128,14 @@ class KUTILS_EXPORT KPluginInfo * KStandardDirs::findAllResources() you pass the list of files to this * function. */ - static KPluginInfo::List fromFiles( const TQStringList & files, KConfig * config = 0, const TQString & group = TQString::null ); + static KPluginInfo::List fromFiles( const TQStringList & files, TDEConfig * config = 0, const TQString & group = TQString::null ); /** * @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 * TDEInstance object. */ - static KPluginInfo::List fromKPartsInstanceName( const TQString &, KConfig * config = 0, const TQString & group = TQString::null ); + static KPluginInfo::List fromKPartsInstanceName( const TQString &, TDEConfig * config = 0, const TQString & group = TQString::null ); /** * @return Whether the plugin should be hidden. @@ -263,25 +263,25 @@ class KUTILS_EXPORT KPluginInfo /** * @return A list of Service pointers if the plugin installs one or more - * KCModule + * TDECModule */ const TQValueList & kcmServices() const; /** - * Set the KConfigGroup to use for load()ing and save()ing the - * configuration. This will be overridden by the KConfigGroup passed to + * Set the TDEConfigGroup to use for load()ing and save()ing the + * configuration. This will be overridden by the TDEConfigGroup passed to * save() or load() (if one is passed). */ - void setConfig( KConfig * config, const TQString & group ); + void setConfig( TDEConfig * config, const TQString & group ); /** - * @return If the KPluginInfo object has a KConfig object set return + * @return If the KPluginInfo object has a TDEConfig object set return * it, else return 0. */ - KConfig * config() const; + TDEConfig * config() const; /** - * @return The groupname used in the KConfig object for load()ing and + * @return The groupname used in the TDEConfig object for load()ing and * save()ing whether the plugin is enabled. */ const TQString & configgroup() const; @@ -289,18 +289,18 @@ class KUTILS_EXPORT KPluginInfo /** * Save state of the plugin - enabled or not. This function is provided * for reimplementation if you need to save somewhere else. - * @param config The KConfigGroup holding the information whether + * @param config The TDEConfigGroup holding the information whether * plugin is enabled. */ - virtual void save( KConfigGroup * config = 0 ); + virtual void save( TDEConfigGroup * config = 0 ); /** * Load the state of the plugin - enabled or not. This function is provided * for reimplementation if you need to save somewhere else. - * @param config The KConfigGroup holding the information whether + * @param config The TDEConfigGroup holding the information whether * plugin is enabled. */ - virtual void load( KConfigGroup * config = 0 ); + virtual void load( TDEConfigGroup * config = 0 ); /** * Restore defaults (enabled or not). diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 9dbf42c4a..7f07b7ed2 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -123,7 +123,7 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate { KPluginSelectionWidgetPrivate( KPluginSelector * _kps, const TQString & _cat, - KConfigGroup * _config ) + TDEConfigGroup * _config ) : widgetstack( 0 ) , kps( _kps ) , config( _config ) @@ -146,14 +146,14 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate TQWidgetStack * widgetstack; KPluginSelector * kps; - KConfigGroup * config; + TDEConfigGroup * config; KPluginListViewToolTip *tooltip; - TQDict pluginconfigmodules; + TQDict pluginconfigmodules; TQMap widgetIDs; TQMap plugincheckedchanged; TQString catname; - TQValueList modulelist; + TQValueList modulelist; TQPtrDict moduleParentComponents; KPluginInfo * currentplugininfo; @@ -165,7 +165,7 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate KPluginSelectionWidget::KPluginSelectionWidget( const TQValueList & plugininfos, KPluginSelector * kps, TQWidget * parent, const TQString & catname, const TQString & category, - KConfigGroup * config, const char * name ) + TDEConfigGroup * config, const char * name ) : TQWidget( parent, name ) , d( new KPluginSelectionWidgetPrivate( kps, catname, config ) ) { @@ -238,9 +238,9 @@ bool KPluginSelectionWidget::pluginIsLoaded( const TQString & pluginName ) const TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent, - const KCModuleInfo & moduleinfo ) + const TDECModuleInfo & moduleinfo ) { - KCModuleProxy * module = new KCModuleProxy( moduleinfo, false, + TDECModuleProxy * module = new TDECModuleProxy( moduleinfo, false, parent ); if( !module->realModule() ) { @@ -281,7 +281,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch { if( !( *it )->noDisplay() ) { - KCModuleInfo moduleinfo( *it ); + TDECModuleInfo moduleinfo( *it ); TQWidget * module = insertKCM( tabwidget, moduleinfo ); tabwidget->addTab( module, moduleinfo.moduleName() ); } @@ -291,7 +291,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch { if( !plugininfo->kcmServices().front()->noDisplay() ) { - KCModuleInfo moduleinfo( + TDECModuleInfo moduleinfo( plugininfo->kcmServices().front() ); TQWidget * module = insertKCM( d->widgetstack, moduleinfo ); module->setEnabled( checked ); @@ -431,7 +431,7 @@ void KPluginSelectionWidget::load() d->currentchecked = info->isPluginEnabled(); } - for( TQValueList::Iterator it = d->modulelist.begin(); + for( TQValueList::Iterator it = d->modulelist.begin(); it != d->modulelist.end(); ++it ) if( ( *it )->changed() ) ( *it )->load(); @@ -454,7 +454,7 @@ void KPluginSelectionWidget::save() d->plugincheckedchanged[ info ] = false; } TQStringList updatedModules; - for( TQValueList::Iterator it = d->modulelist.begin(); + for( TQValueList::Iterator it = d->modulelist.begin(); it != d->modulelist.end(); ++it ) if( ( *it )->changed() ) { @@ -581,7 +581,7 @@ static TQValueList kpartsPluginInfos( const TQString& instanceName } void KPluginSelector::addPlugins( const TQString & instanceName, - const TQString & catname, const TQString & category, KConfig * config ) + const TQString & catname, const TQString & category, TDEConfig * config ) { const TQValueList plugininfos = kpartsPluginInfos( instanceName ); if ( plugininfos.isEmpty() ) @@ -590,14 +590,14 @@ void KPluginSelector::addPlugins( const TQString & instanceName, Q_ASSERT( config ); // please set config, or use addPlugins( instance, ... ) which takes care of it if ( !config ) // KDE4: ensure that config is always set; make it second in the arg list? config = new KSimpleConfig( instanceName ); // memleak! - KConfigGroup * cfgGroup = new KConfigGroup( config, "KParts Plugins" ); + TDEConfigGroup * cfgGroup = new TDEConfigGroup( config, "KParts Plugins" ); kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl; addPluginsInternal( plugininfos, catname, category, cfgGroup ); } void KPluginSelector::addPluginsInternal( const TQValueList plugininfos, const TQString & catname, const TQString & category, - KConfigGroup* cfgGroup ) + TDEConfigGroup* cfgGroup ) { KPluginSelectionWidget * w; if( d->tabwidget ) @@ -619,7 +619,7 @@ void KPluginSelector::addPluginsInternal( const TQValueList plugin } void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString & - catname, const TQString & category, KConfig * config ) + catname, const TQString & category, TDEConfig * config ) { if ( !config ) config = instance->config(); @@ -627,11 +627,11 @@ void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString & } void KPluginSelector::addPlugins( const TQValueList & plugininfos, - const TQString & catname, const TQString & category, KConfig * config ) + const TQString & catname, const TQString & category, TDEConfig * config ) { checkNeedForTabWidget(); - // the KConfigGroup becomes owned by KPluginSelectionWidget - KConfigGroup * cfgGroup = new KConfigGroup( config ? config : TDEGlobal::config(), "Plugins" ); + // the TDEConfigGroup becomes owned by KPluginSelectionWidget + TDEConfigGroup * cfgGroup = new TDEConfigGroup( config ? config : TDEGlobal::config(), "Plugins" ); kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl; addPluginsInternal( plugininfos, catname, category, cfgGroup ); } @@ -696,10 +696,10 @@ void KPluginSelector::defaults() // tabwidget - defaults() will be called for all of them) TQWidget * pluginconfig = d->widgetstack->visibleWidget(); - KCModuleProxy * kcm = ::tqqt_cast(pluginconfig); + TDECModuleProxy * kcm = ::tqqt_cast(pluginconfig); if( kcm ) { - kdDebug( 702 ) << "call KCModule::defaults() for the plugins KCM" + kdDebug( 702 ) << "call TDECModule::defaults() for the plugins KCM" << endl; kcm->defaults(); return; @@ -707,14 +707,14 @@ void KPluginSelector::defaults() // if we get here the visible Widget must be a tabwidget holding more than // one KCM - TQObjectList * kcms = pluginconfig->queryList( "KCModuleProxy", + TQObjectList * kcms = pluginconfig->queryList( "TDECModuleProxy", 0, false, false ); TQObjectListIt it( *kcms ); TQObject * obj; while( ( obj = it.current() ) != 0 ) { ++it; - ( ( KCModule* )obj )->defaults(); + ( ( TDECModule* )obj )->defaults(); } delete kcms; // FIXME: update changed state diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h index 87026154e..4316f4880 100644 --- a/kutils/kpluginselector.h +++ b/kutils/kpluginselector.h @@ -28,8 +28,8 @@ class TDEInstance; class KPluginInfo; class TQWidgetStack; -class KConfig; -class KConfigGroup; +class TDEConfig; +class TDEConfigGroup; /** * @ingroup main @@ -89,10 +89,10 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget * with the Category key == @p category. If @p * category is not set the Category key is ignored * and all plugins are shown. - * @param config The KConfig object that holds the state of the + * @param config The TDEConfig object that holds the state of the * plugins being enabled or not. By default it should * be instance->config(). It is recommended to - * always pass a KConfig object if you use + * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). * For example KViewCanvas passes KSimpleConfig( @@ -101,7 +101,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget void addPlugins( const TQString & instanceName, const TQString & catname = TQString::null, const TQString & category = TQString::null, - KConfig * config = 0 ); + TDEConfig * config = 0 ); /** * Add a list of KParts plugins. Convenience method for the one above. @@ -110,7 +110,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget void addPlugins( const TDEInstance * instance, const TQString & catname = TQString::null, const TQString & category = TQString::null, - KConfig * config = 0 ); + TDEConfig * config = 0 ); /** * Add a list of non-KParts plugins @@ -128,10 +128,10 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget * with the Category key == @p category. If @p * category is not set the Category key is ignored * and all plugins are shown. - * @param config The KConfig object that holds the state of the + * @param config The TDEConfig object that holds the state of the * plugins being enabled or not. By default it will * use TDEGlobal::config(). It is recommended to - * always pass a KConfig object if you use + * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). * For example KViewCanvas passes KSimpleConfig( @@ -140,7 +140,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget void addPlugins( const TQValueList & plugininfos, const TQString & catname = TQString::null, const TQString & category = TQString::null, - KConfig * config = 0 ); + TDEConfig * config = 0 ); /** * Set whether the area for showing the KCMs of the plugins should be @@ -208,7 +208,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget */ void addPluginsInternal( const TQValueList plugininfos, const TQString & catname, const TQString & category, - KConfigGroup* cfgGroup ); + TDEConfigGroup* cfgGroup ); class KPluginSelectorPrivate; KPluginSelectorPrivate * d; diff --git a/kutils/kpluginselector_p.h b/kutils/kpluginselector_p.h index eb509a41e..c287ce555 100644 --- a/kutils/kpluginselector_p.h +++ b/kutils/kpluginselector_p.h @@ -24,10 +24,10 @@ #include -class KConfigGroup; +class TDEConfigGroup; class TQListViewItem; class KPluginInfo; -class KCModuleInfo; +class TDECModuleInfo; /** * This is a widget to configure what Plugins should be loaded. This widget is @@ -53,7 +53,7 @@ class KPluginSelectionWidget : public TQWidget * @param parent The parent widget. * @param catname The translated name of the category. * @param category The unstranslated category key name. - * @param config Set the KConfigGroup object that holds the + * @param config Set the TDEConfigGroup object that holds the * state of the plugins being enabled or not. * @param name The name of the widget (passed to TQWidget) * @@ -61,7 +61,7 @@ class KPluginSelectionWidget : public TQWidget */ KPluginSelectionWidget( const TQValueList & plugininfos, KPluginSelector * kps, TQWidget * parent, const TQString & catname, - const TQString & category, KConfigGroup * config = 0, + const TQString & category, TDEConfigGroup * config = 0, const char * name = 0 ); virtual ~KPluginSelectionWidget(); @@ -162,13 +162,13 @@ class KPluginSelectionWidget : public TQWidget private: /** - * Load a KCM from a KCModuleInfo. If successfull connect changed + * Load a KCM from a TDECModuleInfo. If successfull connect changed * signal and return the module. If not, create a label showing "Error", * show the loaderError and return the label. * * @internal */ - TQWidget * insertKCM( TQWidget * parent, const KCModuleInfo & ); + TQWidget * insertKCM( TQWidget * parent, const TDECModuleInfo & ); /** * Embed the KCMs for the plugin into the widgetstack diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox index b9efd0dcb..88268f671 100644 --- a/kutils/ksettings/README.dox +++ b/kutils/ksettings/README.dox @@ -45,7 +45,7 @@ mechanisms. Every page is a KCM. This is what you need for creating a page: \code -class MyAppConfig : public KCModule +class MyAppConfig : public TDECModule { Q_OBJECT public: @@ -67,7 +67,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_myappconfig, MyAppConfigFactory( "kcm_myappconfig" ) ); MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args ) - : KCModule( MyAppConfigFactory::instance(), parent, args ) + : TDECModule( MyAppConfigFactory::instance(), parent, args ) { // create the pages GUI load(); @@ -76,9 +76,9 @@ MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args // implementations for the other methods \endcode -For the KConfig object you can either use +For the TDEConfig object you can either use TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). -I added a method to KSettings::Dispatcher that gives you the KConfig +I added a method to KSettings::Dispatcher that gives you the TDEConfig object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName @@ -94,7 +94,7 @@ An example file: Encoding=UTF-8 Icon=myapp Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=myappconfig @@ -115,10 +115,10 @@ Some explanation for those keys: - Icon is the icon that will be used in the listview/iconview for your page. - X-TDE-Library is the name of the library where the page is in. The library always needs to be prefixed with kcm_ but you don't write the prefix in the - desktop file. For more docu on this look for the KCModule docu. + desktop file. For more docu on this look for the TDECModule docu. - X-TDE-FactoryName is either the name of the Factory you used in the KGenericFactory call or the suffix of the create_ function that you created. - Again for more info look for the KCModule docu. + Again for more info look for the TDECModule docu. - X-TDE-ParentApp is the name of the application this config page belongs to. It is used by the first two \ref KSettings::Dialog constructors. The Dialog will use all modules that set X-TDE-ParentApp to diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index c64e2e64a..727ca1072 100644 --- a/kutils/ksettings/dialog.cpp +++ b/kutils/ksettings/dialog.cpp @@ -58,7 +58,7 @@ class PageNode enum Type { KCM, Group, Root }; union Value { - KCModuleInfo * kcm; + TDECModuleInfo * kcm; GroupInfo * group; }; Type m_type; @@ -71,7 +71,7 @@ class PageNode bool m_dirty; protected: - PageNode( KCModuleInfo * info, PageNode * parent ) + PageNode( TDECModuleInfo * info, PageNode * parent ) : m_type( KCM ) , m_parent( parent ) , m_visible( true ) @@ -291,7 +291,7 @@ class PageNode return false; } - bool insert( KCModuleInfo * info, const TQString & parentid ) + bool insert( TDECModuleInfo * info, const TQString & parentid ) { if( parentid.isNull() ) { @@ -467,10 +467,10 @@ TQValueList Dialog::parentComponentsServices( constraint = "('" + constraint + "' in [X-TDE-ParentComponents])"; kdDebug( 700 ) << "constraint = " << constraint << endl; - return KTrader::self()->query( "KCModule", constraint ); + return KTrader::self()->query( "TDECModule", constraint ); } -bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const +bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const { // if the user of this class requested to hide disabled modules // we check whether it should be enabled or not @@ -491,9 +491,9 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const // we check if the parent component is a plugin if( ! d->plugininfomap.contains( *pcit ) ) { - // if not the KCModule must be enabled + // if not the TDECModule must be enabled enabled = true; - // we're done for this KCModuleInfo + // we're done for this TDECModuleInfo break; } // if it is a plugin we check whether the plugin is enabled @@ -502,7 +502,7 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const enabled = pinfo->isPluginEnabled(); kdDebug( 700 ) << "parent " << *pcit << " is " << ( enabled ? "enabled" : "disabled" ) << endl; - // if it is enabled we're done for this KCModuleInfo + // if it is enabled we're done for this TDECModuleInfo if( enabled ) break; } @@ -543,12 +543,12 @@ void Dialog::createDialogFromServices() it != setdlgaddon.end(); ++it ) parseGroupFile( *it ); - // now we process the KCModule services + // now we process the TDECModule services for( TQValueList::ConstIterator it = d->services.begin(); it != d->services.end(); ++it ) { - // we create the KCModuleInfo - KCModuleInfo * info = new KCModuleInfo( *it ); + // we create the TDECModuleInfo + TDECModuleInfo * info = new TDECModuleInfo( *it ); TQString parentid; TQVariant tmp = info->service()->property( "X-TDE-CfgDlgHierarchy", TQVariant::String ); @@ -577,10 +577,10 @@ void Dialog::createDialogFromServices() // TODO: Don't show the reset button until the issue with the // KPluginSelector::load() method is solved. // Problem: - // KCMultiDialog::show() call KCModule::load() to reset all KCMs + // KCMultiDialog::show() call TDECModule::load() to reset all KCMs // (KPluginSelector::load() resets all plugin selections and all plugin // KCMs). - // The reset button calls KCModule::load(), too but in this case we want the + // The reset button calls TDECModule::load(), too but in this case we want the // KPluginSelector to only reset the current visible plugin KCM and not // touch the plugin selections. // I have no idea how to check that in KPluginSelector::load()... diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h index cd9b539ef..58115426c 100644 --- a/kutils/ksettings/dialog.h +++ b/kutils/ksettings/dialog.h @@ -26,7 +26,7 @@ template class TQValueList; class KPluginInfo; class KCMultiDialog; -class KCModuleInfo; +class TDECModuleInfo; namespace KSettings { @@ -188,7 +188,7 @@ class KUTILS_EXPORT Dialog : public TQObject * @internal * Check whether the plugin associated with this KCM is enabled. */ - bool isPluginForKCMEnabled( KCModuleInfo * ) const; + bool isPluginForKCMEnabled( TDECModuleInfo * ) const; TQValueList instanceServices() const; TQValueList parentComponentsServices( @@ -204,7 +204,7 @@ class KUTILS_EXPORT Dialog : public TQObject * If this module is put into a TreeList hierarchy this will return a * list of the names of the parent modules. */ - TQStringList parentModuleNames( KCModuleInfo * ); + TQStringList parentModuleNames( TDECModuleInfo * ); /** * @internal diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp index eb9acf0bc..590ca7e3c 100644 --- a/kutils/ksettings/dispatcher.cpp +++ b/kutils/ksettings/dispatcher.cpp @@ -83,7 +83,7 @@ void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, cons connect( recv, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( unregisterInstance( TQObject * ) ) ); } -KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) +TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) { kdDebug( 701 ) << k_funcinfo << endl; if( m_instanceInfo.contains( instanceName ) ) @@ -113,7 +113,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName ) // check if the instanceName is valid: if( ! m_instanceInfo.contains( instanceName ) ) return; - // first we reparse the config of the instance so that the KConfig object + // first we reparse the config of the instance so that the TDEConfig object // will be up to date m_instanceInfo[ instanceName ].instance->config()->reparseConfiguration(); TQSignal * sig = m_instanceInfo[ instanceName ].signal; diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h index c04a41b99..fa0c9e6c9 100644 --- a/kutils/ksettings/dispatcher.h +++ b/kutils/ksettings/dispatcher.h @@ -29,7 +29,7 @@ class TQSignal; class TQStrList; template class KStaticDeleter; class TDEInstance; -class KConfig; +class TDEConfig; namespace KSettings { @@ -39,7 +39,7 @@ namespace KSettings * @short Dispatch change notifications from the KCMs to the program. * * Since your program does not have direct control over the KCMs that get loaded - * into the KConfigureDialog you need a way to get notified. This is what you + * into the TDEConfigureDialog you need a way to get notified. This is what you * do: * \code * Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( loadSettings() ) ); @@ -74,9 +74,9 @@ class KUTILS_EXPORT Dispatcher : public TQObject void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot ); /** - * @return the KConfig object that belongs to the instanceName + * @return the TDEConfig object that belongs to the instanceName */ - KConfig * configForInstanceName( const TQCString & instanceName ); + TDEConfig * configForInstanceName( const TQCString & instanceName ); /** * @return a list of all the instance names that are currently @@ -100,10 +100,10 @@ class KUTILS_EXPORT Dispatcher : public TQObject void reparseConfiguration( const TQCString & instanceName ); /** - * When this slot is called the KConfig objects of all the registered - * instances are sync()ed. This is usefull when some other KConfig + * When this slot is called the TDEConfig objects of all the registered + * instances are sync()ed. This is usefull when some other TDEConfig * objects will read/write from/to the same config file, so that you - * can first write out the current state of the KConfig objects. + * can first write out the current state of the TDEConfig objects. */ void syncConfiguration(); diff --git a/kutils/ksettings/pluginpage.cpp b/kutils/ksettings/pluginpage.cpp index 4a94d21d4..c7208dc69 100644 --- a/kutils/ksettings/pluginpage.cpp +++ b/kutils/ksettings/pluginpage.cpp @@ -38,7 +38,7 @@ class PluginPage::PluginPagePrivate }; PluginPage::PluginPage( TQWidget * parent, const char * name, const TQStringList & args ) - : KCModule( parent, name, args ) + : TDECModule( parent, name, args ) , d( new PluginPagePrivate ) { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); @@ -47,7 +47,7 @@ class PluginPage::PluginPagePrivate } PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args ) - : KCModule( instance, parent, args ) + : TDECModule( instance, parent, args ) , d( new PluginPagePrivate ) { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h index 16cfbc572..2ba4f2142 100644 --- a/kutils/ksettings/pluginpage.h +++ b/kutils/ksettings/pluginpage.h @@ -31,7 +31,7 @@ namespace KSettings /** * @ingroup settings * @ingroup plugin - * @short Convenience KCModule for creating a plugins config page. + * @short Convenience TDECModule for creating a plugins config page. * * This class makes it very easy to create a plugins configuration page to your * program. All you need to do is create a class that is derived from @@ -55,7 +55,7 @@ namespace KSettings Encoding=UTF-8 Icon=plugin Type=Service - ServiceTypes=KCModule + ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=myapppluginconfig @@ -70,18 +70,18 @@ namespace KSettings * @author Matthias Kretz * @since 3.2 */ -class KUTILS_EXPORT PluginPage : public KCModule +class KUTILS_EXPORT PluginPage : public TDECModule { Q_OBJECT public: /** - * Standart KCModule constructor. Automatically creates the the + * Standart TDECModule constructor. Automatically creates the the * KPluginSelector widget. */ PluginPage( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** - * Standart KCModule constructor. Automatically creates the the + * Standart TDECModule constructor. Automatically creates the the * KPluginSelector widget. */ PluginPage( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); @@ -103,7 +103,7 @@ class KUTILS_EXPORT PluginPage : public KCModule virtual void load(); /** - * Save the state of the plugins to KConfig objects + * Save the state of the plugins to TDEConfig objects */ virtual void save(); virtual void defaults(); diff --git a/kwallet/client/kwallet.cc b/kwallet/client/kwallet.cc index a823a06dd..4edb421b2 100644 --- a/kwallet/client/kwallet.cc +++ b/kwallet/client/kwallet.cc @@ -34,7 +34,7 @@ using namespace KWallet; const TQString Wallet::LocalWallet() { - KConfig cfg("kwalletrc", true); + TDEConfig cfg("kwalletrc", true); cfg.setGroup("Wallet"); if (!cfg.readBoolEntry("Use One Wallet", true)) { TQString tmp = cfg.readEntry("Local Wallet", "localwallet"); @@ -52,7 +52,7 @@ const TQString Wallet::LocalWallet() { } const TQString Wallet::NetworkWallet() { - KConfig cfg("kwalletrc", true); + TDEConfig cfg("kwalletrc", true); cfg.setGroup("Wallet"); TQString tmp = cfg.readEntry("Default Wallet", "kdewallet"); diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc index ad9fc54fb..f539d00b6 100644 --- a/libkmid/deviceman.cc +++ b/libkmid/deviceman.cc @@ -110,7 +110,7 @@ DeviceManager::DeviceManager(int def) { TDEInstance *tmp_instance=0L; if (!TDEGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); - KConfig *config = new KConfig("kcmmidirc", true); + TDEConfig *config = new TDEConfig("kcmmidirc", true); config->setGroup("Configuration"); default_dev=config->readNumEntry("midiDevice",0); diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS index 07b7d44ef..03def3f46 100644 --- a/tdecore/AUTHORS +++ b/tdecore/AUTHORS @@ -1,5 +1,5 @@ Matthias Kalle Dalheimer : -classes KConfig, KTextStream, KColorSet, TDEApplication +classes TDEConfig, KTextStream, KColorSet, TDEApplication automake, autoconf, maintenance Richard Moore : @@ -12,7 +12,7 @@ Steffen Hansen : KURL class Torben Weis -DnD stuff, KSocket and KServerSocket classes, KPixmap +DnD stuff, TDESocket and TDEServerSocket classes, KPixmap Alexander Sanda Read and write numerical config entries, KPanner, KTabControl, diff --git a/tdecore/DESIGN.kconfig b/tdecore/DESIGN.kconfig index 4ced76726..c4c68b28e 100644 --- a/tdecore/DESIGN.kconfig +++ b/tdecore/DESIGN.kconfig @@ -70,7 +70,7 @@ When an entry is read with readEntry(key, defaultValue), non-existing entries will return "defaultValue" while hasKey(key) will return "false" for such entries. -Currently all entries are stored in memory. When KConfig is "sync()'ed" +Currently all entries are stored in memory. When TDEConfig is "sync()'ed" it reads the file that it is about to overwrite (for the second time), it then merges in the entries it has in memory and writes the result back to the file. It does NOT update its map of entries in memory with the entries @@ -99,12 +99,12 @@ KDE3.0 Changes ------------------------------------------------------------------------------ -KConfig XT +TDEConfig XT ========== -My buzzword picker offered KConfig XT ("eXtended Technology") and KConfig NG +My buzzword picker offered TDEConfig XT ("eXtended Technology") and TDEConfig NG ("Next Generation"). Since the planned changes are ment to be evolutionary -rather than revolutionary, KConfig NG was dropped. +rather than revolutionary, TDEConfig NG was dropped. Goals ===== @@ -130,12 +130,12 @@ Type information can be provide by preceding every entry with a formalized comment. Work to be done: -* KConfig needs to be extended to provide access to the default values provided -by the default config files. KConfig already stores this information internally. +* TDEConfig needs to be extended to provide access to the default values provided +by the default config files. TDEConfig already stores this information internally. (DONE) * A formal comment structure needs to be designed that can convey type-information. Preferably in such a way that it is easily parsable by both machine and user. -* KConfig needs to be extended, or another class created, that is able to parse +* TDEConfig needs to be extended, or another class created, that is able to parse the formalized comments. * A tool needs to be developed that can assist developers with the generation and verification of default configuration files including type-information. @@ -170,34 +170,34 @@ Host=wantelbos.zogje.fr Class overview - KConfigBase + TDEConfigBase | v - KConfigBackend <-----> KConfig <------> KConfigSkeleton /--< myapp.kcfg + TDEConfigBackend <-----> TDEConfig <------> TDEConfigSkeleton /--< myapp.kcfg | | | / v v |*---------------< -KConfigINIBackend KSimpleConfig |kconfig_compiler \ +TDEConfigINIBackend KSimpleConfig |kconfig_compiler \ | \--< myconfig.kcfg-codegen v - MyConfig <-----KConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui + MyConfig <-----TDEConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui uic -KConfigBase: defines API for generic config class +TDEConfigBase: defines API for generic config class -KConfig: functional generic config class that supports merging of cascaded +TDEConfig: functional generic config class that supports merging of cascaded configuration files KSimpleConfig: functional generic config class without support for cascading configuration files. -KConfigBackend: defines API for config backend, t.i. the actual handling +TDEConfigBackend: defines API for config backend, t.i. the actual handling of the storage method and storage format. -KConfigINIBackend: the standard (and only one so far) class that implements +TDEConfigINIBackend: the standard (and only one so far) class that implements the config backend using the file-based .INI format for configuration files -KConfigSkeleton: base class for deriving classes that store application +TDEConfigSkeleton: base class for deriving classes that store application specific options providing type-safety and single-point defaults. @@ -215,9 +215,9 @@ myconfig.kcfg-codegen: Implementation specific code generation instructions just an example name, the application developer choses the actual name. -KConfigDialogManager: Class that links widgets in a dialog up with their +TDEConfigDialogManager: Class that links widgets in a dialog up with their corresponding confguration options in a configuration - object derived from KConfigSkeleton. + object derived from TDEConfigSkeleton. MyConfigWidget: Dialog generated from a .ui description file. Widget names in the dialog that start with "kcfg_" refer to configuration diff --git a/tdecore/KCONFIG_DESIGN b/tdecore/KCONFIG_DESIGN index dfd9aa151..d0fa141ff 100644 --- a/tdecore/KCONFIG_DESIGN +++ b/tdecore/KCONFIG_DESIGN @@ -1,9 +1,9 @@ - The basic design on KConfig for KDE 2.0 and KDE 3.0: + The basic design on TDEConfig for KDE 2.0 and KDE 3.0: ---------------------------------------- -KConfig is a hierarchy of classes for loading and saving configuration -data in KDE. KConfigBase is an abstract data type (ADT) with pure +TDEConfig is a hierarchy of classes for loading and saving configuration +data in KDE. TDEConfigBase is an abstract data type (ADT) with pure virtual functions which describes the API for accessing configuration data. It cannot be instantiated directly; only subclasses which actually implement the API may be created. The reason for this design @@ -15,34 +15,34 @@ achieve shared memory config values. The possibilities are endless, and with this design we insure that future designs will not break compatibility. -This means that most classes that currently take pointers to KConfig -objects should be changed to take pointers to KConfigBase objects. +This means that most classes that currently take pointers to TDEConfig +objects should be changed to take pointers to TDEConfigBase objects. The virtual functions and c++ polymorphism will make sure that the correct function in the actual, instantiated object are called, but -this lets the user/programmer change the type of KConfig that has been +this lets the user/programmer change the type of TDEConfig that has been implemented at runtime without changing other code. -Similarly, there is a abstract data type KConfigBackEnd. All +Similarly, there is a abstract data type TDEConfigBackEnd. All reading/writing of the physical, on-disk configuration should be done -through a subclass of KConfigBackEnd. The only class that is -currently implemented right now is KConfigINIBackEnd, which +through a subclass of TDEConfigBackEnd. The only class that is +currently implemented right now is TDEConfigINIBackEnd, which reads/writes the standard windows INI-style configuration files that KDE has used since KDE 1.x days. However, it is conceivable that one might program an XML backend, or even a database/registry style backend. Again, this abstract data type approach provides flexibility -for the future. Currently KConfig and KSimpleConfig hardcode that -they are using a KConfigINIBackEnd in the constructor. If more back +for the future. Currently TDEConfig and KSimpleConfig hardcode that +they are using a TDEConfigINIBackEnd in the constructor. If more back ends are implemented, this will have to be changed to use a factory method of some sort to create the backend; all they maintain is a -pointer to a KConfigBackEnd, so the actual type of backend does not +pointer to a TDEConfigBackEnd, so the actual type of backend does not matter. -If you are interested in using KConfig, you need simply to look at the -public members of KConfigBase. They will provide you with everything +If you are interested in using TDEConfig, you need simply to look at the +public members of TDEConfigBase. They will provide you with everything you need to do to look up data, change and write data, etc. If you -are interested in implementing a new KConfig format, look at KConfig +are interested in implementing a new TDEConfig format, look at TDEConfig for ideas. Likewise if you want to implement a backend, look at -KConfigINIBackEnd for inspiration. The KDoc-style API documentation +TDEConfigINIBackEnd for inspiration. The KDoc-style API documentation should be complete. If there is anything confusing, please either fix it in CVS yourself or mail me with your questions, and we will make sure things get clarified. diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index d6d380707..635c61f95 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -64,7 +64,7 @@ that haven't explicitly changed the affected settings to something else. Starting with KDE3, configuration entries can be marked "immutable". When a configuration entry is immutable it means that configuration files that are read later will not be able to override its value. Immutable entries cannot -be changed via KConfig and if the entry is present under $TDEHOME it will +be changed via TDEConfig and if the entry is present under $TDEHOME it will be ignored. Entries can be marked immutable on 4 different levels: diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp index 41660e59a..7291f3f56 100644 --- a/tdecore/kaccel.cpp +++ b/tdecore/kaccel.cpp @@ -527,13 +527,13 @@ const TQString& KAccel::configGroup() const void KAccel::setConfigGroup( const TQString& s ) { d->setConfigGroup( s ); } -bool KAccel::readSettings( KConfigBase* pConfig ) +bool KAccel::readSettings( TDEConfigBase* pConfig ) { d->readSettings( pConfig ); return true; } -bool KAccel::writeSettings( KConfigBase* pConfig ) const +bool KAccel::writeSettings( TDEConfigBase* pConfig ) const { d->writeSettings( pConfig ); return true; } void KAccel::emitKeycodeChanged() diff --git a/tdecore/kaccel.h b/tdecore/kaccel.h index a54c6bd2e..491fa39ce 100644 --- a/tdecore/kaccel.h +++ b/tdecore/kaccel.h @@ -29,7 +29,7 @@ class TQPopupMenu; // for obsolete insertItem() methods below class TQWidget; class KAccelAction; class KAccelActions; -class KConfigBase; +class TDEConfigBase; class KAccelPrivate; /** @@ -267,14 +267,14 @@ class TDECORE_EXPORT KAccel : public TQAccel /** * Returns the configuration group of the settings. * @return the configuration group - * @see KConfig + * @see TDEConfig */ const TQString& configGroup() const; /** * Returns the configuration group of the settings. * @param name the new configuration group - * @see KConfig + * @see TDEConfig */ void setConfigGroup( const TQString &name ); @@ -289,7 +289,7 @@ class TDECORE_EXPORT KAccel : public TQAccel * configuration file * @return true if successful, false otherwise */ - bool readSettings( KConfigBase* pConfig = 0 ); + bool readSettings( TDEConfigBase* pConfig = 0 ); /** * Write the current shortcuts to @p pConfig, * or (if @p pConfig is zero) to the application's @@ -298,7 +298,7 @@ class TDECORE_EXPORT KAccel : public TQAccel * configuration file * @return true if successful, false otherwise */ - bool writeSettings( KConfigBase* pConfig = 0 ) const; + bool writeSettings( TDEConfigBase* pConfig = 0 ) const; /** * Emits the keycodeChanged() signal. diff --git a/tdecore/kaccelaction.cpp b/tdecore/kaccelaction.cpp index 0dc320a84..e8696cc26 100644 --- a/tdecore/kaccelaction.cpp +++ b/tdecore/kaccelaction.cpp @@ -203,7 +203,7 @@ bool KAccelAction::useFourModifierKeys() { if( KAccelAction::g_bUseFourModifierKeys == -1 ) { // Read in whether to use 4 modifier keys - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); bool b = TDEGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false ); KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey(); } @@ -219,7 +219,7 @@ void KAccelAction::useFourModifierKeys( bool b ) if( b && !KKeyNative::keyboardHasWinKey() ) kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n"; } - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true); kdDebug(125) << "bUseFourModifierKeys = " << KAccelAction::g_bUseFourModifierKeys << endl; @@ -294,7 +294,7 @@ bool KAccelActions::init( const KAccelActions& actions ) return true; } -bool KAccelActions::init( KConfigBase& config, const TQString& sGroup ) +bool KAccelActions::init( TDEConfigBase& config, const TQString& sGroup ) { kdDebug(125) << "KAccelActions::init( " << sGroup << " )" << endl; TQMap mapEntry = config.entryMap( sGroup ); @@ -483,7 +483,7 @@ bool KAccelActions::remove( const TQString& sAction ) return true; } -bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pConfig ) +bool KAccelActions::readActions( const TQString& sConfigGroup, TDEConfigBase* pConfig ) { KAccelShortcutList accelList(*this, false); return accelList.readSettings( sConfigGroup, pConfig ); @@ -502,13 +502,13 @@ bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pCon 1) KKeySequence = Alt+F2 -> "Something=Meta+X,Asterisk;Alt+F2" */ -bool KAccelActions::writeActions( const TQString &sGroup, KConfigBase* pConfig, +bool KAccelActions::writeActions( const TQString &sGroup, TDEConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const { kdDebug(125) << "KAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl; if( !pConfig ) pConfig = TDEGlobal::config(); - KConfigGroupSaver cs( pConfig, sGroup ); + TDEConfigGroupSaver cs( pConfig, sGroup ); for( uint i = 0; i < m_nSize; i++ ) { if( m_prgActions[i] == 0 ) { diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h index 4c7ac1840..9cca25d4a 100644 --- a/tdecore/kaccelaction.h +++ b/tdecore/kaccelaction.h @@ -30,8 +30,8 @@ class KAccelBase; class TQObject; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; /** * @internal @@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions * @param sGroup the group in the configuration file * @return true if successful, false otherwise */ - bool init( KConfigBase& config, const TQString& sGroup ); + bool init( TDEConfigBase& config, const TQString& sGroup ); /** * Updates the shortcuts of all actions in this object @@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions * @param pConfig the configuration file to load from * @return true if successful, false otherwise */ - bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 ); + bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 ); /** * Writes the actions to the given configuration file. @@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions * @param bGlobal true to write to the global configuration file * @return true if successful, false otherwise */ - bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0, + bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0, bool bWriteAll = false, bool bGlobal = false ) const; /** diff --git a/tdecore/kaccelbase.cpp b/tdecore/kaccelbase.cpp index cb21146d2..729de1c42 100644 --- a/tdecore/kaccelbase.cpp +++ b/tdecore/kaccelbase.cpp @@ -564,14 +564,14 @@ bool KAccelBase::setShortcut( const TQString& sAction, const KShortcut& cut ) return false; } -void KAccelBase::readSettings( KConfigBase* pConfig ) +void KAccelBase::readSettings( TDEConfigBase* pConfig ) { m_rgActions.readActions( m_sConfigGroup, pConfig ); if( m_bAutoUpdate ) updateConnections(); } -void KAccelBase::writeSettings( KConfigBase* pConfig ) const +void KAccelBase::writeSettings( TDEConfigBase* pConfig ) const { m_rgActions.writeActions( m_sConfigGroup, pConfig, m_bConfigIsGlobal, m_bConfigIsGlobal ); } diff --git a/tdecore/kaccelbase.h b/tdecore/kaccelbase.h index 03cad863a..132a6aa5c 100644 --- a/tdecore/kaccelbase.h +++ b/tdecore/kaccelbase.h @@ -205,14 +205,14 @@ class TDECORE_EXPORT KAccelBase * The group in which the configuration is stored can be * set with setConfigGroup(). */ - void readSettings( KConfigBase* pConfig = 0 ); + void readSettings( TDEConfigBase* pConfig = 0 ); /** * Write the current configurable associations to @p config, * or (if @p config is zero) to the application's * configuration file. */ - void writeSettings( KConfigBase* pConfig = 0 ) const; + void writeSettings( TDEConfigBase* pConfig = 0 ) const; TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& ); diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index dfc3bb612..2950d6170 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -914,7 +914,7 @@ void TDEApplication::init(bool GUIenabled) // Trigger creation of locale. (void) TDEGlobal::locale(); - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); d->actionRestrictions = config->hasGroup("KDE Action Restrictions" ) && !kde_kiosk_exception; // For brain-dead configurations where the user's local config file is not writable. // * We use kdialog to warn the user, so we better not generate warnings from @@ -923,7 +923,7 @@ void TDEApplication::init(bool GUIenabled) TQCString readOnly = getenv("TDE_HOME_READONLY"); if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0)) { - KConfigGroupSaver saver(config, "KDE Action Restrictions"); + TDEConfigGroupSaver saver(config, "KDE Action Restrictions"); if (config->readBoolEntry("warn_unwritable_config",true)) config->checkConfigFilesWritable(true); } @@ -1107,13 +1107,13 @@ void TDEApplication::disableAutoDcopRegistration() autoDcopRegistration = false; } -KConfig* TDEApplication::sessionConfig() +TDEConfig* TDEApplication::sessionConfig() { if (pSessionConfig) return pSessionConfig; // create an instance specific config object - pSessionConfig = new KConfig( sessionConfigName(), false, false); + pSessionConfig = new TDEConfig( sessionConfigName(), false, false); return pSessionConfig; } @@ -2276,7 +2276,7 @@ void TDEApplication::applyGUIStyle() { if ( !useStyles ) return; - KConfigGroup pConfig (TDEGlobal::config(), "General"); + TDEConfigGroup pConfig (TDEGlobal::config(), "General"); TQString defaultStyle = KStyle::defaultStyle(); TQString styleStr = pConfig.readEntry("widgetStyle", defaultStyle); @@ -2339,12 +2339,12 @@ TQString TDEApplication::makeStdCaption( const TQString &userCaption, TQPalette TDEApplication::createApplicationPalette() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "General" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "General" ); return createApplicationPalette( config, TDEGlobalSettings::contrast() ); } -TQPalette TDEApplication::createApplicationPalette( KConfig *config, int contrast_ ) +TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contrast_ ) { TQColor trinity4Background( 239, 239, 239 ); TQColor trinity4Blue( 103,141,178 ); @@ -2440,8 +2440,8 @@ void TDEApplication::kdisplaySetPalette() #ifdef Q_WS_MACX //Can I have this on other platforms, please!? --Sam { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "General" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "General" ); bool do_not_set_palette = FALSE; if(config->readBoolEntry("nopaletteChange", &do_not_set_palette)) return; @@ -2484,8 +2484,8 @@ void TDEApplication::kdisplaySetStyle() void TDEApplication::propagateSettings(SettingsCategory arg) { - KConfigBase* config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "KDE" ); + TDEConfigBase* config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "KDE" ); #ifdef QT_HAVE_MAX_IMAGE_SIZE TQSize maxImageSize(4096, 4096); @@ -2532,7 +2532,7 @@ void TDEApplication::installKDEPropertyMap() installed = true; /** * If you are adding a widget that was missing please - * make sure to also add it to KConfigDialogManager's retrieveSettings() + * make sure to also add it to TDEConfigDialogManager's retrieveSettings() * function. * Thanks. */ @@ -2785,7 +2785,7 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons const TQString & /*messageFile TODO*/, const TQStringList &attachURLs, const TQCString& startup_id ) { - KConfig config("emaildefaults"); + TDEConfig config("emaildefaults"); config.setGroup("Defaults"); TQString group = config.readEntry("Profile","Default"); @@ -2821,7 +2821,7 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons if (config.readBoolEntry("TerminalClient", false)) { - KConfigGroup confGroup( TDEGlobal::config(), "General" ); + TDEConfigGroup confGroup( TDEGlobal::config(), "General" ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", "konsole"); command = preferredTerminal + " -e " + command; } @@ -3351,8 +3351,8 @@ bool TDEApplication::authorize(const TQString &genericAction) if (!d->actionRestrictions) return true; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "KDE Action Restrictions" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "KDE Action Restrictions" ); return config->readBoolEntry(genericAction, true); } @@ -3370,15 +3370,15 @@ bool TDEApplication::authorizeControlModule(const TQString &menuId) { if (menuId.isEmpty() || kde_kiosk_exception) return true; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); return config->readBoolEntry(menuId, true); } TQStringList TDEApplication::authorizeControlModules(const TQStringList &menuIds) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); TQStringList result; for(TQStringList::ConstIterator it = menuIds.begin(); it != menuIds.end(); ++it) @@ -3426,8 +3426,8 @@ void TDEApplication::initUrlActionRestrictions() d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", TQString::null, TQString::null, TQString::null, "=", TQString::null, TQString::null, true)); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "KDE URL Restrictions" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "KDE URL Restrictions" ); int count = config->readNumEntry("rule_count"); TQString keyFormat = TQString("rule_%1"); for(int i = 1; i <= count; i++) diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index f472e3351..c1b8a4ecc 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -25,7 +25,7 @@ #include "tdeversion.h" #include "tdelibs_export.h" -class KConfig; +class TDEConfig; class KCharsets; class DCOPClient; class DCOPObject; @@ -63,7 +63,7 @@ class TDEApplicationPrivate; * * @li It controls the event queue (see TQApplication ). * @li It provides the application with KDE resources such as -* accelerators, common menu entries, a KConfig object. session +* accelerators, common menu entries, a TDEConfig object. session * management events, help invocation etc. * @li Installs a signal handler for the SIGCHLD signal in order to * avoid zombie children. If you want to catch this signal yourself or @@ -283,10 +283,10 @@ public: * Returns the application session config object. * * @return A pointer to the application's instance specific - * KConfig object. - * @see KConfig + * TDEConfig object. + * @see TDEConfig */ - KConfig* sessionConfig(); + TDEConfig* sessionConfig(); /** * Is the application restored from the session manager? @@ -1296,7 +1296,7 @@ private slots: private: TQString sessionConfigName() const; - KConfig* pSessionConfig; //instance specific application config object + TDEConfig* pSessionConfig; //instance specific application config object static DCOPClient *s_DCOPClient; // app specific application communication client static bool s_dcopClientNeedsPostInit; TQString aCaption; // the name for the window title @@ -1380,7 +1380,7 @@ public: * @internal * Raw access for use by TDM. */ - static TQPalette createApplicationPalette( KConfig *config, int contrast ); + static TQPalette createApplicationPalette( TDEConfig *config, int contrast ); /** * Installs a handler for the SIGPIPE signal. It is thrown when you write to @@ -1494,7 +1494,7 @@ signals: manipulate the UI in that slot, it is blocked by the session manager. - Use the sessionConfig() KConfig object to store all your + Use the sessionConfig() TDEConfig object to store all your instance specific data. Do not do any closing at this point! The user may still select diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index a732bf266..4c8a405cb 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -572,7 +572,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const TQString dir; { - KConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" ); + TDEConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" ); dir = TDEGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); } diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index c245f9435..69cd06dee 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -80,7 +80,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent ) : TQObject( parent, "kapp_accel_filter" ), key(0), block( false ), drklash(0) { parent->installEventFilter( this ); - KConfigGroupSaver saver( TDEGlobal::config(), "Development" ); + TDEConfigGroupSaver saver( TDEGlobal::config(), "Development" ); TQString sKey = TDEGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace(); if( !sKey.isEmpty() ) { KShortcut cuts( sKey ); diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index e6d763b79..f7812a713 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -107,7 +107,7 @@ TDEClipboardSynchronizer::TDEClipboardSynchronizer( TQObject *parent, const char { s_self = this; - KConfigGroup config( TDEGlobal::config(), "General" ); + TDEConfigGroup config( TDEGlobal::config(), "General" ); s_sync = config.readBoolEntry( "SynchronizeClipboardAndSelection", s_sync); s_reverse_sync = config.readBoolEntry( "ClipboardSetSelection", s_reverse_sync ); diff --git a/tdecore/kconfig.cpp b/tdecore/kconfig.cpp index b8ac9d2a1..26459cdde 100644 --- a/tdecore/kconfig.cpp +++ b/tdecore/kconfig.cpp @@ -41,9 +41,9 @@ #include "kstaticdeleter.h" #include -KConfig::KConfig( const TQString& fileName, +TDEConfig::TDEConfig( const TQString& fileName, bool bReadOnly, bool bUseKderc, const char *resType ) - : KConfigBase(), bGroupImmutable(false), bFileImmutable(false), + : TDEConfigBase(), bGroupImmutable(false), bFileImmutable(false), bForceGlobal(false) { // set the object's read-only status. @@ -52,7 +52,7 @@ KConfig::KConfig( const TQString& fileName, // for right now we will hardcode that we are using the INI // back end driver. In the future this should be converted over to // a object factory of some sorts. - KConfigINIBackEnd *aBackEnd = new KConfigINIBackEnd(this, + TDEConfigINIBackEnd *aBackEnd = new TDEConfigINIBackEnd(this, fileName, resType, bUseKderc); @@ -75,7 +75,7 @@ KConfig::KConfig( const TQString& fileName, reparseConfiguration(); } -KConfig::KConfig(KConfigBackEnd *aBackEnd, bool bReadOnly) +TDEConfig::TDEConfig(TDEConfigBackEnd *aBackEnd, bool bReadOnly) : bGroupImmutable(false), bFileImmutable(false), bForceGlobal(false) { @@ -84,19 +84,19 @@ KConfig::KConfig(KConfigBackEnd *aBackEnd, bool bReadOnly) reparseConfiguration(); } -KConfig::~KConfig() +TDEConfig::~TDEConfig() { sync(); delete backEnd; } -void KConfig::rollback(bool bDeep) +void TDEConfig::rollback(bool bDeep) { - KConfigBase::rollback(bDeep); + TDEConfigBase::rollback(bDeep); if (!bDeep) - return; // object's bDeep flag is set in KConfigBase method + return; // object's bDeep flag is set in TDEConfigBase method // clear any dirty flags that entries might have set for (KEntryMapIterator aIt = aEntryMap.begin(); @@ -104,7 +104,7 @@ void KConfig::rollback(bool bDeep) (*aIt).bDirty = false; } -TQStringList KConfig::groupList() const +TQStringList TDEConfig::groupList() const { TQStringList retList; @@ -138,7 +138,7 @@ TQStringList KConfig::groupList() const return retList; } -TQMap KConfig::entryMap(const TQString &pGroup) const +TQMap TDEConfig::entryMap(const TQString &pGroup) const { TQCString pGroup_utf = pGroup.utf8(); KEntryKey groupKey( pGroup_utf, 0 ); @@ -158,7 +158,7 @@ TQMap KConfig::entryMap(const TQString &pGroup) const return tmpMap; } -void KConfig::reparseConfiguration() +void TDEConfig::reparseConfiguration() { // Don't lose pending changes if (!isReadOnly() && backEnd && bDirty) @@ -175,7 +175,7 @@ void KConfig::reparseConfiguration() bFileImmutable = bReadOnly; } -KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const +KEntryMap TDEConfig::internalEntryMap(const TQString &pGroup) const { TQCString pGroup_utf = pGroup.utf8(); KEntry aEntry; @@ -199,7 +199,7 @@ KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const return tmpEntryMap; } -void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup) +void TDEConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup) { if (bFileImmutable && !_key.bDefault) return; @@ -235,7 +235,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro } } -KEntry KConfig::lookupData(const KEntryKey &_key) const +KEntry TDEConfig::lookupData(const KEntryKey &_key) const { KEntryMapConstIterator aIt = aEntryMap.find(_key); if (aIt != aEntryMap.end()) @@ -251,7 +251,7 @@ KEntry KConfig::lookupData(const KEntryKey &_key) const } } -bool KConfig::internalHasGroup(const TQCString &group) const +bool TDEConfig::internalHasGroup(const TQCString &group) const { KEntryKey groupKey( group, 0); @@ -272,19 +272,19 @@ bool KConfig::internalHasGroup(const TQCString &group) const return false; } -void KConfig::setFileWriteMode(int mode) +void TDEConfig::setFileWriteMode(int mode) { backEnd->setFileWriteMode(mode); } -KLockFile::Ptr KConfig::lockFile(bool bGlobal) +KLockFile::Ptr TDEConfig::lockFile(bool bGlobal) { - KConfigINIBackEnd *aBackEnd = dynamic_cast(backEnd); + TDEConfigINIBackEnd *aBackEnd = dynamic_cast(backEnd); if (!aBackEnd) return 0; return aBackEnd->lockFile(bGlobal); } -void KConfig::checkUpdate(const TQString &id, const TQString &updateFile) +void TDEConfig::checkUpdate(const TQString &id, const TQString &updateFile) { TQString oldGroup = group(); setGroup("$Version"); @@ -300,10 +300,10 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile) setGroup(oldGroup); } -KConfig* KConfig::copyTo(const TQString &file, KConfig *config) const +TDEConfig* TDEConfig::copyTo(const TQString &file, TDEConfig *config) const { if (!config) - config = new KConfig(TQString::null, false, false); + config = new TDEConfig(TQString::null, false, false); config->backEnd->changeFileName(file, "config", false); config->setReadOnly(false); config->bFileImmutable = false; @@ -325,8 +325,8 @@ KConfig* KConfig::copyTo(const TQString &file, KConfig *config) const return config; } -void KConfig::virtual_hook( int id, void* data ) -{ KConfigBase::virtual_hook( id, data ); } +void TDEConfig::virtual_hook( int id, void* data ) +{ TDEConfigBase::virtual_hook( id, data ); } static KStaticDeleter< TQValueList > sd; TQValueList *KSharedConfig::s_list = 0; @@ -348,7 +348,7 @@ KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool read } KSharedConfig::KSharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals) - : KConfig(fileName, readonly, usekdeglobals) + : TDEConfig(fileName, readonly, usekdeglobals) { if (!s_list) { diff --git a/tdecore/kconfig.h b/tdecore/kconfig.h index 63e7be591..c5084c109 100644 --- a/tdecore/kconfig.h +++ b/tdecore/kconfig.h @@ -29,7 +29,7 @@ class TQTimer; #include "kconfigbase.h" #include "klockfile.h" -class KConfigPrivate; +class TDEConfigPrivate; /** * Access KDE Configuration entries. @@ -37,17 +37,17 @@ class KConfigPrivate; * This class implements KDE's default configuration system. * * @author Kalle Dalheimer , Preston Brown -* @see TDEGlobal::config(), KConfigBase, KSimpleConfig +* @see TDEGlobal::config(), TDEConfigBase, KSimpleConfig * @short KDE Configuration Management class */ -class TDECORE_EXPORT KConfig : public KConfigBase +class TDECORE_EXPORT TDEConfig : public TDEConfigBase { Q_OBJECT public: /** - * Constructs a KConfig object. + * Constructs a TDEConfig object. * * @param fileName A file to parse in addition to the * system-wide file(s). If it is not provided, only global @@ -59,18 +59,18 @@ public: * @param bUseKDEGlobals Toggle reading the global KDE configuration file. * @param resType the place to look in (config, data, etc) See KStandardDirs. */ - KConfig( const TQString& fileName = TQString::null, + TDEConfig( const TQString& fileName = TQString::null, bool bReadOnly = false, bool bUseKDEGlobals = true, const char *resType="config"); - KConfig(KConfigBackEnd *backEnd, bool bReadOnly = false); + TDEConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false); /** - * Destructs the KConfig object. + * Destructs the TDEConfig object. * * Writes back any dirty configuration entries, and destroys * dynamically created objects. */ - virtual ~KConfig(); + virtual ~TDEConfig(); /** * Clears all entries out of the @p dirtyEntryMap, so the @@ -82,7 +82,7 @@ public: * false, but the dirty entries remain in the dirty entry * map. * - * @see KConfigBase::rollback + * @see TDEConfigBase::rollback */ virtual void rollback(bool bDeep = true); @@ -162,15 +162,15 @@ public: * @param config optional config object to reuse * @since 3.2 */ - KConfig* copyTo(const TQString &file, KConfig *config=0) const; + TDEConfig* copyTo(const TQString &file, TDEConfig *config=0) const; /** * Returns a lock file object for the configuration file or 0 if * the backend does not support locking. * @param bGlobal if true, return the lock file for the global config file * - * NOTE: KConfig::sync() requires a lock on both the normal and global - * config file. When calling KConfig::sync() while having a lock on the + * NOTE: TDEConfig::sync() requires a lock on both the normal and global + * config file. When calling TDEConfig::sync() while having a lock on the * global config file, the normal config file MUST be locked AS WELL and the * normal config file MUST be locked BEFORE the global config file! * Otherwise there is a risk of deadlock. @@ -247,12 +247,12 @@ private: * @internal * copy-construction and assignment are not allowed */ - KConfig( const KConfig& ); + TDEConfig( const TDEConfig& ); /** * @internal * copy-construction and assignment are not allowed */ - KConfig& operator= ( const KConfig& rConfig ); + TDEConfig& operator= ( const TDEConfig& rConfig ); private: bool bGroupImmutable : 1; // Current group is immutable. @@ -261,16 +261,16 @@ private: protected: virtual void virtual_hook( int id, void* data ); private: - KConfigPrivate *d; + TDEConfigPrivate *d; }; /** - * KConfig variant using shared memory + * TDEConfig variant using shared memory * * KSharedConfig provides a reference counted, shared memory variant - * of KConfig. + * of TDEConfig. */ -class TDECORE_EXPORT KSharedConfig : public KConfig, public KShared +class TDECORE_EXPORT KSharedConfig : public TDEConfig, public KShared { friend class TQValueList; public: diff --git a/tdecore/kconfig_compiler/README.dox b/tdecore/kconfig_compiler/README.dox index 36d9f988b..76dbc04c2 100644 --- a/tdecore/kconfig_compiler/README.dox +++ b/tdecore/kconfig_compiler/README.dox @@ -4,7 +4,7 @@ kconfig_compiler generates C++ source code from an XML file containing information about configuration options (.kcfg) and a file that provides the code generation options (.kcfgc) The generated class is based on -KConfigSkeleton and provides an API for the application to access its +TDEConfigSkeleton and provides an API for the application to access its configuration data.

      XML description of the configuration options

      @@ -96,9 +96,9 @@ The following options are read from the kcfgc file:
    - + + TDEConfigSkeleton. @@ -144,7 +144,7 @@ The following options are read from the kcfgc file: - diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp index ec71dea71..53e02f68d 100644 --- a/tdecore/kconfig_compiler/example/autoexample.cpp +++ b/tdecore/kconfig_compiler/example/autoexample.cpp @@ -48,7 +48,7 @@ int main( int argc, char **argv ) ExamplePrefsBase configSkeleton( "dummy1", "dummy2" ); configSkeleton.readConfig(); - KConfigDialog *dialog = new KConfigDialog( 0, "settings", &configSkeleton ); + TDEConfigDialog *dialog = new TDEConfigDialog( 0, "settings", &configSkeleton ); GeneralBase *general = new GeneralBase( 0 ); dialog->addPage( general, i18n("General"), "General", "" ); diff --git a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc b/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc index 829ec2e29..a9ac98dc7 100644 --- a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc +++ b/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc @@ -3,7 +3,7 @@ ClassName=ExamplePrefsBase # # Singleton=false # -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton # # IncludeFiles=libtdepim/kpimprefs.h # diff --git a/tdecore/kconfig_compiler/kcfg.xsd b/tdecore/kconfig_compiler/kcfg.xsd index 97f716d62..9eb18a068 100644 --- a/tdecore/kconfig_compiler/kcfg.xsd +++ b/tdecore/kconfig_compiler/kcfg.xsd @@ -29,7 +29,7 @@ - A Schema for KDE's KConfigXT XML format. It is similar to the DTD + A Schema for KDE's TDEConfigXT XML format. It is similar to the DTD found at: http://www.kde.org/standards/kcfg/1.0/kcfg.dtd diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp index 51175c528..b8839f677 100644 --- a/tdecore/kconfig_compiler/kconfig_compiler.cpp +++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp @@ -706,7 +706,7 @@ static TQString itemDeclaration(const CfgEntry *e) TQString fCap = e->name(); fCap[0] = fCap[0].upper(); - return " KConfigSkeleton::Item"+itemType( e->type() ) + + return " TDEConfigSkeleton::Item"+itemType( e->type() ) + " *item" + fCap + ( (!e->param().isEmpty())?(TQString("[%1]").arg(e->paramMax()+1)) : TQString()) + ";\n"; @@ -754,7 +754,7 @@ static TQString itemPath(const CfgEntry *e) TQString newItem( const TQString &type, const TQString &name, const TQString &key, const TQString &defaultValue, const TQString ¶m = TQString()) { - TQString t = "new KConfigSkeleton::Item" + itemType( type ) + + TQString t = "new TDEConfigSkeleton::Item" + itemType( type ) + "( currentGroup(), " + key + ", " + varPath( name ) + param; if ( type == "Enum" ) t += ", values" + name; if ( !defaultValue.isEmpty() ) { @@ -953,7 +953,7 @@ TQString indent(TQString text, int spaces) int main( int argc, char **argv ) { TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3", - I18N_NOOP("KConfig Compiler") , TDEAboutData::License_LGPL ); + I18N_NOOP("TDEConfig 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" ); @@ -1093,7 +1093,7 @@ int main( int argc, char **argv ) } } - if ( inherits.isEmpty() ) inherits = "KConfigSkeleton"; + if ( inherits.isEmpty() ) inherits = "TDEConfigSkeleton"; if ( className.isEmpty() ) { kdError() << "Class name missing" << endl; @@ -1330,7 +1330,7 @@ int main( int argc, char **argv ) h << " static" << endl; h << " void writeConfig()" << endl; h << " {" << endl; - h << " static_cast(self())->writeConfig();" << endl; + h << " static_cast(self())->writeConfig();" << endl; h << " }" << endl; } @@ -1455,7 +1455,7 @@ int main( int argc, char **argv ) } cpp << endl << " // items" << endl; for( e = entries.first(); e; e = entries.next() ) { - cpp << " KConfigSkeleton::Item" << itemType( e->type() ) << " *" << itemVar( e ); + cpp << " TDEConfigSkeleton::Item" << itemType( e->type() ) << " *" << itemVar( e ); if (!e->param().isEmpty() ) cpp << TQString("[%1]").arg( e->paramMax()+1 ); cpp << ";" << endl; } @@ -1553,13 +1553,13 @@ int main( int argc, char **argv ) cpp << e->code() << endl; } if ( e->type() == "Enum" ) { - cpp << " TQValueList values" + cpp << " TQValueList values" << e->name() << ";" << endl; TQValueList choices = e->choices(); TQValueList::ConstIterator it; for( it = choices.begin(); it != choices.end(); ++it ) { cpp << " {" << endl; - cpp << " KConfigSkeleton::ItemEnum::Choice choice;" << endl; + cpp << " TDEConfigSkeleton::ItemEnum::Choice choice;" << endl; cpp << " choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl; if ( setUserTexts ) { if ( !(*it).label.isEmpty() ) @@ -1670,7 +1670,7 @@ int main( int argc, char **argv ) if ( itemAccessors ) { cpp << endl; - cpp << "KConfigSkeleton::Item" << itemType( e->type() ) << " *" + cpp << "TDEConfigSkeleton::Item" << itemType( e->type() ) << " *" << getFunction( n, className ) << "Item("; if (!e->param().isEmpty()) { cpp << " " << cppType(e->paramType()) << " i "; diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp index 2f8e7eee3..143838908 100644 --- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp +++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp @@ -1,5 +1,5 @@ /* - Tests for KConfig Compiler + Tests for TDEConfig Compiler Copyright (c) 2005 by Duncan Mac-Vicar @@ -21,8 +21,8 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "KConfigXT") -KUNITTEST_MODULE_REGISTER_TESTER( KConfigCompiler_Test ) +KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "TDEConfigXT") +KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test ) typedef const char * CompilerTestSet[]; @@ -50,12 +50,12 @@ static CompilerTestSet willFailCases = }; -void KConfigCompiler_Test::allTests() +void TDEConfigCompiler_Test::allTests() { testExpectedOutput(); } -void KConfigCompiler_Test::testExpectedOutput() +void TDEConfigCompiler_Test::testExpectedOutput() { uint i = 0; // Known to pass test cases @@ -74,7 +74,7 @@ void KConfigCompiler_Test::testExpectedOutput() } } -void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail) +void TDEConfigCompiler_Test::performCompare(const TQString &fileName, bool fail) { TQFile file(fileName); TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref")); diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h index 36b33cd47..1eba78b97 100644 --- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h +++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h @@ -1,5 +1,5 @@ /* - Tests for KConfig Compiler + Tests for TDEConfig Compiler Copyright (c) 2005 by Duncan Mac-Vicar @@ -21,7 +21,7 @@ class TQString; // change to SlotTester when it works -class KConfigCompiler_Test : public KUnitTest::Tester +class TDEConfigCompiler_Test : public KUnitTest::Tester { public: void allTests(); diff --git a/tdecore/kconfig_compiler/tests/myprefs.h b/tdecore/kconfig_compiler/tests/myprefs.h index ebef89c08..020dc6bfa 100644 --- a/tdecore/kconfig_compiler/tests/myprefs.h +++ b/tdecore/kconfig_compiler/tests/myprefs.h @@ -1,7 +1,7 @@ #include -class MyPrefs : public KConfigSkeleton +class MyPrefs : public TDEConfigSkeleton { public: - MyPrefs( const TQString &a ) : KConfigSkeleton( a ) {} + MyPrefs( const TQString &a ) : TDEConfigSkeleton( a ) {} }; diff --git a/tdecore/kconfig_compiler/tests/test1.cpp.ref b/tdecore/kconfig_compiler/tests/test1.cpp.ref index b3050921e..d0b6b76f1 100644 --- a/tdecore/kconfig_compiler/tests/test1.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test1.cpp.ref @@ -4,65 +4,65 @@ #include "test1.h" Test1::Test1( const TQString & transport, const TQString & folder ) - : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) ); - KConfigSkeleton::ItemBool *itemOneOption; - itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true ); + TDEConfigSkeleton::ItemBool *itemOneOption; + itemOneOption = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true ); addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) ); - KConfigSkeleton::ItemInt *itemAnotherOption; - itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 ); + TDEConfigSkeleton::ItemInt *itemAnotherOption; + itemAnotherOption = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 ); addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) ); - TQValueList valuesListOption; + TQValueList valuesListOption; { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "One" ); valuesListOption.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "Two" ); valuesListOption.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "Three" ); valuesListOption.append( choice ); } - KConfigSkeleton::ItemEnum *itemListOption; - itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); + TDEConfigSkeleton::ItemEnum *itemListOption; + itemListOption = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); addItem( itemListOption, TQString::fromLatin1( "ListOption" ) ); setCurrentGroup( TQString::fromLatin1( "MyOptions" ) ); - KConfigSkeleton::ItemString *itemMyString; - itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) ); + TDEConfigSkeleton::ItemString *itemMyString; + itemMyString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) ); addItem( itemMyString, TQString::fromLatin1( "MyString" ) ); - KConfigSkeleton::ItemPath *itemMyPath; - itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") ); + TDEConfigSkeleton::ItemPath *itemMyPath; + itemMyPath = new TDEConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") ); addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) ); - KConfigSkeleton::ItemInt *itemAnotherOption2; - itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 ); + TDEConfigSkeleton::ItemInt *itemAnotherOption2; + itemAnotherOption2 = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 ); addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) ); TQStringList defaultMyStringList; defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); - KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + TDEConfigSkeleton::ItemStringList *itemMyStringList; + itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); TQStringList defaultMyStringListHidden; defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) ); defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) ); - KConfigSkeleton::ItemStringList *itemMyStringListHidden; - itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); + TDEConfigSkeleton::ItemStringList *itemMyStringListHidden; + itemMyStringListHidden = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) ); - KConfigSkeleton::ItemInt *itemMyNumber; - itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); + TDEConfigSkeleton::ItemInt *itemMyNumber; + itemMyNumber = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/kconfig_compiler/tests/test1.h.ref index cc2d99c69..584dcb7ff 100644 --- a/tdecore/kconfig_compiler/tests/test1.h.ref +++ b/tdecore/kconfig_compiler/tests/test1.h.ref @@ -7,7 +7,7 @@ #include #include -class Test1 : public KConfigSkeleton +class Test1 : public TDEConfigSkeleton { public: class EnumListOption diff --git a/tdecore/kconfig_compiler/tests/test1.kcfgc b/tdecore/kconfig_compiler/tests/test1.kcfgc index 3b74d7c51..ecab7b851 100644 --- a/tdecore/kconfig_compiler/tests/test1.kcfgc +++ b/tdecore/kconfig_compiler/tests/test1.kcfgc @@ -3,7 +3,7 @@ ClassName=Test1 # # Singleton=false # -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton # # IncludeFiles=libtdepim/kpimprefs.h # diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/kconfig_compiler/tests/test2.cpp.ref index 2d56f7545..fe7b8af80 100644 --- a/tdecore/kconfig_compiler/tests/test2.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test2.cpp.ref @@ -10,59 +10,59 @@ Test2::Test2( ) { setCurrentGroup( TQString::fromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") ); mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") ); addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); - mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); + mAutoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); - mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true ); + mConfirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true ); mConfirmItem->setLabel( i18n("Confirm deletes") ); addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) ); - mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile ); + mArchiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile ); mArchiveFileItem->setLabel( i18n("Archive File") ); addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); - TQValueList valuesDestination; + TQValueList valuesDestination; { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "askDestination" ); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); + mDestinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); mDestinationItem->setLabel( i18n("New Events/Todos Should") ); addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) ); setCurrentGroup( TQString::fromLatin1( "Views" ) ); - mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 ); + mHourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 ); mHourSizeItem->setLabel( i18n("Hour Size") ); addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) ); - mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); + mSelectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); @@ -72,22 +72,22 @@ Test2::Test2( ) defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); + mSelectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") ); addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); setCurrentGroup( TQString::fromLatin1( "Colors" ) ); - mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); + mHighlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); mHighlightColorItem->setLabel( i18n("Highlight color") ); addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); - mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); + mAgendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); mAgendaBgColorItem->setLabel( i18n("Agenda view background color") ); addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); - mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont ); + mTimeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont ); mTimeBarFontItem->setLabel( i18n("Time bar") ); addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/kconfig_compiler/tests/test3.cpp.ref index 11fe6b38f..3bd0eb8c9 100644 --- a/tdecore/kconfig_compiler/tests/test3.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test3.cpp.ref @@ -6,20 +6,20 @@ using namespace TestNameSpace; Test3::Test3( ) - : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "test3rc" ) ) { setCurrentGroup( TQString::fromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); setCurrentGroup( TQString::fromLatin1( "Blah" ) ); - mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 ); + mBlubbItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 ); addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) ); - mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) ); + mBlahBlahItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) ); addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) ); - mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword ); + mMyPasswordItem = new TDEConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword ); addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/kconfig_compiler/tests/test3.h.ref index 75b1b0929..4c35a138a 100644 --- a/tdecore/kconfig_compiler/tests/test3.h.ref +++ b/tdecore/kconfig_compiler/tests/test3.h.ref @@ -8,7 +8,7 @@ namespace TestNameSpace { -class Test3 : public KConfigSkeleton +class Test3 : public TDEConfigSkeleton { public: diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/kconfig_compiler/tests/test4.cpp.ref index 6918a8c8a..c6b29bec2 100644 --- a/tdecore/kconfig_compiler/tests/test4.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test4.cpp.ref @@ -21,54 +21,54 @@ Test4 *Test4::self() const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" }; Test4::Test4( ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) { mSelf = this; setCurrentGroup( TQString::fromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; - KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); + TDEConfigSkeleton::ItemColor *itemColor[4]; + itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); addItem( itemColor[0], TQString::fromLatin1( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); + itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); addItem( itemColor[1], TQString::fromLatin1( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); + itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); addItem( itemColor[2], TQString::fromLatin1( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); + itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); addItem( itemColor[3], TQString::fromLatin1( "Color3" ) ); - TQValueList valuesMouseAction; + TQValueList valuesMouseAction; { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } - KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); + TDEConfigSkeleton::ItemEnum *itemMouseAction[3]; + itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); + itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); + itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) ); - KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + TDEConfigSkeleton::ItemString *itemFooBar; + itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); - KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + TDEConfigSkeleton::ItemInt *itemAge; + itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); addItem( itemAge, TQString::fromLatin1( "Age" ) ); diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/kconfig_compiler/tests/test4.h.ref index d11dd3aee..9457413a1 100644 --- a/tdecore/kconfig_compiler/tests/test4.h.ref +++ b/tdecore/kconfig_compiler/tests/test4.h.ref @@ -6,7 +6,7 @@ #include #include -class Test4 : public KConfigSkeleton +class Test4 : public TDEConfigSkeleton { public: class EnumMouseAction @@ -115,7 +115,7 @@ class Test4 : public KConfigSkeleton static void writeConfig() { - static_cast(self())->writeConfig(); + static_cast(self())->writeConfig(); } protected: Test4(); diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/kconfig_compiler/tests/test5.cpp.ref index 8373eb3f6..9e295bc0e 100644 --- a/tdecore/kconfig_compiler/tests/test5.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test5.cpp.ref @@ -21,54 +21,54 @@ Test5 *Test5::self() const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" }; Test5::Test5( ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) { mSelf = this; setCurrentGroup( TQString::fromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; - KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); + TDEConfigSkeleton::ItemColor *itemColor[4]; + itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); addItem( itemColor[0], TQString::fromLatin1( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); + itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); addItem( itemColor[1], TQString::fromLatin1( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); + itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); addItem( itemColor[2], TQString::fromLatin1( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); + itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); addItem( itemColor[3], TQString::fromLatin1( "Color3" ) ); - TQValueList valuesMouseAction; + TQValueList valuesMouseAction; { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } - KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); + TDEConfigSkeleton::ItemEnum *itemMouseAction[3]; + itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); + itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); + itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) ); - KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + TDEConfigSkeleton::ItemString *itemFooBar; + itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); - KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + TDEConfigSkeleton::ItemInt *itemAge; + itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); addItem( itemAge, TQString::fromLatin1( "Age" ) ); diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/kconfig_compiler/tests/test5.h.ref index efb9b448a..274da4761 100644 --- a/tdecore/kconfig_compiler/tests/test5.h.ref +++ b/tdecore/kconfig_compiler/tests/test5.h.ref @@ -6,7 +6,7 @@ #include #include -class Test5 : public KConfigSkeleton +class Test5 : public TDEConfigSkeleton { public: enum { Encrypt, Decrypt, CrashNBurn, PumpNDump }; @@ -107,7 +107,7 @@ class Test5 : public KConfigSkeleton static void writeConfig() { - static_cast(self())->writeConfig(); + static_cast(self())->writeConfig(); } protected: Test5(); diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/kconfig_compiler/tests/test6.cpp.ref index 51b96d4c4..fc19613a9 100644 --- a/tdecore/kconfig_compiler/tests/test6.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test6.cpp.ref @@ -4,22 +4,22 @@ #include "test6.h" Test6::Test6( const TQString & Number ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) , mParamNumber(Number) { setCurrentGroup( TQString::fromLatin1( "Foo" ) ); - KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + TDEConfigSkeleton::ItemColor *itemColor; + itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); addItem( itemColor, TQString::fromLatin1( "Color" ) ); setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); - KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + TDEConfigSkeleton::ItemString *itemFooBar; + itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); - KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + TDEConfigSkeleton::ItemInt *itemAge; + itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); addItem( itemAge, TQString::fromLatin1( "Age" ) ); diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/kconfig_compiler/tests/test6.h.ref index 6743d6064..eee776b5a 100644 --- a/tdecore/kconfig_compiler/tests/test6.h.ref +++ b/tdecore/kconfig_compiler/tests/test6.h.ref @@ -6,7 +6,7 @@ #include #include -class Test6 : public KConfigSkeleton +class Test6 : public TDEConfigSkeleton { public: diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/kconfig_compiler/tests/test7.cpp.ref index 91a22e036..81f7de10e 100644 --- a/tdecore/kconfig_compiler/tests/test7.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test7.cpp.ref @@ -4,22 +4,22 @@ #include "test7.h" Test7::Test7( int Number ) - : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "test7rc" ) ) , mParamNumber(Number) { setCurrentGroup( TQString::fromLatin1( "Foo" ) ); - KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + TDEConfigSkeleton::ItemColor *itemColor; + itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); addItem( itemColor, TQString::fromLatin1( "Color" ) ); setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); - KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + TDEConfigSkeleton::ItemString *itemFooBar; + itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); - KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + TDEConfigSkeleton::ItemInt *itemAge; + itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); addItem( itemAge, TQString::fromLatin1( "Age" ) ); diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/kconfig_compiler/tests/test7.h.ref index 8f8808da1..fb6dd6c77 100644 --- a/tdecore/kconfig_compiler/tests/test7.h.ref +++ b/tdecore/kconfig_compiler/tests/test7.h.ref @@ -6,7 +6,7 @@ #include #include -class Test7 : public KConfigSkeleton +class Test7 : public TDEConfigSkeleton { public: diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref index 413e75c9c..c0267452d 100644 --- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref @@ -4,15 +4,15 @@ #include "test8a.h" Test8a::Test8a( KSharedConfig::Ptr config ) - : KConfigSkeleton( config ) + : TDEConfigSkeleton( config ) { setCurrentGroup( TQString::fromLatin1( "Group" ) ); - KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() ); + TDEConfigSkeleton::ItemFont *itemFont; + itemFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() ); addItem( itemFont, TQString::fromLatin1( "Font" ) ); - KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() ); + TDEConfigSkeleton::ItemFont *itemTitleFont; + itemTitleFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() ); addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref index 0ab182a04..747c6dd58 100644 --- a/tdecore/kconfig_compiler/tests/test8a.h.ref +++ b/tdecore/kconfig_compiler/tests/test8a.h.ref @@ -7,7 +7,7 @@ #include #include -class Test8a : public KConfigSkeleton +class Test8a : public TDEConfigSkeleton { public: diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/kconfig_compiler/tests/test8b.cpp.ref index e29e3c4e7..6a0a16b48 100644 --- a/tdecore/kconfig_compiler/tests/test8b.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test8b.cpp.ref @@ -24,17 +24,17 @@ Test8b::Test8b( ) mSelf = this; setCurrentGroup( TQString::fromLatin1( "Group8b1" ) ); - KConfigSkeleton::ItemUInt *itemSomething; - itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 ); + TDEConfigSkeleton::ItemUInt *itemSomething; + itemSomething = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 ); addItem( itemSomething, TQString::fromLatin1( "Something" ) ); setCurrentGroup( TQString::fromLatin1( "Group8b2" ) ); - KConfigSkeleton::ItemBool *itemFooBoo; - itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false ); + TDEConfigSkeleton::ItemBool *itemFooBoo; + itemFooBoo = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false ); addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) ); - KConfigSkeleton::ItemUInt *itemPort; - itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 ); + TDEConfigSkeleton::ItemUInt *itemPort; + itemPort = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 ); addItem( itemPort, TQString::fromLatin1( "Port" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/kconfig_compiler/tests/test8b.h.ref index 4ca0d5c7f..052746bfb 100644 --- a/tdecore/kconfig_compiler/tests/test8b.h.ref +++ b/tdecore/kconfig_compiler/tests/test8b.h.ref @@ -75,7 +75,7 @@ class Test8b : public Test8a static void writeConfig() { - static_cast(self())->writeConfig(); + static_cast(self())->writeConfig(); } protected: Test8b(); diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/kconfig_compiler/tests/test9.cpp.ref index c5d57e4d1..f6765fb42 100644 --- a/tdecore/kconfig_compiler/tests/test9.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test9.cpp.ref @@ -4,7 +4,7 @@ #include "test9.h" Test9::Test9( const TQString & transport, const TQString & folder ) - : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { @@ -14,18 +14,18 @@ Test9::Test9( const TQString & transport, const TQString & folder ) defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); - KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + TDEConfigSkeleton::ItemStringList *itemMyStringList; + itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); TQStringList defaultMyPathList; defaultMyPathList.append( TQString::fromUtf8( "/home" ) ); defaultMyPathList.append( TQString::fromUtf8( "~" ) ); - KConfigSkeleton::ItemPathList *itemMyPathList; - itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); + TDEConfigSkeleton::ItemPathList *itemMyPathList; + itemMyPathList = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) ); - KConfigSkeleton::ItemPathList *itemMyPathsList2; - itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() ); + TDEConfigSkeleton::ItemPathList *itemMyPathsList2; + itemMyPathsList2 = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() ); addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/kconfig_compiler/tests/test9.h.ref index 66a629b48..99d94c957 100644 --- a/tdecore/kconfig_compiler/tests/test9.h.ref +++ b/tdecore/kconfig_compiler/tests/test9.h.ref @@ -7,7 +7,7 @@ #include #include -class Test9 : public KConfigSkeleton +class Test9 : public TDEConfigSkeleton { public: diff --git a/tdecore/kconfig_compiler/tests/test9.kcfgc b/tdecore/kconfig_compiler/tests/test9.kcfgc index 8f124fc25..0a88064b6 100644 --- a/tdecore/kconfig_compiler/tests/test9.kcfgc +++ b/tdecore/kconfig_compiler/tests/test9.kcfgc @@ -3,7 +3,7 @@ ClassName=Test9 # # Singleton=false # -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton # # IncludeFiles=libtdepim/kpimprefs.h # diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref index 7b5f55f03..3aad5b689 100644 --- a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref @@ -33,17 +33,17 @@ class TestDPointerPrivate TQFont timeBarFont; // items - KConfigSkeleton::ItemBool *autoSaveItem; - KConfigSkeleton::ItemInt *autoSaveIntervalItem; - KConfigSkeleton::ItemBool *confirmItem; - KConfigSkeleton::ItemString *archiveFileItem; - KConfigSkeleton::ItemEnum *destinationItem; - KConfigSkeleton::ItemInt *hourSizeItem; - KConfigSkeleton::ItemBool *selectionStartsEditorItem; - KConfigSkeleton::ItemStringList *selectedPluginsItem; - KConfigSkeleton::ItemColor *highlightColorItem; - KConfigSkeleton::ItemColor *agendaBgColorItem; - KConfigSkeleton::ItemFont *timeBarFontItem; + TDEConfigSkeleton::ItemBool *autoSaveItem; + TDEConfigSkeleton::ItemInt *autoSaveIntervalItem; + TDEConfigSkeleton::ItemBool *confirmItem; + TDEConfigSkeleton::ItemString *archiveFileItem; + TDEConfigSkeleton::ItemEnum *destinationItem; + TDEConfigSkeleton::ItemInt *hourSizeItem; + TDEConfigSkeleton::ItemBool *selectionStartsEditorItem; + TDEConfigSkeleton::ItemStringList *selectedPluginsItem; + TDEConfigSkeleton::ItemColor *highlightColorItem; + TDEConfigSkeleton::ItemColor *agendaBgColorItem; + TDEConfigSkeleton::ItemFont *timeBarFontItem; }; TestDPointer *TestDPointer::mSelf = 0; @@ -60,65 +60,65 @@ TestDPointer *TestDPointer::self() } TestDPointer::TestDPointer( ) - : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) ) { d = new TestDPointerPrivate; mSelf = this; setCurrentGroup( TQString::fromLatin1( "General" ) ); - d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false ); + d->autoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false ); d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") ); d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") ); addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) ); - d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); + d->autoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); - d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true ); + d->confirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true ); d->confirmItem->setLabel( i18n("Confirm deletes") ); addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) ); - d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile ); + d->archiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile ); d->archiveFileItem->setLabel( i18n("Archive File") ); addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); - TQValueList valuesDestination; + TQValueList valuesDestination; { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "askDestination" ); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { - KConfigSkeleton::ItemEnum::Choice choice; + TDEConfigSkeleton::ItemEnum::Choice choice; choice.name = TQString::fromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); + d->destinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); d->destinationItem->setLabel( i18n("New Events/Todos Should") ); addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) ); setCurrentGroup( TQString::fromLatin1( "Views" ) ); - d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 ); + d->hourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 ); d->hourSizeItem->setLabel( i18n("Hour Size") ); addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) ); - d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); + d->selectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); @@ -128,22 +128,22 @@ TestDPointer::TestDPointer( ) defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); + d->selectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") ); addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); setCurrentGroup( TQString::fromLatin1( "Colors" ) ); - d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); + d->highlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); d->highlightColorItem->setLabel( i18n("Highlight color") ); addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); - d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); + d->agendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); d->agendaBgColorItem->setLabel( i18n("Agenda view background color") ); addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); - d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont ); + d->timeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont ); d->timeBarFontItem->setLabel( i18n("Time bar") ); addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); } @@ -160,7 +160,7 @@ bool TestDPointer::autoSave() } -KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem() +TDEConfigSkeleton::ItemBool *TestDPointer::autoSaveItem() { return d->autoSaveItem; } @@ -177,7 +177,7 @@ int TestDPointer::autoSaveInterval() } -KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem() +TDEConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem() { return d->autoSaveIntervalItem; } @@ -194,7 +194,7 @@ bool TestDPointer::confirm() } -KConfigSkeleton::ItemBool *TestDPointer::confirmItem() +TDEConfigSkeleton::ItemBool *TestDPointer::confirmItem() { return d->confirmItem; } @@ -211,7 +211,7 @@ TQString TestDPointer::archiveFile() } -KConfigSkeleton::ItemString *TestDPointer::archiveFileItem() +TDEConfigSkeleton::ItemString *TestDPointer::archiveFileItem() { return d->archiveFileItem; } @@ -228,7 +228,7 @@ int TestDPointer::destination() } -KConfigSkeleton::ItemEnum *TestDPointer::destinationItem() +TDEConfigSkeleton::ItemEnum *TestDPointer::destinationItem() { return d->destinationItem; } @@ -245,7 +245,7 @@ int TestDPointer::hourSize() } -KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem() +TDEConfigSkeleton::ItemInt *TestDPointer::hourSizeItem() { return d->hourSizeItem; } @@ -262,7 +262,7 @@ bool TestDPointer::selectionStartsEditor() } -KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem() +TDEConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem() { return d->selectionStartsEditorItem; } @@ -279,7 +279,7 @@ TQStringList TestDPointer::selectedPlugins() } -KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem() +TDEConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem() { return d->selectedPluginsItem; } @@ -296,7 +296,7 @@ TQColor TestDPointer::highlightColor() } -KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem() +TDEConfigSkeleton::ItemColor *TestDPointer::highlightColorItem() { return d->highlightColorItem; } @@ -313,7 +313,7 @@ TQColor TestDPointer::agendaBgColor() } -KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem() +TDEConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem() { return d->agendaBgColorItem; } @@ -330,7 +330,7 @@ TQFont TestDPointer::timeBarFont() } -KConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem() +TDEConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem() { return d->timeBarFontItem; } diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref b/tdecore/kconfig_compiler/tests/test_dpointer.h.ref index 81f281e83..d9b7b94c1 100644 --- a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref +++ b/tdecore/kconfig_compiler/tests/test_dpointer.h.ref @@ -8,7 +8,7 @@ class TestDPointerPrivate; -class TestDPointer : public KConfigSkeleton +class TestDPointer : public TDEConfigSkeleton { public: class EnumDestination @@ -210,7 +210,7 @@ class TestDPointer : public KConfigSkeleton static void writeConfig() { - static_cast(self())->writeConfig(); + static_cast(self())->writeConfig(); } protected: TestDPointer(); diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp index 4f217597b..178198509 100644 --- a/tdecore/kconfigbackend.cpp +++ b/tdecore/kconfigbackend.cpp @@ -231,7 +231,7 @@ static TQCString decodeKey(const char* key) return newKey; } -class KConfigBackEnd::KConfigBackEndPrivate +class TDEConfigBackEnd::TDEConfigBackEndPrivate { public: TQDateTime localLastModified; @@ -240,7 +240,7 @@ public: KLockFile::Ptr globalLockFile; }; -void KConfigBackEnd::changeFileName(const TQString &_fileName, +void TDEConfigBackEnd::changeFileName(const TQString &_fileName, const char * _resType, bool _useKDEGlobals) { @@ -270,7 +270,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, d->globalLockFile = 0; } -KLockFile::Ptr KConfigBackEnd::lockFile(bool bGlobal) +KLockFile::Ptr TDEConfigBackEnd::lockFile(bool bGlobal) { if (bGlobal) { @@ -297,35 +297,35 @@ KLockFile::Ptr KConfigBackEnd::lockFile(bool bGlobal) return 0; } -KConfigBackEnd::KConfigBackEnd(KConfigBase *_config, +TDEConfigBackEnd::TDEConfigBackEnd(TDEConfigBase *_config, const TQString &_fileName, const char * _resType, bool _useKDEGlobals) - : pConfig(_config), bFileImmutable(false), mConfigState(KConfigBase::NoAccess), mFileMode(-1) + : pConfig(_config), bFileImmutable(false), mConfigState(TDEConfigBase::NoAccess), mFileMode(-1) { - d = new KConfigBackEndPrivate; + d = new TDEConfigBackEndPrivate; changeFileName(_fileName, _resType, _useKDEGlobals); } -KConfigBackEnd::~KConfigBackEnd() +TDEConfigBackEnd::~TDEConfigBackEnd() { delete d; } -void KConfigBackEnd::setFileWriteMode(int mode) +void TDEConfigBackEnd::setFileWriteMode(int mode) { mFileMode = mode; } -bool KConfigINIBackEnd::parseConfigFiles() +bool TDEConfigINIBackEnd::parseConfigFiles() { // Check if we can write to the local file. - mConfigState = KConfigBase::ReadOnly; + mConfigState = TDEConfigBase::ReadOnly; if (!mLocalFileName.isEmpty() && !pConfig->isReadOnly()) { if (checkAccess(mLocalFileName, W_OK)) { - mConfigState = KConfigBase::ReadWrite; + mConfigState = TDEConfigBase::ReadWrite; } else { @@ -337,7 +337,7 @@ bool KConfigINIBackEnd::parseConfigFiles() if (checkAccess(mLocalFileName, W_OK)) { - mConfigState = KConfigBase::ReadWrite; + mConfigState = TDEConfigBase::ReadWrite; } } TQFileInfo info(mLocalFileName); @@ -426,7 +426,7 @@ bool KConfigINIBackEnd::parseConfigFiles() } } if (bFileImmutable) - mConfigState = KConfigBase::ReadOnly; + mConfigState = TDEConfigBase::ReadOnly; return true; } @@ -447,7 +447,7 @@ extern "C" { extern bool kde_kiosk_exception; -void KConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile, +void TDEConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile, KEntryMap *pWriteBackMap, bool bGlobal, bool bDefault) { @@ -732,11 +732,11 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1()); } // Look up translations using KLocale // https://launchpad.net/distros/ubuntu/+spec/langpacks-desktopfiles-kde - // This calls KLocale up to 10 times for each config file (and each KConfig has up to 4 files) + // This calls KLocale up to 10 times for each config file (and each TDEConfig has up to 4 files) // so I'll see how much of a performance hit it is // it also only acts on the last group in a file // Ideas: only translate most important fields, only translate "Desktop Entry" files, - // do translation per KConfig not per single file + // do translation per TDEConfig not per single file if (!pWriteBackMap) { TQFile file("file.txt"); if (foundGettextDomain) { @@ -772,7 +772,7 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1()); #endif } -void KConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQCString key) { +void TDEConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQCString key) { KEntryKey entryKey = KEntryKey(currentGroup, key); KEntry entry = pConfig->lookupData(entryKey); if (TQString(entry.mValue) != "") { @@ -788,7 +788,7 @@ void KConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQ } } -void KConfigINIBackEnd::sync(bool bMerge) +void TDEConfigINIBackEnd::sync(bool bMerge) { // write-sync is only necessary if there are dirty entries if (!pConfig->isDirty()) @@ -978,7 +978,7 @@ static void writeEntries(FILE *pStream, const KEntryMap& entryMap, bool defaultG } // for loop } -bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal, +bool TDEConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal, TQFile *mergeFile) { bool bEntriesLeft = false; @@ -1032,7 +1032,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal, } /* antlarr: KDE 4.0: make the first parameter "const TQString &" */ -bool KConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal, +bool TDEConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal, bool bMerge) { // is the config object read-only? @@ -1135,7 +1135,7 @@ bool KConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal, return bEntriesLeft; } -void KConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap) +void TDEConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap) { bool firstEntry = true; @@ -1146,13 +1146,13 @@ void KConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap) ::writeEntries(pStream, aTempMap, false, firstEntry, localeString); } -void KConfigBackEnd::virtual_hook( int, void* ) +void TDEConfigBackEnd::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -void KConfigINIBackEnd::virtual_hook( int id, void* data ) -{ KConfigBackEnd::virtual_hook( id, data ); } +void TDEConfigINIBackEnd::virtual_hook( int id, void* data ) +{ TDEConfigBackEnd::virtual_hook( id, data ); } -bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser) +bool TDEConfigBackEnd::checkConfigFilesWritable(bool warnUser) { // WARNING: Do NOT use the event loop as it may not exist at this time. bool allWritable = true; diff --git a/tdecore/kconfigbackend.h b/tdecore/kconfigbackend.h index 03655ab2d..87ddfa3bb 100644 --- a/tdecore/kconfigbackend.h +++ b/tdecore/kconfigbackend.h @@ -29,7 +29,7 @@ #include "tdelibs_export.h" class TQFile; -class KConfigBackEndPrivate; +class TDEConfigBackEndPrivate; /** * Abstract base class for KDE configuration file loading/saving. @@ -45,9 +45,9 @@ class KConfigBackEndPrivate; * Matthias Kalle Dalheimer * @short KDE Configuration file loading/saving abstract base class */ -class TDECORE_EXPORT KConfigBackEnd +class TDECORE_EXPORT TDEConfigBackEnd { - friend class KConfig; + friend class TDEConfig; friend class KSharedConfig; public: /** @@ -65,13 +65,13 @@ public: * will be imported into the config object. If false, only * the filename specified will be dealt with. */ - KConfigBackEnd(KConfigBase *_config, const TQString &_fileName, + TDEConfigBackEnd(TDEConfigBase *_config, const TQString &_fileName, const char * _resType, bool _useKDEGlobals); /** * Destructs the configuration backend. */ - virtual ~KConfigBackEnd(); + virtual ~TDEConfigBackEnd(); /** * Parses all configuration files for a configuration object. This @@ -108,9 +108,9 @@ public: /** * Returns the state of the app-config object. * - * @see KConfig::getConfigState + * @see TDEConfig::getConfigState */ - virtual KConfigBase::ConfigState getConfigState() const + virtual TDEConfigBase::ConfigState getConfigState() const { return mConfigState; } /** @@ -162,7 +162,7 @@ private: KDE_DEPRECATED TQString filename() const { return mfileName; } protected: - KConfigBase *pConfig; + TDEConfigBase *pConfig; TQString mfileName; TQCString resType; @@ -171,14 +171,14 @@ protected: TQCString localeString; TQString mLocalFileName; TQString mGlobalFileName; - KConfigBase::ConfigState mConfigState; + TDEConfigBase::ConfigState mConfigState; int mFileMode; protected: virtual void virtual_hook( int id, void* data ); protected: - class KConfigBackEndPrivate; - KConfigBackEndPrivate *d; + class TDEConfigBackEndPrivate; + TDEConfigBackEndPrivate *d; }; @@ -188,7 +188,7 @@ protected: * @author Preston Brown , * Matthias Kalle Dalheimer */ -class TDECORE_EXPORT KConfigINIBackEnd : public KConfigBackEnd +class TDECORE_EXPORT TDEConfigINIBackEnd : public TDEConfigBackEnd { public: @@ -207,14 +207,14 @@ public: * will be imported into the config object. If false, only * the filename specified will be dealt with. */ - KConfigINIBackEnd(KConfigBase *_config, const TQString &_fileName, + TDEConfigINIBackEnd(TDEConfigBase *_config, const TQString &_fileName, const char * _resType, bool _useKDEGlobals = true) - : KConfigBackEnd(_config, _fileName, _resType, _useKDEGlobals) {} + : TDEConfigBackEnd(_config, _fileName, _resType, _useKDEGlobals) {} /** * Destructs the configuration backend. */ - virtual ~KConfigINIBackEnd() {} + virtual ~TDEConfigINIBackEnd() {} /** * Parses all INI-style configuration files for a config object. @@ -292,8 +292,8 @@ protected: protected: virtual void virtual_hook( int id, void* data ); private: - class KConfigINIBackEndPrivate; - KConfigINIBackEndPrivate *not_d; + class TDEConfigINIBackEndPrivate; + TDEConfigINIBackEndPrivate *not_d; }; #endif diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp index e13d07782..e65338c50 100644 --- a/tdecore/kconfigbase.cpp +++ b/tdecore/kconfigbase.cpp @@ -38,28 +38,28 @@ #include "kstandarddirs.h" #include "kstringhandler.h" -class KConfigBase::KConfigBasePrivate +class TDEConfigBase::TDEConfigBasePrivate { public: - KConfigBasePrivate() : readDefaults(false) { }; + TDEConfigBasePrivate() : readDefaults(false) { }; public: bool readDefaults; }; -KConfigBase::KConfigBase() +TDEConfigBase::TDEConfigBase() : backEnd(0L), bDirty(false), bLocaleInitialized(false), bReadOnly(false), bExpand(false), d(0) { setGroup(TQString::null); } -KConfigBase::~KConfigBase() +TDEConfigBase::~TDEConfigBase() { delete d; } -void KConfigBase::setLocale() +void TDEConfigBase::setLocale() { bLocaleInitialized = true; @@ -71,12 +71,12 @@ void KConfigBase::setLocale() backEnd->setLocaleString(aLocaleString); } -TQString KConfigBase::locale() const +TQString TDEConfigBase::locale() const { return TQString::fromUtf8(aLocaleString); } -void KConfigBase::setGroup( const TQString& group ) +void TDEConfigBase::setGroup( const TQString& group ) { if ( group.isEmpty() ) mGroup = ""; @@ -84,12 +84,12 @@ void KConfigBase::setGroup( const TQString& group ) mGroup = group.utf8(); } -void KConfigBase::setGroup( const char *pGroup ) +void TDEConfigBase::setGroup( const char *pGroup ) { setGroup(TQCString(pGroup)); } -void KConfigBase::setGroup( const TQCString &group ) +void TDEConfigBase::setGroup( const TQCString &group ) { if ( group.isEmpty() ) mGroup = ""; @@ -97,21 +97,21 @@ void KConfigBase::setGroup( const TQCString &group ) mGroup = group; } -TQString KConfigBase::group() const { +TQString TDEConfigBase::group() const { return TQString::fromUtf8(mGroup); } -void KConfigBase::setDesktopGroup() +void TDEConfigBase::setDesktopGroup() { mGroup = "Desktop Entry"; } -bool KConfigBase::hasKey(const TQString &key) const +bool TDEConfigBase::hasKey(const TQString &key) const { return hasKey(key.utf8().data()); } -bool KConfigBase::hasKey(const char *pKey) const +bool TDEConfigBase::hasKey(const char *pKey) const { KEntryKey aEntryKey(mGroup, 0); aEntryKey.c_key = pKey; @@ -131,7 +131,7 @@ bool KConfigBase::hasKey(const char *pKey) const return !entry.mValue.isNull(); } -bool KConfigBase::hasTranslatedKey(const char* pKey) const +bool TDEConfigBase::hasTranslatedKey(const char* pKey) const { KEntryKey aEntryKey(mGroup, 0); aEntryKey.c_key = pKey; @@ -149,27 +149,27 @@ bool KConfigBase::hasTranslatedKey(const char* pKey) const return false; } -bool KConfigBase::hasGroup(const TQString &group) const +bool TDEConfigBase::hasGroup(const TQString &group) const { return internalHasGroup( group.utf8()); } -bool KConfigBase::hasGroup(const char *_pGroup) const +bool TDEConfigBase::hasGroup(const char *_pGroup) const { return internalHasGroup( TQCString(_pGroup)); } -bool KConfigBase::hasGroup(const TQCString &_pGroup) const +bool TDEConfigBase::hasGroup(const TQCString &_pGroup) const { return internalHasGroup( _pGroup); } -bool KConfigBase::isImmutable() const +bool TDEConfigBase::isImmutable() const { return (getConfigState() != ReadWrite); } -bool KConfigBase::groupIsImmutable(const TQString &group) const +bool TDEConfigBase::groupIsImmutable(const TQString &group) const { if (getConfigState() != ReadWrite) return true; @@ -179,7 +179,7 @@ bool KConfigBase::groupIsImmutable(const TQString &group) const return entry.bImmutable; } -bool KConfigBase::entryIsImmutable(const TQString &key) const +bool TDEConfigBase::entryIsImmutable(const TQString &key) const { if (getConfigState() != ReadWrite) return true; @@ -201,14 +201,14 @@ bool KConfigBase::entryIsImmutable(const TQString &key) const } -TQString KConfigBase::readEntryUntranslated( const TQString& pKey, +TQString TDEConfigBase::readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const { - return KConfigBase::readEntryUntranslated(pKey.utf8().data(), aDefault); + return TDEConfigBase::readEntryUntranslated(pKey.utf8().data(), aDefault); } -TQString KConfigBase::readEntryUntranslated( const char *pKey, +TQString TDEConfigBase::readEntryUntranslated( const char *pKey, const TQString& aDefault ) const { TQCString result = readEntryUtf8(pKey); @@ -218,22 +218,22 @@ TQString KConfigBase::readEntryUntranslated( const char *pKey, } -TQString KConfigBase::readEntry( const TQString& pKey, +TQString TDEConfigBase::readEntry( const TQString& pKey, const TQString& aDefault ) const { - return KConfigBase::readEntry(pKey.utf8().data(), aDefault); + return TDEConfigBase::readEntry(pKey.utf8().data(), aDefault); } -TQString KConfigBase::readEntry( const char *pKey, +TQString TDEConfigBase::readEntry( const char *pKey, const TQString& aDefault ) const { // we need to access _locale instead of the method locale() // because calling locale() will create a locale object if it - // doesn't exist, which requires KConfig, which will create a infinite + // doesn't exist, which requires TDEConfig, which will create a infinite // loop, and nobody likes those. if (!bLocaleInitialized && TDEGlobal::_locale) { // get around const'ness. - KConfigBase *that = const_cast(this); + TDEConfigBase *that = const_cast(this); that->setLocale(); } @@ -335,7 +335,7 @@ TQString KConfigBase::readEntry( const char *pKey, return aValue; } -TQCString KConfigBase::readEntryUtf8( const char *pKey) const +TQCString TDEConfigBase::readEntryUtf8( const char *pKey) const { // We don't try the localized key KEntryKey entryKey(mGroup, 0); @@ -350,13 +350,13 @@ TQCString KConfigBase::readEntryUtf8( const char *pKey) const return aEntryData.mValue; } -TQVariant KConfigBase::readPropertyEntry( const TQString& pKey, +TQVariant TDEConfigBase::readPropertyEntry( const TQString& pKey, TQVariant::Type type ) const { return readPropertyEntry(pKey.utf8().data(), type); } -TQVariant KConfigBase::readPropertyEntry( const char *pKey, +TQVariant TDEConfigBase::readPropertyEntry( const char *pKey, TQVariant::Type type ) const { TQVariant va; @@ -365,13 +365,13 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey, return readPropertyEntry(pKey, va); } -TQVariant KConfigBase::readPropertyEntry( const TQString& pKey, +TQVariant TDEConfigBase::readPropertyEntry( const TQString& pKey, const TQVariant &aDefault ) const { return readPropertyEntry(pKey.utf8().data(), aDefault); } -TQVariant KConfigBase::readPropertyEntry( const char *pKey, +TQVariant TDEConfigBase::readPropertyEntry( const char *pKey, const TQVariant &aDefault ) const { if ( !hasKey( pKey ) ) return aDefault; @@ -474,13 +474,13 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey, return TQVariant(); } -int KConfigBase::readListEntry( const TQString& pKey, +int TDEConfigBase::readListEntry( const TQString& pKey, TQStrList &list, char sep ) const { return readListEntry(pKey.utf8().data(), list, sep); } -int KConfigBase::readListEntry( const char *pKey, +int TDEConfigBase::readListEntry( const char *pKey, TQStrList &list, char sep ) const { if( !hasKey( pKey ) ) @@ -519,12 +519,12 @@ int KConfigBase::readListEntry( const char *pKey, return list.count(); } -TQStringList KConfigBase::readListEntry( const TQString& pKey, char sep ) const +TQStringList TDEConfigBase::readListEntry( const TQString& pKey, char sep ) const { return readListEntry(pKey.utf8().data(), sep); } -TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const +TQStringList TDEConfigBase::readListEntry( const char *pKey, char sep ) const { static const TQString& emptyString = TDEGlobal::staticQString(""); @@ -565,7 +565,7 @@ TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const return list; } -TQStringList KConfigBase::readListEntry( const char* pKey, const TQStringList& aDefault, +TQStringList TDEConfigBase::readListEntry( const char* pKey, const TQStringList& aDefault, char sep ) const { if ( !hasKey( pKey ) ) @@ -574,12 +574,12 @@ TQStringList KConfigBase::readListEntry( const char* pKey, const TQStringList& a return readListEntry( pKey, sep ); } -TQValueList KConfigBase::readIntListEntry( const TQString& pKey ) const +TQValueList TDEConfigBase::readIntListEntry( const TQString& pKey ) const { return readIntListEntry(pKey.utf8().data()); } -TQValueList KConfigBase::readIntListEntry( const char *pKey ) const +TQValueList TDEConfigBase::readIntListEntry( const char *pKey ) const { TQStringList strlist = readListEntry(pKey); TQValueList list; @@ -592,12 +592,12 @@ TQValueList KConfigBase::readIntListEntry( const char *pKey ) const return list; } -TQString KConfigBase::readPathEntry( const TQString& pKey, const TQString& pDefault ) const +TQString TDEConfigBase::readPathEntry( const TQString& pKey, const TQString& pDefault ) const { return readPathEntry(pKey.utf8().data(), pDefault); } -TQString KConfigBase::readPathEntry( const char *pKey, const TQString& pDefault ) const +TQString TDEConfigBase::readPathEntry( const char *pKey, const TQString& pDefault ) const { const bool bExpandSave = bExpand; bExpand = true; @@ -606,12 +606,12 @@ TQString KConfigBase::readPathEntry( const char *pKey, const TQString& pDefault return aValue; } -TQStringList KConfigBase::readPathListEntry( const TQString& pKey, char sep ) const +TQStringList TDEConfigBase::readPathListEntry( const TQString& pKey, char sep ) const { return readPathListEntry(pKey.utf8().data(), sep); } -TQStringList KConfigBase::readPathListEntry( const char *pKey, char sep ) const +TQStringList TDEConfigBase::readPathListEntry( const char *pKey, char sep ) const { const bool bExpandSave = bExpand; bExpand = true; @@ -620,12 +620,12 @@ TQStringList KConfigBase::readPathListEntry( const char *pKey, char sep ) const return aValue; } -int KConfigBase::readNumEntry( const TQString& pKey, int nDefault) const +int TDEConfigBase::readNumEntry( const TQString& pKey, int nDefault) const { return readNumEntry(pKey.utf8().data(), nDefault); } -int KConfigBase::readNumEntry( const char *pKey, int nDefault) const +int TDEConfigBase::readNumEntry( const char *pKey, int nDefault) const { TQCString aValue = readEntryUtf8( pKey ); if( aValue.isNull() ) @@ -641,12 +641,12 @@ int KConfigBase::readNumEntry( const char *pKey, int nDefault) const } -unsigned int KConfigBase::readUnsignedNumEntry( const TQString& pKey, unsigned int nDefault) const +unsigned int TDEConfigBase::readUnsignedNumEntry( const TQString& pKey, unsigned int nDefault) const { return readUnsignedNumEntry(pKey.utf8().data(), nDefault); } -unsigned int KConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int nDefault) const +unsigned int TDEConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int nDefault) const { TQCString aValue = readEntryUtf8( pKey ); if( aValue.isNull() ) @@ -660,12 +660,12 @@ unsigned int KConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int n } -long KConfigBase::readLongNumEntry( const TQString& pKey, long nDefault) const +long TDEConfigBase::readLongNumEntry( const TQString& pKey, long nDefault) const { return readLongNumEntry(pKey.utf8().data(), nDefault); } -long KConfigBase::readLongNumEntry( const char *pKey, long nDefault) const +long TDEConfigBase::readLongNumEntry( const char *pKey, long nDefault) const { TQCString aValue = readEntryUtf8( pKey ); if( aValue.isNull() ) @@ -679,12 +679,12 @@ long KConfigBase::readLongNumEntry( const char *pKey, long nDefault) const } -unsigned long KConfigBase::readUnsignedLongNumEntry( const TQString& pKey, unsigned long nDefault) const +unsigned long TDEConfigBase::readUnsignedLongNumEntry( const TQString& pKey, unsigned long nDefault) const { return readUnsignedLongNumEntry(pKey.utf8().data(), nDefault); } -unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned long nDefault) const +unsigned long TDEConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned long nDefault) const { TQCString aValue = readEntryUtf8( pKey ); if( aValue.isNull() ) @@ -697,12 +697,12 @@ unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned } } -TQ_INT64 KConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const +TQ_INT64 TDEConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const { return readNum64Entry(pKey.utf8().data(), nDefault); } -TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const +TQ_INT64 TDEConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const { // Note that TQCString::toLongLong() is missing, we muse use a TQString instead. TQString aValue = readEntry( pKey ); @@ -717,12 +717,12 @@ TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const } -TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const +TQ_UINT64 TDEConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const { return readUnsignedNum64Entry(pKey.utf8().data(), nDefault); } -TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const +TQ_UINT64 TDEConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const { // Note that TQCString::toULongLong() is missing, we muse use a TQString instead. TQString aValue = readEntry( pKey ); @@ -736,12 +736,12 @@ TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefa } } -double KConfigBase::readDoubleNumEntry( const TQString& pKey, double nDefault) const +double TDEConfigBase::readDoubleNumEntry( const TQString& pKey, double nDefault) const { return readDoubleNumEntry(pKey.utf8().data(), nDefault); } -double KConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const +double TDEConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const { TQCString aValue = readEntryUtf8( pKey ); if( aValue.isNull() ) @@ -755,12 +755,12 @@ double KConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const } -bool KConfigBase::readBoolEntry( const TQString& pKey, bool bDefault ) const +bool TDEConfigBase::readBoolEntry( const TQString& pKey, bool bDefault ) const { return readBoolEntry(pKey.utf8().data(), bDefault); } -bool KConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const +bool TDEConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const { TQCString aValue = readEntryUtf8( pKey ); @@ -782,12 +782,12 @@ bool KConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const } } -TQFont KConfigBase::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const +TQFont TDEConfigBase::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const { return readFontEntry(pKey.utf8().data(), pDefault); } -TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) const +TQFont TDEConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) const { TQFont aRetFont; @@ -879,12 +879,12 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co } -TQRect KConfigBase::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const +TQRect TDEConfigBase::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const { return readRectEntry(pKey.utf8().data(), pDefault); } -TQRect KConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) const +TQRect TDEConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) const { TQCString aValue = readEntryUtf8(pKey); @@ -903,13 +903,13 @@ TQRect KConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) co } -TQPoint KConfigBase::readPointEntry( const TQString& pKey, +TQPoint TDEConfigBase::readPointEntry( const TQString& pKey, const TQPoint* pDefault ) const { return readPointEntry(pKey.utf8().data(), pDefault); } -TQPoint KConfigBase::readPointEntry( const char *pKey, +TQPoint TDEConfigBase::readPointEntry( const char *pKey, const TQPoint* pDefault ) const { TQCString aValue = readEntryUtf8(pKey); @@ -928,13 +928,13 @@ TQPoint KConfigBase::readPointEntry( const char *pKey, return TQPoint(); } -TQSize KConfigBase::readSizeEntry( const TQString& pKey, +TQSize TDEConfigBase::readSizeEntry( const TQString& pKey, const TQSize* pDefault ) const { return readSizeEntry(pKey.utf8().data(), pDefault); } -TQSize KConfigBase::readSizeEntry( const char *pKey, +TQSize TDEConfigBase::readSizeEntry( const char *pKey, const TQSize* pDefault ) const { TQCString aValue = readEntryUtf8(pKey); @@ -954,13 +954,13 @@ TQSize KConfigBase::readSizeEntry( const char *pKey, } -TQColor KConfigBase::readColorEntry( const TQString& pKey, +TQColor TDEConfigBase::readColorEntry( const TQString& pKey, const TQColor* pDefault ) const { return readColorEntry(pKey.utf8().data(), pDefault); } -TQColor KConfigBase::readColorEntry( const char *pKey, +TQColor TDEConfigBase::readColorEntry( const char *pKey, const TQColor* pDefault ) const { TQColor aRetColor; @@ -1019,14 +1019,14 @@ TQColor KConfigBase::readColorEntry( const char *pKey, } -TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey, +TQDateTime TDEConfigBase::readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault ) const { return readDateTimeEntry(pKey.utf8().data(), pDefault); } // ### currentDateTime() as fallback ? (Harri) -TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, +TQDateTime TDEConfigBase::readDateTimeEntry( const char *pKey, const TQDateTime* pDefault ) const { if( !hasKey( pKey ) ) @@ -1051,7 +1051,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, return TQDateTime::currentDateTime(); } -void KConfigBase::writeEntry( const TQString& pKey, const TQString& value, +void TDEConfigBase::writeEntry( const TQString& pKey, const TQString& value, bool bPersistent, bool bGlobal, bool bNLS ) @@ -1059,7 +1059,7 @@ void KConfigBase::writeEntry( const TQString& pKey, const TQString& value, writeEntry(pKey.utf8().data(), value, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, const TQString& value, +void TDEConfigBase::writeEntry( const char *pKey, const TQString& value, bool bPersistent, bool bGlobal, bool bNLS ) @@ -1067,13 +1067,13 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value, writeEntry(pKey, value, bPersistent, bGlobal, bNLS, false); } -void KConfigBase::writeEntry( const char *pKey, const TQString& value, +void TDEConfigBase::writeEntry( const char *pKey, const TQString& value, bool bPersistent, bool bGlobal, bool bNLS, bool bExpand ) { - // the KConfig object is dirty now + // the TDEConfig object is dirty now // set this before any IO takes place so that if any derivative // classes do caching, they won't try and flush the cache out // from under us before we read. A race condition is still @@ -1100,7 +1100,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value, putData(entryKey, aEntryData, true); } -void KConfigBase::writePathEntry( const TQString& pKey, const TQString & path, +void TDEConfigBase::writePathEntry( const TQString& pKey, const TQString & path, bool bPersistent, bool bGlobal, bool bNLS) { @@ -1171,21 +1171,21 @@ static TQString translatePath( TQString path ) return path; } -void KConfigBase::writePathEntry( const char *pKey, const TQString & path, +void TDEConfigBase::writePathEntry( const char *pKey, const TQString & path, bool bPersistent, bool bGlobal, bool bNLS) { writeEntry(pKey, translatePath(path), bPersistent, bGlobal, bNLS, true); } -void KConfigBase::writePathEntry ( const TQString& pKey, const TQStringList &list, +void TDEConfigBase::writePathEntry ( const TQString& pKey, const TQStringList &list, char sep , bool bPersistent, bool bGlobal, bool bNLS ) { writePathEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS); } -void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list, +void TDEConfigBase::writePathEntry ( const char *pKey, const TQStringList &list, char sep , bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1204,18 +1204,18 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list, writeEntry( pKey, new_list, sep, bPersistent, bGlobal, bNLS, true ); } -void KConfigBase::deleteEntry( const TQString& pKey, +void TDEConfigBase::deleteEntry( const TQString& pKey, bool bNLS, bool bGlobal) { deleteEntry(pKey.utf8().data(), bNLS, bGlobal); } -void KConfigBase::deleteEntry( const char *pKey, +void TDEConfigBase::deleteEntry( const char *pKey, bool bNLS, bool bGlobal) { - // the KConfig object is dirty now + // the TDEConfig object is dirty now // set this before any IO takes place so that if any derivative // classes do caching, they won't try and flush the cache out // from under us before we read. A race condition is still @@ -1237,7 +1237,7 @@ void KConfigBase::deleteEntry( const char *pKey, putData(entryKey, aEntryData, true); } -bool KConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal ) +bool TDEConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal ) { KEntryMap aEntryMap = internalEntryMap(group); @@ -1268,14 +1268,14 @@ bool KConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal ) return true; } -void KConfigBase::writeEntry ( const TQString& pKey, const TQVariant &prop, +void TDEConfigBase::writeEntry ( const TQString& pKey, const TQVariant &prop, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), prop, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop, +void TDEConfigBase::writeEntry ( const char *pKey, const TQVariant &prop, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1391,14 +1391,14 @@ void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop, Q_ASSERT( 0 ); } -void KConfigBase::writeEntry ( const TQString& pKey, const TQStrList &list, +void TDEConfigBase::writeEntry ( const TQString& pKey, const TQStrList &list, char sep , bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, +void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list, char sep , bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1431,21 +1431,21 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry ( const TQString& pKey, const TQStringList &list, +void TDEConfigBase::writeEntry ( const TQString& pKey, const TQStringList &list, char sep , bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, +void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list, char sep , bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey, list, sep, bPersistent, bGlobal, bNLS, false); } -void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, +void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list, char sep, bool bPersistent, bool bGlobal, bool bNLS, bool bExpand ) { @@ -1475,13 +1475,13 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand ); } -void KConfigBase::writeEntry ( const TQString& pKey, const TQValueList &list, +void TDEConfigBase::writeEntry ( const TQString& pKey, const TQValueList &list, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), list, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry ( const char *pKey, const TQValueList &list, +void TDEConfigBase::writeEntry ( const char *pKey, const TQValueList &list, bool bPersistent, bool bGlobal, bool bNLS ) { TQStringList strlist; @@ -1491,14 +1491,14 @@ void KConfigBase::writeEntry ( const char *pKey, const TQValueList &list, writeEntry(pKey, strlist, ',', bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const TQString& pKey, int nValue, +void TDEConfigBase::writeEntry( const TQString& pKey, int nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, int nValue, +void TDEConfigBase::writeEntry( const char *pKey, int nValue, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1506,14 +1506,14 @@ void KConfigBase::writeEntry( const char *pKey, int nValue, } -void KConfigBase::writeEntry( const TQString& pKey, unsigned int nValue, +void TDEConfigBase::writeEntry( const TQString& pKey, unsigned int nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, unsigned int nValue, +void TDEConfigBase::writeEntry( const char *pKey, unsigned int nValue, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1521,14 +1521,14 @@ void KConfigBase::writeEntry( const char *pKey, unsigned int nValue, } -void KConfigBase::writeEntry( const TQString& pKey, long nValue, +void TDEConfigBase::writeEntry( const TQString& pKey, long nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, long nValue, +void TDEConfigBase::writeEntry( const char *pKey, long nValue, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1536,28 +1536,28 @@ void KConfigBase::writeEntry( const char *pKey, long nValue, } -void KConfigBase::writeEntry( const TQString& pKey, unsigned long nValue, +void TDEConfigBase::writeEntry( const TQString& pKey, unsigned long nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, unsigned long nValue, +void TDEConfigBase::writeEntry( const char *pKey, unsigned long nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue, +void TDEConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue, +void TDEConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1565,21 +1565,21 @@ void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue, } -void KConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue, +void TDEConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue, +void TDEConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const TQString& pKey, double nValue, +void TDEConfigBase::writeEntry( const TQString& pKey, double nValue, bool bPersistent, bool bGlobal, char format, int precision, bool bNLS ) @@ -1588,7 +1588,7 @@ void KConfigBase::writeEntry( const TQString& pKey, double nValue, bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, double nValue, +void TDEConfigBase::writeEntry( const char *pKey, double nValue, bool bPersistent, bool bGlobal, char format, int precision, bool bNLS ) @@ -1598,7 +1598,7 @@ void KConfigBase::writeEntry( const char *pKey, double nValue, } -void KConfigBase::writeEntry( const TQString& pKey, bool bValue, +void TDEConfigBase::writeEntry( const TQString& pKey, bool bValue, bool bPersistent, bool bGlobal, bool bNLS ) @@ -1606,7 +1606,7 @@ void KConfigBase::writeEntry( const TQString& pKey, bool bValue, writeEntry(pKey.utf8().data(), bValue, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, bool bValue, +void TDEConfigBase::writeEntry( const char *pKey, bool bValue, bool bPersistent, bool bGlobal, bool bNLS ) @@ -1622,14 +1622,14 @@ void KConfigBase::writeEntry( const char *pKey, bool bValue, } -void KConfigBase::writeEntry( const TQString& pKey, const TQFont& rFont, +void TDEConfigBase::writeEntry( const TQString& pKey, const TQFont& rFont, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), rFont, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, const TQFont& rFont, +void TDEConfigBase::writeEntry( const char *pKey, const TQFont& rFont, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1637,14 +1637,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQFont& rFont, } -void KConfigBase::writeEntry( const TQString& pKey, const TQRect& rRect, +void TDEConfigBase::writeEntry( const TQString& pKey, const TQRect& rRect, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), rRect, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, const TQRect& rRect, +void TDEConfigBase::writeEntry( const char *pKey, const TQRect& rRect, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1659,14 +1659,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQRect& rRect, } -void KConfigBase::writeEntry( const TQString& pKey, const TQPoint& rPoint, +void TDEConfigBase::writeEntry( const TQString& pKey, const TQPoint& rPoint, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), rPoint, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint, +void TDEConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1679,14 +1679,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint, } -void KConfigBase::writeEntry( const TQString& pKey, const TQSize& rSize, +void TDEConfigBase::writeEntry( const TQString& pKey, const TQSize& rSize, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), rSize, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, const TQSize& rSize, +void TDEConfigBase::writeEntry( const char *pKey, const TQSize& rSize, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1698,7 +1698,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQSize& rSize, writeEntry( pKey, list, ',', bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor, +void TDEConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor, bool bPersistent, bool bGlobal, bool bNLS ) @@ -1706,7 +1706,7 @@ void KConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor, writeEntry( pKey.utf8().data(), rColor, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, const TQColor& rColor, +void TDEConfigBase::writeEntry( const char *pKey, const TQColor& rColor, bool bPersistent, bool bGlobal, bool bNLS ) @@ -1720,14 +1720,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQColor& rColor, writeEntry( pKey, aValue, bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const TQString& pKey, const TQDateTime& rDateTime, +void TDEConfigBase::writeEntry( const TQString& pKey, const TQDateTime& rDateTime, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry(pKey.utf8().data(), rDateTime, bPersistent, bGlobal, bNLS); } -void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, +void TDEConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1748,7 +1748,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, writeEntry( pKey, list, ',', bPersistent, bGlobal, bNLS ); } -void KConfigBase::parseConfigFiles() +void TDEConfigBase::parseConfigFiles() { if (!bLocaleInitialized && TDEGlobal::_locale) { setLocale(); @@ -1760,7 +1760,7 @@ void KConfigBase::parseConfigFiles() } } -void KConfigBase::sync() +void TDEConfigBase::sync() { if (isReadOnly()) return; @@ -1771,35 +1771,35 @@ void KConfigBase::sync() rollback(); } -KConfigBase::ConfigState KConfigBase::getConfigState() const { +TDEConfigBase::ConfigState TDEConfigBase::getConfigState() const { if (backEnd) return backEnd->getConfigState(); return ReadOnly; } -void KConfigBase::rollback( bool /*bDeep = true*/ ) +void TDEConfigBase::rollback( bool /*bDeep = true*/ ) { bDirty = false; } -void KConfigBase::setReadDefaults(bool b) +void TDEConfigBase::setReadDefaults(bool b) { if (!d) { if (!b) return; - d = new KConfigBasePrivate(); + d = new TDEConfigBasePrivate(); } d->readDefaults = b; } -bool KConfigBase::readDefaults() const +bool TDEConfigBase::readDefaults() const { return (d && d->readDefaults); } -void KConfigBase::revertToDefault(const TQString &key) +void TDEConfigBase::revertToDefault(const TQString &key) { setDirty(true); @@ -1826,7 +1826,7 @@ void KConfigBase::revertToDefault(const TQString &key) putData(aEntryKey, entry, true); // Revert } -bool KConfigBase::hasDefault(const TQString &key) const +bool TDEConfigBase::hasDefault(const TQString &key) const { KEntryKey aEntryKey(mGroup, key.utf8()); aEntryKey.bDefault = true; @@ -1851,7 +1851,7 @@ bool KConfigBase::hasDefault(const TQString &key) const -KConfigGroup::KConfigGroup(KConfigBase *master, const TQString &group) +TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const TQString &group) { mMaster = master; backEnd = mMaster->backEnd; // Needed for getConfigState() @@ -1864,7 +1864,7 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const TQString &group) setReadDefaults(mMaster->readDefaults()); } -KConfigGroup::KConfigGroup(KConfigBase *master, const TQCString &group) +TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const TQCString &group) { mMaster = master; backEnd = mMaster->backEnd; // Needed for getConfigState() @@ -1877,7 +1877,7 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const TQCString &group) setReadDefaults(mMaster->readDefaults()); } -KConfigGroup::KConfigGroup(KConfigBase *master, const char * group) +TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const char * group) { mMaster = master; backEnd = mMaster->backEnd; // Needed for getConfigState() @@ -1890,43 +1890,43 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const char * group) setReadDefaults(mMaster->readDefaults()); } -void KConfigGroup::deleteGroup(bool bGlobal) +void TDEConfigGroup::deleteGroup(bool bGlobal) { - mMaster->deleteGroup(KConfigBase::group(), true, bGlobal); + mMaster->deleteGroup(TDEConfigBase::group(), true, bGlobal); } -bool KConfigGroup::groupIsImmutable() const +bool TDEConfigGroup::groupIsImmutable() const { - return mMaster->groupIsImmutable(KConfigBase::group()); + return mMaster->groupIsImmutable(TDEConfigBase::group()); } -void KConfigGroup::setDirty(bool _bDirty) +void TDEConfigGroup::setDirty(bool _bDirty) { mMaster->setDirty(_bDirty); } -void KConfigGroup::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup) +void TDEConfigGroup::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup) { mMaster->putData(_key, _data, _checkGroup); } -KEntry KConfigGroup::lookupData(const KEntryKey &_key) const +KEntry TDEConfigGroup::lookupData(const KEntryKey &_key) const { return mMaster->lookupData(_key); } -void KConfigGroup::sync() +void TDEConfigGroup::sync() { mMaster->sync(); } -void KConfigBase::virtual_hook( int, void* ) +void TDEConfigBase::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -void KConfigGroup::virtual_hook( int id, void* data ) -{ KConfigBase::virtual_hook( id, data ); } +void TDEConfigGroup::virtual_hook( int id, void* data ) +{ TDEConfigBase::virtual_hook( id, data ); } -bool KConfigBase::checkConfigFilesWritable(bool warnUser) +bool TDEConfigBase::checkConfigFilesWritable(bool warnUser) { if (backEnd) return backEnd->checkConfigFilesWritable(warnUser); diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h index 1818aadb5..ff02babdd 100644 --- a/tdecore/kconfigbase.h +++ b/tdecore/kconfigbase.h @@ -35,16 +35,16 @@ #include "kconfigdata.h" #include "tdelibs_export.h" -class KConfigBackEnd; -class KConfigBasePrivate; -class KConfigGroup; +class TDEConfigBackEnd; +class TDEConfigBasePrivate; +class TDEConfigGroup; /** * @short KDE Configuration Management abstract base class * * This class forms the base for all %KDE configuration. It is an * abstract base class, meaning that you cannot directly instantiate - * objects of this class. Either use KConfig (for usual %KDE + * objects of this class. Either use TDEConfig (for usual %KDE * configuration) or KSimpleConfig (for special needs as in ksamba), or * even KSharedConfig (stores values in shared memory). * @@ -53,7 +53,7 @@ class KConfigGroup; * entries that do not explicitly specify which group they are in are * in a special group called the default group. * - * If there is a $ character in an entry, KConfigBase tries to expand + * If there is a $ character in an entry, TDEConfigBase tries to expand * environment variable and uses its value instead of its name. You * can avoid this feature by having two consecutive $ characters in * your config file which get expanded to one. @@ -63,29 +63,29 @@ class KConfigGroup; * * @author Kalle Dalheimer , Preston Brown * @see TDEGlobal#config() - * @see KConfig + * @see TDEConfig * @see KSimpleConfig * @see KSharedConfig */ -class TDECORE_EXPORT KConfigBase : public TQObject +class TDECORE_EXPORT TDEConfigBase : public TQObject { Q_OBJECT - friend class KConfigBackEnd; - friend class KConfigINIBackEnd; - friend class KConfigGroup; + friend class TDEConfigBackEnd; + friend class TDEConfigINIBackEnd; + friend class TDEConfigGroup; public: /** - * Construct a KConfigBase object. + * Construct a TDEConfigBase object. */ - KConfigBase(); + TDEConfigBase(); /** - * Destructs the KConfigBase object. + * Destructs the TDEConfigBase object. */ - virtual ~KConfigBase(); + virtual ~TDEConfigBase(); /** * Specifies the group in which keys will be read and written. @@ -1670,7 +1670,7 @@ public: /** - * Turns on or off "dollar expansion" (see KConfigBase introduction) + * Turns on or off "dollar expansion" (see TDEConfigBase introduction) * when reading config entries. * Dollar sign expansion is initially OFF. * @@ -1688,13 +1688,13 @@ public: /** * Mark the config object as "clean," i.e. don't write dirty entries * at destruction time. If @p bDeep is false, only the global dirty - * flag of the KConfig object gets cleared. If you then call + * flag of the TDEConfig object gets cleared. If you then call * writeEntry() again, the global dirty flag is set again and all * dirty entries will be written at a subsequent sync() call. * - * Classes that derive from KConfigBase should override this + * Classes that derive from TDEConfigBase should override this * method and implement storage-specific behavior, as well as - * calling the KConfigBase::rollback() explicitly in the initializer. + * calling the TDEConfigBase::rollback() explicitly in the initializer. * * @param bDeep If true, the dirty flags of all entries are cleared, * as well as the global dirty flag. @@ -1901,7 +1901,7 @@ protected: /** * Parses all configuration files for a configuration object. * - * The actual parsing is done by the associated KConfigBackEnd. + * The actual parsing is done by the associated TDEConfigBackEnd. */ virtual void parseConfigFiles(); @@ -1937,7 +1937,7 @@ protected: /** * Inserts a (key/value) pair into the internal storage mechanism of - * the configuration object. Classes that derive from KConfigBase + * the configuration object. Classes that derive from TDEConfigBase * will need to implement this method in a storage-specific manner. * * Do not use this function, the implementation / return type are @@ -1954,7 +1954,7 @@ protected: /** * Looks up an entry in the config object's internal structure. - * Classes that derive from KConfigBase will need to implement this + * Classes that derive from TDEConfigBase will need to implement this * method in a storage-specific manner. * * Do not use this function, the implementation and return type are @@ -1973,7 +1973,7 @@ protected: /** * A back end for loading/saving to disk in a particular format. */ - KConfigBackEnd *backEnd; + TDEConfigBackEnd *backEnd; public: /** * Overloaded public methods: @@ -2008,8 +2008,8 @@ protected: protected: virtual void virtual_hook( int id, void* data ); private: - class KConfigBasePrivate; - KConfigBasePrivate *d; + class TDEConfigBasePrivate; + TDEConfigBasePrivate *d; void writeEntry( const char *pKey, const TQString &rValue, bool bPersistent, bool bGlobal, bool bNLS, bool bExpand ); @@ -2018,14 +2018,14 @@ private: }; -class KConfigGroupSaverPrivate; +class TDEConfigGroupSaverPrivate; /** - * Helper class to facilitate working with KConfig / KSimpleConfig + * Helper class to facilitate working with TDEConfig / KSimpleConfig * groups. * * Careful programmers always set the group of a - * KConfig KSimpleConfig object to the group they want to read from + * TDEConfig KSimpleConfig object to the group they want to read from * and set it back to the old one of afterwards. This is usually * written as: * \code @@ -2039,82 +2039,82 @@ class KConfigGroupSaverPrivate; * \endcode * * In order to facilitate this task, you can use - * KConfigGroupSaver. Simply construct such an object ON THE STACK + * TDEConfigGroupSaver. Simply construct such an object ON THE STACK * when you want to switch to a new group. Then, when the object goes * out of scope, the group will automatically be restored. If you * want to use several different groups within a function or method, - * you can still use KConfigGroupSaver: Simply enclose all work with - * one group (including the creation of the KConfigGroupSaver object) + * you can still use TDEConfigGroupSaver: Simply enclose all work with + * one group (including the creation of the TDEConfigGroupSaver object) * in one block. * * @deprecated This class is deprecated and will be removed in KDE 4. - * KConfigGroup provides similar functionality in a more object oriented + * TDEConfigGroup provides similar functionality in a more object oriented * way. * * @author Matthias Kalle Dalheimer - * @see KConfigBase, KConfig, KSimpleConfig, KConfigGroup - * @short Helper class for easier use of KConfig/KSimpleConfig groups + * @see TDEConfigBase, TDEConfig, KSimpleConfig, TDEConfigGroup + * @short Helper class for easier use of TDEConfig/KSimpleConfig groups */ -class TDECORE_EXPORT KConfigGroupSaver // KDE4 remove +class TDECORE_EXPORT TDEConfigGroupSaver // KDE4 remove { public: /** - * Constructor. You pass a pointer to the KConfigBase-derived + * Constructor. You pass a pointer to the TDEConfigBase-derived * object you want to work with and a string indicating the _new_ * group. * - * @param config The KConfigBase-derived object this - * KConfigGroupSaver works on. + * @param config The TDEConfigBase-derived object this + * TDEConfigGroupSaver works on. * @param group The new group that the config object should switch to. */ - KConfigGroupSaver( KConfigBase* config, TQString group ) + TDEConfigGroupSaver( TDEConfigBase* config, TQString group ) /* KDE 4 : make the second parameter const TQString & */ : _config(config), _oldgroup(config->group()) { _config->setGroup( group ); } - KConfigGroupSaver( KConfigBase* config, const char *group ) + TDEConfigGroupSaver( TDEConfigBase* config, const char *group ) : _config(config), _oldgroup(config->group()) { _config->setGroup( group ); } - KConfigGroupSaver( KConfigBase* config, const TQCString &group ) + TDEConfigGroupSaver( TDEConfigBase* config, const TQCString &group ) : _config(config), _oldgroup(config->group()) { _config->setGroup( group ); } - ~KConfigGroupSaver() { _config->setGroup( _oldgroup ); } + ~TDEConfigGroupSaver() { _config->setGroup( _oldgroup ); } - KConfigBase* config() { return _config; }; + TDEConfigBase* config() { return _config; }; private: - KConfigBase* _config; + TDEConfigBase* _config; TQString _oldgroup; - KConfigGroupSaver(const KConfigGroupSaver&); - KConfigGroupSaver& operator=(const KConfigGroupSaver&); + TDEConfigGroupSaver(const TDEConfigGroupSaver&); + TDEConfigGroupSaver& operator=(const TDEConfigGroupSaver&); - KConfigGroupSaverPrivate *d; + TDEConfigGroupSaverPrivate *d; }; -class KConfigGroupPrivate; +class TDEConfigGroupPrivate; /** - * A KConfigBase derived class for one specific group in a KConfig object. + * A TDEConfigBase derived class for one specific group in a TDEConfig object. */ -class TDECORE_EXPORT KConfigGroup: public KConfigBase +class TDECORE_EXPORT TDEConfigGroup: public TDEConfigBase { public: /** * Construct a config group corresponding to @p group in @p master. * @p group is the group name encoded in UTF-8. */ - KConfigGroup(KConfigBase *master, const TQCString &group); + TDEConfigGroup(TDEConfigBase *master, const TQCString &group); /** * This is an overloaded constructor provided for convenience. * It behaves essentially like the above function. * * Construct a config group corresponding to @p group in @p master */ - KConfigGroup(KConfigBase *master, const TQString &group); + TDEConfigGroup(TDEConfigBase *master, const TQString &group); /** * This is an overloaded constructor provided for convenience. * It behaves essentially like the above function. @@ -2122,7 +2122,7 @@ public: * Construct a config group corresponding to @p group in @p master * @p group is the group name encoded in UTF-8. */ - KConfigGroup(KConfigBase *master, const char * group); + TDEConfigGroup(TDEConfigBase *master, const char * group); /** * Delete all entries in the entire group @@ -2170,11 +2170,11 @@ private: void getConfigState() { } - KConfigBase *mMaster; + TDEConfigBase *mMaster; protected: virtual void virtual_hook( int id, void* data ); private: - KConfigGroupPrivate* d; + TDEConfigGroupPrivate* d; }; #endif diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/kconfigdialogmanager.cpp index 82567ca0b..dfb81853b 100644 --- a/tdecore/kconfigdialogmanager.cpp +++ b/tdecore/kconfigdialogmanager.cpp @@ -37,7 +37,7 @@ #include -class KConfigDialogManager::Private { +class TDEConfigDialogManager::Private { public: Private() : insideGroupBox(false) { } @@ -48,7 +48,7 @@ public: bool insideGroupBox; }; -KConfigDialogManager::KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name) +TDEConfigDialogManager::TDEConfigDialogManager(TQWidget *parent, TDEConfigSkeleton *conf, const char *name) : TQObject(parent, name), m_conf(conf), m_dialog(parent) { d = new Private(); @@ -59,12 +59,12 @@ KConfigDialogManager::KConfigDialogManager(TQWidget *parent, KConfigSkeleton *co init(true); } -KConfigDialogManager::~KConfigDialogManager() +TDEConfigDialogManager::~TDEConfigDialogManager() { delete d; } -void KConfigDialogManager::init(bool trackChanges) +void TDEConfigDialogManager::init(bool trackChanges) { if(trackChanges) { @@ -121,12 +121,12 @@ void KConfigDialogManager::init(bool trackChanges) (void) parseChildren(m_dialog, trackChanges); } -void KConfigDialogManager::addWidget(TQWidget *widget) +void TDEConfigDialogManager::addWidget(TQWidget *widget) { (void) parseChildren(widget, true); } -void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *item) +void TDEConfigDialogManager::setupWidget(TQWidget *widget, TDEConfigSkeletonItem *item) { TQVariant minValue = item->minValue(); if (minValue.isValid()) @@ -150,7 +150,7 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it } } -bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges) +bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges) { bool valueChanged = false; const TQObjectList listOfChildren = widget->childrenListObject(); @@ -174,7 +174,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang { // This is one of our widgets! TQString configId = widgetName+5; - KConfigSkeletonItem *item = m_conf->findItem(configId); + TDEConfigSkeletonItem *item = m_conf->findItem(configId); if (item) { d->knownWidget.insert(configId, childWidget); @@ -187,7 +187,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang { // If the class name of the widget wasn't in the monitored widgets map, then look for // it again using the super class name. This fixes a problem with using QtRuby/Korundum - // widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even + // widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even // though it was a 'QWidget'. changedIt = changedMap.find(childWidget->metaObject()->superClassName()); } @@ -256,7 +256,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang return valueChanged; } -void KConfigDialogManager::updateWidgets() +void TDEConfigDialogManager::updateWidgets() { bool changed = false; bool bSignalsBlocked = signalsBlocked(); @@ -266,7 +266,7 @@ void KConfigDialogManager::updateWidgets() for( TQDictIterator it( d->knownWidget ); (widget = it.current()); ++it ) { - KConfigSkeletonItem *item = m_conf->findItem(it.currentKey()); + TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey()); if (!item) { kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl; @@ -294,14 +294,14 @@ void KConfigDialogManager::updateWidgets() TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified())); } -void KConfigDialogManager::updateWidgetsDefault() +void TDEConfigDialogManager::updateWidgetsDefault() { bool bUseDefaults = m_conf->useDefaults(true); updateWidgets(); m_conf->useDefaults(bUseDefaults); } -void KConfigDialogManager::updateSettings() +void TDEConfigDialogManager::updateSettings() { bool changed = false; @@ -309,7 +309,7 @@ void KConfigDialogManager::updateSettings() for( TQDictIterator it( d->knownWidget ); (widget = it.current()); ++it ) { - KConfigSkeletonItem *item = m_conf->findItem(it.currentKey()); + TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey()); if (!item) { kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl; @@ -330,7 +330,7 @@ void KConfigDialogManager::updateSettings() } } -void KConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v) +void TDEConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v) { TQButtonGroup *bg = dynamic_cast(w); if (bg) @@ -349,7 +349,7 @@ void KConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v) propertyMap->setProperty(w, v); } -TQVariant KConfigDialogManager::property(TQWidget *w) +TQVariant TDEConfigDialogManager::property(TQWidget *w) { TQButtonGroup *bg = dynamic_cast(w); if (bg) @@ -362,14 +362,14 @@ TQVariant KConfigDialogManager::property(TQWidget *w) return propertyMap->property(w); } -bool KConfigDialogManager::hasChanged() +bool TDEConfigDialogManager::hasChanged() { TQWidget *widget; for( TQDictIterator it( d->knownWidget ); (widget = it.current()); ++it ) { - KConfigSkeletonItem *item = m_conf->findItem(it.currentKey()); + TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey()); if (!item) { kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl; @@ -386,7 +386,7 @@ bool KConfigDialogManager::hasChanged() return false; } -bool KConfigDialogManager::isDefault() +bool TDEConfigDialogManager::isDefault() { bool bUseDefaults = m_conf->useDefaults(true); bool result = !hasChanged(); diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/kconfigdialogmanager.h index cc2238d4c..1b82e9eda 100644 --- a/tdecore/kconfigdialogmanager.h +++ b/tdecore/kconfigdialogmanager.h @@ -25,28 +25,28 @@ #include #include "tdelibs_export.h" -class KConfigSkeleton; -class KConfigSkeletonItem; +class TDEConfigSkeleton; +class TDEConfigSkeletonItem; class TQWidget; class TQSqlPropertyMap; /** * @short Provides a means of automatically retrieving, - * saving and resetting KConfigSkeleton based settings in a dialog. + * saving and resetting TDEConfigSkeleton based settings in a dialog. * - * The KConfigDialogManager class provides a means of automatically + * The TDEConfigDialogManager class provides a means of automatically * retrieving, saving and resetting basic settings. * It also can emit signals when settings have been changed * (settings were saved) or modified (the user changes a checkbox * from on to off). * * The names of the widgets to be managed have to correspond to the names of the - * configuration entries in the KConfigSkeleton object plus an additional + * configuration entries in the TDEConfigSkeleton object plus an additional * "kcfg_" prefix. For example a widget named "kcfg_MyOption" would be * associated to the configuration entry "MyOption". * - * KConfigDialogManager uses the TQSqlPropertyMap class to determine if it can do - * anything to a widget. Note that KConfigDialogManager doesn't require a + * TDEConfigDialogManager uses the TQSqlPropertyMap class to determine if it can do + * anything to a widget. Note that TDEConfigDialogManager doesn't require a * database, it simply uses the functionality that is built into the * TQSqlPropertyMap class. New widgets can be added to the map using * TQSqlPropertyMap::installDefaultMap(). Note that you can't just add any @@ -75,7 +75,7 @@ class TQSqlPropertyMap; * @author Benjamin C Meyer * @author Waldo Bastian */ -class TDECORE_EXPORT KConfigDialogManager : public TQObject { +class TDECORE_EXPORT TDEConfigDialogManager : public TQObject { Q_OBJECT @@ -114,12 +114,12 @@ public: * @param conf Object that contains settings * @param name - Object name. */ - KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name=0); + TDEConfigDialogManager(TQWidget *parent, TDEConfigSkeleton *conf, const char *name=0); /** * Destructor. */ - ~KConfigDialogManager(); + ~TDEConfigDialogManager(); /** * Add additional widgets to manage @@ -200,13 +200,13 @@ protected: /** * Setup secondary widget properties */ - void setupWidget(TQWidget *widget, KConfigSkeletonItem *item); + void setupWidget(TQWidget *widget, TDEConfigSkeletonItem *item); protected: /** - * KConfigSkeleton object used to store settings + * TDEConfigSkeleton object used to store settings */ - KConfigSkeleton *m_conf; + TDEConfigSkeleton *m_conf; /** * Dialog being managed @@ -226,7 +226,7 @@ protected: private: class Private; /** - * KConfigDialogManager Private class. + * TDEConfigDialogManager Private class. */ Private *d; diff --git a/tdecore/kconfigskeleton.cpp b/tdecore/kconfigskeleton.cpp index ee873eca2..afc45bb87 100644 --- a/tdecore/kconfigskeleton.cpp +++ b/tdecore/kconfigskeleton.cpp @@ -32,22 +32,22 @@ #include "kconfigskeleton.h" -void KConfigSkeletonItem::readImmutability( KConfig *config ) +void TDEConfigSkeletonItem::readImmutability( TDEConfig *config ) { mIsImmutable = config->entryIsImmutable( mKey ); } -KConfigSkeleton::ItemString::ItemString( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemString::ItemString( const TQString &group, const TQString &key, TQString &reference, const TQString &defaultValue, Type type ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ), + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ), mType( type ) { } -void KConfigSkeleton::ItemString::writeConfig( KConfig *config ) +void TDEConfigSkeleton::ItemString::writeConfig( TDEConfig *config ) { if ( mReference != mLoadedValue ) // WABA: Is this test needed? { @@ -64,7 +64,7 @@ void KConfigSkeleton::ItemString::writeConfig( KConfig *config ) } -void KConfigSkeleton::ItemString::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemString::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); @@ -88,39 +88,39 @@ void KConfigSkeleton::ItemString::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemString::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemString::setProperty(const TQVariant & p) { mReference = p.toString(); } -TQVariant KConfigSkeleton::ItemString::property() const +TQVariant TDEConfigSkeleton::ItemString::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemPassword::ItemPassword( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemPassword::ItemPassword( const TQString &group, const TQString &key, TQString &reference, const TQString &defaultValue) : ItemString( group, key, reference, defaultValue, Password ) { } -KConfigSkeleton::ItemPath::ItemPath( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemPath::ItemPath( const TQString &group, const TQString &key, TQString &reference, const TQString &defaultValue) : ItemString( group, key, reference, defaultValue, Path ) { } -KConfigSkeleton::ItemProperty::ItemProperty( const TQString &group, +TDEConfigSkeleton::ItemProperty::ItemProperty( const TQString &group, const TQString &key, TQVariant &reference, TQVariant defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemProperty::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemProperty::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readPropertyEntry( mKey, mDefault ); @@ -129,23 +129,23 @@ void KConfigSkeleton::ItemProperty::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemProperty::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemProperty::setProperty(const TQVariant & p) { mReference = p; } -TQVariant KConfigSkeleton::ItemProperty::property() const +TQVariant TDEConfigSkeleton::ItemProperty::property() const { return mReference; } -KConfigSkeleton::ItemBool::ItemBool( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemBool::ItemBool( const TQString &group, const TQString &key, bool &reference, bool defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemBool::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemBool::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readBoolEntry( mKey, mDefault ); @@ -154,25 +154,25 @@ void KConfigSkeleton::ItemBool::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemBool::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemBool::setProperty(const TQVariant & p) { mReference = p.toBool(); } -TQVariant KConfigSkeleton::ItemBool::property() const +TQVariant TDEConfigSkeleton::ItemBool::property() const { return TQVariant( mReference, 42 /* dummy */ ); } -KConfigSkeleton::ItemInt::ItemInt( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemInt::ItemInt( const TQString &group, const TQString &key, int &reference, int defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } -void KConfigSkeleton::ItemInt::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemInt::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readNumEntry( mKey, mDefault ); @@ -185,51 +185,51 @@ void KConfigSkeleton::ItemInt::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemInt::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemInt::setProperty(const TQVariant & p) { mReference = p.toInt(); } -TQVariant KConfigSkeleton::ItemInt::property() const +TQVariant TDEConfigSkeleton::ItemInt::property() const { return TQVariant(mReference); } -TQVariant KConfigSkeleton::ItemInt::minValue() const +TQVariant TDEConfigSkeleton::ItemInt::minValue() const { if (mHasMin) return TQVariant(mMin); return TQVariant(); } -TQVariant KConfigSkeleton::ItemInt::maxValue() const +TQVariant TDEConfigSkeleton::ItemInt::maxValue() const { if (mHasMax) return TQVariant(mMax); return TQVariant(); } -void KConfigSkeleton::ItemInt::setMinValue(int v) +void TDEConfigSkeleton::ItemInt::setMinValue(int v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemInt::setMaxValue(int v) +void TDEConfigSkeleton::ItemInt::setMaxValue(int v) { mHasMax = true; mMax = v; } -KConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key, TQ_INT64 &reference, TQ_INT64 defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } -void KConfigSkeleton::ItemInt64::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemInt64::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readNum64Entry( mKey, mDefault ); @@ -242,43 +242,43 @@ void KConfigSkeleton::ItemInt64::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemInt64::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemInt64::setProperty(const TQVariant & p) { mReference = p.toLongLong(); } -TQVariant KConfigSkeleton::ItemInt64::property() const +TQVariant TDEConfigSkeleton::ItemInt64::property() const { return TQVariant(mReference); } -TQVariant KConfigSkeleton::ItemInt64::minValue() const +TQVariant TDEConfigSkeleton::ItemInt64::minValue() const { if (mHasMin) return TQVariant(mMin); return TQVariant(); } -TQVariant KConfigSkeleton::ItemInt64::maxValue() const +TQVariant TDEConfigSkeleton::ItemInt64::maxValue() const { if (mHasMax) return TQVariant(mMax); return TQVariant(); } -void KConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v) +void TDEConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v) +void TDEConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v) { mHasMax = true; mMax = v; } -KConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key, int &reference, const TQValueList &choices, int defaultValue ) @@ -286,7 +286,7 @@ KConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key, { } -void KConfigSkeleton::ItemEnum::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemEnum::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); if (!config->hasKey(mKey)) @@ -315,7 +315,7 @@ void KConfigSkeleton::ItemEnum::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemEnum::writeConfig( KConfig *config ) +void TDEConfigSkeleton::ItemEnum::writeConfig( TDEConfig *config ) { if ( mReference != mLoadedValue ) // WABA: Is this test needed? { @@ -329,21 +329,21 @@ void KConfigSkeleton::ItemEnum::writeConfig( KConfig *config ) } } -TQValueList KConfigSkeleton::ItemEnum::choices() const +TQValueList TDEConfigSkeleton::ItemEnum::choices() const { return mChoices; } -KConfigSkeleton::ItemUInt::ItemUInt( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemUInt::ItemUInt( const TQString &group, const TQString &key, unsigned int &reference, unsigned int defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } -void KConfigSkeleton::ItemUInt::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemUInt::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readUnsignedNumEntry( mKey, mDefault ); @@ -356,51 +356,51 @@ void KConfigSkeleton::ItemUInt::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemUInt::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemUInt::setProperty(const TQVariant & p) { mReference = p.toUInt(); } -TQVariant KConfigSkeleton::ItemUInt::property() const +TQVariant TDEConfigSkeleton::ItemUInt::property() const { return TQVariant(mReference); } -TQVariant KConfigSkeleton::ItemUInt::minValue() const +TQVariant TDEConfigSkeleton::ItemUInt::minValue() const { if (mHasMin) return TQVariant(mMin); return TQVariant(); } -TQVariant KConfigSkeleton::ItemUInt::maxValue() const +TQVariant TDEConfigSkeleton::ItemUInt::maxValue() const { if (mHasMax) return TQVariant(mMax); return TQVariant(); } -void KConfigSkeleton::ItemUInt::setMinValue(unsigned int v) +void TDEConfigSkeleton::ItemUInt::setMinValue(unsigned int v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemUInt::setMaxValue(unsigned int v) +void TDEConfigSkeleton::ItemUInt::setMaxValue(unsigned int v) { mHasMax = true; mMax = v; } -KConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key, TQ_UINT64 &reference, TQ_UINT64 defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } -void KConfigSkeleton::ItemUInt64::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemUInt64::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readUnsignedNum64Entry( mKey, mDefault ); @@ -413,50 +413,50 @@ void KConfigSkeleton::ItemUInt64::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemUInt64::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemUInt64::setProperty(const TQVariant & p) { mReference = p.toULongLong(); } -TQVariant KConfigSkeleton::ItemUInt64::property() const +TQVariant TDEConfigSkeleton::ItemUInt64::property() const { return TQVariant(mReference); } -TQVariant KConfigSkeleton::ItemUInt64::minValue() const +TQVariant TDEConfigSkeleton::ItemUInt64::minValue() const { if (mHasMin) return TQVariant(mMin); return TQVariant(); } -TQVariant KConfigSkeleton::ItemUInt64::maxValue() const +TQVariant TDEConfigSkeleton::ItemUInt64::maxValue() const { if (mHasMax) return TQVariant(mMax); return TQVariant(); } -void KConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v) +void TDEConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v) +void TDEConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v) { mHasMax = true; mMax = v; } -KConfigSkeleton::ItemLong::ItemLong( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemLong::ItemLong( const TQString &group, const TQString &key, long &reference, long defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } -void KConfigSkeleton::ItemLong::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemLong::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readLongNumEntry( mKey, mDefault ); @@ -469,52 +469,52 @@ void KConfigSkeleton::ItemLong::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemLong::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemLong::setProperty(const TQVariant & p) { mReference = p.toLongLong(); } -TQVariant KConfigSkeleton::ItemLong::property() const +TQVariant TDEConfigSkeleton::ItemLong::property() const { return TQVariant((TQ_LLONG) mReference); } -TQVariant KConfigSkeleton::ItemLong::minValue() const +TQVariant TDEConfigSkeleton::ItemLong::minValue() const { if (mHasMin) return TQVariant((TQ_LLONG) mMin); return TQVariant(); } -TQVariant KConfigSkeleton::ItemLong::maxValue() const +TQVariant TDEConfigSkeleton::ItemLong::maxValue() const { if (mHasMax) return TQVariant((TQ_LLONG) mMax); return TQVariant(); } -void KConfigSkeleton::ItemLong::setMinValue(long v) +void TDEConfigSkeleton::ItemLong::setMinValue(long v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemLong::setMaxValue(long v) +void TDEConfigSkeleton::ItemLong::setMaxValue(long v) { mHasMax = true; mMax = v; } -KConfigSkeleton::ItemULong::ItemULong( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemULong::ItemULong( const TQString &group, const TQString &key, unsigned long &reference, unsigned long defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } -void KConfigSkeleton::ItemULong::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemULong::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readUnsignedLongNumEntry( mKey, mDefault ); @@ -527,51 +527,51 @@ void KConfigSkeleton::ItemULong::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemULong::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemULong::setProperty(const TQVariant & p) { mReference = p.toULongLong(); } -TQVariant KConfigSkeleton::ItemULong::property() const +TQVariant TDEConfigSkeleton::ItemULong::property() const { return TQVariant((TQ_ULLONG) mReference); } -TQVariant KConfigSkeleton::ItemULong::minValue() const +TQVariant TDEConfigSkeleton::ItemULong::minValue() const { if (mHasMin) return TQVariant((TQ_ULLONG) mMin); return TQVariant(); } -TQVariant KConfigSkeleton::ItemULong::maxValue() const +TQVariant TDEConfigSkeleton::ItemULong::maxValue() const { if (mHasMax) return TQVariant((TQ_ULLONG) mMax); return TQVariant(); } -void KConfigSkeleton::ItemULong::setMinValue(unsigned long v) +void TDEConfigSkeleton::ItemULong::setMinValue(unsigned long v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemULong::setMaxValue(unsigned long v) +void TDEConfigSkeleton::ItemULong::setMaxValue(unsigned long v) { mHasMax = true; mMax = v; } -KConfigSkeleton::ItemDouble::ItemDouble( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemDouble::ItemDouble( const TQString &group, const TQString &key, double &reference, double defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } -void KConfigSkeleton::ItemDouble::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemDouble::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readDoubleNumEntry( mKey, mDefault ); @@ -584,51 +584,51 @@ void KConfigSkeleton::ItemDouble::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemDouble::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemDouble::setProperty(const TQVariant & p) { mReference = p.toDouble(); } -TQVariant KConfigSkeleton::ItemDouble::property() const +TQVariant TDEConfigSkeleton::ItemDouble::property() const { return TQVariant(mReference); } -TQVariant KConfigSkeleton::ItemDouble::minValue() const +TQVariant TDEConfigSkeleton::ItemDouble::minValue() const { if (mHasMin) return TQVariant(mMin); return TQVariant(); } -TQVariant KConfigSkeleton::ItemDouble::maxValue() const +TQVariant TDEConfigSkeleton::ItemDouble::maxValue() const { if (mHasMax) return TQVariant(mMax); return TQVariant(); } -void KConfigSkeleton::ItemDouble::setMinValue(double v) +void TDEConfigSkeleton::ItemDouble::setMinValue(double v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemDouble::setMaxValue(double v) +void TDEConfigSkeleton::ItemDouble::setMaxValue(double v) { mHasMax = true; mMax = v; } -KConfigSkeleton::ItemColor::ItemColor( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemColor::ItemColor( const TQString &group, const TQString &key, TQColor &reference, const TQColor &defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemColor::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemColor::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readColorEntry( mKey, &mDefault ); @@ -637,25 +637,25 @@ void KConfigSkeleton::ItemColor::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemColor::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemColor::setProperty(const TQVariant & p) { mReference = p.toColor(); } -TQVariant KConfigSkeleton::ItemColor::property() const +TQVariant TDEConfigSkeleton::ItemColor::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemFont::ItemFont( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemFont::ItemFont( const TQString &group, const TQString &key, TQFont &reference, const TQFont &defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemFont::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemFont::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readFontEntry( mKey, &mDefault ); @@ -664,25 +664,25 @@ void KConfigSkeleton::ItemFont::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemFont::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemFont::setProperty(const TQVariant & p) { mReference = p.toFont(); } -TQVariant KConfigSkeleton::ItemFont::property() const +TQVariant TDEConfigSkeleton::ItemFont::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemRect::ItemRect( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemRect::ItemRect( const TQString &group, const TQString &key, TQRect &reference, const TQRect &defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemRect::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemRect::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readRectEntry( mKey, &mDefault ); @@ -691,25 +691,25 @@ void KConfigSkeleton::ItemRect::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemRect::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemRect::setProperty(const TQVariant & p) { mReference = p.toRect(); } -TQVariant KConfigSkeleton::ItemRect::property() const +TQVariant TDEConfigSkeleton::ItemRect::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemPoint::ItemPoint( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemPoint::ItemPoint( const TQString &group, const TQString &key, TQPoint &reference, const TQPoint &defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemPoint::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemPoint::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readPointEntry( mKey, &mDefault ); @@ -718,25 +718,25 @@ void KConfigSkeleton::ItemPoint::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemPoint::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemPoint::setProperty(const TQVariant & p) { mReference = p.toPoint(); } -TQVariant KConfigSkeleton::ItemPoint::property() const +TQVariant TDEConfigSkeleton::ItemPoint::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemSize::ItemSize( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemSize::ItemSize( const TQString &group, const TQString &key, TQSize &reference, const TQSize &defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemSize::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemSize::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readSizeEntry( mKey, &mDefault ); @@ -745,25 +745,25 @@ void KConfigSkeleton::ItemSize::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemSize::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemSize::setProperty(const TQVariant & p) { mReference = p.toSize(); } -TQVariant KConfigSkeleton::ItemSize::property() const +TQVariant TDEConfigSkeleton::ItemSize::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemDateTime::ItemDateTime( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemDateTime::ItemDateTime( const TQString &group, const TQString &key, TQDateTime &reference, const TQDateTime &defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemDateTime::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemDateTime::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); mReference = config->readDateTimeEntry( mKey, &mDefault ); @@ -772,25 +772,25 @@ void KConfigSkeleton::ItemDateTime::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemDateTime::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemDateTime::setProperty(const TQVariant & p) { mReference = p.toDateTime(); } -TQVariant KConfigSkeleton::ItemDateTime::property() const +TQVariant TDEConfigSkeleton::ItemDateTime::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemStringList::ItemStringList( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemStringList::ItemStringList( const TQString &group, const TQString &key, TQStringList &reference, const TQStringList &defaultValue ) - : KConfigSkeletonGenericItem( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemStringList::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemStringList::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); if ( !config->hasKey( mKey ) ) @@ -802,25 +802,25 @@ void KConfigSkeleton::ItemStringList::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemStringList::setProperty(const TQVariant & p) +void TDEConfigSkeleton::ItemStringList::setProperty(const TQVariant & p) { mReference = p.toStringList(); } -TQVariant KConfigSkeleton::ItemStringList::property() const +TQVariant TDEConfigSkeleton::ItemStringList::property() const { return TQVariant(mReference); } -KConfigSkeleton::ItemPathList::ItemPathList( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemPathList::ItemPathList( const TQString &group, const TQString &key, TQStringList &reference, const TQStringList &defaultValue ) : ItemStringList( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemPathList::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemPathList::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); if ( !config->hasKey( mKey ) ) @@ -832,7 +832,7 @@ void KConfigSkeleton::ItemPathList::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemPathList::writeConfig( KConfig *config ) +void TDEConfigSkeleton::ItemPathList::writeConfig( TDEConfig *config ) { if ( mReference != mLoadedValue ) // WABA: Is this test needed? { @@ -847,14 +847,14 @@ void KConfigSkeleton::ItemPathList::writeConfig( KConfig *config ) } -KConfigSkeleton::ItemIntList::ItemIntList( const TQString &group, const TQString &key, +TDEConfigSkeleton::ItemIntList::ItemIntList( const TQString &group, const TQString &key, TQValueList &reference, const TQValueList &defaultValue ) - : KConfigSkeletonGenericItem >( group, key, reference, defaultValue ) + : TDEConfigSkeletonGenericItem >( group, key, reference, defaultValue ) { } -void KConfigSkeleton::ItemIntList::readConfig( KConfig *config ) +void TDEConfigSkeleton::ItemIntList::readConfig( TDEConfig *config ) { config->setGroup( mGroup ); if ( !config->hasKey( mKey ) ) @@ -866,22 +866,22 @@ void KConfigSkeleton::ItemIntList::readConfig( KConfig *config ) readImmutability( config ); } -void KConfigSkeleton::ItemIntList::setProperty(const TQVariant &) +void TDEConfigSkeleton::ItemIntList::setProperty(const TQVariant &) { // TODO: Not yet supported } -TQVariant KConfigSkeleton::ItemIntList::property() const +TQVariant TDEConfigSkeleton::ItemIntList::property() const { // TODO: Not yet supported return TQVariant(); } -KConfigSkeleton::KConfigSkeleton( const TQString &configname ) +TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname ) : mCurrentGroup( "No Group" ), mUseDefaults(false) { - kdDebug(177) << "Creating KConfigSkeleton (" << (void *)this << ")" << endl; + kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl; if ( !configname.isEmpty() ) { @@ -893,40 +893,40 @@ KConfigSkeleton::KConfigSkeleton( const TQString &configname ) } } -KConfigSkeleton::KConfigSkeleton(KSharedConfig::Ptr config) +TDEConfigSkeleton::TDEConfigSkeleton(KSharedConfig::Ptr config) : mCurrentGroup( "No Group" ), mUseDefaults(false) { - kdDebug(177) << "Creating KConfigSkeleton (" << (void *)this << ")" << endl; + kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl; mConfig = config; } -KConfigSkeleton::~KConfigSkeleton() +TDEConfigSkeleton::~TDEConfigSkeleton() { - KConfigSkeletonItem::List::ConstIterator it; + TDEConfigSkeletonItem::List::ConstIterator it; for( it = mItems.begin(); it != mItems.end(); ++it ) { delete *it; } } -void KConfigSkeleton::setCurrentGroup( const TQString &group ) +void TDEConfigSkeleton::setCurrentGroup( const TQString &group ) { mCurrentGroup = group; } -KConfig *KConfigSkeleton::config() const +TDEConfig *TDEConfigSkeleton::config() const { return mConfig; } -bool KConfigSkeleton::useDefaults(bool b) +bool TDEConfigSkeleton::useDefaults(bool b) { if (b == mUseDefaults) return mUseDefaults; mUseDefaults = b; - KConfigSkeletonItem::List::ConstIterator it; + TDEConfigSkeletonItem::List::ConstIterator it; for( it = mItems.begin(); it != mItems.end(); ++it ) { (*it)->swapDefault(); @@ -936,9 +936,9 @@ bool KConfigSkeleton::useDefaults(bool b) return !mUseDefaults; } -void KConfigSkeleton::setDefaults() +void TDEConfigSkeleton::setDefaults() { - KConfigSkeletonItem::List::ConstIterator it; + TDEConfigSkeletonItem::List::ConstIterator it; for( it = mItems.begin(); it != mItems.end(); ++it ) { (*it)->setDefault(); } @@ -946,14 +946,14 @@ void KConfigSkeleton::setDefaults() usrSetDefaults(); } -void KConfigSkeleton::readConfig() +void TDEConfigSkeleton::readConfig() { - kdDebug(177) << "KConfigSkeleton::readConfig()" << endl; + kdDebug(177) << "TDEConfigSkeleton::readConfig()" << endl; TQString origGroup = mConfig->group(); mConfig->reparseConfiguration(); - KConfigSkeletonItem::List::ConstIterator it; + TDEConfigSkeletonItem::List::ConstIterator it; for( it = mItems.begin(); it != mItems.end(); ++it ) { (*it)->readConfig( mConfig ); @@ -964,13 +964,13 @@ void KConfigSkeleton::readConfig() mConfig->setGroup(origGroup); } -void KConfigSkeleton::writeConfig() +void TDEConfigSkeleton::writeConfig() { - kdDebug(177) << "KConfigSkeleton::writeConfig()" << endl; + kdDebug(177) << "TDEConfigSkeleton::writeConfig()" << endl; TQString origGroup = mConfig->group(); - KConfigSkeletonItem::List::ConstIterator it; + TDEConfigSkeletonItem::List::ConstIterator it; for( it = mItems.begin(); it != mItems.end(); ++it ) { (*it)->writeConfig( mConfig ); @@ -985,7 +985,7 @@ void KConfigSkeleton::writeConfig() mConfig->setGroup(origGroup); } -void KConfigSkeleton::addItem( KConfigSkeletonItem *item, const TQString &name ) +void TDEConfigSkeleton::addItem( TDEConfigSkeletonItem *item, const TQString &name ) { item->setName( name.isEmpty() ? item->key() : name ); mItems.append( item ); @@ -994,214 +994,214 @@ void KConfigSkeleton::addItem( KConfigSkeletonItem *item, const TQString &name ) item->readConfig( mConfig ); } -KConfigSkeleton::ItemString *KConfigSkeleton::addItemString( const TQString &name, TQString &reference, +TDEConfigSkeleton::ItemString *TDEConfigSkeleton::addItemString( const TQString &name, TQString &reference, const TQString &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemString *item; - item = new KConfigSkeleton::ItemString( mCurrentGroup, key.isEmpty() ? name : key, + TDEConfigSkeleton::ItemString *item; + item = new TDEConfigSkeleton::ItemString( mCurrentGroup, key.isEmpty() ? name : key, reference, defaultValue, - KConfigSkeleton::ItemString::Normal ); + TDEConfigSkeleton::ItemString::Normal ); addItem( item, name ); return item; } -KConfigSkeleton::ItemPassword *KConfigSkeleton::addItemPassword( const TQString &name, TQString &reference, +TDEConfigSkeleton::ItemPassword *TDEConfigSkeleton::addItemPassword( const TQString &name, TQString &reference, const TQString &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemPassword *item; - item = new KConfigSkeleton::ItemPassword( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemPassword *item; + item = new TDEConfigSkeleton::ItemPassword( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemPath *KConfigSkeleton::addItemPath( const TQString &name, TQString &reference, +TDEConfigSkeleton::ItemPath *TDEConfigSkeleton::addItemPath( const TQString &name, TQString &reference, const TQString &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemPath *item; - item = new KConfigSkeleton::ItemPath( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemPath *item; + item = new TDEConfigSkeleton::ItemPath( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemProperty *KConfigSkeleton::addItemProperty( const TQString &name, TQVariant &reference, +TDEConfigSkeleton::ItemProperty *TDEConfigSkeleton::addItemProperty( const TQString &name, TQVariant &reference, const TQVariant &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemProperty *item; - item = new KConfigSkeleton::ItemProperty( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemProperty *item; + item = new TDEConfigSkeleton::ItemProperty( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemBool *KConfigSkeleton::addItemBool( const TQString &name, bool &reference, +TDEConfigSkeleton::ItemBool *TDEConfigSkeleton::addItemBool( const TQString &name, bool &reference, bool defaultValue, const TQString &key ) { - KConfigSkeleton::ItemBool *item; - item = new KConfigSkeleton::ItemBool( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemBool *item; + item = new TDEConfigSkeleton::ItemBool( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemInt *KConfigSkeleton::addItemInt( const TQString &name, int &reference, +TDEConfigSkeleton::ItemInt *TDEConfigSkeleton::addItemInt( const TQString &name, int &reference, int defaultValue, const TQString &key ) { - KConfigSkeleton::ItemInt *item; - item = new KConfigSkeleton::ItemInt( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemInt *item; + item = new TDEConfigSkeleton::ItemInt( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemUInt *KConfigSkeleton::addItemUInt( const TQString &name, unsigned int &reference, +TDEConfigSkeleton::ItemUInt *TDEConfigSkeleton::addItemUInt( const TQString &name, unsigned int &reference, unsigned int defaultValue, const TQString &key ) { - KConfigSkeleton::ItemUInt *item; - item = new KConfigSkeleton::ItemUInt( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemUInt *item; + item = new TDEConfigSkeleton::ItemUInt( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference, +TDEConfigSkeleton::ItemInt64 *TDEConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference, TQ_INT64 defaultValue, const TQString &key ) { - KConfigSkeleton::ItemInt64 *item; - item = new KConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemInt64 *item; + item = new TDEConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference, +TDEConfigSkeleton::ItemUInt64 *TDEConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference, TQ_UINT64 defaultValue, const TQString &key ) { - KConfigSkeleton::ItemUInt64 *item; - item = new KConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemUInt64 *item; + item = new TDEConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemLong *KConfigSkeleton::addItemLong( const TQString &name, long &reference, +TDEConfigSkeleton::ItemLong *TDEConfigSkeleton::addItemLong( const TQString &name, long &reference, long defaultValue, const TQString &key ) { - KConfigSkeleton::ItemLong *item; - item = new KConfigSkeleton::ItemLong( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemLong *item; + item = new TDEConfigSkeleton::ItemLong( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemULong *KConfigSkeleton::addItemULong( const TQString &name, unsigned long &reference, +TDEConfigSkeleton::ItemULong *TDEConfigSkeleton::addItemULong( const TQString &name, unsigned long &reference, unsigned long defaultValue, const TQString &key ) { - KConfigSkeleton::ItemULong *item; - item = new KConfigSkeleton::ItemULong( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemULong *item; + item = new TDEConfigSkeleton::ItemULong( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemDouble *KConfigSkeleton::addItemDouble( const TQString &name, double &reference, +TDEConfigSkeleton::ItemDouble *TDEConfigSkeleton::addItemDouble( const TQString &name, double &reference, double defaultValue, const TQString &key ) { - KConfigSkeleton::ItemDouble *item; - item = new KConfigSkeleton::ItemDouble( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemDouble *item; + item = new TDEConfigSkeleton::ItemDouble( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemColor *KConfigSkeleton::addItemColor( const TQString &name, TQColor &reference, +TDEConfigSkeleton::ItemColor *TDEConfigSkeleton::addItemColor( const TQString &name, TQColor &reference, const TQColor &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemColor *item; - item = new KConfigSkeleton::ItemColor( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemColor *item; + item = new TDEConfigSkeleton::ItemColor( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemFont *KConfigSkeleton::addItemFont( const TQString &name, TQFont &reference, +TDEConfigSkeleton::ItemFont *TDEConfigSkeleton::addItemFont( const TQString &name, TQFont &reference, const TQFont &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemFont *item; - item = new KConfigSkeleton::ItemFont( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemFont *item; + item = new TDEConfigSkeleton::ItemFont( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemRect *KConfigSkeleton::addItemRect( const TQString &name, TQRect &reference, +TDEConfigSkeleton::ItemRect *TDEConfigSkeleton::addItemRect( const TQString &name, TQRect &reference, const TQRect &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemRect *item; - item = new KConfigSkeleton::ItemRect( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemRect *item; + item = new TDEConfigSkeleton::ItemRect( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemPoint *KConfigSkeleton::addItemPoint( const TQString &name, TQPoint &reference, +TDEConfigSkeleton::ItemPoint *TDEConfigSkeleton::addItemPoint( const TQString &name, TQPoint &reference, const TQPoint &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemPoint *item; - item = new KConfigSkeleton::ItemPoint( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemPoint *item; + item = new TDEConfigSkeleton::ItemPoint( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemSize *KConfigSkeleton::addItemSize( const TQString &name, TQSize &reference, +TDEConfigSkeleton::ItemSize *TDEConfigSkeleton::addItemSize( const TQString &name, TQSize &reference, const TQSize &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemSize *item; - item = new KConfigSkeleton::ItemSize( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemSize *item; + item = new TDEConfigSkeleton::ItemSize( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemDateTime *KConfigSkeleton::addItemDateTime( const TQString &name, TQDateTime &reference, +TDEConfigSkeleton::ItemDateTime *TDEConfigSkeleton::addItemDateTime( const TQString &name, TQDateTime &reference, const TQDateTime &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemDateTime *item; - item = new KConfigSkeleton::ItemDateTime( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemDateTime *item; + item = new TDEConfigSkeleton::ItemDateTime( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemStringList *KConfigSkeleton::addItemStringList( const TQString &name, TQStringList &reference, +TDEConfigSkeleton::ItemStringList *TDEConfigSkeleton::addItemStringList( const TQString &name, TQStringList &reference, const TQStringList &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemStringList *item; - item = new KConfigSkeleton::ItemStringList( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemStringList *item; + item = new TDEConfigSkeleton::ItemStringList( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -KConfigSkeleton::ItemIntList *KConfigSkeleton::addItemIntList( const TQString &name, TQValueList &reference, +TDEConfigSkeleton::ItemIntList *TDEConfigSkeleton::addItemIntList( const TQString &name, TQValueList &reference, const TQValueList &defaultValue, const TQString &key ) { - KConfigSkeleton::ItemIntList *item; - item = new KConfigSkeleton::ItemIntList( mCurrentGroup, key.isNull() ? name : key, + TDEConfigSkeleton::ItemIntList *item; + item = new TDEConfigSkeleton::ItemIntList( mCurrentGroup, key.isNull() ? name : key, reference, defaultValue ); addItem( item, name ); return item; } -bool KConfigSkeleton::isImmutable(const TQString &name) +bool TDEConfigSkeleton::isImmutable(const TQString &name) { - KConfigSkeletonItem *item = findItem(name); + TDEConfigSkeletonItem *item = findItem(name); return !item || item->isImmutable(); } -KConfigSkeletonItem *KConfigSkeleton::findItem(const TQString &name) +TDEConfigSkeletonItem *TDEConfigSkeleton::findItem(const TQString &name) { return mItemDict.find(name); } diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h index 3ad18d958..30dc98841 100644 --- a/tdecore/kconfigskeleton.h +++ b/tdecore/kconfigskeleton.h @@ -39,20 +39,20 @@ /** * @short Class for storing a preferences setting * @author Cornelius Schumacher - * @see KConfigSkeleton + * @see TDEConfigSkeleton * - * This class represents one preferences setting as used by @ref KConfigSkeleton. - * Subclasses of KConfigSkeletonItem implement storage functions for a certain type of + * This class represents one preferences setting as used by @ref TDEConfigSkeleton. + * Subclasses of TDEConfigSkeletonItem implement storage functions for a certain type of * setting. Normally you don't have to use this class directly. Use the special - * addItem() functions of KConfigSkeleton instead. If you subclass this class you will - * have to register instances with the function KConfigSkeleton::addItem(). + * addItem() functions of TDEConfigSkeleton instead. If you subclass this class you will + * have to register instances with the function TDEConfigSkeleton::addItem(). */ - class TDECORE_EXPORT KConfigSkeletonItem + class TDECORE_EXPORT TDEConfigSkeletonItem { public: - typedef TQValueList < KConfigSkeletonItem * >List; - typedef TQDict < KConfigSkeletonItem > Dict; - typedef TQDictIterator < KConfigSkeletonItem > DictIterator; + typedef TQValueList < TDEConfigSkeletonItem * >List; + typedef TQDict < TDEConfigSkeletonItem > Dict; + typedef TQDictIterator < TDEConfigSkeletonItem > DictIterator; /** * Constructor. @@ -60,7 +60,7 @@ * @param group Config file group. * @param key Config file key. */ - KConfigSkeletonItem(const TQString & group, const TQString & key) + TDEConfigSkeletonItem(const TQString & group, const TQString & key) :mGroup(group),mKey(key), mIsImmutable(true) { } @@ -68,7 +68,7 @@ /** * Destructor. */ - virtual ~KConfigSkeletonItem() + virtual ~TDEConfigSkeletonItem() { } @@ -153,22 +153,22 @@ } /** - * This function is called by @ref KConfigSkeleton to read the value for this setting + * This function is called by @ref TDEConfigSkeleton to read the value for this setting * from a config file. * value. */ - virtual void readConfig(KConfig *) = 0; + virtual void readConfig(TDEConfig *) = 0; /** - * This function is called by @ref KConfigSkeleton to write the value of this setting + * This function is called by @ref TDEConfigSkeleton to write the value of this setting * to a config file. */ - virtual void writeConfig(KConfig *) = 0; + virtual void writeConfig(TDEConfig *) = 0; /** * Read global default value. */ - virtual void readDefault(KConfig *) = 0; + virtual void readDefault(TDEConfig *) = 0; /** * Set item to @p p @@ -197,7 +197,7 @@ /** * Exchanges the current value with the default value - * Used by KConfigSkeleton::useDefaults(bool); + * Used by TDEConfigSkeleton::useDefaults(bool); */ virtual void swapDefault() = 0; @@ -212,9 +212,9 @@ protected: /** * sets mIsImmutable to true if mKey in config is immutable - * @param config KConfig to check if mKey is immutable in + * @param config TDEConfig to check if mKey is immutable in */ - void readImmutability(KConfig *config); + void readImmutability(TDEConfig *config); TQString mGroup; TQString mKey; @@ -228,18 +228,18 @@ }; -template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonItem +template < typename T > class TDEConfigSkeletonGenericItem:public TDEConfigSkeletonItem { public: - KConfigSkeletonGenericItem(const TQString & group, const TQString & key, T & reference, + TDEConfigSkeletonGenericItem(const TQString & group, const TQString & key, T & reference, T defaultValue) - : KConfigSkeletonItem(group, key), mReference(reference), + : TDEConfigSkeletonItem(group, key), mReference(reference), mDefault(defaultValue), mLoadedValue(defaultValue) { } /** - * Set value of this KConfigSkeletonItem. + * Set value of this TDEConfigSkeletonItem. */ void setValue(const T & v) { @@ -247,7 +247,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI } /** - * Return value of this KConfigSkeletonItem. + * Return value of this TDEConfigSkeletonItem. */ T & value() { @@ -255,7 +255,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI } /** - * Return const value of this KConfigSkeletonItem. + * Return const value of this TDEConfigSkeletonItem. */ const T & value() const { @@ -275,7 +275,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI mReference = mDefault; } - virtual void writeConfig(KConfig * config) + virtual void writeConfig(TDEConfig * config) { if ( mReference != mLoadedValue ) // Is this needed? { @@ -287,7 +287,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI } } - void readDefault(KConfig * config) + void readDefault(TDEConfig * config) { config->setReadDefaults(true); readConfig(config); @@ -311,19 +311,19 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI /** * @short Class for handling preferences settings for an application. * @author Cornelius Schumacher - * @see KConfigSkeletonItem + * @see TDEConfigSkeletonItem * * This class provides an interface to preferences settings. Preferences items * can be registered by the addItem() function corresponding to the data type of - * the seetting. KConfigSkeleton then handles reading and writing of config files and + * the seetting. TDEConfigSkeleton then handles reading and writing of config files and * setting of default values. * - * Normally you will subclass KConfigSkeleton, add data members for the preferences + * Normally you will subclass TDEConfigSkeleton, add data members for the preferences * settings and register the members in the constructor of the subclass. * * Example: * \code - * class MyPrefs : public KConfigSkeleton + * class MyPrefs : public TDEConfigSkeleton * { * public: * MyPrefs() @@ -342,9 +342,9 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI * } * \endcode * - * It might be convenient in many cases to make this subclass of KConfigSkeleton a + * It might be convenient in many cases to make this subclass of TDEConfigSkeleton a * singleton for global access from all over the application without passing - * references to the KConfigSkeleton object around. + * references to the TDEConfigSkeleton object around. * * You can write the data to the configuration file by calling @ref writeConfig() * and read the data from the configuration file by calling @ref readConfig(). @@ -355,21 +355,21 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI * @ref usrWriteConfig(). * * Internally preferences settings are stored in instances of subclasses of - * @ref KConfigSkeletonItem. You can also add KConfigSkeletonItem subclasses + * @ref TDEConfigSkeletonItem. You can also add TDEConfigSkeletonItem subclasses * for your own types and call the generic @ref addItem() to register them. * - * In many cases you don't have to write the specific KConfigSkeleton + * In many cases you don't have to write the specific TDEConfigSkeleton * subclasses yourself, but you can use \ref kconfig_compiler to automatically * generate the C++ code from an XML description of the configuration options. */ -class TDECORE_EXPORT KConfigSkeleton +class TDECORE_EXPORT TDEConfigSkeleton { public: /** * Class for handling a string preferences item. */ - class TDECORE_EXPORT ItemString:public KConfigSkeletonGenericItem < TQString > + class TDECORE_EXPORT ItemString:public TDEConfigSkeletonGenericItem < TQString > { public: enum Type { Normal, Password, Path }; @@ -379,8 +379,8 @@ public: const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !! Type type = Normal); - void writeConfig(KConfig * config); - void readConfig(KConfig * config); + void writeConfig(TDEConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; @@ -414,13 +414,13 @@ public: /** * Class for handling a TQVariant preferences item. */ - class TDECORE_EXPORT ItemProperty:public KConfigSkeletonGenericItem < TQVariant > + class TDECORE_EXPORT ItemProperty:public TDEConfigSkeletonGenericItem < TQVariant > { public: ItemProperty(const TQString & group, const TQString & key, TQVariant & reference, TQVariant defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -429,13 +429,13 @@ public: /** * Class for handling a bool preferences item. */ - class TDECORE_EXPORT ItemBool:public KConfigSkeletonGenericItem < bool > + class TDECORE_EXPORT ItemBool:public TDEConfigSkeletonGenericItem < bool > { public: ItemBool(const TQString & group, const TQString & key, bool & reference, bool defaultValue = true); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -444,13 +444,13 @@ public: /** * Class for handling an integer preferences item. */ - class TDECORE_EXPORT ItemInt:public KConfigSkeletonGenericItem < int > + class TDECORE_EXPORT ItemInt:public TDEConfigSkeletonGenericItem < int > { public: ItemInt(const TQString & group, const TQString & key, int &reference, int defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; TQVariant minValue() const; @@ -469,13 +469,13 @@ public: /** * Class for handling an 64-bit integer preferences item. */ - class TDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 > + class TDECORE_EXPORT ItemInt64:public TDEConfigSkeletonGenericItem < TQ_INT64 > { public: ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference, TQ_INT64 defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; @@ -510,8 +510,8 @@ public: TQValueList choices() const; - void readConfig(KConfig * config); - void writeConfig(KConfig * config); + void readConfig(TDEConfig * config); + void writeConfig(TDEConfig * config); private: TQValueList mChoices; @@ -521,13 +521,13 @@ public: /** * Class for handling an unsingend integer preferences item. */ - class TDECORE_EXPORT ItemUInt:public KConfigSkeletonGenericItem < unsigned int > + class TDECORE_EXPORT ItemUInt:public TDEConfigSkeletonGenericItem < unsigned int > { public: ItemUInt(const TQString & group, const TQString & key, unsigned int &reference, unsigned int defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; TQVariant minValue() const; @@ -547,13 +547,13 @@ public: /** * Class for hanlding a long integer preferences item. */ - class TDECORE_EXPORT ItemLong:public KConfigSkeletonGenericItem < long > + class TDECORE_EXPORT ItemLong:public TDEConfigSkeletonGenericItem < long > { public: ItemLong(const TQString & group, const TQString & key, long &reference, long defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; TQVariant minValue() const; @@ -573,13 +573,13 @@ public: /** * Class for handling an unsigned long integer preferences item. */ - class TDECORE_EXPORT ItemULong:public KConfigSkeletonGenericItem < unsigned long > + class TDECORE_EXPORT ItemULong:public TDEConfigSkeletonGenericItem < unsigned long > { public: ItemULong(const TQString & group, const TQString & key, unsigned long &reference, unsigned long defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; TQVariant minValue() const; @@ -598,13 +598,13 @@ public: /** * Class for handling unsigned 64-bit integer preferences item. */ - class TDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 > + class TDECORE_EXPORT ItemUInt64:public TDEConfigSkeletonGenericItem < TQ_UINT64 > { public: ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference, TQ_UINT64 defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; @@ -624,13 +624,13 @@ public: /** * Class for handling a floating point preference item. */ - class TDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < double > + class TDECORE_EXPORT ItemDouble:public TDEConfigSkeletonGenericItem < double > { public: ItemDouble(const TQString & group, const TQString & key, double &reference, double defaultValue = 0); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; TQVariant minValue() const; @@ -650,14 +650,14 @@ public: /** * Class for handling a color preferences item. */ - class TDECORE_EXPORT ItemColor:public KConfigSkeletonGenericItem < TQColor > + class TDECORE_EXPORT ItemColor:public TDEConfigSkeletonGenericItem < TQColor > { public: ItemColor(const TQString & group, const TQString & key, TQColor & reference, const TQColor & defaultValue = TQColor(128, 128, 128)); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -666,13 +666,13 @@ public: /** * Class for handling a font preferences item. */ - class TDECORE_EXPORT ItemFont:public KConfigSkeletonGenericItem < TQFont > + class TDECORE_EXPORT ItemFont:public TDEConfigSkeletonGenericItem < TQFont > { public: ItemFont(const TQString & group, const TQString & key, TQFont & reference, const TQFont & defaultValue = TDEGlobalSettings::generalFont()); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -681,13 +681,13 @@ public: /** * Class for handling a TQRect preferences item. */ - class TDECORE_EXPORT ItemRect:public KConfigSkeletonGenericItem < TQRect > + class TDECORE_EXPORT ItemRect:public TDEConfigSkeletonGenericItem < TQRect > { public: ItemRect(const TQString & group, const TQString & key, TQRect & reference, const TQRect & defaultValue = TQRect()); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -696,13 +696,13 @@ public: /** * Class for handling a TQPoint preferences item. */ - class TDECORE_EXPORT ItemPoint:public KConfigSkeletonGenericItem < TQPoint > + class TDECORE_EXPORT ItemPoint:public TDEConfigSkeletonGenericItem < TQPoint > { public: ItemPoint(const TQString & group, const TQString & key, TQPoint & reference, const TQPoint & defaultValue = TQPoint()); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -711,13 +711,13 @@ public: /** * Class for handling a TQSize preferences item. */ - class TDECORE_EXPORT ItemSize:public KConfigSkeletonGenericItem < TQSize > + class TDECORE_EXPORT ItemSize:public TDEConfigSkeletonGenericItem < TQSize > { public: ItemSize(const TQString & group, const TQString & key, TQSize & reference, const TQSize & defaultValue = TQSize()); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -726,14 +726,14 @@ public: /** * Class for handling a TQDateTime preferences item. */ - class TDECORE_EXPORT ItemDateTime:public KConfigSkeletonGenericItem < TQDateTime > + class TDECORE_EXPORT ItemDateTime:public TDEConfigSkeletonGenericItem < TQDateTime > { public: ItemDateTime(const TQString & group, const TQString & key, TQDateTime & reference, const TQDateTime & defaultValue = TQDateTime()); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -742,14 +742,14 @@ public: /** * Class for handling a string list preferences item. */ - class TDECORE_EXPORT ItemStringList:public KConfigSkeletonGenericItem < TQStringList > + class TDECORE_EXPORT ItemStringList:public TDEConfigSkeletonGenericItem < TQStringList > { public: ItemStringList(const TQString & group, const TQString & key, TQStringList & reference, const TQStringList & defaultValue = TQStringList()); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -765,22 +765,22 @@ public: TQStringList & reference, const TQStringList & defaultValue = TQStringList()); - void readConfig(KConfig * config); - void writeConfig(KConfig * config); + void readConfig(TDEConfig * config); + void writeConfig(TDEConfig * config); }; /** * Class for handling an integer list preferences item. */ - class TDECORE_EXPORT ItemIntList:public KConfigSkeletonGenericItem < TQValueList < int > > + class TDECORE_EXPORT ItemIntList:public TDEConfigSkeletonGenericItem < TQValueList < int > > { public: ItemIntList(const TQString & group, const TQString & key, TQValueList < int >&reference, const TQValueList < int >&defaultValue = TQValueList < int >()); - void readConfig(KConfig * config); + void readConfig(TDEConfig * config); void setProperty(const TQVariant & p); TQVariant property() const; }; @@ -793,19 +793,19 @@ public: * @param configname name of config file. If no name is given, the default * config file as returned by kapp()->config() is used. */ - KConfigSkeleton(const TQString & configname = TQString::null); + TDEConfigSkeleton(const TQString & configname = TQString::null); /** * Constructor. * * @param config configuration object to use. */ - KConfigSkeleton(KSharedConfig::Ptr config); + TDEConfigSkeleton(KSharedConfig::Ptr config); /** * Destructor */ - virtual ~ KConfigSkeleton(); + virtual ~ TDEConfigSkeleton(); /** Set all registered items to their default values. @@ -840,12 +840,12 @@ public: } /** - * Register a custom @ref KConfigSkeletonItem with a given name. If the name - * parameter is null, take the name from KConfigSkeletonItem::key(). + * Register a custom @ref TDEConfigSkeletonItem with a given name. If the name + * parameter is null, take the name from TDEConfigSkeletonItem::key(). * Note that all names must be unique but that multiple entries can have * the same key if they reside in different groups. */ - void addItem(KConfigSkeletonItem *, const TQString & name = TQString::null ); + void addItem(TDEConfigSkeletonItem *, const TQString & name = TQString::null ); /** * Register an item of type TQString. @@ -1154,14 +1154,14 @@ public: const TQString & key = TQString::null); /** - * Return the @ref KConfig object used for reading and writing the settings. + * Return the @ref TDEConfig object used for reading and writing the settings. */ - KConfig *config() const; + TDEConfig *config() const; /** - * Return list of items managed by this KConfigSkeleton object. + * Return list of items managed by this TDEConfigSkeleton object. */ - KConfigSkeletonItem::List items() const + TDEConfigSkeletonItem::List items() const { return mItems; } @@ -1174,7 +1174,7 @@ public: /** * Lookup item by name */ - KConfigSkeletonItem * findItem(const TQString & name); + TDEConfigSkeletonItem * findItem(const TQString & name); /** * Indicate whether this object should reflect the actual @@ -1215,10 +1215,10 @@ protected: private: TQString mCurrentGroup; - KSharedConfig::Ptr mConfig; // pointer to KConfig object + KSharedConfig::Ptr mConfig; // pointer to TDEConfig object - KConfigSkeletonItem::List mItems; - KConfigSkeletonItem::Dict mItemDict; + TDEConfigSkeletonItem::List mItems; + TDEConfigSkeletonItem::Dict mItemDict; bool mUseDefaults; diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index 3d1818592..9813a0e16 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -21,8 +21,8 @@ 174 tdecore (KProcIO) 175 tdecore (TDEProcess) 176 tdecore (KWin) -177 tdecore (KConfigSkeleton) -178 tdecore (KConfigDialogManager) +177 tdecore (TDEConfigSkeleton) +178 tdecore (TDEConfigDialogManager) 179 tdecore (KNetwork resolver) 180 tdecore (tdelibs) 200 tdeui (KMainWindow) @@ -34,7 +34,7 @@ 265 tdecore (KIconEffect) 270 tdeui (KRootPixmap) 280 tdeui (KSharedPixmap) -281 tdeui (KCModule) +281 tdeui (TDECModule) 282 tdeui (KDockWidget) 290 tdeui (KPixmapIO) 291 tdeui (KAboutDialog) @@ -53,9 +53,9 @@ 703 kutils (KPluginInfo) 704 kutils (KSettings::ComponentsDialog) 710 kutils (KCMultiDialog) -711 kutils (KCModuleProxy) -712 kutils (KCModuleInfo) -713 kutils (KCModuleContainer) +711 kutils (TDECModuleProxy) +712 kutils (TDECModuleInfo) +713 kutils (TDECModuleContainer) 750 kspell (tdelibs) 760 kmdi 780 kcmshell (tdelibs) diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index ef76e04f6..e484a3711 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -162,7 +162,7 @@ struct kDebugPrivate { TQCString aAreaName; unsigned int oldarea; - KConfig *config; + TDEConfig *config; }; static kDebugPrivate *kDebug_data = 0; @@ -187,7 +187,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char if (!kDebug_data->config && TDEGlobal::_instance ) { - kDebug_data->config = new KConfig("kdebugrc", false, false); + kDebug_data->config = new TDEConfig("kdebugrc", false, false); kDebug_data->config->setGroup("0"); //AB: this is necessary here, otherwise all output with area 0 won't be diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 29c30f9d9..1b9a49890 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -42,9 +42,9 @@ KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, const char * resType) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { - // KConfigBackEnd will try to locate the filename that is provided + // TDEConfigBackEnd will try to locate the filename that is provided // based on the resource type specified, _only_ if the filename // is not an absolute path. backEnd->changeFileName(fileName, resType, false); @@ -346,7 +346,7 @@ KDesktopFile::sortOrder() const } void KDesktopFile::virtual_hook( int id, void* data ) -{ KConfig::virtual_hook( id, data ); } +{ TDEConfig::virtual_hook( id, data ); } TQString KDesktopFile::readDocPath() const { @@ -361,7 +361,7 @@ TQString KDesktopFile::readDocPath() const KDesktopFile* KDesktopFile::copyTo(const TQString &file) const { KDesktopFile *config = new KDesktopFile(TQString::null, false); - KConfig::copyTo(file, config); + TDEConfig::copyTo(file, config); config->setDesktopGroup(); return config; } diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h index ff19981cd..28db47842 100644 --- a/tdecore/kdesktopfile.h +++ b/tdecore/kdesktopfile.h @@ -28,10 +28,10 @@ class KDesktopFilePrivate; * KDE Desktop File Management. * * @author Pietro Iglio - * @see KConfigBase KConfig + * @see TDEConfigBase TDEConfig * @short KDE Desktop File Management class */ -class TDECORE_EXPORT KDesktopFile : public KConfig +class TDECORE_EXPORT KDesktopFile : public TDEConfig { Q_OBJECT diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp index c4a903242..2047a7707 100644 --- a/tdecore/kdetcompmgr.cpp +++ b/tdecore/kdetcompmgr.cpp @@ -51,7 +51,7 @@ int main(int argc, char **argv) TDEApplication app; - KConfig config("twinrc", true); + TDEConfig config("twinrc", true); config.setGroup( "Notification Messages" ); if (!config.readBoolEntry("UseTranslucency",false)) { // Attempt to load the kompmgr pid file @@ -97,7 +97,7 @@ int main(int argc, char **argv) } if (app.detectCompositionManagerAvailable(false, false)) { // Perform a shallow check for the composite extension (a deep check would cause noticeable flicker) - KConfig config2("twinrc", true); + TDEConfig config2("twinrc", true); config2.setGroup( "Notification Messages" ); if (config2.readBoolEntry("UseTranslucency",false)) { app.detectCompositionManagerAvailable(true, true); diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index cd74f9ad0..d77d2c561 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -72,8 +72,8 @@ public: KResolver resLocal; // binding resolution unsigned current; // used by the asynchronous connection - ::KSocketAddress *local; // local socket address - ::KSocketAddress *peer; // peer socket address + ::TDESocketAddress *local; // local socket address + ::TDESocketAddress *peer; // peer socket address TQSocketNotifier *qsnIn, *qsnOut; int inMaxSize, outMaxSize; @@ -718,7 +718,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) * if we have done this already, we return it. Otherwise, we'll have * to find the socket name */ -const ::KSocketAddress *KExtendedSocket::localAddress() +const ::TDESocketAddress *KExtendedSocket::localAddress() { if (d->local != NULL) return d->local; @@ -733,7 +733,7 @@ const ::KSocketAddress *KExtendedSocket::localAddress() * passiveSocket and that we require to be connected already. Also note that * the behavior on connectionless sockets is not defined here. */ -const ::KSocketAddress* KExtendedSocket::peerAddress() +const ::TDESocketAddress* KExtendedSocket::peerAddress() { if (d->peer != NULL) return d->peer; @@ -2002,7 +2002,7 @@ int KExtendedSocket::resolve(sockaddr *sock, ksocklen_t len, TQString &host, return err; } -int KExtendedSocket::resolve(::KSocketAddress *sock, TQString &host, TQString &port, +int KExtendedSocket::resolve(::TDESocketAddress *sock, TQString &host, TQString &port, int flags) { return resolve(sock->data, sock->datasize, host, port, flags); @@ -2058,7 +2058,7 @@ TQPtrList KExtendedSocket::lookup(const TQString& host, const TQSt ai->ai->ai_addr = 0; } - ai->addr = ::KSocketAddress::newAddress(ai->ai->ai_addr, ai->ai->ai_addrlen); + ai->addr = ::TDESocketAddress::newAddress(ai->ai->ai_addr, ai->ai->ai_addrlen); l.append(ai); } @@ -2069,9 +2069,9 @@ TQPtrList KExtendedSocket::lookup(const TQString& host, const TQSt return l; } -::KSocketAddress *KExtendedSocket::localAddress(int fd) +::TDESocketAddress *KExtendedSocket::localAddress(int fd) { - ::KSocketAddress *local; + ::TDESocketAddress *local; struct sockaddr static_sa, *sa = &static_sa; ksocklen_t len = sizeof(static_sa); @@ -2106,20 +2106,20 @@ TQPtrList KExtendedSocket::lookup(const TQString& host, const TQSt return NULL; } - local = ::KSocketAddress::newAddress(sa, len); + local = ::TDESocketAddress::newAddress(sa, len); free(sa); } else - local = ::KSocketAddress::newAddress(sa, len); + local = ::TDESocketAddress::newAddress(sa, len); return local; } /* This is exactly the same code as localAddress, except * we call getpeername here */ -::KSocketAddress *KExtendedSocket::peerAddress(int fd) +::TDESocketAddress *KExtendedSocket::peerAddress(int fd) { - ::KSocketAddress *peer; + ::TDESocketAddress *peer; struct sockaddr static_sa, *sa = &static_sa; ksocklen_t len = sizeof(static_sa); @@ -2154,11 +2154,11 @@ TQPtrList KExtendedSocket::lookup(const TQString& host, const TQSt return NULL; } - peer = ::KSocketAddress::newAddress(sa, len); + peer = ::TDESocketAddress::newAddress(sa, len); free(sa); } else - peer = ::KSocketAddress::newAddress(sa, len); + peer = ::TDESocketAddress::newAddress(sa, len); return peer; } @@ -2204,7 +2204,7 @@ KAddressInfo::KAddressInfo(addrinfo *p) ai->ai_addrlen = 0; } - addr = ::KSocketAddress::newAddress(ai->ai_addr, ai->ai_addrlen); + addr = ::TDESocketAddress::newAddress(ai->ai_addr, ai->ai_addrlen); } #endif KAddressInfo::~KAddressInfo() diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h index 080898443..6327d51dc 100644 --- a/tdecore/kextsock.h +++ b/tdecore/kextsock.h @@ -58,8 +58,8 @@ class KExtendedSocketPrivate; /** * The extended socket class. * - * This class should be used instead of KSocket whenever the user needs - * fine-grained control over the socket being created. Unlike KSocket, which + * This class should be used instead of TDESocket whenever the user needs + * fine-grained control over the socket being created. Unlike TDESocket, which * does everything at once, without much intervention, KExtendedSocket allows * intervention at every step of the process and the setting of parameters. * @@ -87,7 +87,7 @@ class KExtendedSocketPrivate; * @deprecated * This class is now deprecated. Please use the classes in KNetwork for * new programs. In particular, this class is replaced by KNetwork::KStreamSocket - * and @ref KNetwork::KServerSocket. + * and @ref KNetwork::TDEServerSocket. * * @author Thiago Macieira * @short an extended socket @@ -491,7 +491,7 @@ public: * @return the local socket address, can be 0 if the connection has not been established * yet */ - const ::KSocketAddress *localAddress(); + const ::TDESocketAddress *localAddress(); /** * Returns the peer socket address. Use KExtendedSocket::resolve() to @@ -499,7 +499,7 @@ public: * @return the peer address, can be 0 if the connection has not been established yet * or the socket is passive */ - const ::KSocketAddress *peerAddress(); + const ::TDESocketAddress *peerAddress(); /** * Returns the file descriptor @@ -964,7 +964,7 @@ public: * @param flags the same flags as getnameinfo() * @returns 0 on success, nonzero otherwise. */ - static int resolve(::KSocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED; + static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED; /** @deprecated * This function is now deprecated. Please use @ref KNetwork::KResolver::resolve. @@ -994,7 +994,7 @@ public: * @param fd the file descriptor * @return the local socket address or 0 if an error occurred. Delete after use. */ - static ::KSocketAddress *localAddress(int fd) KDE_DEPRECATED; + static ::TDESocketAddress *localAddress(int fd) KDE_DEPRECATED; /** * Returns the peer socket address. Use KExtendedSocket::resolve() to @@ -1003,7 +1003,7 @@ public: * @param fd the file descriptor * @return the peer socket address or 0 if an error occurred. Delete after use. */ - static ::KSocketAddress *peerAddress(int fd) KDE_DEPRECATED; + static ::TDESocketAddress *peerAddress(int fd) KDE_DEPRECATED; /** * Returns the representing text of this error code @@ -1029,8 +1029,8 @@ protected: private: KExtendedSocketPrivate *d; - friend class KSocket; - friend class KServerSocket; + friend class TDESocket; + friend class TDEServerSocket; }; /** @deprecated @@ -1043,7 +1043,7 @@ class TDECORE_EXPORT KAddressInfo { private: addrinfo *ai; - ::KSocketAddress *addr; + ::TDESocketAddress *addr; inline KAddressInfo() : ai(0), addr(0) { } @@ -1056,10 +1056,10 @@ public: ~KAddressInfo(); /** - * Returns the KAddressInfo's KSocketAddress. + * Returns the KAddressInfo's TDESocketAddress. * Only valid as long as the KAddressInfo exists. */ - inline KDE_DEPRECATED operator const ::KSocketAddress*() const + inline KDE_DEPRECATED operator const ::TDESocketAddress*() const { return addr; } /** @@ -1076,11 +1076,11 @@ public: { return ai; } /** - * Returns the KAddressInfo's KSocketAddress. + * Returns the KAddressInfo's TDESocketAddress. * Only valid as long as the KAddressInfo exists. - * @return the KAddressInfo's KSocketAddress. + * @return the KAddressInfo's TDESocketAddress. */ - inline KDE_DEPRECATED const ::KSocketAddress* address() const + inline KDE_DEPRECATED const ::TDESocketAddress* address() const { return addr; } /** @@ -1116,8 +1116,8 @@ public: const char* canonname() const KDE_DEPRECATED; /** - * Returns the length of the KSocketAddress. - * @return the KSocketAddress's length + * Returns the length of the TDESocketAddress. + * @return the TDESocketAddress's length */ inline int length() const { if (addr) return addr->size(); return 0; } diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index c51f13e7f..9759edbcf 100644 --- a/tdecore/kglobal.cpp +++ b/tdecore/kglobal.cpp @@ -60,7 +60,7 @@ KStandardDirs *TDEGlobal::dirs() return _instance->dirs(); } -KConfig *TDEGlobal::config() +TDEConfig *TDEGlobal::config() { MYASSERT(_instance); diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h index 361129e2b..22877c8ce 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -22,7 +22,7 @@ #include // KDE4: class TDEInstance is enough here class KCharsets; -class KConfig; +class TDEConfig; class KSharedConfig; class KIconLoader; class TDEHardwareDevices; @@ -65,7 +65,7 @@ public: * Returns the general config object. * @return the global configuration object. */ - static KConfig *config(); + static TDEConfig *config(); /** * Returns the general config object. diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp index f5fb71027..3d759466f 100644 --- a/tdecore/kglobalaccel.cpp +++ b/tdecore/kglobalaccel.cpp @@ -119,11 +119,11 @@ const TQString& TDEGlobalAccel::configGroup() const void TDEGlobalAccel::setConfigGroup( const TQString& s ) { d->setConfigGroup( s ); } -bool TDEGlobalAccel::readSettings( KConfigBase* pConfig ) +bool TDEGlobalAccel::readSettings( TDEConfigBase* pConfig ) { d->readSettings( pConfig ); return true; } -bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig ) const +bool TDEGlobalAccel::writeSettings( TDEConfigBase* pConfig ) const { d->writeSettings( pConfig ); return true; } -bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig, bool bGlobal ) const +bool TDEGlobalAccel::writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const { d->setConfigGlobal( bGlobal ); d->writeSettings( pConfig ); diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h index 1389386c4..fdda08f5a 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/kglobalaccel.h @@ -27,7 +27,7 @@ class TQPopupMenu; class TQWidget; class KAccelAction; class KAccelActions; -class KConfigBase; +class TDEConfigBase; class TDEGlobalAccelPrivate; @@ -157,14 +157,14 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject /** * Returns the configuration group that is used to save the accelerators. * @return the configuration group - * @see KConfig + * @see TDEConfig */ const TQString& configGroup() const; /** * Sets the configuration group that is used to save the accelerators. * @param cg the configuration group - * @see KConfig + * @see TDEConfig */ void setConfigGroup( const TQString &cg ); @@ -176,7 +176,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * configuration file * @return true if successful, false otherwise */ - bool readSettings( KConfigBase* pConfig = 0 ); + bool readSettings( TDEConfigBase* pConfig = 0 ); /** * Write the current shortcuts to @p pConfig, @@ -187,7 +187,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * @return true if successful, false otherwise * @since 3.1 */ - bool writeSettings( KConfigBase* pConfig = 0 ) const; + bool writeSettings( TDEConfigBase* pConfig = 0 ) const; // BCI: merge these two writeSettings methods in KDE 4.0 /** * Write the current shortcuts to @p pConfig, @@ -199,7 +199,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * @param bGlobal if true write the configuration to the kde global settings * @return true if successful, false otherwise */ - bool writeSettings( KConfigBase* pConfig, bool bGlobal ) const; + bool writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const; /** * @internal -- this a wrapper function to diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index f654608ac..8e617b06a 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -108,19 +108,19 @@ void readXdgUserDirs(TQString *desktop, TQString *documents) int TDEGlobalSettings::dndEventDelay() { - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readNumEntry("StartDragDist", TQApplication::startDragDistance()); } bool TDEGlobalSettings::singleClick() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK); } bool TDEGlobalSettings::iconUseRoundedRect() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED); } @@ -128,7 +128,7 @@ TDEGlobalSettings::TearOffHandle TDEGlobalSettings::insertTearOffHandle() { int tearoff; bool effectsenabled; - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); effectsenabled = g.readBoolEntry( "EffectsEnabled", false); tearoff = g.readNumEntry("InsertTearOffHandle", KDE_DEFAULT_INSERTTEAROFFHANDLES); return effectsenabled ? (TearOffHandle) tearoff : Disable; @@ -136,19 +136,19 @@ TDEGlobalSettings::TearOffHandle TDEGlobalSettings::insertTearOffHandle() bool TDEGlobalSettings::changeCursorOverIcon() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ChangeCursor", KDE_DEFAULT_CHANGECURSOR); } bool TDEGlobalSettings::visualActivate() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("VisualActivate", KDE_DEFAULT_VISUAL_ACTIVATE); } unsigned int TDEGlobalSettings::visualActivateSpeed() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry( "VisualActivateSpeed", @@ -160,14 +160,14 @@ unsigned int TDEGlobalSettings::visualActivateSpeed() int TDEGlobalSettings::autoSelectDelay() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry("AutoSelectDelay", KDE_DEFAULT_AUTOSELECTDELAY); } TDEGlobalSettings::Completion TDEGlobalSettings::completionMode() { int completion; - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); completion = g.readNumEntry("completionMode", -1); if ((completion < (int) CompletionNone) || (completion > (int) CompletionPopupAuto)) @@ -179,13 +179,13 @@ TDEGlobalSettings::Completion TDEGlobalSettings::completionMode() bool TDEGlobalSettings::showContextMenusOnPress () { - KConfigGroup g(TDEGlobal::config(), "ContextMenus"); + TDEConfigGroup g(TDEGlobal::config(), "ContextMenus"); return g.readBoolEntry("ShowOnPress", true); } int TDEGlobalSettings::contextMenuKey () { - KConfigGroup g(TDEGlobal::config(), "Shortcuts"); + TDEConfigGroup g(TDEGlobal::config(), "Shortcuts"); KShortcut cut (g.readEntry ("PopupMenuContext", "Menu")); return cut.keyCodeQt(); } @@ -193,7 +193,7 @@ int TDEGlobalSettings::contextMenuKey () TQColor TDEGlobalSettings::toolBarHighlightColor() { initColors(); - KConfigGroup g( TDEGlobal::config(), "Toolbar style" ); + TDEConfigGroup g( TDEGlobal::config(), "Toolbar style" ); return g.readColorEntry("HighlightColor", _trinity4Blue); } @@ -204,7 +204,7 @@ TQColor TDEGlobalSettings::inactiveTitleColor() #else if (!_inactiveBackground) _inactiveBackground = new TQColor(157, 170, 186); - KConfigGroup g( TDEGlobal::config(), "WM" ); + TDEConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "inactiveBackground", _inactiveBackground ); #endif } @@ -216,7 +216,7 @@ TQColor TDEGlobalSettings::inactiveTextColor() #else if (!_inactiveForeground) _inactiveForeground = new TQColor(221,221,221); - KConfigGroup g( TDEGlobal::config(), "WM" ); + TDEConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "inactiveForeground", _inactiveForeground ); #endif } @@ -229,7 +229,7 @@ TQColor TDEGlobalSettings::activeTitleColor() initColors(); if (!_activeBackground) _activeBackground = new TQColor(65,142,220); - KConfigGroup g( TDEGlobal::config(), "WM" ); + TDEConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "activeBackground", _activeBackground); #endif } @@ -239,14 +239,14 @@ TQColor TDEGlobalSettings::activeTextColor() #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)); #else - KConfigGroup g( TDEGlobal::config(), "WM" ); + TDEConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "activeForeground", tqwhiteptr ); #endif } int TDEGlobalSettings::contrast() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry( "contrast", 7 ); } @@ -254,13 +254,13 @@ TQColor TDEGlobalSettings::buttonBackground() { if (!_buttonBackground) _buttonBackground = new TQColor(221,223,228); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "buttonBackground", _buttonBackground ); } TQColor TDEGlobalSettings::buttonTextColor() { - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "buttonForeground", tqblackptr ); } @@ -269,7 +269,7 @@ TQColor TDEGlobalSettings::buttonTextColor() // TDEApplication::kdisplaySetPalette() TQColor TDEGlobalSettings::baseColor() { - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "windowBackground", tqwhiteptr ); } @@ -278,7 +278,7 @@ TQColor TDEGlobalSettings::baseColor() // TDEApplication::kdisplaySetPalette() TQColor TDEGlobalSettings::textColor() { - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "windowForeground", tqblackptr ); } @@ -287,7 +287,7 @@ TQColor TDEGlobalSettings::textColor() // TDEApplication::kdisplaySetPalette() TQColor TDEGlobalSettings::highlightedTextColor() { - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "selectForeground", tqwhiteptr ); } @@ -299,14 +299,14 @@ TQColor TDEGlobalSettings::highlightColor() initColors(); if (!_selectBackground) _selectBackground = new TQColor(103,141,178); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "selectBackground", _selectBackground ); } TQColor TDEGlobalSettings::alternateBackgroundColor() { initColors(); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); *alternateColor = calculateAlternateBackgroundColor( baseColor() ); return g.readColorEntry( "alternateBackground", alternateColor ); } @@ -330,7 +330,7 @@ TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base bool TDEGlobalSettings::shadeSortColumn() { - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readBoolEntry( "shadeSortColumn", KDE_DEFAULT_SHADE_SORT_COLUMN ); } @@ -339,7 +339,7 @@ TQColor TDEGlobalSettings::linkColor() initColors(); if (!_linkColor) _linkColor = new TQColor(0,0,238); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "linkColor", _linkColor ); } @@ -347,7 +347,7 @@ TQColor TDEGlobalSettings::visitedLinkColor() { if (!_visitedLinkColor) _visitedLinkColor = new TQColor(82,24,139); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "visitedLinkColor", _visitedLinkColor ); } @@ -361,7 +361,7 @@ TQFont TDEGlobalSettings::generalFont() _generalFont->setPointSize(10); _generalFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); *_generalFont = g.readFontEntry("font", _generalFont); return *_generalFont; @@ -377,7 +377,7 @@ TQFont TDEGlobalSettings::fixedFont() _fixedFont->setPointSize(10); _fixedFont->setStyleHint(TQFont::TypeWriter); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); *_fixedFont = g.readFontEntry("fixed", _fixedFont); return *_fixedFont; @@ -393,7 +393,7 @@ TQFont TDEGlobalSettings::toolBarFont() _toolBarFont->setPointSize(10); _toolBarFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); *_toolBarFont = g.readFontEntry("toolBarFont", _toolBarFont); return *_toolBarFont; @@ -409,7 +409,7 @@ TQFont TDEGlobalSettings::menuFont() _menuFont->setPointSize(10); _menuFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); *_menuFont = g.readFontEntry("menuFont", _menuFont); return *_menuFont; @@ -425,7 +425,7 @@ TQFont TDEGlobalSettings::windowTitleFont() _windowTitleFont->setPointSize(10); _windowTitleFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( TDEGlobal::config(), "WM" ); + TDEConfigGroup g( TDEGlobal::config(), "WM" ); *_windowTitleFont = g.readFontEntry("activeFont", _windowTitleFont); // inconsistency return *_windowTitleFont; @@ -441,7 +441,7 @@ TQFont TDEGlobalSettings::taskbarFont() _taskbarFont->setPointSize(10); _taskbarFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( TDEGlobal::config(), "General" ); + TDEConfigGroup g( TDEGlobal::config(), "General" ); *_taskbarFont = g.readFontEntry("taskbarFont", _taskbarFont); return *_taskbarFont; @@ -516,7 +516,7 @@ void TDEGlobalSettings::initStatic() // should be called initPaths(). Don't put s_trashPath = new TQString(); s_documentPath = new TQString(); - KConfigGroup g( TDEGlobal::config(), "Paths" ); + TDEConfigGroup g( TDEGlobal::config(), "Paths" ); // Read desktop and documents path using XDG_USER_DIRS readXdgUserDirs(s_desktopPath, s_documentPath); @@ -613,7 +613,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() KMouseSettings & s = *s_mouseSettings; // for convenience #ifndef Q_WS_WIN - KConfigGroup g( TDEGlobal::config(), "Mouse" ); + TDEConfigGroup g( TDEGlobal::config(), "Mouse" ); TQString setting = g.readEntry("MouseButtonMapping"); if (setting == "RightHanded") s.handed = KMouseSettings::RightHanded; @@ -678,7 +678,7 @@ bool TDEGlobalSettings::isMultiHead() bool TDEGlobalSettings::wheelMouseZooms() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry( "WheelMouseZooms", KDE_DEFAULT_WHEEL_ZOOM ); } @@ -687,7 +687,7 @@ TQRect TDEGlobalSettings::splashScreenDesktopGeometry() TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(TDEGlobal::config(), "Windows"); + TDEConfigGroup group(TDEGlobal::config(), "Windows"); int scr = group.readNumEntry("Unmanaged", -3); if (group.readBoolEntry("XineramaEnabled", true) && scr != -2) { if (scr == -3) @@ -706,7 +706,7 @@ TQRect TDEGlobalSettings::desktopGeometry(const TQPoint& point) TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(TDEGlobal::config(), "Windows"); + TDEConfigGroup group(TDEGlobal::config(), "Windows"); if (group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaPlacementEnabled", true)) { return dw->screenGeometry(dw->screenNumber(point)); @@ -723,7 +723,7 @@ TQRect TDEGlobalSettings::desktopGeometry(TQWidget* w) TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(TDEGlobal::config(), "Windows"); + TDEConfigGroup group(TDEGlobal::config(), "Windows"); if (group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaPlacementEnabled", true)) { if (w) @@ -739,14 +739,14 @@ TQRect TDEGlobalSettings::desktopGeometry(TQWidget* w) bool TDEGlobalSettings::showIconsOnPushButtons() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ShowIconsOnPushButtons", KDE_DEFAULT_ICON_ON_PUSHBUTTON); } bool TDEGlobalSettings::showFilePreview(const KURL &url) { - KConfigGroup g(TDEGlobal::config(), "PreviewSettings"); + TDEConfigGroup g(TDEGlobal::config(), "PreviewSettings"); TQString protocol = url.protocol(); bool defaultSetting = KProtocolInfo::showFilePreview( protocol ); return g.readBoolEntry(protocol, defaultSetting ); @@ -754,21 +754,21 @@ bool TDEGlobalSettings::showFilePreview(const KURL &url) bool TDEGlobalSettings::showKonqIconActivationEffect() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT); } bool TDEGlobalSettings::opaqueResize() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("OpaqueResize", KDE_DEFAULT_OPAQUE_RESIZE); } int TDEGlobalSettings::buttonLayout() { - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry("ButtonLayout", KDE_DEFAULT_BUTTON_LAYOUT); } diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h index 2d3adc5e1..7a9c42900 100644 --- a/tdecore/kglobalsettings.h +++ b/tdecore/kglobalsettings.h @@ -241,7 +241,7 @@ class TDECORE_EXPORT TDEGlobalSettings /** * DEPRECATED (starting from kde-3.4). * This isn't where the trash contents is, anymore. - * Use KIO::trash() to trash files, "trash:/" to list the trash contents. + * Use TDEIO::trash() to trash files, "trash:/" to list the trash contents. */ static TQString trashPath() { initStatic(); return *s_trashPath; } // KDE4: if you want to remove the above, move it to kdesktop/init.cc, which needs diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index 546ef99eb..4fd16a49a 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -63,7 +63,7 @@ KIconEffect::~KIconEffect() void KIconEffect::init() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); int i, j, effect=-1; TQStringList groups; @@ -86,7 +86,7 @@ void KIconEffect::init() TQString _none("none"); TQString _tomonochrome("tomonochrome"); - KConfigGroupSaver cs(config, "default"); + TDEConfigGroupSaver cs(config, "default"); for (it=groups.begin(), i=0; it!=groups.end(); it++, i++) { diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index 01aaa84fd..127f8eaba 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -214,8 +214,8 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs ) // These have to match the order in kicontheme.h static const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", 0L }; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs(config, "dummy"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs(config, "dummy"); // loading config and default sizes d->mpGroups = new KIconGroup[(int) KIcon::LastGroup]; diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h index 9cac06c5d..2357aef13 100644 --- a/tdecore/kiconloader.h +++ b/tdecore/kiconloader.h @@ -33,7 +33,7 @@ struct KIconGroup; class KIconThemeNode; -class KConfig; +class TDEConfig; struct KIconLoaderPrivate; class KStandardDirs; class KIconEffect; diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index 103d37a05..853c0ab78 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -52,7 +52,7 @@ public: class KIconThemeDir { public: - KIconThemeDir(const TQString& dir, const KConfigBase *config); + KIconThemeDir(const TQString& dir, const TDEConfigBase *config); bool isValid() const { return mbValid; } TQString iconPath(const TQString& name) const; @@ -139,7 +139,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) // Use KSharedConfig to avoid parsing the file many times, from each kinstance. // Need to keep a ref to it to make this useful d->sharedConfig = KSharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ ); - KConfig& cfg = *d->sharedConfig; + TDEConfig& cfg = *d->sharedConfig; //was: KSimpleConfig cfg(fileName); cfg.setGroup(mainSection); @@ -448,8 +448,8 @@ TQString KIconTheme::current() return *_theme; _theme = new TQString(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Icons"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Icons"); *_theme = config->readEntry("Theme",defaultThemeName()); if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); /* if (_theme->isEmpty()) @@ -516,7 +516,7 @@ TQString KIconTheme::defaultThemeName() /*** KIconThemeDir ***/ -KIconThemeDir::KIconThemeDir(const TQString& dir, const KConfigBase *config) +KIconThemeDir::KIconThemeDir(const TQString& dir, const TDEConfigBase *config) { mbValid = false; mDir = dir; diff --git a/tdecore/kicontheme.h b/tdecore/kicontheme.h index 9aa4d8e32..b20dd6340 100644 --- a/tdecore/kicontheme.h +++ b/tdecore/kicontheme.h @@ -19,7 +19,7 @@ #include #include "tdelibs_export.h" -class KConfig; +class TDEConfig; class KIconThemeDir; class KIconThemePrivate; diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp index 13e29c049..9b4b7c2c7 100644 --- a/tdecore/kinstance.cpp +++ b/tdecore/kinstance.cpp @@ -195,7 +195,7 @@ void TDEInstance::setConfigReadOnly(bool ro) m_configReadOnly = ro; } -KConfig *TDEInstance::config() const +TDEConfig *TDEInstance::config() const { DEBUG_CHECK_ALIVE if( _config == 0 ) { diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h index 775fe3bdf..8178fe9c5 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -20,7 +20,7 @@ class KStandardDirs; class TDEAboutData; -class KConfig; +class TDEConfig; class KIconLoader; class KCharsets; class TQFont; @@ -86,13 +86,13 @@ class TDECORE_EXPORT TDEInstance /** * Returns the general config object ("appnamerc"). - * @return the KConfig object for the instance. + * @return the TDEConfig object for the instance. */ - KConfig *config() const; + TDEConfig *config() const; /** * Returns the general config object ("appnamerc"). - * @return the KConfig object for the instance. + * @return the TDEConfig object for the instance. */ KSharedConfig *sharedConfig() const; @@ -165,7 +165,7 @@ protected: private: mutable KStandardDirs *_dirs; - mutable KConfig *_config; + mutable TDEConfig *_config; mutable KIconLoader *_iconLoader; mutable TDEHardwareDevices *_hardwaredevices; diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index d0ec7583d..e7673debb 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -361,7 +361,7 @@ bool initializeMods() XFreeModifiermap( xmk ); - //KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + //TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); // read in mod that win should be attached to g_bInitializedMods = true; @@ -380,7 +380,7 @@ static void initializeVariations() static void intializeKKeyLabels() { - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); g_rgModInfo[0].sLabel = TDEGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) ); g_rgModInfo[1].sLabel = TDEGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) ); g_rgModInfo[2].sLabel = TDEGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) ); diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp index 6b64abbd8..4c60bed43 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -62,12 +62,12 @@ public: TQValueList catalogues; // list of all loaded catalogs, contains one instance per catalog name and language TQString encoding; TQTextCodec * codecForEncoding; - KConfig * config; + TDEConfig * config; bool formatInited; int /*TQPrinter::PageSize*/ pageSize; KLocale::MeasureSystem measureSystem; TQStringList langTwoAlpha; - KConfig *languages; + TDEConfig *languages; TQString calendarType; KCalendarSystem * calendar; @@ -81,7 +81,7 @@ public: static KLocale *this_klocale = 0; -KLocale::KLocale( const TQString & catalog, KConfig * config ) +KLocale::KLocale( const TQString & catalog, TDEConfig * config ) { d = new KLocalePrivate; d->config = config; @@ -92,7 +92,7 @@ KLocale::KLocale( const TQString & catalog, KConfig * config ) initEncoding(0); initFileNameEncoding(0); - KConfig *cfg = d->config; + TDEConfig *cfg = d->config; this_klocale = this; if (!cfg) cfg = TDEGlobal::instance()->config(); this_klocale = 0; @@ -103,12 +103,12 @@ KLocale::KLocale( const TQString & catalog, KConfig * config ) initMainCatalogues(catalog); } -TQString KLocale::_initLanguage(KConfigBase *config) +TQString KLocale::_initLanguage(TDEConfigBase *config) { if (this_klocale) { // ### HPB Why this cast?? - this_klocale->initLanguageList((KConfig *) config, true); + this_klocale->initLanguageList((TDEConfig *) config, true); // todo: adapt current catalog list: remove unused languages, insert main catalogs, if not already found return this_klocale->language(); } @@ -144,9 +144,9 @@ void KLocale::initMainCatalogues(const TQString & catalog) } } -void KLocale::initLanguageList(KConfig * config, bool useEnv) +void KLocale::initLanguageList(TDEConfig * config, bool useEnv) { - KConfigGroupSaver saver(config, "Locale"); + TDEConfigGroupSaver saver(config, "Locale"); m_country = config->readEntry( "Country" ); if ( m_country.isEmpty() ) @@ -297,19 +297,19 @@ void KLocale::doFormatInit() const void KLocale::initFormat() { - KConfig *config = d->config; + TDEConfig *config = d->config; if (!config) config = TDEGlobal::instance()->config(); Q_ASSERT( config ); kdDebug(173) << "KLocale::initFormat" << endl; // make sure the config files are read using the correct locale - // ### Why not add a KConfigBase::setLocale( const KLocale * )? + // ### Why not add a TDEConfigBase::setLocale( const KLocale * )? // ### Then we could remove this hack KLocale *lsave = TDEGlobal::_locale; TDEGlobal::_locale = this; - KConfigGroupSaver saver(config, "Locale"); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig entry(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") @@ -2054,7 +2054,7 @@ bool KLocale::useDefaultLanguage() const return language() == defaultLanguage(); } -void KLocale::initEncoding(KConfig *) +void KLocale::initEncoding(TDEConfig *) { const int mibDefault = 4; // ISO 8859-1 @@ -2070,7 +2070,7 @@ void KLocale::initEncoding(KConfig *) Q_ASSERT( d->codecForEncoding ); } -void KLocale::initFileNameEncoding(KConfig *) +void KLocale::initFileNameEncoding(TDEConfig *) { // If the following environment variable is set, assume all filenames // are in UTF-8 regardless of the current C locale. @@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const TQStringList result; - KConfig config(TQString::fromLatin1("language.codes"), true, false); + TDEConfig config(TQString::fromLatin1("language.codes"), true, false); config.setGroup("TwoLetterCodes"); for ( TQStringList::ConstIterator it = origList.begin(); @@ -2359,7 +2359,7 @@ TQStringList KLocale::languagesTwoAlpha() const TQStringList KLocale::allLanguagesTwoAlpha() const { if (!d->languages) - d->languages = new KConfig("all_languages", true, false, "locale"); + d->languages = new TDEConfig("all_languages", true, false, "locale"); return d->languages->groupList(); } @@ -2367,7 +2367,7 @@ TQStringList KLocale::allLanguagesTwoAlpha() const TQString KLocale::twoAlphaToLanguageName(const TQString &code) const { if (!d->languages) - d->languages = new KConfig("all_languages", true, false, "locale"); + d->languages = new TDEConfig("all_languages", true, false, "locale"); TQString groupName = code; const int i = groupName.find('_'); @@ -2393,7 +2393,7 @@ TQStringList KLocale::allCountriesTwoAlpha() const TQString KLocale::twoAlphaToCountryName(const TQString &code) const { - KConfig cfg("l10n/"+code.lower()+"/entry.desktop", true, false, "locale"); + TDEConfig cfg("l10n/"+code.lower()+"/entry.desktop", true, false, "locale"); cfg.setGroup("KCM Locale"); return cfg.readEntry("Name"); } diff --git a/tdecore/klocale.h b/tdecore/klocale.h index 42619afd4..7a8e05e98 100644 --- a/tdecore/klocale.h +++ b/tdecore/klocale.h @@ -32,8 +32,8 @@ class TQTime; class TQDateTime; class TDEGlobal; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; class KLocalePrivate; class KCatalogue; class KCalendarSystem; @@ -141,7 +141,7 @@ public: * @param catalog The name of the main language file * @param config The configuration file to use. */ - KLocale( const TQString& catalog, KConfig *config = 0 ); + KLocale( const TQString& catalog, TDEConfig *config = 0 ); /** * Copy constructor. @@ -1138,9 +1138,9 @@ public: /** - * @internal Called from KConfigBackend to initialize language. + * @internal Called from TDEConfigBackend to initialize language. */ - static TQString _initLanguage(KConfigBase *config); + static TQString _initLanguage(TDEConfigBase *config); #ifdef KDE_NO_COMPAT private: @@ -1185,7 +1185,7 @@ private: * * @param config The configuration object used for init. */ - void initFormat(KConfig *config); + void initFormat(TDEConfig *config); /** * @internal Initializes the catalogs appname, tdelibs and kio for all chosen languages. @@ -1203,20 +1203,20 @@ private: * @param config The configuration object used for init * @param useEnv True if we should use environment variables */ - void initLanguageList(KConfig * config, bool useEnv); + void initLanguageList(TDEConfig * config, bool useEnv); /** * @internal Figures out which encoding the user prefers. * * @param config The configuration object used for init */ - void initEncoding(KConfig * config); + void initEncoding(TDEConfig * config); /** * @internal Figures out which encoding the user prefers for filenames * and sets up the appropriate TQFile encoding and decoding functions. */ - void initFileNameEncoding(KConfig *config); + void initFileNameEncoding(TDEConfig *config); /** * @internal A TQFile filename encoding function (TQFile::encodeFn). diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index e84c8c44a..e5d088dcb 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -51,12 +51,12 @@ static bool canAvoidStartupEvent( const TQString& event, const TQString& appname return false; } // starttde event is in global events file - static KConfig* configfile = appname != "ksmserver" - ? new KConfig( appname + ".eventsrc", true, false ) - : new KConfig( "knotify.eventsrc", true, false ); - static KConfig* eventsfile = appname != "ksmserver" - ? new KConfig( appname + "/eventsrc", true, false, "data" ) - : new KConfig( "knotify/eventsrc", true, false, "data" ); + static TDEConfig* configfile = appname != "ksmserver" + ? new TDEConfig( appname + ".eventsrc", true, false ) + : new TDEConfig( "knotify.eventsrc", true, false ); + static TDEConfig* eventsfile = appname != "ksmserver" + ? new TDEConfig( appname + "/eventsrc", true, false, "data" ) + : new TDEConfig( "knotify/eventsrc", true, false, "data" ); configfile->setGroup( event ); eventsfile->setGroup( event ); int ev1 = configfile->readNumEntry( "presentation", -2 ); @@ -178,7 +178,7 @@ int KNotifyClient::getPresentation(const TQString &eventname) int present; if (eventname.isEmpty()) return Default; - KConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false); + TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false); eventsfile.setGroup(eventname); present=eventsfile.readNumEntry("presentation", -1); @@ -190,7 +190,7 @@ TQString KNotifyClient::getFile(const TQString &eventname, int present) { if (eventname.isEmpty()) return TQString::null; - KConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false); + TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false); eventsfile.setGroup(eventname); switch (present) @@ -209,7 +209,7 @@ int KNotifyClient::getDefaultPresentation(const TQString &eventname) int present; if (eventname.isEmpty()) return Default; - KConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data"); + TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data"); eventsfile.setGroup(eventname); present=eventsfile.readNumEntry("default_presentation", -1); @@ -221,7 +221,7 @@ TQString KNotifyClient::getDefaultFile(const TQString &eventname, int present) { if (eventname.isEmpty()) return TQString::null; - KConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data"); + TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data"); eventsfile.setGroup(eventname); switch (present) @@ -332,8 +332,8 @@ KNotifyClient::Instance::Instance(TDEInstance *instance) d->instance = instance; instances()->push(this); - KConfig *config = instance->config(); - KConfigGroupSaver cs( config, "General" ); + TDEConfig *config = instance->config(); + TDEConfigGroupSaver cs( config, "General" ); d->useSystemBell = config->readBoolEntry( "UseSystemBell", false ); } diff --git a/tdecore/krootprop.h b/tdecore/krootprop.h index 002790ca4..f1a72d265 100644 --- a/tdecore/krootprop.h +++ b/tdecore/krootprop.h @@ -33,14 +33,14 @@ class KRootPropPrivate; /** * Access KDE desktop resources stored on the root window. * -* A companion to the KConfig class. +* A companion to the TDEConfig class. * * The KRootProp class is used for reading and writing configuration entries * to properties on the root window. * * All configuration entries are of the form "key=value". * -* @see KConfig::KConfig +* @see TDEConfig::TDEConfig * @author Mark Donohoe (donohe@kde.org) */ class TDECORE_EXPORT KRootProp diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp index 9666f7aab..fcfc48b48 100644 --- a/tdecore/kshortcutlist.cpp +++ b/tdecore/kshortcutlist.cpp @@ -68,7 +68,7 @@ bool KShortcutList::setOther( Other, uint, TQVariant ) return false; } -bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pConfig ) +bool KShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig ) { kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) @@ -84,7 +84,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo kdDebug(125) << "\treadSettings( \"" << sGroup << "\", " << pConfig << " )" << endl; if( !pConfig->hasGroup( sGroup ) ) return true; - KConfigGroupSaver cgs( pConfig, sGroup ); + TDEConfigGroupSaver cgs( pConfig, sGroup ); uint nSize = count(); for( uint i = 0; i < nSize; i++ ) { @@ -106,7 +106,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo return true; } -bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const +bool KShortcutList::writeSettings( const TQString &sConfigGroup, TDEConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const { kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl; if( !pConfig ) @@ -118,7 +118,7 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC if( pConfig->hasGroup( "Keys" ) ) pConfig->deleteGroup( "Keys", true ); - KConfigGroupSaver cs( pConfig, sGroup ); + TDEConfigGroupSaver cs( pConfig, sGroup ); uint nSize = count(); for( uint i = 0; i < nSize; i++ ) { diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h index 497bfaf15..7f4caa079 100644 --- a/tdecore/kshortcutlist.h +++ b/tdecore/kshortcutlist.h @@ -25,7 +25,7 @@ #include "tdelibs_export.h" class TQVariant; -class KConfigBase; +class TDEConfigBase; class TDEInstance; class KKeySequence; class KShortcut; @@ -162,7 +162,7 @@ class TDECORE_EXPORT KShortcutList * @param pConfig the configuration file to load from * @return true if successful, false otherwise */ - virtual bool readSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ); + virtual bool readSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 ); /** * Writes the shortcuts to the given configuration file. @@ -173,7 +173,7 @@ class TDECORE_EXPORT KShortcutList * @param bGlobal true to write to the global configuration file * @return true if successful, false otherwise */ - virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0, + virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0, bool bWriteAll = false, bool bGlobal = false ) const; protected: diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 5c17b665d..5c0203a9f 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -38,9 +38,9 @@ #include "ksimpleconfig.h" KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { - // the difference between KConfig and KSimpleConfig is just that + // the difference between TDEConfig and KSimpleConfig is just that // for KSimpleConfig an absolute filename is guaranteed if (!fileName.isNull() && TQDir::isRelativePath(fileName)) { backEnd->changeFileName( TDEGlobal::dirs()-> @@ -52,16 +52,16 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) reparseConfiguration(); } -KSimpleConfig::KSimpleConfig(KConfigBackEnd *backEnd, bool bReadOnly) - : KConfig(backEnd, bReadOnly) +KSimpleConfig::KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly) + : TDEConfig(backEnd, bReadOnly) {} KSimpleConfig::~KSimpleConfig() { // we need to call the KSimpleConfig version of sync. Relying on the - // regular KConfig sync is bad, because the KSimpleConfig sync has + // regular TDEConfig sync is bad, because the KSimpleConfig sync has // different behavior. Syncing here will insure that the sync() call - // in the KConfig destructor doesn't actually do anything. + // in the TDEConfig destructor doesn't actually do anything. sync(); } @@ -76,6 +76,6 @@ void KSimpleConfig::sync() } void KSimpleConfig::virtual_hook( int id, void* data ) -{ KConfig::virtual_hook( id, data ); } +{ TDEConfig::virtual_hook( id, data ); } #include "ksimpleconfig.moc" diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h index c7efeecfa..326fc8094 100644 --- a/tdecore/ksimpleconfig.h +++ b/tdecore/ksimpleconfig.h @@ -28,17 +28,17 @@ class KSimpleConfigPrivate; /** * KDE Configuration entries * - * This is a trivial extension of KConfig for applications that need + * This is a trivial extension of TDEConfig for applications that need * only one configuration file and no default system. - * A difference with KConfig is that when the data in memory is written back + * A difference with TDEConfig is that when the data in memory is written back * it is not merged with what is on disk. * Whatever is in memory simply replaces what is on disk entirely. * * @author Kalle Dalheimer , Preston Brown - * @see KConfigBase KConfig + * @see TDEConfigBase TDEConfig * @short KDE Configuration Management class with deletion ability */ -class TDECORE_EXPORT KSimpleConfig : public KConfig +class TDECORE_EXPORT KSimpleConfig : public TDEConfig { Q_OBJECT @@ -55,7 +55,7 @@ public: */ KSimpleConfig( const TQString &fileName, bool bReadOnly = false); - KSimpleConfig(KConfigBackEnd *backEnd, bool bReadOnly = false); + KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false); /** * Destructor. diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp index 9552c4104..08d686beb 100644 --- a/tdecore/ksimpledirwatch.cpp +++ b/tdecore/ksimpledirwatch.cpp @@ -214,7 +214,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() delayRemove = false; m_ref = 0; - KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); + TDEConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); m_PollInterval = config.readNumEntry("PollInterval", 500); diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp index 10c694512..96526463a 100644 --- a/tdecore/ksock.cpp +++ b/tdecore/ksock.cpp @@ -89,21 +89,21 @@ extern "C" { #include "tqwindowdefs.h" #endif -class KSocketPrivate +class TDESocketPrivate { public: TQSocketNotifier *readNotifier; TQSocketNotifier *writeNotifier; - KSocketPrivate() : + TDESocketPrivate() : readNotifier(0), writeNotifier(0) { } }; // I moved this into here so we could accurately detect the domain, for // posterity. Really. -KSocket::KSocket( int _sock) - : sock(_sock), d(new KSocketPrivate) +TDESocket::TDESocket( int _sock) + : sock(_sock), d(new TDESocketPrivate) { struct sockaddr_in sin; ksocklen_t len = sizeof(sin); @@ -116,19 +116,19 @@ KSocket::KSocket( int _sock) KSocks::self()->getsockname(_sock, (struct sockaddr *)&sin, &len); } -KSocket::KSocket( const char *_host, unsigned short int _port, int _timeout ) : - sock( -1 ), d(new KSocketPrivate) +TDESocket::TDESocket( const char *_host, unsigned short int _port, int _timeout ) : + sock( -1 ), d(new TDESocketPrivate) { connect( _host, _port, _timeout ); } -KSocket::KSocket( const char *_path ) : - sock( -1 ), d(new KSocketPrivate) +TDESocket::TDESocket( const char *_path ) : + sock( -1 ), d(new TDESocketPrivate) { connect( _path ); } -void KSocket::enableRead( bool _state ) +void TDESocket::enableRead( bool _state ) { if ( _state ) { @@ -144,7 +144,7 @@ void KSocket::enableRead( bool _state ) d->readNotifier->setEnabled( false ); } -void KSocket::enableWrite( bool _state ) +void TDESocket::enableWrite( bool _state ) { if ( _state ) { @@ -161,7 +161,7 @@ void KSocket::enableWrite( bool _state ) d->writeNotifier->setEnabled( false ); } -void KSocket::slotRead( int ) +void TDESocket::slotRead( int ) { char buffer[2]; @@ -172,7 +172,7 @@ void KSocket::slotRead( int ) emit readEvent( this ); } -void KSocket::slotWrite( int ) +void TDESocket::slotWrite( int ) { emit writeEvent( this ); } @@ -180,7 +180,7 @@ void KSocket::slotWrite( int ) /* * Connects the PF_UNIX domain socket to _path. */ -bool KSocket::connect( const char *_path ) +bool TDESocket::connect( const char *_path ) { KExtendedSocket ks(TQString::null, _path, KExtendedSocket::unixSocket); @@ -194,7 +194,7 @@ bool KSocket::connect( const char *_path ) /* * Connects the socket to _host, _port. */ -bool KSocket::connect( const TQString& _host, unsigned short int _port, int _timeout ) +bool TDESocket::connect( const TQString& _host, unsigned short int _port, int _timeout ) { KExtendedSocket ks(_host, _port, KExtendedSocket::inetSocket); ks.setTimeout(_timeout, 0); @@ -208,10 +208,10 @@ bool KSocket::connect( const TQString& _host, unsigned short int _port, int _tim // only for doxygen - the define is always true as defined above #ifdef KSOCK_NO_BROKEN -unsigned long KSocket::ipv4_addr() +unsigned long TDESocket::ipv4_addr() { unsigned long retval = 0; - KSocketAddress *sa = KExtendedSocket::peerAddress(sock); + TDESocketAddress *sa = KExtendedSocket::peerAddress(sock); if (sa == NULL) return 0; @@ -230,12 +230,12 @@ unsigned long KSocket::ipv4_addr() return retval; } -bool KSocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain) +bool TDESocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain) { // This function is now IPv4 only // if you want something better, you should use KExtendedSocket::lookup yourself - kdWarning(170) << "deprecated KSocket::initSockaddr called" << endl; + kdWarning(170) << "deprecated TDESocket::initSockaddr called" << endl; if (domain != PF_INET) return false; @@ -255,13 +255,13 @@ bool KSocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, uns return false; memcpy(server_name, sin->addressV4(), sizeof(*server_name)); - kdDebug(170) << "KSocket::initSockaddr: returning " << sin->pretty() << endl; + kdDebug(170) << "TDESocket::initSockaddr: returning " << sin->pretty() << endl; return true; } #endif -KSocket::~KSocket() +TDESocket::~TDESocket() { // Coolo says delete 0 is ok :) -thiago delete d->readNotifier; @@ -274,7 +274,7 @@ KSocket::~KSocket() } } -class KServerSocketPrivate +class TDEServerSocketPrivate { public: bool bind; @@ -284,25 +284,25 @@ public: }; -KServerSocket::KServerSocket( const char *_path, bool _bind ) : +TDEServerSocket::TDEServerSocket( const char *_path, bool _bind ) : sock( -1 ) { - d = new KServerSocketPrivate(); + d = new TDEServerSocketPrivate(); d->bind = _bind; init ( _path ); } -KServerSocket::KServerSocket( unsigned short int _port, bool _bind ) : +TDEServerSocket::TDEServerSocket( unsigned short int _port, bool _bind ) : sock( -1 ) { - d = new KServerSocketPrivate(); + d = new TDEServerSocketPrivate(); d->bind = _bind; init ( _port ); } -bool KServerSocket::init( const char *_path ) +bool TDEServerSocket::init( const char *_path ) { unlink(_path ); d->path = _path; @@ -317,7 +317,7 @@ bool KServerSocket::init( const char *_path ) } -bool KServerSocket::init( unsigned short int _port ) +bool TDEServerSocket::init( unsigned short int _port ) { d->port = _port; KExtendedSocket *ks; @@ -330,7 +330,7 @@ bool KServerSocket::init( unsigned short int _port ) return true; } -bool KServerSocket::bindAndListen() +bool TDEServerSocket::bindAndListen() { if (d == NULL || d->ks == NULL) return false; @@ -354,11 +354,11 @@ bool KServerSocket::bindAndListen() } -unsigned short int KServerSocket::port() +unsigned short int TDEServerSocket::port() { if (d == NULL || d->ks == NULL || sock == -1) return 0; - const KSocketAddress *sa = d->ks->localAddress(); + const TDESocketAddress *sa = d->ks->localAddress(); if (sa == NULL) return 0; @@ -378,11 +378,11 @@ unsigned short int KServerSocket::port() return 0; // not a port we know } -unsigned long KServerSocket::ipv4_addr() +unsigned long TDEServerSocket::ipv4_addr() { if (d == NULL || d->ks == NULL || sock == -1) return 0; - const KSocketAddress *sa = d->ks->localAddress(); + const TDESocketAddress *sa = d->ks->localAddress(); const sockaddr_in *sin = (sockaddr_in*)sa->address(); @@ -401,7 +401,7 @@ unsigned long KServerSocket::ipv4_addr() return 0; // this is dumb, isn't it? } -void KServerSocket::slotAccept( int ) +void TDEServerSocket::slotAccept( int ) { if (d == NULL || d->ks == NULL || sock == -1) return; // nothing! @@ -417,10 +417,10 @@ void KServerSocket::slotAccept( int ) s->release(); // we're getting rid of the KExtendedSocket delete s; - emit accepted( new KSocket( new_sock ) ); + emit accepted( new TDESocket( new_sock ) ); } -KServerSocket::~KServerSocket() +TDEServerSocket::~TDEServerSocket() { if (d != NULL) { diff --git a/tdecore/ksock.h b/tdecore/ksock.h index d6e4515ea..cdf4ad1ac 100644 --- a/tdecore/ksock.h +++ b/tdecore/ksock.h @@ -65,8 +65,8 @@ typedef sockaddr_in ksockaddr_in; #define KSOCK_DEFAULT_DOMAIN PF_INET -class KSocketPrivate; -class KServerSocketPrivate; +class TDESocketPrivate; +class TDEServerSocketPrivate; /** @deprecated * You can connect this socket to any Internet address. @@ -79,7 +79,7 @@ class KServerSocketPrivate; * Using socket() you get a file descriptor * which you can use with the usual UNIX function like write() or * read(). - * If you have already such a socket identifier you can construct a KSocket + * If you have already such a socket identifier you can construct a TDESocket * on this identifier. * * If socket() delivers a value of -1 or less, the connection @@ -88,33 +88,33 @@ class KServerSocketPrivate; * @author Torben Weis * @short A TCP/IP client socket. */ -class TDECORE_EXPORT KSocket : public TQObject +class TDECORE_EXPORT TDESocket : public TQObject { Q_OBJECT public: /** - * Constructs a KSocket with the provided file descriptor. + * Constructs a TDESocket with the provided file descriptor. * @param _sock The file descriptor to use. */ - KSocket( int _sock ) KDE_DEPRECATED; + TDESocket( int _sock ) KDE_DEPRECATED; /** * Creates a socket and connects to a host. * @param _host The remote host to which to connect. * @param _port The port on the remote host. * @param timeOut The number of seconds waiting for connect (default 30). */ - KSocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED; + TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED; /** * Connects to a UNIX domain socket. * @param _path The filename of the socket. */ - KSocket( const char * _path ) KDE_DEPRECATED; + TDESocket( const char * _path ) KDE_DEPRECATED; /** * Destructor. Closes the socket if it is still open. */ - virtual ~KSocket(); + virtual ~TDESocket(); /** * Returns a file descriptor for this socket. @@ -171,9 +171,9 @@ signals: * * This signal will only be raised if enableRead( @p true ) was called * first. - * @param s the KSocket that triggered the event + * @param s the TDESocket that triggered the event */ - void readEvent( KSocket *s ); + void readEvent( TDESocket *s ); /** * Socket is ready for writing. @@ -184,15 +184,15 @@ signals: * Warning: If you forget to call enableWrite(false) when you are * not ready to send data, you will get lots of writeEvent() signals, * in the order of thousands a second ! - * @param s the KSocket that triggered the event + * @param s the TDESocket that triggered the event */ - void writeEvent( KSocket *s ); + void writeEvent( TDESocket *s ); /** * Raised when the connection is broken. - * @param s the KSocket that triggered the event + * @param s the TDESocket that triggered the event */ - void closeEvent( KSocket *s ); + void closeEvent( TDESocket *s ); public slots: /** @@ -224,10 +224,10 @@ protected: int sock; private: - KSocket(const KSocket&); - KSocket& operator=(const KSocket&); + TDESocket(const TDESocket&); + TDESocket& operator=(const TDESocket&); - KSocketPrivate *d; + TDESocketPrivate *d; }; @@ -239,19 +239,19 @@ private: * This class is deprecated and will be removed in the future. * Please use the classes in KNetwork for new programs. * In special, this class is replaced by KNetwork::KStreamSocket - * and KNetwork::KServerSocket. + * and KNetwork::TDEServerSocket. * - * You can use a KServerSocket to listen on a port for incoming - * connections. When a connection arrived in the port, a KSocket + * You can use a TDEServerSocket to listen on a port for incoming + * connections. When a connection arrived in the port, a TDESocket * is created and the signal accepted is raised. Make sure you * always connect to this signal. If you don't the ServerSocket will - * create new KSocket's and no one will delete them! + * create new TDESocket's and no one will delete them! * * If socket() is -1 or less the socket was not created properly. * * @author Torben Weis */ -class TDECORE_EXPORT KServerSocket : public TQObject +class TDECORE_EXPORT TDEServerSocket : public TQObject { Q_OBJECT public: @@ -262,7 +262,7 @@ public: * This gives you the opportunity to set options on the * socket. */ - KServerSocket( unsigned short int _port, bool _bind = true ); + TDEServerSocket( unsigned short int _port, bool _bind = true ); /** * Creates a UNIX domain server socket. @@ -271,12 +271,12 @@ public: * This gives you the opportunity to set options on the * socket. */ - KServerSocket( const char *_path, bool _bind = true); + TDEServerSocket( const char *_path, bool _bind = true); /** * Destructor. Closes the socket if it was not already closed. */ - virtual ~KServerSocket(); + virtual ~TDEServerSocket(); /** * Binds the socket and start listening. This should only be called @@ -319,14 +319,14 @@ public slots: signals: /** * A connection has been accepted. - * It is your task to delete the KSocket if it is no longer needed. + * It is your task to delete the TDESocket if it is no longer needed. * * WARNING: this signal is always emitted, even if you don't connect - * anything to it. That would mean memory loss, because the KSockets + * anything to it. That would mean memory loss, because the TDESockets * created go to oblivion. * @param s the socket that accepted */ - void accepted( KSocket*s ); + void accepted( TDESocket*s ); protected: bool init( unsigned short int ); @@ -339,10 +339,10 @@ protected: int sock; private: - KServerSocket(const KServerSocket&); - KServerSocket& operator=(const KServerSocket&); + TDEServerSocket(const TDEServerSocket&); + TDEServerSocket& operator=(const TDEServerSocket&); - KServerSocketPrivate *d; + TDEServerSocketPrivate *d; }; #endif //Q_OS_UNIX diff --git a/tdecore/ksockaddr.cpp b/tdecore/ksockaddr.cpp index 899f32dba..cd2f9c93c 100644 --- a/tdecore/ksockaddr.cpp +++ b/tdecore/ksockaddr.cpp @@ -77,10 +77,10 @@ /** - * Class KSocketAddress + * Class TDESocketAddress */ -KSocketAddress::KSocketAddress(const sockaddr* sa, ksocklen_t size) +TDESocketAddress::TDESocketAddress(const sockaddr* sa, ksocklen_t size) { if ( !sa ) init(); @@ -94,44 +94,44 @@ KSocketAddress::KSocketAddress(const sockaddr* sa, ksocklen_t size) } } -void KSocketAddress::init() +void TDESocketAddress::init() { data = NULL; datasize = 0; owndata = false; } -KSocketAddress::~KSocketAddress() +TDESocketAddress::~TDESocketAddress() { if (owndata && data != NULL) free(data); } -TQString KSocketAddress::pretty() const +TQString TDESocketAddress::pretty() const { return i18n(""); } -int KSocketAddress::family() const +int TDESocketAddress::family() const { if (data != NULL) return data->sa_family; return AF_UNSPEC; } -// This creates a new KSocketAddress with given sockaddr -KSocketAddress* KSocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t size) +// This creates a new TDESocketAddress with given sockaddr +TDESocketAddress* TDESocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t size) { if (size == 0) { - kdWarning() << "KSocketAddress::newAddress called with size = 0!\n"; + kdWarning() << "TDESocketAddress::newAddress called with size = 0!\n"; return NULL; } // make sure we have the right stuff if (size < MIN_SOCKADDR_LEN) { - kdWarning() << "KSocketAddress::newAddress called with invalid size\n"; + kdWarning() << "TDESocketAddress::newAddress called with invalid size\n"; return NULL; } @@ -153,10 +153,10 @@ KSocketAddress* KSocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t return new KUnixSocketAddress((const sockaddr_un*)sa, size); } - return new KSocketAddress(sa, size); + return new TDESocketAddress(sa, size); } -bool KSocketAddress::isEqual(const KSocketAddress& other) const +bool TDESocketAddress::isEqual(const TDESocketAddress& other) const { switch(family()) { @@ -176,7 +176,7 @@ bool KSocketAddress::isEqual(const KSocketAddress& other) const return memcmp(data, other.data, datasize) == 0; } -bool KSocketAddress::isCoreEqual(const KSocketAddress& other) const +bool TDESocketAddress::isCoreEqual(const TDESocketAddress& other) const { switch(family()) { @@ -193,17 +193,17 @@ bool KSocketAddress::isCoreEqual(const KSocketAddress& other) const return false; } -TQString KSocketAddress::nodeName() const +TQString TDESocketAddress::nodeName() const { return TQString::null; } -TQString KSocketAddress::serviceName() const +TQString TDESocketAddress::serviceName() const { return TQString::null; } -int KSocketAddress::ianaFamily(int af) +int TDESocketAddress::ianaFamily(int af) { switch (af) { @@ -218,7 +218,7 @@ int KSocketAddress::ianaFamily(int af) } } -int KSocketAddress::fromIanaFamily(int iana) +int TDESocketAddress::fromIanaFamily(int iana) { switch (iana) { @@ -274,7 +274,7 @@ KInetSocketAddress::KInetSocketAddress() : } KInetSocketAddress::KInetSocketAddress(const KInetSocketAddress &other) : - KSocketAddress(), d(new KInetSocketAddressPrivate) + TDESocketAddress(), d(new KInetSocketAddressPrivate) { setAddress(other); } @@ -313,7 +313,7 @@ KInetSocketAddress::~KInetSocketAddress() { delete d; - // KSocketAddress::~KSocketAddress(); + // TDESocketAddress::~TDESocketAddress(); } bool KInetSocketAddress::setAddress(const KInetSocketAddress &other) @@ -626,7 +626,7 @@ ksocklen_t KInetSocketAddress::size() const return 0; } -bool KInetSocketAddress::areEqualInet(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly) +bool KInetSocketAddress::areEqualInet(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly) { if (s1.family() != s2.family()) return false; @@ -643,7 +643,7 @@ bool KInetSocketAddress::areEqualInet(const KSocketAddress &s1, const KSocketAdd (memcmp(&sin1->sin_addr, &sin2->sin_addr, sizeof(struct in_addr)) == 0); } -bool KInetSocketAddress::areEqualInet6(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly) +bool KInetSocketAddress::areEqualInet6(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly) { #ifdef AF_INET6 if (s1.family() != s2.family()) @@ -688,7 +688,7 @@ void KInetSocketAddress::fromV4() # endif #endif - // data == KSocketAddress::data + // data == TDESocketAddress::data data = (sockaddr*)&d->sin; datasize = sizeof( sockaddr_in ); } @@ -864,7 +864,7 @@ const sockaddr_un* KUnixSocketAddress::address() const return d->m_sun; } -bool KUnixSocketAddress::areEqualUnix(const KSocketAddress &s1, const KSocketAddress &s2, bool /* coreOnly */) +bool KUnixSocketAddress::areEqualUnix(const TDESocketAddress &s1, const TDESocketAddress &s2, bool /* coreOnly */) { if (s1.family() != s2.family()) return false; @@ -881,14 +881,14 @@ bool KUnixSocketAddress::areEqualUnix(const KSocketAddress &s1, const KSocketAdd return (strcmp(sun1->sun_path, sun2->sun_path) == 0); } -void KSocketAddress::virtual_hook( int, void* ) +void TDESocketAddress::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } void KInetSocketAddress::virtual_hook( int id, void* data ) -{ KSocketAddress::virtual_hook( id, data ); } +{ TDESocketAddress::virtual_hook( id, data ); } void KUnixSocketAddress::virtual_hook( int id, void* data ) -{ KSocketAddress::virtual_hook( id, data ); } +{ TDESocketAddress::virtual_hook( id, data ); } #include "ksockaddr.moc" diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h index fd73e722a..d3eb62d0d 100644 --- a/tdecore/ksockaddr.h +++ b/tdecore/ksockaddr.h @@ -34,7 +34,7 @@ struct sockaddr; class KExtendedSocket; // No need to define it fully -class KSocketAddressPrivate; +class TDESocketAddressPrivate; /** * A socket address. * @@ -43,27 +43,27 @@ class KSocketAddressPrivate; * @author Thiago Macieira * @short a socket address. */ -class TDECORE_EXPORT KSocketAddress: public TQObject +class TDECORE_EXPORT TDESocketAddress: public TQObject { Q_OBJECT protected: /** * Creates an empty class */ - KSocketAddress() { init(); } + TDESocketAddress() { init(); } /** * Creates with given data * @param sa a sockaddr structure * @param size the size of @p sa */ - KSocketAddress(const sockaddr* sa, ksocklen_t size); + TDESocketAddress(const sockaddr* sa, ksocklen_t size); public: /** * Destructor. */ - virtual ~KSocketAddress(); + virtual ~TDESocketAddress(); /** * Returns a string representation of this socket. @@ -112,15 +112,15 @@ public: * @param other the other socket * @return true if both sockets are equal */ - virtual bool isEqual(const KSocketAddress& other) const; - bool isEqual(const KSocketAddress* other) const + virtual bool isEqual(const TDESocketAddress& other) const; + bool isEqual(const TDESocketAddress* other) const { return isEqual(*other); } /** * Overloaded == operator. * @see isEqual() */ - bool operator==(const KSocketAddress& other) const + bool operator==(const TDESocketAddress& other) const { return isEqual(other); } /** @@ -133,7 +133,7 @@ public: * @param other the other socket * @return true if the code part is equal */ - bool isCoreEqual(const KSocketAddress& other) const; + bool isCoreEqual(const TDESocketAddress& other) const; /** * Some sockets may differ in such things as services or port numbers, @@ -145,7 +145,7 @@ public: * @param other the other socket * @return true if the code part is equal */ - bool isCoreEqual(const KSocketAddress* other) const + bool isCoreEqual(const TDESocketAddress* other) const { return isCoreEqual(*other); } /** @@ -174,18 +174,18 @@ protected: private: void init(); /* No copy constructor */ - KSocketAddress(KSocketAddress&); - KSocketAddress& operator=(KSocketAddress&); + TDESocketAddress(TDESocketAddress&); + TDESocketAddress& operator=(TDESocketAddress&); public: /** - * Creates a new KSocketAddress or descendant class from given + * Creates a new TDESocketAddress or descendant class from given * raw socket address. * @param sa new socket address * @param size new socket address's length - * @return the new KSocketAddress, or 0 if the function failed + * @return the new TDESocketAddress, or 0 if the function failed */ - static KSocketAddress* newAddress(const struct sockaddr *sa, ksocklen_t size); + static TDESocketAddress* newAddress(const struct sockaddr *sa, ksocklen_t size); /** * Returns the IANA family number of the given address family. @@ -206,7 +206,7 @@ public: protected: virtual void virtual_hook( int id, void* data ); private: - KSocketAddressPrivate* d; + TDESocketAddressPrivate* d; }; /* @@ -224,13 +224,13 @@ class KInetSocketAddressPrivate; * * This is an IPv4 or IPv6 address of the Internet * - * This class inherits most of the functionality from KSocketAddress, but + * This class inherits most of the functionality from TDESocketAddress, but * is targeted specifically to Internet addresses * * @author Thiago Macieira * @short an Internet socket address */ -class TDECORE_EXPORT KInetSocketAddress: public ::KSocketAddress +class TDECORE_EXPORT KInetSocketAddress: public ::TDESocketAddress { Q_OBJECT public: @@ -485,10 +485,10 @@ public: * the address) * @return true if the given addresses are equal. * @see areEqualInet6() - * @see KSocketAddress::isEqual() - * @see KSocketAddress::isCoreEqual() + * @see TDESocketAddress::isEqual() + * @see TDESocketAddress::isCoreEqual() */ - static bool areEqualInet(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly); + static bool areEqualInet(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly); /** * Compares two IPv6 addresses. @@ -498,10 +498,10 @@ public: * the address) * @return true if the given addresses are equal. * @see areEqualInet() - * @see KSocketAddress::isEqual() - * @see KSocketAddress::isCoreEqual() + * @see TDESocketAddress::isEqual() + * @see TDESocketAddress::isCoreEqual() */ - static bool areEqualInet6(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly); + static bool areEqualInet6(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly); /* operators */ @@ -581,7 +581,7 @@ class KUnixSocketAddressPrivate; * @author Thiago Macieira * @short a Unix socket address */ -class TDECORE_EXPORT KUnixSocketAddress: public ::KSocketAddress +class TDECORE_EXPORT KUnixSocketAddress: public ::TDESocketAddress { Q_OBJECT public: @@ -665,10 +665,10 @@ public: * @param coreOnly true if only core parts should be compared (currently * unused) * @return true if the given addresses are equal. - * @see KSocketAddress::isEqual() - * @see KSocketAddress::isCoreEqual() + * @see TDESocketAddress::isEqual() + * @see TDESocketAddress::isCoreEqual() */ - static bool areEqualUnix(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly); + static bool areEqualUnix(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly); private: void init(); diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp index 3de74bd88..eb00b1cec 100644 --- a/tdecore/ksocks.cpp +++ b/tdecore/ksocks.cpp @@ -213,7 +213,7 @@ KSocks *KSocks::self() { // Note that we don't use a static deleter here. It makes no sense and tends to cause crashes. if (!_me) { if (kapp) { - KConfigGroup cfg(kapp->config(), "Socks"); + TDEConfigGroup cfg(kapp->config(), "Socks"); _me = new KSocks(&cfg); } else { _disabled = true; @@ -223,7 +223,7 @@ KSocks *KSocks::self() { return _me; } -void KSocks::setConfig(KConfigBase *config) +void KSocks::setConfig(TDEConfigBase *config) { // We can change the config from disabled to enabled // but not the other way around. @@ -239,7 +239,7 @@ void KSocks::setConfig(KConfigBase *config) bool KSocks::activated() { return (_me != 0L); } -KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) { +KSocks::KSocks(TDEConfigBase *config) : _socksLib(0L), _st(0L) { _hasSocks = false; _useSocks = false; diff --git a/tdecore/ksocks.h b/tdecore/ksocks.h index 14067c0f3..b55829941 100644 --- a/tdecore/ksocks.h +++ b/tdecore/ksocks.h @@ -29,7 +29,7 @@ class KSocksTable; class KSocksPrivate; class KLibrary; -class KConfigBase; +class TDEConfigBase; struct sockaddr; typedef unsigned ksocklen_t; @@ -185,10 +185,10 @@ public: * Set this before the first call to KSocks::self() and it will use * @p config to read its configuration from. */ - static void setConfig(KConfigBase *config); + static void setConfig(TDEConfigBase *config); private: - KSocks(KConfigBase *config); + KSocks(TDEConfigBase *config); ~KSocks(); void stopSocks(); diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index 85d6e4249..c902cd6f1 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -1534,13 +1534,13 @@ static TQStringList lookupProfiles(const TQString &mapFile) extern bool kde_kiosk_admin; -bool KStandardDirs::addCustomized(KConfig *config) +bool KStandardDirs::addCustomized(TDEConfig *config) { if (addedCustoms && !d->checkRestrictions) // there are already customized entries return false; // we just quit and hope they are the right ones // save the numbers of config directories. If this changes, - // we will return true to give KConfig a chance to reparse + // we will return true to give TDEConfig a chance to reparse uint configdirs = resourceDirs("config").count(); // Remember original group diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h index 8d026682c..b561c78d5 100644 --- a/tdecore/kstandarddirs.h +++ b/tdecore/kstandarddirs.h @@ -28,7 +28,7 @@ #include #include -class KConfig; +class TDEConfig; class KStandardDirsPrivate; /** @@ -427,7 +427,7 @@ public: * @return true if new config paths have been added * from @p config. **/ - bool addCustomized(KConfig *config); + bool addCustomized(TDEConfig *config); /** * This function is used internally by almost all other function as diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp index fa3abd5af..5bda8ebf5 100644 --- a/tdecore/kstdaccel.cpp +++ b/tdecore/kstdaccel.cpp @@ -126,7 +126,7 @@ static KStdAccelInfo* infoPtr( StdAccel id ) */ static void initialize( StdAccel id ) { - KConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" ); + TDEConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" ); KStdAccelInfo* pInfo = infoPtr( id ); if( !pInfo ) { diff --git a/tdecore/ktempdir.h b/tdecore/ktempdir.h index f5b2f8026..de4b97f6c 100644 --- a/tdecore/ktempdir.h +++ b/tdecore/ktempdir.h @@ -133,7 +133,7 @@ public: * * @note This function is more meant for removing a directory * not created by the user. For user-created directories, - * using KIO::NetAccess::del is recommended instead, + * using TDEIO::NetAccess::del is recommended instead, * especially as it has user feedback for long operations. * * @param path Path of the directory to delete diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp index 708a9efb0..d8b69eade 100644 --- a/tdecore/kuniqueapplication.cpp +++ b/tdecore/kuniqueapplication.cpp @@ -356,7 +356,7 @@ TDEInstance* KUniqueApplication::initHack( bool configUnique ) TDEInstance* inst = new TDEInstance( TDECmdLineArgs::about ); if (configUnique) { - KConfigGroupSaver saver( inst->config(), "KDE" ); + TDEConfigGroupSaver saver( inst->config(), "KDE" ); s_multipleInstances = inst->config()->readBoolEntry("MultipleInstances", false); } if( !start()) diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h index 45a0e5945..ccaf86e1a 100644 --- a/tdecore/kurldrag.h +++ b/tdecore/kurldrag.h @@ -95,7 +95,7 @@ public: * This is an alternative way of setting the metadata: * either use the constructor to pass it all at once, or use * drag->metaData()["key"] = data; - * @see KIO::TransferJob + * @see TDEIO::TransferJob */ TQMap &metaData() { return m_metaData; } diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index 3566bde93..1b08d121e 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -38,7 +38,7 @@ using namespace KNetwork::Internal; class KNetwork::KBufferedSocketPrivate { public: - mutable KSocketBuffer *input, *output; + mutable TDESocketBuffer *input, *output; KBufferedSocketPrivate() { @@ -64,7 +64,7 @@ KBufferedSocket::~KBufferedSocket() delete d; } -void KBufferedSocket::setSocketDevice(KSocketDevice* device) +void KBufferedSocket::setSocketDevice(TDESocketDevice* device) { KStreamSocket::setSocketDevice(device); device->setBlocking(false); @@ -134,7 +134,7 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return KStreamSocket::tqreadBlock(data, maxlen); } -TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from) +TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return tqreadBlock(data, maxlen); @@ -156,7 +156,7 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) return KStreamSocket::peekBlock(data, maxlen); } -TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) +TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return peekBlock(data, maxlen); @@ -193,7 +193,7 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len } TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, - const KSocketAddress&) + const TDESocketAddress&) { // ignore the third parameter return tqwriteBlock(data, maxlen); @@ -256,7 +256,7 @@ void KBufferedSocket::setInputBuffering(bool enable) } else if (d->input == 0L) { - d->input = new KSocketBuffer; + d->input = new TDESocketBuffer; } } @@ -275,7 +275,7 @@ void KBufferedSocket::setOutputBuffering(bool enable) } else if (d->output == 0L) { - d->output = new KSocketBuffer; + d->output = new TDESocketBuffer; } } diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h index 93bee08f3..158a5a434 100644 --- a/tdecore/network/kbufferedsocket.h +++ b/tdecore/network/kbufferedsocket.h @@ -52,7 +52,7 @@ class KBufferedSocketPrivate; * imposed by Qt's TQSocketNotifier. If you want to use a socket * in an auxiliary thread, please use KStreamSocket. * - * @see KNetwork::KStreamSocket, KNetwork::KServerSocket + * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ class TDECORE_EXPORT KBufferedSocket: public KStreamSocket @@ -79,7 +79,7 @@ public: /** * Be sure to catch new devices. */ - virtual void setSocketDevice(KSocketDevice* device); + virtual void setSocketDevice(TDESocketDevice* device); protected: /** @@ -122,7 +122,7 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from); + virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); /** * Peeks data from the socket. @@ -135,7 +135,7 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from); /** * Writes data to the socket. @@ -148,7 +148,7 @@ public: * * The @p to parameter is discarded. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to); + virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); /** * Catch changes. diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index 780a5ec71..eb8e4883b 100644 --- a/tdecore/network/kclientsocketbase.cpp +++ b/tdecore/network/kclientsocketbase.cpp @@ -83,7 +83,7 @@ void KClientSocketBase::setState(SocketState state) bool KClientSocketBase::setSocketOptions(int opts) { TQMutexLocker locker(mutex()); - KSocketBase::setSocketOptions(opts); // call parent + TDESocketBase::setSocketOptions(opts); // call parent // don't create the device unnecessarily if (hasDevice()) @@ -323,7 +323,7 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from) +TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) { resetError(); TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from); @@ -347,7 +347,7 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) +TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { resetError(); TQ_LONG retval = socketDevice()->peekBlock(data, maxlen, from); @@ -371,7 +371,7 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return retval; } -TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to) +TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) { resetError(); TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to); @@ -383,12 +383,12 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return retval; } -KSocketAddress KClientSocketBase::localAddress() const +TDESocketAddress KClientSocketBase::localAddress() const { return socketDevice()->localAddress(); } -KSocketAddress KClientSocketBase::peerAddress() const +TDESocketAddress KClientSocketBase::peerAddress() const { return socketDevice()->peerAddress(); } diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h index 59da43511..68c45dd28 100644 --- a/tdecore/network/kclientsocketbase.h +++ b/tdecore/network/kclientsocketbase.h @@ -115,7 +115,7 @@ public: protected: /** - * Sets the socket options. Reimplemented from KSocketBase. + * Sets the socket options. Reimplemented from TDESocketBase. */ virtual bool setSocketOptions(int opts); @@ -160,7 +160,7 @@ public: * * This is useful, for instance, when IP addresses are in * their string representation (such as "1.2.3.4") or come - * from other sources like @ref KSocketAddress. + * from other sources like @ref TDESocketAddress. * * @param enable whether to enable */ @@ -186,7 +186,7 @@ public: * emitted (only once, even if we're doing a double lookup). * If the lookup failed (for any of the two lookups) the * @ref gotError signal will be emitted with the appropriate - * error condition (see @ref KSocketBase::SocketError). + * error condition (see @ref TDESocketBase::SocketError). * * This function returns true on success and false on error. Note that * this is not the lookup result! @@ -216,7 +216,7 @@ public: const TQString& service = TQString::null) = 0; /** - * Reimplemented from KSocketBase. Connect this socket to this + * Reimplemented from TDESocketBase. Connect this socket to this * specific address. * * Unlike @ref bind(const TQString&, const TQString&) above, this function @@ -258,7 +258,7 @@ public: /** * @overload - * Reimplemented from KSocketBase. + * Reimplemented from TDESocketBase. */ virtual bool connect(const KResolverEntry& address); @@ -300,7 +300,7 @@ public: /** * Returns the number of bytes available on this socket. - * Reimplemented from KSocketBase. + * Reimplemented from TDESocketBase. */ #ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const; @@ -310,52 +310,52 @@ public: #endif /** - * Waits for more data. Reimplemented from KSocketBase. + * Waits for more data. Reimplemented from TDESocketBase. */ virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L); /** - * Reads data from a socket. Reimplemented from KSocketBase. + * Reads data from a socket. Reimplemented from TDESocketBase. */ virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); /** * @overload - * Reads data from a socket. Reimplemented from KSocketBase. + * Reads data from a socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from); + virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); /** - * Peeks data from the socket. Reimplemented from KSocketBase. + * Peeks data from the socket. Reimplemented from TDESocketBase. */ virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen); /** * @overload - * Peeks data from the socket. Reimplemented from KSocketBase. + * Peeks data from the socket. Reimplemented from TDESocketBase. */ - virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from); /** - * Writes data to the socket. Reimplemented from KSocketBase. + * Writes data to the socket. Reimplemented from TDESocketBase. */ virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); /** * @overload - * Writes data to the socket. Reimplemented from KSocketBase. + * Writes data to the socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to); + virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); /** - * Returns the local socket address. Reimplemented from KSocketBase. + * Returns the local socket address. Reimplemented from TDESocketBase. */ - virtual KSocketAddress localAddress() const; + virtual TDESocketAddress localAddress() const; /** - * Returns the peer socket address. Reimplemented from KSocketBase. + * Returns the peer socket address. Reimplemented from TDESocketBase. */ - virtual KSocketAddress peerAddress() const; + virtual TDESocketAddress peerAddress() const; /** * Returns true if the readyRead signal is set to be emitted. diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp index c5a1562a4..ac8e526ee 100644 --- a/tdecore/network/kdatagramsocket.cpp +++ b/tdecore/network/kdatagramsocket.cpp @@ -153,7 +153,7 @@ KDatagramPacket KDatagramSocket::receive() } TQByteArray data(size); - KSocketAddress address; + TDESocketAddress address; // now do the reading size = tqreadBlock(data.data(), size, address); @@ -170,7 +170,7 @@ TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet) return tqwriteBlock(packet.data(), packet.size(), packet.address()); } -TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) +TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { if (to.family() != AF_UNSPEC) { diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h index c51fea1ef..fd12a0d97 100644 --- a/tdecore/network/kdatagramsocket.h +++ b/tdecore/network/kdatagramsocket.h @@ -51,7 +51,7 @@ class KResolverEntry; class TDECORE_EXPORT KDatagramPacket { TQByteArray m_data; - KSocketAddress m_address; + TDESocketAddress m_address; public: /** @@ -78,14 +78,14 @@ public: /** * Constructs the datagram with the specified content and address. */ - KDatagramPacket(const TQByteArray& content, const KSocketAddress& addr) + KDatagramPacket(const TQByteArray& content, const TDESocketAddress& addr) : m_data(content), m_address(addr) { } /** * Constructs the datagram with the specified content and address. */ - KDatagramPacket(const char *content, uint length, const KSocketAddress& addr) + KDatagramPacket(const char *content, uint length, const TDESocketAddress& addr) : m_address(addr) { setData(content, length); } @@ -134,13 +134,13 @@ public: /** * Returns the socket address */ - const KSocketAddress& address() const + const TDESocketAddress& address() const { return m_address; } /** * Sets the address stored to the given value. */ - void setAddress(const KSocketAddress& addr) + void setAddress(const TDESocketAddress& addr) { m_address = addr; } /** @@ -241,7 +241,7 @@ public: /** * Writes data to the socket. Reimplemented from KClientSocketBase. */ - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); + virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Receives one datagram from the stream. The reading process is guaranteed diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp index 42d65326b..e4529f28a 100644 --- a/tdecore/network/khttpproxysocketdevice.cpp +++ b/tdecore/network/khttpproxysocketdevice.cpp @@ -45,15 +45,15 @@ public: KResolverEntry proxy; TQCString request; TQCString reply; - KSocketAddress peer; + TDESocketAddress peer; KHttpProxySocketDevicePrivate() : proxy(KHttpProxySocketDevice::defaultProxy) { } }; -KHttpProxySocketDevice::KHttpProxySocketDevice(const KSocketBase* parent) - : KSocketDevice(parent), d(new KHttpProxySocketDevicePrivate) +KHttpProxySocketDevice::KHttpProxySocketDevice(const TDESocketBase* parent) + : TDESocketDevice(parent), d(new KHttpProxySocketDevicePrivate) { } @@ -66,7 +66,7 @@ KHttpProxySocketDevice::KHttpProxySocketDevice(const KResolverEntry& proxy) KHttpProxySocketDevice::~KHttpProxySocketDevice() { // nothing special to be done during closing - // KSocketDevice::~KSocketDevice closes the socket + // TDESocketDevice::~TDESocketDevice closes the socket delete d; } @@ -90,27 +90,27 @@ void KHttpProxySocketDevice::setProxyServer(const KResolverEntry& proxy) void KHttpProxySocketDevice::close() { d->reply = d->request = TQCString(); - d->peer = KSocketAddress(); - KSocketDevice::close(); + d->peer = TDESocketAddress(); + TDESocketDevice::close(); } -KSocketAddress KHttpProxySocketDevice::peerAddress() const +TDESocketAddress KHttpProxySocketDevice::peerAddress() const { if (isOpen()) return d->peer; - return KSocketAddress(); + return TDESocketAddress(); } -KSocketAddress KHttpProxySocketDevice::externalAddress() const +TDESocketAddress KHttpProxySocketDevice::externalAddress() const { - return KSocketAddress(); + return TDESocketAddress(); } bool KHttpProxySocketDevice::connect(const KResolverEntry& address) { if (d->proxy.family() == AF_UNSPEC) // no proxy server set ! - return KSocketDevice::connect(address); + return TDESocketDevice::connect(address); if (isOpen()) { @@ -148,7 +148,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi if (m_sockfd == -1) { // must create the socket - if (!KSocketDevice::connect(d->proxy)) + if (!TDESocketDevice::connect(d->proxy)) return false; // also unable to contact proxy server setState(0); // unset open flag @@ -170,7 +170,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi bool KHttpProxySocketDevice::parseServerReply() { // make sure we're connected - if (!KSocketDevice::connect(d->proxy)) + if (!TDESocketDevice::connect(d->proxy)) if (error() == InProgress) return true; else if (error() != NoError) diff --git a/tdecore/network/khttpproxysocketdevice.h b/tdecore/network/khttpproxysocketdevice.h index 903d7aa6f..dc5faef93 100644 --- a/tdecore/network/khttpproxysocketdevice.h +++ b/tdecore/network/khttpproxysocketdevice.h @@ -35,18 +35,18 @@ class KHttpProxySocketDevicePrivate; * @class KHttpProxySocketDevice khttpproxysocketdevice.h khttproxysocketdevice.h * @brief The low-level backend for HTTP proxying. * - * This class derives from @ref KSocketDevice and implements the necessary + * This class derives from @ref TDESocketDevice and implements the necessary * calls to make a connection through an HTTP proxy. * * @author Thiago Macieira */ -class TDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice +class TDECORE_EXPORT KHttpProxySocketDevice: public TDESocketDevice { public: /** * Constructor. */ - KHttpProxySocketDevice(const KSocketBase* = 0L); + KHttpProxySocketDevice(const TDESocketBase* = 0L); /** * Constructor with proxy server's address. @@ -92,13 +92,13 @@ public: /** * Return the peer address. */ - virtual KSocketAddress peerAddress() const; + virtual TDESocketAddress peerAddress() const; /** * Return the externally visible address. We can't tell what that address is, * so this function always returns an empty object. */ - virtual KSocketAddress externalAddress() const; + virtual TDESocketAddress externalAddress() const; private: /** diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/kmulticastsocket.h index 848e64491..8fe413283 100644 --- a/tdecore/network/kmulticastsocket.h +++ b/tdecore/network/kmulticastsocket.h @@ -78,14 +78,14 @@ public: * @param group the multicast group to join * @returns true on success */ - virtual bool joinGroup(const KSocketAddress& group); + virtual bool joinGroup(const TDESocketAddress& group); /** * @overload * Joins a multicast group. This function also specifies the network interface * to be used. */ - virtual bool joinGroup(const KSocketAddress& group, + virtual bool joinGroup(const TDESocketAddress& group, const KNetworkInterface& iface); /** @@ -95,13 +95,13 @@ public: * @param group the group to leave * @returns true on successful leaving the group */ - virtual bool leaveGroup(const KSocketAddress& group); + virtual bool leaveGroup(const TDESocketAddress& group); /** * @overload * Leaves a multicast group. */ - virtual bool leaveGroup(const KSocketAddress& group, + virtual bool leaveGroup(const TDESocketAddress& group, const KNetworkInterface& iface); private: diff --git a/tdecore/network/kmulticastsocketdevice.h b/tdecore/network/kmulticastsocketdevice.h index ffb567ff1..a24ba326a 100644 --- a/tdecore/network/kmulticastsocketdevice.h +++ b/tdecore/network/kmulticastsocketdevice.h @@ -42,13 +42,13 @@ class KMulticastSocketImplPrivate; * * @author Thiago Macieira */ -class KMulticastSocketImpl: public KSocketDevice +class KMulticastSocketImpl: public TDESocketDevice { public: /** * Constructor. */ - KMulticastSocketImpl(const KSocketBase* = 0L); + KMulticastSocketImpl(const TDESocketBase* = 0L); /** * Destructor @@ -117,14 +117,14 @@ public: * @param group the multicast group to join * @returns true on success */ - virtual bool joinGroup(const KSocketAddress& group); + virtual bool joinGroup(const TDESocketAddress& group); /** * @overload * Joins a multicast group. This function also specifies the network interface * to be used. */ - virtual bool joinGroup(const KSocketAddress& group, + virtual bool joinGroup(const TDESocketAddress& group, const KNetworkInterface& iface); /** @@ -134,13 +134,13 @@ public: * @param group the group to leave * @returns true on successful leaving the group */ - virtual bool leaveGroup(const KSocketAddress& group); + virtual bool leaveGroup(const TDESocketAddress& group); /** * @overload * Leaves a multicast group. */ - virtual bool leaveGroup(const KSocketAddress& group, + virtual bool leaveGroup(const TDESocketAddress& group, const KNetworkInterface& iface); private: KMulticastSocketImplPrivate *d; diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index a6ca8e45c..1c32e80ec 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -75,7 +75,7 @@ using namespace KNetwork::Internal; class KNetwork::KResolverEntryPrivate: public TQShared { public: - KSocketAddress addr; + TDESocketAddress addr; int socktype; int protocol; TQString canonName; @@ -93,7 +93,7 @@ KResolverEntry::KResolverEntry() : } // constructor with stuff -KResolverEntry::KResolverEntry(const KSocketAddress& addr, int socktype, int protocol, +KResolverEntry::KResolverEntry(const TDESocketAddress& addr, int socktype, int protocol, const TQString& canonName, const TQCString& encodedName) : d(new KResolverEntryPrivate) { @@ -110,7 +110,7 @@ KResolverEntry::KResolverEntry(const struct sockaddr* sa, TQ_UINT16 salen, int s const TQCString& encodedName) : d(new KResolverEntryPrivate) { - d->addr = KSocketAddress(sa, salen); + d->addr = TDESocketAddress(sa, salen); d->socktype = socktype; d->protocol = protocol; d->canonName = canonName; @@ -135,9 +135,9 @@ KResolverEntry::~KResolverEntry() } // returns the socket address -KSocketAddress KResolverEntry::address() const +TDESocketAddress KResolverEntry::address() const { - return d ? d->addr : KSocketAddress(); + return d ? d->addr : TDESocketAddress(); } // returns the length diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h index 5e20e174a..3de19acd3 100644 --- a/tdecore/network/kresolver.h +++ b/tdecore/network/kresolver.h @@ -73,10 +73,10 @@ public: KResolverEntry(); /** - * Constructs a new KResolverEntry from a KSocketAddress + * Constructs a new KResolverEntry from a TDESocketAddress * and other data. * - * The KSocketAddress @p addr parameter will be deep-copied. + * The TDESocketAddress @p addr parameter will be deep-copied. * * @param addr the address that was resolved * @param socktype the socket type of the resolved address @@ -84,7 +84,7 @@ public: * @param canonName the canonical name of the resolved hostname * @param encodedName the ASCII-compatible encoding of the hostname */ - KResolverEntry(const KSocketAddress& addr, int socktype, int protocol, + KResolverEntry(const TDESocketAddress& addr, int socktype, int protocol, const TQString& canonName = TQString::null, const TQCString& encodedName = TQCString()); @@ -92,7 +92,7 @@ public: * Constructs a new KResolverEntry from raw forms of * socket addresses and other data. * - * This constructor instead creates an internal KSocketAddress object. + * This constructor instead creates an internal TDESocketAddress object. * * @param sa the sockaddr structure containing the raw address * @param salen the length of the sockaddr structure @@ -123,7 +123,7 @@ public: /** * Retrieves the socket address associated with this entry. */ - KSocketAddress address() const; + TDESocketAddress address() const; /** * Retrieves the length of the socket address structure. diff --git a/tdecore/network/kreverseresolver.cpp b/tdecore/network/kreverseresolver.cpp index 20ec41b1d..fc172c2ff 100644 --- a/tdecore/network/kreverseresolver.cpp +++ b/tdecore/network/kreverseresolver.cpp @@ -55,7 +55,7 @@ namespace class ReverseThread: public KResolverWorkerBase { public: - ReverseThread(const KSocketAddress& addr, int flags) + ReverseThread(const TDESocketAddress& addr, int flags) : m_addr(addr), m_flags(flags), m_parent(0L) { } @@ -68,7 +68,7 @@ namespace virtual bool postprocess(); // input: - KSocketAddress m_addr; + TDESocketAddress m_addr; int m_flags; KReverseResolver *m_parent; @@ -99,18 +99,18 @@ class KNetwork::KReverseResolverPrivate public: TQString node; TQString service; - KSocketAddress addr; + TDESocketAddress addr; int flags; ReverseThread* worker; bool success; - inline KReverseResolverPrivate(const KSocketAddress& _addr) + inline KReverseResolverPrivate(const TDESocketAddress& _addr) : addr(_addr), worker(0L), success(false) { } }; -KReverseResolver::KReverseResolver(const KSocketAddress& addr, int flags, +KReverseResolver::KReverseResolver(const TDESocketAddress& addr, int flags, TQObject *parent, const char* name) : TQObject(parent, name), d(new KReverseResolverPrivate(addr)) { @@ -148,7 +148,7 @@ TQString KReverseResolver::service() const return d->service; } -const KSocketAddress& KReverseResolver::address() const +const TDESocketAddress& KReverseResolver::address() const { return d->addr; } @@ -190,7 +190,7 @@ bool KReverseResolver::event(TQEvent *e) return true; } -bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node, +bool KReverseResolver::resolve(const TDESocketAddress& addr, TQString& node, TQString& serv, int flags) { ReverseThread th(addr, flags); @@ -206,7 +206,7 @@ bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node, bool KReverseResolver::resolve(const struct sockaddr* sa, TQ_UINT16 salen, TQString& node, TQString& serv, int flags) { - return resolve(KSocketAddress(sa, salen), node, serv, flags); + return resolve(TDESocketAddress(sa, salen), node, serv, flags); } bool ReverseThread::run() diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h index 21a17b0a5..4a3fa4bdd 100644 --- a/tdecore/network/kreverseresolver.h +++ b/tdecore/network/kreverseresolver.h @@ -88,7 +88,7 @@ public: * @param addr the address to resolve * @param flags the flags to use, see @ref Flags */ - KReverseResolver(const KSocketAddress& addr, int flags = 0, + KReverseResolver(const TDESocketAddress& addr, int flags = 0, TQObject * = 0L, const char * = 0L); /** @@ -128,7 +128,7 @@ public: /** * Returns the socket address which was subject to resolution. */ - const KSocketAddress& address() const; + const TDESocketAddress& address() const; /** * Starts the resolution. This function returns 'true' @@ -165,7 +165,7 @@ public: * @return true if the resolution succeeded, false if not * @see ReverseFlags for the possible values for @p flags */ - static bool resolve(const KSocketAddress& addr, TQString& node, + static bool resolve(const TDESocketAddress& addr, TQString& node, TQString& serv, int flags = 0); /** diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index 007258f6b..d5a1b90bb 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -37,7 +37,7 @@ using namespace KNetwork; -class KNetwork::KServerSocketPrivate +class KNetwork::TDEServerSocketPrivate { public: KResolver resolver; @@ -49,7 +49,7 @@ public: bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1; - KServerSocketPrivate() + TDEServerSocketPrivate() : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false), useKBufferedSocket(true) { @@ -58,56 +58,56 @@ public: } }; -KServerSocket::KServerSocket(TQObject* parent, const char *name) - : TQObject(parent, name), d(new KServerSocketPrivate) +TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name) + : TQObject(parent, name), d(new TDEServerSocketPrivate) { TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), this, TQT_SLOT(lookupFinishedSlot())); } -KServerSocket::KServerSocket(const TQString& service, TQObject* parent, const char *name) - : TQObject(parent, name), d(new KServerSocketPrivate) +TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name) + : TQObject(parent, name), d(new TDEServerSocketPrivate) { TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), this, TQT_SLOT(lookupFinishedSlot())); d->resolver.setServiceName(service); } -KServerSocket::KServerSocket(const TQString& node, const TQString& service, +TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service, TQObject* parent, const char* name) - : TQObject(parent, name), d(new KServerSocketPrivate) + : TQObject(parent, name), d(new TDEServerSocketPrivate) { TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), this, TQT_SLOT(lookupFinishedSlot())); setAddress(node, service); } -KServerSocket::~KServerSocket() +TDEServerSocket::~TDEServerSocket() { close(); delete d; } -bool KServerSocket::setSocketOptions(int opts) +bool TDEServerSocket::setSocketOptions(int opts) { TQMutexLocker locker(mutex()); - KSocketBase::setSocketOptions(opts); // call parent + TDESocketBase::setSocketOptions(opts); // call parent bool result = socketDevice()->setSocketOptions(opts); // and set the implementation copyError(); return result; } -KResolver& KServerSocket::resolver() const +KResolver& TDEServerSocket::resolver() const { return d->resolver; } -const KResolverResults& KServerSocket::resolverResults() const +const KResolverResults& TDEServerSocket::resolverResults() const { return d->resolverResults; } -void KServerSocket::setResolutionEnabled(bool enable) +void TDEServerSocket::setResolutionEnabled(bool enable) { if (enable) d->resolver.setFlags(d->resolver.flags() & ~KResolver::NoResolve); @@ -115,41 +115,41 @@ void KServerSocket::setResolutionEnabled(bool enable) d->resolver.setFlags(d->resolver.flags() | KResolver::NoResolve); } -void KServerSocket::setFamily(int families) +void TDEServerSocket::setFamily(int families) { d->resolver.setFamily(families); } -void KServerSocket::setAddress(const TQString& service) +void TDEServerSocket::setAddress(const TQString& service) { d->resolver.setNodeName(TQString::null); d->resolver.setServiceName(service); d->resolverResults.empty(); - if (d->state <= KServerSocketPrivate::LookupDone) - d->state = KServerSocketPrivate::None; + if (d->state <= TDEServerSocketPrivate::LookupDone) + d->state = TDEServerSocketPrivate::None; } -void KServerSocket::setAddress(const TQString& node, const TQString& service) +void TDEServerSocket::setAddress(const TQString& node, const TQString& service) { d->resolver.setNodeName(node); d->resolver.setServiceName(service); d->resolverResults.empty(); - if (d->state <= KServerSocketPrivate::LookupDone) - d->state = KServerSocketPrivate::None; + if (d->state <= TDEServerSocketPrivate::LookupDone) + d->state = TDEServerSocketPrivate::None; } -void KServerSocket::setTimeout(int msec) +void TDEServerSocket::setTimeout(int msec) { d->timeout = msec; } -bool KServerSocket::lookup() +bool TDEServerSocket::lookup() { setError(NoError); if (d->resolver.isRunning() && !blocking()) return true; // already doing lookup - if (d->state >= KServerSocketPrivate::LookupDone) + if (d->state >= TDEServerSocketPrivate::LookupDone) return true; // results are already available // make sure we have at least one parameter for lookup @@ -179,13 +179,13 @@ bool KServerSocket::lookup() return true; } -bool KServerSocket::bind(const KResolverEntry& address) +bool TDEServerSocket::bind(const KResolverEntry& address) { if (socketDevice()->bind(address)) { setError(NoError); - d->state = KServerSocketPrivate::Bound; + d->state = TDEServerSocketPrivate::Bound; emit bound(address); return true; } @@ -193,30 +193,30 @@ bool KServerSocket::bind(const KResolverEntry& address) return false; } -bool KServerSocket::bind(const TQString& node, const TQString& service) +bool TDEServerSocket::bind(const TQString& node, const TQString& service) { setAddress(node, service); return bind(); } -bool KServerSocket::bind(const TQString& service) +bool TDEServerSocket::bind(const TQString& service) { setAddress(service); return bind(); } -bool KServerSocket::bind() +bool TDEServerSocket::bind() { - if (d->state >= KServerSocketPrivate::Bound) + if (d->state >= TDEServerSocketPrivate::Bound) return true; - if (d->state < KServerSocketPrivate::LookupDone) + if (d->state < TDEServerSocketPrivate::LookupDone) { if (!blocking()) { d->bindWhenFound = true; bool ok = lookup(); // will call doBind - if (d->state >= KServerSocketPrivate::Bound) + if (d->state >= TDEServerSocketPrivate::Bound) d->bindWhenFound = false; return ok; } @@ -229,19 +229,19 @@ bool KServerSocket::bind() return doBind(); } -bool KServerSocket::listen(int backlog) +bool TDEServerSocket::listen(int backlog) { // WARNING // this function has to be reentrant // due to the mechanisms used for binding, this function might // end up calling itself - if (d->state == KServerSocketPrivate::Listening) + if (d->state == TDEServerSocketPrivate::Listening) return true; // already listening d->backlog = backlog; - if (d->state < KServerSocketPrivate::Bound) + if (d->state < TDEServerSocketPrivate::Bound) { // we must bind // note that we can end up calling ourselves here @@ -252,7 +252,7 @@ bool KServerSocket::listen(int backlog) return false; } - if (d->state < KServerSocketPrivate::Bound) + if (d->state < TDEServerSocketPrivate::Bound) // asynchronous lookup in progress... // we can't be blocking here anyways return true; @@ -260,29 +260,29 @@ bool KServerSocket::listen(int backlog) d->listenWhenBound = false; } - if (d->state < KServerSocketPrivate::Listening) + if (d->state < TDEServerSocketPrivate::Listening) return doListen(); return true; } -void KServerSocket::close() +void TDEServerSocket::close() { socketDevice()->close(); if (d->resolver.isRunning()) d->resolver.cancel(false); - d->state = KServerSocketPrivate::None; + d->state = TDEServerSocketPrivate::None; emit closed(); } -void KServerSocket::setAcceptBuffered(bool enable) +void TDEServerSocket::setAcceptBuffered(bool enable) { d->useKBufferedSocket = enable; } -KActiveSocketBase* KServerSocket::accept() +KActiveSocketBase* TDEServerSocket::accept() { - if (d->state < KServerSocketPrivate::Listening) + if (d->state < TDEServerSocketPrivate::Listening) { if (!blocking()) { @@ -310,7 +310,7 @@ KActiveSocketBase* KServerSocket::accept() } // we're listening here - KSocketDevice* accepted = socketDevice()->accept(); + TDESocketDevice* accepted = socketDevice()->accept(); if (!accepted) { // error happened during accept @@ -334,19 +334,19 @@ KActiveSocketBase* KServerSocket::accept() return streamsocket; } -KSocketAddress KServerSocket::localAddress() const +TDESocketAddress TDEServerSocket::localAddress() const { return socketDevice()->localAddress(); } -KSocketAddress KServerSocket::externalAddress() const +TDESocketAddress TDEServerSocket::externalAddress() const { return socketDevice()->externalAddress(); } -void KServerSocket::lookupFinishedSlot() +void TDEServerSocket::lookupFinishedSlot() { - if (d->resolver.isRunning() || d->state > KServerSocketPrivate::LookupDone) + if (d->resolver.isRunning() || d->state > TDEServerSocketPrivate::LookupDone) return; if (d->resolver.status() < 0) @@ -354,25 +354,25 @@ void KServerSocket::lookupFinishedSlot() setError(LookupFailure); emit gotError(LookupFailure); d->bindWhenFound = d->listenWhenBound = false; - d->state = KServerSocketPrivate::None; + d->state = TDEServerSocketPrivate::None; return; } // lookup succeeded d->resolverResults = d->resolver.results(); - d->state = KServerSocketPrivate::LookupDone; + d->state = TDEServerSocketPrivate::LookupDone; emit hostFound(); if (d->bindWhenFound) doBind(); } -void KServerSocket::copyError() +void TDEServerSocket::copyError() { setError(socketDevice()->error()); } -bool KServerSocket::doBind() +bool TDEServerSocket::doBind() { d->bindWhenFound = false; // loop through the results and bind to the first that works @@ -393,7 +393,7 @@ bool KServerSocket::doBind() return false; } -bool KServerSocket::doListen() +bool TDEServerSocket::doListen() { if (!socketDevice()->listen(d->backlog)) { @@ -405,7 +405,7 @@ bool KServerSocket::doListen() // set up ready accept signal TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(readyAccept())); - d->state = KServerSocketPrivate::Listening; + d->state = TDEServerSocketPrivate::Listening; return true; } diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index 4f1af33b9..6821a886a 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -30,14 +30,14 @@ namespace KNetwork { -class KSocketDevice; +class TDESocketDevice; class KStreamSocket; class KResolver; class KResolverResults; -class KServerSocketPrivate; +class TDEServerSocketPrivate; /** - * @class KServerSocket kserversocket.h kserversocket.h + * @class TDEServerSocket kserversocket.h kserversocket.h * @brief A server socket for accepting connections. * * This class provides functionality for creating a socket to @@ -49,7 +49,7 @@ class KServerSocketPrivate; * A typical example would look like: * \code * TQString service = "http"; - * KServerSocket *ss = new KServerSocket(service); + * TDEServerSocket *ss = new TDEServerSocket(service); * connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); * connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); * ss->listen(); @@ -70,14 +70,14 @@ class KServerSocketPrivate; * * For another example of usage, this below code attempts to make a connection on any port within a range: * \code - * KServerSocket *ss = new KServerSocket(); + * TDEServerSocket *ss = new TDEServerSocket(); * ss->setFamily(KResolver::InetFamily); * bool found = false; * for( unsigned int port = firstport; port <= lastport; ++port) { * ss->setAddress( TQString::number( port ) ); * bool success = ss->listen(); * if( found = ( success && ss->error() == - * KSocketBase::NoError ) ) + * TDESocketBase::NoError ) ) * break; * ss->close(); * } @@ -98,13 +98,13 @@ class KServerSocketPrivate; * KNetwork::KBufferedSocket (default). If you want to accept a * non-buffered socket, you must first call setAcceptBuffered. * - * @warning If you use KServerSocket in an auxiliary (non-GUI) thread, + * @warning If you use TDEServerSocket in an auxiliary (non-GUI) thread, * you need to accept only KNetwork::KStreamSocket objects. * * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket * @author Thiago Macieira */ -class TDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase +class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase { Q_OBJECT @@ -119,7 +119,7 @@ public: * @param parent the parent TQObject object * @param name the name of this object */ - KServerSocket(TQObject* parent = 0L, const char *name = 0L); + TDEServerSocket(TQObject* parent = 0L, const char *name = 0L); /** * Construct this object specifying the service to listen on. @@ -138,7 +138,7 @@ public: * @param parent the parent TQObject object * @param name the name of this object */ - KServerSocket(const TQString& service, TQObject* parent = 0L, const char *name = 0L); + TDEServerSocket(const TQString& service, TQObject* parent = 0L, const char *name = 0L); /** * Construct this object specifying the node and service names to listen on. @@ -158,7 +158,7 @@ public: * @param parent the parent TQObject object * @param name the name of this object */ - KServerSocket(const TQString& node, const TQString& service, + TDEServerSocket(const TQString& node, const TQString& service, TQObject* parent = 0L, const char *name = 0L); /** @@ -167,11 +167,11 @@ public: * Note, however, that accepted sockets do not get closed when this * object closes. */ - ~KServerSocket(); + ~TDEServerSocket(); protected: /** - * Sets the socket options. Reimplemented from KSocketBase. + * Sets the socket options. Reimplemented from TDESocketBase. */ virtual bool setSocketOptions(int opts); @@ -201,7 +201,7 @@ public: * * This is useful, for instance, when IP addresses are in * their string representation (such as "1.2.3.4") or come - * from other sources like @ref KSocketAddress. + * from other sources like @ref TDESocketAddress. * * @param enable whether to enable */ @@ -268,7 +268,7 @@ public: * emitted (only once, even if we're doing a double lookup). * If the lookup failed (for any of the two lookups) the * @ref gotError signal will be emitted with the appropriate - * error condition (see @ref KSocketBase::SocketError). + * error condition (see @ref TDESocketBase::SocketError). * * This function returns true on success and false on error. Note that * this is not the lookup result! @@ -306,7 +306,7 @@ public: virtual bool bind(); /** - * Connect this socket to this specific address. Reimplemented from KSocketBase. + * Connect this socket to this specific address. Reimplemented from TDESocketBase. * * Unlike @ref bind(const TQString&, const TQString&) above, this function * really does bind the socket. No lookup is performed. The @ref bound signal @@ -369,12 +369,12 @@ public: /** * Returns this socket's local address. */ - virtual KSocketAddress localAddress() const; + virtual TDESocketAddress localAddress() const; /** * Returns this socket's externally-visible address if know. */ - virtual KSocketAddress externalAddress() const; + virtual TDESocketAddress externalAddress() const; private slots: void lookupFinishedSlot(); @@ -425,10 +425,10 @@ private: bool doListen(); private: - KServerSocket(const KServerSocket&); - KServerSocket& operator=(const KServerSocket&); + TDEServerSocket(const TDEServerSocket&); + TDEServerSocket& operator=(const TDEServerSocket&); - KServerSocketPrivate *d; + TDEServerSocketPrivate *d; }; } // namespace KNetwork diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp index 6a60ce0a3..c1649c340 100644 --- a/tdecore/network/ksockssocketdevice.cpp +++ b/tdecore/network/ksockssocketdevice.cpp @@ -43,15 +43,15 @@ using namespace KNetwork; // constructor // nothing to do -KSocksSocketDevice::KSocksSocketDevice(const KSocketBase* obj) - : KSocketDevice(obj) +KSocksSocketDevice::KSocksSocketDevice(const TDESocketBase* obj) + : TDESocketDevice(obj) { } // constructor with argument // nothing to do KSocksSocketDevice::KSocksSocketDevice(int fd) - : KSocketDevice(fd) + : TDESocketDevice(fd) { } @@ -67,7 +67,7 @@ int KSocksSocketDevice::capabilities() const return 0; // can do everything! } -// From here on, the code is almost exactly a copy of KSocketDevice +// From here on, the code is almost exactly a copy of TDESocketDevice // the differences are the use of KSocks where appropriate bool KSocksSocketDevice::bind(const KResolverEntry& address) @@ -190,7 +190,7 @@ KSocksSocketDevice* KSocksSocketDevice::accept() return new KSocksSocketDevice(newfd); } -static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) +static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddress* from, ssize_t &retval, bool peek = false) { kde_socklen_t len; if (from) @@ -204,9 +204,9 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAdd if (retval == -1) { if (errno == EAGAIN || errno == EWOULDBLOCK) - return KSocketDevice::WouldBlock; + return TDESocketDevice::WouldBlock; else - return KSocketDevice::UnknownError; + return TDESocketDevice::UnknownError; } if (from) @@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from) +TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -277,7 +277,7 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) +TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { resetError(); if (m_sockfd == -1) @@ -300,10 +300,10 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddres TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len) { - return tqwriteBlock(data, len, KSocketAddress()); + return tqwriteBlock(data, len, TDESocketAddress()); } -TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) +TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { resetError(); if (m_sockfd == -1) @@ -325,17 +325,17 @@ TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const K return retval; } -KSocketAddress KSocksSocketDevice::localAddress() const +TDESocketAddress KSocksSocketDevice::localAddress() const { if (m_sockfd == -1) - return KSocketAddress(); // not open, empty value + return TDESocketAddress(); // not open, empty value kde_socklen_t len; - KSocketAddress localAddress; + TDESocketAddress localAddress; localAddress.setLength(len = 32); // arbitrary value if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1) // error! - return KSocketAddress(); + return TDESocketAddress(); if (len <= localAddress.length()) { @@ -349,22 +349,22 @@ KSocketAddress KSocksSocketDevice::localAddress() const localAddress.setLength(len); if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1) // error! - return KSocketAddress(); + return TDESocketAddress(); return localAddress; } -KSocketAddress KSocksSocketDevice::peerAddress() const +TDESocketAddress KSocksSocketDevice::peerAddress() const { if (m_sockfd == -1) - return KSocketAddress(); // not open, empty value + return TDESocketAddress(); // not open, empty value kde_socklen_t len; - KSocketAddress peerAddress; + TDESocketAddress peerAddress; peerAddress.setLength(len = 32); // arbitrary value if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1) // error! - return KSocketAddress(); + return TDESocketAddress(); if (len <= peerAddress.length()) { @@ -378,15 +378,15 @@ KSocketAddress KSocksSocketDevice::peerAddress() const peerAddress.setLength(len); if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1) // error! - return KSocketAddress(); + return TDESocketAddress(); return peerAddress; } -KSocketAddress KSocksSocketDevice::externalAddress() const +TDESocketAddress KSocksSocketDevice::externalAddress() const { // return empty, indicating unknown external address - return KSocketAddress(); + return TDESocketAddress(); } bool KSocksSocketDevice::poll(bool *input, bool *output, bool *exception, @@ -474,13 +474,13 @@ void KSocksSocketDevice::initSocks() init = true; if (KSocks::self()->hasSocks()) - delete KSocketDevice::setDefaultImpl(new KSocketDeviceFactory); + delete TDESocketDevice::setDefaultImpl(new TDESocketDeviceFactory); } #if 0 static bool register() { - KSocketDevice::addNewImpl(new KSocketDeviceFactory, 0); + TDESocketDevice::addNewImpl(new TDESocketDeviceFactory, 0); } static bool register = registered(); diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h index 5c93b6d8c..2a83c0adc 100644 --- a/tdecore/network/ksockssocketdevice.h +++ b/tdecore/network/ksockssocketdevice.h @@ -28,7 +28,7 @@ namespace KNetwork { * @class KSocksSocketDevice ksockssocketdevice.h ksockssocketdevice.h * @brief The low-level class for SOCKS proxying. * - * This class reimplements several functions from @ref KSocketDevice in order + * This class reimplements several functions from @ref TDESocketDevice in order * to implement SOCKS support. * * This works by using KSocks. @@ -37,13 +37,13 @@ namespace KNetwork { * * @warning This code is untested! */ -class TDECORE_EXPORT KSocksSocketDevice: public KSocketDevice +class TDECORE_EXPORT KSocksSocketDevice: public TDESocketDevice { public: /** * Constructor. */ - KSocksSocketDevice(const KSocketBase* = 0L); + KSocksSocketDevice(const TDESocketBase* = 0L); /** * Construct from a file descriptor. @@ -84,34 +84,34 @@ public: * Overrides reading. */ virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen); - virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Overrides peeking. */ virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen); - virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Overrides writing. */ virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len); - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); + virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Overrides getting socket address. */ - virtual KSocketAddress localAddress() const; + virtual TDESocketAddress localAddress() const; /** * Overrides getting peer address. */ - virtual KSocketAddress peerAddress() const; + virtual TDESocketAddress peerAddress() const; /** * Overrides getting external address. */ - virtual KSocketAddress externalAddress() const; + virtual TDESocketAddress externalAddress() const; /** * Overrides polling. @@ -121,7 +121,7 @@ public: private: static void initSocks(); - friend class KSocketDevice; + friend class TDESocketDevice; }; } // namespace KNetwork diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index ab90e923a..d077296c1 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -34,7 +34,7 @@ namespace KNetwork { class KResolverEntry; class KResolverResults; -class KServerSocket; +class TDEServerSocket; class KBufferedSocket; class KStreamSocketPrivate; @@ -91,7 +91,7 @@ class KStreamSocketPrivate; * } * \endcode * - * @see KNetwork::KBufferedSocket, KNetwork::KServerSocket + * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ class TDECORE_EXPORT KStreamSocket: public KClientSocketBase @@ -241,7 +241,7 @@ private: KStreamSocketPrivate *d; - friend class KServerSocket; + friend class TDEServerSocket; friend class KBufferedSocket; }; diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp index d1234044b..ff97699c8 100644 --- a/tdecore/network/tdesocketaddress.cpp +++ b/tdecore/network/tdesocketaddress.cpp @@ -238,7 +238,7 @@ struct our_sockaddr_in6 #define MIN_SOCKADDR_UN_LEN (sizeof(TQ_UINT16) + sizeof(char)) -class KNetwork::KSocketAddressData +class KNetwork::TDESocketAddressData { public: /* @@ -249,7 +249,7 @@ public: class QMixSocketAddressRef : public KInetSocketAddress, public KUnixSocketAddress { public: - QMixSocketAddressRef(KSocketAddressData* d) + QMixSocketAddressRef(TDESocketAddressData* d) : KInetSocketAddress(d), KUnixSocketAddress(d) { } @@ -265,7 +265,7 @@ public: } addr; TQ_UINT16 curlen, reallen; - KSocketAddressData() + TDESocketAddressData() : ref(this) { addr.generic = 0L; @@ -273,7 +273,7 @@ public: invalidate(); } - ~KSocketAddressData() + ~TDESocketAddressData() { if (addr.generic != 0L) free(addr.generic); @@ -343,7 +343,7 @@ public: }; // create duplicates of -void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) +void TDESocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) { if (len < MIN_SOCKADDR_LEN) { @@ -405,30 +405,30 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) } // default constructor -KSocketAddress::KSocketAddress() - : d(new KSocketAddressData) +TDESocketAddress::TDESocketAddress() + : d(new TDESocketAddressData) { } // constructor from binary data -KSocketAddress::KSocketAddress(const sockaddr *sa, TQ_UINT16 len) - : d(new KSocketAddressData) +TDESocketAddress::TDESocketAddress(const sockaddr *sa, TQ_UINT16 len) + : d(new TDESocketAddressData) { setAddress(sa, len); } -KSocketAddress::KSocketAddress(const KSocketAddress& other) - : d(new(KSocketAddressData)) +TDESocketAddress::TDESocketAddress(const TDESocketAddress& other) + : d(new(TDESocketAddressData)) { *this = other; } -KSocketAddress::KSocketAddress(KSocketAddressData *d2) +TDESocketAddress::TDESocketAddress(TDESocketAddressData *d2) : d(d2) { } -KSocketAddress::~KSocketAddress() +TDESocketAddress::~TDESocketAddress() { // prevent double-deletion, since we're already being deleted if (d) @@ -439,7 +439,7 @@ KSocketAddress::~KSocketAddress() } } -KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other) +TDESocketAddress& TDESocketAddress::operator =(const TDESocketAddress& other) { if (other.d && !other.d->invalid()) d->dup(other.d->addr.generic, other.d->reallen); @@ -448,21 +448,21 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other) return *this; } -const sockaddr* KSocketAddress::address() const +const sockaddr* TDESocketAddress::address() const { if (d->invalid()) return 0L; return d->addr.generic; } -sockaddr* KSocketAddress::address() +sockaddr* TDESocketAddress::address() { if (d->invalid()) return 0L; return d->addr.generic; } -KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len) +TDESocketAddress& TDESocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len) { if (sa != 0L && len >= MIN_SOCKADDR_LEN) d->dup(sa, len); @@ -472,28 +472,28 @@ KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len) return *this; } -TQ_UINT16 KSocketAddress::length() const +TQ_UINT16 TDESocketAddress::length() const { if (d->invalid()) return 0; return d->reallen; } -KSocketAddress& KSocketAddress::setLength(TQ_UINT16 len) +TDESocketAddress& TDESocketAddress::setLength(TQ_UINT16 len) { d->dup((sockaddr*)0L, len, false); return *this; } -int KSocketAddress::family() const +int TDESocketAddress::family() const { if (d->invalid()) return AF_UNSPEC; return d->addr.generic->sa_family; } -KSocketAddress& KSocketAddress::setFamily(int family) +TDESocketAddress& TDESocketAddress::setFamily(int family) { if (d->invalid()) d->dup((sockaddr*)0L, MIN_SOCKADDR_LEN); @@ -502,7 +502,7 @@ KSocketAddress& KSocketAddress::setFamily(int family) return *this; } -bool KSocketAddress::operator ==(const KSocketAddress& other) const +bool TDESocketAddress::operator ==(const TDESocketAddress& other) const { // if this is invalid, it's only equal if the other one is invalid as well if (d->invalid()) @@ -559,7 +559,7 @@ bool KSocketAddress::operator ==(const KSocketAddress& other) const return false; // not equal in any other case } -TQString KSocketAddress::nodeName() const +TQString TDESocketAddress::nodeName() const { if (d->invalid()) return TQString::null; @@ -585,7 +585,7 @@ TQString KSocketAddress::nodeName() const return TQString::null; } -TQString KSocketAddress::serviceName() const +TQString TDESocketAddress::serviceName() const { if (d->invalid()) return TQString::null; @@ -605,7 +605,7 @@ TQString KSocketAddress::serviceName() const return TQString::null; } -TQString KSocketAddress::toString() const +TQString TDESocketAddress::toString() const { if (d->invalid()) return TQString::null; @@ -627,27 +627,27 @@ TQString KSocketAddress::toString() const return fmt.arg(nodeName()).arg(serviceName()); } -KInetSocketAddress& KSocketAddress::asInet() +KInetSocketAddress& TDESocketAddress::asInet() { return d->ref; } -KInetSocketAddress KSocketAddress::asInet() const +KInetSocketAddress TDESocketAddress::asInet() const { return d->ref; } -KUnixSocketAddress& KSocketAddress::asUnix() +KUnixSocketAddress& TDESocketAddress::asUnix() { return d->ref; } -KUnixSocketAddress KSocketAddress::asUnix() const +KUnixSocketAddress TDESocketAddress::asUnix() const { return d->ref; } -int KSocketAddress::ianaFamily(int af) +int TDESocketAddress::ianaFamily(int af) { switch (af) { @@ -664,7 +664,7 @@ int KSocketAddress::ianaFamily(int af) } } -int KSocketAddress::fromIanaFamily(int iana) +int TDESocketAddress::fromIanaFamily(int iana) { switch (iana) { @@ -688,7 +688,7 @@ KInetSocketAddress::KInetSocketAddress() // binary data constructor KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len) - : KSocketAddress(sa, len) + : TDESocketAddress(sa, len) { if (!d->invalid()) update(); @@ -703,21 +703,21 @@ KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port) // copy constructor KInetSocketAddress::KInetSocketAddress(const KInetSocketAddress& other) - : KSocketAddress(other) + : TDESocketAddress(other) { } // special copy constructor -KInetSocketAddress::KInetSocketAddress(const KSocketAddress& other) - : KSocketAddress(other) +KInetSocketAddress::KInetSocketAddress(const TDESocketAddress& other) + : TDESocketAddress(other) { if (!d->invalid()) update(); } // special constructor -KInetSocketAddress::KInetSocketAddress(KSocketAddressData *d) - : KSocketAddress(d) +KInetSocketAddress::KInetSocketAddress(TDESocketAddressData *d) + : TDESocketAddress(d) { } @@ -730,7 +730,7 @@ KInetSocketAddress::~KInetSocketAddress() // copy operator KInetSocketAddress& KInetSocketAddress::operator =(const KInetSocketAddress& other) { - KSocketAddress::operator =(other); + TDESocketAddress::operator =(other); return *this; } @@ -905,14 +905,14 @@ KUnixSocketAddress::KUnixSocketAddress() } KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len) - : KSocketAddress(sa, len) + : TDESocketAddress(sa, len) { if (!d->invalid() && d->addr.un->sun_family != AF_UNIX) d->invalidate(); } KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other) - : KSocketAddress(other) + : TDESocketAddress(other) { } @@ -921,8 +921,8 @@ KUnixSocketAddress::KUnixSocketAddress(const TQString& pathname) setPathname(pathname); } -KUnixSocketAddress::KUnixSocketAddress(KSocketAddressData* d) - : KSocketAddress(d) +KUnixSocketAddress::KUnixSocketAddress(TDESocketAddressData* d) + : TDESocketAddress(d) { } @@ -932,7 +932,7 @@ KUnixSocketAddress::~KUnixSocketAddress() KUnixSocketAddress& KUnixSocketAddress::operator =(const KUnixSocketAddress& other) { - KSocketAddress::operator =(other); + TDESocketAddress::operator =(other); return *this; } diff --git a/tdecore/network/tdesocketaddress.h b/tdecore/network/tdesocketaddress.h index 885bb77cb..100e05fb2 100644 --- a/tdecore/network/tdesocketaddress.h +++ b/tdecore/network/tdesocketaddress.h @@ -38,7 +38,7 @@ struct sockaddr_un; namespace KNetwork { class KIpAddress; -class KSocketAddress; +class TDESocketAddress; class KInetSocketAddress; class KUnixSocketAddress; @@ -412,15 +412,15 @@ public: }; -class KSocketAddressData; -/** @class KSocketAddress tdesocketaddress.h tdesocketaddress.h +class TDESocketAddressData; +/** @class TDESocketAddress tdesocketaddress.h tdesocketaddress.h * @brief A generic socket address. * * This class holds one generic socket address. * * @author Thiago Macieira */ -class TDECORE_EXPORT KSocketAddress +class TDECORE_EXPORT TDESocketAddress { public: /** @@ -428,7 +428,7 @@ public: * * Creates an empty object */ - KSocketAddress(); + TDESocketAddress(); /** * Creates this object with the given data. @@ -437,7 +437,7 @@ public: * @param sa the socket address structure * @param len the socket address length */ - KSocketAddress(const sockaddr* sa, TQ_UINT16 len); + TDESocketAddress(const sockaddr* sa, TQ_UINT16 len); /** * Copy constructor. This creates a copy of the other @@ -447,12 +447,12 @@ public: * * @param other the object to copy from */ - KSocketAddress(const KSocketAddress& other); + TDESocketAddress(const TDESocketAddress& other); /** * Destructor. Frees any associated resources. */ - virtual ~KSocketAddress(); + virtual ~TDESocketAddress(); /** * Performs a shallow copy of the other object into this one. @@ -460,7 +460,7 @@ public: * * @param other the object to copy from */ - KSocketAddress& operator =(const KSocketAddress& other); + TDESocketAddress& operator =(const TDESocketAddress& other); /** * Returns the socket address structure, to be passed down to @@ -490,7 +490,7 @@ public: * @param sa the socket address structure * @param len the socket address length */ - KSocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len); + TDESocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len); /** * Returns the socket address structure, to be passed down to @@ -517,14 +517,14 @@ public: * the family: * * \code - * KSocketAddress qsa; + * TDESocketAddress qsa; * [...] * qsa.setFamily(AF_UNSPEC).setLength(newlen); * \endcode * * @param len the new length */ - KSocketAddress& setLength(TQ_UINT16 len); + TDESocketAddress& setLength(TQ_UINT16 len); /** * Returns the family of this address. @@ -540,7 +540,7 @@ public: * * @param family the new family to set */ - virtual KSocketAddress& setFamily(int family); + virtual TDESocketAddress& setFamily(int family); /** * Returns the IANA family number of this address. @@ -558,7 +558,7 @@ public: * @param other the other socket * @return true if both sockets are equal */ - bool operator ==(const KSocketAddress& other) const; + bool operator ==(const TDESocketAddress& other) const; /** * Returns the node name of this socket. @@ -615,11 +615,11 @@ public: protected: /// @internal /// private data - KSocketAddressData *d; + TDESocketAddressData *d; /// @internal /// extra constructor - KSocketAddress(KSocketAddressData* d); + TDESocketAddress(TDESocketAddressData* d); public: // static /** @@ -648,9 +648,9 @@ public: // static * * @author Thiago Macieira */ -class TDECORE_EXPORT KInetSocketAddress: public KSocketAddress +class TDECORE_EXPORT KInetSocketAddress: public TDESocketAddress { - friend class KSocketAddress; + friend class TDESocketAddress; public: /** * Public constructor. Creates an empty object. @@ -693,7 +693,7 @@ public: * * @param other the other object */ - KInetSocketAddress(const KSocketAddress& other); + KInetSocketAddress(const TDESocketAddress& other); /** * Destroys this object. @@ -817,7 +817,7 @@ public: protected: /// @internal /// extra constructor - KInetSocketAddress(KSocketAddressData* d); + KInetSocketAddress(TDESocketAddressData* d); private: void update(); @@ -837,9 +837,9 @@ private: * * @author Thiago Macieira */ -class TDECORE_EXPORT KUnixSocketAddress: public KSocketAddress +class TDECORE_EXPORT KUnixSocketAddress: public TDESocketAddress { - friend class KSocketAddress; + friend class TDESocketAddress; public: /** * Default constructor. Creates an empty object. @@ -904,7 +904,7 @@ public: protected: /// @internal /// extra constructor - KUnixSocketAddress(KSocketAddressData* d); + KUnixSocketAddress(TDESocketAddressData* d); }; } // namespace KNetwork diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp index 9be0d6e52..0eb31bbc1 100644 --- a/tdecore/network/tdesocketbase.cpp +++ b/tdecore/network/tdesocketbase.cpp @@ -31,24 +31,24 @@ using namespace KNetwork; -class KNetwork::KSocketBasePrivate +class KNetwork::TDESocketBasePrivate { public: int socketOptions; int socketError; int capabilities; - mutable KSocketDevice* device; + mutable TDESocketDevice* device; TQMutex mutex; - KSocketBasePrivate() + TDESocketBasePrivate() : mutex(true) // create recursive { } }; -KSocketBase::KSocketBase() - : d(new KSocketBasePrivate) +TDESocketBase::TDESocketBase() + : d(new TDESocketBasePrivate) { d->socketOptions = Blocking; d->socketError = 0; @@ -56,64 +56,64 @@ KSocketBase::KSocketBase() d->capabilities = 0; } -KSocketBase::~KSocketBase() +TDESocketBase::~TDESocketBase() { delete d->device; delete d; } -bool KSocketBase::setSocketOptions(int opts) +bool TDESocketBase::setSocketOptions(int opts) { d->socketOptions = opts; return true; } -int KSocketBase::socketOptions() const +int TDESocketBase::socketOptions() const { return d->socketOptions; } -bool KSocketBase::setBlocking(bool enable) +bool TDESocketBase::setBlocking(bool enable) { return setSocketOptions((socketOptions() & ~Blocking) | (enable ? Blocking : 0)); } -bool KSocketBase::blocking() const +bool TDESocketBase::blocking() const { return socketOptions() & Blocking; } -bool KSocketBase::setAddressReuseable(bool enable) +bool TDESocketBase::setAddressReuseable(bool enable) { return setSocketOptions((socketOptions() & ~AddressReuseable) | (enable ? AddressReuseable : 0)); } -bool KSocketBase::addressReuseable() const +bool TDESocketBase::addressReuseable() const { return socketOptions() & AddressReuseable; } -bool KSocketBase::setIPv6Only(bool enable) +bool TDESocketBase::setIPv6Only(bool enable) { return setSocketOptions((socketOptions() & ~IPv6Only) | (enable ? IPv6Only : 0)); } -bool KSocketBase::isIPv6Only() const +bool TDESocketBase::isIPv6Only() const { return socketOptions() & IPv6Only; } -bool KSocketBase::setBroadcast(bool enable) +bool TDESocketBase::setBroadcast(bool enable) { return setSocketOptions((socketOptions() & ~Broadcast) | (enable ? Broadcast : 0)); } -bool KSocketBase::broadcast() const +bool TDESocketBase::broadcast() const { return socketOptions() & Broadcast; } -KSocketDevice* KSocketBase::socketDevice() const +TDESocketDevice* TDESocketBase::socketDevice() const { if (d->device) return d->device; @@ -123,47 +123,47 @@ KSocketDevice* KSocketBase::socketDevice() const if (d->device) return d->device; - KSocketBase* that = const_cast(this); - KSocketDevice* dev = 0; + TDESocketBase* that = const_cast(this); + TDESocketDevice* dev = 0; if (d->capabilities) - dev = KSocketDevice::createDefault(that, d->capabilities); + dev = TDESocketDevice::createDefault(that, d->capabilities); if (!dev) - dev = KSocketDevice::createDefault(that); + dev = TDESocketDevice::createDefault(that); that->setSocketDevice(dev); return d->device; } -void KSocketBase::setSocketDevice(KSocketDevice* device) +void TDESocketBase::setSocketDevice(TDESocketDevice* device) { TQMutexLocker locker(mutex()); if (d->device == 0L) d->device = device; } -int KSocketBase::setRequestedCapabilities(int add, int remove) +int TDESocketBase::setRequestedCapabilities(int add, int remove) { d->capabilities |= add; d->capabilities &= ~remove; return d->capabilities; } -bool KSocketBase::hasDevice() const +bool TDESocketBase::hasDevice() const { return d->device != 0L; } -void KSocketBase::setError(SocketError error) +void TDESocketBase::setError(SocketError error) { d->socketError = error; } -KSocketBase::SocketError KSocketBase::error() const +TDESocketBase::SocketError TDESocketBase::error() const { - return static_cast(d->socketError); + return static_cast(d->socketError); } // static -TQString KSocketBase::errorString(KSocketBase::SocketError code) +TQString TDESocketBase::errorString(TDESocketBase::SocketError code) { TQString reason; switch (code) @@ -256,7 +256,7 @@ TQString KSocketBase::errorString(KSocketBase::SocketError code) } // static -bool KSocketBase::isFatalError(int code) +bool TDESocketBase::isFatalError(int code) { switch (code) { @@ -270,12 +270,12 @@ bool KSocketBase::isFatalError(int code) return true; } -void KSocketBase::unsetSocketDevice() +void TDESocketBase::unsetSocketDevice() { d->device = 0L; } -TQMutex* KSocketBase::mutex() const +TQMutex* TDESocketBase::mutex() const { return &d->mutex; } @@ -308,13 +308,13 @@ int KActiveSocketBase::putch(int ch) void KActiveSocketBase::setError(int status, SocketError error) { - KSocketBase::setError(error); + TDESocketBase::setError(error); setStatus(status); } void KActiveSocketBase::resetError() { - KSocketBase::setError(NoError); + TDESocketBase::setError(NoError); resetStatus(); } diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h index 48ae15e05..bd0828408 100644 --- a/tdecore/network/tdesocketbase.h +++ b/tdecore/network/tdesocketbase.h @@ -80,10 +80,10 @@ class TQMutex; namespace KNetwork { class KResolverEntry; -class KSocketDevice; +class TDESocketDevice; -class KSocketBasePrivate; -/** @class KSocketBase tdesocketbase.h tdesocketbase.h +class TDESocketBasePrivate; +/** @class TDESocketBase tdesocketbase.h tdesocketbase.h * @brief Basic socket functionality. * * This class provides the basic socket functionlity for descended classes. @@ -94,7 +94,7 @@ class KSocketBasePrivate; * * @author Thiago Macieira */ -class TDECORE_EXPORT KSocketBase +class TDECORE_EXPORT TDESocketBase { public: /** @@ -175,12 +175,12 @@ public: /** * Default constructor. */ - KSocketBase(); + TDESocketBase(); /** * Destructor. */ - virtual ~KSocketBase(); + virtual ~TDESocketBase(); /* * The following functions are shared by all descended classes and will have @@ -316,7 +316,7 @@ public: * This function creates the device if none has been set * using the default factory. */ - KSocketDevice* socketDevice() const; + TDESocketDevice* socketDevice() const; /** * Sets the socket implementation to be used on this socket. @@ -331,7 +331,7 @@ public: * This function is called by @ref socketDevice above when the socket is * first created. */ - virtual void setSocketDevice(KSocketDevice* device); + virtual void setSocketDevice(TDESocketDevice* device); /** * Sets the internally requested capabilities for a socket device. @@ -341,16 +341,16 @@ public: * implementation. By using this function, derived classes can request * that a backend with those capabilities be created when necessary. * - * For the possible flags, see @ref KSocketDevice::Capabilities. However, note + * For the possible flags, see @ref TDESocketDevice::Capabilities. However, note * that only the Can* flags make sense in this context. * * @note Since socketDevice must always return a valid backend object, it * is is possible that the created device does not conform to all * requirements requested. Implementations sensitive to this fact * should test the object returned by @ref socketDevice (through - * @ref KSocketDevice::capabilities, for instance) the availability. + * @ref TDESocketDevice::capabilities, for instance) the availability. * - * @param add mask of @ref KSocketDevice::Capabilities to add + * @param add mask of @ref TDESocketDevice::Capabilities to add * @param remove mask of bits to remove from the requirements * @return the current mask of requested capabilities */ @@ -420,15 +420,15 @@ public: private: /// @internal - /// called by KSocketDevice + /// called by TDESocketDevice void unsetSocketDevice(); - KSocketBase(const KSocketBase&); - KSocketBase& operator =(const KSocketBase&); + TDESocketBase(const TDESocketBase&); + TDESocketBase& operator =(const TDESocketBase&); - KSocketBasePrivate *d; + TDESocketBasePrivate *d; - friend class KSocketDevice; + friend class TDESocketDevice; }; /** @@ -440,7 +440,7 @@ private: * * @author Thiago Macieira */ -class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public KSocketBase +class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public TDESocketBase { public: /** @@ -575,7 +575,7 @@ public: * @param from the address of the sender will be stored here * @returns the actual number of bytes read */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from) = 0; + virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) = 0; /** * Peeks the data in the socket. @@ -602,7 +602,7 @@ public: * @param from the address of the sender will be stored here * @returns the actual number of bytes copied into @p data */ - virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0; + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) = 0; /** * Writes the given data to the socket. @@ -623,7 +623,7 @@ public: * @param to the address to send to * @returns the number of bytes actually sent */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to) = 0; + virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) = 0; /** * Reads one character from the socket. @@ -647,14 +647,14 @@ public: /** * Returns this socket's local address. */ - virtual KSocketAddress localAddress() const = 0; + virtual TDESocketAddress localAddress() const = 0; /** * Return this socket's peer address, if we are connected. * If the address cannot be retrieved, the returned object will contain * an invalid address. */ - virtual KSocketAddress peerAddress() const = 0; + virtual TDESocketAddress peerAddress() const = 0; // FIXME KDE 4.0: // enable this function @@ -662,7 +662,7 @@ public: /** * Returns this socket's externally-visible address, if known. */ - virtual KSocketAddress externalAddress() const = 0; + virtual TDESocketAddress externalAddress() const = 0; #endif protected: @@ -689,7 +689,7 @@ protected: * * @author Thiago Macieira */ -class TDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase +class TDECORE_EXPORT KPassiveSocketBase: virtual public TDESocketBase { public: /** @@ -754,12 +754,12 @@ public: /** * Returns this socket's local address. */ - virtual KSocketAddress localAddress() const = 0; + virtual TDESocketAddress localAddress() const = 0; /** * Returns this socket's externally-visible address if known. */ - virtual KSocketAddress externalAddress() const = 0; + virtual TDESocketAddress externalAddress() const = 0; private: KPassiveSocketBase(const KPassiveSocketBase&); diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp index 0ba18b77b..52988d344 100644 --- a/tdecore/network/tdesocketbuffer.cpp +++ b/tdecore/network/tdesocketbuffer.cpp @@ -33,23 +33,23 @@ using namespace KNetwork; using namespace KNetwork::Internal; -KSocketBuffer::KSocketBuffer(TQ_LONG size) +TDESocketBuffer::TDESocketBuffer(TQ_LONG size) : m_mutex(true), m_offset(0), m_size(size), m_length(0) { } -KSocketBuffer::KSocketBuffer(const KSocketBuffer& other) +TDESocketBuffer::TDESocketBuffer(const TDESocketBuffer& other) : KIOBufferBase(other), m_mutex(true) { *this = other; } -KSocketBuffer::~KSocketBuffer() +TDESocketBuffer::~TDESocketBuffer() { // TQValueList takes care of deallocating memory } -KSocketBuffer& KSocketBuffer::operator=(const KSocketBuffer& other) +TDESocketBuffer& TDESocketBuffer::operator=(const TDESocketBuffer& other) { TQMutexLocker locker1(&m_mutex); TQMutexLocker locker2(&other.m_mutex); @@ -64,7 +64,7 @@ KSocketBuffer& KSocketBuffer::operator=(const KSocketBuffer& other) return *this; } -bool KSocketBuffer::canReadLine() const +bool TDESocketBuffer::canReadLine() const { TQMutexLocker locker(&m_mutex); @@ -85,7 +85,7 @@ bool KSocketBuffer::canReadLine() const return false; // not found } -TQCString KSocketBuffer::readLine() +TQCString TDESocketBuffer::readLine() { if (!canReadLine()) return TQCString(); // empty @@ -120,17 +120,17 @@ TQCString KSocketBuffer::readLine() return result; } -TQ_LONG KSocketBuffer::length() const +TQ_LONG TDESocketBuffer::length() const { return m_length; } -TQ_LONG KSocketBuffer::size() const +TQ_LONG TDESocketBuffer::size() const { return m_size; } -bool KSocketBuffer::setSize(TQ_LONG size) +bool TDESocketBuffer::setSize(TQ_LONG size) { m_size = size; if (size == -1 || m_length < m_size) @@ -147,7 +147,7 @@ bool KSocketBuffer::setSize(TQ_LONG size) return (m_length - m_size) == consumeBuffer(0L, m_length - m_size, true); } -TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len) +TQ_LONG TDESocketBuffer::feedBuffer(const char *data, TQ_LONG len) { if (data == 0L || len == 0) return 0; // nothing to write @@ -168,7 +168,7 @@ TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len) return len; } -TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard) +TQ_LONG TDESocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard) { if (maxlen == 0 || isEmpty()) return 0; @@ -220,7 +220,7 @@ TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool disc return copied; } -void KSocketBuffer::clear() +void TDESocketBuffer::clear() { TQMutexLocker locker(&m_mutex); m_list.clear(); @@ -228,7 +228,7 @@ void KSocketBuffer::clear() m_length = 0; } -TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len) +TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len) { if (len == 0 || isEmpty()) return 0; @@ -293,7 +293,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len) return written; } -TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len) +TQ_LONG TDESocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len) { if (len == 0 || isFull()) return 0; diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h index b2c5dc6b2..be71f462e 100644 --- a/tdecore/network/tdesocketbuffer_p.h +++ b/tdecore/network/tdesocketbuffer_p.h @@ -38,14 +38,14 @@ class KActiveSocketBase; /** * @internal - * @class KSocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h + * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h * @brief generic socket buffering code * * This class implements generic buffering used by @ref KBufferedSocket. * * @author Thiago Macieira */ -class KSocketBuffer: public KIOBufferBase +class TDESocketBuffer: public KIOBufferBase { public: /** @@ -53,22 +53,22 @@ public: * * @param size the maximum size of the buffer */ - KSocketBuffer(TQ_LONG size = -1); + TDESocketBuffer(TQ_LONG size = -1); /** * Copy constructor. */ - KSocketBuffer(const KSocketBuffer& other); + TDESocketBuffer(const TDESocketBuffer& other); /** * Virtual destructor. Frees the buffer and discards its contents. */ - virtual ~KSocketBuffer(); + virtual ~TDESocketBuffer(); /** * Assignment operator. */ - KSocketBuffer& operator=(const KSocketBuffer& other); + TDESocketBuffer& operator=(const TDESocketBuffer& other); /** * Returns true if a line can be read from the buffer. diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp index 064b66b08..e4802bb7c 100644 --- a/tdecore/network/tdesocketdevice.cpp +++ b/tdecore/network/tdesocketdevice.cpp @@ -60,14 +60,14 @@ using namespace KNetwork; -class KNetwork::KSocketDevicePrivate +class KNetwork::TDESocketDevicePrivate { public: mutable TQSocketNotifier *input, *output, *exception; - KSocketAddress local, peer; + TDESocketAddress local, peer; int af; - inline KSocketDevicePrivate() + inline TDESocketDevicePrivate() { input = output = exception = 0L; af = 0; @@ -75,16 +75,16 @@ public: }; -KSocketDevice::KSocketDevice(const KSocketBase* parent) - : m_sockfd(-1), d(new KSocketDevicePrivate) +TDESocketDevice::TDESocketDevice(const TDESocketBase* parent) + : m_sockfd(-1), d(new TDESocketDevicePrivate) { setSocketDevice(this); if (parent) setSocketOptions(parent->socketOptions()); } -KSocketDevice::KSocketDevice(int fd) - : m_sockfd(fd), d(new KSocketDevicePrivate) +TDESocketDevice::TDESocketDevice(int fd) + : m_sockfd(fd), d(new TDESocketDevicePrivate) { setState(IO_Open); setFlags(IO_Sequential | IO_Raw | IO_ReadWrite); @@ -92,26 +92,26 @@ KSocketDevice::KSocketDevice(int fd) d->af = localAddress().family(); } -KSocketDevice::KSocketDevice(bool, const KSocketBase* parent) - : m_sockfd(-1), d(new KSocketDevicePrivate) +TDESocketDevice::TDESocketDevice(bool, const TDESocketBase* parent) + : m_sockfd(-1), d(new TDESocketDevicePrivate) { // do not set parent if (parent) setSocketOptions(parent->socketOptions()); } -KSocketDevice::~KSocketDevice() +TDESocketDevice::~TDESocketDevice() { close(); // deletes the notifiers unsetSocketDevice(); // prevent double deletion delete d; } -bool KSocketDevice::setSocketOptions(int opts) +bool TDESocketDevice::setSocketOptions(int opts) { // must call parent TQMutexLocker locker(mutex()); - KSocketBase::setSocketOptions(opts); + TDESocketBase::setSocketOptions(opts); if (m_sockfd == -1) return true; // flags are stored @@ -171,13 +171,13 @@ bool KSocketDevice::setSocketOptions(int opts) return true; // all went well } -bool KSocketDevice::open(TQ_OpenMode) +bool TDESocketDevice::open(TQ_OpenMode) { resetError(); return false; } -void KSocketDevice::close() +void TDESocketDevice::close() { resetError(); if (m_sockfd != -1) @@ -198,7 +198,7 @@ void KSocketDevice::close() m_sockfd = -1; } -bool KSocketDevice::create(int family, int type, int protocol) +bool TDESocketDevice::create(int family, int type, int protocol) { resetError(); @@ -224,12 +224,12 @@ bool KSocketDevice::create(int family, int type, int protocol) return true; // successfully created } -bool KSocketDevice::create(const KResolverEntry& address) +bool TDESocketDevice::create(const KResolverEntry& address) { return create(address.family(), address.socketType(), address.protocol()); } -bool KSocketDevice::bind(const KResolverEntry& address) +bool TDESocketDevice::bind(const KResolverEntry& address) { resetError(); @@ -252,7 +252,7 @@ bool KSocketDevice::bind(const KResolverEntry& address) return true; } -bool KSocketDevice::listen(int backlog) +bool TDESocketDevice::listen(int backlog) { if (m_sockfd != -1) { @@ -273,7 +273,7 @@ bool KSocketDevice::listen(int backlog) return false; } -bool KSocketDevice::connect(const KResolverEntry& address) +bool TDESocketDevice::connect(const KResolverEntry& address) { resetError(); @@ -306,7 +306,7 @@ bool KSocketDevice::connect(const KResolverEntry& address) return true; // all is well } -KSocketDevice* KSocketDevice::accept() +TDESocketDevice* TDESocketDevice::accept() { if (m_sockfd == -1) { @@ -327,17 +327,17 @@ KSocketDevice* KSocketDevice::accept() return NULL; } - return new KSocketDevice(newfd); + return new TDESocketDevice(newfd); } -bool KSocketDevice::disconnect() +bool TDESocketDevice::disconnect() { resetError(); if (m_sockfd == -1) return false; // can't create - KSocketAddress address; + TDESocketAddress address; address.setFamily(AF_UNSPEC); if (kde_connect(m_sockfd, address.address(), address.length()) == -1) { @@ -365,10 +365,10 @@ bool KSocketDevice::disconnect() } #ifdef USE_QT3 -TQ_LONG KSocketDevice::bytesAvailable() const +TQ_LONG TDESocketDevice::bytesAvailable() const #endif #ifdef USE_QT4 -qint64 KSocketDevice::bytesAvailable() const +qint64 TDESocketDevice::bytesAvailable() const #endif { if (m_sockfd == -1) @@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const return nchars; } -TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) +TQ_LONG TDESocketDevice::waitForMore(int msecs, bool *timeout) { if (m_sockfd == -1) return -1; // there won't ever be anything to read... @@ -393,7 +393,7 @@ TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) return bytesAvailable(); } -static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) +static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddress* from, ssize_t &retval, bool peek = false) { socklen_t len; if (from) @@ -407,19 +407,19 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddres if (retval == -1) { if (errno == EAGAIN || errno == EWOULDBLOCK) - return KSocketDevice::WouldBlock; + return TDESocketDevice::WouldBlock; else - return KSocketDevice::UnknownError; + return TDESocketDevice::UnknownError; } if (retval == 0) - return KSocketDevice::RemotelyDisconnected; + return TDESocketDevice::RemotelyDisconnected; if (from) from->setLength(len); return 0; } -TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -440,7 +440,7 @@ TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress &from) +TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -461,7 +461,7 @@ TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSoc return retval; } -TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) +TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -482,7 +482,7 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) +TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { resetError(); if (m_sockfd == -1) @@ -503,12 +503,12 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& fr return retval; } -TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) { - return tqwriteBlock(data, len, KSocketAddress()); + return tqwriteBlock(data, len, TDESocketAddress()); } -TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to) +TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) { resetError(); if (m_sockfd == -1) @@ -532,20 +532,20 @@ TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, return retval; } -KSocketAddress KSocketDevice::localAddress() const +TDESocketAddress TDESocketDevice::localAddress() const { if (m_sockfd == -1) - return KSocketAddress(); // not open, empty value + return TDESocketAddress(); // not open, empty value if (d->local.family() != AF_UNSPEC) return d->local; socklen_t len; - KSocketAddress localAddress; + TDESocketAddress localAddress; localAddress.setLength(len = 32); // arbitrary value if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1) // error! - return d->local = KSocketAddress(); + return d->local = TDESocketAddress(); #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN len = localAddress.address()->sa_len; @@ -563,25 +563,25 @@ KSocketAddress KSocketDevice::localAddress() const localAddress.setLength(len); if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1) // error! - return d->local = KSocketAddress(); + return d->local = TDESocketAddress(); return d->local = localAddress; } -KSocketAddress KSocketDevice::peerAddress() const +TDESocketAddress TDESocketDevice::peerAddress() const { if (m_sockfd == -1) - return KSocketAddress(); // not open, empty value + return TDESocketAddress(); // not open, empty value if (d->peer.family() != AF_UNSPEC) return d->peer; socklen_t len; - KSocketAddress peerAddress; + TDESocketAddress peerAddress; peerAddress.setLength(len = 32); // arbitrary value if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1) // error! - return d->peer = KSocketAddress(); + return d->peer = TDESocketAddress(); #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN len = peerAddress.address()->sa_len; @@ -599,19 +599,19 @@ KSocketAddress KSocketDevice::peerAddress() const peerAddress.setLength(len); if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1) // error! - return d->peer = KSocketAddress(); + return d->peer = TDESocketAddress(); return d->peer = peerAddress; } -KSocketAddress KSocketDevice::externalAddress() const +TDESocketAddress TDESocketDevice::externalAddress() const { // for normal sockets, the externally visible address is the same // as the local address return localAddress(); } -TQSocketNotifier* KSocketDevice::readNotifier() const +TQSocketNotifier* TDESocketDevice::readNotifier() const { if (d->input) return d->input; @@ -629,7 +629,7 @@ TQSocketNotifier* KSocketDevice::readNotifier() const return d->input = createNotifier(TQSocketNotifier::Read); } -TQSocketNotifier* KSocketDevice::writeNotifier() const +TQSocketNotifier* TDESocketDevice::writeNotifier() const { if (d->output) return d->output; @@ -647,7 +647,7 @@ TQSocketNotifier* KSocketDevice::writeNotifier() const return d->output = createNotifier(TQSocketNotifier::Write); } -TQSocketNotifier* KSocketDevice::exceptionNotifier() const +TQSocketNotifier* TDESocketDevice::exceptionNotifier() const { if (d->exception) return d->exception; @@ -665,7 +665,7 @@ TQSocketNotifier* KSocketDevice::exceptionNotifier() const return d->exception = createNotifier(TQSocketNotifier::Exception); } -bool KSocketDevice::poll(bool *input, bool *output, bool *exception, +bool TDESocketDevice::poll(bool *input, bool *output, bool *exception, int timeout, bool* timedout) { if (m_sockfd == -1) @@ -787,13 +787,13 @@ bool KSocketDevice::poll(bool *input, bool *output, bool *exception, #endif } -bool KSocketDevice::poll(int timeout, bool *timedout) +bool TDESocketDevice::poll(int timeout, bool *timedout) { bool input, output, exception; return poll(&input, &output, &exception, timeout, timedout); } -TQSocketNotifier* KSocketDevice::createNotifier(TQSocketNotifier::Type type) const +TQSocketNotifier* TDESocketDevice::createNotifier(TQSocketNotifier::Type type) const { if (m_sockfd == -1) return 0L; @@ -836,14 +836,14 @@ namespace }; } -static KSocketDeviceFactoryBase* defaultImplFactory; +static TDESocketDeviceFactoryBase* defaultImplFactory; static TQMutex defaultImplFactoryMutex; -typedef TQMap factoryMap; +typedef TQMap factoryMap; static factoryMap factories; -KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent) +TDESocketDevice* TDESocketDevice::createDefault(TDESocketBase* parent) { - KSocketDevice* device = dynamic_cast(parent); + TDESocketDevice* device = dynamic_cast(parent); if (device != 0L) return device; @@ -853,12 +853,12 @@ KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent) return defaultImplFactory->create(parent); // the really default - return new KSocketDevice(parent); + return new TDESocketDevice(parent); } -KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilities) +TDESocketDevice* TDESocketDevice::createDefault(TDESocketBase* parent, int capabilities) { - KSocketDevice* device = dynamic_cast(parent); + TDESocketDevice* device = dynamic_cast(parent); if (device != 0L) return device; @@ -872,16 +872,16 @@ KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilitie return 0L; // no default } -KSocketDeviceFactoryBase* -KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory) +TDESocketDeviceFactoryBase* +TDESocketDevice::setDefaultImpl(TDESocketDeviceFactoryBase* factory) { TQMutexLocker locker(&defaultImplFactoryMutex); - KSocketDeviceFactoryBase* old = defaultImplFactory; + TDESocketDeviceFactoryBase* old = defaultImplFactory; defaultImplFactory = factory; return old; } -void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities) +void TDESocketDevice::addNewImpl(TDESocketDeviceFactoryBase* factory, int capabilities) { TQMutexLocker locker(&defaultImplFactoryMutex); if (factories.contains(capabilities)) diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h index 10856716d..52fe18709 100644 --- a/tdecore/network/tdesocketdevice.h +++ b/tdecore/network/tdesocketdevice.h @@ -30,32 +30,32 @@ namespace KNetwork { -class KSocketDevice; -class KSocketDeviceFactoryBase; +class TDESocketDevice; +class TDESocketDeviceFactoryBase; -class KSocketDevicePrivate; -/** @class KSocketDevice tdesocketdevice.h tdesocketdevice.h +class TDESocketDevicePrivate; +/** @class TDESocketDevice tdesocketdevice.h tdesocketdevice.h * @brief Low-level socket functionality. * * This class provides low-level socket functionality. * * Most users will prefer "cooked" interfaces like those of @ref KStreamSocket or - * @ref KServerSocket. + * @ref TDEServerSocket. * * Descended classes from this one provide some other kinds of socket functionality, * like proxying or specific socket types. * * @author Thiago Macieira */ -class TDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase +class TDECORE_EXPORT TDESocketDevice: public KActiveSocketBase, public KPassiveSocketBase { public: /** * Capabilities for the socket implementation. * - * KSocketDevice-derived classes can implement certain capabilities that are not + * TDESocketDevice-derived classes can implement certain capabilities that are not * available in the default class. These capabilities are described by these flags. - * The default KSocketDevice class has none of these capabilities. + * The default TDESocketDevice class has none of these capabilities. * * For the negative capabilities (inabilities, the CanNot* forms), when a capability * is not present, the implementation will default to the original behaviour. @@ -101,7 +101,7 @@ public: * The parameter is used to specify which socket this object is used as * a device for. */ - explicit KSocketDevice(const KSocketBase* = 0L); + explicit TDESocketDevice(const TDESocketBase* = 0L); /** * Constructs a new object around an already-open socket. @@ -109,12 +109,12 @@ public: * Note: you should write programs that create sockets through * the classes whenever possible. */ - explicit KSocketDevice(int fd); + explicit TDESocketDevice(int fd); /** * Destructor. This closes the socket if it's open. */ - virtual ~KSocketDevice(); + virtual ~TDESocketDevice(); /** * Returns the file descriptor for this socket. @@ -186,9 +186,9 @@ public: /** * Accepts a new incoming connection. - * Note: this function returns a socket of type KSocketDevice. + * Note: this function returns a socket of type TDESocketDevice. */ - virtual KSocketDevice* accept(); + virtual TDESocketDevice* accept(); /** * Disconnects this socket. @@ -221,7 +221,7 @@ public: /** * Reads data and the source address from this socket. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from); + virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); /** * Peeks data in the socket. @@ -231,7 +231,7 @@ public: /** * Peeks the data in the socket and the source address. */ - virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Writes data to the socket. @@ -241,18 +241,18 @@ public: /** * Writes the given data to the given destination address. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to); + virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); /** * Returns this socket's local address. */ - virtual KSocketAddress localAddress() const; + virtual TDESocketAddress localAddress() const; /** * Returns this socket's peer address. If this implementation does proxying * of some sort, this is the real external address, not the proxy's address. */ - virtual KSocketAddress peerAddress() const; + virtual TDESocketAddress peerAddress() const; /** * Returns this socket's externally visible local address. @@ -265,10 +265,10 @@ public: * addresses different from the local socket values. The default implementation * returns the same value as @ref localAddress. * - * @note This function may return an empty KSocketAddress. In that case, the + * @note This function may return an empty TDESocketAddress. In that case, the * externally visible address could/can not be determined. */ - virtual KSocketAddress externalAddress() const; + virtual TDESocketAddress externalAddress() const; /** * Returns a socket notifier for input on this socket. @@ -337,7 +337,7 @@ protected: * * @param parent the parent, if any */ - KSocketDevice(bool, const KSocketBase* parent = 0L); + TDESocketDevice(bool, const TDESocketBase* parent = 0L); /** * Creates a socket notifier of the given type. @@ -358,16 +358,16 @@ protected: public: /** - * Creates a new default KSocketDevice object given + * Creates a new default TDESocketDevice object given * the parent object. * * The capabilities flag indicates the desired capabilities the object being * created should possess. Those capabilities are not guaranteed: if no factory * can provide such an object, a default object will be created. * - * @param parent the KSocketBase parent + * @param parent the TDESocketBase parent */ - static KSocketDevice* createDefault(KSocketBase* parent); + static TDESocketDevice* createDefault(TDESocketBase* parent); /** * @overload @@ -377,40 +377,40 @@ public: * @param parent the parent * @param capabilities the requested capabilities */ - static KSocketDevice* createDefault(KSocketBase* parent, int capabilities); + static TDESocketDevice* createDefault(TDESocketBase* parent, int capabilities); /** - * Sets the default KSocketDevice implementation to use and + * Sets the default TDESocketDevice implementation to use and * return the old factory. * * @param factory the factory object for the implementation */ - static KSocketDeviceFactoryBase* setDefaultImpl(KSocketDeviceFactoryBase* factory); + static TDESocketDeviceFactoryBase* setDefaultImpl(TDESocketDeviceFactoryBase* factory); /** - * Adds a factory of KSocketDevice objects to the list, along with its + * Adds a factory of TDESocketDevice objects to the list, along with its * capabilities flag. */ - static void addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities); + static void addNewImpl(TDESocketDeviceFactoryBase* factory, int capabilities); private: - KSocketDevice(const KSocketDevice&); - KSocketDevice& operator=(const KSocketDevice&); + TDESocketDevice(const TDESocketDevice&); + TDESocketDevice& operator=(const TDESocketDevice&); - KSocketDevicePrivate *d; + TDESocketDevicePrivate *d; }; /** @internal * This class provides functionality for creating and registering * socket implementations. */ -class KSocketDeviceFactoryBase +class TDESocketDeviceFactoryBase { public: - KSocketDeviceFactoryBase() {} - virtual ~KSocketDeviceFactoryBase() {} + TDESocketDeviceFactoryBase() {} + virtual ~TDESocketDeviceFactoryBase() {} - virtual KSocketDevice* create(KSocketBase*) const = 0; + virtual TDESocketDevice* create(TDESocketBase*) const = 0; }; /** @@ -418,13 +418,13 @@ public: * socket implementations. */ template -class KSocketDeviceFactory: public KSocketDeviceFactoryBase +class TDESocketDeviceFactory: public TDESocketDeviceFactoryBase { public: - KSocketDeviceFactory() {} - virtual ~KSocketDeviceFactory() {} + TDESocketDeviceFactory() {} + virtual ~TDESocketDeviceFactory() {} - virtual KSocketDevice* create(KSocketBase* parent) const + virtual TDESocketDevice* create(TDESocketBase* parent) const { return new Impl(parent); } }; diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index 7c253ee34..206e75737 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -4828,7 +4828,7 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes() // read in all available Services for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { TQString service = NM_PLUGIN_SERVICE_DIR + TQString ("/") + *i; - KConfig* kconfig = new KConfig (service, true, true, "config"); + TDEConfig* kconfig = new TDEConfig (service, true, true, "config"); kconfig->setGroup ("VPN Connection"); TQString serviceName = kconfig->readEntry("name", TQString()); diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index 372f779c1..bd5ee6ec6 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -1217,7 +1217,7 @@ bool TDERootSystemDevice::canPowerOff() { // Can we power down this system? // This should probably be checked via DCOP and therefore interface with KDM - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->reparseConfiguration(); // config may have changed in the KControl module config->setGroup("General" ); @@ -2766,7 +2766,7 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ // KStandardDirs::kde_default -typedef TQMap KConfigMap; +typedef TQMap TDEConfigMap; TQString readUdevAttribute(udev_device* dev, TQString attr) { return TQString(udev_device_get_property_value(dev, attr.ascii())); @@ -3070,7 +3070,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ TQString hardware_info_directory; // Scan the hardware_info_directory for configuration files - // For each one, open it with KConfig() and apply its rules to classify the device + // For each one, open it with TDEConfig() and apply its rules to classify the device // FIXME // Should this also scan up to subdirectories for the files? That feature might end up being too expensive... @@ -3092,10 +3092,10 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ bool match = true; // Open the rules file - KConfig rulesFile(fi->absFilePath(), true, false); + TDEConfig rulesFile(fi->absFilePath(), true, false); rulesFile.setGroup("Conditions"); - KConfigMap conditionmap = rulesFile.entryMap("Conditions"); - KConfigMap::Iterator cndit; + TDEConfigMap conditionmap = rulesFile.entryMap("Conditions"); + TDEConfigMap::Iterator cndit; for (cndit = conditionmap.begin(); cndit != conditionmap.end(); ++cndit) { TQStringList conditionList = TQStringList::split(',', cndit.data(), false); bool atleastonematch = false; diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/kconfigtest.cpp index 384a328cc..e4768119c 100644 --- a/tdecore/tests/kconfigtest.cpp +++ b/tdecore/tests/kconfigtest.cpp @@ -22,7 +22,7 @@ #include -class KConfigTest : public KUnitTest::Tester +class TDEConfigTest : public KUnitTest::Tester { public: void allTests(); @@ -31,8 +31,8 @@ private: void revertEntries(); }; -KUNITTEST_MODULE( kunittest_kconfig, "KConfigTest" ) -KUNITTEST_MODULE_REGISTER_TESTER( KConfigTest ) +KUNITTEST_MODULE( kunittest_kconfig, "TDEConfigTest" ) +KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest ) // test data #define BOOLENTRY1 true @@ -50,9 +50,9 @@ KUNITTEST_MODULE_REGISTER_TESTER( KConfigTest ) #define DATETIMEENTRY TQDateTime( TQDate( 2002, 06, 23 ), TQTime( 12, 55, 40 ) ) #define STRINGLISTENTRY TQStringList( "Hello," ) -void KConfigTest::writeConfigFile() +void TDEConfigTest::writeConfigFile() { - KConfig sc( "kconfigtest" ); + TDEConfig sc( "kconfigtest" ); sc.setGroup("AAA"); sc.writeEntry("stringEntry1", STRINGENTRY1, true, true); @@ -86,10 +86,10 @@ void KConfigTest::writeConfigFile() } // ### TODO: call this, and test the state of things afterwards -void KConfigTest::revertEntries() +void TDEConfigTest::revertEntries() { tqWarning("Reverting entries"); - KConfig sc( "kconfigtest" ); + TDEConfig sc( "kconfigtest" ); sc.setGroup("Hello"); sc.revertToDefault( "boolEntry1"); @@ -105,13 +105,13 @@ void KConfigTest::revertEntries() sc.sync(); } -void KConfigTest::allTests() +void TDEConfigTest::allTests() { writeConfigFile(); - KConfig sc2( "kconfigtest" ); + TDEConfig sc2( "kconfigtest" ); - KConfigGroup sc3( &sc2, "AAA"); + TDEConfigGroup sc3( &sc2, "AAA"); bool bImmutable = sc3.entryIsImmutable("stringEntry1"); CHECK( bImmutable, false ); diff --git a/tdecore/tests/kconfigtestgui.cpp b/tdecore/tests/kconfigtestgui.cpp index 6f8c6e0e0..776082bfb 100644 --- a/tdecore/tests/kconfigtestgui.cpp +++ b/tdecore/tests/kconfigtestgui.cpp @@ -23,7 +23,7 @@ // // configtest.cpp: libKDEcore example // -// demonstrates use of KConfig class +// demonstrates use of TDEConfig class // // adapted from Qt widgets demo @@ -56,10 +56,10 @@ #endif // -// Construct the KConfigTestView with buttons +// Construct the TDEConfigTestView with buttons // -KConfigTestView::KConfigTestView( TQWidget *parent, const char *name ) +TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) : TQDialog( parent, name ), pConfig( 0L ), pFile( 0L ), @@ -67,7 +67,7 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name ) { // Set the window caption/title - setCaption( "KConfig test" ); + setCaption( "TDEConfig test" ); // Label and edit for the app config file pAppFileLabel = new TQLabel( this, "appconfiglabel" ); @@ -123,18 +123,18 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name ) pQuitButton->setGeometry( 340, 60, 60, 60 ); connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) ); - // create a default KConfig object in order to be able to start right away - pConfig = new KConfig( TQString::null ); + // create a default TDEConfig object in order to be able to start right away + pConfig = new TDEConfig( TQString::null ); } -KConfigTestView::~KConfigTestView() +TDEConfigTestView::~TDEConfigTestView() { delete pConfig; delete pFile; delete pStream; } -void KConfigTestView::appConfigEditReturnPressed() +void TDEConfigTestView::appConfigEditReturnPressed() { // if there already was a config object, delete it and its associated data delete pConfig; @@ -146,12 +146,12 @@ void KConfigTestView::appConfigEditReturnPressed() // create a new config object if( !pAppFileEdit->text().isEmpty() ) - pConfig = new KConfig( pAppFileEdit->text() ); + pConfig = new TDEConfig( pAppFileEdit->text() ); pInfoLabel2->setText( "New config object created." ); } -void KConfigTestView::groupEditReturnPressed() +void TDEConfigTestView::groupEditReturnPressed() { pConfig->setGroup( pGroupEdit->text() ); // according to the Qt doc, this is begging for trouble, but for a @@ -162,7 +162,7 @@ void KConfigTestView::groupEditReturnPressed() pInfoLabel2->setText( aText ); } -void KConfigTestView::keyEditReturnPressed() +void TDEConfigTestView::keyEditReturnPressed() { TQString aValue = pConfig->readEntry( pKeyEdit->text() ); // just checking aValue.isNull() would be easier here, but this is @@ -181,7 +181,7 @@ void KConfigTestView::keyEditReturnPressed() } } -void KConfigTestView::writeButtonClicked() +void TDEConfigTestView::writeButtonClicked() { pConfig->writeEntry( pKeyEdit->text(), TQString( pValueEdit->text() ) ); pInfoLabel2->setText( "Entry written" ); @@ -194,7 +194,7 @@ int main( int argc, char **argv ) { TDEApplication a( argc, argv, "bla" ); - KConfigTestView *w = new KConfigTestView(); + TDEConfigTestView *w = new TDEConfigTestView(); a.setMainWidget( w ); return w->exec(); } diff --git a/tdecore/tests/kconfigtestgui.h b/tdecore/tests/kconfigtestgui.h index 7655c8142..f5bbfd659 100644 --- a/tdecore/tests/kconfigtestgui.h +++ b/tdecore/tests/kconfigtestgui.h @@ -36,15 +36,15 @@ #include // -// KConfigTestView contains lots of Qt widgets. +// TDEConfigTestView contains lots of Qt widgets. // -class KConfigTestView : public TQDialog +class TDEConfigTestView : public TQDialog { Q_OBJECT public: - KConfigTestView( TQWidget *parent=0, const char *name=0 ); - ~KConfigTestView(); + TDEConfigTestView( TQWidget *parent=0, const char *name=0 ); + ~TDEConfigTestView(); private slots: void appConfigEditReturnPressed(); @@ -64,7 +64,7 @@ private: TQLabel* pInfoLabel1, *pInfoLabel2; TQPushButton* pQuitButton; - KConfig* pConfig; + TDEConfig* pConfig; TQFile* pFile; TQTextStream* pStream; }; diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp index c5640dc09..6e1a3080f 100644 --- a/tdecore/tests/kresolvertest.cpp +++ b/tdecore/tests/kresolvertest.cpp @@ -213,7 +213,7 @@ bool testKernel() printf("succeeded\n"); - KSocketAddress *ksin = KExtendedSocket::localAddress(sock); + TDESocketAddress *ksin = KExtendedSocket::localAddress(sock); if (ksin != NULL) { printf("\tWe got socket %s\n", (const char*)ksin->pretty().latin1()); diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp index 48420acfc..e038cbd2c 100644 --- a/tdecore/tests/ksocktest.cpp +++ b/tdecore/tests/ksocktest.cpp @@ -100,7 +100,7 @@ main(int argc, char *argv[]) printf("FD %d\n", sock2->fd()); - KSocketAddress* addr = KExtendedSocket::peerAddress( sock2->fd() ); + TDESocketAddress* addr = KExtendedSocket::peerAddress( sock2->fd() ); check( "peerAddress:", addr->nodeName().latin1(), "213.203.58.36" ); check( "isEqual:", addr->isEqual(KInetSocketAddress("213.203.58.36", 80)) ? "TRUE" : "FALSE", "TRUE"); diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp index 973402ffc..fa7191cce 100644 --- a/tdecore/tests/kstddirstest.cpp +++ b/tdecore/tests/kstddirstest.cpp @@ -8,7 +8,7 @@ int main(int argc, char **argv) { TDEApplication a(argc, argv, "whatever", false); KStandardDirs t; - KConfig config; // to add custom entries - a bit tricky :/ + TDEConfig config; // to add custom entries - a bit tricky :/ TQStringList list; TQString s; diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp index 971da38ff..a05e44d6f 100644 --- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line) bool CupsdConf::loadAvailableResources() { - KConfig conf("tdeprintrc"); + TDEConfig conf("tdeprintrc"); conf.setGroup("CUPS"); TQString host = conf.readEntry("Host",cupsServer()); int port = conf.readNumEntry("Port",ippPort()); diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index 5e6d4659d..ada83d362 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -95,7 +95,7 @@ const char* getPassword(const char*) TQString user(cupsUser()); TQString pass; - if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) + if (TDEIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) { cupsSetUser(user.latin1()); pass_string = pass; diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp index 2f7031503..7962b13ef 100644 --- a/tdeprint/cups/cupsinfos.cpp +++ b/tdeprint/cups/cupsinfos.cpp @@ -117,7 +117,7 @@ const char* CupsInfos::getPasswordCB() void CupsInfos::load() { - KConfig *conf_ = KMFactory::self()->printConfig(); + TDEConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer())); port_ = conf_->readNumEntry("Port",ippPort()); @@ -141,7 +141,7 @@ void CupsInfos::load() void CupsInfos::save() { - KConfig *conf_ = KMFactory::self()->printConfig(); + TDEConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); conf_->writeEntry("Host",host_); conf_->writeEntry("Port",port_); diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp index 7e03dae01..55a96d9d5 100644 --- a/tdeprint/cups/kmconfigcups.cpp +++ b/tdeprint/cups/kmconfigcups.cpp @@ -40,12 +40,12 @@ KMConfigCups::KMConfigCups(TQWidget *parent) lay0->addStretch(1); } -void KMConfigCups::loadConfig(KConfig *) +void KMConfigCups::loadConfig(TDEConfig *) { m_widget->load(); } -void KMConfigCups::saveConfig(KConfig *conf) +void KMConfigCups::saveConfig(TDEConfig *conf) { m_widget->saveConfig(conf); } diff --git a/tdeprint/cups/kmconfigcups.h b/tdeprint/cups/kmconfigcups.h index c0f1ab2ba..5d7032403 100644 --- a/tdeprint/cups/kmconfigcups.h +++ b/tdeprint/cups/kmconfigcups.h @@ -29,8 +29,8 @@ class KMConfigCups : public KMConfigPage public: KMConfigCups(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KMCupsConfigWidget *m_widget; diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index fbec34f2a..2fe66d787 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -52,7 +52,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) m_stddir->setChecked(true); } -void KMConfigCupsDir::loadConfig(KConfig *conf) +void KMConfigCupsDir::loadConfig(TDEConfig *conf) { conf->setGroup("CUPS"); QString dir = conf->readPathEntry("InstallDir"); @@ -60,7 +60,7 @@ void KMConfigCupsDir::loadConfig(KConfig *conf) m_installdir->setURL(dir); } -void KMConfigCupsDir::saveConfig(KConfig *conf) +void KMConfigCupsDir::saveConfig(TDEConfig *conf) { conf->setGroup("CUPS"); conf->writePathEntry("InstallDir",(m_stddir->isChecked() ? TQString::null : m_installdir->url())); diff --git a/tdeprint/cups/kmconfigcupsdir.h b/tdeprint/cups/kmconfigcupsdir.h index 352388c99..6affa62b0 100644 --- a/tdeprint/cups/kmconfigcupsdir.h +++ b/tdeprint/cups/kmconfigcupsdir.h @@ -30,8 +30,8 @@ class KMConfigCupsDir : public KMConfigPage public: KMConfigCupsDir(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KURLRequester *m_installdir; diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index ca2f4aedb..ce005fc3b 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -143,7 +143,7 @@ void KMCupsConfigWidget::save(bool sync) if (sync) inf->save(); } -void KMCupsConfigWidget::saveConfig(KConfig *conf) +void KMCupsConfigWidget::saveConfig(TDEConfig *conf) { conf->setGroup("CUPS"); conf->writeEntry("Host",m_host->text()); diff --git a/tdeprint/cups/kmcupsconfigwidget.h b/tdeprint/cups/kmcupsconfigwidget.h index 7eee42d80..b8e253ba8 100644 --- a/tdeprint/cups/kmcupsconfigwidget.h +++ b/tdeprint/cups/kmcupsconfigwidget.h @@ -24,7 +24,7 @@ class TQLineEdit; class TQCheckBox; -class KConfig; +class TDEConfig; class KMCupsConfigWidget : public TQWidget { @@ -33,7 +33,7 @@ public: void load(); void save(bool sync = true); - void saveConfig(KConfig*); + void saveConfig(TDEConfig*); protected: TQLineEdit *m_host, *m_port, *m_login, *m_password; diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index e5630652e..b0d61b8ac 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -111,7 +111,7 @@ TQString KMCupsManager::driverDirectory() TQString KMCupsManager::cupsInstallDir() { - KConfig *conf= KMFactory::self()->printConfig(); + TDEConfig *conf= KMFactory::self()->printConfig(); conf->setGroup("CUPS"); TQString dir = conf->readPathEntry("InstallDir"); return dir; @@ -1055,14 +1055,14 @@ void KMCupsManager::slotConnectionFailed( int errcode ) TQString einfo; switch (errcode) { - case KNetwork::KSocketBase::ConnectionRefused: - case KNetwork::KSocketBase::ConnectionTimedOut: + case KNetwork::TDESocketBase::ConnectionRefused: + case KNetwork::TDESocketBase::ConnectionTimedOut: einfo = i18n("connection refused") + TQString(" (%1)").arg(errcode); break; - case KNetwork::KSocketBase::LookupFailure: + case KNetwork::TDESocketBase::LookupFailure: einfo = i18n("host not found") + TQString(" (%1)").arg(errcode); break; - case KNetwork::KSocketBase::WouldBlock: + case KNetwork::TDESocketBase::WouldBlock: default: einfo = i18n("read failed (%1)").arg(errcode); break; diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 661d97764..a1b4ad4ee 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -224,11 +224,11 @@ void KMFactory::loadFactory(const TQString& syst) } } -KConfig* KMFactory::printConfig(const TQString& group) +TDEConfig* KMFactory::printConfig(const TQString& group) { if (!m_printconfig) { - m_printconfig = new KConfig("tdeprintrc"); + m_printconfig = new TDEConfig("tdeprintrc"); TQ_CHECK_PTR(m_printconfig); } if (!group.isEmpty()) @@ -238,7 +238,7 @@ KConfig* KMFactory::printConfig(const TQString& group) TQString KMFactory::printSystem() { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->setGroup("General"); TQString sys = conf->readEntry("PrintSystem"); if (sys.isEmpty()) @@ -276,7 +276,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst) unload(); if (saveSyst) { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->setGroup("General"); conf->writeEntry("PrintSystem", syst); conf->sync(); @@ -403,7 +403,7 @@ void KMFactory::slot_configChanged() void KMFactory::saveConfig() { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->sync(); kdDebug(500) << "KMFactory (" << getpid() << ") emitting DCOP signal configChanged()" << endl; emit configChanged(); diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h index 8bfc9961d..baaf48477 100644 --- a/tdeprint/kmfactory.h +++ b/tdeprint/kmfactory.h @@ -39,7 +39,7 @@ class KXmlCommandManager; class KMSpecialManager; class KPrinterImpl; class KLibFactory; -class KConfig; +class TDEConfig; class KPReloadObject; class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject @@ -72,7 +72,7 @@ public: KMSpecialManager* specialManager(); KXmlCommandManager* commandManager(); KPrinterImpl* printerImplementation(); - KConfig* printConfig(const TQString& group = TQString::null); + TDEConfig* printConfig(const TQString& group = TQString::null); TQString printSystem(); TQValueList pluginList(); PluginInfo pluginInfo(const TQString& name); @@ -121,7 +121,7 @@ private: KPrinterImpl *m_implementation; KLibFactory *m_factory; - KConfig *m_printconfig; + TDEConfig *m_printconfig; Settings *m_settings; TQPtrList m_objects; }; diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index 30a1fb993..3496cdb1d 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -242,14 +242,14 @@ bool KMJobManager::doPluginAction(int, const TQPtrList&) void KMJobManager::setLimit(int val) { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); conf->writeEntry("Limit", val); } int KMJobManager::limit() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); return conf->readNumEntry("Limit", 0); } diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index 115f3fd02..57e06994d 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -418,7 +418,7 @@ bool KMManager::configureServer(TQWidget*) TQString KMManager::testPage() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); QString tpage = conf->readPathEntry("TestPage"); if (tpage.isEmpty()) diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 5e77f890a..06a61e1c0 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -439,7 +439,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) } else { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); expandDialog(!config->readBoolEntry("DialogReduced", (KMFactory::self()->settings()->application != KPrinter::StandAlone))); } @@ -447,7 +447,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) KPrintDialog::~KPrintDialog() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); config->writeEntry("DialogReduced", d->m_reduced); @@ -730,19 +730,19 @@ bool KPrintDialog::checkOutputFile() { //value = (KMessageBox::warningYesNo(this,i18n("File \"%1\" already exists. Overwrite?").arg(f.absFilePath())) == KMessageBox::Yes); time_t mtimeDest = f.lastModified().toTime_t(); - KIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(), - KIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true ); + TDEIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(), + TDEIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true ); int result = dlg.exec(); switch ( result ) { - case KIO::R_OVERWRITE: + case TDEIO::R_OVERWRITE: value = true; break; default: - case KIO::R_CANCEL: + case TDEIO::R_CANCEL: value = false; break; - case KIO::R_RENAME: + case TDEIO::R_RENAME: url = dlg.newDestURL(); d->m_file->setURL( url.path() ); value = true; diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index e62bf635b..3664b4157 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -174,7 +174,7 @@ void KPrinter::loadSettings() setSearchName(option("kde-searchname")); d->m_options.remove("kde-searchname"); - KConfig *conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig(); + TDEConfig *conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig(); conf->setGroup("KPrinter Settings"); pconf->setGroup("General"); @@ -199,7 +199,7 @@ void KPrinter::saveSettings() } // save latest used printer to config file - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("Printer",searchName()); // latest used print command diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 9c62d25f8..5c3d840a0 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -223,7 +223,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) { kdDebug(500) << "tdeprint: status message: " << msg << endl; - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); if (!conf->readBoolEntry("ShowStatusMsg", true)) return; @@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap& opts) void KPrinterImpl::loadAppOptions() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); TQStringList opts = conf->readListEntry("ApplicationOptions"); for (uint i=0; isetGroup("KPrinter Settings"); conf->writeEntry("ApplicationOptions", optlist); } diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index bd812b939..19270727e 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -244,7 +244,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId if ( !isPS ) kdDebug( 500 ) << "Previewing a non PostScript file, built-in preview disabled" << endl; - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); KLibFactory *factory(0); bool externalPreview = conf->readBoolEntry("ExternalPreview", false); diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index a38aa4e26..5251b990a 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -273,7 +273,7 @@ void KMLpdManager::listPrinters() TQString KMLpdManager::programName(int f) { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("LPD"); switch (f) { diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp index f43a8da2d..b5c43ebef 100644 --- a/tdeprint/lpr/kmconfiglpr.cpp +++ b/tdeprint/lpr/kmconfiglpr.cpp @@ -45,12 +45,12 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name) l0->addStretch(1); } -void KMConfigLpr::loadConfig(KConfig*) +void KMConfigLpr::loadConfig(TDEConfig*) { m_mode->setCurrentItem(LprSettings::self()->mode()); } -void KMConfigLpr::saveConfig(KConfig *conf) +void KMConfigLpr::saveConfig(TDEConfig *conf) { LprSettings::self()->setMode((LprSettings::Mode)(m_mode->currentItem())); diff --git a/tdeprint/lpr/kmconfiglpr.h b/tdeprint/lpr/kmconfiglpr.h index 7f3d50857..fa7a0ae26 100644 --- a/tdeprint/lpr/kmconfiglpr.h +++ b/tdeprint/lpr/kmconfiglpr.h @@ -29,8 +29,8 @@ class KMConfigLpr : public KMConfigPage public: KMConfigLpr(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: TQComboBox *m_mode; diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp index 0c1cec2a9..30b650c17 100644 --- a/tdeprint/lpr/lprsettings.cpp +++ b/tdeprint/lpr/lprsettings.cpp @@ -53,7 +53,7 @@ LprSettings* LprSettings::self() void LprSettings::init() { // LPR/LPRng mode - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("LPR"); TQString modestr = conf->readEntry("Mode"); if (modestr == "LPRng") diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index cd823d540..ee63e9eeb 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -47,7 +47,7 @@ KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name) KMFactory::self()->uiManager()->setupConfigDialog(this); // initialize pages - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQPtrListIterator it(m_pages); for (;it.current();++it) it.current()->loadConfig(conf); @@ -77,7 +77,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) void KMConfigDialog::slotOk() { // save configuration - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQPtrListIterator it(m_pages); for (;it.current();++it) it.current()->saveConfig(conf); diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index 29d5107e0..2eea53b0e 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -88,7 +88,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) m_remove->setEnabled(false); } -void KMConfigFilter::loadConfig(KConfig *conf) +void KMConfigFilter::loadConfig(TDEConfig *conf) { conf->setGroup("Filter"); TQStringList m_plist = conf->readListEntry("Printers"); @@ -106,7 +106,7 @@ void KMConfigFilter::loadConfig(KConfig *conf) m_locationre->setText(conf->readEntry("LocationRe")); } -void KMConfigFilter::saveConfig(KConfig *conf) +void KMConfigFilter::saveConfig(TDEConfig *conf) { conf->setGroup("Filter"); TQStringList plist; diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h index 9571f0d54..298c83de2 100644 --- a/tdeprint/management/kmconfigfilter.h +++ b/tdeprint/management/kmconfigfilter.h @@ -32,8 +32,8 @@ class KMConfigFilter : public KMConfigPage public: KMConfigFilter(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); protected slots: void slotSelectionChanged(); diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index 183d0b621..b933cab00 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -103,7 +103,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) m_down->setEnabled(false); } -void KMConfigFonts::loadConfig(KConfig *) +void KMConfigFonts::loadConfig(TDEConfig *) { TQSettings settings; m_embedfonts->setChecked(settings.readBoolEntry("/qt/embedFonts", true)); @@ -113,7 +113,7 @@ void KMConfigFonts::loadConfig(KConfig *) item = new TQListViewItem(m_fontpath, item, *it); } -void KMConfigFonts::saveConfig(KConfig *) +void KMConfigFonts::saveConfig(TDEConfig *) { TQSettings settings; settings.writeEntry("/qt/embedFonts", m_embedfonts->isChecked()); diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h index a93a26d75..dd65d3901 100644 --- a/tdeprint/management/kmconfigfonts.h +++ b/tdeprint/management/kmconfigfonts.h @@ -33,8 +33,8 @@ class KMConfigFonts : public KMConfigPage public: KMConfigFonts(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); protected slots: void slotUp(); diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index 2298d7485..f02cfa854 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -104,7 +104,7 @@ void KMConfigGeneral::setEnabledPreviewButton(bool b) m_preview->setEnabled(!m_testpage->url().isEmpty() && b); } -void KMConfigGeneral::loadConfig(KConfig *conf) +void KMConfigGeneral::loadConfig(TDEConfig *conf) { conf->setGroup("General"); m_timer->setValue(conf->readNumEntry("TimerDelay",5)); @@ -118,7 +118,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf) m_uselast->setChecked(conf->readBoolEntry("UseLast", true)); } -void KMConfigGeneral::saveConfig(KConfig *conf) +void KMConfigGeneral::saveConfig(TDEConfig *conf) { conf->setGroup("General"); conf->writeEntry("TimerDelay",m_timer->value()); diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h index 8fc6fa5ab..b82a91daa 100644 --- a/tdeprint/management/kmconfiggeneral.h +++ b/tdeprint/management/kmconfiggeneral.h @@ -32,8 +32,8 @@ class KMConfigGeneral : public KMConfigPage public: KMConfigGeneral(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); protected slots: void slotTestPagePreview(); diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp index 1088e1b3a..0fb40fb7b 100644 --- a/tdeprint/management/kmconfigjobs.cpp +++ b/tdeprint/management/kmconfigjobs.cpp @@ -48,13 +48,13 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) l1->addWidget(m_limit); } -void KMConfigJobs::loadConfig(KConfig *conf) +void KMConfigJobs::loadConfig(TDEConfig *conf) { conf->setGroup("Jobs"); m_limit->setValue(conf->readNumEntry("Limit", 0)); } -void KMConfigJobs::saveConfig(KConfig *conf) +void KMConfigJobs::saveConfig(TDEConfig *conf) { conf->setGroup("Jobs"); conf->writeEntry("Limit", m_limit->value()); diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h index 34be5b1ef..29818d68a 100644 --- a/tdeprint/management/kmconfigjobs.h +++ b/tdeprint/management/kmconfigjobs.h @@ -30,8 +30,8 @@ class KMConfigJobs : public KMConfigPage public: KMConfigJobs(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KIntNumInput *m_limit; diff --git a/tdeprint/management/kmconfigpage.cpp b/tdeprint/management/kmconfigpage.cpp index fb967e05d..6a259a062 100644 --- a/tdeprint/management/kmconfigpage.cpp +++ b/tdeprint/management/kmconfigpage.cpp @@ -26,11 +26,11 @@ KMConfigPage::KMConfigPage(TQWidget *parent, const char *name) m_header = "Header"; } -void KMConfigPage::loadConfig(KConfig*) +void KMConfigPage::loadConfig(TDEConfig*) { } -void KMConfigPage::saveConfig(KConfig*) +void KMConfigPage::saveConfig(TDEConfig*) { } #include "kmconfigpage.moc" diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h index 59b93fb3d..f29b8a23e 100644 --- a/tdeprint/management/kmconfigpage.h +++ b/tdeprint/management/kmconfigpage.h @@ -24,7 +24,7 @@ #include -class KConfig; +class TDEConfig; class TDEPRINT_EXPORT KMConfigPage : public TQWidget { @@ -32,8 +32,8 @@ class TDEPRINT_EXPORT KMConfigPage : public TQWidget public: KMConfigPage(TQWidget *parent = 0, const char *name = 0); - virtual void loadConfig(KConfig*); - virtual void saveConfig(KConfig*); + virtual void loadConfig(TDEConfig*); + virtual void saveConfig(TDEConfig*); TQString pageName() const { return m_name; } TQString pageHeader() const { return m_header; } diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index 316925d48..548968701 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -59,14 +59,14 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) m_program->setEnabled(false); } -void KMConfigPreview::loadConfig(KConfig *conf) +void KMConfigPreview::loadConfig(TDEConfig *conf) { conf->setGroup("General"); m_useext->setChecked(conf->readBoolEntry("ExternalPreview", false)); m_program->setURL(conf->readPathEntry("PreviewCommand", "gv")); } -void KMConfigPreview::saveConfig(KConfig *conf) +void KMConfigPreview::saveConfig(TDEConfig *conf) { conf->setGroup("General"); conf->writeEntry("ExternalPreview", m_useext->isChecked()); diff --git a/tdeprint/management/kmconfigpreview.h b/tdeprint/management/kmconfigpreview.h index a9c826c98..b8b5ab097 100644 --- a/tdeprint/management/kmconfigpreview.h +++ b/tdeprint/management/kmconfigpreview.h @@ -30,8 +30,8 @@ class KMConfigPreview : public KMConfigPage public: KMConfigPreview(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: TQCheckBox *m_useext; diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 579cae5df..704a20db5 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -234,7 +234,7 @@ void KMDriverDbWidget::slotOtherClicked() if ( !url.isEmpty() ) { TQString filename; - if ( KIO::NetAccess::download( url, filename, this ) ) + if ( TDEIO::NetAccess::download( url, filename, this ) ) { DrMain *driver = KMFactory::self()->manager()->loadFileDriver(filename); if (driver) @@ -255,7 +255,7 @@ void KMDriverDbWidget::slotOtherClicked() } else { - KIO::NetAccess::removeTempFile( filename ); + TDEIO::NetAccess::removeTempFile( filename ); KMessageBox::error(this,""+i18n("Wrong driver format.")+"

    "+KMManager::self()->errorMsg()+"

    "); } } diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 19c46224f..da8a98016 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -99,7 +99,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) if (m_standalone) { setCaption(i18n("No Printer")); - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQSize defSize( 550, 250 ); conf->setGroup( "Jobs" ); resize( conf->readSizeEntry( "Size", &defSize ) ); @@ -111,7 +111,7 @@ KMJobViewer::~KMJobViewer() if (m_standalone) { kdDebug( 500 ) << "Destroying stand-alone job viewer window" << endl; - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup( "Jobs" ); conf->writeEntry( "Size", size() ); emit viewerDestroyed(this); @@ -700,7 +700,7 @@ void KMJobViewer::slotConfigure() KMConfigJobs *w = new KMConfigJobs(&dlg); dlg.setMainWidget(w); dlg.resize(300, 10); - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); w->loadConfig(conf); if (dlg.exec()) { @@ -727,7 +727,7 @@ void KMJobViewer::slotDropped( TQDropEvent *e, TQListViewItem* ) for ( KURL::List::ConstIterator it = uris.begin(); it != uris.end(); ++it) { - if ( KIO::NetAccess::download( *it, target, 0 ) ) + if ( TDEIO::NetAccess::download( *it, target, 0 ) ) files << target; } diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index 22b9ac8e9..daafbff97 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -145,7 +145,7 @@ void KMMainView::loadParameters() void KMMainView::restoreSettings() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons)); setOrientation(conf->readNumEntry("Orientation", Qt::Vertical)); @@ -162,7 +162,7 @@ void KMMainView::restoreSettings() void KMMainView::saveSettings() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); conf->writeEntry("ViewType",(int)m_printerview->viewType()); conf->writeEntry("Orientation",(int)orientation()); diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index 4a7f611d8..5acc27351 100644 --- a/tdeprint/management/kmtimer.cpp +++ b/tdeprint/management/kmtimer.cpp @@ -86,7 +86,7 @@ void KMTimer::startTimer(int t) { if (t == -1) { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); t = conf->readNumEntry("TimerDelay", 5) * 1000; } diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index d4652878f..0e0cd306b 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -105,7 +105,7 @@ void KMWDriverTest::initPrinter(KMPrinter *p) { m_driver = KMFactory::self()->manager()->loadFileDriver(drfile); /* remove the temp file if it has been downloaded */ - KIO::NetAccess::removeTempFile( drfile ); + TDEIO::NetAccess::removeTempFile( drfile ); } else if (p->dbEntry() != NULL) m_driver = KMFactory::self()->manager()->loadDbDriver(p->dbEntry()); diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp index e667d1fa1..04556c07b 100644 --- a/tdeprint/management/kmwsocketutil.cpp +++ b/tdeprint/management/kmwsocketutil.cpp @@ -148,7 +148,7 @@ bool KMWSocketUtil::checkPrinter(const TQString& IPstr, int port, TQString* host if (hostname) { TQString portname; - KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname); + KExtendedSocket::resolve((TDESocketAddress*)(sock.peerAddress()), *hostname, portname); } result = true; } diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index a49a77877..1943f9354 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -241,9 +241,9 @@ void NetworkScanner::slotConnectionSuccess() { kdDebug() << "Success" << endl; #ifdef USE_QSOCKET - KSocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() ); + TDESocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() ); #else - KSocketAddress *addr = const_cast( d->socket->peerAddress() ); + TDESocketAddress *addr = const_cast( d->socket->peerAddress() ); #endif kdDebug() << "Connection success: " << ( addr ? addr->pretty() : TQString( "ERROR" ) ) << endl; kdDebug() << "Socket: " << d->socket->socket() << endl; diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp index 7e46139ef..c30409e66 100644 --- a/tdeprint/printerfilter.cpp +++ b/tdeprint/printerfilter.cpp @@ -38,7 +38,7 @@ PrinterFilter::~PrinterFilter() void PrinterFilter::update() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Filter"); m_locationRe.setPattern(conf->readEntry("LocationRe")); m_printers = conf->readListEntry("Printers"); @@ -52,7 +52,7 @@ void PrinterFilter::update() void PrinterFilter::setEnabled(bool on) { m_enabled = on; - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("FilterEnabled", m_enabled); } diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp index 0f8ca3743..78513dad3 100644 --- a/tdeprint/rlpr/kmconfigproxy.cpp +++ b/tdeprint/rlpr/kmconfigproxy.cpp @@ -36,12 +36,12 @@ KMConfigProxy::KMConfigProxy(TQWidget *parent) lay0->addStretch(1); } -void KMConfigProxy::loadConfig(KConfig *conf) +void KMConfigProxy::loadConfig(TDEConfig *conf) { m_widget->loadConfig(conf); } -void KMConfigProxy::saveConfig(KConfig *conf) +void KMConfigProxy::saveConfig(TDEConfig *conf) { m_widget->saveConfig(conf); } diff --git a/tdeprint/rlpr/kmconfigproxy.h b/tdeprint/rlpr/kmconfigproxy.h index 6f3b7ef42..e3f92808c 100644 --- a/tdeprint/rlpr/kmconfigproxy.h +++ b/tdeprint/rlpr/kmconfigproxy.h @@ -23,15 +23,15 @@ #include "kmconfigpage.h" class KMProxyWidget; -class KConfig; +class TDEConfig; class KMConfigProxy : public KMConfigPage { public: KMConfigProxy(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KMProxyWidget *m_widget; diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index e4a761519..763282ecd 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -55,7 +55,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) lay0->addWidget(m_proxyport,2,1); } -void KMProxyWidget::loadConfig(KConfig *conf) +void KMProxyWidget::loadConfig(TDEConfig *conf) { conf->setGroup("RLPR"); m_proxyhost->setText(conf->readEntry("ProxyHost",TQString::null)); @@ -63,7 +63,7 @@ void KMProxyWidget::loadConfig(KConfig *conf) m_useproxy->setChecked(!m_proxyhost->text().isEmpty()); } -void KMProxyWidget::saveConfig(KConfig *conf) +void KMProxyWidget::saveConfig(TDEConfig *conf) { conf->setGroup("RLPR"); conf->writeEntry("ProxyHost",(m_useproxy->isChecked() ? m_proxyhost->text() : TQString::null)); diff --git a/tdeprint/rlpr/kmproxywidget.h b/tdeprint/rlpr/kmproxywidget.h index 0c1a5079b..a698889a9 100644 --- a/tdeprint/rlpr/kmproxywidget.h +++ b/tdeprint/rlpr/kmproxywidget.h @@ -22,7 +22,7 @@ #include -class KConfig; +class TDEConfig; class TQLineEdit; class TQCheckBox; @@ -31,8 +31,8 @@ class KMProxyWidget : public TQGroupBox public: KMProxyWidget(TQWidget *parent = 0, const char *name = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: TQLineEdit *m_proxyhost; diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 2833c9598..628205a31 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -57,7 +57,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); // proxy settings - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("RLPR"); QString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null); if (!host.isEmpty()) diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp index 1b5cc691a..92178f0f4 100644 --- a/tdeprint/tdeprintcheck.cpp +++ b/tdeprint/tdeprintcheck.cpp @@ -53,7 +53,7 @@ static const char* const config_stddirs[] = { 0 }; -bool KdeprintChecker::check(KConfig *conf, const TQString& group) +bool KdeprintChecker::check(TDEConfig *conf, const TQString& group) { if (!group.isEmpty()) conf->setGroup(group); diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h index 0bb28cc28..bb839063f 100644 --- a/tdeprint/tdeprintcheck.h +++ b/tdeprint/tdeprintcheck.h @@ -28,7 +28,7 @@ class TDEPRINT_EXPORT KdeprintChecker { public: - static bool check(KConfig *conf, const TQString& group = TQString::null); + static bool check(TDEConfig *conf, const TQString& group = TQString::null); static bool check(const TQStringList& uris); private: diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 7777e19ce..617fddf8f 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -162,7 +162,7 @@ void KDEPrintd::slotPrintError( KPrintProcess *proc, const TQString& msg ) TQString KDEPrintd::openPassDlg(const TQString& user) { TQString user_(user), pass_, result; - if (KIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted) + if (TDEIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted) result.append(user_).append(":").append(pass_); return result; } @@ -252,7 +252,7 @@ void KDEPrintd::processRequest() return; Request *req = m_requestsPending.first(); - KIO::AuthInfo info; + TDEIO::AuthInfo info; TQByteArray params, reply; TQCString replyType; TQString authString( "::" ); @@ -264,13 +264,13 @@ void KDEPrintd::processRequest() TQDataStream input( params, IO_WriteOnly ); input << info << TQString(i18n( "Authentication failed (user name=%1)" ).arg( info.username )) << 0L << (long int) req->seqNbr; - if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo,TQString,long int,long int)", + if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo,TQString,long int,long int)", params, replyType, reply ) ) { - if ( replyType == "KIO::AuthInfo" ) + if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream output( reply, IO_ReadOnly ); - KIO::AuthInfo result; + TDEIO::AuthInfo result; int seqNbr; output >> result >> seqNbr; @@ -278,7 +278,7 @@ void KDEPrintd::processRequest() authString = result.username + ":" + result.password + ":" + TQString::number( seqNbr ); } else - kdWarning( 500 ) << "DCOP returned type error, expected KIO::AuthInfo, received " << replyType << endl; + kdWarning( 500 ) << "DCOP returned type error, expected TDEIO::AuthInfo, received " << replyType << endl; } else kdWarning( 500 ) << "Cannot communicate with kded_kpasswdserver" << endl; @@ -298,7 +298,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons { TQByteArray params, reply; TQCString replyType; - KIO::AuthInfo info; + TDEIO::AuthInfo info; info.username = user; info.password = passwd; @@ -307,7 +307,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons TQDataStream input( params, IO_WriteOnly ); input << info << ( long int )0; - if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo,long int)", + if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo,long int)", params, replyType, reply ) ) kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl; } diff --git a/tdesu/process.cpp b/tdesu/process.cpp index f1b353396..2d8e9a14f 100644 --- a/tdesu/process.cpp +++ b/tdesu/process.cpp @@ -74,7 +74,7 @@ int PtyProcess::waitMS(int fd,int ms) */ bool PtyProcess::checkPid(pid_t pid) { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("super-user-command"); TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND); //sudo does not accept signals from user so we except it diff --git a/tdesu/su.cpp b/tdesu/su.cpp index 5f8d24832..60a1abeb6 100644 --- a/tdesu/su.cpp +++ b/tdesu/su.cpp @@ -55,7 +55,7 @@ SuProcess::SuProcess(const TQCString &user, const TQCString &command) m_User = user; m_Command = command; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("super-user-command"); superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND); if ( superUserCommand != "sudo" && superUserCommand != "su" ) { diff --git a/tdeui/AUTHORS b/tdeui/AUTHORS index 7d64d96b1..61087b1f0 100644 --- a/tdeui/AUTHORS +++ b/tdeui/AUTHORS @@ -10,7 +10,7 @@ Maintainer of KPixmapEffect, KStyle, KThemeStyle, and KThemeBase - as well as general misc coding here and there. Matthias Kalle Dalheimer : -classes TDEApplication, KConfig, KTextStream, KColorSet, +classes TDEApplication, TDEConfig, KTextStream, KColorSet, automake, autoconf, maintenance Richard Moore : @@ -23,7 +23,7 @@ Steffen Hansen : KURL class Torben Weis -DnD stuff, KSocket and KServerSocket classes, KPixmap +DnD stuff, TDESocket and TDEServerSocket classes, KPixmap Alexander Sanda Read and write numerical config entries, KPanner, KTabControl, diff --git a/tdeui/kaction.h b/tdeui/kaction.h index a6ebbfb9d..f2860679f 100644 --- a/tdeui/kaction.h +++ b/tdeui/kaction.h @@ -45,8 +45,8 @@ class KToolBar; class KAccel; class KAccelActions; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; class KURL; class TDEInstance; class KToolBar; diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp index 4be388afe..605ac8379 100644 --- a/tdeui/kactionclasses.cpp +++ b/tdeui/kactionclasses.cpp @@ -1164,7 +1164,7 @@ void KRecentFilesAction::clearURLList() d->m_urls.clear(); } -void KRecentFilesAction::loadEntries( KConfig* config, TQString groupname) +void KRecentFilesAction::loadEntries( TDEConfig* config, TQString groupname) { TQString key; TQString value; @@ -1209,7 +1209,7 @@ void KRecentFilesAction::loadEntries( KConfig* config, TQString groupname) config->setGroup( oldGroup ); } -void KRecentFilesAction::saveEntries( KConfig* config, TQString groupname ) +void KRecentFilesAction::saveEntries( TDEConfig* config, TQString groupname ) { TQString key; TQString value; diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h index 0a6a105f0..ec63cd36b 100644 --- a/tdeui/kactionclasses.h +++ b/tdeui/kactionclasses.h @@ -48,8 +48,8 @@ class KToolBar; class KAccel; class KAccelActions; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; class KURL; class TDEInstance; class KToolBar; @@ -834,22 +834,22 @@ public slots: void setMaxItems( uint maxItems ); /** - * Loads the recent files entries from a given KConfig object. + * Loads the recent files entries from a given TDEConfig object. * You can provide the name of the group used to load the entries. * If the groupname is empty, entries are load from a group called 'RecentFiles' * - * This method does not effect the active group of KConfig. + * This method does not effect the active group of TDEConfig. */ - void loadEntries( KConfig* config, TQString groupname=TQString::null ); + void loadEntries( TDEConfig* config, TQString groupname=TQString::null ); /** - * Saves the current recent files entries to a given KConfig object. + * Saves the current recent files entries to a given TDEConfig object. * You can provide the name of the group used to load the entries. * If the groupname is empty, entries are saved to a group called 'RecentFiles' * - * This method does not effect the active group of KConfig. + * This method does not effect the active group of TDEConfig. */ - void saveEntries( KConfig* config, TQString groupname=TQString::null ); + void saveEntries( TDEConfig* config, TQString groupname=TQString::null ); /** * Add URL to recent files list. diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp index 9654d0ffd..c841b2730 100644 --- a/tdeui/kactioncollection.cpp +++ b/tdeui/kactioncollection.cpp @@ -405,12 +405,12 @@ KAction* KActionCollection::action( int index ) const // return d->m_actions.at( index ); } -bool KActionCollection::readShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig ) +bool KActionCollection::readShortcutSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig ) { return KActionShortcutList(this).readSettings( sConfigGroup, pConfig ); } -bool KActionCollection::writeShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig ) const +bool KActionCollection::writeShortcutSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig ) const { return KActionShortcutList((KActionCollection*)this).writeSettings( sConfigGroup, pConfig ); } diff --git a/tdeui/kactioncollection.h b/tdeui/kactioncollection.h index 28c9e530e..35dd5dc2d 100644 --- a/tdeui/kactioncollection.h +++ b/tdeui/kactioncollection.h @@ -46,8 +46,8 @@ class KToolBar; class KAccel; class KAccelActions; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; class KURL; class TDEInstance; class KToolBar; @@ -191,11 +191,11 @@ public: /** * Used for reading shortcut configuration from a non-XML rc file. */ - bool readShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ); + bool readShortcutSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 ); /** * Used for writing shortcut configuration to a non-XML rc file. */ - bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ) const; + bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 ) const; void setInstance( TDEInstance *instance ); /** The instance with which this class is associated. */ diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 3e63af8f9..ab36f83d7 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -338,7 +338,7 @@ void KBugReport::slotSetFrom() m_configureEmail->setEnabled(true); // ### KDE4: why oh why is KEmailSettings in kio? - KConfig emailConf( TQString::fromLatin1("emaildefaults") ); + TDEConfig emailConf( TQString::fromLatin1("emaildefaults") ); // find out the default profile emailConf.setGroup( TQString::fromLatin1("Defaults") ); diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 0745bccd9..5af7b6de6 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -35,7 +35,7 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( TDEGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; + TDEConfigGroupSaver saver ( TDEGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp index bba0e5247..904c1cdc4 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/kcmodule.cpp @@ -34,10 +34,10 @@ #include "kcmodule.h" #include "kcmodule.moc" -class KCModulePrivate +class TDECModulePrivate { public: - KCModulePrivate(): + TDECModulePrivate(): _about( 0 ), _useRootOnlyMsg( false ), _hasOwnInstance( true ), @@ -49,17 +49,17 @@ public: TQString _rootOnlyMsg; bool _useRootOnlyMsg; bool _hasOwnInstance; - TQPtrList managers; + TQPtrList managers; TQString _quickHelp; // this member is used to record the state on non-automatically - // managed widgets, allowing for mixed KConfigXT-drive and manual + // managed widgets, allowing for mixed TDEConfigXT-drive and manual // widgets to coexist peacefully and do the correct thing with // the changed(bool) signal bool _unmanagedWidgetChangeState; }; -KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &) +TDECModule::TDECModule(TQWidget *parent, const char *name, const TQStringList &) : TQWidget(parent, name) { init(); @@ -74,7 +74,7 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &) } -KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & ) +TDECModule::TDECModule(TDEInstance *instance, TQWidget *parent, const TQStringList & ) : TQWidget(parent, instance ? instance->instanceName().data() : 0) { init(); @@ -89,21 +89,21 @@ KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & TDEGlobal::setActiveInstance(this->instance()); } -void KCModule::init() +void TDECModule::init() { - d = new KCModulePrivate; + d = new TDECModulePrivate; _btn = Help|Default|Apply; } -KConfigDialogManager* KCModule::addConfig( KConfigSkeleton *config, TQWidget* widget ) +TDEConfigDialogManager* TDECModule::addConfig( TDEConfigSkeleton *config, TQWidget* widget ) { - KConfigDialogManager* manager = new KConfigDialogManager( widget, config, name() ); + TDEConfigDialogManager* manager = new TDEConfigDialogManager( widget, config, name() ); connect( manager, TQT_SIGNAL( widgetModified() ), TQT_SLOT( widgetChanged() )); d->managers.append( manager ); return manager; } -KCModule::~KCModule() +TDECModule::~TDECModule() { if (d->_hasOwnInstance) delete d->_instance; @@ -111,36 +111,36 @@ KCModule::~KCModule() delete d; } -void KCModule::load() +void TDECModule::load() { - KConfigDialogManager* manager; + TDEConfigDialogManager* manager; for( manager = d->managers.first(); manager; manager = d->managers.next() ) manager->updateWidgets(); } -void KCModule::save() +void TDECModule::save() { - KConfigDialogManager* manager; + TDEConfigDialogManager* manager; for( manager = d->managers.first(); manager; manager = d->managers.next() ) manager->updateSettings(); emit( changed( false )); } -void KCModule::defaults() +void TDECModule::defaults() { - KConfigDialogManager* manager; + TDEConfigDialogManager* manager; for( manager = d->managers.first(); manager; manager = d->managers.next() ) manager->updateWidgetsDefault(); } -void KCModule::widgetChanged() +void TDECModule::widgetChanged() { emit changed(d->_unmanagedWidgetChangeState || managedWidgetChangeState()); } -bool KCModule::managedWidgetChangeState() const +bool TDECModule::managedWidgetChangeState() const { - KConfigDialogManager* manager; + TDEConfigDialogManager* manager; for( manager = d->managers.first(); manager; manager = d->managers.next() ) { if ( manager->hasChanged() ) @@ -150,71 +150,71 @@ bool KCModule::managedWidgetChangeState() const return false; } -void KCModule::unmanagedWidgetChangeState(bool changed) +void TDECModule::unmanagedWidgetChangeState(bool changed) { d->_unmanagedWidgetChangeState = changed; widgetChanged(); } -const TDEAboutData *KCModule::aboutData() const +const TDEAboutData *TDECModule::aboutData() const { return d->_about; } -void KCModule::setAboutData( TDEAboutData* about ) +void TDECModule::setAboutData( TDEAboutData* about ) { delete d->_about; d->_about = about; } -void KCModule::setRootOnlyMsg(const TQString& msg) +void TDECModule::setRootOnlyMsg(const TQString& msg) { d->_rootOnlyMsg = msg; } -TQString KCModule::rootOnlyMsg() const +TQString TDECModule::rootOnlyMsg() const { return d->_rootOnlyMsg; } -void KCModule::setUseRootOnlyMsg(bool on) +void TDECModule::setUseRootOnlyMsg(bool on) { d->_useRootOnlyMsg = on; } -bool KCModule::useRootOnlyMsg() const +bool TDECModule::useRootOnlyMsg() const { return d->_useRootOnlyMsg; } -void KCModule::changed() +void TDECModule::changed() { emit changed(true); } -TDEInstance *KCModule::instance() const +TDEInstance *TDECModule::instance() const { return d->_instance; } -void KCModule::setQuickHelp( const TQString& help ) +void TDECModule::setQuickHelp( const TQString& help ) { d->_quickHelp = help; emit( quickHelpChanged() ); } -TQString KCModule::quickHelp() const +TQString TDECModule::quickHelp() const { return d->_quickHelp; } -const TQPtrList& KCModule::configs() const +const TQPtrList& TDECModule::configs() const { return d->managers; } -void KCModule::virtual_hook( int, void* ) +void TDECModule::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } // vim: sw=4 et sts=4 diff --git a/tdeui/kcmodule.h b/tdeui/kcmodule.h index c237ad163..41d8d095e 100644 --- a/tdeui/kcmodule.h +++ b/tdeui/kcmodule.h @@ -30,9 +30,9 @@ class TQStringList; class TDEAboutData; -class KConfigDialogManager; -class KConfigSkeleton; -class KCModulePrivate; +class TDEConfigDialogManager; +class TDEConfigSkeleton; +class TDECModulePrivate; class TDEInstance; /** @@ -54,8 +54,8 @@ class TDEInstance; * \code * #include * - * typedef KGenericFactory YourKCModuleFactory; - * K_EXPORT_COMPONENT_FACTORY( yourLibName, YourKCModuleFactory("name_of_the_po_file") ); + * typedef KGenericFactory YourTDECModuleFactory; + * K_EXPORT_COMPONENT_FACTORY( yourLibName, YourTDECModuleFactory("name_of_the_po_file") ); * \endcode * * The parameter "name_of_the_po_file" has to correspond with the messages target @@ -66,7 +66,7 @@ class TDEInstance; * * @author Matthias Hoelzer-Kluepfel */ -class TDEUI_EXPORT KCModule : public TQWidget +class TDEUI_EXPORT TDECModule : public TQWidget { Q_OBJECT @@ -76,7 +76,7 @@ public: * An enumeration type for the buttons used by this module. * You should only use Help, Default and Apply. The rest is obsolete. * - * @see KCModule::buttons @see KCModule::setButtons + * @see TDECModule::buttons @see TDECModule::setButtons */ enum Button {Help=1, Default=2, Apply=16, Reset=4, /* obsolete, do not use! */ @@ -89,14 +89,14 @@ public: * Make sure you have a TQStringList argument in your * implementation. */ - KCModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() ); + TDECModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() ); - KCModule(TDEInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() ); + TDECModule(TDEInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() ); /* * Destroys the module. */ - ~KCModule(); + ~TDECModule(); /** * Load the configuration data into the module. @@ -111,9 +111,9 @@ public: * center, to undo all of his changes and restore the currently valid * settings. * - * If you use KConfigXT, loading is taken care of automatically and + * If you use TDEConfigXT, loading is taken care of automatically and * you do not need to do it manually. However, if you for some reason reimplement it and - * also are using KConfigXT, you must call this function otherwise the loading of KConfigXT + * also are using TDEConfigXT, you must call this function otherwise the loading of TDEConfigXT * options will not work. * */ @@ -134,9 +134,9 @@ public: * * save is called when the user clicks "Apply" or "Ok". * - * If you use KConfigXT, saving is taken care off automatically and + * If you use TDEConfigXT, saving is taken care off automatically and * you do not need to load manually. However, if you for some reason reimplement it and - * also are using KConfigXT, you must call this function, otherwise the saving of KConfigXT + * also are using TDEConfigXT, you must call this function, otherwise the saving of TDEConfigXT * options will not work. Call it at the very end of your reimplementation, to avoid * changed() signals getting emitted when you modify widgets. */ @@ -148,9 +148,9 @@ public: * This method is called when the user clicks the "Default" * button. It should set the display to useful values. * - * If you use KConfigXT, you do not have to reimplement this function since + * If you use TDEConfigXT, you do not have to reimplement this function since * the fetching and settings of default values is done automatically. However, if you - * reimplement and also are using KConfigXT, remember to call the base function at the + * reimplement and also are using TDEConfigXT, remember to call the base function at the * very end of your reimplementation. */ virtual void defaults(); @@ -198,7 +198,7 @@ public: * The return value is a value or'ed together from * the Button enumeration type. * - * @see KCModule::setButtons + * @see TDECModule::setButtons */ int buttons() const { return _btn; } @@ -212,7 +212,7 @@ public: * customized message. If none has been set, a default message * will be used. * - * @see KCModule::setRootOnlyMsg + * @see TDECModule::setRootOnlyMsg */ TQString rootOnlyMsg() const; @@ -224,30 +224,30 @@ public: * appear (for example if it has already one). This function * tells KControl if a RootOnly message should be shown * - * @see KCModule::setUseRootOnlyMsg + * @see TDECModule::setUseRootOnlyMsg */ bool useRootOnlyMsg() const; TDEInstance *instance() const; /** - * @return a list of @ref KConfigDialogManager's in use, if any. + * @return a list of @ref TDEConfigDialogManager's in use, if any. * @since 3.4 */ - const TQPtrList& configs() const; + const TQPtrList& configs() const; protected: /** - * Adds a KConfigskeleton @p config to watch the widget @p widget + * Adds a TDEConfigskeleton @p config to watch the widget @p widget * * This function is useful if you need to handle multiple configuration files. * * @since 3.3 - * @return a pointer to the KConfigDialogManager in use - * @param config the KConfigSkeleton to use + * @return a pointer to the TDEConfigDialogManager in use + * @param config the TDEConfigSkeleton to use * @param widget the widget to watch */ - KConfigDialogManager* addConfig( KConfigSkeleton *config, TQWidget* widget ); + TDEConfigDialogManager* addConfig( TDEConfigSkeleton *config, TQWidget* widget ); /** * Sets the quick help. @@ -304,7 +304,7 @@ protected: * * If Apply is not specified, kcmshell will show a "Close" button. * - * @see KCModule::buttons + * @see TDECModule::buttons */ void setButtons(int btn) { _btn = btn; } @@ -315,7 +315,7 @@ protected: * corresponding desktop file contains the line X-TDE-RootOnly=true. * If no message is set, a default one will be used. * - * @see KCModule::rootOnlyMsg + * @see TDECModule::rootOnlyMsg */ void setRootOnlyMsg(const TQString& msg); @@ -325,7 +325,7 @@ protected: * Following the value of @p on, the RootOnly message will be * shown or not. * - * @see KCModule::useRootOnlyMsg + * @see TDECModule::useRootOnlyMsg */ void setUseRootOnlyMsg(bool on); @@ -348,7 +348,7 @@ private: protected: virtual void virtual_hook( int id, void* data ); private: - KCModulePrivate *d; + TDECModulePrivate *d; /** * Internal function for initialization of the class. diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index 7db3807a7..2651fd05d 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -1254,7 +1254,7 @@ void KColorDialog::slotDefaultColorClicked() void KColorDialog::readSettings() { - KConfigGroup group( TDEGlobal::config(), "Colors" ); + TDEConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = group.readEntry("CurrentPalette"); d->table->setPalette(palette); @@ -1263,7 +1263,7 @@ KColorDialog::readSettings() void KColorDialog::slotWriteSettings() { - KConfigGroup group( TDEGlobal::config(), "Colors" ); + TDEConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = d->table->palette(); if (!group.hasDefault("CurrentPalette") && diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index 41963a56b..e0ff8e6e4 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -599,7 +599,7 @@ public: * You won't have the benefit of weighted completion though, so normally * you should do something like * \code - * KConfig *config = kapp->config(); + * TDEConfig *config = kapp->config(); * TQStringList list; * * // load the history and completion list after creating the history combo @@ -618,7 +618,7 @@ public: * config->writeEntry( "History list", list ); * \endcode * - * Be sure to use different names for saving with KConfig if you have more + * Be sure to use different names for saving with TDEConfig if you have more * than one KHistoryCombo. * * Note: When @p setCompletionList is true, the items are inserted into the diff --git a/tdeui/kconfigdialog.cpp b/tdeui/kconfigdialog.cpp index ccbba1cf0..9707bc26a 100644 --- a/tdeui/kconfigdialog.cpp +++ b/tdeui/kconfigdialog.cpp @@ -31,30 +31,30 @@ #include #include -TQAsciiDict KConfigDialog::openDialogs; +TQAsciiDict TDEConfigDialog::openDialogs; // This class is here purly so we don't break binary compatibility down the road. -class KConfigDialog::KConfigDialogPrivate +class TDEConfigDialog::TDEConfigDialogPrivate { public: - KConfigDialogPrivate(KDialogBase::DialogType t) + TDEConfigDialogPrivate(KDialogBase::DialogType t) : shown(false), type(t), manager(0) { } bool shown; KDialogBase::DialogType type; - KConfigDialogManager *manager; - TQMap managerForPage; + TDEConfigDialogManager *manager; + TQMap managerForPage; }; -KConfigDialog::KConfigDialog( TQWidget *parent, const char *name, - KConfigSkeleton *config, +TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name, + TDEConfigSkeleton *config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal ) : KDialogBase( dialogType, (WFlags)TQt::WStyle_DialogBorder, parent, name, modal, i18n("Configure"), dialogButtons, defaultButton ), - d(new KConfigDialogPrivate(dialogType)) + d(new TDEConfigDialogPrivate(dialogType)) { if ( name ) { openDialogs.insert(name, this); @@ -71,19 +71,19 @@ KConfigDialog::KConfigDialog( TQWidget *parent, const char *name, connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault())); connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons())); - d->manager = new KConfigDialogManager(this, config); + d->manager = new TDEConfigDialogManager(this, config); setupManagerConnections(d->manager); enableButton(Apply, false); } -KConfigDialog::~KConfigDialog() +TDEConfigDialog::~TDEConfigDialog() { openDialogs.remove(name()); delete d; } -void KConfigDialog::addPage(TQWidget *page, +void TDEConfigDialog::addPage(TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, @@ -94,25 +94,25 @@ void KConfigDialog::addPage(TQWidget *page, d->manager->addWidget(page); } -void KConfigDialog::addPage(TQWidget *page, - KConfigSkeleton *config, +void TDEConfigDialog::addPage(TQWidget *page, + TDEConfigSkeleton *config, const TQString &itemName, const TQString &pixmapName, const TQString &header) { addPageInternal(page, itemName, pixmapName, header); - d->managerForPage[page] = new KConfigDialogManager(page, config); + d->managerForPage[page] = new TDEConfigDialogManager(page, config); setupManagerConnections(d->managerForPage[page]); } -void KConfigDialog::addPageInternal(TQWidget *page, +void TDEConfigDialog::addPageInternal(TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header) { if(d->shown) { - kdDebug(240) << "KConfigDialog::addPage: can not add a page after the dialog has been shown."; + kdDebug(240) << "TDEConfigDialog::addPage: can not add a page after the dialog has been shown."; return; } switch(d->type) @@ -144,11 +144,11 @@ void KConfigDialog::addPageInternal(TQWidget *page, break; default: - kdDebug(240) << "KConfigDialog::addpage: unknown type."; + kdDebug(240) << "TDEConfigDialog::addpage: unknown type."; } } -void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) +void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager) { connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot())); connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); @@ -158,26 +158,26 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault())); } -KConfigDialog* KConfigDialog::exists(const char* name) +TDEConfigDialog* TDEConfigDialog::exists(const char* name) { return openDialogs.find(name); } -bool KConfigDialog::showDialog(const char* name) +bool TDEConfigDialog::showDialog(const char* name) { - KConfigDialog *dialog = exists(name); + TDEConfigDialog *dialog = exists(name); if(dialog) dialog->show(); return (dialog != NULL); } -void KConfigDialog::updateButtons() +void TDEConfigDialog::updateButtons() { static bool only_once = false; if (only_once) return; only_once = true; - TQMap::iterator it; + TQMap::iterator it; bool has_changed = d->manager->hasChanged() || hasChanged(); for (it = d->managerForPage.begin(); @@ -203,7 +203,7 @@ void KConfigDialog::updateButtons() only_once = false; } -void KConfigDialog::settingsChangedSlot() +void TDEConfigDialog::settingsChangedSlot() { // Update the buttons updateButtons(); @@ -211,9 +211,9 @@ void KConfigDialog::settingsChangedSlot() emit settingsChanged(name()); } -void KConfigDialog::show() +void TDEConfigDialog::show() { - TQMap::iterator it; + TQMap::iterator it; updateWidgets(); d->manager->updateWidgets(); @@ -243,15 +243,15 @@ void KConfigDialog::show() KDialogBase::show(); } -void KConfigDialog::updateSettings() +void TDEConfigDialog::updateSettings() { } -void KConfigDialog::updateWidgets() +void TDEConfigDialog::updateWidgets() { } -void KConfigDialog::updateWidgetsDefault() +void TDEConfigDialog::updateWidgetsDefault() { } diff --git a/tdeui/kconfigdialog.h b/tdeui/kconfigdialog.h index 9268ab1f2..f7cc10e26 100644 --- a/tdeui/kconfigdialog.h +++ b/tdeui/kconfigdialog.h @@ -21,35 +21,35 @@ #ifndef KCONFIGDIALOG_H #define KCONFIGDIALOG_H -class KConfig; -class KConfigSkeleton; -class KConfigDialogManager; +class TDEConfig; +class TDEConfigSkeleton; +class TDEConfigDialogManager; #include #include /** * \short Standard %KDE configuration dialog class * - * The KConfigDialog class provides an easy and uniform means of displaying - * a settings dialog using KDialogBase, KConfigDialogManager and a - * KConfigSkeleton derived settings class. + * The TDEConfigDialog class provides an easy and uniform means of displaying + * a settings dialog using KDialogBase, TDEConfigDialogManager and a + * TDEConfigSkeleton derived settings class. * - * KConfigDialog handles the enabling and disabling of buttons, creation + * TDEConfigDialog handles the enabling and disabling of buttons, creation * of the dialog, and deletion of the widgets. Because of - * KConfigDialogManager, this class also manages: restoring + * TDEConfigDialogManager, this class also manages: restoring * the settings, reseting them to the default values, and saving them. This * requires that the names of the widgets corresponding to configuration entries * have to have the same name plus an additional "kcfg_" prefix. For example the * widget named "kcfg_MyOption" would be associated with the configuration entry * "MyOption". * - * Here is an example usage of KConfigDialog: + * Here is an example usage of TDEConfigDialog: * * \code * void KCoolApp::showSettings(){ - * if(KConfigDialog::showDialog("settings")) + * if(TDEConfigDialog::showDialog("settings")) * return; - * KConfigDialog *dialog = new KConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList); + * TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList); * dialog->addPage(new General(0, "General"), i18n("General") ); * dialog->addPage(new Appearance(0, "Style"), i18n("Appearance") ); * connect(dialog, TQT_SIGNAL(settingsChanged()), mainWidget, TQT_SLOT(loadSettings())); @@ -65,11 +65,11 @@ class KConfigDialogManager; * Please note that using the setMainWidget method inherited from KDialogBase * currently yields broken behaviour at runtime; use @ref addPage() instead. * - * @see KConfigSkeleton + * @see TDEConfigSkeleton * @author Waldo Bastian * @since 3.2 */ -class TDEUI_EXPORT KConfigDialog : public KDialogBase { +class TDEUI_EXPORT TDEConfigDialog : public KDialogBase { Q_OBJECT signals: @@ -87,7 +87,7 @@ signals: /** * One or more of the settings have been permanently changed such as if * the user clicked on the Apply or Ok button. - * This signal is useful when using KConfigDialog to configure + * This signal is useful when using TDEConfigDialog to configure * items in a list. When emitted the main class would then know what * item in the list was actually changed. * @param dialogName the name of the dialog. @@ -116,12 +116,12 @@ public: * @param modal - Whether the dialog should be modal. To prevent more than one * non-modal settings dialog from showing the static function showDialog() can be * used in determining if the settings dialog already exists before creating - * a new KConfigDialog object. + * a new TDEConfigDialog object. */ // KDE4: Add the "separator" parameter as in KDialogBase // Make "dialogType" an int - KConfigDialog( TQWidget *parent, const char *name, - KConfigSkeleton *config, + TDEConfigDialog( TQWidget *parent, const char *name, + TDEConfigSkeleton *config, DialogType dialogType = IconList, int dialogButtons = Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton = Ok, @@ -132,10 +132,10 @@ public: * Deletes private class. * @see exists() */ - ~KConfigDialog(); + ~TDEConfigDialog(); /** - * Adds page to the dialog and to KConfigDialogManager. When an + * Adds page to the dialog and to TDEConfigDialogManager. When an * application is done adding pages show() should be called to * display the dialog. * Note that after you call show() you can not add any more pages @@ -146,7 +146,7 @@ public: * @param pixmapName - Name of the pixmap that should be used if needed. * @param header - Header text use in the list modes. Ignored in Tabbed * mode. If empty, the itemName text is used when needed. - * @param manage - Whether KConfigDialogManager should manage the page or not. + * @param manage - Whether TDEConfigDialogManager should manage the page or not. */ // KDE4: Add a default value for itemName & pixmapName void addPage( TQWidget *page, const TQString &itemName, @@ -155,9 +155,9 @@ public: bool manage=true ); /** - * Adds page to the dialog that is managed by a custom KConfigDialogManager. + * Adds page to the dialog that is managed by a custom TDEConfigDialogManager. * This is useful for dialogs that contain settings spread over more than - * one configuration file and thus have/need more than one KConfigSkeleton. + * one configuration file and thus have/need more than one TDEConfigSkeleton. * When an application is done adding pages show() should be called to * display the dialog. * Note that after you call show() you can not add any more pages @@ -171,7 +171,7 @@ public: * mode. If empty, the itemName text is used when needed. */ // KDE4: Add a default value for itemName & pixmapName - void addPage( TQWidget *page, KConfigSkeleton *config, + void addPage( TQWidget *page, TDEConfigSkeleton *config, const TQString &itemName, const TQString &pixmapName, const TQString &header=TQString::null ); @@ -182,7 +182,7 @@ public: * @param name - Dialog name to look for. * @return Pointer to widget or NULL if it does not exist. */ - static KConfigDialog* exists( const char* name ); + static TDEConfigDialog* exists( const char* name ); /** * Attempts to show the dialog with the name 'name'. @@ -260,19 +260,19 @@ private: * Sets the connections from a manager to the dialog (and the other * way round) up. */ - void setupManagerConnections(KConfigDialogManager *manager); + void setupManagerConnections(TDEConfigDialogManager *manager); private: /** * The list of existing dialogs. */ - static TQAsciiDict openDialogs; + static TQAsciiDict openDialogs; - class KConfigDialogPrivate; + class TDEConfigDialogPrivate; /** * Private class. */ - KConfigDialogPrivate *d; + TDEConfigDialogPrivate *d; }; #endif //KCONFIGDIALOG_H diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index d09b4e9ee..4bd337c35 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -46,8 +46,8 @@ TQCursor KCursor::handCursor() if (!hand_cursor) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "General" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "General" ); #ifndef Q_WS_WIN // this mask doesn't work too well on win32 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" ) @@ -369,8 +369,8 @@ KCursorPrivate::KCursorPrivate() { hideCursorDelay = 5000; // 5s default value - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); enabled = kc->readBoolEntry( TQString::fromLatin1("Autohiding cursor enabled"), true ); } diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 0b99c550c..3821e6a26 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -178,7 +178,7 @@ void KDialog::resizeLayout( TQLayoutItem *lay, int margin, int spacing ) static TQRect screenRect( TQWidget *w, int screen ) { TQDesktopWidget *desktop = TQApplication::desktop(); - KConfig gc("kdeglobals", false, false); + TDEConfig gc("kdeglobals", false, false); gc.setGroup("Windows"); if (desktop->isVirtualDesktop() && gc.readBoolEntry("XineramaEnabled", true) && diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index c18bead0a..3a7be7a94 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -1744,7 +1744,7 @@ TQSize KDialogBase::configDialogSize( const TQString& groupName ) const } -TQSize KDialogBase::configDialogSize( KConfig& config, +TQSize KDialogBase::configDialogSize( TDEConfig& config, const TQString& groupName ) const { int w, h; @@ -1754,7 +1754,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config, w = sizeHint().width(); h = sizeHint().height(); - KConfigGroupSaver cs(&config, groupName); + TDEConfigGroupSaver cs(&config, groupName); w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w ); h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h ); @@ -1768,13 +1768,13 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) } -void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName, +void KDialogBase::saveDialogSize( TDEConfig& config, const TQString& groupName, bool global ) const { int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - KConfigGroupSaver cs(&config, groupName); + TDEConfigGroupSaver cs(&config, groupName); TQSize sizeToSave = size(); config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()), diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index 893e049f7..1bc910fd6 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -839,12 +839,12 @@ class TDEUI_EXPORT KDialogBase : public KDialog * read the dialogs size from the configuration according to the screen size. * If no size is saved for one dimension of the screen, sizeHint() is returned. * - * @param config The KConfig object to read from + * @param config The TDEConfig object to read from * @param groupName Name of the group to read from. The old group * of TDEGlobal::config is preserved. * @since 3.2 */ - TQSize configDialogSize( KConfig& config, const TQString& groupName ) const; + TQSize configDialogSize( TDEConfig& config, const TQString& groupName ) const; /** * save the dialogs size dependant on the screen dimension either to the @@ -860,14 +860,14 @@ class TDEUI_EXPORT KDialogBase : public KDialog /** * save the dialogs size dependant on the screen dimension. * - * @param config The KConfig object to write to. + * @param config The TDEConfig object to write to. * @param groupName The group to which the dialogs size is saved. See * configDialogSize to read the size. * @param global Set to true if the entry should go to the global config. * Default is false. * @since 3.2 */ - void saveDialogSize( KConfig& config, const TQString& groupName, + void saveDialogSize( TDEConfig& config, const TQString& groupName, bool global=false ) const; /** diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 192c24b05..a1ef8aad1 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -165,12 +165,12 @@ void KDockMainWindow::readDockConfig(TQDomElement &base) } #ifndef NO_KDE2 -void KDockMainWindow::writeDockConfig( KConfig* c, TQString group ) +void KDockMainWindow::writeDockConfig( TDEConfig* c, TQString group ) { dockManager->writeConfig( c, group ); } -void KDockMainWindow::readDockConfig( KConfig* c, TQString group ) +void KDockMainWindow::readDockConfig( TDEConfig* c, TQString group ) { dockManager->readConfig( c, group ); } @@ -420,12 +420,12 @@ void KDockWidgetHeader::setDragEnabled(bool b) } #ifndef NO_KDE2 -void KDockWidgetHeader::saveConfig( KConfig* c ) +void KDockWidgetHeader::saveConfig( TDEConfig* c ) { c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() ); } -void KDockWidgetHeader::loadConfig( KConfig* c ) +void KDockWidgetHeader::loadConfig( TDEConfig* c ) { setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) ); } @@ -2528,7 +2528,7 @@ void KDockManager::setReadDockConfigMode(int mode) } #ifndef NO_KDE2 -void KDockManager::writeConfig( KConfig* c, TQString group ) +void KDockManager::writeConfig( TDEConfig* c, TQString group ) { //debug("BEGIN Write Config"); if ( !c ) c = TDEGlobal::config(); @@ -2670,7 +2670,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) //debug("END Write Config"); } #include -void KDockManager::readConfig( KConfig* c, TQString group ) +void KDockManager::readConfig( TDEConfig* c, TQString group ) { if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; @@ -3134,12 +3134,12 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) } #ifndef NO_KDE2 -void KDockArea::writeDockConfig( KConfig* c, TQString group ) +void KDockArea::writeDockConfig( TDEConfig* c, TQString group ) { dockManager->writeConfig( c, group ); } -void KDockArea::readDockConfig( KConfig* c, TQString group ) +void KDockArea::readDockConfig( TDEConfig* c, TQString group ) { dockManager->readConfig( c, group ); } @@ -3261,8 +3261,8 @@ void KDockContainer::removeWidget (KDockWidget *dw){ void KDockContainer::undockWidget (KDockWidget *){;} void KDockContainer::setToolTip(KDockWidget *, TQString &){;} void KDockContainer::setPixmap(KDockWidget*,const TQPixmap&){;} -void KDockContainer::load (KConfig*, const TQString&){;} -void KDockContainer::save (KConfig*, const TQString&){;} +void KDockContainer::load (TDEConfig*, const TQString&){;} +void KDockContainer::save (TDEConfig*, const TQString&){;} void KDockContainer::load (TQDomElement&){;} void KDockContainer::save (TQDomElement&){;} void KDockContainer::prepareSave(TQStringList &names) diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h index 8f5c288ec..27b7f2b74 100644 --- a/tdeui/kdockwidget.h +++ b/tdeui/kdockwidget.h @@ -81,7 +81,7 @@ class TQPixmap; #ifndef NO_KDE2 class KToolBar; -class KConfig; +class TDEConfig; #else class TQToolBar; #endif @@ -128,12 +128,12 @@ public: /** * Provides saving the current configuration. Must be overridden by an inheriting class. */ - virtual void saveConfig( KConfig* ){} + virtual void saveConfig( TDEConfig* ){} /** * Provides loading the current configuration. Must be overridden by an inheriting class */ - virtual void loadConfig( KConfig* ){} + virtual void loadConfig( TDEConfig* ){} #endif protected: @@ -291,14 +291,14 @@ public: * * @param c the configuration safe */ - virtual void saveConfig( KConfig* c); + virtual void saveConfig( TDEConfig* c); /** * Loads the current button state from a KDE config container object. * * @param c the configuration safe */ - virtual void loadConfig( KConfig* c); + virtual void loadConfig( TDEConfig* c); #endif /*@since 3.2 @@ -906,7 +906,7 @@ private: * that can be called within a KDockMainWindow or a KDockWidget . * * An important feature is the ability to read or save the current state of all things concerning to - * dockwidgets to KConfig . + * dockwidgets to TDEConfig . * * The dockmanager is also often used when a certain dockwidget or a child of such dockwidget must be found. * @@ -954,9 +954,9 @@ public: * last but not least some necessary things for recovering the dockmainwindow state. * * @param c the KDE configuration saver - * @param group the name of the section in KConfig + * @param group the name of the section in TDEConfig */ - void writeConfig( KConfig* c = 0L, TQString group = TQString::null ); + void writeConfig( TDEConfig* c = 0L, TQString group = TQString::null ); /** * Like writeConfig but reads the whole stuff in. @@ -972,9 +972,9 @@ public: * to work, each widget must have a unique name. * * @param c the KDE configuration saver - * @param group the name of the section in KConfig + * @param group the name of the section in TDEConfig */ - void readConfig ( KConfig* c = 0L, TQString group = TQString::null ); + void readConfig ( TDEConfig* c = 0L, TQString group = TQString::null ); #endif /// @since 3.1 @@ -1390,20 +1390,20 @@ public: #ifndef NO_KDE2 /** - * It writes the current dock state in the given section of KConfig. + * It writes the current dock state in the given section of TDEConfig. * * @param c KDE class for saving configurations * @param group name of section to write to */ - void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null ); + void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString::null ); /** - * It reads the current dock state from the given section of KConfig. + * It reads the current dock state from the given section of TDEConfig. * * @param c KDE class for saving configurations * @param group name of section to read from */ - void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null ); + void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString::null ); #endif /** @@ -1509,8 +1509,8 @@ public: void readDockConfig(TQDomElement &base); #ifndef NO_KDE2 - void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null ); - void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null ); + void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString::null ); + void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString::null ); #endif diff --git a/tdeui/kdockwidget_p.h b/tdeui/kdockwidget_p.h index 9ee9e8e73..471c4d9b2 100644 --- a/tdeui/kdockwidget_p.h +++ b/tdeui/kdockwidget_p.h @@ -50,9 +50,9 @@ public: virtual void showWidget(KDockWidget *); virtual void removeWidget(KDockWidget*); virtual void undockWidget(KDockWidget*); - virtual void save(KConfig *cfg,const TQString& group_or_prefix); + virtual void save(TDEConfig *cfg,const TQString& group_or_prefix); virtual void save(TQDomElement& dockElement); - virtual void load(KConfig *cfg,const TQString& group_or_prefix); + virtual void load(TDEConfig *cfg,const TQString& group_or_prefix); virtual void load(TQDomElement& dockElement); virtual void setToolTip (KDockWidget *, TQString &); virtual void setPixmap(KDockWidget*,const TQPixmap&); diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp index 54b2932aa..1923f6cb9 100644 --- a/tdeui/kfontcombo.cpp +++ b/tdeui/kfontcombo.cpp @@ -373,7 +373,7 @@ void KFontCombo::updateFonts() bool KFontCombo::displayFonts() { - KConfigGroupSaver saver(TDEGlobal::config(), "KDE"); + TDEConfigGroupSaver saver(TDEGlobal::config(), "KDE"); return TDEGlobal::config()->readBoolEntry("DisplayFontItems", true); } diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp index 23d514092..01073521d 100644 --- a/tdeui/kfontdialog.cpp +++ b/tdeui/kfontdialog.cpp @@ -330,8 +330,8 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index d9ae693f3..b83cc6d53 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -675,12 +675,12 @@ void KKeyChooser::listSync() }*/ } -void KKeyChooser::syncToConfig( const TQString& sConfigGroup, KConfigBase* pConfig, bool bClearUnset ) +void KKeyChooser::syncToConfig( const TQString& sConfigGroup, TDEConfigBase* pConfig, bool bClearUnset ) { kdDebug(125) << "KKeyChooser::syncToConfig( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) pConfig = TDEGlobal::config(); - KConfigGroupSaver cgs( pConfig, sConfigGroup ); + TDEConfigGroupSaver cgs( pConfig, sConfigGroup ); TQListViewItemIterator it( d->pList ); for( ; it.current(); ++it ) { @@ -1094,7 +1094,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); + TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } @@ -1106,14 +1106,14 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); + TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } KKeyDialog::~KKeyDialog() { - KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); + TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); group.writeEntry( "Dialog Size", size(), true, true ); } diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h index b457f133b..eba8d0069 100644 --- a/tdeui/kkeydialog.h +++ b/tdeui/kkeydialog.h @@ -34,7 +34,7 @@ class TQRadioButton; class KAccel; class KAccelActions; class KActionCollection; -class KConfigBase; +class TDEConfigBase; class TDEGlobalAccel; class KKeySequence; class KShortcut; @@ -98,7 +98,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget */ bool insert( KActionCollection *, const TQString &title); - void syncToConfig( const TQString& sConfigGroup, KConfigBase* pConfig, bool bClearUnset ); + void syncToConfig( const TQString& sConfigGroup, TDEConfigBase* pConfig, bool bClearUnset ); /** * This function writes any shortcut changes back to the original @@ -337,7 +337,7 @@ public: /** * This is an overloaded member function, provided for convenience. * It behaves essentially like the above function, except that settings - * are saved to a *.rc file using KConfig. + * are saved to a *.rc file using TDEConfig. */ static int configure( KAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true ); diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index ece9a3ffe..d70485b09 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -62,7 +62,7 @@ public: if ( !initialized ) { - KConfigGroup config( TDEGlobal::config(), "General" ); + TDEConfigGroup config( TDEGlobal::config(), "General" ); backspacePerformsCompletion = config.readBoolEntry( "Backspace performs completion", false ); initialized = true; diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp index 8aff145b8..b604658f1 100644 --- a/tdeui/klistview.cpp +++ b/tdeui/klistview.cpp @@ -2015,9 +2015,9 @@ bool KListView::shadeSortColumn() const return d->shadeSortColumn; } -void KListView::saveLayout(KConfig *config, const TQString &group) const +void KListView::saveLayout(TDEConfig *config, const TQString &group) const { - KConfigGroupSaver saver(config, group); + TDEConfigGroupSaver saver(config, group); TQStringList widths, order; const int colCount = columns(); @@ -2033,9 +2033,9 @@ void KListView::saveLayout(KConfig *config, const TQString &group) const config->writeEntry("SortAscending", d->sortAscending); } -void KListView::restoreLayout(KConfig *config, const TQString &group) +void KListView::restoreLayout(TDEConfig *config, const TQString &group) { - KConfigGroupSaver saver(config, group); + TDEConfigGroupSaver saver(config, group); TQStringList cols = config->readListEntry("ColumnWidths"); int i = 0; { // scope the iterators diff --git a/tdeui/klistview.h b/tdeui/klistview.h index e60ae70b8..ee283aa5f 100644 --- a/tdeui/klistview.h +++ b/tdeui/klistview.h @@ -26,7 +26,7 @@ #include class TQDragObject; -class KConfig; +class TDEConfig; class KLineEdit; /** * This Widget extends the functionality of TQListView to honor the system @@ -350,20 +350,20 @@ public: /** * Saves the list view's layout (column widtsh, column order, sort column) - * to a KConfig group + * to a TDEConfig group * - * @param config the KConfig object to write to + * @param config the TDEConfig object to write to * @param group the config group to use */ - void saveLayout(KConfig *config, const TQString &group) const; + void saveLayout(TDEConfig *config, const TQString &group) const; /** - * Reads the list view's layout from a KConfig group as stored with + * Reads the list view's layout from a TDEConfig group as stored with * saveLayout * - * @param config the KConfig object to read from + * @param config the TDEConfig object to read from * @param group the config group to use */ - void restoreLayout(KConfig *config, const TQString &group); + void restoreLayout(TDEConfig *config, const TQString &group); /** * Reimplemented to remember the current sort column and order. * @param column is the column to be sorted, or -1 to sort in order of diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index 487d4f197..14f6f6bea 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -92,7 +92,7 @@ public: } bool saveState( TQSessionManager& ) { - KConfig* config = TDEApplication::kApplication()->sessionConfig(); + TDEConfig* config = TDEApplication::kApplication()->sessionConfig(); if ( KMainWindow::memberList->first() ){ // According to Jochen Wilhelmy , this // hook is useful for better document orientation @@ -353,7 +353,7 @@ bool KMainWindow::canBeRestored( int number ) { if ( !kapp->isRestored() ) return false; - KConfig *config = kapp->sessionConfig(); + TDEConfig *config = kapp->sessionConfig(); if ( !config ) return false; config->setGroup( TQString::fromLatin1("Number") ); @@ -365,7 +365,7 @@ const TQString KMainWindow::classNameOfToplevel( int number ) { if ( !kapp->isRestored() ) return TQString::null; - KConfig *config = kapp->sessionConfig(); + TDEConfig *config = kapp->sessionConfig(); if ( !config ) return TQString::null; TQString s; @@ -412,7 +412,7 @@ bool KMainWindow::restore( int number, bool show ) { if ( !canBeRestored( number ) ) return false; - KConfig *config = kapp->sessionConfig(); + TDEConfig *config = kapp->sessionConfig(); if ( readPropertiesInternal( config, number ) ){ if ( show ) KMainWindow::show(); @@ -671,11 +671,11 @@ bool KMainWindow::queryClose() return true; } -void KMainWindow::saveGlobalProperties( KConfig* ) +void KMainWindow::saveGlobalProperties( TDEConfig* ) { } -void KMainWindow::readGlobalProperties( KConfig* ) +void KMainWindow::readGlobalProperties( TDEConfig* ) { } @@ -689,7 +689,7 @@ void KMainWindow::showAboutApplication() { } -void KMainWindow::savePropertiesInternal( KConfig *config, int number ) +void KMainWindow::savePropertiesInternal( TDEConfig *config, int number ) { bool oldASWS = d->autoSaveWindowSize; d->autoSaveWindowSize = true; // make saveMainWindowSettings save the window size @@ -713,7 +713,7 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number ) d->autoSaveWindowSize = oldASWS; } -void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &configGroup) +void KMainWindow::saveMainWindowSettings(TDEConfig *config, const TQString &configGroup) { kdDebug(200) << "KMainWindow::saveMainWindowSettings " << configGroup << endl; TQString oldGroup; @@ -802,7 +802,7 @@ void KMainWindow::createStandardStatusBarAction(){ } } -bool KMainWindow::readPropertiesInternal( KConfig *config, int number ) +bool KMainWindow::readPropertiesInternal( TDEConfig *config, int number ) { if ( number == 1 ) readGlobalProperties( config ); @@ -826,16 +826,16 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number ) return true; } -void KMainWindow::applyMainWindowSettings(KConfig *config, const TQString &configGroup) +void KMainWindow::applyMainWindowSettings(TDEConfig *config, const TQString &configGroup) { return applyMainWindowSettings(config,configGroup,false); } -void KMainWindow::applyMainWindowSettings(KConfig *config, const TQString &configGroup,bool force) +void KMainWindow::applyMainWindowSettings(TDEConfig *config, const TQString &configGroup,bool force) { kdDebug(200) << "KMainWindow::applyMainWindowSettings" << endl; - KConfigGroupSaver saver( config, configGroup.isEmpty() ? config->group() : configGroup ); + TDEConfigGroupSaver saver( config, configGroup.isEmpty() ? config->group() : configGroup ); restoreWindowSize(config); @@ -899,7 +899,7 @@ void KMainWindow::finalizeGUI( bool force ) d->settingsDirty = false; } -void KMainWindow::saveWindowSize( KConfig * config ) const +void KMainWindow::saveWindowSize( TDEConfig * config ) const { int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); @@ -931,7 +931,7 @@ void KMainWindow::saveWindowSize( KConfig * config ) const config->writeEntry(heightString, h ); } -void KMainWindow::restoreWindowSize( KConfig * config ) +void KMainWindow::restoreWindowSize( TDEConfig * config ) { if (d->care_about_geometry) { parseGeometry(true); diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h index a90d3dc12..a66eb8327 100644 --- a/tdeui/kmainwindow.h +++ b/tdeui/kmainwindow.h @@ -30,7 +30,7 @@ class KPopupMenu; class KXMLGUIFactory; -class KConfig; +class TDEConfig; class KHelpMenu; class KStatusBar; class TQStatusBar; @@ -489,9 +489,9 @@ public: * group name is used. * @param force if set, even default settings are re-applied */ - void applyMainWindowSettings(KConfig *config, const TQString &groupName, bool force); + void applyMainWindowSettings(TDEConfig *config, const TQString &groupName, bool force); // KDE4 merge with force=false - void applyMainWindowSettings(KConfig *config, const TQString &groupName = TQString::null); + void applyMainWindowSettings(TDEConfig *config, const TQString &groupName = TQString::null); /** * Save settings for statusbar, menubar and toolbar to their respective @@ -501,7 +501,7 @@ public: * @param groupName Group name to use. If not specified, the last used * group name is used */ - void saveMainWindowSettings(KConfig *config, const TQString &groupName = TQString::null); + void saveMainWindowSettings(TDEConfig *config, const TQString &groupName = TQString::null); /** * Sets whether KMainWindow should provide a menu that allows showing/hiding @@ -881,12 +881,12 @@ protected: * in this function! * */ - virtual void saveProperties( KConfig* ) {} + virtual void saveProperties( TDEConfig* ) {} /** * Read your instance-specific properties. */ - virtual void readProperties( KConfig* ) {} + virtual void readProperties( TDEConfig* ) {} /** * Save your application-wide properties. The function is @@ -904,16 +904,16 @@ protected: * * Default implementation does nothing. */ - virtual void saveGlobalProperties( KConfig* sessionConfig ); + virtual void saveGlobalProperties( TDEConfig* sessionConfig ); /** * The counterpart of saveGlobalProperties(). * * Read the application-specific properties in again. */ - virtual void readGlobalProperties( KConfig* sessionConfig ); - void savePropertiesInternal( KConfig*, int ); - bool readPropertiesInternal( KConfig*, int ); + virtual void readGlobalProperties( TDEConfig* sessionConfig ); + void savePropertiesInternal( TDEConfig*, int ); + bool readPropertiesInternal( TDEConfig*, int ); /** * For inherited classes @@ -927,13 +927,13 @@ protected: * For inherited classes * Note that the group must be set before calling */ - void saveWindowSize( KConfig * config ) const; + void saveWindowSize( TDEConfig * config ) const; /** * For inherited classes * Note that the group must be set before calling, and that * a -geometry on the command line has priority. */ - void restoreWindowSize( KConfig * config ); + void restoreWindowSize( TDEConfig * config ); /// parse the geometry from the geometry command line argument void parseGeometry(bool parsewidth); diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index 7266d8d91..f6cac81ab 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -235,8 +235,8 @@ void KMenuBar::show() void KMenuBar::slotReadConfig() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver( config, "KDE" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver( config, "KDE" ); setTopLevelMenuInternal( config->readBoolEntry( "macStyle", false ) ); } @@ -329,7 +329,7 @@ void KMenuBar::selectionTimeout() if ( d->topLevel ) { d->fallback_mode = true; // KMenuBar is handling its position itself - KConfigGroup xineramaConfig(TDEGlobal::config(),"Xinerama"); + TDEConfigGroup xineramaConfig(TDEGlobal::config(),"Xinerama"); int screen = xineramaConfig.readNumEntry("MenubarScreen", TQApplication::desktop()->screenNumber(TQPoint(0,0)) ); TQRect area; diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index 4037ffdcc..524636089 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -343,8 +343,8 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : TDEGlobal::config(); - KConfigGroupSaver saver( config, grpNotifMsgs ); + TDEConfig *config = againConfig ? againConfig : TDEGlobal::config(); + TDEConfigGroupSaver saver( config, grpNotifMsgs ); TQString dontAsk = config->readEntry(dontShowAgainName).lower(); if (dontAsk == "yes") { result = Yes; @@ -362,8 +362,8 @@ KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : TDEGlobal::config(); - KConfigGroupSaver saver( config, grpNotifMsgs ); + TDEConfig *config = againConfig ? againConfig : TDEGlobal::config(); + TDEConfigGroupSaver saver( config, grpNotifMsgs ); return config->readBoolEntry(dontShowAgainName, true); } @@ -373,8 +373,8 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : TDEGlobal::config(); - KConfigGroupSaver saver( config, grpNotifMsgs ); + TDEConfig *config = againConfig ? againConfig : TDEGlobal::config(); + TDEConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':')); config->sync(); } @@ -384,15 +384,15 @@ KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : TDEGlobal::config(); - KConfigGroupSaver saver( config, grpNotifMsgs ); + TDEConfig *config = againConfig ? againConfig : TDEGlobal::config(); + TDEConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':')); config->sync(); } -KConfig* KMessageBox::againConfig = NULL; +TDEConfig* KMessageBox::againConfig = NULL; void -KMessageBox::setDontShowAskAgainConfig(KConfig* cfg) +KMessageBox::setDontShowAskAgainConfig(TDEConfig* cfg) { againConfig = cfg; } @@ -935,12 +935,12 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri void KMessageBox::enableAllMessages() { - KConfig *config = againConfig ? againConfig : TDEGlobal::config(); + TDEConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; - KConfigGroupSaver saver( config, grpNotifMsgs ); + TDEConfigGroupSaver saver( config, grpNotifMsgs ); typedef TQMap configMap; @@ -955,12 +955,12 @@ KMessageBox::enableAllMessages() void KMessageBox::enableMessage(const TQString &dontShowAgainName) { - KConfig *config = againConfig ? againConfig : TDEGlobal::config(); + TDEConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; - KConfigGroupSaver saver( config, grpNotifMsgs ); + TDEConfigGroupSaver saver( config, grpNotifMsgs ); config->deleteEntry(dontShowAgainName); config->sync(); diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h index 574ae9ea8..b7724f5ce 100644 --- a/tdeui/kmessagebox.h +++ b/tdeui/kmessagebox.h @@ -27,7 +27,7 @@ class TQWidget; class TQStringList; -class KConfig; +class TDEConfig; class KDialogBase; /** @@ -1097,7 +1097,7 @@ public: * If @p cfg is 0 (default) TDEGlobal::config() will be used. * @since 3.2 */ - static void setDontShowAskAgainConfig(KConfig* cfg); + static void setDontShowAskAgainConfig(TDEConfig* cfg); /** * Create content and layout of a standard dialog @@ -1160,7 +1160,7 @@ public: TQMessageBox::Icon notifyType=TQMessageBox::Information); private: - static KConfig* againConfig; + static TDEConfig* againConfig; }; #endif diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index 50a16fd27..2ef893927 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -class KConfig; +class TDEConfig; class TQPopupMenu; /** @@ -176,7 +176,7 @@ public: virtual int heightForWidth(int width) const { return width; } /** - * Always use this KConfig object to save/load your applet's configuration. + * Always use this TDEConfig object to save/load your applet's configuration. * * For unique applets this config object will write to a config file called * \rc in the user's local %KDE directory. @@ -184,7 +184,7 @@ public: * For normal applets this config object will write to a instance specific config file * called \\rc in the user's local %KDE directory. **/ - KConfig* config() const { return _config; } + TDEConfig* config() const { return _config; } KSharedConfig::Ptr sharedConfig() const; /** @@ -384,7 +384,7 @@ private: Type _type; Position _position; Alignment _alignment; - KConfig* _config; + TDEConfig* _config; int _actions; protected: virtual void virtual_hook( int id, void* data ); diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp index 47ddd7d95..aae989c2e 100644 --- a/tdeui/kpanelextension.cpp +++ b/tdeui/kpanelextension.cpp @@ -55,7 +55,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type, { d = new KPanelExtensionPrivate; setFrameStyle(NoFrame); - _config = new KConfig(configFile); + _config = new TDEConfig(configFile); } KPanelExtension::~KPanelExtension() diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index 437f3795e..f97e85482 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include class TQPopupMenu; -class KConfig; +class TDEConfig; class KPanelExtensionPrivate; /** @@ -139,7 +139,7 @@ public: virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } /** - * Always use this KConfig object to save/load your extensions configuration. + * Always use this TDEConfig object to save/load your extensions configuration. * * For unique extensions this config object will write to a config file called * \rc in the users local KDE directory. @@ -147,7 +147,7 @@ public: * For normal extensions this config object will write to a instance specific config file * called \\rc in the users local KDE directory. **/ - KConfig* config() const { return _config; } + TDEConfig* config() const { return _config; } /** * @return Type indicating the extensions type. @@ -334,7 +334,7 @@ private: Type _type; Position _position; Alignment _alignment; - KConfig* _config; + TDEConfig* _config; int _actions; protected: virtual void virtual_hook( int id, void* data ); diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp index 194801ff2..101d2aba0 100644 --- a/tdeui/kpanelmenu.cpp +++ b/tdeui/kpanelmenu.cpp @@ -63,7 +63,7 @@ void KPanelMenu::init(const TQString& path) connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); // setup cache timer - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("menus"); d->clearDelay = config->readNumEntry("MenuCacheTime", 60000); // 1 minute diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 3b3d74be2..5803ca477 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -110,8 +110,8 @@ KPasswordEdit::KPasswordEdit(TQWidget *parent, const char *name) { init(); - KConfig* const cfg = TDEGlobal::config(); - KConfigGroupSaver saver(cfg, "Passwords"); + TDEConfig* const cfg = TDEGlobal::config(); + TDEConfigGroupSaver saver(cfg, "Passwords"); const TQString val = cfg->readEntry("EchoMode", "OneStar"); if (val == "ThreeStars") @@ -338,8 +338,8 @@ void KPasswordDialog::init() { m_Row = 0; - KConfig* const cfg = TDEGlobal::config(); - const KConfigGroupSaver saver(cfg, "Passwords"); + TDEConfig* const cfg = TDEGlobal::config(); + const TDEConfigGroupSaver saver(cfg, "Passwords"); bool def = ( qstrcmp( tqAppName(), "tdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) ++m_Keep; diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp index 4164e7db2..004a51349 100644 --- a/tdeui/kpixmapio.cpp +++ b/tdeui/kpixmapio.cpp @@ -87,7 +87,7 @@ KPixmapIO::KPixmapIO() #ifdef HAVE_MITSHM setShmPolicy(ShmDontKeep); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if (!config->readBoolEntry("UseMitShm", true)) return; diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 824e92bfc..c5ec9dcf0 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -181,7 +181,7 @@ KSpellConfig::dictFromList() const bool KSpellConfig::readGlobalSettings() { - KConfigGroupSaver cs( kc,"KSpell" ); + TDEConfigGroupSaver cs( kc,"KSpell" ); setNoRootAffix ( kc->readNumEntry("KSpell_NoRootAffix", 0) ); setRunTogether ( kc->readNumEntry("KSpell_RunTogether", 0) ); @@ -196,7 +196,7 @@ KSpellConfig::readGlobalSettings() bool KSpellConfig::writeGlobalSettings () { - KConfigGroupSaver cs( kc,"KSpell" ); + TDEConfigGroupSaver cs( kc,"KSpell" ); kc->writeEntry ("KSpell_NoRootAffix",(int) noRootAffix(), true, true); kc->writeEntry ("KSpell_RunTogether", (int) runTogether(), true, true); diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h index b9cabe220..941405854 100644 --- a/tdeui/ksconfig.h +++ b/tdeui/ksconfig.h @@ -28,7 +28,7 @@ class TQCheckBox; class TQComboBox; class TQLabel; -class KConfig; +class TDEConfig; class KSpellConfigPrivate; /** @@ -264,7 +264,7 @@ class TDEUI_EXPORT KSpellConfig : public TQWidget TQString qspdict; // -p [dict] TQStringList ignorelist; enum {rdictlist=3, rencoding=4, rhelp=6}; - KConfig *kc; + TDEConfig *kc; int iclient; // defaults to ispell, may be aspell, too TQCheckBox *cb1, *cb2; diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index 5750c8832..fe865d31e 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -54,7 +54,7 @@ KScrollView::~KScrollView() void KScrollView::scrollBy(int dx, int dy) { - KConfigGroup cfg( TDEGlobal::config(), "KDE" ); + TDEConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", true )) { TQScrollView::scrollBy( dx, dy ); return; diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp index 1ed3b7df7..c93194e77 100644 --- a/tdeui/kshortcutdialog.cpp +++ b/tdeui/kshortcutdialog.cpp @@ -119,7 +119,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T setShortcut( shortcut ); resize( 0, 0 ); - s_showMore = KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); + s_showMore = TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); updateDetails(); #ifdef Q_WS_X11 @@ -129,7 +129,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T KShortcutDialog::~KShortcutDialog() { - KConfigGroup group(TDEGlobal::config(), "General"); + TDEConfigGroup group(TDEGlobal::config(), "General"); group.writeEntry("ShowAlternativeShortcutConfig", s_showMore); } diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp index 444f34c6b..7d7856a34 100644 --- a/tdeui/kstatusbar.cpp +++ b/tdeui/kstatusbar.cpp @@ -63,7 +63,7 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name ) { // make the size grip stuff configurable // ...but off by default (sven) - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQString group(config->group()); config->setGroup(TQString::fromLatin1("StatusBar style")); bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false); diff --git a/tdeui/kstdguiitem.h b/tdeui/kstdguiitem.h index 3014737ab..0a59d5969 100644 --- a/tdeui/kstdguiitem.h +++ b/tdeui/kstdguiitem.h @@ -86,7 +86,7 @@ public: static KGuiItem overwrite(); /** * Returns a KGuiItem suiting for cases where code or functionality - * runs under root privileges. Used in conjunction with KConfig Modules. + * runs under root privileges. Used in conjunction with TDEConfig Modules. */ static KGuiItem adminMode(); diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index 5ce1bc074..f86083d0a 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -207,12 +207,12 @@ void KSwitchLanguageDialog::slotOk() first = false; } - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if (d->applicationLanguageList().join(":") != languageString) { //list is different from defaults or saved languages list - KConfigGroup group(config, "Locale"); + TDEConfigGroup group(config, "Locale"); group.writeEntry("Language", languageString); config->sync(); @@ -258,12 +258,12 @@ void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *but TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQStringList languagesList; if (config->hasGroup("Locale")) { - KConfigGroupSaver saver(config, "Locale"); + TDEConfigGroupSaver saver(config, "Locale"); if (config->hasKey("Language")) { diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index 66b43e26f..50f594c89 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -290,8 +290,8 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, d->checksDone = 0; d->completeRehighlightRequired = false; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "KSpell" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "KSpell" ); d->disablePercentage = config->readNumEntry( "KSpell_AsYouTypeDisablePercentage", 42 ); d->disablePercentage = QMIN( d->disablePercentage, 101 ); d->disableWordCount = config->readNumEntry( "KSpell_AsYouTypeDisableWordCount", 100 ); @@ -335,7 +335,7 @@ KDictSpellingHighlighter::~KDictSpellingHighlighter() void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) { kdDebug(0) << "KDictSpellingHighlighter::slotSpellReady( " << spell << " )" << endl; - KConfigGroup cg( TDEGlobal::config(),"KSpell" ); + TDEConfigGroup cg( TDEGlobal::config(),"KSpell" ); if ( cg.readEntry("KSpell_DoSpellChecking") != "0" ) { if ( d->globalConfig ) { @@ -539,8 +539,8 @@ void KDictSpellingHighlighter::slotLocalSpellConfigChanged() TQString KDictSpellingHighlighter::spellKey() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "KSpell" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "KSpell" ); config->reparseConfiguration(); TQString key; key += TQString::number( config->readNumEntry( "KSpell_NoRootAffix", 0 )); diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index e24fde38a..717d5c574 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -314,8 +314,8 @@ KActionCollection* KSystemTray::actionCollection() TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance ) { - KConfig *appCfg = kapp->config(); - KConfigGroupSaver configSaver(appCfg, "System Tray"); + TDEConfig *appCfg = kapp->config(); + TDEConfigGroupSaver configSaver(appCfg, "System Tray"); int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); } diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index 1be5985ad..aff96f9a5 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -42,7 +42,7 @@ public: KTabWidgetPrivate() { m_automaticResizeTabs = false; - KConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); + TDEConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30); m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3); m_CurrentMaxLength = m_minLength; diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index b9e3bc594..085aba857 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -301,7 +301,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) ok->setDefault(true); hbox2->addWidget(ok); - KConfigGroup config(kapp->config(), "TipOfDay"); + TDEConfigGroup config(kapp->config(), "TipOfDay"); mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true)); connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip())); @@ -332,7 +332,7 @@ void KTipDialog::showTip(TQWidget *parent, const TQString &tipFile, bool force) void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bool force) { - KConfigGroup configGroup(kapp->config(), "TipOfDay"); + TDEConfigGroup configGroup(kapp->config(), "TipOfDay"); const bool runOnStart = configGroup.readBoolEntry("RunOnStart", true); @@ -418,7 +418,7 @@ static TQString fixTip(TQString tip) void KTipDialog::setShowOnStart(bool on) { - KConfigGroup config(kapp->config(), "TipOfDay"); + TDEConfigGroup config(kapp->config(), "TipOfDay"); config.writeEntry("RunOnStart", on); config.sync(); } diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index b6c67568d..41d416f01 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -1020,7 +1020,7 @@ void KToolBar::saveState() } // if that didn't work, we save to the config file - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); saveSettings(config, TQString::null); config->sync(); } @@ -1040,7 +1040,7 @@ TQString KToolBar::settingsGroup() const return configGroup; } -void KToolBar::saveSettings(KConfig *config, const TQString &_configGroup) +void KToolBar::saveSettings(TDEConfig *config, const TQString &_configGroup) { TQString configGroup = _configGroup; if (configGroup.isEmpty()) @@ -1053,7 +1053,7 @@ void KToolBar::saveSettings(KConfig *config, const TQString &_configGroup) //kdDebug(220) << name() << " position=" << position << " index=" << index << " offset=" << offset() << " newLine=" << newLine() << endl; - KConfigGroupSaver saver(config, configGroup); + TDEConfigGroupSaver saver(config, configGroup); if(!config->hasDefault("Position") && position == d->PositionDefault ) config->revertToDefault("Position"); @@ -1487,7 +1487,7 @@ void KToolBar::slotAppearanceChanged() bool KToolBar::highlightSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + TDEConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); } @@ -1495,7 +1495,7 @@ bool KToolBar::highlightSetting() bool KToolBar::transparentSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + TDEConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); } @@ -1503,7 +1503,7 @@ bool KToolBar::transparentSetting() KToolBar::IconText KToolBar::iconTextSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + TDEConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); TQString icontext = TDEGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); if ( icontext == "IconTextRight" ) return IconTextRight; @@ -1515,7 +1515,7 @@ KToolBar::IconText KToolBar::iconTextSetting() return IconOnly; } -void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configGroup, bool forceGlobal) +void KToolBar::applyAppearanceSettings(TDEConfig *config, const TQString &_configGroup, bool forceGlobal) { TQString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; //kdDebug(220) << name() << " applyAppearanceSettings: configGroup=" << configGroup << " forceGlobal=" << forceGlobal << endl; @@ -1527,7 +1527,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG // This is the reason for the xmlgui tests below. bool xmlgui = d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty(); - KConfig *gconfig = TDEGlobal::config(); + TDEConfig *gconfig = TDEGlobal::config(); static const TQString &attrIconText = TDEGlobal::staticQString("IconText"); static const TQString &attrHighlight = TDEGlobal::staticQString("Highlighting"); @@ -1547,8 +1547,8 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG // this is the first iteration TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - { // start block for KConfigGroupSaver - KConfigGroupSaver saver(gconfig, grpToolbar); + { // start block for TDEConfigGroupSaver + TDEConfigGroupSaver saver(gconfig, grpToolbar); // first, get the generic settings highlight = gconfig->readBoolEntry(attrHighlight, true); @@ -1590,7 +1590,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG } // revert back to the old group - } // end block for KConfigGroupSaver + } // end block for TDEConfigGroupSaver bool doUpdate = false; @@ -1637,12 +1637,12 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG updateGeometry(); } -void KToolBar::applySettings(KConfig *config, const TQString &_configGroup) +void KToolBar::applySettings(TDEConfig *config, const TQString &_configGroup) { return applySettings(config,_configGroup,false); } -void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool force) +void KToolBar::applySettings(TDEConfig *config, const TQString &_configGroup, bool force) { //kdDebug(220) << name() << " applySettings group=" << _configGroup << endl; @@ -1654,7 +1654,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool Global config / user settings if no XMLGUI is used Global config / App-XML attributes / user settings if XMLGUI is used - So in the first case, we simply read everything from KConfig as below, + So in the first case, we simply read everything from TDEConfig as below, but in the second case we don't do anything here if there is no app-specific config, and the XMLGUI-related code (loadState()) uses the static methods of this class to get the global defaults. @@ -1668,7 +1668,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool // ...and now the position stuff if ( config->hasGroup(configGroup) || force ) { - KConfigGroupSaver cgs(config, configGroup); + TDEConfigGroupSaver cgs(config, configGroup); static const TQString &attrPosition = TDEGlobal::staticQString("Position"); static const TQString &attrIndex = TDEGlobal::staticQString("Index"); @@ -1801,9 +1801,9 @@ void KToolBar::loadState( const TQDomElement &element ) This method is called in order to load toolbar settings from XML. However this can be used in two rather different cases: - for the initial loading of the app's XML. In that case the settings - are only the defaults, the user's KConfig settings will override them + are only the defaults, the user's TDEConfig settings will override them (KDE4 TODO: how about saving those user settings into the local XML file instead? - Then this whole thing would be simpler, no KConfig settings to apply afterwards. + Then this whole thing would be simpler, no TDEConfig settings to apply afterwards. OTOH we'd have to migrate those settings when the .rc version increases, like we do for shortcuts) diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index 5fffdd592..2a86b0687 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -905,20 +905,20 @@ public: /** * Save the toolbar settings to group @p configGroup in @p config. */ - void saveSettings(KConfig *config, const TQString &configGroup); + void saveSettings(TDEConfig *config, const TQString &configGroup); /** * Read the toolbar settings from group @p configGroup in @p config * and apply them. Even default settings are re-applied if @p force is set. */ - void applySettings(KConfig *config, const TQString &configGroup,bool force); + void applySettings(TDEConfig *config, const TQString &configGroup,bool force); // KDE4 merge with force=false - void applySettings(KConfig *config, const TQString &configGroup); + void applySettings(TDEConfig *config, const TQString &configGroup); /* * Tell the toolbar what XML-GUI resource file it should use to save * it's state. The state of the toolbar (position, size, etc) is - * saved in KConfig files if the application does not use XML-GUI + * saved in TDEConfig files if the application does not use XML-GUI * but if the app does, then it's saved the XML file. This function * allows this to happen. * @@ -1090,7 +1090,7 @@ protected: void showEvent( TQShowEvent *e ); void resizeEvent( TQResizeEvent *e ); bool event( TQEvent *e ); - void applyAppearanceSettings(KConfig *config, const TQString &_configGroup, bool forceGlobal = false); + void applyAppearanceSettings(TDEConfig *config, const TQString &_configGroup, bool forceGlobal = false); TQString settingsGroup() const; private slots: diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp index 83f29a70e..a6dadcfd3 100644 --- a/tdeui/tests/kcolordlgtest.cpp +++ b/tdeui/tests/kcolordlgtest.cpp @@ -29,7 +29,7 @@ int main( int argc, char *argv[] ) KLocale::setMainCatalogue("tdelibs"); TQApplication::setColorMode( TQApplication::CustomColors ); TDEApplication a( argc, argv, "KColorDialogTest" ); - KConfig aConfig; + TDEConfig aConfig; aConfig.setGroup( "KColorDialog-test" ); color = aConfig.readColorEntry( "Chosen" ); diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index 1720ca09a..8b2ecb829 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -81,7 +81,7 @@ static const char *preview_xpm[] = { SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const char* name ) :TQDialog(0L,name,true) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup( TQString::fromLatin1("SFileDialogData:") + name ); if ( initially.isNull() ){ initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() ); @@ -166,7 +166,7 @@ void SFileDialog::dockChange() SFileDialog::~SFileDialog() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup( TQString("SFileDialogData:") + name() ); config->writeEntry( "Bookmarks", fd->getBookmark() ); @@ -188,7 +188,7 @@ void SFileDialog::setDockDefaultPos( KDockWidget* d ) void SFileDialog::changeDir( const TQString& f ) { if ( !f.isEmpty() ){ - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup( TQString("SFileDialogData:") + name() ); config->writePathEntry( "InitiallyDir", f ); } diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/kfontdialogtest.cpp index 4ef49fec7..14edee074 100644 --- a/tdeui/tests/kfontdialogtest.cpp +++ b/tdeui/tests/kfontdialogtest.cpp @@ -33,7 +33,7 @@ { TDEApplication app( argc, argv, "KFontDialogTest" ); - KConfig aConfig; + TDEConfig aConfig; aConfig.setGroup( "KFontDialog-test" ); app.setFont(TQFont("Helvetica",12)); -- cgit v1.2.3 From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- arts/kde/artskde.idl | 2 +- arts/kde/kaudioconverter.cc | 6 +-- arts/kde/kioinputstream_impl.cpp | 34 ++++++------ arts/kde/kioinputstream_impl.h | 6 +-- arts/kde/kiotest.cc | 2 +- arts/kde/kiotestslow.cc | 2 +- arts/kde/kplayobject.h | 2 +- arts/kde/kplayobjectcreator.cc | 4 +- arts/kde/kplayobjectcreator.h | 2 +- arts/kde/kplayobjectfactory.cc | 2 +- kabc/plugins/ldapkio/resourceldapkioconfig.cpp | 14 ++--- kabc/plugins/ldapkio/resourceldapkioconfig.h | 4 +- kabc/plugins/ldapkio/resourceldapkioplugin.cpp | 2 +- khtml/java/kjavaappletserver.cpp | 10 ++-- khtml/java/kjavadownloader.cpp | 4 +- khtml/java/kjavadownloader.h | 8 +-- kio/bookmarks/kbookmark.h | 6 +-- kio/bookmarks/kbookmarkbar.h | 2 +- kio/bookmarks/kbookmarkdombuilder.h | 2 +- kio/bookmarks/kbookmarkdrag.h | 2 +- kio/bookmarks/kbookmarkexporter.h | 2 +- kio/bookmarks/kbookmarkimporter.h | 4 +- kio/bookmarks/kbookmarkimporter_crash.h | 4 +- kio/bookmarks/kbookmarkimporter_ie.h | 6 +-- kio/bookmarks/kbookmarkimporter_kde1.h | 2 +- kio/bookmarks/kbookmarkimporter_ns.h | 10 ++-- kio/bookmarks/kbookmarkimporter_opera.h | 6 +-- kio/bookmarks/kbookmarkmanager.h | 6 +-- kio/bookmarks/kbookmarkmenu.h | 4 +- kio/bookmarks/kbookmarknotifier.h | 2 +- kio/kfile/kcombiview.h | 2 +- kio/kfile/kcustommenueditor.h | 2 +- kio/kfile/kdiroperator.h | 2 +- kio/kfile/kdirselectdialog.h | 2 +- kio/kfile/kdirsize.h | 2 +- kio/kfile/kdiskfreesp.h | 2 +- kio/kfile/kencodingfiledialog.h | 2 +- kio/kfile/kfile.h | 2 +- kio/kfile/kfilebookmarkhandler.h | 2 +- kio/kfile/kfiledetailview.h | 4 +- kio/kfile/kfiledialog.h | 2 +- kio/kfile/kfilefiltercombo.h | 2 +- kio/kfile/kfileiconview.h | 4 +- kio/kfile/kfilemetainfowidget.h | 2 +- kio/kfile/kfilemetapreview.h | 2 +- kio/kfile/kfilepreview.h | 2 +- kio/kfile/kfilesharedlg.h | 2 +- kio/kfile/kfilespeedbar.h | 2 +- kio/kfile/kfiletreebranch.h | 2 +- kio/kfile/kfiletreeview.h | 4 +- kio/kfile/kfiletreeviewitem.h | 2 +- kio/kfile/kfileview.h | 4 +- kio/kfile/kicondialog.h | 6 +-- kio/kfile/kimagefilepreview.h | 2 +- kio/kfile/kmetaprops.h | 2 +- kio/kfile/knotifydialog.h | 8 +-- kio/kfile/kopenwith.h | 4 +- kio/kfile/kpreviewprops.h | 2 +- kio/kfile/kpreviewwidgetbase.h | 2 +- kio/kfile/kpropertiesdialog.h | 20 +++---- kio/kfile/krecentdirs.h | 2 +- kio/kfile/krecentdocument.h | 2 +- kio/kfile/kurlbar.h | 8 +-- kio/kfile/kurlcombobox.h | 2 +- kio/kfile/kurlrequester.h | 4 +- kio/kfile/kurlrequesterdlg.h | 2 +- kio/kio/authinfo.h | 12 ++--- kio/kio/chmodjob.cpp | 2 +- kio/kio/chmodjob.h | 4 +- kio/kio/connection.h | 4 +- kio/kio/davjob.h | 8 +-- kio/kio/defaultprogress.h | 2 +- kio/kio/forwardingslavebase.h | 2 +- kio/kio/global.cpp | 30 +++++------ kio/kio/global.h | 46 ++++++++-------- kio/kio/job.cpp | 2 +- kio/kio/job.h | 74 +++++++++++++------------- kio/kio/jobclasses.h | 30 +++++------ kio/kio/kacl.h | 10 ++-- kio/kio/kar.h | 2 +- kio/kio/karchive.h | 8 +-- kio/kio/kautomount.h | 4 +- kio/kio/kdatatool.h | 6 +-- kio/kio/kdcopservicestarter.h | 2 +- kio/kio/kdirlister.h | 2 +- kio/kio/kdirnotify.h | 2 +- kio/kio/kdirnotify_stub.h | 2 +- kio/kio/kdirwatch.h | 2 +- kio/kio/kemailsettings.h | 2 +- kio/kio/kfilefilter.h | 4 +- kio/kio/kfileitem.h | 10 ++-- kio/kio/kfilemetainfo.cpp | 12 ++--- kio/kio/kfilemetainfo.h | 42 +++++++-------- kio/kio/kfileshare.h | 2 +- kio/kio/kfilterbase.h | 2 +- kio/kio/kfilterdev.h | 2 +- kio/kio/kimageio.h | 2 +- kio/kio/kimageiofactory.h | 6 +-- kio/kio/klimitediodevice.h | 2 +- kio/kio/kmessageboxwrapper.h | 2 +- kio/kio/kmimemagic.h | 4 +- kio/kio/kmimetype.h | 8 +-- kio/kio/kmimetypechooser.h | 4 +- kio/kio/kmimetyperesolver.h | 4 +- kio/kio/knfsshare.h | 2 +- kio/kio/kprotocolinfo.cpp | 4 +- kio/kio/kprotocolinfo.h | 6 +-- kio/kio/kprotocolmanager.h | 2 +- kio/kio/kremoteencoding.h | 2 +- kio/kio/krun.h | 6 +-- kio/kio/ksambashare.h | 2 +- kio/kio/kscan.h | 8 +-- kio/kio/kservice.h | 2 +- kio/kio/kservicefactory.h | 2 +- kio/kio/kservicegroup.h | 4 +- kio/kio/kservicegroupfactory.h | 2 +- kio/kio/kservicetype.h | 2 +- kio/kio/kservicetypefactory.h | 2 +- kio/kio/kshellcompletion.h | 2 +- kio/kio/kshred.h | 2 +- kio/kio/ktar.h | 2 +- kio/kio/ktrader.h | 2 +- kio/kio/ktraderparsetree.h | 48 ++++++++--------- kio/kio/kurifilter.h | 8 +-- kio/kio/kurlcompletion.h | 2 +- kio/kio/kurlpixmapprovider.h | 2 +- kio/kio/kuserprofile.h | 4 +- kio/kio/kzip.h | 4 +- kio/kio/metainfojob.cpp | 4 +- kio/kio/metainfojob.h | 6 +-- kio/kio/netaccess.h | 2 +- kio/kio/observer.h | 2 +- kio/kio/passdlg.h | 2 +- kio/kio/paste.cpp | 12 ++--- kio/kio/paste.h | 14 ++--- kio/kio/previewjob.h | 6 +-- kio/kio/progressbase.h | 2 +- kio/kio/renamedlg.h | 4 +- kio/kio/renamedlgplugin.h | 2 +- kio/kio/scheduler.h | 2 +- kio/kio/sessiondata.h | 2 +- kio/kio/skipdlg.h | 4 +- kio/kio/slave.h | 2 +- kio/kio/slavebase.h | 2 +- kio/kio/slaveconfig.h | 2 +- kio/kio/slaveinterface.h | 6 +-- kio/kio/statusbarprogress.h | 2 +- kio/kio/tcpslavebase.h | 2 +- kio/kssl/kopenssl.h | 2 +- kio/kssl/ksmimecrypto.h | 2 +- kio/kssl/kssl.h | 2 +- kio/kssl/ksslcertchain.h | 2 +- kio/kssl/ksslcertdlg.h | 8 +-- kio/kssl/ksslcertificate.h | 14 ++--- kio/kssl/ksslcertificatecache.h | 6 +-- kio/kssl/ksslcertificatefactory.h | 2 +- kio/kssl/ksslcertificatehome.h | 2 +- kio/kssl/ksslconnectioninfo.h | 2 +- kio/kssl/ksslcsessioncache.h | 2 +- kio/kssl/ksslinfodlg.h | 4 +- kio/kssl/ksslkeygen.h | 2 +- kio/kssl/ksslpeerinfo.h | 2 +- kio/kssl/ksslpemcallback.h | 2 +- kio/kssl/ksslpkcs12.h | 2 +- kio/kssl/ksslpkcs7.h | 2 +- kio/kssl/ksslsession.h | 2 +- kio/kssl/ksslsettings.h | 2 +- kio/kssl/ksslsigners.h | 2 +- kio/kssl/ksslx509map.h | 2 +- kio/kssl/ksslx509v3.h | 2 +- kio/misc/kntlm/kntlm.h | 2 +- kio/misc/tdesasl/tdesasl.h | 2 +- kio/misc/uiserver.h | 6 +-- kio/tests/jobtest.cpp | 2 +- kioslave/http/http.cc | 4 +- kparts/COMMENTS | 2 +- kwallet/client/kwallet.h | 2 +- tdecore/kbufferedio.cpp | 44 +++++++-------- tdecore/kbufferedio.h | 12 ++--- tdecore/kdebug.areas | 2 +- tdecore/kextsock.cpp | 4 +- tdecore/kextsock.h | 4 +- tdecore/kprotocolinfo_tdecore.cpp | 4 +- tdecore/ksimpledirwatch.h | 2 +- tdecore/network/kbufferedsocket.cpp | 64 +++++++++++----------- tdecore/network/kbufferedsocket.h | 24 ++++----- tdecore/network/kclientsocketbase.h | 2 +- tdecore/network/kiobuffer.h | 14 ++--- tdecore/network/kserversocket.cpp | 10 ++-- tdecore/network/kserversocket.h | 8 +-- tdecore/network/kstreamsocket.h | 8 +-- tdecore/network/tdesocketbuffer.cpp | 4 +- tdecore/network/tdesocketbuffer_p.h | 4 +- tdecore/tdelibs_export.h | 6 +-- tdeprint/cups/kmcupsmanager.cpp | 2 +- win/tdelibs_export_win.h | 6 +-- 196 files changed, 579 insertions(+), 579 deletions(-) (limited to 'khtml/java') diff --git a/arts/kde/artskde.idl b/arts/kde/artskde.idl index f31b49ed4..f1de50924 100644 --- a/arts/kde/artskde.idl +++ b/arts/kde/artskde.idl @@ -12,7 +12,7 @@ interface KFloatWatchProxy { /* * used for deliviering MCOP data to the playobjects */ -interface KIOInputStream : InputStream { +interface TDEIOInputStream : InputStream { boolean openURL(string url); attribute long bufferPackets; diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cc index adda3033a..c5a526db6 100644 --- a/arts/kde/kaudioconverter.cc +++ b/arts/kde/kaudioconverter.cc @@ -81,12 +81,12 @@ void KAudioConverter::requestPlayObject(const KURL &url) { string queryInterface = "Arts::PlayObject"; - Arts::KIOInputStream inputStream; + Arts::TDEIOInputStream inputStream; if(!url.isLocalFile()) { - Arts::KIOInputStream_impl *inputStreamImpl = new Arts::KIOInputStream_impl(); - inputStream = Arts::KIOInputStream::_from_base(inputStreamImpl); + Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl(); + inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl); TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &))); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index ab215a585..4ff509980 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -41,9 +41,9 @@ using namespace Arts; -const unsigned int KIOInputStream_impl::PACKET_COUNT = 10; +const unsigned int TDEIOInputStream_impl::PACKET_COUNT = 10; -KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048) +TDEIOInputStream_impl::TDEIOInputStream_impl() : m_packetSize(2048) { m_job = 0; m_finished = false; @@ -55,13 +55,13 @@ KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048) m_size = 0; } -KIOInputStream_impl::~KIOInputStream_impl() +TDEIOInputStream_impl::~TDEIOInputStream_impl() { if(m_job != 0) m_job->kill(); } -void KIOInputStream_impl::streamStart() +void TDEIOInputStream_impl::streamStart() { // prevent kill/reconnect if (m_streamStarted) { @@ -92,7 +92,7 @@ void KIOInputStream_impl::streamStart() m_streamStarted = true; } -void KIOInputStream_impl::streamEnd() +void TDEIOInputStream_impl::streamEnd() { kdDebug( 400 ) << "streamEnd()\n"; @@ -117,14 +117,14 @@ void KIOInputStream_impl::streamEnd() m_streamStarted = false; } -bool KIOInputStream_impl::openURL(const std::string& url) +bool TDEIOInputStream_impl::openURL(const std::string& url) { m_url = KURL(url.c_str()); m_size = 0; return true; } -void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) +void TDEIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) { if(m_finished) m_finished = false; @@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) processQueue(); } -void KIOInputStream_impl::slotResult(TDEIO::Job *job) +void TDEIOInputStream_impl::slotResult(TDEIO::Job *job) { // jobs delete themselves after emitting their result m_finished = true; @@ -151,38 +151,38 @@ void KIOInputStream_impl::slotResult(TDEIO::Job *job) } } -void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) +void TDEIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) { kdDebug( 400 ) << "got mimetype: " << mimetype << endl; emit mimeTypeFound(mimetype); } -void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) +void TDEIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) { m_size = size; } -bool KIOInputStream_impl::eof() +bool TDEIOInputStream_impl::eof() { return (m_finished && m_data.size() == 0); } -bool KIOInputStream_impl::seekOk() +bool TDEIOInputStream_impl::seekOk() { return false; } -long KIOInputStream_impl::size() +long TDEIOInputStream_impl::size() { return m_size ? m_size : m_data.size(); } -long KIOInputStream_impl::seek(long) +long TDEIOInputStream_impl::seek(long) { return -1; } -void KIOInputStream_impl::processQueue() +void TDEIOInputStream_impl::processQueue() { if(m_job != 0) { @@ -210,7 +210,7 @@ void KIOInputStream_impl::processQueue() } } -void KIOInputStream_impl::request_outdata(DataPacket *packet) +void TDEIOInputStream_impl::request_outdata(DataPacket *packet) { processQueue(); packet->size = std::min(m_packetSize, (unsigned int)m_data.size()); @@ -233,4 +233,4 @@ void KIOInputStream_impl::request_outdata(DataPacket *packet) packet->send(); } -REGISTER_IMPLEMENTATION(KIOInputStream_impl); +REGISTER_IMPLEMENTATION(TDEIOInputStream_impl); diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 06052e04b..d0a872881 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -31,14 +31,14 @@ namespace Arts { -class KIOInputStream_impl : public TQObject, virtual public KIOInputStream_skel, +class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_skel, virtual public InputStream_skel, virtual public StdSynthModule { Q_OBJECT public: - KIOInputStream_impl(); - ~KIOInputStream_impl(); + TDEIOInputStream_impl(); + ~TDEIOInputStream_impl(); void streamStart(); void streamEnd(); diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc index 826a3b165..f838c4f77 100644 --- a/arts/kde/kiotest.cc +++ b/arts/kde/kiotest.cc @@ -27,7 +27,7 @@ int main(int argc, char **argv) TDEApplication app; QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); - KIOInputStream stream; + TDEIOInputStream stream; StdoutWriter writer; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index e367ea924..ffb71d8b1 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -96,7 +96,7 @@ int main(int argc, char **argv) QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); #ifndef USE_FILEINPUTSTREAM - KIOInputStream stream; + TDEIOInputStream stream; #else FileInputStream stream; #endif diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index 4aafe0b58..f5bd849be 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -126,7 +126,7 @@ class PlayObjectFactory; * This class acts as a general interface to the KDE multimedia framework. * You basically point the Playobject to an URL and say "play", and it will * automatically decode and play and / or display the file or stream. - * For non-local media, it will make extensive use of KIOInputStream to + * For non-local media, it will make extensive use of TDEIOInputStream to * directly play the content from the remote location without having to * download it to a temporary local file first. * diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc index b1969718e..2e8187e67 100644 --- a/arts/kde/kplayobjectcreator.cc +++ b/arts/kde/kplayobjectcreator.cc @@ -53,8 +53,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj m_createBUS = createBUS; // This is the RightWay(tm) according to stw - Arts::KIOInputStream_impl* instream_impl = new Arts::KIOInputStream_impl(); - m_instream = Arts::KIOInputStream::_from_base(instream_impl); + Arts::TDEIOInputStream_impl* instream_impl = new Arts::TDEIOInputStream_impl(); + m_instream = Arts::TDEIOInputStream::_from_base(instream_impl); // signal will be called once the ioslave knows the mime-type of the stream connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)), diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index d52e18a1e..74e571c8e 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -46,7 +46,7 @@ private slots: private: Arts::SoundServerV2 m_server; - Arts::KIOInputStream m_instream; + Arts::TDEIOInputStream m_instream; Arts::PlayObject playObject; bool m_createBUS; }; diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index c09692946..db4110792 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -75,7 +75,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri { if(mimetype == "application/octet-stream" && m_allowStreaming) { - Arts::KIOInputStream instream; + Arts::TDEIOInputStream instream; instream.openURL(url.url().latin1()); m_stream = true; diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp index 7ecd14554..85b9b12b0 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp @@ -45,7 +45,7 @@ using namespace KABC; -ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent, const char* name ) +ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent, const char* name ) : KRES::ConfigWidget( parent, name ) { TQBoxLayout *mainLayout = new TQVBoxLayout( this ); @@ -62,12 +62,12 @@ ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent, const char* nam connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) ); } -void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res ) +void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res ) { ResourceLDAPKIO *resource = dynamic_cast( res ); if ( !resource ) { - kdDebug(5700) << "ResourceLDAPKIOConfig::loadSettings(): cast failed" << endl; + kdDebug(5700) << "ResourceLDAPTDEIOConfig::loadSettings(): cast failed" << endl; return; } @@ -98,12 +98,12 @@ void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res ) mAutoCache = resource->autoCache(); } -void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res ) +void ResourceLDAPTDEIOConfig::saveSettings( KRES::Resource *res ) { ResourceLDAPKIO *resource = dynamic_cast( res ); if ( !resource ) { - kdDebug(5700) << "ResourceLDAPKIOConfig::saveSettings(): cast failed" << endl; + kdDebug(5700) << "ResourceLDAPTDEIOConfig::saveSettings(): cast failed" << endl; return; } @@ -131,7 +131,7 @@ void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res ) } -void ResourceLDAPKIOConfig::editAttributes() +void ResourceLDAPTDEIOConfig::editAttributes() { AttributesDialog dlg( mAttributes, mRDNPrefix, this ); if ( dlg.exec() ) { @@ -140,7 +140,7 @@ void ResourceLDAPKIOConfig::editAttributes() } } -void ResourceLDAPKIOConfig::editCache() +void ResourceLDAPTDEIOConfig::editCache() { LDAPUrl src; TQStringList attr; diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h index f8e0003ec..e14c7c428 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.h +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h @@ -42,12 +42,12 @@ class KLineEdit; namespace KABC { -class KABC_EXPORT ResourceLDAPKIOConfig : public KRES::ConfigWidget +class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget { Q_OBJECT public: - ResourceLDAPKIOConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp index 975837bf8..7edb90e22 100644 --- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp @@ -31,6 +31,6 @@ extern "C" KDE_EXPORT void *init_kabc_ldapkio() { TDEGlobal::locale()->insertCatalogue("kabc_ldapkio"); - return new KRES::PluginFactory(); + return new KRES::PluginFactory(); } } diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index a82a80a0e..9d8b0ac4f 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -87,7 +87,7 @@ class JSStackFrame; -typedef TQMap< int, KJavaKIOJob* > KIOJobMap; +typedef TQMap< int, KJavaTDEIOJob* > TDEIOJobMap; typedef TQMap< int, JSStackFrame* > JSStack; class JSStackFrame { @@ -121,7 +121,7 @@ private: TQMap< int, TQGuardedPtr > contexts; TQString appletLabel; JSStack jsstack; - KIOJobMap kiojobs; + TDEIOJobMap kiojobs; bool javaProcessFailed; bool useKIO; KSSL * kssl; @@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray& void KJavaAppletServer::removeDataJob( int loaderID ) { - const KIOJobMap::iterator it = d->kiojobs.find( loaderID ); + const TDEIOJobMap::iterator it = d->kiojobs.find( loaderID ); if (it != d->kiojobs.end()) { it.data()->deleteLater(); d->kiojobs.erase( it ); @@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) if (cmd_code == KJAS_PUT_DATA) { // rest of the data is for kio put if (ok) { - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + TDEIOJobMap::iterator it = d->kiojobs.find( ID_num ); if (ok && it != d->kiojobs.end()) { TQByteArray qba; qba.setRawData(qb.data() + index, qb.size() - index - 1); @@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_DATA_COMMAND: if (ok && !args.empty()) { const int cmd = args.first().toInt( &ok ); - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + TDEIOJobMap::iterator it = d->kiojobs.find( ID_num ); if (ok && it != d->kiojobs.end()) it.data()->jobCommand( cmd ); kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl; diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp index a12b585b7..a0a8abdd2 100644 --- a/khtml/java/kjavadownloader.cpp +++ b/khtml/java/kjavadownloader.cpp @@ -41,9 +41,9 @@ static const int KJAS_STOP = 0; static const int KJAS_HOLD = 1; static const int KJAS_RESUME = 2; -KJavaKIOJob::~KJavaKIOJob() {} +KJavaTDEIOJob::~KJavaTDEIOJob() {} -void KJavaKIOJob::data( const TQByteArray& ) +void KJavaTDEIOJob::data( const TQByteArray& ) { kdError(6100) << "Job id mixup" << endl; } diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h index ab6553398..22690824c 100644 --- a/khtml/java/kjavadownloader.h +++ b/khtml/java/kjavadownloader.h @@ -40,16 +40,16 @@ namespace TDEIO { class KJavaDownloaderPrivate; class KJavaUploaderPrivate; -class KJavaKIOJob : public TQObject +class KJavaTDEIOJob : public TQObject { Q_OBJECT public: - virtual ~KJavaKIOJob(); + virtual ~KJavaTDEIOJob(); virtual void jobCommand( int cmd ) = 0; virtual void data( const TQByteArray& qb ); }; -class KJavaDownloader : public KJavaKIOJob +class KJavaDownloader : public KJavaTDEIOJob { Q_OBJECT @@ -69,7 +69,7 @@ private: }; -class KJavaUploader : public KJavaKIOJob +class KJavaUploader : public KJavaTDEIOJob { Q_OBJECT diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 84f177522..4e5dc9149 100644 --- a/kio/bookmarks/kbookmark.h +++ b/kio/bookmarks/kbookmark.h @@ -28,7 +28,7 @@ class KBookmarkManager; class KBookmarkGroup; -class KIO_EXPORT KBookmark +class TDEIO_EXPORT KBookmark { friend class KBookmarkGroup; public: @@ -196,7 +196,7 @@ private: /** * A group of bookmarks */ -class KIO_EXPORT KBookmarkGroup : public KBookmark +class TDEIO_EXPORT KBookmarkGroup : public KBookmark { public: /** @@ -315,7 +315,7 @@ private: /** * @since 3.2 */ -class KIO_EXPORT KBookmarkGroupTraverser { +class TDEIO_EXPORT KBookmarkGroupTraverser { protected: virtual ~KBookmarkGroupTraverser() { ; } void traverse(const KBookmarkGroup &); diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h index 310c1933d..1f100d183 100644 --- a/kio/bookmarks/kbookmarkbar.h +++ b/kio/bookmarks/kbookmarkbar.h @@ -39,7 +39,7 @@ class TQPopupMenu; * identical to using KBookmarkMenu so follow the directions * there. */ -class KIO_EXPORT KBookmarkBar : public TQObject +class TDEIO_EXPORT KBookmarkBar : public TQObject { Q_OBJECT diff --git a/kio/bookmarks/kbookmarkdombuilder.h b/kio/bookmarks/kbookmarkdombuilder.h index f1f712531..44fe7b170 100644 --- a/kio/bookmarks/kbookmarkdombuilder.h +++ b/kio/bookmarks/kbookmarkdombuilder.h @@ -27,7 +27,7 @@ /** * @since 3.2 */ -class KIO_EXPORT KBookmarkDomBuilder : public TQObject { +class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject { Q_OBJECT public: KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *); diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h index c213f2d93..016bd6849 100644 --- a/kio/bookmarks/kbookmarkdrag.h +++ b/kio/bookmarks/kbookmarkdrag.h @@ -25,7 +25,7 @@ #include // Clipboard/dnd data : URLs + XML for bookmarks -class KIO_EXPORT KBookmarkDrag : public TQUriDrag +class TDEIO_EXPORT KBookmarkDrag : public TQUriDrag { public: static KBookmarkDrag * newDrag( const TQValueList & bookmarks, diff --git a/kio/bookmarks/kbookmarkexporter.h b/kio/bookmarks/kbookmarkexporter.h index 0943d6cbe..68e8f475a 100644 --- a/kio/bookmarks/kbookmarkexporter.h +++ b/kio/bookmarks/kbookmarkexporter.h @@ -29,7 +29,7 @@ /** * @since 3.2 */ -class KIO_EXPORT KBookmarkExporterBase +class TDEIO_EXPORT KBookmarkExporterBase { public: KBookmarkExporterBase(KBookmarkManager* mgr, const TQString & fileName) diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h index 8fb684c7e..cc87b2004 100644 --- a/kio/bookmarks/kbookmarkimporter.h +++ b/kio/bookmarks/kbookmarkimporter.h @@ -34,7 +34,7 @@ * and KActionMenu uses it to create actions directly. * @since 3.2 */ -class KIO_EXPORT KBookmarkImporterBase : public TQObject +class TDEIO_EXPORT KBookmarkImporterBase : public TQObject { Q_OBJECT public: @@ -84,7 +84,7 @@ private: /** * A class for importing XBEL files */ -class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser +class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h index a5ae08d96..f4fc9af32 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.h +++ b/kio/bookmarks/kbookmarkimporter_crash.h @@ -34,7 +34,7 @@ * A class for importing all crash sessions as bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject { Q_OBJECT public: @@ -57,7 +57,7 @@ protected: * A class for importing all crash sessions as bookmarks * @since 3.2 */ -class KIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase { public: KCrashBookmarkImporterImpl() : m_shouldDelete(false) { } diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h index eddf20f41..b1b7c651c 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.h +++ b/kio/bookmarks/kbookmarkimporter_ie.h @@ -33,7 +33,7 @@ * A class for importing IE bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject { Q_OBJECT public: @@ -62,7 +62,7 @@ protected: * A class for importing IE bookmarks * @since 3.2 */ -class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase { public: KIEBookmarkImporterImpl() { } @@ -75,7 +75,7 @@ private: /* * @since 3.2 */ -class KIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase { public: KIEBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & path) diff --git a/kio/bookmarks/kbookmarkimporter_kde1.h b/kio/bookmarks/kbookmarkimporter_kde1.h index 7e6ad2395..5af4f04e9 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.h +++ b/kio/bookmarks/kbookmarkimporter_kde1.h @@ -31,7 +31,7 @@ * Separated from KBookmarkManager to save memory (we throw this one * out once the import is done) */ -class KIO_EXPORT KBookmarkImporter +class TDEIO_EXPORT KBookmarkImporter { public: KBookmarkImporter( TQDomDocument * doc ) : m_pDoc(doc) {} diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h index fdf79a3b9..10844fc63 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.h +++ b/kio/bookmarks/kbookmarkimporter_ns.h @@ -34,7 +34,7 @@ * A class for importing NS bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject { Q_OBJECT public: @@ -64,7 +64,7 @@ protected: * utf8 defaults to off * @since 3.2 */ -class KIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase { public: KNSBookmarkImporterImpl() : m_utf8(false) { } @@ -81,7 +81,7 @@ private: * utf8 defaults to on * @since 3.2 */ -class KIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl +class TDEIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl { public: KMozillaBookmarkImporterImpl() { setUtf8(true); } @@ -94,7 +94,7 @@ private: * Warning, it overwrites the existing bookmarks.html file ! * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkExporter +class TDEIO_EXPORT_DEPRECATED KNSBookmarkExporter { public: KNSBookmarkExporter(KBookmarkManager* mgr, const TQString & fileName) @@ -113,7 +113,7 @@ protected: /** * @since 3.2 */ -class KIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase { public: KNSBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & fileName) diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h index 0f9a3ba00..f6f1028b1 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.h +++ b/kio/bookmarks/kbookmarkimporter_opera.h @@ -32,7 +32,7 @@ * A class for importing Opera bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject { Q_OBJECT public: @@ -58,7 +58,7 @@ protected: * A class for importing Opera bookmarks * @since 3.2 */ -class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase { public: KOperaBookmarkImporterImpl() { } @@ -71,7 +71,7 @@ private: /** * @since 3.2 */ -class KIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase { public: KOperaBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & filename) diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h index d076eefc7..4a129704a 100644 --- a/kio/bookmarks/kbookmarkmanager.h +++ b/kio/bookmarks/kbookmarkmanager.h @@ -50,7 +50,7 @@ * * \endcode */ -class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject +class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -314,7 +314,7 @@ private: * If you wish to use your own editor or allow the user to add * bookmarks, you must overload this class. */ -class KIO_EXPORT KBookmarkOwner +class TDEIO_EXPORT KBookmarkOwner { public: /** @@ -350,7 +350,7 @@ protected: /** * @since 3.2 */ -class KIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner +class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index b54398a02..35e6191e3 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -76,7 +76,7 @@ namespace TDEIO { class Job; } * 1a) Reimplement your own KBookmarkOwner * 1b) Reimplement and instantiate your own KBookmarkManager */ -class KIO_EXPORT KBookmarkMenu : public TQObject +class TDEIO_EXPORT KBookmarkMenu : public TQObject { Q_OBJECT friend class KBookmarkMenuNSImporter; @@ -238,7 +238,7 @@ protected: /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ -class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject +class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarknotifier.h b/kio/bookmarks/kbookmarknotifier.h index 3982f984f..f99e570bc 100644 --- a/kio/bookmarks/kbookmarknotifier.h +++ b/kio/bookmarks/kbookmarknotifier.h @@ -28,7 +28,7 @@ * DCOP interface for a bookmark notifier (an object which emits signals * upon changes to the bookmarks) */ -class KIO_EXPORT KBookmarkNotifier : virtual public DCOPObject +class TDEIO_EXPORT KBookmarkNotifier : virtual public DCOPObject { K_DCOP diff --git a/kio/kfile/kcombiview.h b/kio/kfile/kcombiview.h index 2747c51ad..5d56b8257 100644 --- a/kio/kfile/kcombiview.h +++ b/kio/kfile/kcombiview.h @@ -51,7 +51,7 @@ class TQIconViewItem; * @see KFileDetailView * @see KDirOperator */ -class KIO_EXPORT KCombiView : public TQSplitter, +class TDEIO_EXPORT KCombiView : public TQSplitter, public KFileView { Q_OBJECT diff --git a/kio/kfile/kcustommenueditor.h b/kio/kfile/kcustommenueditor.h index 9112780b0..108e9c477 100644 --- a/kio/kfile/kcustommenueditor.h +++ b/kio/kfile/kcustommenueditor.h @@ -30,7 +30,7 @@ class TDEConfigBase; * @author Waldo Bastian (bastian@kde.org) * @since 3.1 */ -class KIO_EXPORT KCustomMenuEditor : public KDialogBase +class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase { Q_OBJECT public: diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index 73798b92c..3dbd42759 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -94,7 +94,7 @@ namespace TDEIO { * @short A widget for displaying files and browsing directories. * @author Stephan Kulow , Carsten Pfeiffer */ -class KIO_EXPORT KDirOperator : public TQWidget +class TDEIO_EXPORT KDirOperator : public TQWidget { Q_OBJECT diff --git a/kio/kfile/kdirselectdialog.h b/kio/kfile/kdirselectdialog.h index 106fe77fc..746064c68 100644 --- a/kio/kfile/kdirselectdialog.h +++ b/kio/kfile/kdirselectdialog.h @@ -36,7 +36,7 @@ class KToggleAction; * @author Michael Jarrett * @see KFileDialog */ -class KIO_EXPORT KDirSelectDialog : public KDialogBase +class TDEIO_EXPORT KDirSelectDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kfile/kdirsize.h b/kio/kfile/kdirsize.h index 41fe87eb6..b0f2c8fc2 100644 --- a/kio/kfile/kdirsize.h +++ b/kio/kfile/kdirsize.h @@ -27,7 +27,7 @@ * Computes a directory size (similar to "du", but doesn't give the same results * since we simply sum up the dir and file sizes, whereas du speaks disk blocks) */ -class KIO_EXPORT KDirSize : public TDEIO::Job +class TDEIO_EXPORT KDirSize : public TDEIO::Job { Q_OBJECT protected: diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index 7b9fc6238..5ffa47d9a 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -37,7 +37,7 @@ class TDEProcess; * This class parses the output of "df" to find the disk usage * information for a given partition (mount point). */ -class KIO_EXPORT KDiskFreeSp : public TQObject +class TDEIO_EXPORT KDiskFreeSp : public TQObject { Q_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); diff --git a/kio/kfile/kencodingfiledialog.h b/kio/kfile/kencodingfiledialog.h index 15b44f9c3..95daca6ce 100644 --- a/kio/kfile/kencodingfiledialog.h +++ b/kio/kfile/kencodingfiledialog.h @@ -36,7 +36,7 @@ struct KEncodingFileDialogPrivate; * can easily add children that will be incorporated into the layout. */ -class KIO_EXPORT KEncodingFileDialog : public KFileDialog +class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog { Q_OBJECT diff --git a/kio/kfile/kfile.h b/kio/kfile/kfile.h index 8e6541cb3..7209a1d25 100644 --- a/kio/kfile/kfile.h +++ b/kio/kfile/kfile.h @@ -28,7 +28,7 @@ * construct a KFile object itself. */ -class KIO_EXPORT KFile +class TDEIO_EXPORT KFile { public: /** diff --git a/kio/kfile/kfilebookmarkhandler.h b/kio/kfile/kfilebookmarkhandler.h index 7db71548b..9b615c87e 100644 --- a/kio/kfile/kfilebookmarkhandler.h +++ b/kio/kfile/kfilebookmarkhandler.h @@ -26,7 +26,7 @@ class TQTextStream; class KPopupMenu; -class KIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner +class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner { Q_OBJECT diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 9c41cfb91..37e71720f 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -34,7 +34,7 @@ class TQKeyEvent; * An item for the listiew, that has a reference to its corresponding * KFileItem. */ -class KIO_EXPORT KFileListViewItem : public KListViewItem +class TDEIO_EXPORT KFileListViewItem : public KListViewItem { public: KFileListViewItem( TQListView *parent, const TQString &text, @@ -106,7 +106,7 @@ private: * @see KCombiView * @see KFileIconView */ -class KIO_EXPORT KFileDetailView : public KListView, public KFileView +class TDEIO_EXPORT KFileDetailView : public KListView, public KFileView { Q_OBJECT diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h index 51d817b2f..2f986d351 100644 --- a/kio/kfile/kfiledialog.h +++ b/kio/kfile/kfiledialog.h @@ -74,7 +74,7 @@ struct KFileDialogPrivate; * * @author Richard J. Moore , Carsten Pfeiffer */ -class KIO_EXPORT KFileDialog : public KDialogBase +class TDEIO_EXPORT KFileDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kfile/kfilefiltercombo.h b/kio/kfile/kfilefiltercombo.h index d1f9cbf62..589376d0c 100644 --- a/kio/kfile/kfilefiltercombo.h +++ b/kio/kfile/kfilefiltercombo.h @@ -28,7 +28,7 @@ class KFileFilterComboPrivate; -class KIO_EXPORT KFileFilterCombo : public KComboBox +class TDEIO_EXPORT KFileFilterCombo : public KComboBox { Q_OBJECT diff --git a/kio/kfile/kfileiconview.h b/kio/kfile/kfileiconview.h index 209e4828a..98afc0a6e 100644 --- a/kio/kfile/kfileiconview.h +++ b/kio/kfile/kfileiconview.h @@ -37,7 +37,7 @@ class TQLabel; * An item for the iconview, that has a reference to its corresponding * KFileItem. */ -class KIO_EXPORT KFileIconViewItem : public KIconViewItem +class TDEIO_EXPORT KFileIconViewItem : public KIconViewItem { public: KFileIconViewItem( TQIconView *parent, const TQString &text, @@ -80,7 +80,7 @@ namespace TDEIO { * @see KCombiView * @see KFileDetailView */ -class KIO_EXPORT KFileIconView : public KIconView, public KFileView +class TDEIO_EXPORT KFileIconView : public KIconView, public KFileView { Q_OBJECT diff --git a/kio/kfile/kfilemetainfowidget.h b/kio/kfile/kfilemetainfowidget.h index 96614950b..a42846bea 100644 --- a/kio/kfile/kfilemetainfowidget.h +++ b/kio/kfile/kfilemetainfowidget.h @@ -27,7 +27,7 @@ /*! * A widget to display file meta infos (like id3 for mp3) */ -class KIO_EXPORT KFileMetaInfoWidget: public TQWidget +class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget { Q_OBJECT public: diff --git a/kio/kfile/kfilemetapreview.h b/kio/kfile/kfilemetapreview.h index 19b7901a1..f26cd29b5 100644 --- a/kio/kfile/kfilemetapreview.h +++ b/kio/kfile/kfilemetapreview.h @@ -15,7 +15,7 @@ #include #include -class KIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase +class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase { Q_OBJECT diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h index 79dda2984..af6fe13d2 100644 --- a/kio/kfile/kfilepreview.h +++ b/kio/kfile/kfilepreview.h @@ -36,7 +36,7 @@ /*! * This KFileView is an empbedded preview for some file types. */ -class KIO_EXPORT KFilePreview : public TQSplitter, public KFileView +class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView { Q_OBJECT diff --git a/kio/kfile/kfilesharedlg.h b/kio/kfile/kfilesharedlg.h index 54876f12a..e7998ad66 100644 --- a/kio/kfile/kfilesharedlg.h +++ b/kio/kfile/kfilesharedlg.h @@ -30,7 +30,7 @@ class TQPushButton; * @author David Faure * @since 3.1 */ -class KIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index f7a27131b..d1c2a689e 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -23,7 +23,7 @@ class TDEConfig; -class KIO_EXPORT KFileSpeedBar : public KURLBar +class TDEIO_EXPORT KFileSpeedBar : public KURLBar { Q_OBJECT public: diff --git a/kio/kfile/kfiletreebranch.h b/kio/kfile/kfiletreebranch.h index 30f5cf47c..31e6dcfc0 100644 --- a/kio/kfile/kfiletreebranch.h +++ b/kio/kfile/kfiletreebranch.h @@ -45,7 +45,7 @@ class KFileTreeView; * */ -class KIO_EXPORT KFileTreeBranch : public KDirLister +class TDEIO_EXPORT KFileTreeBranch : public KDirLister { Q_OBJECT public: diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h index fb242b2c6..f28f0f01e 100644 --- a/kio/kfile/kfiletreeview.h +++ b/kio/kfile/kfiletreeview.h @@ -37,7 +37,7 @@ class TQTimer; -class KIO_EXPORT KFileTreeViewToolTip : public TQToolTip +class TDEIO_EXPORT KFileTreeViewToolTip : public TQToolTip { public: KFileTreeViewToolTip( TQListView *view ) : TQToolTip( view ), m_view( view ) {} @@ -63,7 +63,7 @@ private: * 3. retrieve the root item with KFileTreeBranch::root() and set it open * if desired. That starts the listing. */ -class KIO_EXPORT KFileTreeView : public KListView +class TDEIO_EXPORT KFileTreeView : public KListView { Q_OBJECT public: diff --git a/kio/kfile/kfiletreeviewitem.h b/kio/kfile/kfiletreeviewitem.h index fe338df3b..0fefc5dc1 100644 --- a/kio/kfile/kfiletreeviewitem.h +++ b/kio/kfile/kfiletreeviewitem.h @@ -37,7 +37,7 @@ class KFileTreeItem; /** * An item for a KFileTreeView that knows about its own KFileItem. */ -class KIO_EXPORT KFileTreeViewItem : public KListViewItem +class TDEIO_EXPORT KFileTreeViewItem : public KListViewItem { public: KFileTreeViewItem( KFileTreeViewItem*, KFileItem*, KFileTreeBranch * ); diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index 5a6bfd002..7e88fc9d8 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -34,7 +34,7 @@ class KActionCollection; * internal class to make easier to use signals possible * @internal **/ -class KIO_EXPORT KFileViewSignaler : public TQObject +class TDEIO_EXPORT KFileViewSignaler : public TQObject { Q_OBJECT @@ -95,7 +95,7 @@ signals: * @short A base class for views of the KDE file selector * @author Stephan Kulow **/ -class KIO_EXPORT KFileView { +class TDEIO_EXPORT KFileView { public: KFileView(); diff --git a/kio/kfile/kicondialog.h b/kio/kfile/kicondialog.h index e533f6800..30d9f1579 100644 --- a/kio/kfile/kicondialog.h +++ b/kio/kfile/kicondialog.h @@ -32,7 +32,7 @@ class KIconLoader; /** * Icon canvas for KIconDialog. */ -class KIO_EXPORT KIconCanvas: public KIconView +class TDEIO_EXPORT KIconCanvas: public KIconView { Q_OBJECT @@ -88,7 +88,7 @@ private: * * @short An icon selection dialog. */ -class KIO_EXPORT KIconDialog: public KDialogBase +class TDEIO_EXPORT KIconDialog: public KDialogBase { Q_OBJECT @@ -254,7 +254,7 @@ private: * @see KIconDialog * @short A push button that allows selection of an icon. */ -class KIO_EXPORT KIconButton: public TQPushButton +class TDEIO_EXPORT KIconButton: public TQPushButton { Q_OBJECT TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon ) diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index a86f4f923..0604e08f0 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -28,7 +28,7 @@ namespace TDEIO { class Job; class PreviewJob; } /** * Image preview widget for the file dialog. */ -class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase +class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase { Q_OBJECT diff --git a/kio/kfile/kmetaprops.h b/kio/kfile/kmetaprops.h index 8bd83a3b3..c842499dd 100644 --- a/kio/kfile/kmetaprops.h +++ b/kio/kfile/kmetaprops.h @@ -28,7 +28,7 @@ class KFileMetaInfoItem; * 'MetaProps plugin * In this plugin you can modify meta information like id3 tags of mp3 files */ -class KIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index acab7e23f..9bb3210ea 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -49,7 +49,7 @@ namespace KNotify * @since 3.1 * @author Carsten Pfeiffer */ -class KIO_EXPORT KNotifyDialog : public KDialogBase +class TDEIO_EXPORT KNotifyDialog : public KDialogBase { Q_OBJECT @@ -148,7 +148,7 @@ namespace KNotify /** * @internal */ - class KIO_EXPORT Application + class TDEIO_EXPORT Application { public: Application( const TQString &path ); @@ -173,7 +173,7 @@ namespace KNotify }; - class KIO_EXPORT ApplicationList : public TQPtrList + class TDEIO_EXPORT ApplicationList : public TQPtrList { virtual int compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) @@ -186,7 +186,7 @@ namespace KNotify /** * @internal */ - class KIO_EXPORT KNotifyWidget : public KNotifyWidgetBase + class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase { Q_OBJECT diff --git a/kio/kfile/kopenwith.h b/kio/kfile/kopenwith.h index a6c570172..90c43ceb1 100644 --- a/kio/kfile/kopenwith.h +++ b/kio/kfile/kopenwith.h @@ -43,7 +43,7 @@ class KOpenWithDlgPrivate; * * @author David Faure */ -class KIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4 +class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4 { Q_OBJECT public: @@ -189,7 +189,7 @@ protected: * * */ -class KIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler +class TDEIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler { public: KFileOpenWithHandler() : KOpenWithHandler() {} diff --git a/kio/kfile/kpreviewprops.h b/kio/kfile/kpreviewprops.h index c34e70763..d934af22a 100644 --- a/kio/kfile/kpreviewprops.h +++ b/kio/kfile/kpreviewprops.h @@ -29,7 +29,7 @@ class KFileMetaPreview; * This plugin displays a preview of the given file * @since 3.5 */ -class KIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin { Q_OBJECT diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h index e4c77c600..3597070ee 100644 --- a/kio/kfile/kpreviewwidgetbase.h +++ b/kio/kfile/kpreviewwidgetbase.h @@ -41,7 +41,7 @@ class KURL; * @short Abstract baseclass for all preview widgets. * @author Frerich Raabe */ -class KIO_EXPORT KPreviewWidgetBase : public TQWidget +class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget { Q_OBJECT diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index df814f7d4..3f6d48c6a 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -67,7 +67,7 @@ namespace TDEIO { class Job; } * If you are looking for more flexibility, see KFileMetaInfo and * KFileMetaInfoWidget. */ -class KIO_EXPORT KPropertiesDialog : public KDialogBase +class TDEIO_EXPORT KPropertiesDialog : public KDialogBase { Q_OBJECT @@ -434,7 +434,7 @@ private: * You can also include X-TDE-Protocol=file if you want that plugin * to be loaded only for local files, for instance. */ -class KIO_EXPORT KPropsDlgPlugin : public TQObject +class TDEIO_EXPORT KPropsDlgPlugin : public TQObject { Q_OBJECT public: @@ -492,7 +492,7 @@ private: * This plugin displays the name of the file, its size and access times. * @internal */ -class KIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -568,7 +568,7 @@ private: * the owner of a file. * @internal */ -class KIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -654,7 +654,7 @@ private: * Such files are used to represent a program in kicker and konqueror. * @internal */ -class KIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -689,7 +689,7 @@ private: * Type=MimeType * @internal */ -class KIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -719,7 +719,7 @@ private: * Properties plugin for device .desktop files * @internal */ -class KIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -771,7 +771,7 @@ class KPropertiesDesktopBase; * Such files are used to represent a program in kicker and konqueror. * @internal */ -class KIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -822,7 +822,7 @@ private: * @deprecated replaced with KDesktopPropsPlugin */ /// Remove in KDE4 -class KIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -878,7 +878,7 @@ private: * @deprecated replaced with KDesktopPropsPlugin */ /// Remove in KDE4 -class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: diff --git a/kio/kfile/krecentdirs.h b/kio/kfile/krecentdirs.h index e8c6c9419..774655e51 100644 --- a/kio/kfile/krecentdirs.h +++ b/kio/kfile/krecentdirs.h @@ -47,7 +47,7 @@ * a single ':' the file-class is specific to the current application. * If the file-class starts with '::' it is global to all applications. */ -class KIO_EXPORT KRecentDirs +class TDEIO_EXPORT KRecentDirs { public: /** diff --git a/kio/kfile/krecentdocument.h b/kio/kfile/krecentdocument.h index 6bbd3f654..968559968 100644 --- a/kio/kfile/krecentdocument.h +++ b/kio/kfile/krecentdocument.h @@ -47,7 +47,7 @@ * * @author Daniel M. Duley */ -class KIO_EXPORT KRecentDocument +class TDEIO_EXPORT KRecentDocument { public: diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index df9d15790..32c05ec58 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -39,7 +39,7 @@ class KURLBar; * @see KURLBar * @see KURLBarListBox */ -class KIO_EXPORT KURLBarItem : public TQListBoxPixmap +class TDEIO_EXPORT KURLBarItem : public TQListBoxPixmap { public: /** @@ -227,7 +227,7 @@ class KURLBarListBox; * @author Carsten Pfeiffer * @short A URL-bar widget, as used in the KFileDialog */ -class KIO_EXPORT KURLBar : public TQFrame +class TDEIO_EXPORT KURLBar : public TQFrame { Q_OBJECT @@ -490,7 +490,7 @@ class KURLBarToolTip; * * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLBarListBox : public KListBox +class TDEIO_EXPORT KURLBarListBox : public KListBox { Q_OBJECT @@ -564,7 +564,7 @@ class KURLRequester; * * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLBarItemDialog : public KDialogBase +class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kfile/kurlcombobox.h b/kio/kfile/kurlcombobox.h index 0a9451075..a1fd9182d 100644 --- a/kio/kfile/kurlcombobox.h +++ b/kio/kfile/kurlcombobox.h @@ -38,7 +38,7 @@ * @short A combo box showing a number of recent URLs/directories * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLComboBox : public KComboBox +class TDEIO_EXPORT KURLComboBox : public KComboBox { Q_OBJECT TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true) diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h index f5402788a..aa2f6894b 100644 --- a/kio/kfile/kurlrequester.h +++ b/kio/kfile/kurlrequester.h @@ -53,7 +53,7 @@ class TQTimer; * @short A widget to request a filename/url from the user * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLRequester : public TQHBox +class TDEIO_EXPORT KURLRequester : public TQHBox { Q_OBJECT TQ_PROPERTY( TQString url READ url WRITE setURL ) @@ -287,7 +287,7 @@ private: /** * URL requester with a combo box, for use in Designer */ -class KIO_EXPORT KURLComboRequester : public KURLRequester +class TDEIO_EXPORT KURLComboRequester : public KURLRequester { Q_OBJECT public: diff --git a/kio/kfile/kurlrequesterdlg.h b/kio/kfile/kurlrequesterdlg.h index 3f13a844d..07b70d745 100644 --- a/kio/kfile/kurlrequesterdlg.h +++ b/kio/kfile/kurlrequesterdlg.h @@ -35,7 +35,7 @@ class KFileDialog; * @short Simple dialog to enter a filename/url. * @author Wilco Greven */ -class KIO_EXPORT KURLRequesterDlg : public KDialogBase +class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase { Q_OBJECT diff --git a/kio/kio/authinfo.h b/kio/kio/authinfo.h index 130db0857..019311ef8 100644 --- a/kio/kio/authinfo.h +++ b/kio/kio/authinfo.h @@ -48,10 +48,10 @@ namespace TDEIO { * @short A two way messaging class for passing authentication information. * @author Dawit Alemayehu */ -class KIO_EXPORT AuthInfo +class TDEIO_EXPORT AuthInfo { - KIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); - KIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); + TDEIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); + TDEIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); public: /** @@ -225,8 +225,8 @@ private: class AuthInfoPrivate* d; }; -KIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); -KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); +TDEIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); +TDEIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); /** * A Singleton class that provides access to passwords @@ -237,7 +237,7 @@ KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); * @short An interface to the ftp .netrc files * @author Dawit Alemayehu */ -class KIO_EXPORT NetRC +class TDEIO_EXPORT NetRC { public: diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp index e1c8a64e4..f589da957 100644 --- a/kio/kio/chmodjob.cpp +++ b/kio/kio/chmodjob.cpp @@ -227,7 +227,7 @@ void ChmodJob::slotResult( TDEIO::Job * job ) } // antlarr: KDE 4: Make owner and group be const TQString & -KIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask, +TDEIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask, TQString owner, TQString group, bool recursive, bool showProgressInfo ) { diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h index c501add6a..81b614562 100644 --- a/kio/kio/chmodjob.h +++ b/kio/kio/chmodjob.h @@ -35,7 +35,7 @@ namespace TDEIO { * optionally in a recursive manner. * @see TDEIO::chmod() */ - class KIO_EXPORT ChmodJob : public TDEIO::Job + class TDEIO_EXPORT ChmodJob : public TDEIO::Job { Q_OBJECT public: @@ -100,7 +100,7 @@ namespace TDEIO { * @param showProgressInfo true to show progess information * @return The job handling the operation. */ - KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask, + TDEIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask, TQString newOwner, TQString newGroup, bool recursive, bool showProgressInfo = true ); diff --git a/kio/kio/connection.h b/kio/kio/connection.h index 720e4e935..fb0b50e15 100644 --- a/kio/kio/connection.h +++ b/kio/kio/connection.h @@ -35,7 +35,7 @@ class TQSocketNotifier; namespace TDEIO { - struct KIO_EXPORT Task { + struct TDEIO_EXPORT Task { int cmd; TQByteArray data; }; @@ -46,7 +46,7 @@ namespace TDEIO { * It handles a queue of commands to be sent which makes it possible to * queue data before an actual connection has been established. */ - class KIO_EXPORT Connection : public TQObject + class TDEIO_EXPORT Connection : public TQObject { Q_OBJECT public: diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h index 3232f9e00..02eaa6a78 100644 --- a/kio/kio/davjob.h +++ b/kio/kio/davjob.h @@ -54,7 +54,7 @@ namespace TDEIO { * @see TDEIO::davSearch() * @since 3.1 */ - class KIO_EXPORT DavJob : public TransferJob { + class TDEIO_EXPORT DavJob : public TransferJob { Q_OBJECT public: @@ -95,7 +95,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the new DavJob */ - KIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true ); + TDEIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true ); /** * Creates a new DavJob that issues a PROPPATCH command. PROPPATCH sets @@ -107,7 +107,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the new DavJob */ - KIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true ); + TDEIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true ); /** * Creates a new DavJob that issues a SEARCH command. @@ -119,7 +119,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the new DavJob */ - KIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); + TDEIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); } diff --git a/kio/kio/defaultprogress.h b/kio/kio/defaultprogress.h index 68d405b24..44ffff6c4 100644 --- a/kio/kio/defaultprogress.h +++ b/kio/kio/defaultprogress.h @@ -34,7 +34,7 @@ namespace TDEIO { * A default implementation of the progress dialog ProgressBase. * ProgressBase */ -class KIO_EXPORT DefaultProgress : public ProgressBase { +class TDEIO_EXPORT DefaultProgress : public ProgressBase { Q_OBJECT diff --git a/kio/kio/forwardingslavebase.h b/kio/kio/forwardingslavebase.h index 49d01f4e2..f765e38a6 100644 --- a/kio/kio/forwardingslavebase.h +++ b/kio/kio/forwardingslavebase.h @@ -85,7 +85,7 @@ class ForwardingSlaveBasePrivate; * @since 3.4 * @author Kevin Ottens */ -class KIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase +class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase { Q_OBJECT public: diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 36706a6cf..3a7cadb8f 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -42,7 +42,7 @@ #include #endif -KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size ) +TDEIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size ) { if ( size >= 1024 ) return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")"; @@ -50,7 +50,7 @@ KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size ) return convertSize( size ); } -KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size ) +TDEIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size ) { double fsize = size; TQString s; @@ -88,19 +88,19 @@ KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size ) return s; } -KIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize ) +TDEIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize ) { return convertSize(kbSize * 1024); } -KIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size ) +TDEIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size ) { char charbuf[256]; sprintf(charbuf, "%lld", size); return TQString::fromLatin1(charbuf); } -KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize, +TDEIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) { if ( (speed != 0) && (totalSize != 0) ) @@ -109,7 +109,7 @@ KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t tota return 0; } -KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds ) +TDEIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds ) { unsigned int days = seconds / 86400; unsigned int hours = (seconds - (days * 86400)) / 3600; @@ -124,7 +124,7 @@ KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds ) return timeStr; } -KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) +TDEIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) { TQTime remainingTime; @@ -147,7 +147,7 @@ KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO: return remainingTime; } -KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize) +TDEIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize) { TQString text = items == 0 ? i18n( "No Items" ) : i18n( "One Item", "%n Items", items ); text += " - "; @@ -162,7 +162,7 @@ KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, return text; } -KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str ) +TDEIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str ) { TQString str( _str ); @@ -177,7 +177,7 @@ KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str ) return str; } -KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str ) +TDEIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str ) { TQString str; @@ -205,12 +205,12 @@ KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str ) return str; } -KIO_EXPORT TQString TDEIO::Job::errorString() const +TDEIO_EXPORT TQString TDEIO::Job::errorString() const { return TDEIO::buildErrorString(m_error, m_errorText); } -KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText) +TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText) { TQString result; @@ -419,7 +419,7 @@ KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &error return result; } -KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) { +TDEIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) { switch (cmd) { case CMD_CONNECT: return i18n("Opening connections is not supported with the protocol %1." ).arg(protocol); @@ -458,7 +458,7 @@ KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol }/*end switch*/ } -KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/, +TDEIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/, int method /*= -1*/ ) const { TQString errorName, techName, description, ret2; @@ -508,7 +508,7 @@ KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= return ret; } -KIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText, +TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText, const KURL *reqUrl /*= 0L*/, int /*method = -1*/ ) { TQString url, host, protocol, datetime, domain, path, dir, filename; diff --git a/kio/kio/global.h b/kio/kio/global.h index 0091c4801..44b9df616 100644 --- a/kio/kio/global.h +++ b/kio/kio/global.h @@ -44,7 +44,7 @@ namespace TDEIO * @param size size in bytes * @return converted size as a string - e.g. 123.4 kB , 12.0 MB */ - KIO_EXPORT TQString convertSize( TDEIO::filesize_t size ); + TDEIO_EXPORT TQString convertSize( TDEIO::filesize_t size ); /** * Converts @p size from bytes to a string representation with includes @@ -53,7 +53,7 @@ namespace TDEIO * @param size size in bytes * @return converted size as a string - e.g. 1.4 KB (1495 B), 45 B */ - KIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size ); + TDEIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size ); /** * Converts a size to a string representation * Not unlike TQString::number(...) @@ -61,7 +61,7 @@ namespace TDEIO * @param size size in bytes * @return converted size as a string - e.g. 123456789 */ - KIO_EXPORT TQString number( TDEIO::filesize_t size ); + TDEIO_EXPORT TQString number( TDEIO::filesize_t size ); /** * Converts size from kilo-bytes to the string representation. @@ -69,7 +69,7 @@ namespace TDEIO * @param kbSize size in kilo-bytes * @return converted size as a string - e.g. 123.4 kB , 12.0 MB */ - KIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize ); + TDEIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize ); /** * Calculates remaining time in seconds from total size, processed size and speed. @@ -81,7 +81,7 @@ namespace TDEIO * * @since 3.4 */ - KIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize, + TDEIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ); /** @@ -92,7 +92,7 @@ namespace TDEIO * * @since 3.4 */ - KIO_EXPORT TQString convertSeconds( unsigned int seconds ); + TDEIO_EXPORT TQString convertSeconds( unsigned int seconds ); /** * Calculates remaining time from total size, processed size and speed. @@ -103,7 +103,7 @@ namespace TDEIO * @param speed speed in bytes per second * @return calculated remaining time */ - KIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED; + TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED; /** * Helper for showing information about a set of files and directories @@ -114,7 +114,7 @@ namespace TDEIO * @param showSize whether to show the size in the result * @return the summary string */ - KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize); + TDEIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize); /** * Encodes (from the text displayed to the real filename) @@ -123,14 +123,14 @@ namespace TDEIO * @param str the file name to encode * @return the encoded file name */ - KIO_EXPORT TQString encodeFileName( const TQString & str ); + TDEIO_EXPORT TQString encodeFileName( const TQString & str ); /** * Decodes (from the filename to the text displayed) * This translates %2[fF] into / and %% into % * @param str the file name to decode * @return the decoded file name */ - KIO_EXPORT TQString decodeFileName( const TQString & str ); + TDEIO_EXPORT TQString decodeFileName( const TQString & str ); /** * Commands that can be invoked by a job. @@ -258,7 +258,7 @@ namespace TDEIO * @param errorText the additional error text * @return the created error string */ - KIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText); + TDEIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText); /** * Returns a translated html error message for @p errorCode using the @@ -270,7 +270,7 @@ namespace TDEIO * @param method the ioslave method * @return the created error string */ - KIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText, + TDEIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText, const KURL *reqUrl = 0L, int method = -1 ); /** @@ -289,7 +289,7 @@ namespace TDEIO * @li TQStringList causes - a list of possible causes of the error * @li TQStringList solutions - a liso of solutions for the error */ - KIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText, + TDEIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText, const KURL *reqUrl = 0L, int method = -1 ); /** @@ -300,7 +300,7 @@ namespace TDEIO * @see enum Command * @since 3.2 */ - KIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd); + TDEIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd); /** * Constants used to specify the type of a KUDSAtom. @@ -401,7 +401,7 @@ namespace TDEIO * @return the cache control value * @see getCacheControlString() */ - KIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl); + TDEIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl); /** * Returns a string representation of the given cache control method. @@ -410,14 +410,14 @@ namespace TDEIO * @return the string representation * @see parseCacheControl() */ - KIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl); + TDEIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl); /** * Returns the mount point where @p device is mounted * right now. This means, it has to be mounted, not just * defined in fstab. */ - KIO_EXPORT TQString findDeviceMountPoint( const TQString& device ); + TDEIO_EXPORT TQString findDeviceMountPoint( const TQString& device ); /** * Returns the mount point on which resides @p filename. @@ -426,7 +426,7 @@ namespace TDEIO * @param filename the file name to check * @return the mount point of the given @p filename */ - KIO_EXPORT TQString findPathMountPoint( const TQString & filename ); + TDEIO_EXPORT TQString findPathMountPoint( const TQString & filename ); /** * Checks if the path belongs to a filesystem that is probably @@ -435,7 +435,7 @@ namespace TDEIO * @param filename the file name to check * @return true if the filesystem is probably slow */ - KIO_EXPORT bool probably_slow_mounted(const TQString& filename); + TDEIO_EXPORT bool probably_slow_mounted(const TQString& filename); /** * Checks if the path belongs to a filesystem that is manually @@ -443,7 +443,7 @@ namespace TDEIO * @param filename the file name to check * @return true if the filesystem is manually mounted */ - KIO_EXPORT bool manually_mounted(const TQString& filename); + TDEIO_EXPORT bool manually_mounted(const TQString& filename); enum FileSystemFlag { SupportsChmod, SupportsChown, SupportsUTime, SupportsSymlinks, CaseInsensitive }; @@ -467,7 +467,7 @@ namespace TDEIO * "foo" and "FOO" as being the same file (true for msdos systems) * */ - KIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag); + TDEIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag); /************ @@ -483,7 +483,7 @@ namespace TDEIO * * Each atom contains a specific bit of information for the file */ -class KIO_EXPORT UDSAtom +class TDEIO_EXPORT UDSAtom { public: /** @@ -512,7 +512,7 @@ typedef TQValueListConstIterator UDSEntryListConstIterator; /** * MetaData is a simple map of key/value strings. */ -class KIO_EXPORT MetaData : public TQMap +class TDEIO_EXPORT MetaData : public TQMap { public: /** diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 01bb2c60d..d72eae574 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -2307,7 +2307,7 @@ void CopyJob::slotStart() } // For unit test purposes -KIO_EXPORT bool kio_resolve_local_urls = true; +TDEIO_EXPORT bool kio_resolve_local_urls = true; void CopyJob::slotResultStating( Job *job ) { diff --git a/kio/kio/job.h b/kio/kio/job.h index 03985b637..f5254df39 100644 --- a/kio/kio/job.h +++ b/kio/kio/job.h @@ -38,7 +38,7 @@ namespace TDEIO { * directory (unix-style), -1 for default permissions. * @return A pointer to the job handling the operation. */ - KIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 ); + TDEIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 ); /** * Removes a single directory. @@ -50,7 +50,7 @@ namespace TDEIO { * @param url The URL of the directory to remove. * @return A pointer to the job handling the operation. */ - KIO_EXPORT SimpleJob * rmdir( const KURL& url ); + TDEIO_EXPORT SimpleJob * rmdir( const KURL& url ); /** * Changes permissions on a file or directory. @@ -61,7 +61,7 @@ namespace TDEIO { * @param permissions The permissions to set. * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions ); + TDEIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions ); /** * Rename a file or directory. @@ -74,7 +74,7 @@ namespace TDEIO { * @param overwrite whether to automatically overwrite if the dest exists * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite ); + TDEIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite ); /** * Create or move a symlink. @@ -87,7 +87,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true ); /** * Execute any command that is specific to one slave (protocol). @@ -101,7 +101,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true ); /** * Mount filesystem. @@ -115,7 +115,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true ); /** * Unmount filesystem. @@ -126,7 +126,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true ); /** * Retrieve local URL if available @@ -134,7 +134,7 @@ namespace TDEIO { * @param remoteURL the remote URL to get the local URL for * @return the job handling the operation. */ - KIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl ); + TDEIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl ); /** * HTTP cache update @@ -145,7 +145,7 @@ namespace TDEIO { * supposed to expire. * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate); + TDEIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate); /** * Find all details for one file or directory. @@ -154,7 +154,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true ); + TDEIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true ); /** * Find all details for one file or directory. * This version of the call includes two additional booleans, @p sideIsSource and @p details. @@ -182,7 +182,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true ); + TDEIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true ); /** * Get (a.k.a. read). @@ -193,7 +193,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true ); + TDEIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true ); /** * Put (a.k.a. write) @@ -207,7 +207,7 @@ namespace TDEIO { * @return the job handling the operation. * @see multi_get() */ - KIO_EXPORT TransferJob *put( const KURL& url, int permissions, + TDEIO_EXPORT TransferJob *put( const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo = true ); /** @@ -238,7 +238,7 @@ namespace TDEIO { * @param showProgressInfo true to display * @return the job handling the operation. */ - KIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData, + TDEIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo = true ); /** @@ -251,7 +251,7 @@ namespace TDEIO { * @return the job handling the operation. * @since 3.3 */ - KIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true ); + TDEIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true ); /** * Put (a.k.a. write) data from a single TQByteArray. @@ -267,7 +267,7 @@ namespace TDEIO { * @return the job handling the operation. * @since 3.3 */ - KIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions, + TDEIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo = true ); /** @@ -280,7 +280,7 @@ namespace TDEIO { * @return the job handling the operation. * @see get() */ - KIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData); + TDEIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData); /** * Find mimetype for one file or directory. @@ -289,7 +289,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT MimetypeJob * mimetype( const KURL& url, + TDEIO_EXPORT MimetypeJob * mimetype( const KURL& url, bool showProgressInfo = true ); /** @@ -308,7 +308,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1, + TDEIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1, bool overwrite=false, bool resume=false, bool showProgressInfo = true); @@ -327,7 +327,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1, + TDEIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1, bool overwrite=false, bool resume=false, bool showProgressInfo = true); @@ -338,7 +338,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true); + TDEIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true); /** * List the contents of @p url, which is assumed to be a directory. @@ -352,7 +352,7 @@ namespace TDEIO { * files/dirs (whose names start with dot) * @return the job handling the operation. */ - KIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true, + TDEIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true, bool includeHidden = true ); /** @@ -368,7 +368,7 @@ namespace TDEIO { * files/dirs (whose names start with dot) * @return the job handling the operation. */ - KIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true, + TDEIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true, bool includeHidden = true ); /** @@ -384,7 +384,7 @@ namespace TDEIO { * @return the job handling the operation * @see copyAs() */ - KIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Copy a file or directory @p src into the destination @p dest, @@ -399,7 +399,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Copy a list of file/dirs @p src into a destination directory @p dest. @@ -409,7 +409,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); /** * Moves a file or directory @p src to the given destination @p dest. @@ -421,7 +421,7 @@ namespace TDEIO { * @see copy() * @see moveAs() */ - KIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Moves a file or directory @p src to the given destination @p dest. Unlike move() * this operation will fail when the directory already exists. @@ -432,7 +432,7 @@ namespace TDEIO { * @return the job handling the operation * @see copyAs() */ - KIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Moves a list of files or directories @p src to the given destination @p dest. * @@ -442,7 +442,7 @@ namespace TDEIO { * @return the job handling the operation * @see copy() */ - KIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); /** * Create a link. @@ -454,7 +454,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true ); /** * Create several links @@ -467,7 +467,7 @@ namespace TDEIO { * @return the job handling the operation * @see link() */ - KIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true ); /** * Create a link. Unlike link() this operation will fail when the directory already @@ -482,7 +482,7 @@ namespace TDEIO { * @see link () * @see copyAs() */ - KIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Trash a file or directory. @@ -494,7 +494,7 @@ namespace TDEIO { * @return the job handling the operation * @since 3.4 */ - KIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true ); /** * Trash a list of files or directories. @@ -505,7 +505,7 @@ namespace TDEIO { * @return the job handling the operation * @since 3.4 */ - KIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true ); /** * Delete a file or directory. @@ -515,7 +515,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true ); + TDEIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true ); /** * Deletes a list of files or directories. @@ -525,7 +525,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true ); + TDEIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true ); } #endif diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 9858b1ce1..3438406fa 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -65,7 +65,7 @@ namespace TDEIO { * @see TDEIO::Scheduler * @see TDEIO::Slave */ - class KIO_EXPORT Job : public TQObject { + class TDEIO_EXPORT Job : public TQObject { Q_OBJECT protected: @@ -525,7 +525,7 @@ namespace TDEIO { * Other jobs are high-level jobs (CopyJob, DeleteJob, FileCopyJob...) * that manage subjobs but aren't scheduled directly. */ - class KIO_EXPORT SimpleJob : public TDEIO::Job { + class TDEIO_EXPORT SimpleJob : public TDEIO::Job { Q_OBJECT public: @@ -685,7 +685,7 @@ namespace TDEIO { * A KIO job that retrieves information about a file or directory. * @see TDEIO::stat() */ - class KIO_EXPORT StatJob : public SimpleJob { + class TDEIO_EXPORT StatJob : public SimpleJob { Q_OBJECT @@ -777,7 +777,7 @@ namespace TDEIO { * @see TDEIO::mkdir() * @since 3.3 */ - class KIO_EXPORT MkdirJob : public SimpleJob { + class TDEIO_EXPORT MkdirJob : public SimpleJob { Q_OBJECT @@ -836,7 +836,7 @@ namespace TDEIO { * @internal * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy()) */ - class KIO_EXPORT DirectCopyJob : public SimpleJob { + class TDEIO_EXPORT DirectCopyJob : public SimpleJob { Q_OBJECT public: @@ -872,7 +872,7 @@ namespace TDEIO { * If data coming from the slave can not be handled, the * reading of data from the slave should be suspended. */ - class KIO_EXPORT TransferJob : public SimpleJob { + class TDEIO_EXPORT TransferJob : public SimpleJob { Q_OBJECT public: @@ -1072,7 +1072,7 @@ namespace TDEIO { * * @since 3.3 */ - class KIO_EXPORT StoredTransferJob : public TDEIO::TransferJob { + class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob { Q_OBJECT public: @@ -1117,7 +1117,7 @@ namespace TDEIO { * but use TDEIO::multi_get() instead. * @see TDEIO::multi_get() */ - class KIO_EXPORT MultiGetJob : public TransferJob { + class TDEIO_EXPORT MultiGetJob : public TransferJob { Q_OBJECT public: @@ -1205,7 +1205,7 @@ namespace TDEIO { * but use TDEIO::mimetype() instead. * @see TDEIO::mimetype() */ - class KIO_EXPORT MimetypeJob : public TransferJob { + class TDEIO_EXPORT MimetypeJob : public TransferJob { Q_OBJECT public: @@ -1247,7 +1247,7 @@ namespace TDEIO { * @see TDEIO::file_copy() * @see TDEIO::file_move() */ - class KIO_EXPORT FileCopyJob : public Job { + class TDEIO_EXPORT FileCopyJob : public Job { Q_OBJECT public: @@ -1389,7 +1389,7 @@ namespace TDEIO { * @see TDEIO::listRecursive() * @see TDEIO::listDir() */ - class KIO_EXPORT ListJob : public SimpleJob { + class TDEIO_EXPORT ListJob : public SimpleJob { Q_OBJECT public: @@ -1481,7 +1481,7 @@ namespace TDEIO { }; /// @internal - struct KIO_EXPORT CopyInfo + struct TDEIO_EXPORT CopyInfo { KURL uSource; KURL uDest; @@ -1505,7 +1505,7 @@ namespace TDEIO { * @see TDEIO::link() * @see TDEIO::linkAs() */ - class KIO_EXPORT CopyJob : public Job { + class TDEIO_EXPORT CopyJob : public Job { Q_OBJECT public: @@ -1760,7 +1760,7 @@ namespace TDEIO { * * @see TDEIO::del() */ - class KIO_EXPORT DeleteJob : public Job { + class TDEIO_EXPORT DeleteJob : public Job { Q_OBJECT public: @@ -1863,7 +1863,7 @@ namespace TDEIO { * @see TDEIO::localURL() * @since R14.0.0 */ - class KIO_EXPORT LocalURLJob : public SimpleJob { + class TDEIO_EXPORT LocalURLJob : public SimpleJob { Q_OBJECT diff --git a/kio/kio/kacl.h b/kio/kio/kacl.h index 53bc762b0..1f60fde60 100644 --- a/kio/kio/kacl.h +++ b/kio/kio/kacl.h @@ -39,7 +39,7 @@ typedef TQValueListConstIterator ACLGroupPermissionsConstIt * @short a POSIX ACL encapsulation * @author Till Adam */ -class KIO_EXPORT KACL +class TDEIO_EXPORT KACL { public: /** @@ -197,11 +197,11 @@ protected: private: class KACLPrivate; KACLPrivate * d; - KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); - KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a ); + TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); + TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a ); }; -KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); -KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a ); +TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); +TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a ); #endif diff --git a/kio/kio/kar.h b/kio/kio/kar.h index 1b8f2cef2..83d94e75c 100644 --- a/kio/kio/kar.h +++ b/kio/kio/kar.h @@ -35,7 +35,7 @@ * @author Laurence Anderson * @since 3.1 */ -class KIO_EXPORT KAr : public KArchive +class TDEIO_EXPORT KAr : public KArchive { public: /** diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h index 6f0b57cbc..840c560b7 100644 --- a/kio/kio/karchive.h +++ b/kio/kio/karchive.h @@ -39,7 +39,7 @@ class KArchiveFile; * @short generic class for reading/writing archives * @author David Faure */ -class KIO_EXPORT KArchive +class TDEIO_EXPORT KArchive { protected: /** @@ -392,7 +392,7 @@ private: * @see KArchiveFile * @see KArchiveDirectory */ -class KIO_EXPORT KArchiveEntry +class TDEIO_EXPORT KArchiveEntry { public: /** @@ -487,7 +487,7 @@ private: * @see KArchive * @see KArchiveDirectory */ -class KIO_EXPORT KArchiveFile : public KArchiveEntry +class TDEIO_EXPORT KArchiveFile : public KArchiveEntry { public: /** @@ -570,7 +570,7 @@ private: * @see KArchive * @see KArchiveFile */ -class KIO_EXPORT KArchiveDirectory : public KArchiveEntry +class TDEIO_EXPORT KArchiveDirectory : public KArchiveEntry { public: /** diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h index 68eecdbbd..203c037d9 100644 --- a/kio/kio/kautomount.h +++ b/kio/kio/kautomount.h @@ -42,7 +42,7 @@ class Job; * * @short This class implements synchronous mounting of devices. */ -class KIO_EXPORT KAutoMount : public TQObject +class TDEIO_EXPORT KAutoMount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; @@ -87,7 +87,7 @@ private: * * @short This class implements synchronous unmounting of devices, */ -class KIO_EXPORT KAutoUnmount : public TQObject +class TDEIO_EXPORT KAutoUnmount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h index 46005ada3..1258767fc 100644 --- a/kio/kio/kdatatool.h +++ b/kio/kio/kdatatool.h @@ -44,7 +44,7 @@ class TDEInstance; * described by the service. * @see KDataTool */ -class KIO_EXPORT KDataToolInfo +class TDEIO_EXPORT KDataToolInfo { public: /** @@ -191,7 +191,7 @@ private: * The slot defined for step 2 is called when the action is activated, and * that's where the tool should be created and run. */ -class KIO_EXPORT KDataToolAction : public KAction +class TDEIO_EXPORT KDataToolAction : public KAction { Q_OBJECT @@ -251,7 +251,7 @@ private: * @see KDataToolAction, and for activating a tool, passing it the data * (and possibly getting modified data from it). */ -class KIO_EXPORT KDataTool : public TQObject +class TDEIO_EXPORT KDataTool : public TQObject { Q_OBJECT diff --git a/kio/kio/kdcopservicestarter.h b/kio/kio/kdcopservicestarter.h index b267476e7..f70f0173e 100644 --- a/kio/kio/kdcopservicestarter.h +++ b/kio/kio/kdcopservicestarter.h @@ -31,7 +31,7 @@ class TQCString; * also be reimplemented by specific applications to provide dlopened in-process DCOP objects. * @author David Faure */ -class KIO_EXPORT KDCOPServiceStarter { +class TDEIO_EXPORT KDCOPServiceStarter { friend class KStaticDeleter; public: diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h index 87aa6c694..2688fcd9c 100644 --- a/kio/kio/kdirlister.h +++ b/kio/kio/kdirlister.h @@ -52,7 +52,7 @@ namespace TDEIO { class Job; class ListJob; } * @short Helper class for the kiojob used to list and update a directory. * @author Michael Brade */ -class KIO_EXPORT KDirLister : public TQObject +class TDEIO_EXPORT KDirLister : public TQObject { class KDirListerPrivate; friend class KDirListerPrivate; diff --git a/kio/kio/kdirnotify.h b/kio/kio/kdirnotify.h index 2082569a1..14d864609 100644 --- a/kio/kio/kdirnotify.h +++ b/kio/kio/kdirnotify.h @@ -29,7 +29,7 @@ * The information comes from the konqueror/kdesktop instance where the * operation was done, and can interest KDirListers, bookmark handlers, etc. */ -class KIO_EXPORT KDirNotify : public DCOPObject +class TDEIO_EXPORT KDirNotify : public DCOPObject { K_DCOP protected: diff --git a/kio/kio/kdirnotify_stub.h b/kio/kio/kdirnotify_stub.h index a807ecf82..56ab168c4 100644 --- a/kio/kio/kdirnotify_stub.h +++ b/kio/kio/kdirnotify_stub.h @@ -14,7 +14,7 @@ #include -class KIO_EXPORT KDirNotify_stub : virtual public DCOPStub +class TDEIO_EXPORT KDirNotify_stub : virtual public DCOPStub { public: KDirNotify_stub( const TQCString& app, const TQCString& id ); diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h index ac33a6ed5..4abaa302e 100644 --- a/kio/kio/kdirwatch.h +++ b/kio/kio/kdirwatch.h @@ -60,7 +60,7 @@ class KDirWatchPrivate; * @short Class for watching directory and file changes. * @author Sven Radej */ -class KIO_EXPORT KDirWatch : public TQObject +class TDEIO_EXPORT KDirWatch : public TQObject { Q_OBJECT diff --git a/kio/kio/kemailsettings.h b/kio/kio/kemailsettings.h index 9d35675c6..0ade4520e 100644 --- a/kio/kio/kemailsettings.h +++ b/kio/kio/kemailsettings.h @@ -43,7 +43,7 @@ class KEMailSettingsPrivate; * * @author Alex Zepeda zipzippy@sonic.net **/ -class KIO_EXPORT KEMailSettings { +class TDEIO_EXPORT KEMailSettings { public: /** * The list of settings that I thought of when I wrote this diff --git a/kio/kio/kfilefilter.h b/kio/kio/kfilefilter.h index b17d2fe74..2891e800e 100644 --- a/kio/kio/kfilefilter.h +++ b/kio/kio/kfilefilter.h @@ -38,7 +38,7 @@ class KFileItem; * reimplement passesFilter(). * @short Base class for file filters. */ -class KIO_EXPORT KFileFilter +class TDEIO_EXPORT KFileFilter { public: /** @@ -56,7 +56,7 @@ protected: * by mime type and by mode. * @short A simple file filter. */ -class KIO_EXPORT KSimpleFileFilter : public KFileFilter +class TDEIO_EXPORT KSimpleFileFilter : public KFileFilter { public: /** diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h index 5e75ac16f..0fcba9f4a 100644 --- a/kio/kio/kfileitem.h +++ b/kio/kio/kfileitem.h @@ -38,7 +38,7 @@ * (UDSEntry isn't very friendly to use). * It includes many file attributes such as mimetype, icon, text, mode, link... */ -class KIO_EXPORT KFileItem +class TDEIO_EXPORT KFileItem { public: enum { Unknown = (mode_t) - 1 }; @@ -650,8 +650,8 @@ protected: private: class KFileItemPrivate; KFileItemPrivate * d; - KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); - KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); + TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); + TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); }; /** @@ -664,8 +664,8 @@ typedef TQPtrList KFileItemList; */ typedef TQPtrListIterator KFileItemListIterator; -KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); -KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); +TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); +TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); #endif diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index 0ccbb577b..85fb1a37f 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -1705,7 +1705,7 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle first a bool that says if the items is valid, and if yes, all the elements of the Data */ -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item ) +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item ) { KFileMetaInfoItem::Data* d = item.d; @@ -1725,7 +1725,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& i } -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item ) +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item ) { bool isValid; s >> isValid; @@ -1758,7 +1758,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item ) // serialization of a KFileMetaInfoGroup // we serialize the name of the mimetype here instead of the mimetype info // on the other side, we can simply use this to ask the provider for the info -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group ) +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group ) { KFileMetaInfoGroup::Data* d = group.d; @@ -1775,7 +1775,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& return s; } -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group ) +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group ) { TQString mimeType; bool isValid; @@ -1812,7 +1812,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group // serialization of a KFileMetaInfo object // we serialize the name of the mimetype here instead of the mimetype info // on the other side, we can simply use this to ask the provider for the info -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info ) +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info ) { KFileMetaInfo::Data* d = info.d; @@ -1830,7 +1830,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info return s; } -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info ) +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info ) { TQString mimeType; bool isValid; diff --git a/kio/kio/kfilemetainfo.h b/kio/kio/kfilemetainfo.h index 63a08c277..ea843a5f3 100644 --- a/kio/kio/kfilemetainfo.h +++ b/kio/kio/kfilemetainfo.h @@ -47,7 +47,7 @@ class KFileMetaInfoGroup; * @author Rolf Magnus * @author Carsten Pfeiffer */ -class KIO_EXPORT KFileMimeTypeInfo +class TDEIO_EXPORT KFileMimeTypeInfo { // the plugin needs to be a friend because it puts the data into the object, // and it should be the only one allowed to do this. @@ -135,7 +135,7 @@ public: * It contains, among other things, the information about the group's name * and a list of supported items. */ - class KIO_EXPORT GroupInfo + class TDEIO_EXPORT GroupInfo { friend class KFilePlugin; @@ -247,7 +247,7 @@ public: * It contains every information about a KFileMetaInfoItem that this * item has in common for each file of a specific mimetype. **/ - class KIO_EXPORT ItemInfo + class TDEIO_EXPORT ItemInfo { friend class KFilePlugin; friend class GroupInfo; @@ -493,7 +493,7 @@ protected: * This is one item of the meta information about a file (see * KFileMetaInfo). */ -class KIO_EXPORT KFileMetaInfoItem +class TDEIO_EXPORT KFileMetaInfoItem { public: class Data; @@ -660,9 +660,9 @@ public: */ bool isValid() const; - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); - KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); + TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); friend class KFileMetaInfoGroup; protected: @@ -681,12 +681,12 @@ protected: * This is one group of meta information items about a file (see * KFileMetaInfo). */ -class KIO_EXPORT KFileMetaInfoGroup +class TDEIO_EXPORT KFileMetaInfoGroup { friend class KFilePlugin; friend class KFileMetaInfo; - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); - KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); + TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); public: class Data; @@ -923,7 +923,7 @@ protected: * The groups and the What enum are not yet supported, but already added to * the interface so that adding support doesn't break compatibility. */ -class KIO_EXPORT KFileMetaInfo +class TDEIO_EXPORT KFileMetaInfo { public: typedef KFileMimeTypeInfo::Hint Hint; @@ -1223,8 +1223,8 @@ public: */ KURL url() const; - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); - KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); + TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); friend class KFilePlugin; protected: @@ -1391,7 +1391,7 @@ private: * PreferredItems=Items,Size * @endcode **/ -class KIO_EXPORT KFilePlugin : public TQObject +class TDEIO_EXPORT KFilePlugin : public TQObject { Q_OBJECT @@ -1643,7 +1643,7 @@ private: * supported and which groups and items are provided for it, you can ask * the KFileMetainfoProvider for it. **/ -class KIO_EXPORT KFileMetaInfoProvider: private QObject +class TDEIO_EXPORT KFileMetaInfoProvider: private QObject { friend class KFilePlugin; @@ -1725,14 +1725,14 @@ private: }; -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); #endif // KILEMETAINFO_H diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h index e46d0903b..ff473c122 100644 --- a/kio/kio/kfileshare.h +++ b/kio/kio/kfileshare.h @@ -48,7 +48,7 @@ protected slots: // this is why this class needs to be in the .h * (communication with the backend) * @since 3.1 */ -class KIO_EXPORT KFileShare +class TDEIO_EXPORT KFileShare { diff --git a/kio/kio/kfilterbase.h b/kio/kio/kfilterbase.h index a9d143b6c..25613c101 100644 --- a/kio/kio/kfilterbase.h +++ b/kio/kio/kfilterbase.h @@ -35,7 +35,7 @@ class TQIODevice; * such as gzip and bzip2. It's pretty much internal. * Don't use directly, use KFilterDev instead. */ -class KIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create +class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create { Q_OBJECT public: diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index 2df49f2cc..8dd0999a9 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -33,7 +33,7 @@ class KFilterBase; * * @author David Faure */ -class KIO_EXPORT KFilterDev : public TQIODevice +class TDEIO_EXPORT KFilterDev : public TQIODevice { public: /** diff --git a/kio/kio/kimageio.h b/kio/kio/kimageio.h index 3c14fb54d..671fb5f61 100644 --- a/kio/kio/kimageio.h +++ b/kio/kio/kimageio.h @@ -66,7 +66,7 @@ * @see KImageIO, TQPixmap, TQImage, QImageIO * @author Sirtaj Singh Kang */ -class KIO_EXPORT KImageIO +class TDEIO_EXPORT KImageIO { public: /** diff --git a/kio/kio/kimageiofactory.h b/kio/kio/kimageiofactory.h index 2ffe58e60..603ef2c0e 100644 --- a/kio/kio/kimageiofactory.h +++ b/kio/kio/kimageiofactory.h @@ -15,7 +15,7 @@ class KImageIOFormat; class KImageIOFormatList; /** \internal */ -class KIO_EXPORT KImageIOFormat : public KSycocaEntry +class TDEIO_EXPORT KImageIOFormat : public KSycocaEntry { K_SYCOCATYPE( KST_KImageIOFormat, KSycocaEntry ) @@ -76,7 +76,7 @@ protected: }; /** \internal */ -class KIO_EXPORT KImageIOFormatList : public KImageIOFormat::List +class TDEIO_EXPORT KImageIOFormatList : public KImageIOFormat::List { public: KImageIOFormatList() { } @@ -84,7 +84,7 @@ public: /** \internal */ -class KIO_EXPORT KImageIOFactory : public KSycocaFactory +class TDEIO_EXPORT KImageIOFactory : public KSycocaFactory { friend class KImageIO; K_SYCOCAFACTORY( KST_KImageIO ) diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index e2946d37a..602ba45a0 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -28,7 +28,7 @@ * @author David Faure * @since 3.1 */ -class KIO_EXPORT KLimitedIODevice : public TQIODevice +class TDEIO_EXPORT KLimitedIODevice : public TQIODevice { public: /** diff --git a/kio/kio/kmessageboxwrapper.h b/kio/kio/kmessageboxwrapper.h index 356d98042..3590b5e89 100644 --- a/kio/kio/kmessageboxwrapper.h +++ b/kio/kio/kmessageboxwrapper.h @@ -27,7 +27,7 @@ * Allows KIO classes to display dialog boxes with the correct * theme/style even in non-GUI apps like kded and kfmclient */ -class KIO_EXPORT KMessageBoxWrapper : public KMessageBox +class TDEIO_EXPORT KMessageBoxWrapper : public KMessageBox { public: static void error(TQWidget *parent, diff --git a/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h index 49fb300ad..f5430a219 100644 --- a/kio/kio/kmimemagic.h +++ b/kio/kio/kmimemagic.h @@ -43,7 +43,7 @@ class KMimeMagic; // see below (read this one first) * It contains the mimetype and the encoding of * the file or buffer read. */ -class KIO_EXPORT_DEPRECATED KMimeMagicResult +class TDEIO_EXPORT_DEPRECATED KMimeMagicResult { public: KMimeMagicResult() { m_iAccuracy = 100; } @@ -98,7 +98,7 @@ protected: * * The result is contained in the class KMimeMagicResult. */ -class KIO_EXPORT_DEPRECATED KMimeMagic +class TDEIO_EXPORT_DEPRECATED KMimeMagic { public: /** diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h index 1d53f3713..8302fa8da 100644 --- a/kio/kio/kmimetype.h +++ b/kio/kio/kmimetype.h @@ -44,7 +44,7 @@ class KSimpleConfig; * * @see KServiceType */ -class KIO_EXPORT KMimeType : public KServiceType +class TDEIO_EXPORT KMimeType : public KServiceType { K_SYCOCATYPE( KST_KMimeType, KServiceType ) @@ -474,7 +474,7 @@ protected: * Folder mime type. Handles locked folders, for instance. * @short Mimetype for a folder (inode/directory) */ -class KIO_EXPORT KFolderType : public KMimeType +class TDEIO_EXPORT KFolderType : public KMimeType { K_SYCOCATYPE( KST_KFolderType, KMimeType ) @@ -503,7 +503,7 @@ protected: * Handles mount/umount icon, and user-defined properties. * @short Mimetype for a .desktop file */ -class KIO_EXPORT KDEDesktopMimeType : public KMimeType +class TDEIO_EXPORT KDEDesktopMimeType : public KMimeType { K_SYCOCATYPE( KST_KDEDesktopMimeType, KMimeType ) @@ -619,7 +619,7 @@ protected: * The mime type for executable files. * @short MimeType for any executable, like /bin/ls */ -class KIO_EXPORT KExecMimeType : public KMimeType +class TDEIO_EXPORT KExecMimeType : public KMimeType { K_SYCOCATYPE( KST_KExecMimeType, KMimeType ) diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h index 355eeb707..16ec052f5 100644 --- a/kio/kio/kmimetypechooser.h +++ b/kio/kio/kmimetypechooser.h @@ -31,7 +31,7 @@ * * @author Anders Lund (anders at alweb dk), jan 23, 2002 */ -class KIO_EXPORT KMimeTypeChooser : public TQVBox +class TDEIO_EXPORT KMimeTypeChooser : public TQVBox { Q_OBJECT @@ -128,7 +128,7 @@ class KIO_EXPORT KMimeTypeChooser : public TQVBox * * @author Anders Lund (anders at alweb dk) dec 19, 2001 */ -class KIO_EXPORT KMimeTypeChooserDialog : public KDialogBase +class TDEIO_EXPORT KMimeTypeChooserDialog : public KDialogBase { public: /** diff --git a/kio/kio/kmimetyperesolver.h b/kio/kio/kmimetyperesolver.h index fdbbb1e5b..c8828a0da 100644 --- a/kio/kio/kmimetyperesolver.h +++ b/kio/kio/kmimetyperesolver.h @@ -31,7 +31,7 @@ * A baseclass for KMimeTypeResolver, with the interface, * KMimeTypeResolverHelper uses. */ -class KIO_EXPORT KMimeTypeResolverBase +class TDEIO_EXPORT KMimeTypeResolverBase { public: virtual void slotViewportAdjusted() = 0; @@ -46,7 +46,7 @@ protected: * itself. So an object of this class is used to handle signals, slots etc. * and forwards them to the KMimeTypeResolver instance. */ -class KIO_EXPORT KMimeTypeResolverHelper : public TQObject +class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject { Q_OBJECT diff --git a/kio/kio/knfsshare.h b/kio/kio/knfsshare.h index fd6587600..64cd28dcf 100644 --- a/kio/kio/knfsshare.h +++ b/kio/kio/knfsshare.h @@ -32,7 +32,7 @@ class KNFSSharePrivate; * It parses the /etc/exports file to get its information. * Singleton class, call instance() to get an instance. */ -class KIO_EXPORT KNFSShare : public TQObject +class TDEIO_EXPORT KNFSShare : public TQObject { Q_OBJECT public: diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp index f297907e0..9523b70cb 100644 --- a/kio/kio/kprotocolinfo.cpp +++ b/kio/kio/kprotocolinfo.cpp @@ -18,8 +18,8 @@ */ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) -#undef KIO_EXPORT -#define KIO_EXPORT KDE_EXPORT +#undef TDEIO_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #endif #include "kprotocolinfo.h" diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h index a3c579034..8ce7ce500 100644 --- a/kio/kio/kprotocolinfo.h +++ b/kio/kio/kprotocolinfo.h @@ -41,7 +41,7 @@ * * @author Torben Weis */ -class KIO_EXPORT KProtocolInfo : public KSycocaEntry +class TDEIO_EXPORT KProtocolInfo : public KSycocaEntry { friend class KProtocolInfoFactory; K_SYCOCATYPE( KST_KProtocolInfo, KSycocaEntry ) @@ -682,7 +682,7 @@ private: KProtocolInfoPrivate* d; }; -KIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field ); -KIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field ); +TDEIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field ); +TDEIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field ); #endif diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h index e1d425ebd..f7e27164b 100644 --- a/kio/kio/kprotocolmanager.h +++ b/kio/kio/kprotocolmanager.h @@ -51,7 +51,7 @@ class TDEConfig; * @author Dawit Alemayehu * @see KPAC */ -class KIO_EXPORT KProtocolManager +class TDEIO_EXPORT KProtocolManager { public: diff --git a/kio/kio/kremoteencoding.h b/kio/kio/kremoteencoding.h index 6f5eea5fd..18dfe1fdb 100644 --- a/kio/kio/kremoteencoding.h +++ b/kio/kio/kremoteencoding.h @@ -41,7 +41,7 @@ class KRemoteEncodingPrivate; * @author Thiago Macieira * @since 3.3 */ -class KIO_EXPORT KRemoteEncoding +class TDEIO_EXPORT KRemoteEncoding { public: /** diff --git a/kio/kio/krun.h b/kio/kio/krun.h index 44bff6dee..03186af85 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -55,7 +55,7 @@ namespace TDEIO { * * @short Opens files with their associated applications in KDE */ -class KIO_EXPORT KRun : public TQObject +class TDEIO_EXPORT KRun : public TQObject { Q_OBJECT public: @@ -461,7 +461,7 @@ private: * KRun can open the openwith dialog directly now. * Use KRun::displayOpenWithDialog() if you were using KOpenWithHandler directly. */ -class KIO_EXPORT_DEPRECATED KOpenWithHandler +class TDEIO_EXPORT_DEPRECATED KOpenWithHandler { public: KOpenWithHandler() {} @@ -475,7 +475,7 @@ public: * It sends a notification when the process exits (for the taskbar) * and it will show an error message if necessary (e.g. "program not found"). */ -class KIO_EXPORT TDEProcessRunner : public TQObject +class TDEIO_EXPORT TDEProcessRunner : public TQObject { Q_OBJECT diff --git a/kio/kio/ksambashare.h b/kio/kio/ksambashare.h index ba922ecf5..ffd298588 100644 --- a/kio/kio/ksambashare.h +++ b/kio/kio/ksambashare.h @@ -31,7 +31,7 @@ class KSambaSharePrivate; * any suid script. * Singleton class, call instance() to get an instance. */ -class KIO_EXPORT KSambaShare : public TQObject +class TDEIO_EXPORT KSambaShare : public TQObject { Q_OBJECT public: diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h index 755d4972a..940b8ceaa 100644 --- a/kio/kio/kscan.h +++ b/kio/kio/kscan.h @@ -60,7 +60,7 @@ class TQImage; * @short A baseclass and accessor for Scanning Dialogs * @author Carsten Pfeiffer */ -class KIO_EXPORT KScanDialog : public KDialogBase +class TDEIO_EXPORT KScanDialog : public KDialogBase { Q_OBJECT @@ -179,7 +179,7 @@ private: * createDialog(). * @short Factory for creating KScanDialogs */ -class KIO_EXPORT KScanDialogFactory : public KLibFactory +class TDEIO_EXPORT KScanDialogFactory : public KLibFactory { public: virtual ~KScanDialogFactory(); @@ -233,7 +233,7 @@ private: /** * Base class for OCR Dialogs. */ -class KIO_EXPORT KOCRDialog : public KDialogBase +class TDEIO_EXPORT KOCRDialog : public KDialogBase { Q_OBJECT @@ -315,7 +315,7 @@ private: * createDialog(). * @short Factory for creating KScanDialogs */ -class KIO_EXPORT KOCRDialogFactory : public KLibFactory +class TDEIO_EXPORT KOCRDialogFactory : public KLibFactory { public: virtual ~KOCRDialogFactory(); diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h index 37f0e0f25..800bacf11 100644 --- a/kio/kio/kservice.h +++ b/kio/kio/kservice.h @@ -45,7 +45,7 @@ class TQWidget; * @see KServiceGroup * @author Torben Weis */ -class KIO_EXPORT KService : public KSycocaEntry +class TDEIO_EXPORT KService : public KSycocaEntry { K_SYCOCATYPE( KST_KService, KSycocaEntry ) diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h index 8e86f8cbc..2fd9dd822 100644 --- a/kio/kio/kservicefactory.h +++ b/kio/kio/kservicefactory.h @@ -35,7 +35,7 @@ class KSycocaDict; * It loads the services from parsing directories (e.g. applnk/) * but can also create service from data streams or single config files */ -class KIO_EXPORT KServiceFactory : public KSycocaFactory +class TDEIO_EXPORT KServiceFactory : public KSycocaFactory { K_SYCOCAFACTORY( KST_KServiceFactory ) public: diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h index afc043adf..8e2fa42e6 100644 --- a/kio/kio/kservicegroup.h +++ b/kio/kio/kservicegroup.h @@ -65,7 +65,7 @@ class KBuildServiceGroupFactory; * \endcode * @short Represents a group of services */ -class KIO_EXPORT KServiceGroup : public KSycocaEntry +class TDEIO_EXPORT KServiceGroup : public KSycocaEntry { friend class KBuildServiceGroupFactory; K_SYCOCATYPE( KST_KServiceGroup, KSycocaEntry ) @@ -327,7 +327,7 @@ private: Private* d; }; -class KIO_EXPORT KServiceSeparator : public KSycocaEntry +class TDEIO_EXPORT KServiceSeparator : public KSycocaEntry { K_SYCOCATYPE( KST_KServiceSeparator, KSycocaEntry ) diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h index b1131b398..5fad77ce6 100644 --- a/kio/kio/kservicegroupfactory.h +++ b/kio/kio/kservicegroupfactory.h @@ -33,7 +33,7 @@ class KSycocaDict; * A sycoca factory for service groups (e.g. list of applications) * It loads the services from parsing directories (e.g. applnk/) */ -class KIO_EXPORT KServiceGroupFactory : public KSycocaFactory +class TDEIO_EXPORT KServiceGroupFactory : public KSycocaFactory { K_SYCOCAFACTORY( KST_KServiceGroupFactory ) public: diff --git a/kio/kio/kservicetype.h b/kio/kio/kservicetype.h index b96984d43..f17eb0394 100644 --- a/kio/kio/kservicetype.h +++ b/kio/kio/kservicetype.h @@ -42,7 +42,7 @@ * Service types are stored as desktop files in $TDEHOME/share/servicetypes. * @see KService */ -class KIO_EXPORT KServiceType : public KSycocaEntry +class TDEIO_EXPORT KServiceType : public KSycocaEntry { K_SYCOCATYPE( KST_KServiceType, KSycocaEntry ) diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h index fd3c96a1a..b1a3c5dab 100644 --- a/kio/kio/kservicetypefactory.h +++ b/kio/kio/kservicetypefactory.h @@ -42,7 +42,7 @@ class KExecMimeType; * It loads the service types from parsing directories (e.g. mimelnk/) * but can also create service types from data streams or single config files */ -class KIO_EXPORT KServiceTypeFactory : public KSycocaFactory +class TDEIO_EXPORT KServiceTypeFactory : public KSycocaFactory { K_SYCOCAFACTORY( KST_KServiceTypeFactory ) public: diff --git a/kio/kio/kshellcompletion.h b/kio/kio/kshellcompletion.h index acfa638cf..fa90c509e 100644 --- a/kio/kio/kshellcompletion.h +++ b/kio/kio/kshellcompletion.h @@ -37,7 +37,7 @@ class KShellCompletionPrivate; * @short Shell-like completion of file names * @author David Smith */ -class KIO_EXPORT KShellCompletion : public KURLCompletion +class TDEIO_EXPORT KShellCompletion : public KURLCompletion { Q_OBJECT diff --git a/kio/kio/kshred.h b/kio/kio/kshred.h index c7669122a..7f817c1ea 100644 --- a/kio/kio/kshred.h +++ b/kio/kio/kshred.h @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * @author Andreas F. Pour * @author David Faure (integration into KDE and progress signal) */ -class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove +class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove Q_OBJECT diff --git a/kio/kio/ktar.h b/kio/kio/ktar.h index 67f004a39..fc238073c 100644 --- a/kio/kio/ktar.h +++ b/kio/kio/ktar.h @@ -37,7 +37,7 @@ * * @author Torben Weis , David Faure */ -class KIO_EXPORT KTar : public KArchive +class TDEIO_EXPORT KTar : public KArchive { public: /** diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h index 8abf09870..772f0be3a 100644 --- a/kio/kio/ktrader.h +++ b/kio/kio/ktrader.h @@ -82,7 +82,7 @@ * applications or components. * @author Torben Weis */ -class KIO_EXPORT KTrader : public TQObject +class TDEIO_EXPORT KTrader : public TQObject { Q_OBJECT public: diff --git a/kio/kio/ktraderparsetree.h b/kio/kio/ktraderparsetree.h index 8cc466abd..a08b61a5a 100644 --- a/kio/kio/ktraderparsetree.h +++ b/kio/kio/ktraderparsetree.h @@ -36,7 +36,7 @@ namespace TDEIO { class ParseTreeBase; /** \internal */ -struct KIO_EXPORT PreferencesReturn +struct TDEIO_EXPORT PreferencesReturn { enum Type { PRT_DOUBLE, PRT_ERROR }; @@ -59,20 +59,20 @@ struct KIO_EXPORT PreferencesReturn * 1 => Does match * <0 => Error */ -KIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &, +TDEIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &, const KServiceTypeProfile::OfferList& ); /** * @internal * @return 1 on success or <0 on Error */ -KIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &, +TDEIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &, const KServiceTypeProfile::OfferList& ); /** * @internal */ -struct KIO_EXPORT PreferencesMaxima +struct TDEIO_EXPORT PreferencesMaxima { enum Type { PM_ERROR, PM_INVALID_INT, PM_INVALID_DOUBLE, PM_DOUBLE, PM_INT }; @@ -86,7 +86,7 @@ struct KIO_EXPORT PreferencesMaxima /** * @internal */ -class KIO_EXPORT ParseContext +class TDEIO_EXPORT ParseContext { public: /** @@ -120,7 +120,7 @@ public: /** * @internal */ -class KIO_EXPORT ParseTreeBase : public KShared +class TDEIO_EXPORT ParseTreeBase : public KShared { public: typedef KSharedPtr Ptr; @@ -131,13 +131,13 @@ protected: virtual ~ParseTreeBase() { }; }; -KIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr ); -KIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs ); +TDEIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr ); +TDEIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs ); /** * @internal */ -class KIO_EXPORT ParseTreeOR : public ParseTreeBase +class TDEIO_EXPORT ParseTreeOR : public ParseTreeBase { public: ParseTreeOR( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -152,7 +152,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeAND : public ParseTreeBase +class TDEIO_EXPORT ParseTreeAND : public ParseTreeBase { public: ParseTreeAND( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -167,7 +167,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeCMP : public ParseTreeBase +class TDEIO_EXPORT ParseTreeCMP : public ParseTreeBase { public: ParseTreeCMP( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; } @@ -183,7 +183,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeIN : public ParseTreeBase +class TDEIO_EXPORT ParseTreeIN : public ParseTreeBase { public: ParseTreeIN( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -198,7 +198,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeMATCH : public ParseTreeBase +class TDEIO_EXPORT ParseTreeMATCH : public ParseTreeBase { public: ParseTreeMATCH( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -213,7 +213,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeCALC : public ParseTreeBase +class TDEIO_EXPORT ParseTreeCALC : public ParseTreeBase { public: ParseTreeCALC( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; } @@ -229,7 +229,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase +class TDEIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase { public: ParseTreeBRACKETS( ParseTreeBase *_ptr ) { m_pLeft = _ptr; } @@ -243,7 +243,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeNOT : public ParseTreeBase +class TDEIO_EXPORT ParseTreeNOT : public ParseTreeBase { public: ParseTreeNOT( ParseTreeBase *_ptr ) { m_pLeft = _ptr; } @@ -257,7 +257,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeEXIST : public ParseTreeBase +class TDEIO_EXPORT ParseTreeEXIST : public ParseTreeBase { public: ParseTreeEXIST( const char *_id ) { m_id = _id; } @@ -271,7 +271,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeID : public ParseTreeBase +class TDEIO_EXPORT ParseTreeID : public ParseTreeBase { public: ParseTreeID( const char *arg ) { m_str = arg; } @@ -285,7 +285,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeSTRING : public ParseTreeBase +class TDEIO_EXPORT ParseTreeSTRING : public ParseTreeBase { public: ParseTreeSTRING( const char *arg ) { m_str = arg; } @@ -299,7 +299,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeNUM : public ParseTreeBase +class TDEIO_EXPORT ParseTreeNUM : public ParseTreeBase { public: ParseTreeNUM( int arg ) { m_int = arg; } @@ -313,7 +313,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase +class TDEIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase { public: ParseTreeDOUBLE( double arg ) { m_double = arg; } @@ -327,7 +327,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeBOOL : public ParseTreeBase +class TDEIO_EXPORT ParseTreeBOOL : public ParseTreeBase { public: ParseTreeBOOL( bool arg ) { m_bool = arg; } @@ -341,7 +341,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeMAX2 : public ParseTreeBase +class TDEIO_EXPORT ParseTreeMAX2 : public ParseTreeBase { public: ParseTreeMAX2( const char *_id ) { m_strId = _id; } @@ -355,7 +355,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeMIN2 : public ParseTreeBase +class TDEIO_EXPORT ParseTreeMIN2 : public ParseTreeBase { public: ParseTreeMIN2( const char *_id ) { m_strId = _id; } diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h index 0084129bf..fd7cb9b3c 100644 --- a/kio/kio/kurifilter.h +++ b/kio/kio/kurifilter.h @@ -76,7 +76,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -360,7 +360,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -460,7 +460,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -545,7 +545,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h index 62eda9f8d..f785696b4 100644 --- a/kio/kio/kurlcompletion.h +++ b/kio/kio/kurlcompletion.h @@ -38,7 +38,7 @@ class KURLCompletionPrivate; * @short Completion of a single URL * @author David Smith */ -class KIO_EXPORT KURLCompletion : public KCompletion +class TDEIO_EXPORT KURLCompletion : public KCompletion { Q_OBJECT diff --git a/kio/kio/kurlpixmapprovider.h b/kio/kio/kurlpixmapprovider.h index 1fa400c1e..82be4bd1b 100644 --- a/kio/kio/kurlpixmapprovider.h +++ b/kio/kio/kurlpixmapprovider.h @@ -39,7 +39,7 @@ * @short Resolves pixmaps for URLs * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLPixmapProvider : public KPixmapProvider +class TDEIO_EXPORT KURLPixmapProvider : public KPixmapProvider { public: /** diff --git a/kio/kio/kuserprofile.h b/kio/kio/kuserprofile.h index 061657625..45b58fe6a 100644 --- a/kio/kio/kuserprofile.h +++ b/kio/kio/kuserprofile.h @@ -37,7 +37,7 @@ * @see KService * @short Holds the user's preference of a service. */ -class KIO_EXPORT KServiceOffer +class TDEIO_EXPORT KServiceOffer { public: /** @@ -114,7 +114,7 @@ private: * @see KTrader * @short Represents the user's preferences for services of a service type */ -class KIO_EXPORT KServiceTypeProfile +class TDEIO_EXPORT KServiceTypeProfile { public: typedef TQValueList OfferList; diff --git a/kio/kio/kzip.h b/kio/kio/kzip.h index 26bfc71d3..9e4d24eeb 100644 --- a/kio/kio/kzip.h +++ b/kio/kio/kzip.h @@ -50,7 +50,7 @@ class KZipFileEntry; * @author Holger Schroeder * @since 3.1 */ -class KIO_EXPORT KZip : public KArchive +class TDEIO_EXPORT KZip : public KArchive { public: /** @@ -223,7 +223,7 @@ private: /** * @internal */ -class KIO_EXPORT KZipFileEntry : public KArchiveFile +class TDEIO_EXPORT KZipFileEntry : public KArchiveFile { public: /*KZipFileEntry() : st(-1) diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 545c841b0..3787fac80 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -169,12 +169,12 @@ TQStringList MetaInfoJob::supportedMimeTypes() return result; } -KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items) +TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items) { return new MetaInfoJob(items, false); } -KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items) +TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items) { KFileItemList fileItems; for (KURL::List::ConstIterator it = items.begin(); it != items.end(); ++it) diff --git a/kio/kio/metainfojob.h b/kio/kio/metainfojob.h index 0f7d485b3..e2152bded 100644 --- a/kio/kio/metainfojob.h +++ b/kio/kio/metainfojob.h @@ -32,7 +32,7 @@ namespace TDEIO { * @short KIO Job to retrieve meta information from files. * @since 3.1 */ - class KIO_EXPORT MetaInfoJob : public TDEIO::Job + class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job { Q_OBJECT public: @@ -105,7 +105,7 @@ namespace TDEIO { * @param items files to get metainfo for * @return the MetaInfoJob to retrieve the items */ - KIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items); + TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items); /** * Retrieves meta information for the given items. @@ -113,7 +113,7 @@ namespace TDEIO { * @param items files to get metainfo for * @return the MetaInfoJob to retrieve the items */ - KIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items); + TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items); } #endif diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h index ba8988dfc..54dd02974 100644 --- a/kio/kio/netaccess.h +++ b/kio/kio/netaccess.h @@ -56,7 +56,7 @@ namespace TDEIO { * * @short Provides an easy, synchronous interface to KIO file operations. */ -class KIO_EXPORT NetAccess : public TQObject +class TDEIO_EXPORT NetAccess : public TQObject { Q_OBJECT diff --git a/kio/kio/observer.h b/kio/kio/observer.h index 8c20e6f92..1869e5638 100644 --- a/kio/kio/observer.h +++ b/kio/kio/observer.h @@ -52,7 +52,7 @@ namespace TDEIO { * @short Observer for TDEIO::Job progress information * @author David Faure */ -class KIO_EXPORT Observer : public TQObject, public DCOPObject { +class TDEIO_EXPORT Observer : public TQObject, public DCOPObject { K_DCOP Q_OBJECT diff --git a/kio/kio/passdlg.h b/kio/kio/passdlg.h index b071ddef0..864023398 100644 --- a/kio/kio/passdlg.h +++ b/kio/kio/passdlg.h @@ -33,7 +33,7 @@ namespace TDEIO { * instead of directly instantiating this dialog. * @short dialog for requesting login and password from the end user */ -class KIO_EXPORT PasswordDialog : public KDialogBase +class TDEIO_EXPORT PasswordDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp index 55102c5ed..472f4e313 100644 --- a/kio/kio/paste.cpp +++ b/kio/kio/paste.cpp @@ -143,7 +143,7 @@ static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, #endif // KDE4: remove -KIO_EXPORT bool TDEIO::isClipboardEmpty() +TDEIO_EXPORT bool TDEIO::isClipboardEmpty() { #ifndef QT_NO_MIMECLIPBOARD TQMimeSource *data = TQApplication::clipboard()->data(); @@ -207,7 +207,7 @@ TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url #endif // The main method for pasting -KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move ) +TDEIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move ) { if ( !dest_url.isValid() ) { KMessageBox::error( 0L, i18n( "Malformed URL\n%1" ).arg( dest_url.url() ) ); @@ -256,7 +256,7 @@ KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move ) } -KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data ) +TDEIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data ) { KURL new_url = getNewFileName( u, TQString::null ); // We could use TDEIO::put here, but that would require a class @@ -273,12 +273,12 @@ KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data ) (void) TDEIO::NetAccess::upload( tempFile.name(), new_url, 0 ); } -KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data ) +TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data ) { return pasteDataAsync( u, _data, TQString::null ); } -KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text ) +TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text ) { KURL new_url = getNewFileName( u, text ); @@ -288,7 +288,7 @@ KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArr return pasteDataAsyncTo( new_url, _data ); } -KIO_EXPORT TQString TDEIO::pasteActionText() +TDEIO_EXPORT TQString TDEIO::pasteActionText() { TQMimeSource *data = TQApplication::clipboard()->data(); KURL::List urls; diff --git a/kio/kio/paste.h b/kio/kio/paste.h index 36befcd65..66579831a 100644 --- a/kio/kio/paste.h +++ b/kio/kio/paste.h @@ -42,7 +42,7 @@ namespace TDEIO { * @return the job that handles the operation * @see pasteData() */ - KIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false ); + TDEIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false ); /** * Pastes the given @p data to the given destination URL. @@ -54,7 +54,7 @@ namespace TDEIO { * @param data the data to copy * @see pasteClipboard() */ - KIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data ); + TDEIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data ); /** * Pastes the given @p data to the given destination URL. @@ -66,7 +66,7 @@ namespace TDEIO { * @param data the data to copy * @see pasteClipboard() */ - KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data ); + TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data ); /** * Pastes the given @p data to the given destination URL. @@ -79,7 +79,7 @@ namespace TDEIO { * @param dialogText the text to show in the dialog * @see pasteClipboard() */ - KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above + TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above /** @@ -100,7 +100,7 @@ namespace TDEIO { * * @since 3.5 */ - KIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL, + TDEIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL, const TQString& dialogText, TQWidget* widget, bool clipboard = false ); @@ -109,7 +109,7 @@ namespace TDEIO { * @return true if not * Not used anymore, wrong method name, so it will disappear in KDE4. */ - KIO_EXPORT_DEPRECATED bool isClipboardEmpty(); + TDEIO_EXPORT_DEPRECATED bool isClipboardEmpty(); /** * Returns the text to use for the Paste action, when the application supports @@ -119,7 +119,7 @@ namespace TDEIO { * * @since 3.5 */ - KIO_EXPORT TQString pasteActionText(); + TDEIO_EXPORT TQString pasteActionText(); } #endif diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h index a0a137ff4..fe8e16c0f 100644 --- a/kio/kio/previewjob.h +++ b/kio/kio/previewjob.h @@ -34,7 +34,7 @@ namespace TDEIO { * This class catches a preview (thumbnail) for files. * @short KIO Job to get a thumbnail picture */ - class KIO_EXPORT PreviewJob : public TDEIO::Job + class TDEIO_EXPORT PreviewJob : public TDEIO::Job { Q_OBJECT public: @@ -154,7 +154,7 @@ namespace TDEIO { * @return the new PreviewJob * @see PreviewJob::availablePlugins() */ - KIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); + TDEIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); /** * Creates a PreviewJob to generate or retrieve a preview image @@ -176,7 +176,7 @@ namespace TDEIO { * @return the new PreviewJob * @see PreviewJob::availablePlugins() */ - KIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); + TDEIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); } #endif diff --git a/kio/kio/progressbase.h b/kio/kio/progressbase.h index cbcab06be..2be545621 100644 --- a/kio/kio/progressbase.h +++ b/kio/kio/progressbase.h @@ -67,7 +67,7 @@ namespace TDEIO * @short Base class for IO progress dialogs. * @author Matej Koss */ -class KIO_EXPORT ProgressBase : public TQWidget { +class TDEIO_EXPORT ProgressBase : public TQWidget { Q_OBJECT diff --git a/kio/kio/renamedlg.h b/kio/kio/renamedlg.h index b2347539b..38dcac925 100644 --- a/kio/kio/renamedlg.h +++ b/kio/kio/renamedlg.h @@ -45,7 +45,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW * @short A dialog for renaming files. * @since 3.1 */ -class KIO_EXPORT RenameDlg : public TQDialog +class TDEIO_EXPORT RenameDlg : public TQDialog { Q_OBJECT public: @@ -135,7 +135,7 @@ private: * @param mtimeDest modification time of destination file * @return the result */ -KIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption, +TDEIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption, // KDE4: make those KURLs const TQString& src, const TQString & dest, RenameDlg_Mode mode, TQString& newDestPath, diff --git a/kio/kio/renamedlgplugin.h b/kio/kio/renamedlgplugin.h index ab50e6b6a..b3604b084 100644 --- a/kio/kio/renamedlgplugin.h +++ b/kio/kio/renamedlgplugin.h @@ -31,7 +31,7 @@ * @short Base class for RenameDlg plugins. * @since 3.1 */ -class KIO_EXPORT RenameDlgPlugin : public TQWidget +class TDEIO_EXPORT RenameDlgPlugin : public TQWidget { public: /** diff --git a/kio/kio/scheduler.h b/kio/kio/scheduler.h index 9871cd1c2..ac0764dc4 100644 --- a/kio/kio/scheduler.h +++ b/kio/kio/scheduler.h @@ -108,7 +108,7 @@ namespace TDEIO { * @see TDEIO::Job **/ - class KIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject { + class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject { Q_OBJECT public: diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h index 80b28ace6..4fef02161 100644 --- a/kio/kio/sessiondata.h +++ b/kio/kio/sessiondata.h @@ -32,7 +32,7 @@ class SlaveConfig; /** * @internal */ -class KIO_EXPORT SessionData : public TQObject +class TDEIO_EXPORT SessionData : public TQObject { Q_OBJECT diff --git a/kio/kio/skipdlg.h b/kio/kio/skipdlg.h index e1199de97..56252dace 100644 --- a/kio/kio/skipdlg.h +++ b/kio/kio/skipdlg.h @@ -29,12 +29,12 @@ namespace TDEIO { enum SkipDlg_Result { S_SKIP = 1, S_AUTO_SKIP = 2, S_CANCEL = 0 }; - KIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null ); + TDEIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null ); /** * @internal */ -class KIO_EXPORT SkipDlg : public KDialog +class TDEIO_EXPORT SkipDlg : public KDialog { Q_OBJECT public: diff --git a/kio/kio/slave.h b/kio/kio/slave.h index bbede6637..6f9f02a2f 100644 --- a/kio/kio/slave.h +++ b/kio/kio/slave.h @@ -41,7 +41,7 @@ namespace TDEIO { * do *not* use connection() or slaveconn but the respective TDEIO::Slave * accessor methods. Otherwise classes derived from Slave might break. (LS) */ - class KIO_EXPORT Slave : public TDEIO::SlaveInterface + class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface { Q_OBJECT diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index 332646875..a65a1f94f 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -42,7 +42,7 @@ class SlaveBasePrivate; * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT SlaveBase +class TDEIO_EXPORT SlaveBase { public: SlaveBase( const TQCString &protocol, const TQCString &pool_socket, const TQCString &app_socket); diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h index 59abb74ac..5bdc6cda8 100644 --- a/kio/kio/slaveconfig.h +++ b/kio/kio/slaveconfig.h @@ -44,7 +44,7 @@ namespace TDEIO { * only applied when the slave is connecting with a host that matches with * the host and/or domain specified by the group. */ - class KIO_EXPORT SlaveConfig : public TQObject + class TDEIO_EXPORT SlaveConfig : public TQObject { Q_OBJECT public: diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h index 79d797e08..8ac7b683e 100644 --- a/kio/kio/slaveinterface.h +++ b/kio/kio/slaveinterface.h @@ -90,7 +90,7 @@ class SlaveInterfacePrivate; * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT SlaveInterface : public TQObject +class TDEIO_EXPORT SlaveInterface : public TQObject { Q_OBJECT @@ -284,7 +284,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSAtom &a ) return s; } -KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e ); -KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e ); +TDEIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e ); +TDEIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e ); #endif diff --git a/kio/kio/statusbarprogress.h b/kio/kio/statusbarprogress.h index 58bd77fa9..d1d591fbe 100644 --- a/kio/kio/statusbarprogress.h +++ b/kio/kio/statusbarprogress.h @@ -57,7 +57,7 @@ class Job; * @short IO progress widget for embedding in a statusbar. * @author Matej Koss */ -class KIO_EXPORT StatusbarProgress : public ProgressBase { +class TDEIO_EXPORT StatusbarProgress : public ProgressBase { Q_OBJECT diff --git a/kio/kio/tcpslavebase.h b/kio/kio/tcpslavebase.h index 8a4e436ce..52081c807 100644 --- a/kio/kio/tcpslavebase.h +++ b/kio/kio/tcpslavebase.h @@ -42,7 +42,7 @@ namespace TDEIO { * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT TCPSlaveBase : public SlaveBase +class TDEIO_EXPORT TCPSlaveBase : public SlaveBase { public: TCPSlaveBase(unsigned short int defaultPort, const TQCString &protocol, diff --git a/kio/kssl/kopenssl.h b/kio/kssl/kopenssl.h index 24130807a..59cf7b560 100644 --- a/kio/kssl/kopenssl.h +++ b/kio/kssl/kopenssl.h @@ -63,7 +63,7 @@ class KOpenSSLProxyPrivate; * @short KDE OpenSSL Wrapper * @internal */ -class KIO_EXPORT KOpenSSLProxy { +class TDEIO_EXPORT KOpenSSLProxy { friend class KStaticDeleter; public: diff --git a/kio/kssl/ksmimecrypto.h b/kio/kssl/ksmimecrypto.h index 95d17a8a8..5f8e1da73 100644 --- a/kio/kssl/ksmimecrypto.h +++ b/kio/kssl/ksmimecrypto.h @@ -30,7 +30,7 @@ class KOpenSSLProxy; class KSMIMECryptoPrivate; -class KIO_EXPORT KSMIMECrypto { +class TDEIO_EXPORT KSMIMECrypto { public: KSMIMECrypto(); ~KSMIMECrypto(); diff --git a/kio/kssl/kssl.h b/kio/kssl/kssl.h index ffb217980..e10b10eaf 100644 --- a/kio/kssl/kssl.h +++ b/kio/kssl/kssl.h @@ -39,7 +39,7 @@ class KSSLSession; * @see KExtendedSocket, TCPSlaveBase * @short KDE SSL Class */ -class KIO_EXPORT KSSL { +class TDEIO_EXPORT KSSL { public: /** * Construct a KSSL object diff --git a/kio/kssl/ksslcertchain.h b/kio/kssl/ksslcertchain.h index c7e9f3c8f..eb6c27d44 100644 --- a/kio/kssl/ksslcertchain.h +++ b/kio/kssl/ksslcertchain.h @@ -42,7 +42,7 @@ class TQStringList; * @see KSSL, KSSLCertificate, KSSLPeerInfo * @short KDE X.509 Certificate Chain */ -class KIO_EXPORT KSSLCertChain { +class TDEIO_EXPORT KSSLCertChain { friend class KSSL; friend class KSSLPeerInfo; diff --git a/kio/kssl/ksslcertdlg.h b/kio/kssl/ksslcertdlg.h index 314ae677d..8d6f3d777 100644 --- a/kio/kssl/ksslcertdlg.h +++ b/kio/kssl/ksslcertdlg.h @@ -40,7 +40,7 @@ class TQPushButton; * @see KSSL * @short KDE X.509 Certificate Dialog */ -class KIO_EXPORT KSSLCertDlg : public KDialog { +class TDEIO_EXPORT KSSLCertDlg : public KDialog { Q_OBJECT public: /** @@ -119,7 +119,7 @@ private: }; -class KIO_EXPORT KSSLCertDlgRet { +class TDEIO_EXPORT KSSLCertDlgRet { public: bool ok; TQString choice; @@ -131,8 +131,8 @@ protected: KSSLCertDlgRetPrivate *d; }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r); #endif diff --git a/kio/kssl/ksslcertificate.h b/kio/kssl/ksslcertificate.h index a7906581a..0c5f87323 100644 --- a/kio/kssl/ksslcertificate.h +++ b/kio/kssl/ksslcertificate.h @@ -72,7 +72,7 @@ class X509; * @see KSSL * @short KDE X.509 Certificate */ -class KIO_EXPORT KSSLCertificate { +class TDEIO_EXPORT KSSLCertificate { friend class KSSL; friend class KSSLCertificateHome; friend class KSSLCertificateFactory; @@ -350,8 +350,8 @@ public: static TQString getMD5DigestFromKDEKey(const TQString& k); private: - KIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y); - KIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y); + TDEIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y); + TDEIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y); KSSLCertificatePrivate *d; int purposeToOpenSSL(KSSLPurpose p) const; @@ -365,11 +365,11 @@ protected: KSSLValidation processError(int ec); }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r); -KIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y); -KIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y) +TDEIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y); +TDEIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y) { return !(x == y); } #endif diff --git a/kio/kssl/ksslcertificatecache.h b/kio/kssl/ksslcertificatecache.h index 486997265..924cb0f54 100644 --- a/kio/kssl/ksslcertificatecache.h +++ b/kio/kssl/ksslcertificatecache.h @@ -28,7 +28,7 @@ class KSSLCertificate; #include -class KIO_EXPORT KSSLCertificateCache { +class TDEIO_EXPORT KSSLCertificateCache { public: enum KSSLCertificatePolicy { Unknown, Reject, Accept, Prompt, Ambiguous }; @@ -101,7 +101,7 @@ private: }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p); #endif diff --git a/kio/kssl/ksslcertificatefactory.h b/kio/kssl/ksslcertificatefactory.h index c259e60e8..503c591a7 100644 --- a/kio/kssl/ksslcertificatefactory.h +++ b/kio/kssl/ksslcertificatefactory.h @@ -29,7 +29,7 @@ class KSSLCertificate; typedef enum {KEYTYPE_UNKNOWN, KEYTYPE_RSA, KEYTYPE_DSA} KSSLKeyType; -class KIO_EXPORT KSSLCertificateFactory { +class TDEIO_EXPORT KSSLCertificateFactory { public: diff --git a/kio/kssl/ksslcertificatehome.h b/kio/kssl/ksslcertificatehome.h index 549d7c168..f8a18a423 100644 --- a/kio/kssl/ksslcertificatehome.h +++ b/kio/kssl/ksslcertificatehome.h @@ -28,7 +28,7 @@ class KSSLPKCS12; #include -class KIO_EXPORT KSSLCertificateHome { +class TDEIO_EXPORT KSSLCertificateHome { public: diff --git a/kio/kssl/ksslconnectioninfo.h b/kio/kssl/ksslconnectioninfo.h index e9bbad831..09fd5cdae 100644 --- a/kio/kssl/ksslconnectioninfo.h +++ b/kio/kssl/ksslconnectioninfo.h @@ -37,7 +37,7 @@ class KSSL; * @see KSSL * @short KDE SSL Connection Information */ -class KIO_EXPORT KSSLConnectionInfo { +class TDEIO_EXPORT KSSLConnectionInfo { friend class KSSL; public: /** diff --git a/kio/kssl/ksslcsessioncache.h b/kio/kssl/ksslcsessioncache.h index 4cfc77aaf..9badfe279 100644 --- a/kio/kssl/ksslcsessioncache.h +++ b/kio/kssl/ksslcsessioncache.h @@ -26,7 +26,7 @@ class KURL; class TQString; -class KIO_EXPORT KSSLCSessionCache { +class TDEIO_EXPORT KSSLCSessionCache { public: /** diff --git a/kio/kssl/ksslinfodlg.h b/kio/kssl/ksslinfodlg.h index 4bd00a9e5..c73afbba1 100644 --- a/kio/kssl/ksslinfodlg.h +++ b/kio/kssl/ksslinfodlg.h @@ -47,7 +47,7 @@ class KSSLCertChain; * @see KSSL * @short KDE SSL Information Dialog */ -class KIO_EXPORT KSSLInfoDlg : public KDialog { +class TDEIO_EXPORT KSSLInfoDlg : public KDialog { Q_OBJECT public: /** @@ -146,7 +146,7 @@ private slots: * @see KSSLInfoDlg * @short KDE SSL Certificate Box */ -class KIO_EXPORT KSSLCertBox : public TQScrollView { +class TDEIO_EXPORT KSSLCertBox : public TQScrollView { public: /** * Construct a certificate box diff --git a/kio/kssl/ksslkeygen.h b/kio/kssl/ksslkeygen.h index cd1d8e7ab..5bb99a593 100644 --- a/kio/kssl/ksslkeygen.h +++ b/kio/kssl/ksslkeygen.h @@ -41,7 +41,7 @@ class KGWizardPage2; * @see KSSL, KSSLCertificate, KSSLPKCS12 * @short KDE Key Generation Dialog */ -class KIO_EXPORT KSSLKeyGen : public KWizard { +class TDEIO_EXPORT KSSLKeyGen : public KWizard { Q_OBJECT public: /** diff --git a/kio/kssl/ksslpeerinfo.h b/kio/kssl/ksslpeerinfo.h index bdcf91231..a5cd017c9 100644 --- a/kio/kssl/ksslpeerinfo.h +++ b/kio/kssl/ksslpeerinfo.h @@ -39,7 +39,7 @@ class KInetSocketAddress; * @see KSSL * @short KDE SSL Peer Data */ -class KIO_EXPORT KSSLPeerInfo { +class TDEIO_EXPORT KSSLPeerInfo { friend class KSSL; public: /** diff --git a/kio/kssl/ksslpemcallback.h b/kio/kssl/ksslpemcallback.h index 0a8978b6e..265edd099 100644 --- a/kio/kssl/ksslpemcallback.h +++ b/kio/kssl/ksslpemcallback.h @@ -23,7 +23,7 @@ #include -int KIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata); +int TDEIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata); #endif diff --git a/kio/kssl/ksslpkcs12.h b/kio/kssl/ksslpkcs12.h index bfbd78d3e..c9dff0d82 100644 --- a/kio/kssl/ksslpkcs12.h +++ b/kio/kssl/ksslpkcs12.h @@ -58,7 +58,7 @@ class KOpenSSLProxy; * @see KSSL, KSSLCertificate * @short KDE PKCS#12 Certificate */ -class KIO_EXPORT KSSLPKCS12 { +class TDEIO_EXPORT KSSLPKCS12 { friend class KSSL; public: diff --git a/kio/kssl/ksslpkcs7.h b/kio/kssl/ksslpkcs7.h index 07c221464..c94b7bc7a 100644 --- a/kio/kssl/ksslpkcs7.h +++ b/kio/kssl/ksslpkcs7.h @@ -57,7 +57,7 @@ class KOpenSSLProxy; * @see KSSL * @short KDE PKCS#7 Certificate */ -class KIO_EXPORT KSSLPKCS7 { +class TDEIO_EXPORT KSSLPKCS7 { friend class KSSL; public: diff --git a/kio/kssl/ksslsession.h b/kio/kssl/ksslsession.h index d8689833f..394a4b91a 100644 --- a/kio/kssl/ksslsession.h +++ b/kio/kssl/ksslsession.h @@ -39,7 +39,7 @@ class KSSLSessionPrivate; * @see KSSL * @short KDE SSL Session Information */ -class KIO_EXPORT KSSLSession { +class TDEIO_EXPORT KSSLSession { friend class KSSL; public: /** diff --git a/kio/kssl/ksslsettings.h b/kio/kssl/ksslsettings.h index 1b56a7a3a..18dd31249 100644 --- a/kio/kssl/ksslsettings.h +++ b/kio/kssl/ksslsettings.h @@ -36,7 +36,7 @@ class KSSLSettingsPrivate; * @see KSSL * @short KDE SSL Settings */ -class KIO_EXPORT KSSLSettings { +class TDEIO_EXPORT KSSLSettings { public: /** * Construct a KSSL Settings object diff --git a/kio/kssl/ksslsigners.h b/kio/kssl/ksslsigners.h index 21744f1de..3149e852a 100644 --- a/kio/kssl/ksslsigners.h +++ b/kio/kssl/ksslsigners.h @@ -40,7 +40,7 @@ class DCOPClient; * @see KSSL, KSSLCertificate * @short KDE SSL Signer Database */ -class KIO_EXPORT KSSLSigners { +class TDEIO_EXPORT KSSLSigners { public: /** * Construct a KSSLSigner object. diff --git a/kio/kssl/ksslx509map.h b/kio/kssl/ksslx509map.h index 93c46aeec..f76413100 100644 --- a/kio/kssl/ksslx509map.h +++ b/kio/kssl/ksslx509map.h @@ -36,7 +36,7 @@ * @see KSSL, KSSLCertificate * @short X.509 Map Parser */ -class KIO_EXPORT KSSLX509Map { +class TDEIO_EXPORT KSSLX509Map { public: /** * Construct an X.509 Map diff --git a/kio/kssl/ksslx509v3.h b/kio/kssl/ksslx509v3.h index 45c7d706e..c521f3e25 100644 --- a/kio/kssl/ksslx509v3.h +++ b/kio/kssl/ksslx509v3.h @@ -35,7 +35,7 @@ * @see KExtendedSocket, TCPSlaveBase * @short KDE SSL Class */ -class KIO_EXPORT KSSLX509V3 { +class TDEIO_EXPORT KSSLX509V3 { friend class KSSLCertificate; friend class KSSLCertificatePrivate; public: diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h index 462624fcd..06b8febab 100644 --- a/kio/misc/kntlm/kntlm.h +++ b/kio/misc/kntlm/kntlm.h @@ -38,7 +38,7 @@ * This class doesn't maintain any state information, so all methods are static. */ -class KIO_EXPORT KNTLM { +class TDEIO_EXPORT KNTLM { public: enum Flags { diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h index 1f68ac688..0c57096a8 100644 --- a/kio/misc/tdesasl/tdesasl.h +++ b/kio/misc/tdesasl/tdesasl.h @@ -69,7 +69,7 @@ class TQStrIList; * @version $Id$ */ -class KIO_EXPORT KDESasl +class TDEIO_EXPORT KDESasl { public: diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h index c7cfaf5c0..abe935ad5 100644 --- a/kio/misc/uiserver.h +++ b/kio/misc/uiserver.h @@ -55,7 +55,7 @@ struct ListProgressColumnConfig * List view in the UIServer. * @internal */ -class KIO_EXPORT ListProgress : public KListView { +class TDEIO_EXPORT ListProgress : public KListView { Q_OBJECT @@ -103,7 +103,7 @@ protected: * One item in the ListProgress * @internal */ -class KIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { +class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { Q_OBJECT @@ -214,7 +214,7 @@ class UIServerSystemTray; * * @internal */ -class KIO_EXPORT UIServer : public KMainWindow, public DCOPObject { +class TDEIO_EXPORT UIServer : public KMainWindow, public DCOPObject { K_DCOP Q_OBJECT diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index a0da57244..e811aaec4 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -551,7 +551,7 @@ void JobTest::copyFileToSystem() void JobTest::copyFileToSystem( bool resolve_local_urls ) { kdDebug() << k_funcinfo << resolve_local_urls << endl; - extern KIO_EXPORT bool kio_resolve_local_urls; + extern TDEIO_EXPORT bool kio_resolve_local_urls; kio_resolve_local_urls = resolve_local_urls; const TQString src = homeTmpDir() + "fileFromHome"; diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index cbff13fdf..0973b0b3b 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -2152,7 +2152,7 @@ bool HTTPProtocol::httpOpenConnection() * data to be sent in addition to the header (POST requests) and there is no * way for this function to get that data. This function is called in the * slotPut() or slotGet() functions which, in turn, are called (indirectly) as - * a result of a KIOJob::put() or KIOJob::get(). It is those latter functions + * a result of a TDEIOJob::put() or TDEIOJob::get(). It is those latter functions * which are responsible for starting up this ioslave in the first place. * This means that 'httpOpen' is called (essentially) as soon as the ioslave * is created -- BEFORE any data gets to this slave. @@ -4317,7 +4317,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d) /** * This function is our "receive" function. It is responsible for * downloading the message (not the header) from the HTTP server. It - * is called either as a response to a client's KIOJob::dataEnd() + * is called either as a response to a client's TDEIOJob::dataEnd() * (meaning that the client is done sending data) or by 'httpOpen()' * (if we are in the process of a PUT/POST request). It can also be * called by a webDAV function, to receive stat/list/property/etc. diff --git a/kparts/COMMENTS b/kparts/COMMENTS index 80e5671d1..1a9773212 100644 --- a/kparts/COMMENTS +++ b/kparts/COMMENTS @@ -180,7 +180,7 @@ What do you think ? Did I overlook something ? (Simon) I don't think there's a problem with the async stuff (BrowserView/KReadOnlyPart) . Mosfet's KGhostView browserview or - his dviview are both 100% like KReadOnlyPart (yes, they launch KIOJob::copy() + his dviview are both 100% like KReadOnlyPart (yes, they launch TDEIOJob::copy() and copy the file to some local temp) . It works :-) and noone complains :-)) -> I see no problem with that :-) (David) Sure - but does that answer the question : KReadOnlyPart==KBrowserPart ? diff --git a/kwallet/client/kwallet.h b/kwallet/client/kwallet.h index cbe8188a5..38157955b 100644 --- a/kwallet/client/kwallet.h +++ b/kwallet/client/kwallet.h @@ -50,7 +50,7 @@ namespace KWallet { * @author George Staikos * @short KDE Wallet Class */ -class KIO_EXPORT Wallet : public TQObject, public DCOPObject { +class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject { K_DCOP Q_OBJECT protected: diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp index 951c41244..2424c95e9 100644 --- a/tdecore/kbufferedio.cpp +++ b/tdecore/kbufferedio.cpp @@ -29,7 +29,7 @@ /** * @section impldetails Implementation Details * - * The KBufferedIO class has two purposes: first, it defines an API on how + * The TDEBufferedIO class has two purposes: first, it defines an API on how * that classes providing buffered I/O should provide. Next, it implements on * top of that API a generic buffering, that should suffice for most cases. * @@ -86,7 +86,7 @@ */ // constructor -KBufferedIO::KBufferedIO() : +TDEBufferedIO::TDEBufferedIO() : inBufIndex(0), outBufIndex(0) { inBuf.setAutoDelete(true); @@ -94,14 +94,14 @@ KBufferedIO::KBufferedIO() : } // destructor -KBufferedIO::~KBufferedIO() +TDEBufferedIO::~TDEBufferedIO() { } // sets the buffer sizes // this implementation doesn't support setting the buffer sizes // if any parameter is different than -1 or -2, fail -bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) +bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) { if (wsize != -2 && wsize != -1) return false; @@ -112,27 +112,27 @@ bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) } #ifdef USE_QT3 -int KBufferedIO::bytesAvailable() const +int TDEBufferedIO::bytesAvailable() const #endif // USE_QT3 #ifdef USE_QT4 -qint64 KBufferedIO::bytesAvailable() const +qint64 TDEBufferedIO::bytesAvailable() const #endif // USE_QT4 { return readBufferSize(); } #ifdef USE_QT3 -int KBufferedIO::bytesToWrite() const +int TDEBufferedIO::bytesToWrite() const #endif // USE_QT3 #ifdef USE_QT4 -qint64 KBufferedIO::bytesToWrite() const +qint64 TDEBufferedIO::bytesToWrite() const #endif // USE_QT4 { return writeBufferSize(); } // This function will scan the read buffer for a '\n' -bool KBufferedIO::canReadLine() const +bool TDEBufferedIO::canReadLine() const { if (bytesAvailable() == 0) return false; // no new line in here @@ -140,7 +140,7 @@ bool KBufferedIO::canReadLine() const TQByteArray* buf; // scan each TQByteArray for the occurrence of '\n' - TQPtrList &buflist = ((KBufferedIO*)this)->inBuf; + TQPtrList &buflist = ((TDEBufferedIO*)this)->inBuf; buf = buflist.first(); char *p = buf->data() + inBufIndex; int n = buf->size() - inBufIndex; @@ -162,7 +162,7 @@ bool KBufferedIO::canReadLine() const // unreads the current data // that is, writes into the read buffer, at the beginning -int KBufferedIO::unreadBlock(const char *data, uint len) +int TDEBufferedIO::unreadBlock(const char *data, uint len) { return feedReadBuffer(len, data, true); } @@ -171,7 +171,7 @@ int KBufferedIO::unreadBlock(const char *data, uint len) // protected member functions // -unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard) +unsigned TDEBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard) { { register unsigned u = readBufferSize(); @@ -221,7 +221,7 @@ unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool return copied; } -void KBufferedIO::consumeWriteBuffer(unsigned nbytes) +void TDEBufferedIO::consumeWriteBuffer(unsigned nbytes) { TQByteArray *buf = outBuf.first(); if (buf == NULL) @@ -250,7 +250,7 @@ void KBufferedIO::consumeWriteBuffer(unsigned nbytes) } } -unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning) +unsigned TDEBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning) { if (nbytes == 0) return 0; @@ -266,7 +266,7 @@ unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool a return nbytes; } -unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) +unsigned TDEBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) { if (nbytes == 0) return 0; @@ -277,33 +277,33 @@ unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) return nbytes; } -unsigned KBufferedIO::readBufferSize() const +unsigned TDEBufferedIO::readBufferSize() const { unsigned count = 0; - TQByteArray *buf = ((KBufferedIO*)this)->inBuf.first(); + TQByteArray *buf = ((TDEBufferedIO*)this)->inBuf.first(); while (buf != NULL) { count += buf->size(); - buf = ((KBufferedIO*)this)->inBuf.next(); + buf = ((TDEBufferedIO*)this)->inBuf.next(); } return count - inBufIndex; } -unsigned KBufferedIO::writeBufferSize() const +unsigned TDEBufferedIO::writeBufferSize() const { unsigned count = 0; - TQByteArray *buf = ((KBufferedIO*)this)->outBuf.first(); + TQByteArray *buf = ((TDEBufferedIO*)this)->outBuf.first(); while (buf != NULL) { count += buf->size(); - buf = (const_cast(this))->outBuf.next(); + buf = (const_cast(this))->outBuf.next(); } return count - outBufIndex; } -void KBufferedIO::virtual_hook( int id, void* data ) +void TDEBufferedIO::virtual_hook( int id, void* data ) { KAsyncIO::virtual_hook( id, data ); } #include "kbufferedio.moc" diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h index 78bccc9ef..f00ab52b6 100644 --- a/tdecore/kbufferedio.h +++ b/tdecore/kbufferedio.h @@ -25,7 +25,7 @@ #include #include "kasyncio.h" -class KBufferedIOPrivate; +class TDEBufferedIOPrivate; /** * This abstract class implements basic functionality for buffered * input/output. @@ -39,7 +39,7 @@ class KBufferedIOPrivate; * written using QSocket's buffering characteristics will be more easily * ported to the more powerful KExtendedSocket class. * - * KBufferedIO already provides a powerful internal buffering algorithm. However, + * TDEBufferedIO already provides a powerful internal buffering algorithm. However, * this does not include the I/O itself, which must be implemented in * derived classes. Thus, to implement a class that does some I/O, you must * override, in addition to the pure virtual TQIODevice methods, these two: @@ -53,14 +53,14 @@ class KBufferedIOPrivate; * @author Thiago Macieira * @short Buffered I/O */ -class TDECORE_EXPORT KBufferedIO: public KAsyncIO +class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO { Q_OBJECT protected: // no default public constructor - KBufferedIO(); + TDEBufferedIO(); public: /** @@ -79,7 +79,7 @@ public: * Destroys this class. The flushing of the buffers is implementation dependant. * The default implementation discards the contents */ - virtual ~KBufferedIO(); + virtual ~TDEBufferedIO(); /** * Closes the stream now, discarding the contents of the @@ -294,7 +294,7 @@ protected: protected: virtual void virtual_hook( int id, void* data ); private: - KBufferedIOPrivate *d; + TDEBufferedIOPrivate *d; }; #endif // KBUFFEREDIO_H diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index 9813a0e16..ab08d0ed2 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -228,7 +228,7 @@ 7004 kio (KDirListerCache) 7005 kio (Filter) 7006 kio (Scheduler) -7007 kio (KIOJob) +7007 kio (TDEIOJob) 7009 kio (KMimeType) 7010 kio (KRun) 7011 kio (KSycoca) diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index d77d2c561..de1735382 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -1570,7 +1570,7 @@ qint64 KExtendedSocket::bytesAvailable() const // as of now, we don't do any extra processing // we only work in input-buffered sockets if (d->flags & inputBufferedSocket) - return KBufferedIO::bytesAvailable(); + return TDEBufferedIO::bytesAvailable(); return 0; // TODO: FIONREAD ioctl } @@ -2246,6 +2246,6 @@ const char* KAddressInfo::canonname() const } void KExtendedSocket::virtual_hook( int id, void* data ) -{ KBufferedIO::virtual_hook( id, data ); } +{ TDEBufferedIO::virtual_hook( id, data ); } #include "kextsock.moc" diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h index 6327d51dc..fad502c04 100644 --- a/tdecore/kextsock.h +++ b/tdecore/kextsock.h @@ -92,7 +92,7 @@ class KExtendedSocketPrivate; * @author Thiago Macieira * @short an extended socket */ -class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice +class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice { Q_OBJECT @@ -582,7 +582,7 @@ public: * @li #closed() will only be sent if we are indeed reading from the input * stream. That is, if this socket is buffering the input. See setBufferSize * - * Note that, in general, functions inherited/overridden from KBufferedIO will only + * Note that, in general, functions inherited/overridden from TDEBufferedIO will only * work on buffered sockets, like bytesAvailable and bytesToWrite. * @return The return values are: * @li 0: success diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 943ad1b9a..1c6232068 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -17,8 +17,8 @@ */ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) -#undef KIO_EXPORT -#define KIO_EXPORT KDE_EXPORT +#undef TDEIO_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #endif #define KPROTOCOLINFO_TDECORE diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h index 36ceafba6..4dcae30b7 100644 --- a/tdecore/ksimpledirwatch.h +++ b/tdecore/ksimpledirwatch.h @@ -63,7 +63,7 @@ class KSimpleDirWatchPrivate; * @short Class for watching directory and file changes. * @author Sven Radej */ -class KIO_EXPORT KSimpleDirWatch : public TQObject +class TDEIO_EXPORT KSimpleDirWatch : public TQObject { Q_OBJECT diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index 1b08d121e..3e9462922 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -35,28 +35,28 @@ using namespace KNetwork; using namespace KNetwork::Internal; -class KNetwork::KBufferedSocketPrivate +class KNetwork::TDEBufferedSocketPrivate { public: mutable TDESocketBuffer *input, *output; - KBufferedSocketPrivate() + TDEBufferedSocketPrivate() { input = 0L; output = 0L; } }; -KBufferedSocket::KBufferedSocket(const TQString& host, const TQString& service, +TDEBufferedSocket::TDEBufferedSocket(const TQString& host, const TQString& service, TQObject *parent, const char *name) : KStreamSocket(host, service, parent, name), - d(new KBufferedSocketPrivate) + d(new TDEBufferedSocketPrivate) { setInputBuffering(true); setOutputBuffering(true); } -KBufferedSocket::~KBufferedSocket() +TDEBufferedSocket::~TDEBufferedSocket() { closeNow(); delete d->input; @@ -64,13 +64,13 @@ KBufferedSocket::~KBufferedSocket() delete d; } -void KBufferedSocket::setSocketDevice(TDESocketDevice* device) +void TDEBufferedSocket::setSocketDevice(TDESocketDevice* device) { KStreamSocket::setSocketDevice(device); device->setBlocking(false); } -bool KBufferedSocket::setSocketOptions(int opts) +bool TDEBufferedSocket::setSocketOptions(int opts) { if (opts == Blocking) return false; @@ -79,7 +79,7 @@ bool KBufferedSocket::setSocketOptions(int opts) return KStreamSocket::setSocketOptions(opts); } -void KBufferedSocket::close() +void TDEBufferedSocket::close() { if (!d->output || d->output->isEmpty()) closeNow(); @@ -94,10 +94,10 @@ void KBufferedSocket::close() } #ifdef USE_QT3 -TQ_LONG KBufferedSocket::bytesAvailable() const +TQ_LONG TDEBufferedSocket::bytesAvailable() const #endif #ifdef USE_QT4 -qint64 KBufferedSocket::bytesAvailable() const +qint64 TDEBufferedSocket::bytesAvailable() const #endif { if (!d->input) @@ -106,7 +106,7 @@ qint64 KBufferedSocket::bytesAvailable() const return d->input->length(); } -TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) +TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout) { TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout); if (d->input) @@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) return retval; } -TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) { if (d->input) { @@ -134,13 +134,13 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return KStreamSocket::tqreadBlock(data, maxlen); } -TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) +TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return tqreadBlock(data, maxlen); } -TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) +TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) { if (d->input) { @@ -156,13 +156,13 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) return KStreamSocket::peekBlock(data, maxlen); } -TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) +TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return peekBlock(data, maxlen); } -TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) { if (state() != Connected) { @@ -192,14 +192,14 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len return KStreamSocket::tqwriteBlock(data, len); } -TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, +TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, const TDESocketAddress&) { // ignore the third parameter return tqwriteBlock(data, maxlen); } -void KBufferedSocket::enableRead(bool enable) +void TDEBufferedSocket::enableRead(bool enable) { KStreamSocket::enableRead(enable); if (!enable && d->input) @@ -216,7 +216,7 @@ void KBufferedSocket::enableRead(bool enable) TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); } -void KBufferedSocket::enableWrite(bool enable) +void TDEBufferedSocket::enableWrite(bool enable) { KStreamSocket::enableWrite(enable); if (!enable && d->output && !d->output->isEmpty()) @@ -228,7 +228,7 @@ void KBufferedSocket::enableWrite(bool enable) } } -void KBufferedSocket::stateChanging(SocketState newState) +void TDEBufferedSocket::stateChanging(SocketState newState) { if (newState == Connecting || newState == Connected) { @@ -246,7 +246,7 @@ void KBufferedSocket::stateChanging(SocketState newState) KStreamSocket::stateChanging(newState); } -void KBufferedSocket::setInputBuffering(bool enable) +void TDEBufferedSocket::setInputBuffering(bool enable) { TQMutexLocker locker(mutex()); if (!enable) @@ -260,12 +260,12 @@ void KBufferedSocket::setInputBuffering(bool enable) } } -KIOBufferBase* KBufferedSocket::inputBuffer() +TDEIOBufferBase* TDEBufferedSocket::inputBuffer() { return d->input; } -void KBufferedSocket::setOutputBuffering(bool enable) +void TDEBufferedSocket::setOutputBuffering(bool enable) { TQMutexLocker locker(mutex()); if (!enable) @@ -279,16 +279,16 @@ void KBufferedSocket::setOutputBuffering(bool enable) } } -KIOBufferBase* KBufferedSocket::outputBuffer() +TDEIOBufferBase* TDEBufferedSocket::outputBuffer() { return d->output; } #ifdef USE_QT3 -TQ_ULONG KBufferedSocket::bytesToWrite() const +TQ_ULONG TDEBufferedSocket::bytesToWrite() const #endif #ifdef USE_QT4 -qint64 KBufferedSocket::bytesToWrite() const +qint64 TDEBufferedSocket::bytesToWrite() const #endif { if (!d->output) @@ -297,14 +297,14 @@ qint64 KBufferedSocket::bytesToWrite() const return d->output->length(); } -void KBufferedSocket::closeNow() +void TDEBufferedSocket::closeNow() { KStreamSocket::close(); if (d->output) d->output->clear(); } -bool KBufferedSocket::canReadLine() const +bool TDEBufferedSocket::canReadLine() const { if (!d->input) return false; @@ -312,12 +312,12 @@ bool KBufferedSocket::canReadLine() const return d->input->canReadLine(); } -TQCString KBufferedSocket::readLine() +TQCString TDEBufferedSocket::readLine() { return d->input->readLine(); } -void KBufferedSocket::waitForConnect() +void TDEBufferedSocket::waitForConnect() { if (state() != Connecting) return; // nothing to be waited on @@ -327,7 +327,7 @@ void KBufferedSocket::waitForConnect() KStreamSocket::setSocketOptions(socketOptions() & ~Blocking); } -void KBufferedSocket::slotReadActivity() +void TDEBufferedSocket::slotReadActivity() { if (d->input && state() == Connected) { @@ -374,7 +374,7 @@ void KBufferedSocket::slotReadActivity() } } -void KBufferedSocket::slotWriteActivity() +void TDEBufferedSocket::slotWriteActivity() { if (d->output && !d->output->isEmpty() && (state() == Connected || state() == Closing)) diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h index 158a5a434..60ad3e81d 100644 --- a/tdecore/network/kbufferedsocket.h +++ b/tdecore/network/kbufferedsocket.h @@ -31,12 +31,12 @@ #include "kstreamsocket.h" #include -class KIOBufferBase; +class TDEIOBufferBase; namespace KNetwork { -class KBufferedSocketPrivate; -/** @class KBufferedSocket kbufferedsocket.h kbufferedsocket.h +class TDEBufferedSocketPrivate; +/** @class TDEBufferedSocket kbufferedsocket.h kbufferedsocket.h * @brief Buffered stream sockets. * * This class allows the user to create and operate buffered stream sockets @@ -55,7 +55,7 @@ class KBufferedSocketPrivate; * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ -class TDECORE_EXPORT KBufferedSocket: public KStreamSocket +class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket { Q_OBJECT @@ -68,13 +68,13 @@ public: * @param parent the parent object for this object * @param name the internal name for this object */ - KBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null, + TDEBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null, TQObject* parent = 0L, const char *name = 0L); /** * Destructor. */ - virtual ~KBufferedSocket(); + virtual ~TDEBufferedSocket(); /** * Be sure to catch new devices. @@ -168,7 +168,7 @@ public: /** * Retrieves the input buffer object. */ - KIOBufferBase* inputBuffer(); + TDEIOBufferBase* inputBuffer(); /** * Sets the use of output buffering. @@ -178,7 +178,7 @@ public: /** * Retrieves the output buffer object. */ - KIOBufferBase* outputBuffer(); + TDEIOBufferBase* outputBuffer(); /** * Returns the length of the output buffer. @@ -240,10 +240,10 @@ signals: void bytesWritten(int bytes); private: - KBufferedSocket(const KBufferedSocket&); - KBufferedSocket& operator=(const KBufferedSocket&); + TDEBufferedSocket(const TDEBufferedSocket&); + TDEBufferedSocket& operator=(const TDEBufferedSocket&); - KBufferedSocketPrivate *d; + TDEBufferedSocketPrivate *d; public: // KDE4: remove this function @@ -253,7 +253,7 @@ public: * * This function is provided to ease porting from KExtendedSocket, * which required a call to reset() in order to be able to connect again - * using the same device. This is not necessary in KBufferedSocket any more. + * using the same device. This is not necessary in TDEBufferedSocket any more. */ #ifdef USE_QT3 inline void reset() diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h index 68c45dd28..27da219a9 100644 --- a/tdecore/network/kclientsocketbase.h +++ b/tdecore/network/kclientsocketbase.h @@ -46,7 +46,7 @@ class KClientSocketBasePrivate; * such as, and especially, name resolution and signals. * * @note This class is abstract. If you're looking for a normal, - * client socket class, see @ref KStreamSocket and KBufferedSocket + * client socket class, see @ref KStreamSocket and TDEBufferedSocket * * @author Thiago Macieira */ diff --git a/tdecore/network/kiobuffer.h b/tdecore/network/kiobuffer.h index ac1352a4d..c79daaa70 100644 --- a/tdecore/network/kiobuffer.h +++ b/tdecore/network/kiobuffer.h @@ -32,41 +32,41 @@ class TQIODevice; /** - * @class KIOBufferBase kiobuffer.h kiobuffer.h + * @class TDEIOBufferBase kiobuffer.h kiobuffer.h * @brief base for I/O buffer implementation * * This class declares the base methods to interface with an I/O buffer. * Most applications will not need to access this class directly, since - * it is all handled by @ref KNetwork::KBufferedSocket and other buffering + * it is all handled by @ref KNetwork::TDEBufferedSocket and other buffering * classes. * * @author Thiago Macieira */ -class KIOBufferBase +class TDEIOBufferBase { public: /** * Default constructor. Does nothing. */ - KIOBufferBase() + TDEIOBufferBase() { } /** * Copy constructor. Does nothing here. */ - KIOBufferBase(const KIOBufferBase& ) + TDEIOBufferBase(const TDEIOBufferBase& ) { } /** * Virtual destructor. Does nothing. */ - virtual ~KIOBufferBase() + virtual ~TDEIOBufferBase() { } /** * Assignment operator. Does nothing. */ - KIOBufferBase& operator=(const KIOBufferBase& ) + TDEIOBufferBase& operator=(const TDEIOBufferBase& ) { return *this; } /** diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index d5a1b90bb..16a48cdf2 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -47,11 +47,11 @@ public: int backlog; int timeout; - bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1; + bool bindWhenFound : 1, listenWhenBound : 1, useTDEBufferedSocket : 1; TDEServerSocketPrivate() : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false), - useKBufferedSocket(true) + useTDEBufferedSocket(true) { resolver.setFlags(KResolver::Passive); resolver.setFamily(KResolver::KnownFamily); @@ -277,7 +277,7 @@ void TDEServerSocket::close() void TDEServerSocket::setAcceptBuffered(bool enable) { - d->useKBufferedSocket = enable; + d->useTDEBufferedSocket = enable; } KActiveSocketBase* TDEServerSocket::accept() @@ -319,8 +319,8 @@ KActiveSocketBase* TDEServerSocket::accept() } KStreamSocket* streamsocket; - if (d->useKBufferedSocket) - streamsocket = new KBufferedSocket(); + if (d->useTDEBufferedSocket) + streamsocket = new TDEBufferedSocket(); else streamsocket = new KStreamSocket(); streamsocket->setSocketDevice(accepted); diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index 6821a886a..edb86d0b2 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -95,13 +95,13 @@ class TDEServerSocketPrivate; * * It is important to note that @ref accept can return either an * object of type KNetwork::KStreamSocket or - * KNetwork::KBufferedSocket (default). If you want to accept a + * KNetwork::TDEBufferedSocket (default). If you want to accept a * non-buffered socket, you must first call setAcceptBuffered. * * @warning If you use TDEServerSocket in an auxiliary (non-GUI) thread, * you need to accept only KNetwork::KStreamSocket objects. * - * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket + * @see KNetwork::KStreamSocket, KNetwork::TDEBufferedSocket * @author Thiago Macieira */ class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase @@ -338,7 +338,7 @@ public: * Toggles whether the accepted socket will be buffered or not. * That is, the @ref accept function will always return a KStreamSocket * object or descended from it. If buffering is enabled, the class - * to be returned will be KBufferedSocket. + * to be returned will be TDEBufferedSocket. * * By default, this flag is set to true. * @@ -361,7 +361,7 @@ public: * the base class for active sockets, but it is guaranteed * that the object will be a KStreamSocket or derived from it. * - * @sa KBufferedSocket + * @sa TDEBufferedSocket * @sa setAcceptBuffered */ virtual KActiveSocketBase* accept(); diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index d077296c1..c1f9e5848 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -35,7 +35,7 @@ namespace KNetwork { class KResolverEntry; class KResolverResults; class TDEServerSocket; -class KBufferedSocket; +class TDEBufferedSocket; class KStreamSocketPrivate; /** @class KStreamSocket kstreamsocket.h kstreamsocket.h @@ -50,7 +50,7 @@ class KStreamSocketPrivate; * * KStreamSocket objects are thread-safe and can be used in auxiliary * threads (i.e., not the thread in which the Qt event loop runs in). - * Note that KBufferedSocket cannot be used reliably in an auxiliary thread. + * Note that TDEBufferedSocket cannot be used reliably in an auxiliary thread. * * Sample usage: * \code @@ -91,7 +91,7 @@ class KStreamSocketPrivate; * } * \endcode * - * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket + * @see KNetwork::TDEBufferedSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ class TDECORE_EXPORT KStreamSocket: public KClientSocketBase @@ -242,7 +242,7 @@ private: KStreamSocketPrivate *d; friend class TDEServerSocket; - friend class KBufferedSocket; + friend class TDEBufferedSocket; }; } // namespace KNetwork diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp index 52988d344..33b8fe776 100644 --- a/tdecore/network/tdesocketbuffer.cpp +++ b/tdecore/network/tdesocketbuffer.cpp @@ -39,7 +39,7 @@ TDESocketBuffer::TDESocketBuffer(TQ_LONG size) } TDESocketBuffer::TDESocketBuffer(const TDESocketBuffer& other) - : KIOBufferBase(other), m_mutex(true) + : TDEIOBufferBase(other), m_mutex(true) { *this = other; } @@ -54,7 +54,7 @@ TDESocketBuffer& TDESocketBuffer::operator=(const TDESocketBuffer& other) TQMutexLocker locker1(&m_mutex); TQMutexLocker locker2(&other.m_mutex); - KIOBufferBase::operator=(other); + TDEIOBufferBase::operator=(other); m_list = other.m_list; // copy-on-write m_offset = other.m_offset; diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h index be71f462e..0fa5d4e37 100644 --- a/tdecore/network/tdesocketbuffer_p.h +++ b/tdecore/network/tdesocketbuffer_p.h @@ -41,11 +41,11 @@ class KActiveSocketBase; * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h * @brief generic socket buffering code * - * This class implements generic buffering used by @ref KBufferedSocket. + * This class implements generic buffering used by @ref TDEBufferedSocket. * * @author Thiago Macieira */ -class TDESocketBuffer: public KIOBufferBase +class TDESocketBuffer: public TDEIOBufferBase { public: /** diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index 767752689..a226eac94 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -37,7 +37,7 @@ #define TDEFX_EXPORT KDE_EXPORT #define TDEPRINT_EXPORT KDE_EXPORT #define KDNSSD_EXPORT KDE_EXPORT -#define KIO_EXPORT KDE_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #define DCOP_EXPORT KDE_EXPORT #define KPARTS_EXPORT KDE_EXPORT #define KTEXTEDITOR_EXPORT KDE_EXPORT @@ -73,8 +73,8 @@ # ifndef TDECORE_EXPORT_DEPRECATED # define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT # endif -# ifndef KIO_EXPORT_DEPRECATED -# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT +# ifndef TDEIO_EXPORT_DEPRECATED +# define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT # endif # ifndef TDEUI_EXPORT_DEPRECATED # define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index b0d61b8ac..e5d45a42a 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -992,7 +992,7 @@ void KMCupsManager::checkUpdatePossibleInternal() { kdDebug(500) << "Checking for update possible" << endl; delete m_socket; - m_socket = new KNetwork::KBufferedSocket; + m_socket = new KNetwork::TDEBufferedSocket; m_socket->setTimeout( 1500 ); connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), TQT_SLOT( slotConnectionSuccess() ) ); diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h index 17663a5fa..a61464ed3 100644 --- a/win/tdelibs_export_win.h +++ b/win/tdelibs_export_win.h @@ -63,11 +63,11 @@ # define TDEPRINT_EXPORT KDE_IMPORT #endif -#ifndef KIO_EXPORT +#ifndef TDEIO_EXPORT # ifdef MAKE_KIO_LIB -# define KIO_EXPORT KDE_EXPORT +# define TDEIO_EXPORT KDE_EXPORT # else -# define KIO_EXPORT KDE_IMPORT +# define TDEIO_EXPORT KDE_IMPORT # endif #endif -- cgit v1.2.3 From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:21 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- CMakeLists.txt | 26 +- KDE2PORTING.html | 10 +- KDE3PORTING.html | 14 +- Mainpage.dox | 32 +- Makefile.am.in | 22 +- README | 16 +- TODO | 4 +- arts/knotify/Makefile.am | 2 +- configure.in.in | 6 +- dcop/Makefile.am | 6 +- dcop/testdcop.cpp | 4 +- dnssd/CMakeLists.txt | 4 +- dnssd/Makefile.am | 10 +- dnssd/README | 2 +- dnssd/kcm_kdnssd.kcfg | 39 - dnssd/kcm_tdednssd.kcfg | 39 + dnssd/settings.kcfgc | 2 +- doc/CMakeLists.txt | 2 +- doc/Makefile.am | 2 +- doc/kspell/CMakeLists.txt | 13 - doc/kspell/Makefile.am | 5 - doc/kspell/index.docbook | 174 - doc/tdelibs/man-kbuildsycoca.8.docbook | 2 +- doc/tdespell/CMakeLists.txt | 13 + doc/tdespell/Makefile.am | 5 + doc/tdespell/index.docbook | 174 + interfaces/CMakeLists.txt | 8 +- interfaces/Makefile.am | 4 +- interfaces/khexedit/Makefile.am | 2 +- interfaces/khexedit/byteseditinterface.h | 2 +- interfaces/kimproxy/CMakeLists.txt | 13 - interfaces/kimproxy/Makefile.am | 1 - interfaces/kimproxy/TODO | 10 - interfaces/kimproxy/interface/CMakeLists.txt | 22 - interfaces/kimproxy/interface/Makefile.am | 13 - .../interface/dcopinstantmessenger.desktop | 72 - .../interface/kcm_instantmessenger.desktop | 138 - interfaces/kimproxy/interface/kimiface.h | 500 -- interfaces/kimproxy/library/CMakeLists.txt | 51 - interfaces/kimproxy/library/Makefile.am | 26 - interfaces/kimproxy/library/icons/CMakeLists.txt | 13 - interfaces/kimproxy/library/icons/Makefile.am | 1 - .../library/icons/cr16-action-presence_away.png | Bin 852 -> 0 bytes .../library/icons/cr16-action-presence_offline.png | Bin 549 -> 0 bytes .../library/icons/cr16-action-presence_online.png | Bin 922 -> 0 bytes .../library/icons/cr16-action-presence_unknown.png | Bin 822 -> 0 bytes .../library/icons/cr32-action-presence_away.png | Bin 2402 -> 0 bytes .../library/icons/cr32-action-presence_offline.png | Bin 1407 -> 0 bytes .../library/icons/cr32-action-presence_online.png | Bin 2547 -> 0 bytes .../library/icons/cr32-action-presence_unknown.png | Bin 2483 -> 0 bytes .../library/icons/cr48-action-presence_away.png | Bin 3328 -> 0 bytes .../library/icons/cr48-action-presence_offline.png | Bin 1717 -> 0 bytes .../library/icons/cr48-action-presence_online.png | Bin 3370 -> 0 bytes interfaces/kimproxy/library/kimproxy.cpp | 653 -- interfaces/kimproxy/library/kimproxy.h | 654 -- interfaces/kimproxy/library/kimproxyiface.h | 38 - interfaces/kmediaplayer/CMakeLists.txt | 60 - interfaces/kmediaplayer/Makefile.am | 18 - .../kmediaplayer/kfileaudiopreview/CMakeLists.txt | 46 - .../kmediaplayer/kfileaudiopreview/Makefile.am | 13 - .../kfileaudiopreview/kfileaudiopreview.cpp | 146 - .../kfileaudiopreview/kfileaudiopreview.h | 64 - interfaces/kmediaplayer/kmediaplayer.desktop | 4 - interfaces/kmediaplayer/kmediaplayerengine.desktop | 3 - interfaces/kmediaplayer/player.cpp | 79 - interfaces/kmediaplayer/player.h | 143 - interfaces/kmediaplayer/playerdcopobject.h | 62 - interfaces/kmediaplayer/view.cpp | 89 - interfaces/kmediaplayer/view.h | 98 - interfaces/kscript/CMakeLists.txt | 56 - interfaces/kscript/Makefile.am | 21 - interfaces/kscript/README | 14 - interfaces/kscript/sample/CMakeLists.txt | 43 - interfaces/kscript/sample/Makefile.am | 13 - interfaces/kscript/sample/shellscript.cpp | 85 - interfaces/kscript/sample/shellscript.desktop | 153 - interfaces/kscript/sample/shellscript.h | 48 - interfaces/kscript/scriptclientinterface.h | 124 - interfaces/kscript/scriptinterface.desktop | 89 - interfaces/kscript/scriptinterface.h | 88 - interfaces/kscript/scriptloader.cpp | 104 - interfaces/kscript/scriptloader.h | 59 - interfaces/kscript/scriptmanager.cpp | 132 - interfaces/kscript/scriptmanager.h | 139 - interfaces/kspeech/Makefile.am | 2 +- interfaces/kspeech/kspeech.h | 2 +- interfaces/ktexteditor/.kateconfig | 1 - interfaces/ktexteditor/CMakeLists.txt | 96 - interfaces/ktexteditor/Makefile.am | 52 - .../ktexteditor/blockselectiondcopinterface.cpp | 33 - .../ktexteditor/blockselectiondcopinterface.h | 60 - interfaces/ktexteditor/blockselectioninterface.cpp | 74 - interfaces/ktexteditor/blockselectioninterface.h | 82 - interfaces/ktexteditor/clipboarddcopinterface.cpp | 40 - interfaces/ktexteditor/clipboarddcopinterface.h | 54 - interfaces/ktexteditor/clipboardinterface.cpp | 56 - interfaces/ktexteditor/clipboardinterface.h | 74 - interfaces/ktexteditor/codecompletioninterface.cpp | 51 - interfaces/ktexteditor/codecompletioninterface.h | 202 - interfaces/ktexteditor/configinterface.cpp | 79 - interfaces/ktexteditor/configinterface.h | 93 - .../ktexteditor/configinterfaceextension.cpp | 84 - interfaces/ktexteditor/configinterfaceextension.h | 116 - interfaces/ktexteditor/cursorinterface.cpp | 69 - interfaces/ktexteditor/cursorinterface.h | 84 - interfaces/ktexteditor/document.h | 85 - interfaces/ktexteditor/documentdcopinfo.cpp | 33 - interfaces/ktexteditor/documentdcopinfo.h | 47 - interfaces/ktexteditor/documentinfo.cpp | 65 - interfaces/ktexteditor/documentinfo.h | 60 - interfaces/ktexteditor/dynwordwrapinterface.cpp | 69 - interfaces/ktexteditor/dynwordwrapinterface.h | 64 - interfaces/ktexteditor/editdcopinterface.cpp | 61 - interfaces/ktexteditor/editdcopinterface.h | 90 - interfaces/ktexteditor/editinterface.cpp | 57 - interfaces/ktexteditor/editinterface.h | 137 - interfaces/ktexteditor/editinterfaceext.cpp | 50 - interfaces/ktexteditor/editinterfaceext.h | 74 - interfaces/ktexteditor/editor.h | 65 - interfaces/ktexteditor/editorchooser.cpp | 162 - interfaces/ktexteditor/editorchooser.h | 58 - interfaces/ktexteditor/editorchooser_ui.ui | 64 - interfaces/ktexteditor/encodingdcopinterface.cpp | 28 - interfaces/ktexteditor/encodingdcopinterface.h | 46 - interfaces/ktexteditor/encodinginterface.cpp | 76 - interfaces/ktexteditor/encodinginterface.h | 63 - interfaces/ktexteditor/highlightinginterface.cpp | 69 - interfaces/ktexteditor/highlightinginterface.h | 92 - interfaces/ktexteditor/kcm_ktexteditor.desktop | 172 - interfaces/ktexteditor/ktexteditor.cpp | 242 - interfaces/ktexteditor/ktexteditor.desktop | 86 - interfaces/ktexteditor/ktexteditoreditor.desktop | 86 - interfaces/ktexteditor/ktexteditorplugin.desktop | 87 - interfaces/ktexteditor/markinterface.cpp | 74 - interfaces/ktexteditor/markinterface.h | 171 - interfaces/ktexteditor/markinterfaceextension.cpp | 69 - interfaces/ktexteditor/markinterfaceextension.h | 83 - interfaces/ktexteditor/plugin.h | 88 - interfaces/ktexteditor/popupmenuinterface.cpp | 69 - interfaces/ktexteditor/popupmenuinterface.h | 66 - interfaces/ktexteditor/printdcopinterface.cpp | 30 - interfaces/ktexteditor/printdcopinterface.h | 46 - interfaces/ktexteditor/printinterface.cpp | 74 - interfaces/ktexteditor/printinterface.h | 63 - interfaces/ktexteditor/searchdcopinterface.cpp | 95 - interfaces/ktexteditor/searchdcopinterface.h | 59 - interfaces/ktexteditor/searchinterface.cpp | 55 - interfaces/ktexteditor/searchinterface.h | 65 - interfaces/ktexteditor/selectiondcopinterface.cpp | 64 - interfaces/ktexteditor/selectiondcopinterface.h | 72 - interfaces/ktexteditor/selectionextdcopinterface.h | 57 - interfaces/ktexteditor/selectioninterface.cpp | 65 - interfaces/ktexteditor/selectioninterface.h | 100 - interfaces/ktexteditor/selectioninterfaceext.cpp | 115 - interfaces/ktexteditor/selectioninterfaceext.h | 74 - interfaces/ktexteditor/sessionconfiginterface.cpp | 88 - interfaces/ktexteditor/sessionconfiginterface.h | 71 - interfaces/ktexteditor/templateinterface.cpp | 197 - interfaces/ktexteditor/templateinterface.h | 131 - interfaces/ktexteditor/texthintinterface.cpp | 66 - interfaces/ktexteditor/texthintinterface.h | 79 - interfaces/ktexteditor/undodcopinterface.cpp | 57 - interfaces/ktexteditor/undodcopinterface.h | 54 - interfaces/ktexteditor/undointerface.cpp | 74 - interfaces/ktexteditor/undointerface.h | 84 - interfaces/ktexteditor/variableinterface.cpp | 48 - interfaces/ktexteditor/variableinterface.h | 72 - interfaces/ktexteditor/view.h | 68 - interfaces/ktexteditor/viewcursordcopinterface.cpp | 68 - interfaces/ktexteditor/viewcursordcopinterface.h | 74 - interfaces/ktexteditor/viewcursorinterface.cpp | 74 - interfaces/ktexteditor/viewcursorinterface.h | 95 - .../ktexteditor/viewstatusmsgdcopinterface.cpp | 29 - .../ktexteditor/viewstatusmsgdcopinterface.h | 45 - interfaces/ktexteditor/viewstatusmsginterface.cpp | 76 - interfaces/ktexteditor/viewstatusmsginterface.h | 63 - interfaces/ktexteditor/wordwrapinterface.cpp | 70 - interfaces/ktexteditor/wordwrapinterface.h | 66 - interfaces/tdeimproxy/CMakeLists.txt | 13 + interfaces/tdeimproxy/Makefile.am | 1 + interfaces/tdeimproxy/TODO | 10 + interfaces/tdeimproxy/interface/CMakeLists.txt | 22 + interfaces/tdeimproxy/interface/Makefile.am | 13 + .../interface/dcopinstantmessenger.desktop | 72 + .../interface/kcm_instantmessenger.desktop | 138 + interfaces/tdeimproxy/interface/kimiface.h | 500 ++ interfaces/tdeimproxy/library/CMakeLists.txt | 51 + interfaces/tdeimproxy/library/Makefile.am | 26 + interfaces/tdeimproxy/library/icons/CMakeLists.txt | 13 + interfaces/tdeimproxy/library/icons/Makefile.am | 1 + .../library/icons/cr16-action-presence_away.png | Bin 0 -> 852 bytes .../library/icons/cr16-action-presence_offline.png | Bin 0 -> 549 bytes .../library/icons/cr16-action-presence_online.png | Bin 0 -> 922 bytes .../library/icons/cr16-action-presence_unknown.png | Bin 0 -> 822 bytes .../library/icons/cr32-action-presence_away.png | Bin 0 -> 2402 bytes .../library/icons/cr32-action-presence_offline.png | Bin 0 -> 1407 bytes .../library/icons/cr32-action-presence_online.png | Bin 0 -> 2547 bytes .../library/icons/cr32-action-presence_unknown.png | Bin 0 -> 2483 bytes .../library/icons/cr48-action-presence_away.png | Bin 0 -> 3328 bytes .../library/icons/cr48-action-presence_offline.png | Bin 0 -> 1717 bytes .../library/icons/cr48-action-presence_online.png | Bin 0 -> 3370 bytes interfaces/tdeimproxy/library/tdeimproxy.cpp | 653 ++ interfaces/tdeimproxy/library/tdeimproxy.h | 654 ++ interfaces/tdeimproxy/library/tdeimproxyiface.h | 38 + interfaces/tdemediaplayer/CMakeLists.txt | 60 + interfaces/tdemediaplayer/Makefile.am | 18 + .../kfileaudiopreview/CMakeLists.txt | 46 + .../tdemediaplayer/kfileaudiopreview/Makefile.am | 13 + .../kfileaudiopreview/kfileaudiopreview.cpp | 146 + .../kfileaudiopreview/kfileaudiopreview.h | 64 + interfaces/tdemediaplayer/player.cpp | 79 + interfaces/tdemediaplayer/player.h | 143 + interfaces/tdemediaplayer/playerdcopobject.h | 62 + interfaces/tdemediaplayer/tdemediaplayer.desktop | 4 + .../tdemediaplayer/tdemediaplayerengine.desktop | 3 + interfaces/tdemediaplayer/view.cpp | 89 + interfaces/tdemediaplayer/view.h | 98 + interfaces/tdescript/CMakeLists.txt | 56 + interfaces/tdescript/Makefile.am | 21 + interfaces/tdescript/README | 14 + interfaces/tdescript/sample/CMakeLists.txt | 43 + interfaces/tdescript/sample/Makefile.am | 13 + interfaces/tdescript/sample/shellscript.cpp | 85 + interfaces/tdescript/sample/shellscript.desktop | 153 + interfaces/tdescript/sample/shellscript.h | 48 + interfaces/tdescript/scriptclientinterface.h | 124 + interfaces/tdescript/scriptinterface.desktop | 89 + interfaces/tdescript/scriptinterface.h | 88 + interfaces/tdescript/scriptloader.cpp | 104 + interfaces/tdescript/scriptloader.h | 59 + interfaces/tdescript/scriptmanager.cpp | 132 + interfaces/tdescript/scriptmanager.h | 139 + interfaces/tdetexteditor/.kateconfig | 1 + interfaces/tdetexteditor/CMakeLists.txt | 96 + interfaces/tdetexteditor/Makefile.am | 52 + .../tdetexteditor/blockselectiondcopinterface.cpp | 33 + .../tdetexteditor/blockselectiondcopinterface.h | 60 + .../tdetexteditor/blockselectioninterface.cpp | 74 + interfaces/tdetexteditor/blockselectioninterface.h | 82 + .../tdetexteditor/clipboarddcopinterface.cpp | 40 + interfaces/tdetexteditor/clipboarddcopinterface.h | 54 + interfaces/tdetexteditor/clipboardinterface.cpp | 56 + interfaces/tdetexteditor/clipboardinterface.h | 74 + .../tdetexteditor/codecompletioninterface.cpp | 51 + interfaces/tdetexteditor/codecompletioninterface.h | 202 + interfaces/tdetexteditor/configinterface.cpp | 79 + interfaces/tdetexteditor/configinterface.h | 93 + .../tdetexteditor/configinterfaceextension.cpp | 84 + .../tdetexteditor/configinterfaceextension.h | 116 + interfaces/tdetexteditor/cursorinterface.cpp | 69 + interfaces/tdetexteditor/cursorinterface.h | 84 + interfaces/tdetexteditor/document.h | 85 + interfaces/tdetexteditor/documentdcopinfo.cpp | 33 + interfaces/tdetexteditor/documentdcopinfo.h | 47 + interfaces/tdetexteditor/documentinfo.cpp | 65 + interfaces/tdetexteditor/documentinfo.h | 60 + interfaces/tdetexteditor/dynwordwrapinterface.cpp | 69 + interfaces/tdetexteditor/dynwordwrapinterface.h | 64 + interfaces/tdetexteditor/editdcopinterface.cpp | 61 + interfaces/tdetexteditor/editdcopinterface.h | 90 + interfaces/tdetexteditor/editinterface.cpp | 57 + interfaces/tdetexteditor/editinterface.h | 137 + interfaces/tdetexteditor/editinterfaceext.cpp | 50 + interfaces/tdetexteditor/editinterfaceext.h | 74 + interfaces/tdetexteditor/editor.h | 65 + interfaces/tdetexteditor/editorchooser.cpp | 162 + interfaces/tdetexteditor/editorchooser.h | 58 + interfaces/tdetexteditor/editorchooser_ui.ui | 64 + interfaces/tdetexteditor/encodingdcopinterface.cpp | 28 + interfaces/tdetexteditor/encodingdcopinterface.h | 46 + interfaces/tdetexteditor/encodinginterface.cpp | 76 + interfaces/tdetexteditor/encodinginterface.h | 63 + interfaces/tdetexteditor/highlightinginterface.cpp | 69 + interfaces/tdetexteditor/highlightinginterface.h | 92 + interfaces/tdetexteditor/kcm_tdetexteditor.desktop | 172 + interfaces/tdetexteditor/markinterface.cpp | 74 + interfaces/tdetexteditor/markinterface.h | 171 + .../tdetexteditor/markinterfaceextension.cpp | 69 + interfaces/tdetexteditor/markinterfaceextension.h | 83 + interfaces/tdetexteditor/plugin.h | 88 + interfaces/tdetexteditor/popupmenuinterface.cpp | 69 + interfaces/tdetexteditor/popupmenuinterface.h | 66 + interfaces/tdetexteditor/printdcopinterface.cpp | 30 + interfaces/tdetexteditor/printdcopinterface.h | 46 + interfaces/tdetexteditor/printinterface.cpp | 74 + interfaces/tdetexteditor/printinterface.h | 63 + interfaces/tdetexteditor/searchdcopinterface.cpp | 95 + interfaces/tdetexteditor/searchdcopinterface.h | 59 + interfaces/tdetexteditor/searchinterface.cpp | 55 + interfaces/tdetexteditor/searchinterface.h | 65 + .../tdetexteditor/selectiondcopinterface.cpp | 64 + interfaces/tdetexteditor/selectiondcopinterface.h | 72 + .../tdetexteditor/selectionextdcopinterface.h | 57 + interfaces/tdetexteditor/selectioninterface.cpp | 65 + interfaces/tdetexteditor/selectioninterface.h | 100 + interfaces/tdetexteditor/selectioninterfaceext.cpp | 115 + interfaces/tdetexteditor/selectioninterfaceext.h | 74 + .../tdetexteditor/sessionconfiginterface.cpp | 88 + interfaces/tdetexteditor/sessionconfiginterface.h | 71 + interfaces/tdetexteditor/tdetexteditor.cpp | 242 + interfaces/tdetexteditor/tdetexteditor.desktop | 86 + .../tdetexteditor/tdetexteditoreditor.desktop | 86 + .../tdetexteditor/tdetexteditorplugin.desktop | 87 + interfaces/tdetexteditor/templateinterface.cpp | 197 + interfaces/tdetexteditor/templateinterface.h | 131 + interfaces/tdetexteditor/texthintinterface.cpp | 66 + interfaces/tdetexteditor/texthintinterface.h | 79 + interfaces/tdetexteditor/undodcopinterface.cpp | 57 + interfaces/tdetexteditor/undodcopinterface.h | 54 + interfaces/tdetexteditor/undointerface.cpp | 74 + interfaces/tdetexteditor/undointerface.h | 84 + interfaces/tdetexteditor/variableinterface.cpp | 48 + interfaces/tdetexteditor/variableinterface.h | 72 + interfaces/tdetexteditor/view.h | 68 + .../tdetexteditor/viewcursordcopinterface.cpp | 68 + interfaces/tdetexteditor/viewcursordcopinterface.h | 74 + interfaces/tdetexteditor/viewcursorinterface.cpp | 74 + interfaces/tdetexteditor/viewcursorinterface.h | 95 + .../tdetexteditor/viewstatusmsgdcopinterface.cpp | 29 + .../tdetexteditor/viewstatusmsgdcopinterface.h | 45 + .../tdetexteditor/viewstatusmsginterface.cpp | 76 + interfaces/tdetexteditor/viewstatusmsginterface.h | 63 + interfaces/tdetexteditor/wordwrapinterface.cpp | 70 + interfaces/tdetexteditor/wordwrapinterface.h | 66 + interfaces/terminal/Makefile.am | 4 +- interfaces/terminal/test/main.cc | 2 +- kabc/CMakeLists.txt | 4 +- kabc/Makefile.am | 6 +- kabc/addressbook.h | 2 +- kabc/plugins/dir/CMakeLists.txt | 2 +- kabc/plugins/dir/Makefile.am | 4 +- kabc/plugins/dir/resourcedirconfig.h | 2 +- kabc/plugins/evolution/Makefile.am | 2 +- kabc/plugins/file/CMakeLists.txt | 2 +- kabc/plugins/file/Makefile.am | 4 +- kabc/plugins/file/resourcefileconfig.h | 2 +- kabc/plugins/ldapkio/CMakeLists.txt | 2 +- kabc/plugins/ldapkio/Makefile.am | 4 +- kabc/plugins/ldapkio/resourceldapkioconfig.h | 2 +- kabc/plugins/net/CMakeLists.txt | 2 +- kabc/plugins/net/Makefile.am | 2 +- kabc/plugins/net/resourcenetconfig.h | 2 +- kabc/plugins/sql/Makefile.am | 2 +- kabc/resource.h | 2 +- kabc/stdaddressbook.cpp | 2 +- kabc/tests/Makefile.am | 24 +- kabc/vcard/Makefile.am | 4 +- kabc/vcardparser/Makefile.am | 6 +- kate/AUTHORS | 2 +- kate/ChangeLog | 2 +- kate/Mainpage.dox | 2 +- kate/Makefile.am | 2 +- kate/data/css.xml | 4 +- kate/data/katepartreadonlyui.rc | 2 +- kate/data/katepartui.rc | 2 +- kate/data/scss.xml | 2 +- kate/interfaces/CMakeLists.txt | 2 +- kate/interfaces/Makefile.am | 4 +- kate/interfaces/document.h | 36 +- kate/interfaces/view.h | 16 +- kate/part/CMakeLists.txt | 4 +- kate/part/Makefile.am | 4 +- kate/part/katebuffer.cpp | 2 +- kate/part/katecodecompletion.h | 2 +- kate/part/kateconfig.h | 2 +- kate/part/katedialogs.cpp | 6 +- kate/part/katedocument.cpp | 8 +- kate/part/katedocument.h | 12 +- kate/part/katedocumenthelpers.h | 2 +- kate/part/katefactory.h | 4 +- kate/part/katejscript.cpp | 2 +- kate/part/kateschema.cpp | 2 +- kate/part/katespell.cpp | 38 +- kate/part/katespell.h | 2 +- kate/part/kateview.cpp | 6 +- kate/part/kateview.h | 6 +- kate/part/test_regression.cpp | 2 +- kate/plugins/autobookmarker/Makefile.am | 14 +- kate/plugins/autobookmarker/autobookmarker.cpp | 14 +- kate/plugins/autobookmarker/autobookmarker.h | 4 +- .../ktexteditor_autobookmarker.desktop | 135 - .../autobookmarker/ktexteditor_autobookmarkerrc | 18 - .../tdetexteditor_autobookmarker.desktop | 135 + .../autobookmarker/tdetexteditor_autobookmarkerrc | 18 + kate/plugins/insertfile/CMakeLists.txt | 10 +- kate/plugins/insertfile/Makefile.am | 16 +- kate/plugins/insertfile/insertfileplugin.cpp | 10 +- kate/plugins/insertfile/insertfileplugin.h | 4 +- .../insertfile/ktexteditor_insertfile.desktop | 156 - .../plugins/insertfile/ktexteditor_insertfileui.rc | 9 - .../insertfile/tdetexteditor_insertfile.desktop | 156 + .../insertfile/tdetexteditor_insertfileui.rc | 9 + kate/plugins/isearch/CMakeLists.txt | 10 +- kate/plugins/isearch/ISearchPlugin.cpp | 4 +- kate/plugins/isearch/ISearchPlugin.h | 12 +- kate/plugins/isearch/Makefile.am | 16 +- kate/plugins/isearch/ktexteditor_isearch.desktop | 153 - kate/plugins/isearch/ktexteditor_isearchui.rc | 14 - kate/plugins/isearch/tdetexteditor_isearch.desktop | 153 + kate/plugins/isearch/tdetexteditor_isearchui.rc | 14 + kate/plugins/kdatatool/CMakeLists.txt | 10 +- kate/plugins/kdatatool/Makefile.am | 16 +- kate/plugins/kdatatool/kate_kdatatool.cpp | 14 +- kate/plugins/kdatatool/kate_kdatatool.h | 2 +- .../kdatatool/ktexteditor_kdatatool.desktop | 169 - kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc | 8 - .../kdatatool/tdetexteditor_kdatatool.desktop | 169 + .../plugins/kdatatool/tdetexteditor_kdatatoolui.rc | 8 + kate/plugins/wordcompletion/CMakeLists.txt | 10 +- kate/plugins/wordcompletion/Makefile.am | 14 +- kate/plugins/wordcompletion/docwordcompletion.cpp | 12 +- kate/plugins/wordcompletion/docwordcompletion.h | 8 +- kate/plugins/wordcompletion/docwordcompletionui.rc | 2 +- .../ktexteditor_docwordcompletion.desktop | 139 - .../tdetexteditor_docwordcompletion.desktop | 139 + kcert/CMakeLists.txt | 50 - kcert/Makefile.am | 18 - kcert/kcertpart.cc | 883 --- kcert/kcertpart.desktop | 99 - kcert/kcertpart.h | 139 - kcert/kcertpart.rc | 10 - kcmshell/CMakeLists.txt | 4 +- kcmshell/Makefile.am | 4 +- kded/DESIGN | 4 +- kded/Makefile.am | 6 +- kded/README.kded | 12 +- kded/kbuildimageiofactory.cpp | 4 +- kded/kbuildimageiofactory.h | 2 +- kded/kbuildprotocolinfofactory.cpp | 4 +- kded/kbuildprotocolinfofactory.h | 2 +- kded/kbuildservicefactory.cpp | 4 +- kded/kbuildservicefactory.h | 2 +- kded/kbuildservicegroupfactory.cpp | 4 +- kded/kbuildservicegroupfactory.h | 2 +- kded/kbuildservicetypefactory.cpp | 4 +- kded/kbuildservicetypefactory.h | 2 +- kded/kbuildsycoca.cpp | 56 +- kded/kbuildsycoca.h | 8 +- kded/kctimefactory.cpp | 4 +- kded/kctimefactory.h | 4 +- kded/kded.cpp | 14 +- kded/kded.h | 4 +- kdewidgets/Makefile.am | 2 +- kdoctools/customization/entities/general.entities | 10 +- kdoctools/customization/obsolete/general.entities | 10 +- kdoctools/customization/pl/user.entities | 26 +- khtml/.emacs-dirvars | 9 - khtml/CMakeLists.txt | 137 - khtml/ChangeLog | 3874 ---------- khtml/DESIGN.html | 346 - khtml/Mainpage.dox | 46 - khtml/Makefile.am | 133 - khtml/README.HTMLWidget | 66 - khtml/SAFARI_MERGE | 161 - khtml/TODO | 60 - khtml/configure.in.in | 57 - khtml/css/CMakeLists.txt | 47 - khtml/css/Makefile.am | 60 - khtml/css/css_base.cpp | 419 -- khtml/css/css_base.h | 271 - khtml/css/css_extensionsimpl.cpp | 366 - khtml/css/css_extensionsimpl.h | 205 - khtml/css/css_renderstyledeclarationimpl.cpp | 1147 --- khtml/css/css_renderstyledeclarationimpl.h | 75 - khtml/css/css_ruleimpl.cpp | 391 - khtml/css/css_ruleimpl.h | 237 - khtml/css/css_stylesheetimpl.cpp | 436 -- khtml/css/css_stylesheetimpl.h | 192 - khtml/css/css_valueimpl.cpp | 1073 --- khtml/css/css_valueimpl.h | 461 -- khtml/css/csshelper.cpp | 87 - khtml/css/csshelper.h | 51 - khtml/css/cssparser.cpp | 2614 ------- khtml/css/cssparser.h | 201 - khtml/css/cssproperties.c | 678 -- khtml/css/cssproperties.h | 144 - khtml/css/cssproperties.in | 148 - khtml/css/cssstyleselector.cpp | 4217 ----------- khtml/css/cssstyleselector.h | 333 - khtml/css/cssvalues.c | 1344 ---- khtml/css/cssvalues.h | 290 - khtml/css/cssvalues.in | 478 -- khtml/css/html4.css | 549 -- khtml/css/makeprop | 57 - khtml/css/makevalues | 63 - khtml/css/parser.cpp | 2875 -------- khtml/css/parser.h | 164 - khtml/css/parser.y | 1064 --- khtml/css/quirks.css | 41 - khtml/css/tokenizer.cpp | 930 --- khtml/css/tokenizer.flex | 92 - khtml/design.h | 58 - khtml/dom/CMakeLists.txt | 58 - khtml/dom/Makefile.am | 58 - khtml/dom/css_extensions.cpp | 2043 ------ khtml/dom/css_extensions.h | 2702 ------- khtml/dom/css_rule.cpp | 546 -- khtml/dom/css_rule.h | 534 -- khtml/dom/css_stylesheet.cpp | 457 -- khtml/dom/css_stylesheet.h | 496 -- khtml/dom/css_value.cpp | 587 -- khtml/dom/css_value.h | 745 -- khtml/dom/dom2_events.cpp | 725 -- khtml/dom/dom2_events.h | 846 --- khtml/dom/dom2_range.cpp | 406 -- khtml/dom/dom2_range.h | 475 -- khtml/dom/dom2_traversal.cpp | 381 - khtml/dom/dom2_traversal.h | 617 -- khtml/dom/dom2_views.cpp | 95 - khtml/dom/dom2_views.h | 90 - khtml/dom/dom_core.h | 34 - khtml/dom/dom_doc.cpp | 684 -- khtml/dom/dom_doc.h | 1107 --- khtml/dom/dom_element.cpp | 409 -- khtml/dom/dom_element.h | 600 -- khtml/dom/dom_exception.h | 92 - khtml/dom/dom_html.h | 40 - khtml/dom/dom_misc.cpp | 37 - khtml/dom/dom_misc.h | 60 - khtml/dom/dom_node.cpp | 495 -- khtml/dom/dom_node.h | 991 --- khtml/dom/dom_string.cpp | 300 - khtml/dom/dom_string.h | 144 - khtml/dom/dom_text.cpp | 237 - khtml/dom/dom_text.h | 312 - khtml/dom/dom_xml.cpp | 293 - khtml/dom/dom_xml.h | 310 - khtml/dom/html_base.cpp | 533 -- khtml/dom/html_base.h | 610 -- khtml/dom/html_block.cpp | 443 -- khtml/dom/html_block.h | 406 -- khtml/dom/html_document.cpp | 233 - khtml/dom/html_document.h | 304 - khtml/dom/html_element.cpp | 186 - khtml/dom/html_element.h | 221 - khtml/dom/html_form.cpp | 1302 ---- khtml/dom/html_form.h | 1427 ---- khtml/dom/html_head.cpp | 515 -- khtml/dom/html_head.h | 552 -- khtml/dom/html_image.cpp | 413 -- khtml/dom/html_image.h | 431 -- khtml/dom/html_inline.cpp | 434 -- khtml/dom/html_inline.h | 463 -- khtml/dom/html_list.cpp | 354 - khtml/dom/html_list.h | 341 - khtml/dom/html_misc.cpp | 214 - khtml/dom/html_misc.h | 222 - khtml/dom/html_object.cpp | 535 -- khtml/dom/html_object.h | 630 -- khtml/dom/html_table.cpp | 868 --- khtml/dom/html_table.h | 997 --- khtml/domtreeview.cpp | 97 - khtml/domtreeview.h | 54 - khtml/ecma/AUTHORS | 4 - khtml/ecma/CMakeLists.txt | 61 - khtml/ecma/Makefile.am | 90 - khtml/ecma/README | 21 - khtml/ecma/THANKS | 9 - khtml/ecma/TODO | 12 - khtml/ecma/domparser.cpp | 112 - khtml/ecma/domparser.h | 58 - khtml/ecma/jsk.html | 113 - khtml/ecma/kjs_binding.cpp | 467 -- khtml/ecma/kjs_binding.h | 409 -- khtml/ecma/kjs_css.cpp | 1302 ---- khtml/ecma/kjs_css.h | 304 - khtml/ecma/kjs_debugwin.cpp | 1139 --- khtml/ecma/kjs_debugwin.h | 285 - khtml/ecma/kjs_dom.cpp | 1849 ----- khtml/ecma/kjs_dom.h | 299 - khtml/ecma/kjs_events.cpp | 993 --- khtml/ecma/kjs_events.h | 250 - khtml/ecma/kjs_html.cpp | 3946 ----------- khtml/ecma/kjs_html.h | 294 - khtml/ecma/kjs_mozilla.cpp | 94 - khtml/ecma/kjs_mozilla.h | 44 - khtml/ecma/kjs_navigator.cpp | 670 -- khtml/ecma/kjs_navigator.h | 53 - khtml/ecma/kjs_proxy.cpp | 411 -- khtml/ecma/kjs_proxy.h | 91 - khtml/ecma/kjs_range.cpp | 233 - khtml/ecma/kjs_range.h | 71 - khtml/ecma/kjs_traversal.cpp | 327 - khtml/ecma/kjs_traversal.h | 108 - khtml/ecma/kjs_views.cpp | 91 - khtml/ecma/kjs_views.h | 53 - khtml/ecma/kjs_window.cpp | 2935 -------- khtml/ecma/kjs_window.h | 309 - khtml/ecma/testecma.cpp | 67 - khtml/ecma/xmlhttprequest.cpp | 810 --- khtml/ecma/xmlhttprequest.h | 142 - khtml/ecma/xmlserializer.cpp | 109 - khtml/ecma/xmlserializer.h | 54 - khtml/html/AlwaysInline.h | 49 - khtml/html/CMakeLists.txt | 44 - khtml/html/Makefile.am | 54 - khtml/html/Platform.h | 218 - khtml/html/RefPtr.h | 202 - khtml/html/doctypes.cpp | 1174 --- khtml/html/doctypes.gperf | 91 - khtml/html/dtd.cpp | 918 --- khtml/html/dtd.dtd | 1072 --- khtml/html/dtd.h | 41 - khtml/html/html_baseimpl.cpp | 708 -- khtml/html/html_baseimpl.h | 207 - khtml/html/html_blockimpl.cpp | 371 - khtml/html/html_blockimpl.h | 108 - khtml/html/html_documentimpl.cpp | 537 -- khtml/html/html_documentimpl.h | 95 - khtml/html/html_elementimpl.cpp | 685 -- khtml/html/html_elementimpl.h | 89 - khtml/html/html_formimpl.cpp | 2980 -------- khtml/html/html_formimpl.h | 606 -- khtml/html/html_headimpl.cpp | 649 -- khtml/html/html_headimpl.h | 233 - khtml/html/html_imageimpl.cpp | 560 -- khtml/html/html_imageimpl.h | 150 - khtml/html/html_inlineimpl.cpp | 298 - khtml/html/html_inlineimpl.h | 75 - khtml/html/html_listimpl.cpp | 169 - khtml/html/html_listimpl.h | 112 - khtml/html/html_miscimpl.cpp | 443 -- khtml/html/html_miscimpl.h | 150 - khtml/html/html_objectimpl.cpp | 465 -- khtml/html/html_objectimpl.h | 145 - khtml/html/html_tableimpl.cpp | 994 --- khtml/html/html_tableimpl.h | 329 - khtml/html/htmlparser.cpp | 1731 ----- khtml/html/htmlparser.h | 192 - khtml/html/htmltokenizer.cpp | 1798 ----- khtml/html/htmltokenizer.h | 358 - khtml/htmlpageinfo.ui | 301 - khtml/java/CMakeLists.txt | 76 - khtml/java/ChangeLog | 19 - khtml/java/KJAS_GRAMMAR.txt | 82 - khtml/java/Makefile.am | 37 - khtml/java/README | 20 - khtml/java/TODO | 22 - khtml/java/build.properties | 9 - khtml/java/build.xml | 49 - khtml/java/configure.in.in | 5 - khtml/java/cr16-action-java.png | Bin 1051 -> 0 bytes khtml/java/dummy/CMakeLists.txt | 30 - khtml/java/dummy/Makefile.am | 13 - khtml/java/images/animbean.gif | Bin 4376 -> 0 bytes khtml/java/images/beanicon.png | Bin 569 -> 0 bytes khtml/java/images/brokenbean.gif | Bin 1195 -> 0 bytes khtml/java/kjava.jar | Bin 157645 -> 0 bytes khtml/java/kjava.policy.in | 8 - khtml/java/kjavaapplet.cpp | 288 - khtml/java/kjavaapplet.h | 251 - khtml/java/kjavaappletcontext.cpp | 274 - khtml/java/kjavaappletcontext.h | 141 - khtml/java/kjavaappletserver.cpp | 833 --- khtml/java/kjavaappletserver.h | 180 - khtml/java/kjavaappletviewer.cpp | 635 -- khtml/java/kjavaappletviewer.desktop | 82 - khtml/java/kjavaappletviewer.h | 145 - khtml/java/kjavaappletwidget.cpp | 140 - khtml/java/kjavaappletwidget.h | 125 - khtml/java/kjavadownloader.cpp | 298 - khtml/java/kjavadownloader.h | 90 - khtml/java/kjavaprocess.cpp | 397 -- khtml/java/kjavaprocess.h | 164 - khtml/java/kqeventutil.cpp | 200 - khtml/java/kqeventutil.h | 34 - khtml/java/kxeventutil.cpp | 408 -- khtml/java/kxeventutil.h | 51 - khtml/java/make-jar | 12 - khtml/java/netscape/javascript/JSException.java | 20 - khtml/java/netscape/javascript/JSObject.java | 21 - khtml/java/netscape/plugin/Plugin.java | 28 - .../security/ForbiddenTargetException.java | 10 - khtml/java/netscape/security/Principal.java | 4 - khtml/java/netscape/security/PrivilegeManager.java | 109 - khtml/java/netscape/security/Target.java | 4 - khtml/java/org/kde/javascript/JSObject.java | 183 - khtml/java/org/kde/kjas/server/Console.java | 20 - .../org/kde/kjas/server/KJASAppletClassLoader.java | 360 - .../org/kde/kjas/server/KJASAppletContext.java | 473 -- .../java/org/kde/kjas/server/KJASAppletPanel.java | 113 - khtml/java/org/kde/kjas/server/KJASAppletStub.java | 807 --- khtml/java/org/kde/kjas/server/KJASAudioClip.java | 98 - .../org/kde/kjas/server/KJASBrokenClassFixer.java | 132 - khtml/java/org/kde/kjas/server/KJASConsole.java | 93 - .../org/kde/kjas/server/KJASConsoleStream.java | 46 - .../org/kde/kjas/server/KJASProtocolHandler.java | 900 --- .../org/kde/kjas/server/KJASSecurityManager.java | 243 - .../java/org/kde/kjas/server/KJASSoundPlayer.java | 36 - .../java/org/kde/kjas/server/KJASSwingConsole.java | 325 - .../kjas/server/KJASURLStreamHandlerFactory.java | 609 -- khtml/java/org/kde/kjas/server/Main.java | 178 - khtml/java/org/kde/kjas/server/StatusListener.java | 5 - khtml/java/pluginsinfo | 7 - khtml/java/tests/Makefile.am | 9 - khtml/java/tests/badapplets/BadApplet.jar | Bin 7233 -> 0 bytes khtml/java/tests/badapplets/BadApplet.java | 202 - khtml/java/tests/badapplets/applet.html | 14 - khtml/java/tests/good_sites | 44 - khtml/java/tests/testkjavaappletserver.cpp | 41 - khtml/khtml-devel-gdb | 22 - khtml/khtml.desktop | 93 - khtml/khtml.rc | 16 - khtml/khtml_browser.rc | 49 - khtml/khtml_caret.cpp | 2664 ------- khtml/khtml_caret_p.h | 1109 --- khtml/khtml_events.cpp | 92 - khtml/khtml_events.h | 157 - khtml/khtml_ext.cpp | 1032 --- khtml/khtml_ext.h | 177 - khtml/khtml_factory.cpp | 207 - khtml/khtml_factory.h | 76 - khtml/khtml_iface.cc | 233 - khtml/khtml_iface.h | 242 - khtml/khtml_pagecache.cpp | 313 - khtml/khtml_pagecache.h | 134 - khtml/khtml_part.cpp | 7471 -------------------- khtml/khtml_part.h | 1683 ----- khtml/khtml_popupmenu.rc | 39 - khtml/khtml_printsettings.cpp | 108 - khtml/khtml_printsettings.h | 43 - khtml/khtml_run.cpp | 92 - khtml/khtml_run.h | 59 - khtml/khtml_settings.cc | 1064 --- khtml/khtml_settings.h | 232 - khtml/khtmldefaults.h | 33 - khtml/khtmlimage.cpp | 357 - khtml/khtmlimage.desktop | 170 - khtml/khtmlimage.h | 119 - khtml/khtmlpart_p.h | 569 -- khtml/khtmlview.cpp | 4623 ------------ khtml/khtmlview.h | 624 -- khtml/kjserrordlg.ui | 133 - khtml/kjserrordlg.ui.h | 32 - khtml/kmultipart/CMakeLists.txt | 48 - khtml/kmultipart/Makefile.am | 17 - khtml/kmultipart/README | 16 - khtml/kmultipart/kmultipart.cpp | 613 -- khtml/kmultipart/kmultipart.desktop | 73 - khtml/kmultipart/kmultipart.h | 118 - khtml/libkhtml.map | 22 - khtml/misc/CMakeLists.txt | 41 - khtml/misc/Makefile.am | 43 - khtml/misc/arena.cpp | 333 - khtml/misc/arena.h | 123 - khtml/misc/blocked_icon.cpp | 41 - khtml/misc/blocked_icon.png | Bin 599 -> 0 bytes khtml/misc/decoder.cpp | 790 --- khtml/misc/decoder.h | 115 - khtml/misc/guess_ja.cpp | 379 - khtml/misc/guess_ja.h | 122 - khtml/misc/helper.cpp | 144 - khtml/misc/helper.h | 55 - khtml/misc/htmlattrs.c | 1019 --- khtml/misc/htmlattrs.h | 168 - khtml/misc/htmlattrs.in | 157 - khtml/misc/htmlhashes.cpp | 45 - khtml/misc/htmlhashes.h | 14 - khtml/misc/htmltags.c | 687 -- khtml/misc/htmltags.h | 119 - khtml/misc/htmltags.in | 102 - khtml/misc/khtmllayout.h | 112 - khtml/misc/knsplugininstaller.cpp | 671 -- khtml/misc/knsplugininstaller.h | 268 - khtml/misc/loader.cpp | 1679 ----- khtml/misc/loader.h | 522 -- khtml/misc/loader_client.h | 35 - khtml/misc/loader_jpeg.cpp | 548 -- khtml/misc/loader_jpeg.h | 50 - khtml/misc/makeattrs | 113 - khtml/misc/maketags | 124 - khtml/misc/multimap.h | 345 - khtml/misc/seed.h | 46 - khtml/misc/shared.h | 227 - khtml/misc/stringit.cpp | 138 - khtml/misc/stringit.h | 203 - khtml/pics/CMakeLists.txt | 20 - khtml/pics/Makefile.am | 10 - khtml/pics/cr128-action-bug.png | Bin 13453 -> 0 bytes khtml/pics/cr16-action-bug.png | Bin 1107 -> 0 bytes khtml/pics/cr16-action-images_display.png | Bin 539 -> 0 bytes khtml/pics/cr16-action-wallet_open.png | Bin 781 -> 0 bytes khtml/pics/cr22-action-bug.png | Bin 1914 -> 0 bytes khtml/pics/cr22-action-dbgnext.png | Bin 187 -> 0 bytes khtml/pics/cr22-action-dbgrun.png | Bin 244 -> 0 bytes khtml/pics/cr22-action-dbgrunto.png | Bin 275 -> 0 bytes khtml/pics/cr22-action-dbgstep.png | Bin 182 -> 0 bytes khtml/pics/cr22-action-images_display.png | Bin 1270 -> 0 bytes khtml/pics/cr32-action-bug.png | Bin 2994 -> 0 bytes khtml/pics/cr32-action-images_display.png | Bin 2191 -> 0 bytes khtml/pics/cr48-action-bug.png | Bin 5091 -> 0 bytes khtml/pics/cr64-action-bug.png | Bin 7630 -> 0 bytes khtml/rendering/CMakeLists.txt | 46 - khtml/rendering/Makefile.am | 57 - khtml/rendering/bidi.cpp | 2250 ------ khtml/rendering/bidi.h | 172 - khtml/rendering/break_lines.cpp | 126 - khtml/rendering/break_lines.h | 163 - khtml/rendering/counter_tree.cpp | 222 - khtml/rendering/counter_tree.h | 114 - khtml/rendering/enumerate.cpp | 411 -- khtml/rendering/enumerate.h | 66 - khtml/rendering/font.cpp | 502 -- khtml/rendering/font.h | 188 - khtml/rendering/img-loading.png | Bin 318 -> 0 bytes khtml/rendering/loading_icon.cpp | 25 - khtml/rendering/render_applet.cpp | 145 - khtml/rendering/render_applet.h | 60 - khtml/rendering/render_arena.cpp | 146 - khtml/rendering/render_arena.h | 72 - khtml/rendering/render_block.cpp | 3155 --------- khtml/rendering/render_block.h | 378 - khtml/rendering/render_body.cpp | 121 - khtml/rendering/render_body.h | 56 - khtml/rendering/render_box.cpp | 2325 ------ khtml/rendering/render_box.h | 213 - khtml/rendering/render_br.cpp | 79 - khtml/rendering/render_br.h | 77 - khtml/rendering/render_canvas.cpp | 780 -- khtml/rendering/render_canvas.h | 250 - khtml/rendering/render_container.cpp | 597 -- khtml/rendering/render_container.h | 85 - khtml/rendering/render_flow.cpp | 412 -- khtml/rendering/render_flow.h | 96 - khtml/rendering/render_form.cpp | 1914 ----- khtml/rendering/render_form.h | 511 -- khtml/rendering/render_frames.cpp | 1025 --- khtml/rendering/render_frames.h | 172 - khtml/rendering/render_generated.cpp | 392 - khtml/rendering/render_generated.h | 125 - khtml/rendering/render_image.cpp | 604 -- khtml/rendering/render_image.h | 105 - khtml/rendering/render_inline.cpp | 935 --- khtml/rendering/render_inline.h | 94 - khtml/rendering/render_layer.cpp | 1830 ----- khtml/rendering/render_layer.h | 342 - khtml/rendering/render_line.cpp | 996 --- khtml/rendering/render_line.h | 310 - khtml/rendering/render_list.cpp | 586 -- khtml/rendering/render_list.h | 140 - khtml/rendering/render_object.cpp | 2330 ------ khtml/rendering/render_object.h | 866 --- khtml/rendering/render_replaced.cpp | 940 --- khtml/rendering/render_replaced.h | 169 - khtml/rendering/render_style.cpp | 1301 ---- khtml/rendering/render_style.h | 1524 ---- khtml/rendering/render_table.cpp | 3070 -------- khtml/rendering/render_table.h | 524 -- khtml/rendering/render_text.cpp | 1546 ---- khtml/rendering/render_text.h | 345 - khtml/rendering/table_layout.cpp | 1193 ---- khtml/rendering/table_layout.h | 112 - khtml/rendering/table_layout.txt | 74 - khtml/test/README | 6 - khtml/test/align.html | 21 - khtml/test/align1.html | 21 - khtml/test/align2.html | 126 - khtml/test/anchor1.html | 25 - khtml/test/anchor2.html | 85 - khtml/test/button.html | 14 - khtml/test/color.html | 60 - khtml/test/fixed-background.html | 47 - khtml/test/image.gif | Bin 1476 -> 0 bytes khtml/test/image_map.html | 24 - khtml/test/java.html | 15 - khtml/test/jsplugins.html | 73 - khtml/test/konqi.gif | Bin 39318 -> 0 bytes khtml/test/lake.class | Bin 3636 -> 0 bytes khtml/test/lists.html | 221 - khtml/test/nav_bar.gif | Bin 1059 -> 0 bytes khtml/test/nbsp.html | 20 - khtml/test/object.html | 4 - khtml/test/pseudo.html | 27 - khtml/test/testpages.html | 34 - khtml/test_regression.cpp | 1644 ----- khtml/test_regression.h | 194 - khtml/test_regression_fontoverload.cpp | 384 - khtml/testkhtml.cpp | 210 - khtml/testkhtml.h | 55 - khtml/xml/CMakeLists.txt | 43 - khtml/xml/Makefile.am | 48 - khtml/xml/dom2_eventsimpl.cpp | 969 --- khtml/xml/dom2_eventsimpl.h | 513 -- khtml/xml/dom2_rangeimpl.cpp | 1640 ----- khtml/xml/dom2_rangeimpl.h | 127 - khtml/xml/dom2_traversalimpl.cpp | 667 -- khtml/xml/dom2_traversalimpl.h | 196 - khtml/xml/dom2_viewsimpl.cpp | 50 - khtml/xml/dom2_viewsimpl.h | 50 - khtml/xml/dom_docimpl.cpp | 2892 -------- khtml/xml/dom_docimpl.h | 763 -- khtml/xml/dom_elementimpl.cpp | 1301 ---- khtml/xml/dom_elementimpl.h | 392 - khtml/xml/dom_nodeimpl.cpp | 2068 ------ khtml/xml/dom_nodeimpl.h | 736 -- khtml/xml/dom_restyler.cpp | 122 - khtml/xml/dom_restyler.h | 102 - khtml/xml/dom_stringimpl.cpp | 460 -- khtml/xml/dom_stringimpl.h | 104 - khtml/xml/dom_textimpl.cpp | 522 -- khtml/xml/dom_textimpl.h | 176 - khtml/xml/dom_xmlimpl.cpp | 498 -- khtml/xml/dom_xmlimpl.h | 181 - khtml/xml/xml_tokenizer.cpp | 609 -- khtml/xml/xml_tokenizer.h | 198 - kinit/CMakeLists.txt | 2 +- kinit/kinit.cpp | 6 +- kio/CMakeLists.txt | 4 +- kio/Makefile.am | 4 +- kio/kfile/ChangeLog | 2 +- kio/kfile/kfiledetailview.cpp | 2 +- kio/kfile/kfileiconview.cpp | 2 +- kio/kfile/kfiletreeview.cpp | 2 +- kio/kfile/kopenwith.cpp | 2 +- kio/kfile/kpropertiesdialog.cpp | 4 +- kio/kfile/kurlrequester.cpp | 2 +- kio/kio/CMakeLists.txt | 4 +- kio/kio/Makefile.am | 6 +- kio/kio/kdatatool.cpp | 2 +- kio/kio/kfilemetainfo.cpp | 2 +- kio/kio/kimageio.cpp | 4 +- kio/kio/kimageiofactory.h | 2 +- kio/kio/kmimetype.cpp | 6 +- kio/kio/kmimetype.h | 2 +- kio/kio/kmimetypechooser.cpp | 2 +- kio/kio/kprotocolinfo.h | 4 +- kio/kio/kservice.cpp | 8 +- kio/kio/kservice.h | 2 +- kio/kio/kservicefactory.cpp | 6 +- kio/kio/kservicefactory.h | 2 +- kio/kio/kservicegroup.cpp | 2 +- kio/kio/kservicegroup.h | 6 +- kio/kio/kservicegroupfactory.cpp | 6 +- kio/kio/kservicegroupfactory.h | 2 +- kio/kio/kservicetype.cpp | 4 +- kio/kio/kservicetype.h | 2 +- kio/kio/kservicetypefactory.cpp | 6 +- kio/kio/kservicetypefactory.h | 2 +- kio/kio/ktrader.h | 2 +- kio/kio/kurifilter.cpp | 2 +- kio/kio/kuserprofile.cpp | 2 +- kio/kio/metainfojob.cpp | 2 +- kio/kioexec/Makefile.am | 2 +- kio/kpasswdserver/CMakeLists.txt | 2 +- kio/kpasswdserver/Makefile.am | 4 +- kio/kpasswdserver/kpasswdserver.cpp | 4 +- kio/kssl/CMakeLists.txt | 2 +- kio/kssl/Makefile.am | 2 +- kio/kssl/ksslkeygen.cc | 2 +- kio/misc/CMakeLists.txt | 4 +- kio/misc/Makefile.am | 6 +- kio/misc/kfile/Makefile.am | 2 +- kio/misc/kntlm/CMakeLists.txt | 43 - kio/misc/kntlm/Makefile.am | 12 - kio/misc/kntlm/des.cpp | 513 -- kio/misc/kntlm/des.h | 19 - kio/misc/kntlm/kntlm.cpp | 389 - kio/misc/kntlm/kntlm.h | 233 - kio/misc/kntlm/kswap.h | 428 -- kio/misc/ksendbugmail/Makefile.am | 2 +- kio/misc/kwalletd/CMakeLists.txt | 49 - kio/misc/kwalletd/Makefile.am | 35 - kio/misc/kwalletd/kbetterthankdialogbase.ui | 154 - kio/misc/kwalletd/kbetterthankdialogbase.ui.h | 50 - kio/misc/kwalletd/ktimeout.cpp | 84 - kio/misc/kwalletd/ktimeout.h | 52 - kio/misc/kwalletd/kwalletd.cpp | 1514 ---- kio/misc/kwalletd/kwalletd.desktop | 151 - kio/misc/kwalletd/kwalletd.h | 199 - kio/misc/kwalletd/kwalletwizard.ui | 545 -- kio/misc/kwalletd/kwalletwizard.ui.h | 74 - kio/misc/tdentlm/CMakeLists.txt | 43 + kio/misc/tdentlm/Makefile.am | 12 + kio/misc/tdentlm/des.cpp | 513 ++ kio/misc/tdentlm/des.h | 19 + kio/misc/tdentlm/kswap.h | 428 ++ kio/misc/tdentlm/tdentlm.cpp | 389 + kio/misc/tdentlm/tdentlm.h | 233 + kio/misc/tdewalletd/CMakeLists.txt | 49 + kio/misc/tdewalletd/Makefile.am | 35 + kio/misc/tdewalletd/kbetterthankdialogbase.ui | 154 + kio/misc/tdewalletd/kbetterthankdialogbase.ui.h | 50 + kio/misc/tdewalletd/ktimeout.cpp | 84 + kio/misc/tdewalletd/ktimeout.h | 52 + kio/misc/tdewalletd/tdewalletd.cpp | 1514 ++++ kio/misc/tdewalletd/tdewalletd.desktop | 151 + kio/misc/tdewalletd/tdewalletd.h | 199 + kio/misc/tdewalletd/tdewalletwizard.ui | 545 ++ kio/misc/tdewalletd/tdewalletwizard.ui.h | 74 + kio/tests/Makefile.am | 18 +- kio/tests/kdirwatchunittest.cpp | 2 +- kio/tests/kdirwatchunittest.h | 4 +- kio/tests/ksycocatest.cpp | 360 - kio/tests/ksycocaupdatetest.cpp | 11 - kio/tests/kurifiltertest.cpp | 2 +- kio/tests/tdesycocatest.cpp | 360 + kio/tests/tdesycocaupdatetest.cpp | 11 + kioslave/gzip/Makefile.am | 2 +- kioslave/http/CMakeLists.txt | 2 +- kioslave/http/Makefile.am | 2 +- kioslave/http/TODO | 2 +- kioslave/http/http.cc | 4 +- kioslave/http/kcookiejar/CMakeLists.txt | 2 +- kioslave/http/kcookiejar/Makefile.am | 2 +- kioslave/http/kcookiejar/kcookiejar.cpp | 2 +- kioslave/http/kcookiejar/tests/Makefile.am | 2 +- kioslave/metainfo/Makefile.am | 2 +- kmdi/CMakeLists.txt | 60 - kmdi/Makefile.am | 20 - kmdi/TODO | 4 - kmdi/kmdi/CMakeLists.txt | 52 - kmdi/kmdi/Makefile.am | 14 - kmdi/kmdi/dockcontainer.cpp | 656 -- kmdi/kmdi/dockcontainer.h | 144 - kmdi/kmdi/global.h | 69 - kmdi/kmdi/guiclient.cpp | 230 - kmdi/kmdi/guiclient.h | 103 - kmdi/kmdi/mainwindow.cpp | 451 -- kmdi/kmdi/mainwindow.h | 199 - kmdi/kmdi/tabwidget.cpp | 284 - kmdi/kmdi/tabwidget.h | 115 - kmdi/kmdi/toolviewaccessor.cpp | 223 - kmdi/kmdi/toolviewaccessor.h | 88 - kmdi/kmdi/toolviewaccessor_p.h | 60 - kmdi/kmdichildarea.cpp | 793 --- kmdi/kmdichildarea.h | 304 - kmdi/kmdichildfrm.cpp | 1409 ---- kmdi/kmdichildfrm.h | 446 -- kmdi/kmdichildfrmcaption.cpp | 322 - kmdi/kmdichildfrmcaption.h | 145 - kmdi/kmdichildview.cpp | 774 -- kmdi/kmdichildview.h | 615 -- kmdi/kmdidefines.h | 117 - kmdi/kmdidockcontainer.cpp | 858 --- kmdi/kmdidockcontainer.h | 167 - kmdi/kmdidocumentviewtabwidget.cpp | 148 - kmdi/kmdidocumentviewtabwidget.h | 125 - kmdi/kmdifocuslist.cpp | 70 - kmdi/kmdifocuslist.h | 42 - kmdi/kmdiguiclient.cpp | 320 - kmdi/kmdiguiclient.h | 146 - kmdi/kmdiiterator.h | 51 - kmdi/kmdilistiterator.h | 61 - kmdi/kmdimainfrm.cpp | 2937 -------- kmdi/kmdimainfrm.h | 884 --- kmdi/kmdinulliterator.h | 49 - kmdi/kmditaskbar.cpp | 394 -- kmdi/kmditaskbar.h | 219 - kmdi/kmditoolviewaccessor.cpp | 269 - kmdi/kmditoolviewaccessor.h | 86 - kmdi/kmditoolviewaccessor_p.h | 51 - kmdi/res/filenew.xpm | 27 - kmdi/res/kde2_closebutton.xpm | 22 - kmdi/res/kde2_maxbutton.xpm | 22 - kmdi/res/kde2_minbutton.xpm | 22 - kmdi/res/kde2_restorebutton.xpm | 22 - kmdi/res/kde2_undockbutton.xpm | 22 - kmdi/res/kde2laptop_closebutton.xpm | 18 - kmdi/res/kde2laptop_closebutton_menu.xpm | 25 - kmdi/res/kde2laptop_maxbutton.xpm | 18 - kmdi/res/kde2laptop_minbutton.xpm | 18 - kmdi/res/kde2laptop_restorebutton.xpm | 18 - kmdi/res/kde2laptop_undockbutton.xpm | 18 - kmdi/res/kde_closebutton.xpm | 30 - kmdi/res/kde_maxbutton.xpm | 30 - kmdi/res/kde_minbutton.xpm | 30 - kmdi/res/kde_restorebutton.xpm | 30 - kmdi/res/kde_undockbutton.xpm | 27 - kmdi/res/win_closebutton.xpm | 30 - kmdi/res/win_maxbutton.xpm | 30 - kmdi/res/win_minbutton.xpm | 30 - kmdi/res/win_restorebutton.xpm | 30 - kmdi/res/win_undockbutton.xpm | 26 - kmdi/test/Makefile.am | 10 - kmdi/test/README | 16 - kmdi/test/hello.cpp | 104 - kmdi/test/hello.h | 38 - kmdi/test/main.cpp | 103 - kmdi/test/mainwidget.cpp | 147 - kmdi/test/mainwidget.h | 71 - knewstuff/Makefile.am | 6 +- kparts/AUTHORS | 11 - kparts/CMakeLists.txt | 64 - kparts/COMMENTS | 605 -- kparts/Mainpage.dox | 42 - kparts/Makefile.am | 32 - kparts/browserextension.cpp | 732 -- kparts/browserextension.h | 832 --- kparts/browserinterface.cpp | 58 - kparts/browserinterface.h | 54 - kparts/browserrun.cpp | 525 -- kparts/browserrun.h | 194 - kparts/browserview.desktop | 157 - kparts/componentfactory.h | 401 -- kparts/design.h | 28 - kparts/dockmainwindow.cpp | 166 - kparts/dockmainwindow.h | 88 - kparts/event.cpp | 58 - kparts/event.h | 120 - kparts/factory.cpp | 82 - kparts/factory.h | 142 - kparts/genericfactory.h | 203 - kparts/historyprovider.cpp | 90 - kparts/historyprovider.h | 109 - kparts/kpart.desktop | 85 - kparts/krop.desktop | 86 - kparts/krwp.desktop | 86 - kparts/mainwindow.cpp | 191 - kparts/mainwindow.h | 120 - kparts/part.cpp | 705 -- kparts/part.h | 702 -- kparts/partmanager.cpp | 601 -- kparts/partmanager.h | 289 - kparts/plugin.cpp | 315 - kparts/plugin.h | 177 - kparts/statusbarextension.cpp | 178 - kparts/statusbarextension.h | 126 - kparts/tests/Makefile.am | 46 - kparts/tests/README | 5 - kparts/tests/example.cpp | 135 - kparts/tests/example.h | 39 - kparts/tests/ghostview.cpp | 119 - kparts/tests/ghostview.h | 22 - kparts/tests/ghostviewtest_shell.rc | 15 - kparts/tests/kpartstest_part1.rc | 18 - kparts/tests/kpartstest_shell.rc | 28 - kparts/tests/normalktm.cpp | 122 - kparts/tests/normalktm.h | 38 - kparts/tests/notepad.cpp | 101 - kparts/tests/notepad.desktop | 86 - kparts/tests/notepad.h | 42 - kparts/tests/notepadpart.cpp | 5 - kparts/tests/notepadpart.rc | 14 - kparts/tests/parts.cpp | 90 - kparts/tests/parts.h | 43 - kparts/tests/plugin_foobar.rc | 12 - kparts/tests/plugin_spellcheck.cpp | 39 - kparts/tests/plugin_spellcheck.h | 18 - kparts/tests/plugin_spellcheck.rc | 15 - krandr/CMakeLists.txt | 48 - krandr/Mainpage.dox | 18 - krandr/Makefile.am | 19 - krandr/configure.in.in | 21 - krandr/ktimerdialog.cpp | 205 - krandr/ktimerdialog.h | 170 - krandr/libkrandr.cc | 1634 ----- krandr/libkrandr.h | 359 - krandr/lowlevel_randr.c | 680 -- krandr/lowlevel_randr.h | 103 - krandr/randr.cpp | 881 --- krandr/randr.h | 302 - kresources/CMakeLists.txt | 78 - kresources/Makefile.am | 49 - kresources/README.design | 173 - kresources/TODO | 17 - kresources/configdialog.cpp | 123 - kresources/configdialog.h | 60 - kresources/configpage.cpp | 535 -- kresources/configpage.h | 110 - kresources/configwidget.cpp | 37 - kresources/configwidget.h | 58 - kresources/factory.cpp | 162 - kresources/factory.h | 118 - kresources/kcmkresources.cpp | 68 - kresources/kcmkresources.h | 42 - kresources/kresources.desktop | 210 - kresources/kresources_manager.desktop | 75 - kresources/kresources_plugin.desktop | 79 - kresources/manager.h | 422 -- kresources/manageriface.h | 46 - kresources/managerimpl.cpp | 448 -- kresources/managerimpl.h | 107 - kresources/resource.cpp | 185 - kresources/resource.h | 420 -- kresources/selectdialog.cpp | 122 - kresources/selectdialog.h | 87 - kresources/testresources.cpp | 81 - krsync/CMakeLists.txt | 50 - krsync/krsync.cpp | 1071 --- krsync/krsync.h | 179 - krsync/rsyncconfigdialog.cpp | 207 - krsync/rsyncconfigdialog.h | 105 - kspell2/CMakeLists.txt | 59 - kspell2/Makefile.am | 24 - kspell2/README | 71 - kspell2/backgroundchecker.cpp | 179 - kspell2/backgroundchecker.h | 124 - kspell2/backgroundengine.cpp | 138 - kspell2/backgroundengine.h | 73 - kspell2/backgroundthread.cpp | 115 - kspell2/backgroundthread.h | 69 - kspell2/broker.cpp | 252 - kspell2/broker.h | 136 - kspell2/client.cpp | 34 - kspell2/client.h | 57 - kspell2/defaultdictionary.cpp | 118 - kspell2/defaultdictionary.h | 71 - kspell2/dictionary.h | 110 - kspell2/filter.cpp | 309 - kspell2/filter.h | 122 - kspell2/kspellclient.desktop | 72 - kspell2/plugins/CMakeLists.txt | 20 - kspell2/plugins/Makefile.am | 9 - kspell2/plugins/aspell/CMakeLists.txt | 44 - kspell2/plugins/aspell/Makefile.am | 17 - kspell2/plugins/aspell/kspell_aspell.desktop | 21 - kspell2/plugins/aspell/kspell_aspellclient.cpp | 66 - kspell2/plugins/aspell/kspell_aspellclient.h | 57 - kspell2/plugins/aspell/kspell_aspelldict.cpp | 125 - kspell2/plugins/aspell/kspell_aspelldict.h | 50 - kspell2/plugins/configure.in.bot | 16 - kspell2/plugins/configure.in.in | 41 - kspell2/plugins/hspell/CMakeLists.txt | 49 - kspell2/plugins/hspell/Makefile.am | 17 - kspell2/plugins/hspell/kspell_hspell.desktop | 18 - kspell2/plugins/hspell/kspell_hspellclient.cpp | 57 - kspell2/plugins/hspell/kspell_hspellclient.h | 60 - kspell2/plugins/hspell/kspell_hspelldict.cpp | 107 - kspell2/plugins/hspell/kspell_hspelldict.h | 53 - kspell2/plugins/ispell/CMakeLists.txt | 44 - kspell2/plugins/ispell/Makefile.am | 24 - kspell2/plugins/ispell/correct.cpp | 949 --- kspell2/plugins/ispell/good.cpp | 431 -- kspell2/plugins/ispell/hash.cpp | 204 - kspell2/plugins/ispell/ispell.h | 801 --- kspell2/plugins/ispell/ispell_checker.cpp | 505 -- kspell2/plugins/ispell/ispell_checker.h | 273 - kspell2/plugins/ispell/ispell_def.h | 34 - kspell2/plugins/ispell/kspell_ispell.desktop | 22 - kspell2/plugins/ispell/kspell_ispellclient.cpp | 54 - kspell2/plugins/ispell/kspell_ispellclient.h | 56 - kspell2/plugins/ispell/kspell_ispelldict.cpp | 76 - kspell2/plugins/ispell/kspell_ispelldict.h | 49 - kspell2/plugins/ispell/lookup.cpp | 764 -- kspell2/plugins/ispell/makedent.cpp | 972 --- kspell2/plugins/ispell/msgs.h | 329 - kspell2/plugins/ispell/sp_spell.h | 60 - kspell2/plugins/ispell/tgood.cpp | 810 --- kspell2/settings.cpp | 226 - kspell2/settings.h | 78 - kspell2/tests/Makefile.am | 24 - kspell2/tests/backgroundtest.cpp | 167 - kspell2/tests/backgroundtest.h | 45 - kspell2/tests/test.cpp | 100 - kspell2/tests/test_config.cpp | 38 - kspell2/tests/test_configdialog.cpp | 40 - kspell2/tests/test_dialog.cpp | 65 - kspell2/tests/test_dialog.h | 42 - kspell2/tests/test_filter.cpp | 50 - kspell2/tests/test_highlighter.cpp | 41 - kspell2/threadevents.h | 62 - kspell2/ui/CMakeLists.txt | 67 - kspell2/ui/Makefile.am | 21 - kspell2/ui/configdialog.cpp | 69 - kspell2/ui/configdialog.h | 49 - kspell2/ui/configui.ui | 114 - kspell2/ui/configwidget.cpp | 131 - kspell2/ui/configwidget.h | 57 - kspell2/ui/dialog.cpp | 282 - kspell2/ui/dialog.h | 88 - kspell2/ui/highlighter.cpp | 150 - kspell2/ui/highlighter.h | 59 - kspell2/ui/kspell2ui.ui | 324 - kstyles/asteroid/Makefile.am | 2 +- kstyles/keramik/Makefile.am | 2 +- kstyles/plastik/plastik.cpp | 32 +- kstyles/plastik/plastik.h | 8 +- kstyles/utils/installtheme/Makefile.am | 2 +- kunittest/CMakeLists.txt | 52 - kunittest/Makefile.am | 27 - kunittest/modrunner.cpp | 67 - kunittest/module.h | 120 - kunittest/runner.cpp | 322 - kunittest/runner.h | 219 - kunittest/samplemodule.cpp | 40 - kunittest/samplemodule.h | 38 - kunittest/tester.cpp | 99 - kunittest/tester.h | 716 -- kutils/CMakeLists.txt | 66 - kutils/Mainpage.dox | 24 - kutils/Makefile.am | 31 - kutils/TODO | 25 - kutils/groups.dox | 41 - kutils/kcmultidialog.cpp | 410 -- kutils/kcmultidialog.h | 288 - kutils/kdeglobals.kcfg | 564 -- kutils/kdeglobals.kcfgc | 5 - kutils/kfind.cpp | 710 -- kutils/kfind.h | 427 -- kutils/kfinddialog.cpp | 544 -- kutils/kfinddialog.h | 315 - kutils/kmultitabbar.cpp | 997 --- kutils/kmultitabbar.h | 316 - kutils/kmultitabbar_p.h | 67 - kutils/kplugininfo.cpp | 359 - kutils/kplugininfo.desktop | 107 - kutils/kplugininfo.h | 319 - kutils/kpluginselector.cpp | 726 -- kutils/kpluginselector.h | 218 - kutils/kpluginselector_p.h | 188 - kutils/kreplace.cpp | 328 - kutils/kreplace.h | 269 - kutils/kreplacedialog.cpp | 160 - kutils/kreplacedialog.h | 160 - kutils/ksettings/CMakeLists.txt | 39 - kutils/ksettings/Makefile.am | 9 - kutils/ksettings/README.dox | 276 - kutils/ksettings/TODO | 13 - kutils/ksettings/componentsdialog.cpp | 180 - kutils/ksettings/componentsdialog.h | 88 - kutils/ksettings/dialog.cpp | 642 -- kutils/ksettings/dialog.h | 224 - kutils/ksettings/dispatcher.cpp | 157 - kutils/ksettings/dispatcher.h | 133 - kutils/ksettings/pluginpage.cpp | 88 - kutils/ksettings/pluginpage.h | 120 - kutils/tdecmodulecontainer.cpp | 258 - kutils/tdecmodulecontainer.h | 207 - kutils/tdecmoduleinfo.cpp | 242 - kutils/tdecmoduleinfo.h | 296 - kutils/tdecmoduleloader.cpp | 302 - kutils/tdecmoduleloader.h | 220 - kutils/tdecmoduleproxy.cpp | 650 -- kutils/tdecmoduleproxy.h | 358 - kutils/tdecmoduleproxyIface.h | 121 - kutils/tdecmoduleproxyIfaceImpl.cpp | 129 - kutils/tdecmoduleproxyIfaceImpl.h | 97 - kutils/tests/Makefile.am | 16 - kutils/tests/kfindtest.cpp | 252 - kutils/tests/kfindtest.h | 59 - kutils/tests/kreplacetest.cpp | 342 - kutils/tests/kreplacetest.h | 52 - kwallet/CMakeLists.txt | 13 - kwallet/Makefile.am | 7 - kwallet/README | 22 - kwallet/backend/CMakeLists.txt | 41 - kwallet/backend/Makefile.am | 25 - kwallet/backend/blockcipher.cc | 37 - kwallet/backend/blockcipher.h | 76 - kwallet/backend/blowfish.cc | 259 - kwallet/backend/blowfish.h | 73 - kwallet/backend/blowfishtables.h | 214 - kwallet/backend/cbc.cc | 149 - kwallet/backend/cbc.h | 62 - kwallet/backend/kwalletbackend.cc | 838 --- kwallet/backend/kwalletbackend.h | 161 - kwallet/backend/kwalletentry.cc | 89 - kwallet/backend/kwalletentry.h | 62 - kwallet/backend/sha1.cc | 343 - kwallet/backend/sha1.h | 71 - kwallet/backend/tests/Makefile.am | 14 - kwallet/backend/tests/backendtest.cpp | 45 - kwallet/backend/tests/testbf.cpp | 67 - kwallet/backend/tests/testsha.cpp | 43 - kwallet/client/CMakeLists.txt | 46 - kwallet/client/Makefile.am | 14 - kwallet/client/kwallet.cc | 713 -- kwallet/client/kwallet.h | 525 -- kwallet/client/kwallettypes.h | 32 - kwallet/tests/Makefile.am | 20 - kwallet/tests/README | 5 - kwallet/tests/kwalletasync.cpp | 59 - kwallet/tests/kwalletboth.cpp | 81 - kwallet/tests/kwalletsync.cpp | 39 - kwallet/tests/kwallettest.cpp | 2 - kwallet/tests/kwallettest.h | 15 - libkmid/CMakeLists.txt | 51 - libkmid/Makefile.am | 24 - libkmid/alsaout.cc | 571 -- libkmid/alsaout.h | 231 - libkmid/awe_sup.h | 50 - libkmid/configure.in.in | 128 - libkmid/dattypes.cc | 110 - libkmid/dattypes.h | 55 - libkmid/deviceman.cc | 830 --- libkmid/deviceman.h | 537 -- libkmid/fmout.cc | 354 - libkmid/fmout.h | 155 - libkmid/gusout.cc | 691 -- libkmid/gusout.h | 180 - libkmid/gusvoices.h | 286 - libkmid/libkmid.cc | 263 - libkmid/libkmid.h | 226 - libkmid/midfile.cc | 460 -- libkmid/midfile.h | 99 - libkmid/midimapper.cc | 456 -- libkmid/midimapper.h | 210 - libkmid/midiout.cc | 301 - libkmid/midiout.h | 251 - libkmid/midispec.h | 60 - libkmid/midistat.cc | 115 - libkmid/midistat.h | 143 - libkmid/mt32togm.cc | 18 - libkmid/mt32togm.h | 31 - libkmid/notearray.cc | 122 - libkmid/notearray.h | 145 - libkmid/player.cc | 959 --- libkmid/player.h | 396 -- libkmid/sndcard.h | 88 - libkmid/synthout.cc | 211 - libkmid/synthout.h | 118 - libkmid/tests/Kathzy.mid | Bin 9083 -> 0 bytes libkmid/tests/Makefile.am | 14 - libkmid/tests/apitest.cc | 25 - libkmid/tests/ctest.c | 54 - libkmid/tests/notesoff.cc | 24 - libkmid/track.cc | 566 -- libkmid/track.h | 237 - libkmid/voiceman.cc | 279 - libkmid/voiceman.h | 172 - libkscreensaver/CMakeLists.txt | 47 - libkscreensaver/Makefile.am | 18 - libkscreensaver/configure.in.in | 5 - libkscreensaver/kscreensaver.cpp | 231 - libkscreensaver/kscreensaver.h | 138 - libkscreensaver/kscreensaver_vroot.h | 132 - libkscreensaver/main.cpp | 163 - libtdemid/CMakeLists.txt | 51 + libtdemid/Makefile.am | 24 + libtdemid/alsaout.cc | 571 ++ libtdemid/alsaout.h | 231 + libtdemid/awe_sup.h | 50 + libtdemid/configure.in.in | 128 + libtdemid/dattypes.cc | 110 + libtdemid/dattypes.h | 55 + libtdemid/deviceman.cc | 830 +++ libtdemid/deviceman.h | 537 ++ libtdemid/fmout.cc | 354 + libtdemid/fmout.h | 155 + libtdemid/gusout.cc | 691 ++ libtdemid/gusout.h | 180 + libtdemid/gusvoices.h | 286 + libtdemid/libtdemid.cc | 263 + libtdemid/libtdemid.h | 226 + libtdemid/midfile.cc | 460 ++ libtdemid/midfile.h | 99 + libtdemid/midimapper.cc | 456 ++ libtdemid/midimapper.h | 210 + libtdemid/midiout.cc | 301 + libtdemid/midiout.h | 251 + libtdemid/midispec.h | 60 + libtdemid/midistat.cc | 115 + libtdemid/midistat.h | 143 + libtdemid/mt32togm.cc | 18 + libtdemid/mt32togm.h | 31 + libtdemid/notearray.cc | 122 + libtdemid/notearray.h | 145 + libtdemid/player.cc | 959 +++ libtdemid/player.h | 396 ++ libtdemid/sndcard.h | 88 + libtdemid/synthout.cc | 211 + libtdemid/synthout.h | 118 + libtdemid/tests/Kathzy.mid | Bin 0 -> 9083 bytes libtdemid/tests/Makefile.am | 14 + libtdemid/tests/apitest.cc | 25 + libtdemid/tests/ctest.c | 54 + libtdemid/tests/notesoff.cc | 24 + libtdemid/track.cc | 566 ++ libtdemid/track.h | 237 + libtdemid/voiceman.cc | 279 + libtdemid/voiceman.h | 172 + libtdescreensaver/CMakeLists.txt | 47 + libtdescreensaver/Makefile.am | 18 + libtdescreensaver/configure.in.in | 5 + libtdescreensaver/main.cpp | 163 + libtdescreensaver/tdescreensaver.cpp | 231 + libtdescreensaver/tdescreensaver.h | 138 + libtdescreensaver/tdescreensaver_vroot.h | 132 + pics/Makefile.am | 2 +- pics/crystalsvg/cr128-mime-kmultiple.png | Bin 4383 -> 0 bytes pics/crystalsvg/cr128-mime-tdemultiple.png | Bin 0 -> 4383 bytes pics/crystalsvg/cr16-mime-kmultiple.png | Bin 494 -> 0 bytes pics/crystalsvg/cr16-mime-tdemultiple.png | Bin 0 -> 494 bytes pics/crystalsvg/cr22-mime-kmultiple.png | Bin 664 -> 0 bytes pics/crystalsvg/cr22-mime-tdemultiple.png | Bin 0 -> 664 bytes pics/crystalsvg/cr32-mime-kmultiple.png | Bin 1346 -> 0 bytes pics/crystalsvg/cr32-mime-tdemultiple.png | Bin 0 -> 1346 bytes pics/crystalsvg/cr48-mime-kmultiple.png | Bin 1806 -> 0 bytes pics/crystalsvg/cr48-mime-tdemultiple.png | Bin 0 -> 1806 bytes pics/crystalsvg/cr64-mime-kmultiple.png | Bin 2052 -> 0 bytes pics/crystalsvg/cr64-mime-tdemultiple.png | Bin 0 -> 2052 bytes pics/crystalsvg/crsc-mime-kmultiple.svgz | Bin 2159 -> 0 bytes pics/crystalsvg/crsc-mime-tdemultiple.svgz | Bin 0 -> 2159 bytes tdecert/CMakeLists.txt | 50 + tdecert/Makefile.am | 18 + tdecert/tdecertpart.cc | 883 +++ tdecert/tdecertpart.desktop | 99 + tdecert/tdecertpart.h | 139 + tdecert/tdecertpart.rc | 10 + tdecore/CMakeLists.txt | 12 +- tdecore/DESIGN.iconloading | 6 +- tdecore/MAINTAINERS | 8 +- tdecore/Makefile.am | 12 +- tdecore/README.kiosk | 8 +- tdecore/kaccelmanager.cpp | 2 +- tdecore/kconfig_compiler/Makefile.am | 2 +- tdecore/kconfig_compiler/example/Makefile.am | 4 +- tdecore/kconfig_compiler/tests/Makefile.am | 32 +- .../tests/kconfigcompiler_test.cpp | 4 +- .../kconfig_compiler/tests/kconfigcompiler_test.h | 2 +- tdecore/kdebug.areas | 78 +- tdecore/kentities.c | 2 +- tdecore/kentities.gperf | 2 +- tdecore/kmultipledrag.cpp | 82 - tdecore/kmultipledrag.h | 105 - tdecore/kprotocolinfo_tdecore.cpp | 4 +- tdecore/kprotocolinfofactory.cpp | 4 +- tdecore/kprotocolinfofactory.h | 2 +- tdecore/kstringhandler.h | 4 +- tdecore/ksycoca.cpp | 528 -- tdecore/ksycoca.h | 187 - tdecore/ksycocadict.cpp | 454 -- tdecore/ksycocadict.h | 123 - tdecore/ksycocaentry.h | 123 - tdecore/ksycocafactory.cpp | 202 - tdecore/ksycocafactory.h | 143 - tdecore/ksycocatype.h | 64 - tdecore/network/CMakeLists.txt | 2 +- tdecore/network/Makefile.am | 4 +- tdecore/network/kmulticastsocket.h | 113 - tdecore/network/kmulticastsocketdevice.h | 151 - tdecore/network/tdemulticastsocket.h | 113 + tdecore/network/tdemulticastsocketdevice.h | 151 + tdecore/tdehardwaredevices.cpp | 4 +- tdecore/tdemultipledrag.cpp | 82 + tdecore/tdemultipledrag.h | 105 + tdecore/tdesycoca.cpp | 528 ++ tdecore/tdesycoca.h | 187 + tdecore/tdesycocadict.cpp | 454 ++ tdecore/tdesycocadict.h | 123 + tdecore/tdesycocaentry.h | 123 + tdecore/tdesycocafactory.cpp | 202 + tdecore/tdesycocafactory.h | 143 + tdecore/tdesycocatype.h | 64 + tdecore/tests/Makefile.am | 8 +- tdecore/tests/dcopkonqtest.cpp | 4 +- tdecore/tests/kapptest.cpp | 2 +- tdecore/tests/kconfigtest.cpp | 6 +- tdehtml/.emacs-dirvars | 9 + tdehtml/CMakeLists.txt | 137 + tdehtml/ChangeLog | 3874 ++++++++++ tdehtml/DESIGN.html | 346 + tdehtml/Mainpage.dox | 46 + tdehtml/Makefile.am | 133 + tdehtml/README.HTMLWidget | 66 + tdehtml/SAFARI_MERGE | 161 + tdehtml/TODO | 60 + tdehtml/configure.in.in | 57 + tdehtml/css/CMakeLists.txt | 47 + tdehtml/css/Makefile.am | 60 + tdehtml/css/css_base.cpp | 419 ++ tdehtml/css/css_base.h | 271 + tdehtml/css/css_extensionsimpl.cpp | 366 + tdehtml/css/css_extensionsimpl.h | 205 + tdehtml/css/css_renderstyledeclarationimpl.cpp | 1147 +++ tdehtml/css/css_renderstyledeclarationimpl.h | 75 + tdehtml/css/css_ruleimpl.cpp | 391 + tdehtml/css/css_ruleimpl.h | 237 + tdehtml/css/css_stylesheetimpl.cpp | 436 ++ tdehtml/css/css_stylesheetimpl.h | 192 + tdehtml/css/css_valueimpl.cpp | 1073 +++ tdehtml/css/css_valueimpl.h | 461 ++ tdehtml/css/csshelper.cpp | 87 + tdehtml/css/csshelper.h | 51 + tdehtml/css/cssparser.cpp | 2614 +++++++ tdehtml/css/cssparser.h | 201 + tdehtml/css/cssproperties.c | 678 ++ tdehtml/css/cssproperties.h | 144 + tdehtml/css/cssproperties.in | 148 + tdehtml/css/cssstyleselector.cpp | 4217 +++++++++++ tdehtml/css/cssstyleselector.h | 333 + tdehtml/css/cssvalues.c | 1344 ++++ tdehtml/css/cssvalues.h | 290 + tdehtml/css/cssvalues.in | 478 ++ tdehtml/css/html4.css | 549 ++ tdehtml/css/makeprop | 57 + tdehtml/css/makevalues | 63 + tdehtml/css/parser.cpp | 2875 ++++++++ tdehtml/css/parser.h | 164 + tdehtml/css/parser.y | 1064 +++ tdehtml/css/quirks.css | 41 + tdehtml/css/tokenizer.cpp | 930 +++ tdehtml/css/tokenizer.flex | 92 + tdehtml/design.h | 58 + tdehtml/dom/CMakeLists.txt | 58 + tdehtml/dom/Makefile.am | 58 + tdehtml/dom/css_extensions.cpp | 2043 ++++++ tdehtml/dom/css_extensions.h | 2702 +++++++ tdehtml/dom/css_rule.cpp | 546 ++ tdehtml/dom/css_rule.h | 534 ++ tdehtml/dom/css_stylesheet.cpp | 457 ++ tdehtml/dom/css_stylesheet.h | 496 ++ tdehtml/dom/css_value.cpp | 587 ++ tdehtml/dom/css_value.h | 745 ++ tdehtml/dom/dom2_events.cpp | 725 ++ tdehtml/dom/dom2_events.h | 846 +++ tdehtml/dom/dom2_range.cpp | 406 ++ tdehtml/dom/dom2_range.h | 475 ++ tdehtml/dom/dom2_traversal.cpp | 381 + tdehtml/dom/dom2_traversal.h | 617 ++ tdehtml/dom/dom2_views.cpp | 95 + tdehtml/dom/dom2_views.h | 90 + tdehtml/dom/dom_core.h | 34 + tdehtml/dom/dom_doc.cpp | 684 ++ tdehtml/dom/dom_doc.h | 1107 +++ tdehtml/dom/dom_element.cpp | 409 ++ tdehtml/dom/dom_element.h | 600 ++ tdehtml/dom/dom_exception.h | 92 + tdehtml/dom/dom_html.h | 40 + tdehtml/dom/dom_misc.cpp | 37 + tdehtml/dom/dom_misc.h | 60 + tdehtml/dom/dom_node.cpp | 495 ++ tdehtml/dom/dom_node.h | 991 +++ tdehtml/dom/dom_string.cpp | 300 + tdehtml/dom/dom_string.h | 144 + tdehtml/dom/dom_text.cpp | 237 + tdehtml/dom/dom_text.h | 312 + tdehtml/dom/dom_xml.cpp | 293 + tdehtml/dom/dom_xml.h | 310 + tdehtml/dom/html_base.cpp | 533 ++ tdehtml/dom/html_base.h | 610 ++ tdehtml/dom/html_block.cpp | 443 ++ tdehtml/dom/html_block.h | 406 ++ tdehtml/dom/html_document.cpp | 233 + tdehtml/dom/html_document.h | 304 + tdehtml/dom/html_element.cpp | 186 + tdehtml/dom/html_element.h | 221 + tdehtml/dom/html_form.cpp | 1302 ++++ tdehtml/dom/html_form.h | 1427 ++++ tdehtml/dom/html_head.cpp | 515 ++ tdehtml/dom/html_head.h | 552 ++ tdehtml/dom/html_image.cpp | 413 ++ tdehtml/dom/html_image.h | 431 ++ tdehtml/dom/html_inline.cpp | 434 ++ tdehtml/dom/html_inline.h | 463 ++ tdehtml/dom/html_list.cpp | 354 + tdehtml/dom/html_list.h | 341 + tdehtml/dom/html_misc.cpp | 214 + tdehtml/dom/html_misc.h | 222 + tdehtml/dom/html_object.cpp | 535 ++ tdehtml/dom/html_object.h | 630 ++ tdehtml/dom/html_table.cpp | 868 +++ tdehtml/dom/html_table.h | 997 +++ tdehtml/domtreeview.cpp | 97 + tdehtml/domtreeview.h | 54 + tdehtml/ecma/AUTHORS | 4 + tdehtml/ecma/CMakeLists.txt | 61 + tdehtml/ecma/Makefile.am | 90 + tdehtml/ecma/README | 21 + tdehtml/ecma/THANKS | 9 + tdehtml/ecma/TODO | 12 + tdehtml/ecma/domparser.cpp | 112 + tdehtml/ecma/domparser.h | 58 + tdehtml/ecma/jsk.html | 113 + tdehtml/ecma/kjs_binding.cpp | 467 ++ tdehtml/ecma/kjs_binding.h | 409 ++ tdehtml/ecma/kjs_css.cpp | 1302 ++++ tdehtml/ecma/kjs_css.h | 304 + tdehtml/ecma/kjs_debugwin.cpp | 1139 +++ tdehtml/ecma/kjs_debugwin.h | 285 + tdehtml/ecma/kjs_dom.cpp | 1849 +++++ tdehtml/ecma/kjs_dom.h | 299 + tdehtml/ecma/kjs_events.cpp | 993 +++ tdehtml/ecma/kjs_events.h | 250 + tdehtml/ecma/kjs_html.cpp | 3946 +++++++++++ tdehtml/ecma/kjs_html.h | 294 + tdehtml/ecma/kjs_mozilla.cpp | 94 + tdehtml/ecma/kjs_mozilla.h | 44 + tdehtml/ecma/kjs_navigator.cpp | 670 ++ tdehtml/ecma/kjs_navigator.h | 53 + tdehtml/ecma/kjs_proxy.cpp | 411 ++ tdehtml/ecma/kjs_proxy.h | 91 + tdehtml/ecma/kjs_range.cpp | 233 + tdehtml/ecma/kjs_range.h | 71 + tdehtml/ecma/kjs_traversal.cpp | 327 + tdehtml/ecma/kjs_traversal.h | 108 + tdehtml/ecma/kjs_views.cpp | 91 + tdehtml/ecma/kjs_views.h | 53 + tdehtml/ecma/kjs_window.cpp | 2935 ++++++++ tdehtml/ecma/kjs_window.h | 309 + tdehtml/ecma/testecma.cpp | 67 + tdehtml/ecma/xmlhttprequest.cpp | 810 +++ tdehtml/ecma/xmlhttprequest.h | 142 + tdehtml/ecma/xmlserializer.cpp | 109 + tdehtml/ecma/xmlserializer.h | 54 + tdehtml/html/AlwaysInline.h | 49 + tdehtml/html/CMakeLists.txt | 44 + tdehtml/html/Makefile.am | 54 + tdehtml/html/Platform.h | 218 + tdehtml/html/RefPtr.h | 202 + tdehtml/html/doctypes.cpp | 1174 +++ tdehtml/html/doctypes.gperf | 91 + tdehtml/html/dtd.cpp | 918 +++ tdehtml/html/dtd.dtd | 1072 +++ tdehtml/html/dtd.h | 41 + tdehtml/html/html_baseimpl.cpp | 708 ++ tdehtml/html/html_baseimpl.h | 207 + tdehtml/html/html_blockimpl.cpp | 371 + tdehtml/html/html_blockimpl.h | 108 + tdehtml/html/html_documentimpl.cpp | 537 ++ tdehtml/html/html_documentimpl.h | 95 + tdehtml/html/html_elementimpl.cpp | 685 ++ tdehtml/html/html_elementimpl.h | 89 + tdehtml/html/html_formimpl.cpp | 2980 ++++++++ tdehtml/html/html_formimpl.h | 606 ++ tdehtml/html/html_headimpl.cpp | 649 ++ tdehtml/html/html_headimpl.h | 233 + tdehtml/html/html_imageimpl.cpp | 560 ++ tdehtml/html/html_imageimpl.h | 150 + tdehtml/html/html_inlineimpl.cpp | 298 + tdehtml/html/html_inlineimpl.h | 75 + tdehtml/html/html_listimpl.cpp | 169 + tdehtml/html/html_listimpl.h | 112 + tdehtml/html/html_miscimpl.cpp | 443 ++ tdehtml/html/html_miscimpl.h | 150 + tdehtml/html/html_objectimpl.cpp | 465 ++ tdehtml/html/html_objectimpl.h | 145 + tdehtml/html/html_tableimpl.cpp | 994 +++ tdehtml/html/html_tableimpl.h | 329 + tdehtml/html/htmlparser.cpp | 1731 +++++ tdehtml/html/htmlparser.h | 192 + tdehtml/html/htmltokenizer.cpp | 1798 +++++ tdehtml/html/htmltokenizer.h | 358 + tdehtml/htmlpageinfo.ui | 301 + tdehtml/java/CMakeLists.txt | 76 + tdehtml/java/ChangeLog | 19 + tdehtml/java/KJAS_GRAMMAR.txt | 82 + tdehtml/java/Makefile.am | 37 + tdehtml/java/README | 20 + tdehtml/java/TODO | 22 + tdehtml/java/build.properties | 9 + tdehtml/java/build.xml | 49 + tdehtml/java/configure.in.in | 5 + tdehtml/java/cr16-action-java.png | Bin 0 -> 1051 bytes tdehtml/java/dummy/CMakeLists.txt | 30 + tdehtml/java/dummy/Makefile.am | 13 + tdehtml/java/images/animbean.gif | Bin 0 -> 4376 bytes tdehtml/java/images/beanicon.png | Bin 0 -> 569 bytes tdehtml/java/images/brokenbean.gif | Bin 0 -> 1195 bytes tdehtml/java/kjava.jar | Bin 0 -> 157645 bytes tdehtml/java/kjava.policy.in | 8 + tdehtml/java/kjavaapplet.cpp | 288 + tdehtml/java/kjavaapplet.h | 251 + tdehtml/java/kjavaappletcontext.cpp | 274 + tdehtml/java/kjavaappletcontext.h | 141 + tdehtml/java/kjavaappletserver.cpp | 833 +++ tdehtml/java/kjavaappletserver.h | 180 + tdehtml/java/kjavaappletviewer.cpp | 635 ++ tdehtml/java/kjavaappletviewer.desktop | 82 + tdehtml/java/kjavaappletviewer.h | 145 + tdehtml/java/kjavaappletwidget.cpp | 140 + tdehtml/java/kjavaappletwidget.h | 125 + tdehtml/java/kjavadownloader.cpp | 298 + tdehtml/java/kjavadownloader.h | 90 + tdehtml/java/kjavaprocess.cpp | 397 ++ tdehtml/java/kjavaprocess.h | 164 + tdehtml/java/kqeventutil.cpp | 200 + tdehtml/java/kqeventutil.h | 34 + tdehtml/java/kxeventutil.cpp | 408 ++ tdehtml/java/kxeventutil.h | 51 + tdehtml/java/make-jar | 12 + tdehtml/java/netscape/javascript/JSException.java | 20 + tdehtml/java/netscape/javascript/JSObject.java | 21 + tdehtml/java/netscape/plugin/Plugin.java | 28 + .../security/ForbiddenTargetException.java | 10 + tdehtml/java/netscape/security/Principal.java | 4 + .../java/netscape/security/PrivilegeManager.java | 109 + tdehtml/java/netscape/security/Target.java | 4 + tdehtml/java/org/kde/javascript/JSObject.java | 183 + tdehtml/java/org/kde/kjas/server/Console.java | 20 + .../org/kde/kjas/server/KJASAppletClassLoader.java | 360 + .../org/kde/kjas/server/KJASAppletContext.java | 473 ++ .../java/org/kde/kjas/server/KJASAppletPanel.java | 113 + .../java/org/kde/kjas/server/KJASAppletStub.java | 807 +++ .../java/org/kde/kjas/server/KJASAudioClip.java | 98 + .../org/kde/kjas/server/KJASBrokenClassFixer.java | 132 + tdehtml/java/org/kde/kjas/server/KJASConsole.java | 93 + .../org/kde/kjas/server/KJASConsoleStream.java | 46 + .../org/kde/kjas/server/KJASProtocolHandler.java | 900 +++ .../org/kde/kjas/server/KJASSecurityManager.java | 243 + .../java/org/kde/kjas/server/KJASSoundPlayer.java | 36 + .../java/org/kde/kjas/server/KJASSwingConsole.java | 325 + .../kjas/server/KJASURLStreamHandlerFactory.java | 609 ++ tdehtml/java/org/kde/kjas/server/Main.java | 178 + .../java/org/kde/kjas/server/StatusListener.java | 5 + tdehtml/java/pluginsinfo | 7 + tdehtml/java/tests/Makefile.am | 9 + tdehtml/java/tests/badapplets/BadApplet.jar | Bin 0 -> 7233 bytes tdehtml/java/tests/badapplets/BadApplet.java | 202 + tdehtml/java/tests/badapplets/applet.html | 14 + tdehtml/java/tests/good_sites | 44 + tdehtml/java/tests/testkjavaappletserver.cpp | 41 + tdehtml/kjserrordlg.ui | 133 + tdehtml/kjserrordlg.ui.h | 32 + tdehtml/libtdehtml.map | 22 + tdehtml/misc/CMakeLists.txt | 41 + tdehtml/misc/Makefile.am | 43 + tdehtml/misc/arena.cpp | 333 + tdehtml/misc/arena.h | 123 + tdehtml/misc/blocked_icon.cpp | 41 + tdehtml/misc/blocked_icon.png | Bin 0 -> 599 bytes tdehtml/misc/decoder.cpp | 790 +++ tdehtml/misc/decoder.h | 115 + tdehtml/misc/guess_ja.cpp | 379 + tdehtml/misc/guess_ja.h | 122 + tdehtml/misc/helper.cpp | 144 + tdehtml/misc/helper.h | 55 + tdehtml/misc/htmlattrs.c | 1019 +++ tdehtml/misc/htmlattrs.h | 168 + tdehtml/misc/htmlattrs.in | 157 + tdehtml/misc/htmlhashes.cpp | 45 + tdehtml/misc/htmlhashes.h | 14 + tdehtml/misc/htmltags.c | 687 ++ tdehtml/misc/htmltags.h | 119 + tdehtml/misc/htmltags.in | 102 + tdehtml/misc/knsplugininstaller.cpp | 671 ++ tdehtml/misc/knsplugininstaller.h | 268 + tdehtml/misc/loader.cpp | 1679 +++++ tdehtml/misc/loader.h | 522 ++ tdehtml/misc/loader_client.h | 35 + tdehtml/misc/loader_jpeg.cpp | 548 ++ tdehtml/misc/loader_jpeg.h | 50 + tdehtml/misc/makeattrs | 113 + tdehtml/misc/maketags | 124 + tdehtml/misc/multimap.h | 345 + tdehtml/misc/seed.h | 46 + tdehtml/misc/shared.h | 227 + tdehtml/misc/stringit.cpp | 138 + tdehtml/misc/stringit.h | 203 + tdehtml/misc/tdehtmllayout.h | 112 + tdehtml/pics/CMakeLists.txt | 20 + tdehtml/pics/Makefile.am | 10 + tdehtml/pics/cr128-action-bug.png | Bin 0 -> 13453 bytes tdehtml/pics/cr16-action-bug.png | Bin 0 -> 1107 bytes tdehtml/pics/cr16-action-images_display.png | Bin 0 -> 539 bytes tdehtml/pics/cr16-action-wallet_open.png | Bin 0 -> 781 bytes tdehtml/pics/cr22-action-bug.png | Bin 0 -> 1914 bytes tdehtml/pics/cr22-action-dbgnext.png | Bin 0 -> 187 bytes tdehtml/pics/cr22-action-dbgrun.png | Bin 0 -> 244 bytes tdehtml/pics/cr22-action-dbgrunto.png | Bin 0 -> 275 bytes tdehtml/pics/cr22-action-dbgstep.png | Bin 0 -> 182 bytes tdehtml/pics/cr22-action-images_display.png | Bin 0 -> 1270 bytes tdehtml/pics/cr32-action-bug.png | Bin 0 -> 2994 bytes tdehtml/pics/cr32-action-images_display.png | Bin 0 -> 2191 bytes tdehtml/pics/cr48-action-bug.png | Bin 0 -> 5091 bytes tdehtml/pics/cr64-action-bug.png | Bin 0 -> 7630 bytes tdehtml/rendering/CMakeLists.txt | 46 + tdehtml/rendering/Makefile.am | 57 + tdehtml/rendering/bidi.cpp | 2250 ++++++ tdehtml/rendering/bidi.h | 172 + tdehtml/rendering/break_lines.cpp | 126 + tdehtml/rendering/break_lines.h | 163 + tdehtml/rendering/counter_tree.cpp | 222 + tdehtml/rendering/counter_tree.h | 114 + tdehtml/rendering/enumerate.cpp | 411 ++ tdehtml/rendering/enumerate.h | 66 + tdehtml/rendering/font.cpp | 502 ++ tdehtml/rendering/font.h | 188 + tdehtml/rendering/img-loading.png | Bin 0 -> 318 bytes tdehtml/rendering/loading_icon.cpp | 25 + tdehtml/rendering/render_applet.cpp | 145 + tdehtml/rendering/render_applet.h | 60 + tdehtml/rendering/render_arena.cpp | 146 + tdehtml/rendering/render_arena.h | 72 + tdehtml/rendering/render_block.cpp | 3155 +++++++++ tdehtml/rendering/render_block.h | 378 + tdehtml/rendering/render_body.cpp | 121 + tdehtml/rendering/render_body.h | 56 + tdehtml/rendering/render_box.cpp | 2325 ++++++ tdehtml/rendering/render_box.h | 213 + tdehtml/rendering/render_br.cpp | 79 + tdehtml/rendering/render_br.h | 77 + tdehtml/rendering/render_canvas.cpp | 780 ++ tdehtml/rendering/render_canvas.h | 250 + tdehtml/rendering/render_container.cpp | 597 ++ tdehtml/rendering/render_container.h | 85 + tdehtml/rendering/render_flow.cpp | 412 ++ tdehtml/rendering/render_flow.h | 96 + tdehtml/rendering/render_form.cpp | 1914 +++++ tdehtml/rendering/render_form.h | 511 ++ tdehtml/rendering/render_frames.cpp | 1025 +++ tdehtml/rendering/render_frames.h | 172 + tdehtml/rendering/render_generated.cpp | 392 + tdehtml/rendering/render_generated.h | 125 + tdehtml/rendering/render_image.cpp | 604 ++ tdehtml/rendering/render_image.h | 105 + tdehtml/rendering/render_inline.cpp | 935 +++ tdehtml/rendering/render_inline.h | 94 + tdehtml/rendering/render_layer.cpp | 1830 +++++ tdehtml/rendering/render_layer.h | 342 + tdehtml/rendering/render_line.cpp | 996 +++ tdehtml/rendering/render_line.h | 310 + tdehtml/rendering/render_list.cpp | 586 ++ tdehtml/rendering/render_list.h | 140 + tdehtml/rendering/render_object.cpp | 2330 ++++++ tdehtml/rendering/render_object.h | 866 +++ tdehtml/rendering/render_replaced.cpp | 940 +++ tdehtml/rendering/render_replaced.h | 169 + tdehtml/rendering/render_style.cpp | 1301 ++++ tdehtml/rendering/render_style.h | 1524 ++++ tdehtml/rendering/render_table.cpp | 3070 ++++++++ tdehtml/rendering/render_table.h | 524 ++ tdehtml/rendering/render_text.cpp | 1546 ++++ tdehtml/rendering/render_text.h | 345 + tdehtml/rendering/table_layout.cpp | 1193 ++++ tdehtml/rendering/table_layout.h | 112 + tdehtml/rendering/table_layout.txt | 74 + tdehtml/tdehtml-devel-gdb | 22 + tdehtml/tdehtml.desktop | 93 + tdehtml/tdehtml.rc | 16 + tdehtml/tdehtml_browser.rc | 49 + tdehtml/tdehtml_caret.cpp | 2664 +++++++ tdehtml/tdehtml_caret_p.h | 1109 +++ tdehtml/tdehtml_events.cpp | 92 + tdehtml/tdehtml_events.h | 157 + tdehtml/tdehtml_ext.cpp | 1032 +++ tdehtml/tdehtml_ext.h | 177 + tdehtml/tdehtml_factory.cpp | 207 + tdehtml/tdehtml_factory.h | 76 + tdehtml/tdehtml_iface.cc | 233 + tdehtml/tdehtml_iface.h | 242 + tdehtml/tdehtml_pagecache.cpp | 313 + tdehtml/tdehtml_pagecache.h | 134 + tdehtml/tdehtml_part.cpp | 7471 ++++++++++++++++++++ tdehtml/tdehtml_part.h | 1683 +++++ tdehtml/tdehtml_popupmenu.rc | 39 + tdehtml/tdehtml_printsettings.cpp | 108 + tdehtml/tdehtml_printsettings.h | 43 + tdehtml/tdehtml_run.cpp | 92 + tdehtml/tdehtml_run.h | 59 + tdehtml/tdehtml_settings.cc | 1064 +++ tdehtml/tdehtml_settings.h | 232 + tdehtml/tdehtmldefaults.h | 33 + tdehtml/tdehtmlimage.cpp | 357 + tdehtml/tdehtmlimage.desktop | 170 + tdehtml/tdehtmlimage.h | 119 + tdehtml/tdehtmlpart_p.h | 569 ++ tdehtml/tdehtmlview.cpp | 4623 ++++++++++++ tdehtml/tdehtmlview.h | 624 ++ tdehtml/tdemultipart/CMakeLists.txt | 48 + tdehtml/tdemultipart/Makefile.am | 17 + tdehtml/tdemultipart/README | 16 + tdehtml/tdemultipart/tdemultipart.cpp | 613 ++ tdehtml/tdemultipart/tdemultipart.desktop | 73 + tdehtml/tdemultipart/tdemultipart.h | 118 + tdehtml/test/README | 6 + tdehtml/test/align.html | 21 + tdehtml/test/align1.html | 21 + tdehtml/test/align2.html | 126 + tdehtml/test/anchor1.html | 25 + tdehtml/test/anchor2.html | 85 + tdehtml/test/button.html | 14 + tdehtml/test/color.html | 60 + tdehtml/test/fixed-background.html | 47 + tdehtml/test/image.gif | Bin 0 -> 1476 bytes tdehtml/test/image_map.html | 24 + tdehtml/test/java.html | 15 + tdehtml/test/jsplugins.html | 73 + tdehtml/test/konqi.gif | Bin 0 -> 39318 bytes tdehtml/test/lake.class | Bin 0 -> 3636 bytes tdehtml/test/lists.html | 221 + tdehtml/test/nav_bar.gif | Bin 0 -> 1059 bytes tdehtml/test/nbsp.html | 20 + tdehtml/test/object.html | 4 + tdehtml/test/pseudo.html | 27 + tdehtml/test/testpages.html | 34 + tdehtml/test_regression.cpp | 1644 +++++ tdehtml/test_regression.h | 194 + tdehtml/test_regression_fontoverload.cpp | 384 + tdehtml/testtdehtml.cpp | 210 + tdehtml/testtdehtml.h | 55 + tdehtml/xml/CMakeLists.txt | 43 + tdehtml/xml/Makefile.am | 48 + tdehtml/xml/dom2_eventsimpl.cpp | 969 +++ tdehtml/xml/dom2_eventsimpl.h | 513 ++ tdehtml/xml/dom2_rangeimpl.cpp | 1640 +++++ tdehtml/xml/dom2_rangeimpl.h | 127 + tdehtml/xml/dom2_traversalimpl.cpp | 667 ++ tdehtml/xml/dom2_traversalimpl.h | 196 + tdehtml/xml/dom2_viewsimpl.cpp | 50 + tdehtml/xml/dom2_viewsimpl.h | 50 + tdehtml/xml/dom_docimpl.cpp | 2892 ++++++++ tdehtml/xml/dom_docimpl.h | 763 ++ tdehtml/xml/dom_elementimpl.cpp | 1301 ++++ tdehtml/xml/dom_elementimpl.h | 392 + tdehtml/xml/dom_nodeimpl.cpp | 2068 ++++++ tdehtml/xml/dom_nodeimpl.h | 736 ++ tdehtml/xml/dom_restyler.cpp | 122 + tdehtml/xml/dom_restyler.h | 102 + tdehtml/xml/dom_stringimpl.cpp | 460 ++ tdehtml/xml/dom_stringimpl.h | 104 + tdehtml/xml/dom_textimpl.cpp | 522 ++ tdehtml/xml/dom_textimpl.h | 176 + tdehtml/xml/dom_xmlimpl.cpp | 498 ++ tdehtml/xml/dom_xmlimpl.h | 181 + tdehtml/xml/xml_tokenizer.cpp | 609 ++ tdehtml/xml/xml_tokenizer.h | 198 + tdemdi/CMakeLists.txt | 60 + tdemdi/Makefile.am | 20 + tdemdi/TODO | 4 + tdemdi/res/filenew.xpm | 27 + tdemdi/res/kde2_closebutton.xpm | 22 + tdemdi/res/kde2_maxbutton.xpm | 22 + tdemdi/res/kde2_minbutton.xpm | 22 + tdemdi/res/kde2_restorebutton.xpm | 22 + tdemdi/res/kde2_undockbutton.xpm | 22 + tdemdi/res/kde2laptop_closebutton.xpm | 18 + tdemdi/res/kde2laptop_closebutton_menu.xpm | 25 + tdemdi/res/kde2laptop_maxbutton.xpm | 18 + tdemdi/res/kde2laptop_minbutton.xpm | 18 + tdemdi/res/kde2laptop_restorebutton.xpm | 18 + tdemdi/res/kde2laptop_undockbutton.xpm | 18 + tdemdi/res/kde_closebutton.xpm | 30 + tdemdi/res/kde_maxbutton.xpm | 30 + tdemdi/res/kde_minbutton.xpm | 30 + tdemdi/res/kde_restorebutton.xpm | 30 + tdemdi/res/kde_undockbutton.xpm | 27 + tdemdi/res/win_closebutton.xpm | 30 + tdemdi/res/win_maxbutton.xpm | 30 + tdemdi/res/win_minbutton.xpm | 30 + tdemdi/res/win_restorebutton.xpm | 30 + tdemdi/res/win_undockbutton.xpm | 26 + tdemdi/tdemdi/CMakeLists.txt | 52 + tdemdi/tdemdi/Makefile.am | 14 + tdemdi/tdemdi/dockcontainer.cpp | 656 ++ tdemdi/tdemdi/dockcontainer.h | 144 + tdemdi/tdemdi/global.h | 69 + tdemdi/tdemdi/guiclient.cpp | 230 + tdemdi/tdemdi/guiclient.h | 103 + tdemdi/tdemdi/mainwindow.cpp | 451 ++ tdemdi/tdemdi/mainwindow.h | 199 + tdemdi/tdemdi/tabwidget.cpp | 284 + tdemdi/tdemdi/tabwidget.h | 115 + tdemdi/tdemdi/toolviewaccessor.cpp | 223 + tdemdi/tdemdi/toolviewaccessor.h | 88 + tdemdi/tdemdi/toolviewaccessor_p.h | 60 + tdemdi/tdemdichildarea.cpp | 793 +++ tdemdi/tdemdichildarea.h | 304 + tdemdi/tdemdichildfrm.cpp | 1409 ++++ tdemdi/tdemdichildfrm.h | 446 ++ tdemdi/tdemdichildfrmcaption.cpp | 322 + tdemdi/tdemdichildfrmcaption.h | 145 + tdemdi/tdemdichildview.cpp | 774 ++ tdemdi/tdemdichildview.h | 615 ++ tdemdi/tdemdidefines.h | 117 + tdemdi/tdemdidockcontainer.cpp | 858 +++ tdemdi/tdemdidockcontainer.h | 167 + tdemdi/tdemdidocumentviewtabwidget.cpp | 148 + tdemdi/tdemdidocumentviewtabwidget.h | 125 + tdemdi/tdemdifocuslist.cpp | 70 + tdemdi/tdemdifocuslist.h | 42 + tdemdi/tdemdiguiclient.cpp | 320 + tdemdi/tdemdiguiclient.h | 146 + tdemdi/tdemdiiterator.h | 51 + tdemdi/tdemdilistiterator.h | 61 + tdemdi/tdemdimainfrm.cpp | 2937 ++++++++ tdemdi/tdemdimainfrm.h | 884 +++ tdemdi/tdemdinulliterator.h | 49 + tdemdi/tdemditaskbar.cpp | 394 ++ tdemdi/tdemditaskbar.h | 219 + tdemdi/tdemditoolviewaccessor.cpp | 269 + tdemdi/tdemditoolviewaccessor.h | 86 + tdemdi/tdemditoolviewaccessor_p.h | 51 + tdemdi/test/Makefile.am | 10 + tdemdi/test/README | 16 + tdemdi/test/hello.cpp | 104 + tdemdi/test/hello.h | 38 + tdemdi/test/main.cpp | 103 + tdemdi/test/mainwidget.cpp | 147 + tdemdi/test/mainwidget.h | 71 + tdeparts/AUTHORS | 11 + tdeparts/CMakeLists.txt | 64 + tdeparts/COMMENTS | 605 ++ tdeparts/Mainpage.dox | 42 + tdeparts/Makefile.am | 32 + tdeparts/browserextension.cpp | 732 ++ tdeparts/browserextension.h | 832 +++ tdeparts/browserinterface.cpp | 58 + tdeparts/browserinterface.h | 54 + tdeparts/browserrun.cpp | 525 ++ tdeparts/browserrun.h | 194 + tdeparts/browserview.desktop | 157 + tdeparts/componentfactory.h | 401 ++ tdeparts/design.h | 28 + tdeparts/dockmainwindow.cpp | 166 + tdeparts/dockmainwindow.h | 88 + tdeparts/event.cpp | 58 + tdeparts/event.h | 120 + tdeparts/factory.cpp | 82 + tdeparts/factory.h | 142 + tdeparts/genericfactory.h | 203 + tdeparts/historyprovider.cpp | 90 + tdeparts/historyprovider.h | 109 + tdeparts/kpart.desktop | 85 + tdeparts/krop.desktop | 86 + tdeparts/krwp.desktop | 86 + tdeparts/mainwindow.cpp | 191 + tdeparts/mainwindow.h | 120 + tdeparts/part.cpp | 705 ++ tdeparts/part.h | 702 ++ tdeparts/partmanager.cpp | 601 ++ tdeparts/partmanager.h | 289 + tdeparts/plugin.cpp | 315 + tdeparts/plugin.h | 177 + tdeparts/statusbarextension.cpp | 178 + tdeparts/statusbarextension.h | 126 + tdeparts/tests/Makefile.am | 46 + tdeparts/tests/README | 5 + tdeparts/tests/example.cpp | 135 + tdeparts/tests/example.h | 39 + tdeparts/tests/ghostview.cpp | 119 + tdeparts/tests/ghostview.h | 22 + tdeparts/tests/ghostviewtest_shell.rc | 15 + tdeparts/tests/normalktm.cpp | 122 + tdeparts/tests/normalktm.h | 38 + tdeparts/tests/notepad.cpp | 101 + tdeparts/tests/notepad.desktop | 86 + tdeparts/tests/notepad.h | 42 + tdeparts/tests/notepadpart.cpp | 5 + tdeparts/tests/notepadpart.rc | 14 + tdeparts/tests/parts.cpp | 90 + tdeparts/tests/parts.h | 43 + tdeparts/tests/plugin_foobar.rc | 12 + tdeparts/tests/plugin_spellcheck.cpp | 39 + tdeparts/tests/plugin_spellcheck.h | 18 + tdeparts/tests/plugin_spellcheck.rc | 15 + tdeparts/tests/tdepartstest_part1.rc | 18 + tdeparts/tests/tdepartstest_shell.rc | 28 + tdeprint/kprintpreview.cpp | 2 +- tderandr/CMakeLists.txt | 48 + tderandr/Mainpage.dox | 18 + tderandr/Makefile.am | 19 + tderandr/configure.in.in | 21 + tderandr/ktimerdialog.cpp | 205 + tderandr/ktimerdialog.h | 170 + tderandr/libtderandr.cc | 1634 +++++ tderandr/libtderandr.h | 359 + tderandr/lowlevel_randr.c | 680 ++ tderandr/lowlevel_randr.h | 103 + tderandr/randr.cpp | 881 +++ tderandr/randr.h | 302 + tderesources/CMakeLists.txt | 78 + tderesources/Makefile.am | 49 + tderesources/README.design | 173 + tderesources/TODO | 17 + tderesources/configdialog.cpp | 123 + tderesources/configdialog.h | 60 + tderesources/configpage.cpp | 535 ++ tderesources/configpage.h | 110 + tderesources/configwidget.cpp | 37 + tderesources/configwidget.h | 58 + tderesources/factory.cpp | 162 + tderesources/factory.h | 118 + tderesources/kcmtderesources.cpp | 68 + tderesources/kcmtderesources.h | 42 + tderesources/manager.h | 422 ++ tderesources/manageriface.h | 46 + tderesources/managerimpl.cpp | 448 ++ tderesources/managerimpl.h | 107 + tderesources/resource.cpp | 185 + tderesources/resource.h | 420 ++ tderesources/selectdialog.cpp | 122 + tderesources/selectdialog.h | 87 + tderesources/tderesources.desktop | 210 + tderesources/tderesources_manager.desktop | 75 + tderesources/tderesources_plugin.desktop | 79 + tderesources/testresources.cpp | 81 + tdersync/CMakeLists.txt | 50 + tdersync/rsyncconfigdialog.cpp | 207 + tdersync/rsyncconfigdialog.h | 105 + tdersync/tdersync.cpp | 1071 +++ tdersync/tdersync.h | 179 + tdespell2/CMakeLists.txt | 59 + tdespell2/Makefile.am | 24 + tdespell2/README | 71 + tdespell2/backgroundchecker.cpp | 179 + tdespell2/backgroundchecker.h | 124 + tdespell2/backgroundengine.cpp | 138 + tdespell2/backgroundengine.h | 73 + tdespell2/backgroundthread.cpp | 115 + tdespell2/backgroundthread.h | 69 + tdespell2/broker.cpp | 252 + tdespell2/broker.h | 136 + tdespell2/client.cpp | 34 + tdespell2/client.h | 57 + tdespell2/defaultdictionary.cpp | 118 + tdespell2/defaultdictionary.h | 71 + tdespell2/dictionary.h | 110 + tdespell2/filter.cpp | 309 + tdespell2/filter.h | 122 + tdespell2/plugins/CMakeLists.txt | 20 + tdespell2/plugins/Makefile.am | 9 + tdespell2/plugins/aspell/CMakeLists.txt | 44 + tdespell2/plugins/aspell/Makefile.am | 17 + tdespell2/plugins/aspell/tdespell_aspell.desktop | 21 + tdespell2/plugins/aspell/tdespell_aspellclient.cpp | 66 + tdespell2/plugins/aspell/tdespell_aspellclient.h | 57 + tdespell2/plugins/aspell/tdespell_aspelldict.cpp | 125 + tdespell2/plugins/aspell/tdespell_aspelldict.h | 50 + tdespell2/plugins/configure.in.bot | 16 + tdespell2/plugins/configure.in.in | 41 + tdespell2/plugins/hspell/CMakeLists.txt | 49 + tdespell2/plugins/hspell/Makefile.am | 17 + tdespell2/plugins/hspell/tdespell_hspell.desktop | 18 + tdespell2/plugins/hspell/tdespell_hspellclient.cpp | 57 + tdespell2/plugins/hspell/tdespell_hspellclient.h | 60 + tdespell2/plugins/hspell/tdespell_hspelldict.cpp | 107 + tdespell2/plugins/hspell/tdespell_hspelldict.h | 53 + tdespell2/plugins/ispell/CMakeLists.txt | 44 + tdespell2/plugins/ispell/Makefile.am | 24 + tdespell2/plugins/ispell/correct.cpp | 949 +++ tdespell2/plugins/ispell/good.cpp | 431 ++ tdespell2/plugins/ispell/hash.cpp | 204 + tdespell2/plugins/ispell/ispell.h | 801 +++ tdespell2/plugins/ispell/ispell_checker.cpp | 505 ++ tdespell2/plugins/ispell/ispell_checker.h | 273 + tdespell2/plugins/ispell/ispell_def.h | 34 + tdespell2/plugins/ispell/lookup.cpp | 764 ++ tdespell2/plugins/ispell/makedent.cpp | 972 +++ tdespell2/plugins/ispell/msgs.h | 329 + tdespell2/plugins/ispell/sp_spell.h | 60 + tdespell2/plugins/ispell/tdespell_ispell.desktop | 22 + tdespell2/plugins/ispell/tdespell_ispellclient.cpp | 54 + tdespell2/plugins/ispell/tdespell_ispellclient.h | 56 + tdespell2/plugins/ispell/tdespell_ispelldict.cpp | 76 + tdespell2/plugins/ispell/tdespell_ispelldict.h | 49 + tdespell2/plugins/ispell/tgood.cpp | 810 +++ tdespell2/settings.cpp | 226 + tdespell2/settings.h | 78 + tdespell2/tdespellclient.desktop | 72 + tdespell2/tests/Makefile.am | 24 + tdespell2/tests/backgroundtest.cpp | 167 + tdespell2/tests/backgroundtest.h | 45 + tdespell2/tests/test.cpp | 100 + tdespell2/tests/test_config.cpp | 38 + tdespell2/tests/test_configdialog.cpp | 40 + tdespell2/tests/test_dialog.cpp | 65 + tdespell2/tests/test_dialog.h | 42 + tdespell2/tests/test_filter.cpp | 50 + tdespell2/tests/test_highlighter.cpp | 41 + tdespell2/threadevents.h | 62 + tdespell2/ui/CMakeLists.txt | 67 + tdespell2/ui/Makefile.am | 21 + tdespell2/ui/configdialog.cpp | 69 + tdespell2/ui/configdialog.h | 49 + tdespell2/ui/configui.ui | 114 + tdespell2/ui/configwidget.cpp | 131 + tdespell2/ui/configwidget.h | 57 + tdespell2/ui/dialog.cpp | 282 + tdespell2/ui/dialog.h | 88 + tdespell2/ui/highlighter.cpp | 150 + tdespell2/ui/highlighter.h | 59 + tdespell2/ui/tdespell2ui.ui | 324 + tdeui/CMakeLists.txt | 12 +- tdeui/Makefile.am | 16 +- tdeui/README.kspell | 17 - tdeui/README.tdespell | 17 + tdeui/TODO.kspell | 34 - tdeui/TODO.tdespell | 34 + tdeui/kdepackages.h | 94 +- tdeui/kdockwidget_private.h | 2 +- tdeui/keditcl2.cpp | 4 +- tdeui/kedittoolbar.cpp | 2 +- tdeui/ksconfig.cpp | 2 +- tdeui/ksconfig.h | 2 +- tdeui/kspell.cpp | 1577 ----- tdeui/kspell.h | 568 -- tdeui/kspelldlg.cpp | 285 - tdeui/kspelldlg.h | 114 - tdeui/kspellui.ui | 300 - tdeui/ksyntaxhighlighter.cpp | 4 +- tdeui/ktabwidget.cpp | 2 +- tdeui/ktextedit.cpp | 2 +- tdeui/tdespell.cpp | 1577 +++++ tdeui/tdespell.h | 568 ++ tdeui/tdespelldlg.cpp | 285 + tdeui/tdespelldlg.h | 114 + tdeui/tdespellui.ui | 300 + tdeui/tests/CMakeLists.txt | 2 +- tdeui/tests/Makefile.am | 4 +- tdeui/tests/kspelltest.cpp | 57 - tdeui/tests/kxmlguitest_part.rc | 2 +- tdeui/tests/tdespelltest.cpp | 57 + tdeunittest/CMakeLists.txt | 52 + tdeunittest/Makefile.am | 27 + tdeunittest/modrunner.cpp | 67 + tdeunittest/module.h | 120 + tdeunittest/runner.cpp | 322 + tdeunittest/runner.h | 219 + tdeunittest/samplemodule.cpp | 40 + tdeunittest/samplemodule.h | 38 + tdeunittest/tester.cpp | 99 + tdeunittest/tester.h | 716 ++ tdeutils/CMakeLists.txt | 66 + tdeutils/Mainpage.dox | 24 + tdeutils/Makefile.am | 31 + tdeutils/TODO | 25 + tdeutils/groups.dox | 41 + tdeutils/kcmultidialog.cpp | 410 ++ tdeutils/kcmultidialog.h | 288 + tdeutils/kdeglobals.kcfg | 564 ++ tdeutils/kdeglobals.kcfgc | 5 + tdeutils/kfind.cpp | 710 ++ tdeutils/kfind.h | 427 ++ tdeutils/kfinddialog.cpp | 544 ++ tdeutils/kfinddialog.h | 315 + tdeutils/kplugininfo.cpp | 359 + tdeutils/kplugininfo.desktop | 107 + tdeutils/kplugininfo.h | 319 + tdeutils/kpluginselector.cpp | 726 ++ tdeutils/kpluginselector.h | 218 + tdeutils/kpluginselector_p.h | 188 + tdeutils/kreplace.cpp | 328 + tdeutils/kreplace.h | 269 + tdeutils/kreplacedialog.cpp | 160 + tdeutils/kreplacedialog.h | 160 + tdeutils/ksettings/CMakeLists.txt | 39 + tdeutils/ksettings/Makefile.am | 9 + tdeutils/ksettings/README.dox | 276 + tdeutils/ksettings/TODO | 13 + tdeutils/ksettings/componentsdialog.cpp | 180 + tdeutils/ksettings/componentsdialog.h | 88 + tdeutils/ksettings/dialog.cpp | 642 ++ tdeutils/ksettings/dialog.h | 224 + tdeutils/ksettings/dispatcher.cpp | 157 + tdeutils/ksettings/dispatcher.h | 133 + tdeutils/ksettings/pluginpage.cpp | 88 + tdeutils/ksettings/pluginpage.h | 120 + tdeutils/tdecmodulecontainer.cpp | 258 + tdeutils/tdecmodulecontainer.h | 207 + tdeutils/tdecmoduleinfo.cpp | 242 + tdeutils/tdecmoduleinfo.h | 296 + tdeutils/tdecmoduleloader.cpp | 302 + tdeutils/tdecmoduleloader.h | 220 + tdeutils/tdecmoduleproxy.cpp | 650 ++ tdeutils/tdecmoduleproxy.h | 358 + tdeutils/tdecmoduleproxyIface.h | 121 + tdeutils/tdecmoduleproxyIfaceImpl.cpp | 129 + tdeutils/tdecmoduleproxyIfaceImpl.h | 97 + tdeutils/tdemultitabbar.cpp | 997 +++ tdeutils/tdemultitabbar.h | 316 + tdeutils/tdemultitabbar_p.h | 67 + tdeutils/tests/Makefile.am | 16 + tdeutils/tests/kfindtest.cpp | 252 + tdeutils/tests/kfindtest.h | 59 + tdeutils/tests/kreplacetest.cpp | 342 + tdeutils/tests/kreplacetest.h | 52 + tdewallet/CMakeLists.txt | 13 + tdewallet/Makefile.am | 7 + tdewallet/README | 22 + tdewallet/backend/CMakeLists.txt | 41 + tdewallet/backend/Makefile.am | 25 + tdewallet/backend/blockcipher.cc | 37 + tdewallet/backend/blockcipher.h | 76 + tdewallet/backend/blowfish.cc | 259 + tdewallet/backend/blowfish.h | 73 + tdewallet/backend/blowfishtables.h | 214 + tdewallet/backend/cbc.cc | 149 + tdewallet/backend/cbc.h | 62 + tdewallet/backend/sha1.cc | 343 + tdewallet/backend/sha1.h | 71 + tdewallet/backend/tdewalletbackend.cc | 838 +++ tdewallet/backend/tdewalletbackend.h | 161 + tdewallet/backend/tdewalletentry.cc | 89 + tdewallet/backend/tdewalletentry.h | 62 + tdewallet/backend/tests/Makefile.am | 14 + tdewallet/backend/tests/backendtest.cpp | 45 + tdewallet/backend/tests/testbf.cpp | 67 + tdewallet/backend/tests/testsha.cpp | 43 + tdewallet/client/CMakeLists.txt | 46 + tdewallet/client/Makefile.am | 14 + tdewallet/client/tdewallet.cc | 713 ++ tdewallet/client/tdewallet.h | 525 ++ tdewallet/client/tdewallettypes.h | 32 + tdewallet/tests/Makefile.am | 20 + tdewallet/tests/README | 5 + tdewallet/tests/tdewalletasync.cpp | 59 + tdewallet/tests/tdewalletboth.cpp | 81 + tdewallet/tests/tdewalletsync.cpp | 39 + tdewallet/tests/tdewallettest.cpp | 2 + tdewallet/tests/tdewallettest.h | 15 + win/pro_files/interfaces/interfaces.pro | 2 +- .../interfaces/ktexteditor/ktexteditor.pro | 74 - .../interfaces/tdetexteditor/tdetexteditor.pro | 74 + win/pro_files/kabc/kabc.pro | 2 +- win/pro_files/kate/interfaces/interfaces.pro | 4 +- win/pro_files/kate/part/part.pro | 6 +- win/pro_files/kdewidgets/kdewidgets.pro | 4 +- .../kio/kfile/tests/kfiletreeviewtest.pro | 2 +- win/pro_files/kio/kio.pro | 2 +- win/pro_files/kmdi/kmdi.pro | 31 - win/pro_files/kmdi/test/test.pro | 25 - win/pro_files/kparts/kparts.pro | 31 - win/pro_files/kresources/kresources.pro | 35 - win/pro_files/kutils/kutils.pro | 26 - win/pro_files/tdecore/tdecore.pro | 12 +- win/pro_files/tdemdi/tdemdi.pro | 31 + win/pro_files/tdemdi/test/test.pro | 25 + win/pro_files/tdeparts/tdeparts.pro | 31 + win/pro_files/tderesources/tderesources.pro | 35 + win/pro_files/tdeui/tdeui.pro | 6 +- win/pro_files/tdeutils/tdeutils.pro | 26 + win/tools/build_tdelibs_dbg | 10 +- win/tools/build_tdelibs_rel | 10 +- win/tools/kde_env | 2 +- 2405 files changed, 298429 insertions(+), 298429 deletions(-) delete mode 100644 dnssd/kcm_kdnssd.kcfg create mode 100644 dnssd/kcm_tdednssd.kcfg delete mode 100644 doc/kspell/CMakeLists.txt delete mode 100644 doc/kspell/Makefile.am delete mode 100644 doc/kspell/index.docbook create mode 100644 doc/tdespell/CMakeLists.txt create mode 100644 doc/tdespell/Makefile.am create mode 100644 doc/tdespell/index.docbook delete mode 100644 interfaces/kimproxy/CMakeLists.txt delete mode 100644 interfaces/kimproxy/Makefile.am delete mode 100644 interfaces/kimproxy/TODO delete mode 100644 interfaces/kimproxy/interface/CMakeLists.txt delete mode 100644 interfaces/kimproxy/interface/Makefile.am delete mode 100644 interfaces/kimproxy/interface/dcopinstantmessenger.desktop delete mode 100644 interfaces/kimproxy/interface/kcm_instantmessenger.desktop delete mode 100644 interfaces/kimproxy/interface/kimiface.h delete mode 100644 interfaces/kimproxy/library/CMakeLists.txt delete mode 100644 interfaces/kimproxy/library/Makefile.am delete mode 100644 interfaces/kimproxy/library/icons/CMakeLists.txt delete mode 100644 interfaces/kimproxy/library/icons/Makefile.am delete mode 100644 interfaces/kimproxy/library/icons/cr16-action-presence_away.png delete mode 100644 interfaces/kimproxy/library/icons/cr16-action-presence_offline.png delete mode 100644 interfaces/kimproxy/library/icons/cr16-action-presence_online.png delete mode 100644 interfaces/kimproxy/library/icons/cr16-action-presence_unknown.png delete mode 100644 interfaces/kimproxy/library/icons/cr32-action-presence_away.png delete mode 100644 interfaces/kimproxy/library/icons/cr32-action-presence_offline.png delete mode 100644 interfaces/kimproxy/library/icons/cr32-action-presence_online.png delete mode 100644 interfaces/kimproxy/library/icons/cr32-action-presence_unknown.png delete mode 100644 interfaces/kimproxy/library/icons/cr48-action-presence_away.png delete mode 100644 interfaces/kimproxy/library/icons/cr48-action-presence_offline.png delete mode 100644 interfaces/kimproxy/library/icons/cr48-action-presence_online.png delete mode 100644 interfaces/kimproxy/library/kimproxy.cpp delete mode 100644 interfaces/kimproxy/library/kimproxy.h delete mode 100644 interfaces/kimproxy/library/kimproxyiface.h delete mode 100644 interfaces/kmediaplayer/CMakeLists.txt delete mode 100644 interfaces/kmediaplayer/Makefile.am delete mode 100644 interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt delete mode 100644 interfaces/kmediaplayer/kfileaudiopreview/Makefile.am delete mode 100644 interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp delete mode 100644 interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h delete mode 100644 interfaces/kmediaplayer/kmediaplayer.desktop delete mode 100644 interfaces/kmediaplayer/kmediaplayerengine.desktop delete mode 100644 interfaces/kmediaplayer/player.cpp delete mode 100644 interfaces/kmediaplayer/player.h delete mode 100644 interfaces/kmediaplayer/playerdcopobject.h delete mode 100644 interfaces/kmediaplayer/view.cpp delete mode 100644 interfaces/kmediaplayer/view.h delete mode 100644 interfaces/kscript/CMakeLists.txt delete mode 100644 interfaces/kscript/Makefile.am delete mode 100644 interfaces/kscript/README delete mode 100644 interfaces/kscript/sample/CMakeLists.txt delete mode 100644 interfaces/kscript/sample/Makefile.am delete mode 100644 interfaces/kscript/sample/shellscript.cpp delete mode 100644 interfaces/kscript/sample/shellscript.desktop delete mode 100644 interfaces/kscript/sample/shellscript.h delete mode 100644 interfaces/kscript/scriptclientinterface.h delete mode 100644 interfaces/kscript/scriptinterface.desktop delete mode 100644 interfaces/kscript/scriptinterface.h delete mode 100644 interfaces/kscript/scriptloader.cpp delete mode 100644 interfaces/kscript/scriptloader.h delete mode 100644 interfaces/kscript/scriptmanager.cpp delete mode 100644 interfaces/kscript/scriptmanager.h delete mode 100644 interfaces/ktexteditor/.kateconfig delete mode 100644 interfaces/ktexteditor/CMakeLists.txt delete mode 100644 interfaces/ktexteditor/Makefile.am delete mode 100644 interfaces/ktexteditor/blockselectiondcopinterface.cpp delete mode 100644 interfaces/ktexteditor/blockselectiondcopinterface.h delete mode 100644 interfaces/ktexteditor/blockselectioninterface.cpp delete mode 100644 interfaces/ktexteditor/blockselectioninterface.h delete mode 100644 interfaces/ktexteditor/clipboarddcopinterface.cpp delete mode 100644 interfaces/ktexteditor/clipboarddcopinterface.h delete mode 100644 interfaces/ktexteditor/clipboardinterface.cpp delete mode 100644 interfaces/ktexteditor/clipboardinterface.h delete mode 100644 interfaces/ktexteditor/codecompletioninterface.cpp delete mode 100644 interfaces/ktexteditor/codecompletioninterface.h delete mode 100644 interfaces/ktexteditor/configinterface.cpp delete mode 100644 interfaces/ktexteditor/configinterface.h delete mode 100644 interfaces/ktexteditor/configinterfaceextension.cpp delete mode 100644 interfaces/ktexteditor/configinterfaceextension.h delete mode 100644 interfaces/ktexteditor/cursorinterface.cpp delete mode 100644 interfaces/ktexteditor/cursorinterface.h delete mode 100644 interfaces/ktexteditor/document.h delete mode 100644 interfaces/ktexteditor/documentdcopinfo.cpp delete mode 100644 interfaces/ktexteditor/documentdcopinfo.h delete mode 100644 interfaces/ktexteditor/documentinfo.cpp delete mode 100644 interfaces/ktexteditor/documentinfo.h delete mode 100644 interfaces/ktexteditor/dynwordwrapinterface.cpp delete mode 100644 interfaces/ktexteditor/dynwordwrapinterface.h delete mode 100644 interfaces/ktexteditor/editdcopinterface.cpp delete mode 100644 interfaces/ktexteditor/editdcopinterface.h delete mode 100644 interfaces/ktexteditor/editinterface.cpp delete mode 100644 interfaces/ktexteditor/editinterface.h delete mode 100644 interfaces/ktexteditor/editinterfaceext.cpp delete mode 100644 interfaces/ktexteditor/editinterfaceext.h delete mode 100644 interfaces/ktexteditor/editor.h delete mode 100644 interfaces/ktexteditor/editorchooser.cpp delete mode 100644 interfaces/ktexteditor/editorchooser.h delete mode 100644 interfaces/ktexteditor/editorchooser_ui.ui delete mode 100644 interfaces/ktexteditor/encodingdcopinterface.cpp delete mode 100644 interfaces/ktexteditor/encodingdcopinterface.h delete mode 100644 interfaces/ktexteditor/encodinginterface.cpp delete mode 100644 interfaces/ktexteditor/encodinginterface.h delete mode 100644 interfaces/ktexteditor/highlightinginterface.cpp delete mode 100644 interfaces/ktexteditor/highlightinginterface.h delete mode 100644 interfaces/ktexteditor/kcm_ktexteditor.desktop delete mode 100644 interfaces/ktexteditor/ktexteditor.cpp delete mode 100644 interfaces/ktexteditor/ktexteditor.desktop delete mode 100644 interfaces/ktexteditor/ktexteditoreditor.desktop delete mode 100644 interfaces/ktexteditor/ktexteditorplugin.desktop delete mode 100644 interfaces/ktexteditor/markinterface.cpp delete mode 100644 interfaces/ktexteditor/markinterface.h delete mode 100644 interfaces/ktexteditor/markinterfaceextension.cpp delete mode 100644 interfaces/ktexteditor/markinterfaceextension.h delete mode 100644 interfaces/ktexteditor/plugin.h delete mode 100644 interfaces/ktexteditor/popupmenuinterface.cpp delete mode 100644 interfaces/ktexteditor/popupmenuinterface.h delete mode 100644 interfaces/ktexteditor/printdcopinterface.cpp delete mode 100644 interfaces/ktexteditor/printdcopinterface.h delete mode 100644 interfaces/ktexteditor/printinterface.cpp delete mode 100644 interfaces/ktexteditor/printinterface.h delete mode 100644 interfaces/ktexteditor/searchdcopinterface.cpp delete mode 100644 interfaces/ktexteditor/searchdcopinterface.h delete mode 100644 interfaces/ktexteditor/searchinterface.cpp delete mode 100644 interfaces/ktexteditor/searchinterface.h delete mode 100644 interfaces/ktexteditor/selectiondcopinterface.cpp delete mode 100644 interfaces/ktexteditor/selectiondcopinterface.h delete mode 100644 interfaces/ktexteditor/selectionextdcopinterface.h delete mode 100644 interfaces/ktexteditor/selectioninterface.cpp delete mode 100644 interfaces/ktexteditor/selectioninterface.h delete mode 100644 interfaces/ktexteditor/selectioninterfaceext.cpp delete mode 100644 interfaces/ktexteditor/selectioninterfaceext.h delete mode 100644 interfaces/ktexteditor/sessionconfiginterface.cpp delete mode 100644 interfaces/ktexteditor/sessionconfiginterface.h delete mode 100644 interfaces/ktexteditor/templateinterface.cpp delete mode 100644 interfaces/ktexteditor/templateinterface.h delete mode 100644 interfaces/ktexteditor/texthintinterface.cpp delete mode 100644 interfaces/ktexteditor/texthintinterface.h delete mode 100644 interfaces/ktexteditor/undodcopinterface.cpp delete mode 100644 interfaces/ktexteditor/undodcopinterface.h delete mode 100644 interfaces/ktexteditor/undointerface.cpp delete mode 100644 interfaces/ktexteditor/undointerface.h delete mode 100644 interfaces/ktexteditor/variableinterface.cpp delete mode 100644 interfaces/ktexteditor/variableinterface.h delete mode 100644 interfaces/ktexteditor/view.h delete mode 100644 interfaces/ktexteditor/viewcursordcopinterface.cpp delete mode 100644 interfaces/ktexteditor/viewcursordcopinterface.h delete mode 100644 interfaces/ktexteditor/viewcursorinterface.cpp delete mode 100644 interfaces/ktexteditor/viewcursorinterface.h delete mode 100644 interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp delete mode 100644 interfaces/ktexteditor/viewstatusmsgdcopinterface.h delete mode 100644 interfaces/ktexteditor/viewstatusmsginterface.cpp delete mode 100644 interfaces/ktexteditor/viewstatusmsginterface.h delete mode 100644 interfaces/ktexteditor/wordwrapinterface.cpp delete mode 100644 interfaces/ktexteditor/wordwrapinterface.h create mode 100644 interfaces/tdeimproxy/CMakeLists.txt create mode 100644 interfaces/tdeimproxy/Makefile.am create mode 100644 interfaces/tdeimproxy/TODO create mode 100644 interfaces/tdeimproxy/interface/CMakeLists.txt create mode 100644 interfaces/tdeimproxy/interface/Makefile.am create mode 100644 interfaces/tdeimproxy/interface/dcopinstantmessenger.desktop create mode 100644 interfaces/tdeimproxy/interface/kcm_instantmessenger.desktop create mode 100644 interfaces/tdeimproxy/interface/kimiface.h create mode 100644 interfaces/tdeimproxy/library/CMakeLists.txt create mode 100644 interfaces/tdeimproxy/library/Makefile.am create mode 100644 interfaces/tdeimproxy/library/icons/CMakeLists.txt create mode 100644 interfaces/tdeimproxy/library/icons/Makefile.am create mode 100644 interfaces/tdeimproxy/library/icons/cr16-action-presence_away.png create mode 100644 interfaces/tdeimproxy/library/icons/cr16-action-presence_offline.png create mode 100644 interfaces/tdeimproxy/library/icons/cr16-action-presence_online.png create mode 100644 interfaces/tdeimproxy/library/icons/cr16-action-presence_unknown.png create mode 100644 interfaces/tdeimproxy/library/icons/cr32-action-presence_away.png create mode 100644 interfaces/tdeimproxy/library/icons/cr32-action-presence_offline.png create mode 100644 interfaces/tdeimproxy/library/icons/cr32-action-presence_online.png create mode 100644 interfaces/tdeimproxy/library/icons/cr32-action-presence_unknown.png create mode 100644 interfaces/tdeimproxy/library/icons/cr48-action-presence_away.png create mode 100644 interfaces/tdeimproxy/library/icons/cr48-action-presence_offline.png create mode 100644 interfaces/tdeimproxy/library/icons/cr48-action-presence_online.png create mode 100644 interfaces/tdeimproxy/library/tdeimproxy.cpp create mode 100644 interfaces/tdeimproxy/library/tdeimproxy.h create mode 100644 interfaces/tdeimproxy/library/tdeimproxyiface.h create mode 100644 interfaces/tdemediaplayer/CMakeLists.txt create mode 100644 interfaces/tdemediaplayer/Makefile.am create mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt create mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am create mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp create mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h create mode 100644 interfaces/tdemediaplayer/player.cpp create mode 100644 interfaces/tdemediaplayer/player.h create mode 100644 interfaces/tdemediaplayer/playerdcopobject.h create mode 100644 interfaces/tdemediaplayer/tdemediaplayer.desktop create mode 100644 interfaces/tdemediaplayer/tdemediaplayerengine.desktop create mode 100644 interfaces/tdemediaplayer/view.cpp create mode 100644 interfaces/tdemediaplayer/view.h create mode 100644 interfaces/tdescript/CMakeLists.txt create mode 100644 interfaces/tdescript/Makefile.am create mode 100644 interfaces/tdescript/README create mode 100644 interfaces/tdescript/sample/CMakeLists.txt create mode 100644 interfaces/tdescript/sample/Makefile.am create mode 100644 interfaces/tdescript/sample/shellscript.cpp create mode 100644 interfaces/tdescript/sample/shellscript.desktop create mode 100644 interfaces/tdescript/sample/shellscript.h create mode 100644 interfaces/tdescript/scriptclientinterface.h create mode 100644 interfaces/tdescript/scriptinterface.desktop create mode 100644 interfaces/tdescript/scriptinterface.h create mode 100644 interfaces/tdescript/scriptloader.cpp create mode 100644 interfaces/tdescript/scriptloader.h create mode 100644 interfaces/tdescript/scriptmanager.cpp create mode 100644 interfaces/tdescript/scriptmanager.h create mode 100644 interfaces/tdetexteditor/.kateconfig create mode 100644 interfaces/tdetexteditor/CMakeLists.txt create mode 100644 interfaces/tdetexteditor/Makefile.am create mode 100644 interfaces/tdetexteditor/blockselectiondcopinterface.cpp create mode 100644 interfaces/tdetexteditor/blockselectiondcopinterface.h create mode 100644 interfaces/tdetexteditor/blockselectioninterface.cpp create mode 100644 interfaces/tdetexteditor/blockselectioninterface.h create mode 100644 interfaces/tdetexteditor/clipboarddcopinterface.cpp create mode 100644 interfaces/tdetexteditor/clipboarddcopinterface.h create mode 100644 interfaces/tdetexteditor/clipboardinterface.cpp create mode 100644 interfaces/tdetexteditor/clipboardinterface.h create mode 100644 interfaces/tdetexteditor/codecompletioninterface.cpp create mode 100644 interfaces/tdetexteditor/codecompletioninterface.h create mode 100644 interfaces/tdetexteditor/configinterface.cpp create mode 100644 interfaces/tdetexteditor/configinterface.h create mode 100644 interfaces/tdetexteditor/configinterfaceextension.cpp create mode 100644 interfaces/tdetexteditor/configinterfaceextension.h create mode 100644 interfaces/tdetexteditor/cursorinterface.cpp create mode 100644 interfaces/tdetexteditor/cursorinterface.h create mode 100644 interfaces/tdetexteditor/document.h create mode 100644 interfaces/tdetexteditor/documentdcopinfo.cpp create mode 100644 interfaces/tdetexteditor/documentdcopinfo.h create mode 100644 interfaces/tdetexteditor/documentinfo.cpp create mode 100644 interfaces/tdetexteditor/documentinfo.h create mode 100644 interfaces/tdetexteditor/dynwordwrapinterface.cpp create mode 100644 interfaces/tdetexteditor/dynwordwrapinterface.h create mode 100644 interfaces/tdetexteditor/editdcopinterface.cpp create mode 100644 interfaces/tdetexteditor/editdcopinterface.h create mode 100644 interfaces/tdetexteditor/editinterface.cpp create mode 100644 interfaces/tdetexteditor/editinterface.h create mode 100644 interfaces/tdetexteditor/editinterfaceext.cpp create mode 100644 interfaces/tdetexteditor/editinterfaceext.h create mode 100644 interfaces/tdetexteditor/editor.h create mode 100644 interfaces/tdetexteditor/editorchooser.cpp create mode 100644 interfaces/tdetexteditor/editorchooser.h create mode 100644 interfaces/tdetexteditor/editorchooser_ui.ui create mode 100644 interfaces/tdetexteditor/encodingdcopinterface.cpp create mode 100644 interfaces/tdetexteditor/encodingdcopinterface.h create mode 100644 interfaces/tdetexteditor/encodinginterface.cpp create mode 100644 interfaces/tdetexteditor/encodinginterface.h create mode 100644 interfaces/tdetexteditor/highlightinginterface.cpp create mode 100644 interfaces/tdetexteditor/highlightinginterface.h create mode 100644 interfaces/tdetexteditor/kcm_tdetexteditor.desktop create mode 100644 interfaces/tdetexteditor/markinterface.cpp create mode 100644 interfaces/tdetexteditor/markinterface.h create mode 100644 interfaces/tdetexteditor/markinterfaceextension.cpp create mode 100644 interfaces/tdetexteditor/markinterfaceextension.h create mode 100644 interfaces/tdetexteditor/plugin.h create mode 100644 interfaces/tdetexteditor/popupmenuinterface.cpp create mode 100644 interfaces/tdetexteditor/popupmenuinterface.h create mode 100644 interfaces/tdetexteditor/printdcopinterface.cpp create mode 100644 interfaces/tdetexteditor/printdcopinterface.h create mode 100644 interfaces/tdetexteditor/printinterface.cpp create mode 100644 interfaces/tdetexteditor/printinterface.h create mode 100644 interfaces/tdetexteditor/searchdcopinterface.cpp create mode 100644 interfaces/tdetexteditor/searchdcopinterface.h create mode 100644 interfaces/tdetexteditor/searchinterface.cpp create mode 100644 interfaces/tdetexteditor/searchinterface.h create mode 100644 interfaces/tdetexteditor/selectiondcopinterface.cpp create mode 100644 interfaces/tdetexteditor/selectiondcopinterface.h create mode 100644 interfaces/tdetexteditor/selectionextdcopinterface.h create mode 100644 interfaces/tdetexteditor/selectioninterface.cpp create mode 100644 interfaces/tdetexteditor/selectioninterface.h create mode 100644 interfaces/tdetexteditor/selectioninterfaceext.cpp create mode 100644 interfaces/tdetexteditor/selectioninterfaceext.h create mode 100644 interfaces/tdetexteditor/sessionconfiginterface.cpp create mode 100644 interfaces/tdetexteditor/sessionconfiginterface.h create mode 100644 interfaces/tdetexteditor/tdetexteditor.cpp create mode 100644 interfaces/tdetexteditor/tdetexteditor.desktop create mode 100644 interfaces/tdetexteditor/tdetexteditoreditor.desktop create mode 100644 interfaces/tdetexteditor/tdetexteditorplugin.desktop create mode 100644 interfaces/tdetexteditor/templateinterface.cpp create mode 100644 interfaces/tdetexteditor/templateinterface.h create mode 100644 interfaces/tdetexteditor/texthintinterface.cpp create mode 100644 interfaces/tdetexteditor/texthintinterface.h create mode 100644 interfaces/tdetexteditor/undodcopinterface.cpp create mode 100644 interfaces/tdetexteditor/undodcopinterface.h create mode 100644 interfaces/tdetexteditor/undointerface.cpp create mode 100644 interfaces/tdetexteditor/undointerface.h create mode 100644 interfaces/tdetexteditor/variableinterface.cpp create mode 100644 interfaces/tdetexteditor/variableinterface.h create mode 100644 interfaces/tdetexteditor/view.h create mode 100644 interfaces/tdetexteditor/viewcursordcopinterface.cpp create mode 100644 interfaces/tdetexteditor/viewcursordcopinterface.h create mode 100644 interfaces/tdetexteditor/viewcursorinterface.cpp create mode 100644 interfaces/tdetexteditor/viewcursorinterface.h create mode 100644 interfaces/tdetexteditor/viewstatusmsgdcopinterface.cpp create mode 100644 interfaces/tdetexteditor/viewstatusmsgdcopinterface.h create mode 100644 interfaces/tdetexteditor/viewstatusmsginterface.cpp create mode 100644 interfaces/tdetexteditor/viewstatusmsginterface.h create mode 100644 interfaces/tdetexteditor/wordwrapinterface.cpp create mode 100644 interfaces/tdetexteditor/wordwrapinterface.h delete mode 100644 kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop delete mode 100644 kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc create mode 100644 kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop create mode 100644 kate/plugins/autobookmarker/tdetexteditor_autobookmarkerrc delete mode 100644 kate/plugins/insertfile/ktexteditor_insertfile.desktop delete mode 100644 kate/plugins/insertfile/ktexteditor_insertfileui.rc create mode 100644 kate/plugins/insertfile/tdetexteditor_insertfile.desktop create mode 100644 kate/plugins/insertfile/tdetexteditor_insertfileui.rc delete mode 100644 kate/plugins/isearch/ktexteditor_isearch.desktop delete mode 100644 kate/plugins/isearch/ktexteditor_isearchui.rc create mode 100644 kate/plugins/isearch/tdetexteditor_isearch.desktop create mode 100644 kate/plugins/isearch/tdetexteditor_isearchui.rc delete mode 100644 kate/plugins/kdatatool/ktexteditor_kdatatool.desktop delete mode 100644 kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc create mode 100644 kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop create mode 100644 kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc delete mode 100644 kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop create mode 100644 kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop delete mode 100644 kcert/CMakeLists.txt delete mode 100644 kcert/Makefile.am delete mode 100644 kcert/kcertpart.cc delete mode 100644 kcert/kcertpart.desktop delete mode 100644 kcert/kcertpart.h delete mode 100644 kcert/kcertpart.rc delete mode 100644 khtml/.emacs-dirvars delete mode 100644 khtml/CMakeLists.txt delete mode 100644 khtml/ChangeLog delete mode 100644 khtml/DESIGN.html delete mode 100644 khtml/Mainpage.dox delete mode 100644 khtml/Makefile.am delete mode 100644 khtml/README.HTMLWidget delete mode 100644 khtml/SAFARI_MERGE delete mode 100644 khtml/TODO delete mode 100644 khtml/configure.in.in delete mode 100644 khtml/css/CMakeLists.txt delete mode 100644 khtml/css/Makefile.am delete mode 100644 khtml/css/css_base.cpp delete mode 100644 khtml/css/css_base.h delete mode 100644 khtml/css/css_extensionsimpl.cpp delete mode 100644 khtml/css/css_extensionsimpl.h delete mode 100644 khtml/css/css_renderstyledeclarationimpl.cpp delete mode 100644 khtml/css/css_renderstyledeclarationimpl.h delete mode 100644 khtml/css/css_ruleimpl.cpp delete mode 100644 khtml/css/css_ruleimpl.h delete mode 100644 khtml/css/css_stylesheetimpl.cpp delete mode 100644 khtml/css/css_stylesheetimpl.h delete mode 100644 khtml/css/css_valueimpl.cpp delete mode 100644 khtml/css/css_valueimpl.h delete mode 100644 khtml/css/csshelper.cpp delete mode 100644 khtml/css/csshelper.h delete mode 100644 khtml/css/cssparser.cpp delete mode 100644 khtml/css/cssparser.h delete mode 100644 khtml/css/cssproperties.c delete mode 100644 khtml/css/cssproperties.h delete mode 100644 khtml/css/cssproperties.in delete mode 100644 khtml/css/cssstyleselector.cpp delete mode 100644 khtml/css/cssstyleselector.h delete mode 100644 khtml/css/cssvalues.c delete mode 100644 khtml/css/cssvalues.h delete mode 100644 khtml/css/cssvalues.in delete mode 100644 khtml/css/html4.css delete mode 100644 khtml/css/makeprop delete mode 100755 khtml/css/makevalues delete mode 100644 khtml/css/parser.cpp delete mode 100644 khtml/css/parser.h delete mode 100644 khtml/css/parser.y delete mode 100644 khtml/css/quirks.css delete mode 100644 khtml/css/tokenizer.cpp delete mode 100644 khtml/css/tokenizer.flex delete mode 100644 khtml/design.h delete mode 100644 khtml/dom/CMakeLists.txt delete mode 100644 khtml/dom/Makefile.am delete mode 100644 khtml/dom/css_extensions.cpp delete mode 100644 khtml/dom/css_extensions.h delete mode 100644 khtml/dom/css_rule.cpp delete mode 100644 khtml/dom/css_rule.h delete mode 100644 khtml/dom/css_stylesheet.cpp delete mode 100644 khtml/dom/css_stylesheet.h delete mode 100644 khtml/dom/css_value.cpp delete mode 100644 khtml/dom/css_value.h delete mode 100644 khtml/dom/dom2_events.cpp delete mode 100644 khtml/dom/dom2_events.h delete mode 100644 khtml/dom/dom2_range.cpp delete mode 100644 khtml/dom/dom2_range.h delete mode 100644 khtml/dom/dom2_traversal.cpp delete mode 100644 khtml/dom/dom2_traversal.h delete mode 100644 khtml/dom/dom2_views.cpp delete mode 100644 khtml/dom/dom2_views.h delete mode 100644 khtml/dom/dom_core.h delete mode 100644 khtml/dom/dom_doc.cpp delete mode 100644 khtml/dom/dom_doc.h delete mode 100644 khtml/dom/dom_element.cpp delete mode 100644 khtml/dom/dom_element.h delete mode 100644 khtml/dom/dom_exception.h delete mode 100644 khtml/dom/dom_html.h delete mode 100644 khtml/dom/dom_misc.cpp delete mode 100644 khtml/dom/dom_misc.h delete mode 100644 khtml/dom/dom_node.cpp delete mode 100644 khtml/dom/dom_node.h delete mode 100644 khtml/dom/dom_string.cpp delete mode 100644 khtml/dom/dom_string.h delete mode 100644 khtml/dom/dom_text.cpp delete mode 100644 khtml/dom/dom_text.h delete mode 100644 khtml/dom/dom_xml.cpp delete mode 100644 khtml/dom/dom_xml.h delete mode 100644 khtml/dom/html_base.cpp delete mode 100644 khtml/dom/html_base.h delete mode 100644 khtml/dom/html_block.cpp delete mode 100644 khtml/dom/html_block.h delete mode 100644 khtml/dom/html_document.cpp delete mode 100644 khtml/dom/html_document.h delete mode 100644 khtml/dom/html_element.cpp delete mode 100644 khtml/dom/html_element.h delete mode 100644 khtml/dom/html_form.cpp delete mode 100644 khtml/dom/html_form.h delete mode 100644 khtml/dom/html_head.cpp delete mode 100644 khtml/dom/html_head.h delete mode 100644 khtml/dom/html_image.cpp delete mode 100644 khtml/dom/html_image.h delete mode 100644 khtml/dom/html_inline.cpp delete mode 100644 khtml/dom/html_inline.h delete mode 100644 khtml/dom/html_list.cpp delete mode 100644 khtml/dom/html_list.h delete mode 100644 khtml/dom/html_misc.cpp delete mode 100644 khtml/dom/html_misc.h delete mode 100644 khtml/dom/html_object.cpp delete mode 100644 khtml/dom/html_object.h delete mode 100644 khtml/dom/html_table.cpp delete mode 100644 khtml/dom/html_table.h delete mode 100644 khtml/domtreeview.cpp delete mode 100644 khtml/domtreeview.h delete mode 100644 khtml/ecma/AUTHORS delete mode 100644 khtml/ecma/CMakeLists.txt delete mode 100644 khtml/ecma/Makefile.am delete mode 100644 khtml/ecma/README delete mode 100644 khtml/ecma/THANKS delete mode 100644 khtml/ecma/TODO delete mode 100644 khtml/ecma/domparser.cpp delete mode 100644 khtml/ecma/domparser.h delete mode 100644 khtml/ecma/jsk.html delete mode 100644 khtml/ecma/kjs_binding.cpp delete mode 100644 khtml/ecma/kjs_binding.h delete mode 100644 khtml/ecma/kjs_css.cpp delete mode 100644 khtml/ecma/kjs_css.h delete mode 100644 khtml/ecma/kjs_debugwin.cpp delete mode 100644 khtml/ecma/kjs_debugwin.h delete mode 100644 khtml/ecma/kjs_dom.cpp delete mode 100644 khtml/ecma/kjs_dom.h delete mode 100644 khtml/ecma/kjs_events.cpp delete mode 100644 khtml/ecma/kjs_events.h delete mode 100644 khtml/ecma/kjs_html.cpp delete mode 100644 khtml/ecma/kjs_html.h delete mode 100644 khtml/ecma/kjs_mozilla.cpp delete mode 100644 khtml/ecma/kjs_mozilla.h delete mode 100644 khtml/ecma/kjs_navigator.cpp delete mode 100644 khtml/ecma/kjs_navigator.h delete mode 100644 khtml/ecma/kjs_proxy.cpp delete mode 100644 khtml/ecma/kjs_proxy.h delete mode 100644 khtml/ecma/kjs_range.cpp delete mode 100644 khtml/ecma/kjs_range.h delete mode 100644 khtml/ecma/kjs_traversal.cpp delete mode 100644 khtml/ecma/kjs_traversal.h delete mode 100644 khtml/ecma/kjs_views.cpp delete mode 100644 khtml/ecma/kjs_views.h delete mode 100644 khtml/ecma/kjs_window.cpp delete mode 100644 khtml/ecma/kjs_window.h delete mode 100644 khtml/ecma/testecma.cpp delete mode 100644 khtml/ecma/xmlhttprequest.cpp delete mode 100644 khtml/ecma/xmlhttprequest.h delete mode 100644 khtml/ecma/xmlserializer.cpp delete mode 100644 khtml/ecma/xmlserializer.h delete mode 100644 khtml/html/AlwaysInline.h delete mode 100644 khtml/html/CMakeLists.txt delete mode 100644 khtml/html/Makefile.am delete mode 100644 khtml/html/Platform.h delete mode 100644 khtml/html/RefPtr.h delete mode 100644 khtml/html/doctypes.cpp delete mode 100644 khtml/html/doctypes.gperf delete mode 100644 khtml/html/dtd.cpp delete mode 100644 khtml/html/dtd.dtd delete mode 100644 khtml/html/dtd.h delete mode 100644 khtml/html/html_baseimpl.cpp delete mode 100644 khtml/html/html_baseimpl.h delete mode 100644 khtml/html/html_blockimpl.cpp delete mode 100644 khtml/html/html_blockimpl.h delete mode 100644 khtml/html/html_documentimpl.cpp delete mode 100644 khtml/html/html_documentimpl.h delete mode 100644 khtml/html/html_elementimpl.cpp delete mode 100644 khtml/html/html_elementimpl.h delete mode 100644 khtml/html/html_formimpl.cpp delete mode 100644 khtml/html/html_formimpl.h delete mode 100644 khtml/html/html_headimpl.cpp delete mode 100644 khtml/html/html_headimpl.h delete mode 100644 khtml/html/html_imageimpl.cpp delete mode 100644 khtml/html/html_imageimpl.h delete mode 100644 khtml/html/html_inlineimpl.cpp delete mode 100644 khtml/html/html_inlineimpl.h delete mode 100644 khtml/html/html_listimpl.cpp delete mode 100644 khtml/html/html_listimpl.h delete mode 100644 khtml/html/html_miscimpl.cpp delete mode 100644 khtml/html/html_miscimpl.h delete mode 100644 khtml/html/html_objectimpl.cpp delete mode 100644 khtml/html/html_objectimpl.h delete mode 100644 khtml/html/html_tableimpl.cpp delete mode 100644 khtml/html/html_tableimpl.h delete mode 100644 khtml/html/htmlparser.cpp delete mode 100644 khtml/html/htmlparser.h delete mode 100644 khtml/html/htmltokenizer.cpp delete mode 100644 khtml/html/htmltokenizer.h delete mode 100644 khtml/htmlpageinfo.ui delete mode 100644 khtml/java/CMakeLists.txt delete mode 100644 khtml/java/ChangeLog delete mode 100644 khtml/java/KJAS_GRAMMAR.txt delete mode 100644 khtml/java/Makefile.am delete mode 100644 khtml/java/README delete mode 100644 khtml/java/TODO delete mode 100644 khtml/java/build.properties delete mode 100644 khtml/java/build.xml delete mode 100644 khtml/java/configure.in.in delete mode 100644 khtml/java/cr16-action-java.png delete mode 100644 khtml/java/dummy/CMakeLists.txt delete mode 100644 khtml/java/dummy/Makefile.am delete mode 100644 khtml/java/images/animbean.gif delete mode 100644 khtml/java/images/beanicon.png delete mode 100644 khtml/java/images/brokenbean.gif delete mode 100644 khtml/java/kjava.jar delete mode 100644 khtml/java/kjava.policy.in delete mode 100644 khtml/java/kjavaapplet.cpp delete mode 100644 khtml/java/kjavaapplet.h delete mode 100644 khtml/java/kjavaappletcontext.cpp delete mode 100644 khtml/java/kjavaappletcontext.h delete mode 100644 khtml/java/kjavaappletserver.cpp delete mode 100644 khtml/java/kjavaappletserver.h delete mode 100644 khtml/java/kjavaappletviewer.cpp delete mode 100644 khtml/java/kjavaappletviewer.desktop delete mode 100644 khtml/java/kjavaappletviewer.h delete mode 100644 khtml/java/kjavaappletwidget.cpp delete mode 100644 khtml/java/kjavaappletwidget.h delete mode 100644 khtml/java/kjavadownloader.cpp delete mode 100644 khtml/java/kjavadownloader.h delete mode 100644 khtml/java/kjavaprocess.cpp delete mode 100644 khtml/java/kjavaprocess.h delete mode 100644 khtml/java/kqeventutil.cpp delete mode 100644 khtml/java/kqeventutil.h delete mode 100644 khtml/java/kxeventutil.cpp delete mode 100644 khtml/java/kxeventutil.h delete mode 100755 khtml/java/make-jar delete mode 100644 khtml/java/netscape/javascript/JSException.java delete mode 100644 khtml/java/netscape/javascript/JSObject.java delete mode 100644 khtml/java/netscape/plugin/Plugin.java delete mode 100644 khtml/java/netscape/security/ForbiddenTargetException.java delete mode 100644 khtml/java/netscape/security/Principal.java delete mode 100644 khtml/java/netscape/security/PrivilegeManager.java delete mode 100644 khtml/java/netscape/security/Target.java delete mode 100644 khtml/java/org/kde/javascript/JSObject.java delete mode 100644 khtml/java/org/kde/kjas/server/Console.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASAppletContext.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASAppletPanel.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASAppletStub.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASAudioClip.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASConsole.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASConsoleStream.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASProtocolHandler.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASSecurityManager.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASSoundPlayer.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASSwingConsole.java delete mode 100644 khtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java delete mode 100644 khtml/java/org/kde/kjas/server/Main.java delete mode 100644 khtml/java/org/kde/kjas/server/StatusListener.java delete mode 100644 khtml/java/pluginsinfo delete mode 100644 khtml/java/tests/Makefile.am delete mode 100644 khtml/java/tests/badapplets/BadApplet.jar delete mode 100644 khtml/java/tests/badapplets/BadApplet.java delete mode 100644 khtml/java/tests/badapplets/applet.html delete mode 100644 khtml/java/tests/good_sites delete mode 100644 khtml/java/tests/testkjavaappletserver.cpp delete mode 100644 khtml/khtml-devel-gdb delete mode 100644 khtml/khtml.desktop delete mode 100644 khtml/khtml.rc delete mode 100644 khtml/khtml_browser.rc delete mode 100644 khtml/khtml_caret.cpp delete mode 100644 khtml/khtml_caret_p.h delete mode 100644 khtml/khtml_events.cpp delete mode 100644 khtml/khtml_events.h delete mode 100644 khtml/khtml_ext.cpp delete mode 100644 khtml/khtml_ext.h delete mode 100644 khtml/khtml_factory.cpp delete mode 100644 khtml/khtml_factory.h delete mode 100644 khtml/khtml_iface.cc delete mode 100644 khtml/khtml_iface.h delete mode 100644 khtml/khtml_pagecache.cpp delete mode 100644 khtml/khtml_pagecache.h delete mode 100644 khtml/khtml_part.cpp delete mode 100644 khtml/khtml_part.h delete mode 100644 khtml/khtml_popupmenu.rc delete mode 100644 khtml/khtml_printsettings.cpp delete mode 100644 khtml/khtml_printsettings.h delete mode 100644 khtml/khtml_run.cpp delete mode 100644 khtml/khtml_run.h delete mode 100644 khtml/khtml_settings.cc delete mode 100644 khtml/khtml_settings.h delete mode 100644 khtml/khtmldefaults.h delete mode 100644 khtml/khtmlimage.cpp delete mode 100644 khtml/khtmlimage.desktop delete mode 100644 khtml/khtmlimage.h delete mode 100644 khtml/khtmlpart_p.h delete mode 100644 khtml/khtmlview.cpp delete mode 100644 khtml/khtmlview.h delete mode 100644 khtml/kjserrordlg.ui delete mode 100644 khtml/kjserrordlg.ui.h delete mode 100644 khtml/kmultipart/CMakeLists.txt delete mode 100644 khtml/kmultipart/Makefile.am delete mode 100644 khtml/kmultipart/README delete mode 100644 khtml/kmultipart/kmultipart.cpp delete mode 100644 khtml/kmultipart/kmultipart.desktop delete mode 100644 khtml/kmultipart/kmultipart.h delete mode 100644 khtml/libkhtml.map delete mode 100644 khtml/misc/CMakeLists.txt delete mode 100644 khtml/misc/Makefile.am delete mode 100644 khtml/misc/arena.cpp delete mode 100644 khtml/misc/arena.h delete mode 100644 khtml/misc/blocked_icon.cpp delete mode 100644 khtml/misc/blocked_icon.png delete mode 100644 khtml/misc/decoder.cpp delete mode 100644 khtml/misc/decoder.h delete mode 100644 khtml/misc/guess_ja.cpp delete mode 100644 khtml/misc/guess_ja.h delete mode 100644 khtml/misc/helper.cpp delete mode 100644 khtml/misc/helper.h delete mode 100644 khtml/misc/htmlattrs.c delete mode 100644 khtml/misc/htmlattrs.h delete mode 100644 khtml/misc/htmlattrs.in delete mode 100644 khtml/misc/htmlhashes.cpp delete mode 100644 khtml/misc/htmlhashes.h delete mode 100644 khtml/misc/htmltags.c delete mode 100644 khtml/misc/htmltags.h delete mode 100644 khtml/misc/htmltags.in delete mode 100644 khtml/misc/khtmllayout.h delete mode 100644 khtml/misc/knsplugininstaller.cpp delete mode 100644 khtml/misc/knsplugininstaller.h delete mode 100644 khtml/misc/loader.cpp delete mode 100644 khtml/misc/loader.h delete mode 100644 khtml/misc/loader_client.h delete mode 100644 khtml/misc/loader_jpeg.cpp delete mode 100644 khtml/misc/loader_jpeg.h delete mode 100644 khtml/misc/makeattrs delete mode 100644 khtml/misc/maketags delete mode 100644 khtml/misc/multimap.h delete mode 100644 khtml/misc/seed.h delete mode 100644 khtml/misc/shared.h delete mode 100644 khtml/misc/stringit.cpp delete mode 100644 khtml/misc/stringit.h delete mode 100644 khtml/pics/CMakeLists.txt delete mode 100644 khtml/pics/Makefile.am delete mode 100644 khtml/pics/cr128-action-bug.png delete mode 100644 khtml/pics/cr16-action-bug.png delete mode 100644 khtml/pics/cr16-action-images_display.png delete mode 100644 khtml/pics/cr16-action-wallet_open.png delete mode 100644 khtml/pics/cr22-action-bug.png delete mode 100644 khtml/pics/cr22-action-dbgnext.png delete mode 100644 khtml/pics/cr22-action-dbgrun.png delete mode 100644 khtml/pics/cr22-action-dbgrunto.png delete mode 100644 khtml/pics/cr22-action-dbgstep.png delete mode 100644 khtml/pics/cr22-action-images_display.png delete mode 100644 khtml/pics/cr32-action-bug.png delete mode 100644 khtml/pics/cr32-action-images_display.png delete mode 100644 khtml/pics/cr48-action-bug.png delete mode 100644 khtml/pics/cr64-action-bug.png delete mode 100644 khtml/rendering/CMakeLists.txt delete mode 100644 khtml/rendering/Makefile.am delete mode 100644 khtml/rendering/bidi.cpp delete mode 100644 khtml/rendering/bidi.h delete mode 100644 khtml/rendering/break_lines.cpp delete mode 100644 khtml/rendering/break_lines.h delete mode 100644 khtml/rendering/counter_tree.cpp delete mode 100644 khtml/rendering/counter_tree.h delete mode 100644 khtml/rendering/enumerate.cpp delete mode 100644 khtml/rendering/enumerate.h delete mode 100644 khtml/rendering/font.cpp delete mode 100644 khtml/rendering/font.h delete mode 100644 khtml/rendering/img-loading.png delete mode 100644 khtml/rendering/loading_icon.cpp delete mode 100644 khtml/rendering/render_applet.cpp delete mode 100644 khtml/rendering/render_applet.h delete mode 100644 khtml/rendering/render_arena.cpp delete mode 100644 khtml/rendering/render_arena.h delete mode 100644 khtml/rendering/render_block.cpp delete mode 100644 khtml/rendering/render_block.h delete mode 100644 khtml/rendering/render_body.cpp delete mode 100644 khtml/rendering/render_body.h delete mode 100644 khtml/rendering/render_box.cpp delete mode 100644 khtml/rendering/render_box.h delete mode 100644 khtml/rendering/render_br.cpp delete mode 100644 khtml/rendering/render_br.h delete mode 100644 khtml/rendering/render_canvas.cpp delete mode 100644 khtml/rendering/render_canvas.h delete mode 100644 khtml/rendering/render_container.cpp delete mode 100644 khtml/rendering/render_container.h delete mode 100644 khtml/rendering/render_flow.cpp delete mode 100644 khtml/rendering/render_flow.h delete mode 100644 khtml/rendering/render_form.cpp delete mode 100644 khtml/rendering/render_form.h delete mode 100644 khtml/rendering/render_frames.cpp delete mode 100644 khtml/rendering/render_frames.h delete mode 100644 khtml/rendering/render_generated.cpp delete mode 100644 khtml/rendering/render_generated.h delete mode 100644 khtml/rendering/render_image.cpp delete mode 100644 khtml/rendering/render_image.h delete mode 100644 khtml/rendering/render_inline.cpp delete mode 100644 khtml/rendering/render_inline.h delete mode 100644 khtml/rendering/render_layer.cpp delete mode 100644 khtml/rendering/render_layer.h delete mode 100644 khtml/rendering/render_line.cpp delete mode 100644 khtml/rendering/render_line.h delete mode 100644 khtml/rendering/render_list.cpp delete mode 100644 khtml/rendering/render_list.h delete mode 100644 khtml/rendering/render_object.cpp delete mode 100644 khtml/rendering/render_object.h delete mode 100644 khtml/rendering/render_replaced.cpp delete mode 100644 khtml/rendering/render_replaced.h delete mode 100644 khtml/rendering/render_style.cpp delete mode 100644 khtml/rendering/render_style.h delete mode 100644 khtml/rendering/render_table.cpp delete mode 100644 khtml/rendering/render_table.h delete mode 100644 khtml/rendering/render_text.cpp delete mode 100644 khtml/rendering/render_text.h delete mode 100644 khtml/rendering/table_layout.cpp delete mode 100644 khtml/rendering/table_layout.h delete mode 100644 khtml/rendering/table_layout.txt delete mode 100644 khtml/test/README delete mode 100644 khtml/test/align.html delete mode 100644 khtml/test/align1.html delete mode 100644 khtml/test/align2.html delete mode 100644 khtml/test/anchor1.html delete mode 100644 khtml/test/anchor2.html delete mode 100644 khtml/test/button.html delete mode 100644 khtml/test/color.html delete mode 100644 khtml/test/fixed-background.html delete mode 100644 khtml/test/image.gif delete mode 100644 khtml/test/image_map.html delete mode 100644 khtml/test/java.html delete mode 100644 khtml/test/jsplugins.html delete mode 100644 khtml/test/konqi.gif delete mode 100644 khtml/test/lake.class delete mode 100644 khtml/test/lists.html delete mode 100644 khtml/test/nav_bar.gif delete mode 100644 khtml/test/nbsp.html delete mode 100644 khtml/test/object.html delete mode 100644 khtml/test/pseudo.html delete mode 100644 khtml/test/testpages.html delete mode 100644 khtml/test_regression.cpp delete mode 100644 khtml/test_regression.h delete mode 100644 khtml/test_regression_fontoverload.cpp delete mode 100644 khtml/testkhtml.cpp delete mode 100644 khtml/testkhtml.h delete mode 100644 khtml/xml/CMakeLists.txt delete mode 100644 khtml/xml/Makefile.am delete mode 100644 khtml/xml/dom2_eventsimpl.cpp delete mode 100644 khtml/xml/dom2_eventsimpl.h delete mode 100644 khtml/xml/dom2_rangeimpl.cpp delete mode 100644 khtml/xml/dom2_rangeimpl.h delete mode 100644 khtml/xml/dom2_traversalimpl.cpp delete mode 100644 khtml/xml/dom2_traversalimpl.h delete mode 100644 khtml/xml/dom2_viewsimpl.cpp delete mode 100644 khtml/xml/dom2_viewsimpl.h delete mode 100644 khtml/xml/dom_docimpl.cpp delete mode 100644 khtml/xml/dom_docimpl.h delete mode 100644 khtml/xml/dom_elementimpl.cpp delete mode 100644 khtml/xml/dom_elementimpl.h delete mode 100644 khtml/xml/dom_nodeimpl.cpp delete mode 100644 khtml/xml/dom_nodeimpl.h delete mode 100644 khtml/xml/dom_restyler.cpp delete mode 100644 khtml/xml/dom_restyler.h delete mode 100644 khtml/xml/dom_stringimpl.cpp delete mode 100644 khtml/xml/dom_stringimpl.h delete mode 100644 khtml/xml/dom_textimpl.cpp delete mode 100644 khtml/xml/dom_textimpl.h delete mode 100644 khtml/xml/dom_xmlimpl.cpp delete mode 100644 khtml/xml/dom_xmlimpl.h delete mode 100644 khtml/xml/xml_tokenizer.cpp delete mode 100644 khtml/xml/xml_tokenizer.h delete mode 100644 kio/misc/kntlm/CMakeLists.txt delete mode 100644 kio/misc/kntlm/Makefile.am delete mode 100644 kio/misc/kntlm/des.cpp delete mode 100644 kio/misc/kntlm/des.h delete mode 100644 kio/misc/kntlm/kntlm.cpp delete mode 100644 kio/misc/kntlm/kntlm.h delete mode 100644 kio/misc/kntlm/kswap.h delete mode 100644 kio/misc/kwalletd/CMakeLists.txt delete mode 100644 kio/misc/kwalletd/Makefile.am delete mode 100644 kio/misc/kwalletd/kbetterthankdialogbase.ui delete mode 100644 kio/misc/kwalletd/kbetterthankdialogbase.ui.h delete mode 100644 kio/misc/kwalletd/ktimeout.cpp delete mode 100644 kio/misc/kwalletd/ktimeout.h delete mode 100644 kio/misc/kwalletd/kwalletd.cpp delete mode 100644 kio/misc/kwalletd/kwalletd.desktop delete mode 100644 kio/misc/kwalletd/kwalletd.h delete mode 100644 kio/misc/kwalletd/kwalletwizard.ui delete mode 100644 kio/misc/kwalletd/kwalletwizard.ui.h create mode 100644 kio/misc/tdentlm/CMakeLists.txt create mode 100644 kio/misc/tdentlm/Makefile.am create mode 100644 kio/misc/tdentlm/des.cpp create mode 100644 kio/misc/tdentlm/des.h create mode 100644 kio/misc/tdentlm/kswap.h create mode 100644 kio/misc/tdentlm/tdentlm.cpp create mode 100644 kio/misc/tdentlm/tdentlm.h create mode 100644 kio/misc/tdewalletd/CMakeLists.txt create mode 100644 kio/misc/tdewalletd/Makefile.am create mode 100644 kio/misc/tdewalletd/kbetterthankdialogbase.ui create mode 100644 kio/misc/tdewalletd/kbetterthankdialogbase.ui.h create mode 100644 kio/misc/tdewalletd/ktimeout.cpp create mode 100644 kio/misc/tdewalletd/ktimeout.h create mode 100644 kio/misc/tdewalletd/tdewalletd.cpp create mode 100644 kio/misc/tdewalletd/tdewalletd.desktop create mode 100644 kio/misc/tdewalletd/tdewalletd.h create mode 100644 kio/misc/tdewalletd/tdewalletwizard.ui create mode 100644 kio/misc/tdewalletd/tdewalletwizard.ui.h delete mode 100644 kio/tests/ksycocatest.cpp delete mode 100644 kio/tests/ksycocaupdatetest.cpp create mode 100644 kio/tests/tdesycocatest.cpp create mode 100644 kio/tests/tdesycocaupdatetest.cpp delete mode 100644 kmdi/CMakeLists.txt delete mode 100644 kmdi/Makefile.am delete mode 100644 kmdi/TODO delete mode 100644 kmdi/kmdi/CMakeLists.txt delete mode 100644 kmdi/kmdi/Makefile.am delete mode 100644 kmdi/kmdi/dockcontainer.cpp delete mode 100644 kmdi/kmdi/dockcontainer.h delete mode 100644 kmdi/kmdi/global.h delete mode 100644 kmdi/kmdi/guiclient.cpp delete mode 100644 kmdi/kmdi/guiclient.h delete mode 100644 kmdi/kmdi/mainwindow.cpp delete mode 100644 kmdi/kmdi/mainwindow.h delete mode 100644 kmdi/kmdi/tabwidget.cpp delete mode 100644 kmdi/kmdi/tabwidget.h delete mode 100644 kmdi/kmdi/toolviewaccessor.cpp delete mode 100644 kmdi/kmdi/toolviewaccessor.h delete mode 100644 kmdi/kmdi/toolviewaccessor_p.h delete mode 100644 kmdi/kmdichildarea.cpp delete mode 100644 kmdi/kmdichildarea.h delete mode 100644 kmdi/kmdichildfrm.cpp delete mode 100644 kmdi/kmdichildfrm.h delete mode 100644 kmdi/kmdichildfrmcaption.cpp delete mode 100644 kmdi/kmdichildfrmcaption.h delete mode 100644 kmdi/kmdichildview.cpp delete mode 100644 kmdi/kmdichildview.h delete mode 100644 kmdi/kmdidefines.h delete mode 100644 kmdi/kmdidockcontainer.cpp delete mode 100644 kmdi/kmdidockcontainer.h delete mode 100644 kmdi/kmdidocumentviewtabwidget.cpp delete mode 100644 kmdi/kmdidocumentviewtabwidget.h delete mode 100644 kmdi/kmdifocuslist.cpp delete mode 100644 kmdi/kmdifocuslist.h delete mode 100644 kmdi/kmdiguiclient.cpp delete mode 100644 kmdi/kmdiguiclient.h delete mode 100644 kmdi/kmdiiterator.h delete mode 100644 kmdi/kmdilistiterator.h delete mode 100644 kmdi/kmdimainfrm.cpp delete mode 100644 kmdi/kmdimainfrm.h delete mode 100644 kmdi/kmdinulliterator.h delete mode 100644 kmdi/kmditaskbar.cpp delete mode 100644 kmdi/kmditaskbar.h delete mode 100644 kmdi/kmditoolviewaccessor.cpp delete mode 100644 kmdi/kmditoolviewaccessor.h delete mode 100644 kmdi/kmditoolviewaccessor_p.h delete mode 100644 kmdi/res/filenew.xpm delete mode 100644 kmdi/res/kde2_closebutton.xpm delete mode 100644 kmdi/res/kde2_maxbutton.xpm delete mode 100644 kmdi/res/kde2_minbutton.xpm delete mode 100644 kmdi/res/kde2_restorebutton.xpm delete mode 100644 kmdi/res/kde2_undockbutton.xpm delete mode 100644 kmdi/res/kde2laptop_closebutton.xpm delete mode 100644 kmdi/res/kde2laptop_closebutton_menu.xpm delete mode 100644 kmdi/res/kde2laptop_maxbutton.xpm delete mode 100644 kmdi/res/kde2laptop_minbutton.xpm delete mode 100644 kmdi/res/kde2laptop_restorebutton.xpm delete mode 100644 kmdi/res/kde2laptop_undockbutton.xpm delete mode 100644 kmdi/res/kde_closebutton.xpm delete mode 100644 kmdi/res/kde_maxbutton.xpm delete mode 100644 kmdi/res/kde_minbutton.xpm delete mode 100644 kmdi/res/kde_restorebutton.xpm delete mode 100644 kmdi/res/kde_undockbutton.xpm delete mode 100644 kmdi/res/win_closebutton.xpm delete mode 100644 kmdi/res/win_maxbutton.xpm delete mode 100644 kmdi/res/win_minbutton.xpm delete mode 100644 kmdi/res/win_restorebutton.xpm delete mode 100644 kmdi/res/win_undockbutton.xpm delete mode 100644 kmdi/test/Makefile.am delete mode 100644 kmdi/test/README delete mode 100644 kmdi/test/hello.cpp delete mode 100644 kmdi/test/hello.h delete mode 100644 kmdi/test/main.cpp delete mode 100644 kmdi/test/mainwidget.cpp delete mode 100644 kmdi/test/mainwidget.h delete mode 100644 kparts/AUTHORS delete mode 100644 kparts/CMakeLists.txt delete mode 100644 kparts/COMMENTS delete mode 100644 kparts/Mainpage.dox delete mode 100644 kparts/Makefile.am delete mode 100644 kparts/browserextension.cpp delete mode 100644 kparts/browserextension.h delete mode 100644 kparts/browserinterface.cpp delete mode 100644 kparts/browserinterface.h delete mode 100644 kparts/browserrun.cpp delete mode 100644 kparts/browserrun.h delete mode 100644 kparts/browserview.desktop delete mode 100644 kparts/componentfactory.h delete mode 100644 kparts/design.h delete mode 100644 kparts/dockmainwindow.cpp delete mode 100644 kparts/dockmainwindow.h delete mode 100644 kparts/event.cpp delete mode 100644 kparts/event.h delete mode 100644 kparts/factory.cpp delete mode 100644 kparts/factory.h delete mode 100644 kparts/genericfactory.h delete mode 100644 kparts/historyprovider.cpp delete mode 100644 kparts/historyprovider.h delete mode 100644 kparts/kpart.desktop delete mode 100644 kparts/krop.desktop delete mode 100644 kparts/krwp.desktop delete mode 100644 kparts/mainwindow.cpp delete mode 100644 kparts/mainwindow.h delete mode 100644 kparts/part.cpp delete mode 100644 kparts/part.h delete mode 100644 kparts/partmanager.cpp delete mode 100644 kparts/partmanager.h delete mode 100644 kparts/plugin.cpp delete mode 100644 kparts/plugin.h delete mode 100644 kparts/statusbarextension.cpp delete mode 100644 kparts/statusbarextension.h delete mode 100644 kparts/tests/Makefile.am delete mode 100644 kparts/tests/README delete mode 100644 kparts/tests/example.cpp delete mode 100644 kparts/tests/example.h delete mode 100644 kparts/tests/ghostview.cpp delete mode 100644 kparts/tests/ghostview.h delete mode 100644 kparts/tests/ghostviewtest_shell.rc delete mode 100644 kparts/tests/kpartstest_part1.rc delete mode 100644 kparts/tests/kpartstest_shell.rc delete mode 100644 kparts/tests/normalktm.cpp delete mode 100644 kparts/tests/normalktm.h delete mode 100644 kparts/tests/notepad.cpp delete mode 100644 kparts/tests/notepad.desktop delete mode 100644 kparts/tests/notepad.h delete mode 100644 kparts/tests/notepadpart.cpp delete mode 100644 kparts/tests/notepadpart.rc delete mode 100644 kparts/tests/parts.cpp delete mode 100644 kparts/tests/parts.h delete mode 100644 kparts/tests/plugin_foobar.rc delete mode 100644 kparts/tests/plugin_spellcheck.cpp delete mode 100644 kparts/tests/plugin_spellcheck.h delete mode 100644 kparts/tests/plugin_spellcheck.rc delete mode 100644 krandr/CMakeLists.txt delete mode 100644 krandr/Mainpage.dox delete mode 100644 krandr/Makefile.am delete mode 100644 krandr/configure.in.in delete mode 100644 krandr/ktimerdialog.cpp delete mode 100644 krandr/ktimerdialog.h delete mode 100644 krandr/libkrandr.cc delete mode 100644 krandr/libkrandr.h delete mode 100644 krandr/lowlevel_randr.c delete mode 100644 krandr/lowlevel_randr.h delete mode 100644 krandr/randr.cpp delete mode 100644 krandr/randr.h delete mode 100644 kresources/CMakeLists.txt delete mode 100644 kresources/Makefile.am delete mode 100644 kresources/README.design delete mode 100644 kresources/TODO delete mode 100644 kresources/configdialog.cpp delete mode 100644 kresources/configdialog.h delete mode 100644 kresources/configpage.cpp delete mode 100644 kresources/configpage.h delete mode 100644 kresources/configwidget.cpp delete mode 100644 kresources/configwidget.h delete mode 100644 kresources/factory.cpp delete mode 100644 kresources/factory.h delete mode 100644 kresources/kcmkresources.cpp delete mode 100644 kresources/kcmkresources.h delete mode 100644 kresources/kresources.desktop delete mode 100644 kresources/kresources_manager.desktop delete mode 100644 kresources/kresources_plugin.desktop delete mode 100644 kresources/manager.h delete mode 100644 kresources/manageriface.h delete mode 100644 kresources/managerimpl.cpp delete mode 100644 kresources/managerimpl.h delete mode 100644 kresources/resource.cpp delete mode 100644 kresources/resource.h delete mode 100644 kresources/selectdialog.cpp delete mode 100644 kresources/selectdialog.h delete mode 100644 kresources/testresources.cpp delete mode 100644 krsync/CMakeLists.txt delete mode 100644 krsync/krsync.cpp delete mode 100644 krsync/krsync.h delete mode 100644 krsync/rsyncconfigdialog.cpp delete mode 100644 krsync/rsyncconfigdialog.h delete mode 100644 kspell2/CMakeLists.txt delete mode 100644 kspell2/Makefile.am delete mode 100644 kspell2/README delete mode 100644 kspell2/backgroundchecker.cpp delete mode 100644 kspell2/backgroundchecker.h delete mode 100644 kspell2/backgroundengine.cpp delete mode 100644 kspell2/backgroundengine.h delete mode 100644 kspell2/backgroundthread.cpp delete mode 100644 kspell2/backgroundthread.h delete mode 100644 kspell2/broker.cpp delete mode 100644 kspell2/broker.h delete mode 100644 kspell2/client.cpp delete mode 100644 kspell2/client.h delete mode 100644 kspell2/defaultdictionary.cpp delete mode 100644 kspell2/defaultdictionary.h delete mode 100644 kspell2/dictionary.h delete mode 100644 kspell2/filter.cpp delete mode 100644 kspell2/filter.h delete mode 100644 kspell2/kspellclient.desktop delete mode 100644 kspell2/plugins/CMakeLists.txt delete mode 100644 kspell2/plugins/Makefile.am delete mode 100644 kspell2/plugins/aspell/CMakeLists.txt delete mode 100644 kspell2/plugins/aspell/Makefile.am delete mode 100644 kspell2/plugins/aspell/kspell_aspell.desktop delete mode 100644 kspell2/plugins/aspell/kspell_aspellclient.cpp delete mode 100644 kspell2/plugins/aspell/kspell_aspellclient.h delete mode 100644 kspell2/plugins/aspell/kspell_aspelldict.cpp delete mode 100644 kspell2/plugins/aspell/kspell_aspelldict.h delete mode 100644 kspell2/plugins/configure.in.bot delete mode 100644 kspell2/plugins/configure.in.in delete mode 100644 kspell2/plugins/hspell/CMakeLists.txt delete mode 100644 kspell2/plugins/hspell/Makefile.am delete mode 100644 kspell2/plugins/hspell/kspell_hspell.desktop delete mode 100644 kspell2/plugins/hspell/kspell_hspellclient.cpp delete mode 100644 kspell2/plugins/hspell/kspell_hspellclient.h delete mode 100644 kspell2/plugins/hspell/kspell_hspelldict.cpp delete mode 100644 kspell2/plugins/hspell/kspell_hspelldict.h delete mode 100644 kspell2/plugins/ispell/CMakeLists.txt delete mode 100644 kspell2/plugins/ispell/Makefile.am delete mode 100644 kspell2/plugins/ispell/correct.cpp delete mode 100644 kspell2/plugins/ispell/good.cpp delete mode 100644 kspell2/plugins/ispell/hash.cpp delete mode 100644 kspell2/plugins/ispell/ispell.h delete mode 100644 kspell2/plugins/ispell/ispell_checker.cpp delete mode 100644 kspell2/plugins/ispell/ispell_checker.h delete mode 100644 kspell2/plugins/ispell/ispell_def.h delete mode 100644 kspell2/plugins/ispell/kspell_ispell.desktop delete mode 100644 kspell2/plugins/ispell/kspell_ispellclient.cpp delete mode 100644 kspell2/plugins/ispell/kspell_ispellclient.h delete mode 100644 kspell2/plugins/ispell/kspell_ispelldict.cpp delete mode 100644 kspell2/plugins/ispell/kspell_ispelldict.h delete mode 100644 kspell2/plugins/ispell/lookup.cpp delete mode 100644 kspell2/plugins/ispell/makedent.cpp delete mode 100644 kspell2/plugins/ispell/msgs.h delete mode 100644 kspell2/plugins/ispell/sp_spell.h delete mode 100644 kspell2/plugins/ispell/tgood.cpp delete mode 100644 kspell2/settings.cpp delete mode 100644 kspell2/settings.h delete mode 100644 kspell2/tests/Makefile.am delete mode 100644 kspell2/tests/backgroundtest.cpp delete mode 100644 kspell2/tests/backgroundtest.h delete mode 100644 kspell2/tests/test.cpp delete mode 100644 kspell2/tests/test_config.cpp delete mode 100644 kspell2/tests/test_configdialog.cpp delete mode 100644 kspell2/tests/test_dialog.cpp delete mode 100644 kspell2/tests/test_dialog.h delete mode 100644 kspell2/tests/test_filter.cpp delete mode 100644 kspell2/tests/test_highlighter.cpp delete mode 100644 kspell2/threadevents.h delete mode 100644 kspell2/ui/CMakeLists.txt delete mode 100644 kspell2/ui/Makefile.am delete mode 100644 kspell2/ui/configdialog.cpp delete mode 100644 kspell2/ui/configdialog.h delete mode 100644 kspell2/ui/configui.ui delete mode 100644 kspell2/ui/configwidget.cpp delete mode 100644 kspell2/ui/configwidget.h delete mode 100644 kspell2/ui/dialog.cpp delete mode 100644 kspell2/ui/dialog.h delete mode 100644 kspell2/ui/highlighter.cpp delete mode 100644 kspell2/ui/highlighter.h delete mode 100644 kspell2/ui/kspell2ui.ui delete mode 100644 kunittest/CMakeLists.txt delete mode 100644 kunittest/Makefile.am delete mode 100644 kunittest/modrunner.cpp delete mode 100644 kunittest/module.h delete mode 100644 kunittest/runner.cpp delete mode 100644 kunittest/runner.h delete mode 100644 kunittest/samplemodule.cpp delete mode 100644 kunittest/samplemodule.h delete mode 100644 kunittest/tester.cpp delete mode 100644 kunittest/tester.h delete mode 100644 kutils/CMakeLists.txt delete mode 100644 kutils/Mainpage.dox delete mode 100644 kutils/Makefile.am delete mode 100644 kutils/TODO delete mode 100644 kutils/groups.dox delete mode 100644 kutils/kcmultidialog.cpp delete mode 100644 kutils/kcmultidialog.h delete mode 100644 kutils/kdeglobals.kcfg delete mode 100644 kutils/kdeglobals.kcfgc delete mode 100644 kutils/kfind.cpp delete mode 100644 kutils/kfind.h delete mode 100644 kutils/kfinddialog.cpp delete mode 100644 kutils/kfinddialog.h delete mode 100644 kutils/kmultitabbar.cpp delete mode 100644 kutils/kmultitabbar.h delete mode 100644 kutils/kmultitabbar_p.h delete mode 100644 kutils/kplugininfo.cpp delete mode 100644 kutils/kplugininfo.desktop delete mode 100644 kutils/kplugininfo.h delete mode 100644 kutils/kpluginselector.cpp delete mode 100644 kutils/kpluginselector.h delete mode 100644 kutils/kpluginselector_p.h delete mode 100644 kutils/kreplace.cpp delete mode 100644 kutils/kreplace.h delete mode 100644 kutils/kreplacedialog.cpp delete mode 100644 kutils/kreplacedialog.h delete mode 100644 kutils/ksettings/CMakeLists.txt delete mode 100644 kutils/ksettings/Makefile.am delete mode 100644 kutils/ksettings/README.dox delete mode 100644 kutils/ksettings/TODO delete mode 100644 kutils/ksettings/componentsdialog.cpp delete mode 100644 kutils/ksettings/componentsdialog.h delete mode 100644 kutils/ksettings/dialog.cpp delete mode 100644 kutils/ksettings/dialog.h delete mode 100644 kutils/ksettings/dispatcher.cpp delete mode 100644 kutils/ksettings/dispatcher.h delete mode 100644 kutils/ksettings/pluginpage.cpp delete mode 100644 kutils/ksettings/pluginpage.h delete mode 100644 kutils/tdecmodulecontainer.cpp delete mode 100644 kutils/tdecmodulecontainer.h delete mode 100644 kutils/tdecmoduleinfo.cpp delete mode 100644 kutils/tdecmoduleinfo.h delete mode 100644 kutils/tdecmoduleloader.cpp delete mode 100644 kutils/tdecmoduleloader.h delete mode 100644 kutils/tdecmoduleproxy.cpp delete mode 100644 kutils/tdecmoduleproxy.h delete mode 100644 kutils/tdecmoduleproxyIface.h delete mode 100644 kutils/tdecmoduleproxyIfaceImpl.cpp delete mode 100644 kutils/tdecmoduleproxyIfaceImpl.h delete mode 100644 kutils/tests/Makefile.am delete mode 100644 kutils/tests/kfindtest.cpp delete mode 100644 kutils/tests/kfindtest.h delete mode 100644 kutils/tests/kreplacetest.cpp delete mode 100644 kutils/tests/kreplacetest.h delete mode 100644 kwallet/CMakeLists.txt delete mode 100644 kwallet/Makefile.am delete mode 100644 kwallet/README delete mode 100644 kwallet/backend/CMakeLists.txt delete mode 100644 kwallet/backend/Makefile.am delete mode 100644 kwallet/backend/blockcipher.cc delete mode 100644 kwallet/backend/blockcipher.h delete mode 100644 kwallet/backend/blowfish.cc delete mode 100644 kwallet/backend/blowfish.h delete mode 100644 kwallet/backend/blowfishtables.h delete mode 100644 kwallet/backend/cbc.cc delete mode 100644 kwallet/backend/cbc.h delete mode 100644 kwallet/backend/kwalletbackend.cc delete mode 100644 kwallet/backend/kwalletbackend.h delete mode 100644 kwallet/backend/kwalletentry.cc delete mode 100644 kwallet/backend/kwalletentry.h delete mode 100644 kwallet/backend/sha1.cc delete mode 100644 kwallet/backend/sha1.h delete mode 100644 kwallet/backend/tests/Makefile.am delete mode 100644 kwallet/backend/tests/backendtest.cpp delete mode 100644 kwallet/backend/tests/testbf.cpp delete mode 100644 kwallet/backend/tests/testsha.cpp delete mode 100644 kwallet/client/CMakeLists.txt delete mode 100644 kwallet/client/Makefile.am delete mode 100644 kwallet/client/kwallet.cc delete mode 100644 kwallet/client/kwallet.h delete mode 100644 kwallet/client/kwallettypes.h delete mode 100644 kwallet/tests/Makefile.am delete mode 100644 kwallet/tests/README delete mode 100644 kwallet/tests/kwalletasync.cpp delete mode 100644 kwallet/tests/kwalletboth.cpp delete mode 100644 kwallet/tests/kwalletsync.cpp delete mode 100644 kwallet/tests/kwallettest.cpp delete mode 100644 kwallet/tests/kwallettest.h delete mode 100644 libkmid/CMakeLists.txt delete mode 100644 libkmid/Makefile.am delete mode 100644 libkmid/alsaout.cc delete mode 100644 libkmid/alsaout.h delete mode 100644 libkmid/awe_sup.h delete mode 100644 libkmid/configure.in.in delete mode 100644 libkmid/dattypes.cc delete mode 100644 libkmid/dattypes.h delete mode 100644 libkmid/deviceman.cc delete mode 100644 libkmid/deviceman.h delete mode 100644 libkmid/fmout.cc delete mode 100644 libkmid/fmout.h delete mode 100644 libkmid/gusout.cc delete mode 100644 libkmid/gusout.h delete mode 100644 libkmid/gusvoices.h delete mode 100644 libkmid/libkmid.cc delete mode 100644 libkmid/libkmid.h delete mode 100644 libkmid/midfile.cc delete mode 100644 libkmid/midfile.h delete mode 100644 libkmid/midimapper.cc delete mode 100644 libkmid/midimapper.h delete mode 100644 libkmid/midiout.cc delete mode 100644 libkmid/midiout.h delete mode 100644 libkmid/midispec.h delete mode 100644 libkmid/midistat.cc delete mode 100644 libkmid/midistat.h delete mode 100644 libkmid/mt32togm.cc delete mode 100644 libkmid/mt32togm.h delete mode 100644 libkmid/notearray.cc delete mode 100644 libkmid/notearray.h delete mode 100644 libkmid/player.cc delete mode 100644 libkmid/player.h delete mode 100644 libkmid/sndcard.h delete mode 100644 libkmid/synthout.cc delete mode 100644 libkmid/synthout.h delete mode 100644 libkmid/tests/Kathzy.mid delete mode 100644 libkmid/tests/Makefile.am delete mode 100644 libkmid/tests/apitest.cc delete mode 100644 libkmid/tests/ctest.c delete mode 100644 libkmid/tests/notesoff.cc delete mode 100644 libkmid/track.cc delete mode 100644 libkmid/track.h delete mode 100644 libkmid/voiceman.cc delete mode 100644 libkmid/voiceman.h delete mode 100644 libkscreensaver/CMakeLists.txt delete mode 100644 libkscreensaver/Makefile.am delete mode 100644 libkscreensaver/configure.in.in delete mode 100644 libkscreensaver/kscreensaver.cpp delete mode 100644 libkscreensaver/kscreensaver.h delete mode 100644 libkscreensaver/kscreensaver_vroot.h delete mode 100644 libkscreensaver/main.cpp create mode 100644 libtdemid/CMakeLists.txt create mode 100644 libtdemid/Makefile.am create mode 100644 libtdemid/alsaout.cc create mode 100644 libtdemid/alsaout.h create mode 100644 libtdemid/awe_sup.h create mode 100644 libtdemid/configure.in.in create mode 100644 libtdemid/dattypes.cc create mode 100644 libtdemid/dattypes.h create mode 100644 libtdemid/deviceman.cc create mode 100644 libtdemid/deviceman.h create mode 100644 libtdemid/fmout.cc create mode 100644 libtdemid/fmout.h create mode 100644 libtdemid/gusout.cc create mode 100644 libtdemid/gusout.h create mode 100644 libtdemid/gusvoices.h create mode 100644 libtdemid/libtdemid.cc create mode 100644 libtdemid/libtdemid.h create mode 100644 libtdemid/midfile.cc create mode 100644 libtdemid/midfile.h create mode 100644 libtdemid/midimapper.cc create mode 100644 libtdemid/midimapper.h create mode 100644 libtdemid/midiout.cc create mode 100644 libtdemid/midiout.h create mode 100644 libtdemid/midispec.h create mode 100644 libtdemid/midistat.cc create mode 100644 libtdemid/midistat.h create mode 100644 libtdemid/mt32togm.cc create mode 100644 libtdemid/mt32togm.h create mode 100644 libtdemid/notearray.cc create mode 100644 libtdemid/notearray.h create mode 100644 libtdemid/player.cc create mode 100644 libtdemid/player.h create mode 100644 libtdemid/sndcard.h create mode 100644 libtdemid/synthout.cc create mode 100644 libtdemid/synthout.h create mode 100644 libtdemid/tests/Kathzy.mid create mode 100644 libtdemid/tests/Makefile.am create mode 100644 libtdemid/tests/apitest.cc create mode 100644 libtdemid/tests/ctest.c create mode 100644 libtdemid/tests/notesoff.cc create mode 100644 libtdemid/track.cc create mode 100644 libtdemid/track.h create mode 100644 libtdemid/voiceman.cc create mode 100644 libtdemid/voiceman.h create mode 100644 libtdescreensaver/CMakeLists.txt create mode 100644 libtdescreensaver/Makefile.am create mode 100644 libtdescreensaver/configure.in.in create mode 100644 libtdescreensaver/main.cpp create mode 100644 libtdescreensaver/tdescreensaver.cpp create mode 100644 libtdescreensaver/tdescreensaver.h create mode 100644 libtdescreensaver/tdescreensaver_vroot.h delete mode 100644 pics/crystalsvg/cr128-mime-kmultiple.png create mode 100644 pics/crystalsvg/cr128-mime-tdemultiple.png delete mode 100644 pics/crystalsvg/cr16-mime-kmultiple.png create mode 100644 pics/crystalsvg/cr16-mime-tdemultiple.png delete mode 100644 pics/crystalsvg/cr22-mime-kmultiple.png create mode 100644 pics/crystalsvg/cr22-mime-tdemultiple.png delete mode 100644 pics/crystalsvg/cr32-mime-kmultiple.png create mode 100644 pics/crystalsvg/cr32-mime-tdemultiple.png delete mode 100644 pics/crystalsvg/cr48-mime-kmultiple.png create mode 100644 pics/crystalsvg/cr48-mime-tdemultiple.png delete mode 100644 pics/crystalsvg/cr64-mime-kmultiple.png create mode 100644 pics/crystalsvg/cr64-mime-tdemultiple.png delete mode 100644 pics/crystalsvg/crsc-mime-kmultiple.svgz create mode 100644 pics/crystalsvg/crsc-mime-tdemultiple.svgz create mode 100644 tdecert/CMakeLists.txt create mode 100644 tdecert/Makefile.am create mode 100644 tdecert/tdecertpart.cc create mode 100644 tdecert/tdecertpart.desktop create mode 100644 tdecert/tdecertpart.h create mode 100644 tdecert/tdecertpart.rc delete mode 100644 tdecore/kmultipledrag.cpp delete mode 100644 tdecore/kmultipledrag.h delete mode 100644 tdecore/ksycoca.cpp delete mode 100644 tdecore/ksycoca.h delete mode 100644 tdecore/ksycocadict.cpp delete mode 100644 tdecore/ksycocadict.h delete mode 100644 tdecore/ksycocaentry.h delete mode 100644 tdecore/ksycocafactory.cpp delete mode 100644 tdecore/ksycocafactory.h delete mode 100644 tdecore/ksycocatype.h delete mode 100644 tdecore/network/kmulticastsocket.h delete mode 100644 tdecore/network/kmulticastsocketdevice.h create mode 100644 tdecore/network/tdemulticastsocket.h create mode 100644 tdecore/network/tdemulticastsocketdevice.h create mode 100644 tdecore/tdemultipledrag.cpp create mode 100644 tdecore/tdemultipledrag.h create mode 100644 tdecore/tdesycoca.cpp create mode 100644 tdecore/tdesycoca.h create mode 100644 tdecore/tdesycocadict.cpp create mode 100644 tdecore/tdesycocadict.h create mode 100644 tdecore/tdesycocaentry.h create mode 100644 tdecore/tdesycocafactory.cpp create mode 100644 tdecore/tdesycocafactory.h create mode 100644 tdecore/tdesycocatype.h create mode 100644 tdehtml/.emacs-dirvars create mode 100644 tdehtml/CMakeLists.txt create mode 100644 tdehtml/ChangeLog create mode 100644 tdehtml/DESIGN.html create mode 100644 tdehtml/Mainpage.dox create mode 100644 tdehtml/Makefile.am create mode 100644 tdehtml/README.HTMLWidget create mode 100644 tdehtml/SAFARI_MERGE create mode 100644 tdehtml/TODO create mode 100644 tdehtml/configure.in.in create mode 100644 tdehtml/css/CMakeLists.txt create mode 100644 tdehtml/css/Makefile.am create mode 100644 tdehtml/css/css_base.cpp create mode 100644 tdehtml/css/css_base.h create mode 100644 tdehtml/css/css_extensionsimpl.cpp create mode 100644 tdehtml/css/css_extensionsimpl.h create mode 100644 tdehtml/css/css_renderstyledeclarationimpl.cpp create mode 100644 tdehtml/css/css_renderstyledeclarationimpl.h create mode 100644 tdehtml/css/css_ruleimpl.cpp create mode 100644 tdehtml/css/css_ruleimpl.h create mode 100644 tdehtml/css/css_stylesheetimpl.cpp create mode 100644 tdehtml/css/css_stylesheetimpl.h create mode 100644 tdehtml/css/css_valueimpl.cpp create mode 100644 tdehtml/css/css_valueimpl.h create mode 100644 tdehtml/css/csshelper.cpp create mode 100644 tdehtml/css/csshelper.h create mode 100644 tdehtml/css/cssparser.cpp create mode 100644 tdehtml/css/cssparser.h create mode 100644 tdehtml/css/cssproperties.c create mode 100644 tdehtml/css/cssproperties.h create mode 100644 tdehtml/css/cssproperties.in create mode 100644 tdehtml/css/cssstyleselector.cpp create mode 100644 tdehtml/css/cssstyleselector.h create mode 100644 tdehtml/css/cssvalues.c create mode 100644 tdehtml/css/cssvalues.h create mode 100644 tdehtml/css/cssvalues.in create mode 100644 tdehtml/css/html4.css create mode 100644 tdehtml/css/makeprop create mode 100755 tdehtml/css/makevalues create mode 100644 tdehtml/css/parser.cpp create mode 100644 tdehtml/css/parser.h create mode 100644 tdehtml/css/parser.y create mode 100644 tdehtml/css/quirks.css create mode 100644 tdehtml/css/tokenizer.cpp create mode 100644 tdehtml/css/tokenizer.flex create mode 100644 tdehtml/design.h create mode 100644 tdehtml/dom/CMakeLists.txt create mode 100644 tdehtml/dom/Makefile.am create mode 100644 tdehtml/dom/css_extensions.cpp create mode 100644 tdehtml/dom/css_extensions.h create mode 100644 tdehtml/dom/css_rule.cpp create mode 100644 tdehtml/dom/css_rule.h create mode 100644 tdehtml/dom/css_stylesheet.cpp create mode 100644 tdehtml/dom/css_stylesheet.h create mode 100644 tdehtml/dom/css_value.cpp create mode 100644 tdehtml/dom/css_value.h create mode 100644 tdehtml/dom/dom2_events.cpp create mode 100644 tdehtml/dom/dom2_events.h create mode 100644 tdehtml/dom/dom2_range.cpp create mode 100644 tdehtml/dom/dom2_range.h create mode 100644 tdehtml/dom/dom2_traversal.cpp create mode 100644 tdehtml/dom/dom2_traversal.h create mode 100644 tdehtml/dom/dom2_views.cpp create mode 100644 tdehtml/dom/dom2_views.h create mode 100644 tdehtml/dom/dom_core.h create mode 100644 tdehtml/dom/dom_doc.cpp create mode 100644 tdehtml/dom/dom_doc.h create mode 100644 tdehtml/dom/dom_element.cpp create mode 100644 tdehtml/dom/dom_element.h create mode 100644 tdehtml/dom/dom_exception.h create mode 100644 tdehtml/dom/dom_html.h create mode 100644 tdehtml/dom/dom_misc.cpp create mode 100644 tdehtml/dom/dom_misc.h create mode 100644 tdehtml/dom/dom_node.cpp create mode 100644 tdehtml/dom/dom_node.h create mode 100644 tdehtml/dom/dom_string.cpp create mode 100644 tdehtml/dom/dom_string.h create mode 100644 tdehtml/dom/dom_text.cpp create mode 100644 tdehtml/dom/dom_text.h create mode 100644 tdehtml/dom/dom_xml.cpp create mode 100644 tdehtml/dom/dom_xml.h create mode 100644 tdehtml/dom/html_base.cpp create mode 100644 tdehtml/dom/html_base.h create mode 100644 tdehtml/dom/html_block.cpp create mode 100644 tdehtml/dom/html_block.h create mode 100644 tdehtml/dom/html_document.cpp create mode 100644 tdehtml/dom/html_document.h create mode 100644 tdehtml/dom/html_element.cpp create mode 100644 tdehtml/dom/html_element.h create mode 100644 tdehtml/dom/html_form.cpp create mode 100644 tdehtml/dom/html_form.h create mode 100644 tdehtml/dom/html_head.cpp create mode 100644 tdehtml/dom/html_head.h create mode 100644 tdehtml/dom/html_image.cpp create mode 100644 tdehtml/dom/html_image.h create mode 100644 tdehtml/dom/html_inline.cpp create mode 100644 tdehtml/dom/html_inline.h create mode 100644 tdehtml/dom/html_list.cpp create mode 100644 tdehtml/dom/html_list.h create mode 100644 tdehtml/dom/html_misc.cpp create mode 100644 tdehtml/dom/html_misc.h create mode 100644 tdehtml/dom/html_object.cpp create mode 100644 tdehtml/dom/html_object.h create mode 100644 tdehtml/dom/html_table.cpp create mode 100644 tdehtml/dom/html_table.h create mode 100644 tdehtml/domtreeview.cpp create mode 100644 tdehtml/domtreeview.h create mode 100644 tdehtml/ecma/AUTHORS create mode 100644 tdehtml/ecma/CMakeLists.txt create mode 100644 tdehtml/ecma/Makefile.am create mode 100644 tdehtml/ecma/README create mode 100644 tdehtml/ecma/THANKS create mode 100644 tdehtml/ecma/TODO create mode 100644 tdehtml/ecma/domparser.cpp create mode 100644 tdehtml/ecma/domparser.h create mode 100644 tdehtml/ecma/jsk.html create mode 100644 tdehtml/ecma/kjs_binding.cpp create mode 100644 tdehtml/ecma/kjs_binding.h create mode 100644 tdehtml/ecma/kjs_css.cpp create mode 100644 tdehtml/ecma/kjs_css.h create mode 100644 tdehtml/ecma/kjs_debugwin.cpp create mode 100644 tdehtml/ecma/kjs_debugwin.h create mode 100644 tdehtml/ecma/kjs_dom.cpp create mode 100644 tdehtml/ecma/kjs_dom.h create mode 100644 tdehtml/ecma/kjs_events.cpp create mode 100644 tdehtml/ecma/kjs_events.h create mode 100644 tdehtml/ecma/kjs_html.cpp create mode 100644 tdehtml/ecma/kjs_html.h create mode 100644 tdehtml/ecma/kjs_mozilla.cpp create mode 100644 tdehtml/ecma/kjs_mozilla.h create mode 100644 tdehtml/ecma/kjs_navigator.cpp create mode 100644 tdehtml/ecma/kjs_navigator.h create mode 100644 tdehtml/ecma/kjs_proxy.cpp create mode 100644 tdehtml/ecma/kjs_proxy.h create mode 100644 tdehtml/ecma/kjs_range.cpp create mode 100644 tdehtml/ecma/kjs_range.h create mode 100644 tdehtml/ecma/kjs_traversal.cpp create mode 100644 tdehtml/ecma/kjs_traversal.h create mode 100644 tdehtml/ecma/kjs_views.cpp create mode 100644 tdehtml/ecma/kjs_views.h create mode 100644 tdehtml/ecma/kjs_window.cpp create mode 100644 tdehtml/ecma/kjs_window.h create mode 100644 tdehtml/ecma/testecma.cpp create mode 100644 tdehtml/ecma/xmlhttprequest.cpp create mode 100644 tdehtml/ecma/xmlhttprequest.h create mode 100644 tdehtml/ecma/xmlserializer.cpp create mode 100644 tdehtml/ecma/xmlserializer.h create mode 100644 tdehtml/html/AlwaysInline.h create mode 100644 tdehtml/html/CMakeLists.txt create mode 100644 tdehtml/html/Makefile.am create mode 100644 tdehtml/html/Platform.h create mode 100644 tdehtml/html/RefPtr.h create mode 100644 tdehtml/html/doctypes.cpp create mode 100644 tdehtml/html/doctypes.gperf create mode 100644 tdehtml/html/dtd.cpp create mode 100644 tdehtml/html/dtd.dtd create mode 100644 tdehtml/html/dtd.h create mode 100644 tdehtml/html/html_baseimpl.cpp create mode 100644 tdehtml/html/html_baseimpl.h create mode 100644 tdehtml/html/html_blockimpl.cpp create mode 100644 tdehtml/html/html_blockimpl.h create mode 100644 tdehtml/html/html_documentimpl.cpp create mode 100644 tdehtml/html/html_documentimpl.h create mode 100644 tdehtml/html/html_elementimpl.cpp create mode 100644 tdehtml/html/html_elementimpl.h create mode 100644 tdehtml/html/html_formimpl.cpp create mode 100644 tdehtml/html/html_formimpl.h create mode 100644 tdehtml/html/html_headimpl.cpp create mode 100644 tdehtml/html/html_headimpl.h create mode 100644 tdehtml/html/html_imageimpl.cpp create mode 100644 tdehtml/html/html_imageimpl.h create mode 100644 tdehtml/html/html_inlineimpl.cpp create mode 100644 tdehtml/html/html_inlineimpl.h create mode 100644 tdehtml/html/html_listimpl.cpp create mode 100644 tdehtml/html/html_listimpl.h create mode 100644 tdehtml/html/html_miscimpl.cpp create mode 100644 tdehtml/html/html_miscimpl.h create mode 100644 tdehtml/html/html_objectimpl.cpp create mode 100644 tdehtml/html/html_objectimpl.h create mode 100644 tdehtml/html/html_tableimpl.cpp create mode 100644 tdehtml/html/html_tableimpl.h create mode 100644 tdehtml/html/htmlparser.cpp create mode 100644 tdehtml/html/htmlparser.h create mode 100644 tdehtml/html/htmltokenizer.cpp create mode 100644 tdehtml/html/htmltokenizer.h create mode 100644 tdehtml/htmlpageinfo.ui create mode 100644 tdehtml/java/CMakeLists.txt create mode 100644 tdehtml/java/ChangeLog create mode 100644 tdehtml/java/KJAS_GRAMMAR.txt create mode 100644 tdehtml/java/Makefile.am create mode 100644 tdehtml/java/README create mode 100644 tdehtml/java/TODO create mode 100644 tdehtml/java/build.properties create mode 100644 tdehtml/java/build.xml create mode 100644 tdehtml/java/configure.in.in create mode 100644 tdehtml/java/cr16-action-java.png create mode 100644 tdehtml/java/dummy/CMakeLists.txt create mode 100644 tdehtml/java/dummy/Makefile.am create mode 100644 tdehtml/java/images/animbean.gif create mode 100644 tdehtml/java/images/beanicon.png create mode 100644 tdehtml/java/images/brokenbean.gif create mode 100644 tdehtml/java/kjava.jar create mode 100644 tdehtml/java/kjava.policy.in create mode 100644 tdehtml/java/kjavaapplet.cpp create mode 100644 tdehtml/java/kjavaapplet.h create mode 100644 tdehtml/java/kjavaappletcontext.cpp create mode 100644 tdehtml/java/kjavaappletcontext.h create mode 100644 tdehtml/java/kjavaappletserver.cpp create mode 100644 tdehtml/java/kjavaappletserver.h create mode 100644 tdehtml/java/kjavaappletviewer.cpp create mode 100644 tdehtml/java/kjavaappletviewer.desktop create mode 100644 tdehtml/java/kjavaappletviewer.h create mode 100644 tdehtml/java/kjavaappletwidget.cpp create mode 100644 tdehtml/java/kjavaappletwidget.h create mode 100644 tdehtml/java/kjavadownloader.cpp create mode 100644 tdehtml/java/kjavadownloader.h create mode 100644 tdehtml/java/kjavaprocess.cpp create mode 100644 tdehtml/java/kjavaprocess.h create mode 100644 tdehtml/java/kqeventutil.cpp create mode 100644 tdehtml/java/kqeventutil.h create mode 100644 tdehtml/java/kxeventutil.cpp create mode 100644 tdehtml/java/kxeventutil.h create mode 100755 tdehtml/java/make-jar create mode 100644 tdehtml/java/netscape/javascript/JSException.java create mode 100644 tdehtml/java/netscape/javascript/JSObject.java create mode 100644 tdehtml/java/netscape/plugin/Plugin.java create mode 100644 tdehtml/java/netscape/security/ForbiddenTargetException.java create mode 100644 tdehtml/java/netscape/security/Principal.java create mode 100644 tdehtml/java/netscape/security/PrivilegeManager.java create mode 100644 tdehtml/java/netscape/security/Target.java create mode 100644 tdehtml/java/org/kde/javascript/JSObject.java create mode 100644 tdehtml/java/org/kde/kjas/server/Console.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASAppletClassLoader.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASAppletContext.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASAppletPanel.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASAppletStub.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASAudioClip.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASConsole.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASConsoleStream.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASSecurityManager.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASSoundPlayer.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASSwingConsole.java create mode 100644 tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java create mode 100644 tdehtml/java/org/kde/kjas/server/Main.java create mode 100644 tdehtml/java/org/kde/kjas/server/StatusListener.java create mode 100644 tdehtml/java/pluginsinfo create mode 100644 tdehtml/java/tests/Makefile.am create mode 100644 tdehtml/java/tests/badapplets/BadApplet.jar create mode 100644 tdehtml/java/tests/badapplets/BadApplet.java create mode 100644 tdehtml/java/tests/badapplets/applet.html create mode 100644 tdehtml/java/tests/good_sites create mode 100644 tdehtml/java/tests/testkjavaappletserver.cpp create mode 100644 tdehtml/kjserrordlg.ui create mode 100644 tdehtml/kjserrordlg.ui.h create mode 100644 tdehtml/libtdehtml.map create mode 100644 tdehtml/misc/CMakeLists.txt create mode 100644 tdehtml/misc/Makefile.am create mode 100644 tdehtml/misc/arena.cpp create mode 100644 tdehtml/misc/arena.h create mode 100644 tdehtml/misc/blocked_icon.cpp create mode 100644 tdehtml/misc/blocked_icon.png create mode 100644 tdehtml/misc/decoder.cpp create mode 100644 tdehtml/misc/decoder.h create mode 100644 tdehtml/misc/guess_ja.cpp create mode 100644 tdehtml/misc/guess_ja.h create mode 100644 tdehtml/misc/helper.cpp create mode 100644 tdehtml/misc/helper.h create mode 100644 tdehtml/misc/htmlattrs.c create mode 100644 tdehtml/misc/htmlattrs.h create mode 100644 tdehtml/misc/htmlattrs.in create mode 100644 tdehtml/misc/htmlhashes.cpp create mode 100644 tdehtml/misc/htmlhashes.h create mode 100644 tdehtml/misc/htmltags.c create mode 100644 tdehtml/misc/htmltags.h create mode 100644 tdehtml/misc/htmltags.in create mode 100644 tdehtml/misc/knsplugininstaller.cpp create mode 100644 tdehtml/misc/knsplugininstaller.h create mode 100644 tdehtml/misc/loader.cpp create mode 100644 tdehtml/misc/loader.h create mode 100644 tdehtml/misc/loader_client.h create mode 100644 tdehtml/misc/loader_jpeg.cpp create mode 100644 tdehtml/misc/loader_jpeg.h create mode 100644 tdehtml/misc/makeattrs create mode 100644 tdehtml/misc/maketags create mode 100644 tdehtml/misc/multimap.h create mode 100644 tdehtml/misc/seed.h create mode 100644 tdehtml/misc/shared.h create mode 100644 tdehtml/misc/stringit.cpp create mode 100644 tdehtml/misc/stringit.h create mode 100644 tdehtml/misc/tdehtmllayout.h create mode 100644 tdehtml/pics/CMakeLists.txt create mode 100644 tdehtml/pics/Makefile.am create mode 100644 tdehtml/pics/cr128-action-bug.png create mode 100644 tdehtml/pics/cr16-action-bug.png create mode 100644 tdehtml/pics/cr16-action-images_display.png create mode 100644 tdehtml/pics/cr16-action-wallet_open.png create mode 100644 tdehtml/pics/cr22-action-bug.png create mode 100644 tdehtml/pics/cr22-action-dbgnext.png create mode 100644 tdehtml/pics/cr22-action-dbgrun.png create mode 100644 tdehtml/pics/cr22-action-dbgrunto.png create mode 100644 tdehtml/pics/cr22-action-dbgstep.png create mode 100644 tdehtml/pics/cr22-action-images_display.png create mode 100644 tdehtml/pics/cr32-action-bug.png create mode 100644 tdehtml/pics/cr32-action-images_display.png create mode 100644 tdehtml/pics/cr48-action-bug.png create mode 100644 tdehtml/pics/cr64-action-bug.png create mode 100644 tdehtml/rendering/CMakeLists.txt create mode 100644 tdehtml/rendering/Makefile.am create mode 100644 tdehtml/rendering/bidi.cpp create mode 100644 tdehtml/rendering/bidi.h create mode 100644 tdehtml/rendering/break_lines.cpp create mode 100644 tdehtml/rendering/break_lines.h create mode 100644 tdehtml/rendering/counter_tree.cpp create mode 100644 tdehtml/rendering/counter_tree.h create mode 100644 tdehtml/rendering/enumerate.cpp create mode 100644 tdehtml/rendering/enumerate.h create mode 100644 tdehtml/rendering/font.cpp create mode 100644 tdehtml/rendering/font.h create mode 100644 tdehtml/rendering/img-loading.png create mode 100644 tdehtml/rendering/loading_icon.cpp create mode 100644 tdehtml/rendering/render_applet.cpp create mode 100644 tdehtml/rendering/render_applet.h create mode 100644 tdehtml/rendering/render_arena.cpp create mode 100644 tdehtml/rendering/render_arena.h create mode 100644 tdehtml/rendering/render_block.cpp create mode 100644 tdehtml/rendering/render_block.h create mode 100644 tdehtml/rendering/render_body.cpp create mode 100644 tdehtml/rendering/render_body.h create mode 100644 tdehtml/rendering/render_box.cpp create mode 100644 tdehtml/rendering/render_box.h create mode 100644 tdehtml/rendering/render_br.cpp create mode 100644 tdehtml/rendering/render_br.h create mode 100644 tdehtml/rendering/render_canvas.cpp create mode 100644 tdehtml/rendering/render_canvas.h create mode 100644 tdehtml/rendering/render_container.cpp create mode 100644 tdehtml/rendering/render_container.h create mode 100644 tdehtml/rendering/render_flow.cpp create mode 100644 tdehtml/rendering/render_flow.h create mode 100644 tdehtml/rendering/render_form.cpp create mode 100644 tdehtml/rendering/render_form.h create mode 100644 tdehtml/rendering/render_frames.cpp create mode 100644 tdehtml/rendering/render_frames.h create mode 100644 tdehtml/rendering/render_generated.cpp create mode 100644 tdehtml/rendering/render_generated.h create mode 100644 tdehtml/rendering/render_image.cpp create mode 100644 tdehtml/rendering/render_image.h create mode 100644 tdehtml/rendering/render_inline.cpp create mode 100644 tdehtml/rendering/render_inline.h create mode 100644 tdehtml/rendering/render_layer.cpp create mode 100644 tdehtml/rendering/render_layer.h create mode 100644 tdehtml/rendering/render_line.cpp create mode 100644 tdehtml/rendering/render_line.h create mode 100644 tdehtml/rendering/render_list.cpp create mode 100644 tdehtml/rendering/render_list.h create mode 100644 tdehtml/rendering/render_object.cpp create mode 100644 tdehtml/rendering/render_object.h create mode 100644 tdehtml/rendering/render_replaced.cpp create mode 100644 tdehtml/rendering/render_replaced.h create mode 100644 tdehtml/rendering/render_style.cpp create mode 100644 tdehtml/rendering/render_style.h create mode 100644 tdehtml/rendering/render_table.cpp create mode 100644 tdehtml/rendering/render_table.h create mode 100644 tdehtml/rendering/render_text.cpp create mode 100644 tdehtml/rendering/render_text.h create mode 100644 tdehtml/rendering/table_layout.cpp create mode 100644 tdehtml/rendering/table_layout.h create mode 100644 tdehtml/rendering/table_layout.txt create mode 100644 tdehtml/tdehtml-devel-gdb create mode 100644 tdehtml/tdehtml.desktop create mode 100644 tdehtml/tdehtml.rc create mode 100644 tdehtml/tdehtml_browser.rc create mode 100644 tdehtml/tdehtml_caret.cpp create mode 100644 tdehtml/tdehtml_caret_p.h create mode 100644 tdehtml/tdehtml_events.cpp create mode 100644 tdehtml/tdehtml_events.h create mode 100644 tdehtml/tdehtml_ext.cpp create mode 100644 tdehtml/tdehtml_ext.h create mode 100644 tdehtml/tdehtml_factory.cpp create mode 100644 tdehtml/tdehtml_factory.h create mode 100644 tdehtml/tdehtml_iface.cc create mode 100644 tdehtml/tdehtml_iface.h create mode 100644 tdehtml/tdehtml_pagecache.cpp create mode 100644 tdehtml/tdehtml_pagecache.h create mode 100644 tdehtml/tdehtml_part.cpp create mode 100644 tdehtml/tdehtml_part.h create mode 100644 tdehtml/tdehtml_popupmenu.rc create mode 100644 tdehtml/tdehtml_printsettings.cpp create mode 100644 tdehtml/tdehtml_printsettings.h create mode 100644 tdehtml/tdehtml_run.cpp create mode 100644 tdehtml/tdehtml_run.h create mode 100644 tdehtml/tdehtml_settings.cc create mode 100644 tdehtml/tdehtml_settings.h create mode 100644 tdehtml/tdehtmldefaults.h create mode 100644 tdehtml/tdehtmlimage.cpp create mode 100644 tdehtml/tdehtmlimage.desktop create mode 100644 tdehtml/tdehtmlimage.h create mode 100644 tdehtml/tdehtmlpart_p.h create mode 100644 tdehtml/tdehtmlview.cpp create mode 100644 tdehtml/tdehtmlview.h create mode 100644 tdehtml/tdemultipart/CMakeLists.txt create mode 100644 tdehtml/tdemultipart/Makefile.am create mode 100644 tdehtml/tdemultipart/README create mode 100644 tdehtml/tdemultipart/tdemultipart.cpp create mode 100644 tdehtml/tdemultipart/tdemultipart.desktop create mode 100644 tdehtml/tdemultipart/tdemultipart.h create mode 100644 tdehtml/test/README create mode 100644 tdehtml/test/align.html create mode 100644 tdehtml/test/align1.html create mode 100644 tdehtml/test/align2.html create mode 100644 tdehtml/test/anchor1.html create mode 100644 tdehtml/test/anchor2.html create mode 100644 tdehtml/test/button.html create mode 100644 tdehtml/test/color.html create mode 100644 tdehtml/test/fixed-background.html create mode 100644 tdehtml/test/image.gif create mode 100644 tdehtml/test/image_map.html create mode 100644 tdehtml/test/java.html create mode 100644 tdehtml/test/jsplugins.html create mode 100644 tdehtml/test/konqi.gif create mode 100644 tdehtml/test/lake.class create mode 100644 tdehtml/test/lists.html create mode 100644 tdehtml/test/nav_bar.gif create mode 100644 tdehtml/test/nbsp.html create mode 100644 tdehtml/test/object.html create mode 100644 tdehtml/test/pseudo.html create mode 100644 tdehtml/test/testpages.html create mode 100644 tdehtml/test_regression.cpp create mode 100644 tdehtml/test_regression.h create mode 100644 tdehtml/test_regression_fontoverload.cpp create mode 100644 tdehtml/testtdehtml.cpp create mode 100644 tdehtml/testtdehtml.h create mode 100644 tdehtml/xml/CMakeLists.txt create mode 100644 tdehtml/xml/Makefile.am create mode 100644 tdehtml/xml/dom2_eventsimpl.cpp create mode 100644 tdehtml/xml/dom2_eventsimpl.h create mode 100644 tdehtml/xml/dom2_rangeimpl.cpp create mode 100644 tdehtml/xml/dom2_rangeimpl.h create mode 100644 tdehtml/xml/dom2_traversalimpl.cpp create mode 100644 tdehtml/xml/dom2_traversalimpl.h create mode 100644 tdehtml/xml/dom2_viewsimpl.cpp create mode 100644 tdehtml/xml/dom2_viewsimpl.h create mode 100644 tdehtml/xml/dom_docimpl.cpp create mode 100644 tdehtml/xml/dom_docimpl.h create mode 100644 tdehtml/xml/dom_elementimpl.cpp create mode 100644 tdehtml/xml/dom_elementimpl.h create mode 100644 tdehtml/xml/dom_nodeimpl.cpp create mode 100644 tdehtml/xml/dom_nodeimpl.h create mode 100644 tdehtml/xml/dom_restyler.cpp create mode 100644 tdehtml/xml/dom_restyler.h create mode 100644 tdehtml/xml/dom_stringimpl.cpp create mode 100644 tdehtml/xml/dom_stringimpl.h create mode 100644 tdehtml/xml/dom_textimpl.cpp create mode 100644 tdehtml/xml/dom_textimpl.h create mode 100644 tdehtml/xml/dom_xmlimpl.cpp create mode 100644 tdehtml/xml/dom_xmlimpl.h create mode 100644 tdehtml/xml/xml_tokenizer.cpp create mode 100644 tdehtml/xml/xml_tokenizer.h create mode 100644 tdemdi/CMakeLists.txt create mode 100644 tdemdi/Makefile.am create mode 100644 tdemdi/TODO create mode 100644 tdemdi/res/filenew.xpm create mode 100644 tdemdi/res/kde2_closebutton.xpm create mode 100644 tdemdi/res/kde2_maxbutton.xpm create mode 100644 tdemdi/res/kde2_minbutton.xpm create mode 100644 tdemdi/res/kde2_restorebutton.xpm create mode 100644 tdemdi/res/kde2_undockbutton.xpm create mode 100644 tdemdi/res/kde2laptop_closebutton.xpm create mode 100644 tdemdi/res/kde2laptop_closebutton_menu.xpm create mode 100644 tdemdi/res/kde2laptop_maxbutton.xpm create mode 100644 tdemdi/res/kde2laptop_minbutton.xpm create mode 100644 tdemdi/res/kde2laptop_restorebutton.xpm create mode 100644 tdemdi/res/kde2laptop_undockbutton.xpm create mode 100644 tdemdi/res/kde_closebutton.xpm create mode 100644 tdemdi/res/kde_maxbutton.xpm create mode 100644 tdemdi/res/kde_minbutton.xpm create mode 100644 tdemdi/res/kde_restorebutton.xpm create mode 100644 tdemdi/res/kde_undockbutton.xpm create mode 100644 tdemdi/res/win_closebutton.xpm create mode 100644 tdemdi/res/win_maxbutton.xpm create mode 100644 tdemdi/res/win_minbutton.xpm create mode 100644 tdemdi/res/win_restorebutton.xpm create mode 100644 tdemdi/res/win_undockbutton.xpm create mode 100644 tdemdi/tdemdi/CMakeLists.txt create mode 100644 tdemdi/tdemdi/Makefile.am create mode 100644 tdemdi/tdemdi/dockcontainer.cpp create mode 100644 tdemdi/tdemdi/dockcontainer.h create mode 100644 tdemdi/tdemdi/global.h create mode 100644 tdemdi/tdemdi/guiclient.cpp create mode 100644 tdemdi/tdemdi/guiclient.h create mode 100644 tdemdi/tdemdi/mainwindow.cpp create mode 100644 tdemdi/tdemdi/mainwindow.h create mode 100644 tdemdi/tdemdi/tabwidget.cpp create mode 100644 tdemdi/tdemdi/tabwidget.h create mode 100644 tdemdi/tdemdi/toolviewaccessor.cpp create mode 100644 tdemdi/tdemdi/toolviewaccessor.h create mode 100644 tdemdi/tdemdi/toolviewaccessor_p.h create mode 100644 tdemdi/tdemdichildarea.cpp create mode 100644 tdemdi/tdemdichildarea.h create mode 100644 tdemdi/tdemdichildfrm.cpp create mode 100644 tdemdi/tdemdichildfrm.h create mode 100644 tdemdi/tdemdichildfrmcaption.cpp create mode 100644 tdemdi/tdemdichildfrmcaption.h create mode 100644 tdemdi/tdemdichildview.cpp create mode 100644 tdemdi/tdemdichildview.h create mode 100644 tdemdi/tdemdidefines.h create mode 100644 tdemdi/tdemdidockcontainer.cpp create mode 100644 tdemdi/tdemdidockcontainer.h create mode 100644 tdemdi/tdemdidocumentviewtabwidget.cpp create mode 100644 tdemdi/tdemdidocumentviewtabwidget.h create mode 100644 tdemdi/tdemdifocuslist.cpp create mode 100644 tdemdi/tdemdifocuslist.h create mode 100644 tdemdi/tdemdiguiclient.cpp create mode 100644 tdemdi/tdemdiguiclient.h create mode 100644 tdemdi/tdemdiiterator.h create mode 100644 tdemdi/tdemdilistiterator.h create mode 100644 tdemdi/tdemdimainfrm.cpp create mode 100644 tdemdi/tdemdimainfrm.h create mode 100644 tdemdi/tdemdinulliterator.h create mode 100644 tdemdi/tdemditaskbar.cpp create mode 100644 tdemdi/tdemditaskbar.h create mode 100644 tdemdi/tdemditoolviewaccessor.cpp create mode 100644 tdemdi/tdemditoolviewaccessor.h create mode 100644 tdemdi/tdemditoolviewaccessor_p.h create mode 100644 tdemdi/test/Makefile.am create mode 100644 tdemdi/test/README create mode 100644 tdemdi/test/hello.cpp create mode 100644 tdemdi/test/hello.h create mode 100644 tdemdi/test/main.cpp create mode 100644 tdemdi/test/mainwidget.cpp create mode 100644 tdemdi/test/mainwidget.h create mode 100644 tdeparts/AUTHORS create mode 100644 tdeparts/CMakeLists.txt create mode 100644 tdeparts/COMMENTS create mode 100644 tdeparts/Mainpage.dox create mode 100644 tdeparts/Makefile.am create mode 100644 tdeparts/browserextension.cpp create mode 100644 tdeparts/browserextension.h create mode 100644 tdeparts/browserinterface.cpp create mode 100644 tdeparts/browserinterface.h create mode 100644 tdeparts/browserrun.cpp create mode 100644 tdeparts/browserrun.h create mode 100644 tdeparts/browserview.desktop create mode 100644 tdeparts/componentfactory.h create mode 100644 tdeparts/design.h create mode 100644 tdeparts/dockmainwindow.cpp create mode 100644 tdeparts/dockmainwindow.h create mode 100644 tdeparts/event.cpp create mode 100644 tdeparts/event.h create mode 100644 tdeparts/factory.cpp create mode 100644 tdeparts/factory.h create mode 100644 tdeparts/genericfactory.h create mode 100644 tdeparts/historyprovider.cpp create mode 100644 tdeparts/historyprovider.h create mode 100644 tdeparts/kpart.desktop create mode 100644 tdeparts/krop.desktop create mode 100644 tdeparts/krwp.desktop create mode 100644 tdeparts/mainwindow.cpp create mode 100644 tdeparts/mainwindow.h create mode 100644 tdeparts/part.cpp create mode 100644 tdeparts/part.h create mode 100644 tdeparts/partmanager.cpp create mode 100644 tdeparts/partmanager.h create mode 100644 tdeparts/plugin.cpp create mode 100644 tdeparts/plugin.h create mode 100644 tdeparts/statusbarextension.cpp create mode 100644 tdeparts/statusbarextension.h create mode 100644 tdeparts/tests/Makefile.am create mode 100644 tdeparts/tests/README create mode 100644 tdeparts/tests/example.cpp create mode 100644 tdeparts/tests/example.h create mode 100644 tdeparts/tests/ghostview.cpp create mode 100644 tdeparts/tests/ghostview.h create mode 100644 tdeparts/tests/ghostviewtest_shell.rc create mode 100644 tdeparts/tests/normalktm.cpp create mode 100644 tdeparts/tests/normalktm.h create mode 100644 tdeparts/tests/notepad.cpp create mode 100644 tdeparts/tests/notepad.desktop create mode 100644 tdeparts/tests/notepad.h create mode 100644 tdeparts/tests/notepadpart.cpp create mode 100644 tdeparts/tests/notepadpart.rc create mode 100644 tdeparts/tests/parts.cpp create mode 100644 tdeparts/tests/parts.h create mode 100644 tdeparts/tests/plugin_foobar.rc create mode 100644 tdeparts/tests/plugin_spellcheck.cpp create mode 100644 tdeparts/tests/plugin_spellcheck.h create mode 100644 tdeparts/tests/plugin_spellcheck.rc create mode 100644 tdeparts/tests/tdepartstest_part1.rc create mode 100644 tdeparts/tests/tdepartstest_shell.rc create mode 100644 tderandr/CMakeLists.txt create mode 100644 tderandr/Mainpage.dox create mode 100644 tderandr/Makefile.am create mode 100644 tderandr/configure.in.in create mode 100644 tderandr/ktimerdialog.cpp create mode 100644 tderandr/ktimerdialog.h create mode 100644 tderandr/libtderandr.cc create mode 100644 tderandr/libtderandr.h create mode 100644 tderandr/lowlevel_randr.c create mode 100644 tderandr/lowlevel_randr.h create mode 100644 tderandr/randr.cpp create mode 100644 tderandr/randr.h create mode 100644 tderesources/CMakeLists.txt create mode 100644 tderesources/Makefile.am create mode 100644 tderesources/README.design create mode 100644 tderesources/TODO create mode 100644 tderesources/configdialog.cpp create mode 100644 tderesources/configdialog.h create mode 100644 tderesources/configpage.cpp create mode 100644 tderesources/configpage.h create mode 100644 tderesources/configwidget.cpp create mode 100644 tderesources/configwidget.h create mode 100644 tderesources/factory.cpp create mode 100644 tderesources/factory.h create mode 100644 tderesources/kcmtderesources.cpp create mode 100644 tderesources/kcmtderesources.h create mode 100644 tderesources/manager.h create mode 100644 tderesources/manageriface.h create mode 100644 tderesources/managerimpl.cpp create mode 100644 tderesources/managerimpl.h create mode 100644 tderesources/resource.cpp create mode 100644 tderesources/resource.h create mode 100644 tderesources/selectdialog.cpp create mode 100644 tderesources/selectdialog.h create mode 100644 tderesources/tderesources.desktop create mode 100644 tderesources/tderesources_manager.desktop create mode 100644 tderesources/tderesources_plugin.desktop create mode 100644 tderesources/testresources.cpp create mode 100644 tdersync/CMakeLists.txt create mode 100644 tdersync/rsyncconfigdialog.cpp create mode 100644 tdersync/rsyncconfigdialog.h create mode 100644 tdersync/tdersync.cpp create mode 100644 tdersync/tdersync.h create mode 100644 tdespell2/CMakeLists.txt create mode 100644 tdespell2/Makefile.am create mode 100644 tdespell2/README create mode 100644 tdespell2/backgroundchecker.cpp create mode 100644 tdespell2/backgroundchecker.h create mode 100644 tdespell2/backgroundengine.cpp create mode 100644 tdespell2/backgroundengine.h create mode 100644 tdespell2/backgroundthread.cpp create mode 100644 tdespell2/backgroundthread.h create mode 100644 tdespell2/broker.cpp create mode 100644 tdespell2/broker.h create mode 100644 tdespell2/client.cpp create mode 100644 tdespell2/client.h create mode 100644 tdespell2/defaultdictionary.cpp create mode 100644 tdespell2/defaultdictionary.h create mode 100644 tdespell2/dictionary.h create mode 100644 tdespell2/filter.cpp create mode 100644 tdespell2/filter.h create mode 100644 tdespell2/plugins/CMakeLists.txt create mode 100644 tdespell2/plugins/Makefile.am create mode 100644 tdespell2/plugins/aspell/CMakeLists.txt create mode 100644 tdespell2/plugins/aspell/Makefile.am create mode 100644 tdespell2/plugins/aspell/tdespell_aspell.desktop create mode 100644 tdespell2/plugins/aspell/tdespell_aspellclient.cpp create mode 100644 tdespell2/plugins/aspell/tdespell_aspellclient.h create mode 100644 tdespell2/plugins/aspell/tdespell_aspelldict.cpp create mode 100644 tdespell2/plugins/aspell/tdespell_aspelldict.h create mode 100644 tdespell2/plugins/configure.in.bot create mode 100644 tdespell2/plugins/configure.in.in create mode 100644 tdespell2/plugins/hspell/CMakeLists.txt create mode 100644 tdespell2/plugins/hspell/Makefile.am create mode 100644 tdespell2/plugins/hspell/tdespell_hspell.desktop create mode 100644 tdespell2/plugins/hspell/tdespell_hspellclient.cpp create mode 100644 tdespell2/plugins/hspell/tdespell_hspellclient.h create mode 100644 tdespell2/plugins/hspell/tdespell_hspelldict.cpp create mode 100644 tdespell2/plugins/hspell/tdespell_hspelldict.h create mode 100644 tdespell2/plugins/ispell/CMakeLists.txt create mode 100644 tdespell2/plugins/ispell/Makefile.am create mode 100644 tdespell2/plugins/ispell/correct.cpp create mode 100644 tdespell2/plugins/ispell/good.cpp create mode 100644 tdespell2/plugins/ispell/hash.cpp create mode 100644 tdespell2/plugins/ispell/ispell.h create mode 100644 tdespell2/plugins/ispell/ispell_checker.cpp create mode 100644 tdespell2/plugins/ispell/ispell_checker.h create mode 100644 tdespell2/plugins/ispell/ispell_def.h create mode 100644 tdespell2/plugins/ispell/lookup.cpp create mode 100644 tdespell2/plugins/ispell/makedent.cpp create mode 100644 tdespell2/plugins/ispell/msgs.h create mode 100644 tdespell2/plugins/ispell/sp_spell.h create mode 100644 tdespell2/plugins/ispell/tdespell_ispell.desktop create mode 100644 tdespell2/plugins/ispell/tdespell_ispellclient.cpp create mode 100644 tdespell2/plugins/ispell/tdespell_ispellclient.h create mode 100644 tdespell2/plugins/ispell/tdespell_ispelldict.cpp create mode 100644 tdespell2/plugins/ispell/tdespell_ispelldict.h create mode 100644 tdespell2/plugins/ispell/tgood.cpp create mode 100644 tdespell2/settings.cpp create mode 100644 tdespell2/settings.h create mode 100644 tdespell2/tdespellclient.desktop create mode 100644 tdespell2/tests/Makefile.am create mode 100644 tdespell2/tests/backgroundtest.cpp create mode 100644 tdespell2/tests/backgroundtest.h create mode 100644 tdespell2/tests/test.cpp create mode 100644 tdespell2/tests/test_config.cpp create mode 100644 tdespell2/tests/test_configdialog.cpp create mode 100644 tdespell2/tests/test_dialog.cpp create mode 100644 tdespell2/tests/test_dialog.h create mode 100644 tdespell2/tests/test_filter.cpp create mode 100644 tdespell2/tests/test_highlighter.cpp create mode 100644 tdespell2/threadevents.h create mode 100644 tdespell2/ui/CMakeLists.txt create mode 100644 tdespell2/ui/Makefile.am create mode 100644 tdespell2/ui/configdialog.cpp create mode 100644 tdespell2/ui/configdialog.h create mode 100644 tdespell2/ui/configui.ui create mode 100644 tdespell2/ui/configwidget.cpp create mode 100644 tdespell2/ui/configwidget.h create mode 100644 tdespell2/ui/dialog.cpp create mode 100644 tdespell2/ui/dialog.h create mode 100644 tdespell2/ui/highlighter.cpp create mode 100644 tdespell2/ui/highlighter.h create mode 100644 tdespell2/ui/tdespell2ui.ui delete mode 100644 tdeui/README.kspell create mode 100644 tdeui/README.tdespell delete mode 100644 tdeui/TODO.kspell create mode 100644 tdeui/TODO.tdespell delete mode 100644 tdeui/kspell.cpp delete mode 100644 tdeui/kspell.h delete mode 100644 tdeui/kspelldlg.cpp delete mode 100644 tdeui/kspelldlg.h delete mode 100644 tdeui/kspellui.ui create mode 100644 tdeui/tdespell.cpp create mode 100644 tdeui/tdespell.h create mode 100644 tdeui/tdespelldlg.cpp create mode 100644 tdeui/tdespelldlg.h create mode 100644 tdeui/tdespellui.ui delete mode 100644 tdeui/tests/kspelltest.cpp create mode 100644 tdeui/tests/tdespelltest.cpp create mode 100644 tdeunittest/CMakeLists.txt create mode 100644 tdeunittest/Makefile.am create mode 100644 tdeunittest/modrunner.cpp create mode 100644 tdeunittest/module.h create mode 100644 tdeunittest/runner.cpp create mode 100644 tdeunittest/runner.h create mode 100644 tdeunittest/samplemodule.cpp create mode 100644 tdeunittest/samplemodule.h create mode 100644 tdeunittest/tester.cpp create mode 100644 tdeunittest/tester.h create mode 100644 tdeutils/CMakeLists.txt create mode 100644 tdeutils/Mainpage.dox create mode 100644 tdeutils/Makefile.am create mode 100644 tdeutils/TODO create mode 100644 tdeutils/groups.dox create mode 100644 tdeutils/kcmultidialog.cpp create mode 100644 tdeutils/kcmultidialog.h create mode 100644 tdeutils/kdeglobals.kcfg create mode 100644 tdeutils/kdeglobals.kcfgc create mode 100644 tdeutils/kfind.cpp create mode 100644 tdeutils/kfind.h create mode 100644 tdeutils/kfinddialog.cpp create mode 100644 tdeutils/kfinddialog.h create mode 100644 tdeutils/kplugininfo.cpp create mode 100644 tdeutils/kplugininfo.desktop create mode 100644 tdeutils/kplugininfo.h create mode 100644 tdeutils/kpluginselector.cpp create mode 100644 tdeutils/kpluginselector.h create mode 100644 tdeutils/kpluginselector_p.h create mode 100644 tdeutils/kreplace.cpp create mode 100644 tdeutils/kreplace.h create mode 100644 tdeutils/kreplacedialog.cpp create mode 100644 tdeutils/kreplacedialog.h create mode 100644 tdeutils/ksettings/CMakeLists.txt create mode 100644 tdeutils/ksettings/Makefile.am create mode 100644 tdeutils/ksettings/README.dox create mode 100644 tdeutils/ksettings/TODO create mode 100644 tdeutils/ksettings/componentsdialog.cpp create mode 100644 tdeutils/ksettings/componentsdialog.h create mode 100644 tdeutils/ksettings/dialog.cpp create mode 100644 tdeutils/ksettings/dialog.h create mode 100644 tdeutils/ksettings/dispatcher.cpp create mode 100644 tdeutils/ksettings/dispatcher.h create mode 100644 tdeutils/ksettings/pluginpage.cpp create mode 100644 tdeutils/ksettings/pluginpage.h create mode 100644 tdeutils/tdecmodulecontainer.cpp create mode 100644 tdeutils/tdecmodulecontainer.h create mode 100644 tdeutils/tdecmoduleinfo.cpp create mode 100644 tdeutils/tdecmoduleinfo.h create mode 100644 tdeutils/tdecmoduleloader.cpp create mode 100644 tdeutils/tdecmoduleloader.h create mode 100644 tdeutils/tdecmoduleproxy.cpp create mode 100644 tdeutils/tdecmoduleproxy.h create mode 100644 tdeutils/tdecmoduleproxyIface.h create mode 100644 tdeutils/tdecmoduleproxyIfaceImpl.cpp create mode 100644 tdeutils/tdecmoduleproxyIfaceImpl.h create mode 100644 tdeutils/tdemultitabbar.cpp create mode 100644 tdeutils/tdemultitabbar.h create mode 100644 tdeutils/tdemultitabbar_p.h create mode 100644 tdeutils/tests/Makefile.am create mode 100644 tdeutils/tests/kfindtest.cpp create mode 100644 tdeutils/tests/kfindtest.h create mode 100644 tdeutils/tests/kreplacetest.cpp create mode 100644 tdeutils/tests/kreplacetest.h create mode 100644 tdewallet/CMakeLists.txt create mode 100644 tdewallet/Makefile.am create mode 100644 tdewallet/README create mode 100644 tdewallet/backend/CMakeLists.txt create mode 100644 tdewallet/backend/Makefile.am create mode 100644 tdewallet/backend/blockcipher.cc create mode 100644 tdewallet/backend/blockcipher.h create mode 100644 tdewallet/backend/blowfish.cc create mode 100644 tdewallet/backend/blowfish.h create mode 100644 tdewallet/backend/blowfishtables.h create mode 100644 tdewallet/backend/cbc.cc create mode 100644 tdewallet/backend/cbc.h create mode 100644 tdewallet/backend/sha1.cc create mode 100644 tdewallet/backend/sha1.h create mode 100644 tdewallet/backend/tdewalletbackend.cc create mode 100644 tdewallet/backend/tdewalletbackend.h create mode 100644 tdewallet/backend/tdewalletentry.cc create mode 100644 tdewallet/backend/tdewalletentry.h create mode 100644 tdewallet/backend/tests/Makefile.am create mode 100644 tdewallet/backend/tests/backendtest.cpp create mode 100644 tdewallet/backend/tests/testbf.cpp create mode 100644 tdewallet/backend/tests/testsha.cpp create mode 100644 tdewallet/client/CMakeLists.txt create mode 100644 tdewallet/client/Makefile.am create mode 100644 tdewallet/client/tdewallet.cc create mode 100644 tdewallet/client/tdewallet.h create mode 100644 tdewallet/client/tdewallettypes.h create mode 100644 tdewallet/tests/Makefile.am create mode 100644 tdewallet/tests/README create mode 100644 tdewallet/tests/tdewalletasync.cpp create mode 100644 tdewallet/tests/tdewalletboth.cpp create mode 100644 tdewallet/tests/tdewalletsync.cpp create mode 100644 tdewallet/tests/tdewallettest.cpp create mode 100644 tdewallet/tests/tdewallettest.h delete mode 100644 win/pro_files/interfaces/ktexteditor/ktexteditor.pro create mode 100644 win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro delete mode 100644 win/pro_files/kmdi/kmdi.pro delete mode 100644 win/pro_files/kmdi/test/test.pro delete mode 100644 win/pro_files/kparts/kparts.pro delete mode 100644 win/pro_files/kresources/kresources.pro delete mode 100644 win/pro_files/kutils/kutils.pro create mode 100644 win/pro_files/tdemdi/tdemdi.pro create mode 100644 win/pro_files/tdemdi/test/test.pro create mode 100644 win/pro_files/tdeparts/tdeparts.pro create mode 100644 win/pro_files/tderesources/tderesources.pro create mode 100644 win/pro_files/tdeutils/tdeutils.pro (limited to 'khtml/java') diff --git a/CMakeLists.txt b/CMakeLists.txt index f20b54c41..7a1f952dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -932,11 +932,11 @@ add_subdirectory( tdecore ) if( WITH_ELFICON ) add_subdirectory( tdelfeditor ) endif( WITH_ELFICON ) -add_subdirectory( kunittest ) +add_subdirectory( tdeunittest ) add_subdirectory( tdeui ) add_subdirectory( tdesu ) add_subdirectory( kjs ) -add_subdirectory( kwallet ) +add_subdirectory( tdewallet ) add_subdirectory( kio ) add_subdirectory( kded ) @@ -945,34 +945,34 @@ add_subdirectory( kded ) add_subdirectory( kdoctools ) add_subdirectory( doc ) -add_subdirectory( kparts ) -add_subdirectory( kutils ) -add_subdirectory( kspell2 ) -add_subdirectory( kmdi ) +add_subdirectory( tdeparts ) +add_subdirectory( tdeutils ) +add_subdirectory( tdespell2 ) +add_subdirectory( tdemdi ) add_subdirectory( kinit ) add_subdirectory( tdeprint ) add_subdirectory( kab ) -add_subdirectory( kresources ) +add_subdirectory( tderesources ) add_subdirectory( kabc ) add_subdirectory( arts ) add_subdirectory( interfaces ) add_subdirectory( kate ) -add_subdirectory( kcert ) +add_subdirectory( tdecert ) if( XRANDR_FOUND ) - add_subdirectory( krandr ) + add_subdirectory( tderandr ) endif( XRANDR_FOUND ) -add_subdirectory( khtml ) +add_subdirectory( tdehtml ) add_subdirectory( kcmshell ) add_subdirectory( kconf_update ) add_subdirectory( kdewidgets ) add_subdirectory( kimgio ) add_subdirectory( kioslave ) add_subdirectory( kstyles ) -add_subdirectory( libkmid ) -add_subdirectory( libkscreensaver ) +add_subdirectory( libtdemid ) +add_subdirectory( libtdescreensaver ) add_subdirectory( networkstatus ) add_subdirectory( knewstuff ) -add_subdirectory( krsync ) +add_subdirectory( tdersync ) add_subdirectory( licenses ) add_subdirectory( dnssd ) add_subdirectory( pics ) diff --git a/KDE2PORTING.html b/KDE2PORTING.html index f23a2443b..c373e83f5 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -28,7 +28,7 @@ or this page online.

  • KHelpMenu
  • KToolBar
  • Starting other programs
    • -
  • khtmlw
    • +
  • tdehtmlw
  • KIntegerLine, KIntLineEdit
  • KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h
  • TDEConfigBase, TDEConfig, KSimpleConfig
    • @@ -347,9 +347,9 @@ This makes KRun the recommended way to run another program in KDE 2.

    Return to the Table of Contents

    -

    khtmlw

    +

    tdehtmlw

    -khtmlw has been replaced with khtml.
    +tdehtmlw has been replaced with tdehtml.
    • KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar managing for free. @@ -361,7 +361,7 @@ khtmlw has been replaced with khtml.
      w->openURL(myURL); -
    • khtml uses QString's instead of char *'s now. This means, that most +
    • tdehtml uses QString's instead of char *'s now. This means, that most of the api has changed. In all functions:

            const char * -> QString
@@ -406,7 +406,7 @@ khtmlw has been replaced with khtml.
    @@ -271,7 +271,7 @@ mainViewGeometry() instead.

    KHelpMenu

    -helpMenu() has been moved to KMainWindow from KApplication (kapp).

    +helpMenu() has been moved to KMainWindow from TDEApplication (kapp).

    Both the "About KDE" and the "About <Application>" dialog boxes are now modeless. "About KDE" is a completely new widget.

    @@ -281,7 +281,7 @@ If you used in the toplevel window (that is derived from KMainWindow) you must now change this to "helpMenu( TQString )". The TQString defaults to TQString::null so it is sufficient to write helpMenu().

    -The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication +The old aboutKDE(), aboutApp() and appHelpActivated() of TDEApplication have all been removed. If you need direct access to these or need access to a help menu in a class that is not derived from KMainWindow then allocate an instance of the new class KHelpMenu. @@ -792,7 +792,7 @@ Matthias Hoelzer-Kluepfel <hoelzer@kde.org It is no longer possible to make calls to an application registered as "-" with "" only. The full name can be obtained by using -either KApplication::startServiceBy...() or DCOPClient::findObject() or +either TDEApplication::startServiceBy...() or DCOPClient::findObject() or their command line equivalents "dcopstart" and "dcopfind".

    KLibFactory

    diff --git a/TODO b/TODO index 9220d264b..dff44b8f0 100644 --- a/TODO +++ b/TODO @@ -11,8 +11,8 @@ that we would like to make for the next binary incompatible release. help prevent mistakes where developers forget to delete the pointer. Maybe make use of Qt4 helper macros? -- Move all utility functions away from KApplication. TBD: Make KApplication - a very thin wrapper around QApplication. Ideally, KApplication should go +- Move all utility functions away from TDEApplication. TBD: Make TDEApplication + a very thin wrapper around QApplication. Ideally, TDEApplication should go away completely. The kapp pointer references everywhere must die. Find a way to make that possible @@ -95,7 +95,7 @@ that we would like to make for the next binary incompatible release. Keep source compatibility. - Sort out reference counting of applications and KMainWindows: Add a setRefCountEnabled() - function to KApplication; deref()ing the last reference should only quit the application + function to TDEApplication; deref()ing the last reference should only quit the application if reference counts are enabled, and the reference count should be disabled by default so apps that don't use a KMainWindow mostly continue to work. Make the KMainWindow constructor call setRefCountEnabled(true), and make each KMainWindow hold its own diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc index dfc1265cc..10778d6bf 100644 --- a/arts/kde/kconverttest.cc +++ b/arts/kde/kconverttest.cc @@ -59,7 +59,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc index 91d1d9db4..b27978f47 100644 --- a/arts/kde/kiotest.cc +++ b/arts/kde/kiotest.cc @@ -24,7 +24,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); KIOInputStream stream; diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index 16465cb8d..f35f2a3e2 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -92,7 +92,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); #ifndef USE_FILEINPUTSTREAM diff --git a/arts/knotify/knotifytest.cpp b/arts/knotify/knotifytest.cpp index 9ca10cb9d..232b1b8c7 100644 --- a/arts/knotify/knotifytest.cpp +++ b/arts/knotify/knotifytest.cpp @@ -5,7 +5,7 @@ int main(int argc, char **argv) { - KApplication app(argc, argv, "knotifytest"); + TDEApplication app(argc, argv, "knotifytest"); // while (1) { diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc index 1df46ec05..410419302 100644 --- a/arts/message/artsmessage.cc +++ b/arts/message/artsmessage.cc @@ -60,7 +60,7 @@ int main(int argc, char **argv) { KGlobal::locale()->setMainCatalogue("tdelibs"); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString msg; diff --git a/dcop/HOWTO b/dcop/HOWTO index 071136a4f..5927f3716 100644 --- a/dcop/HOWTO +++ b/dcop/HOWTO @@ -74,18 +74,18 @@ compiler later. Establishing the Connection: ---------------------------- -KApplication has gained a method called "KApplication::dcopClient()" +TDEApplication has gained a method called "TDEApplication::dcopClient()" which returns a pointer to a DCOPClient instance. The first time this method is called, the client class will be created. DCOPClients have unique identifiers attached to them which are based on what -KApplication::name() returns. In fact, if there is only a single +TDEApplication::name() returns. In fact, if there is only a single instance of the program running, the appId will be equal to -KApplication::name(). +TDEApplication::name(). To actually enable DCOP communication to begin, you must use DCOPClient::attach(). This will attempt to attach to the DCOP server. If no server is found or there is any other type of error, attach() -will return false. KApplication will catch a dcop signal and display an +will return false. TDEApplication will catch a dcop signal and display an appropriate error message box in that case. After connecting with the server via DCOPClient::attach(), you need to @@ -100,7 +100,7 @@ case: */ appId = client->registerAs(kApp->name()); -If you never retrieve the DCOPClient pointer from KApplication, the +If you never retrieve the DCOPClient pointer from TDEApplication, the object will not be created and thus there will be no memory overhead. You may also detach from the server by calling DCOPClient::detach(). @@ -495,9 +495,9 @@ Code: int main(int argc, char **argv) { - KApplication *app; + TDEApplication *app; - app = new KApplication(argc, argv, "testit"); + app = new TDEApplication(argc, argv, "testit"); return app->exec(); } @@ -515,7 +515,7 @@ VmStk: 20 kB VmExe: 4 kB VmLib: 6588 kB -If I create the KApplication's DCOPClient, and call attach() and +If I create the TDEApplication's DCOPClient, and call attach() and registerAs(), it changes to this: VmSize: 8080 kB @@ -531,8 +531,8 @@ resident, but no more data or stack. So this will be shared between all processes, right? 100k to enable DCOP in all apps doesn't seem bad at all. :) -OK now for some timings. Just creating a KApplication and then exiting -(i.e. removing the call to KApplication::exec) takes this much time: +OK now for some timings. Just creating a TDEApplication and then exiting +(i.e. removing the call to TDEApplication::exec) takes this much time: 0.28user 0.02system 0:00.32elapsed 92%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (1084major+62minor)pagefaults 0swaps diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox index a92fb4e50..423571280 100644 --- a/dcop/Mainpage.dox +++ b/dcop/Mainpage.dox @@ -38,18 +38,18 @@ The manual method is covered first, followed by the automatic IDL method. \section establish Establishing the Connection: -KApplication has gained a method called \p KApplication::dcopClient() +TDEApplication has gained a method called \p TDEApplication::dcopClient() which returns a pointer to a DCOPClient instance. The first time this method is called, the client class will be created. DCOPClients have unique identifiers attached to them which are based on what -KApplication::name() returns. In fact, if there is only a single +TDEApplication::name() returns. In fact, if there is only a single instance of the program running, the appId will be equal to -KApplication::name(). +TDEApplication::name(). To actually enable DCOP communication to begin, you must use \p DCOPClient::attach(). This will attempt to attach to the DCOP server. If no server is found or there is any other type of error, -DCOPClient::attach() will return false. KApplication will catch a dcop +DCOPClient::attach() will return false. TDEApplication will catch a dcop signal and display an appropriate error message box in that case. After connecting with the server via DCOPClient::attach(), you need to @@ -62,7 +62,7 @@ case: appId = client->registerAs(kapp->name()); \endcode -If you never retrieve the DCOPClient pointer from KApplication, the +If you never retrieve the DCOPClient pointer from TDEApplication, the object will not be created and thus there will be no memory overhead. You may also detach from the server by calling DCOPClient::detach(). diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp index 66bd5088a..1ab43f730 100644 --- a/dcop/dcop_deadlock_test.cpp +++ b/dcop/dcop_deadlock_test.cpp @@ -71,8 +71,8 @@ tqWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 10 int main(int argc, char **argv) { - TQCString myName = KApplication::dcopClient()->registerAs("testdcop", false); - KApplication app(argc, argv, "testdcop"); + TQCString myName = TDEApplication::dcopClient()->registerAs("testdcop", false); + TDEApplication app(argc, argv, "testdcop"); tqWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data()); diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h index 7595cfc2b..8421c7b80 100644 --- a/dcop/dcopclient.h +++ b/dcop/dcopclient.h @@ -41,7 +41,7 @@ typedef TQValueList QCStringList; * for KDE applications. * * This class provides IPC and RPC for KDE applications. Usually you - * will not have to instantiate one yourself because KApplication + * will not have to instantiate one yourself because TDEApplication * contains a method to return a pointer to a DCOPClient object which * can be used for your whole application. * @@ -62,7 +62,7 @@ typedef TQValueList QCStringList; * client->send("someApp", "someObject", "someFunction(TQString)", data); * \endcode * - * @see KApplication::dcopClient() + * @see TDEApplication::dcopClient() * @author Preston Brown , Matthias Ettrich */ class DCOP_EXPORT DCOPClient : public TQObject @@ -675,7 +675,7 @@ class DCOP_EXPORT DCOPClient : public TQObject * Returns the application's main dcop client. The main client can * be used by objects that do not have any specific access to a dcop * client. In KDE applications, the main client usually is the same - * as KApplication::dcopClient(). + * as TDEApplication::dcopClient(). * @return the application's main dcop client */ static DCOPClient* mainClient(); @@ -684,7 +684,7 @@ class DCOP_EXPORT DCOPClient : public TQObject * Sets the application's main dcop client. The main client can * be used by objects that do not have any specific access to a dcop * client. In KDE applications, the main client usually is the same - * as KApplication::dcopClient(). + * as TDEApplication::dcopClient(). * @param mainClient the new main dcop client */ static void setMainClient( DCOPClient* mainClient); @@ -772,7 +772,7 @@ signals: * synchronous call. In that case, it will enter a local event * loop to keep the GUI updated until finally an answer arrives. * - * In KDE, the KApplication object connects to this signal to be + * In KDE, the TDEApplication object connects to this signal to be * able to block any user input (i.e. mouse and key events) while * we are waiting for an answer. If we did not do this, the * application might end up in an illegal state, as a keyboard diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp index d0f73aa4e..eb953f1d7 100644 --- a/dcop/tests/driver.cpp +++ b/dcop/tests/driver.cpp @@ -54,7 +54,7 @@ int main(int argc, char** argv) const char* appname = strdup( argv[ 1 ] ); argv[ 1 ] = 0; // sue me TDECmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME - KApplication app; + TDEApplication app; app.dcopClient()->attach( ); app.dcopClient()->registerAs( "TestAppDriver" ); Driver * object = new Driver( appname ); diff --git a/dcop/tests/test.cpp b/dcop/tests/test.cpp index cd62a59c0..2be39f601 100644 --- a/dcop/tests/test.cpp +++ b/dcop/tests/test.cpp @@ -32,7 +32,7 @@ int main(int argc, char** argv) return 0; } TDECmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME - KApplication app; + TDEApplication app; if(!app.dcopClient()->attach( )) return 1; diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp index 8a24f11b6..2afadb769 100644 --- a/dnssd/domainbrowser.cpp +++ b/dnssd/domainbrowser.cpp @@ -86,7 +86,7 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent) d->m_domains+="local."; d->m_browseLAN=true; } - connect(KApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this, + connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this, TQT_SLOT(domainListChanged(int,int))); } diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h index 21ad69d89..4780b169d 100644 --- a/interfaces/kspeech/kspeech.h +++ b/interfaces/kspeech/kspeech.h @@ -219,7 +219,7 @@ client->attach(); if (!client->isApplicationRegistered("kttsd")) { TQString error; - if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) + if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) cout << "Starting KTTSD failed with message " << error << endl; } @endverbatim diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc index 0b32eec8e..403bde0b5 100644 --- a/interfaces/terminal/test/main.cc +++ b/interfaces/terminal/test/main.cc @@ -35,7 +35,7 @@ int main( int argc, char** argv ) { KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" ); TDECmdLineArgs::init( argc, argv, about ); - KApplication a; + TDEApplication a; Win* win = new Win(); win->show(); return a.exec(); diff --git a/kabc/address.cpp b/kabc/address.cpp index 0787bcc4e..9ecf8eb2d 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp @@ -37,13 +37,13 @@ static KStaticDeleter< TQMap > isoMapDeleter; Address::Address() : mEmpty( true ), mType( 0 ) { - mId = KApplication::randomString( 10 ); + mId = TDEApplication::randomString( 10 ); } Address::Address( int type ) : mEmpty( true ), mType( type ) { - mId = KApplication::randomString( 10 ); + mId = TDEApplication::randomString( 10 ); } bool Address::operator==( const Address &a ) const diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index 20d7305b8..417d62b8e 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -438,7 +438,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kabc/key.cpp b/kabc/key.cpp index 0d917595d..fadc89dce 100644 --- a/kabc/key.cpp +++ b/kabc/key.cpp @@ -28,7 +28,7 @@ using namespace KABC; Key::Key( const TQString &text, int type ) : mTextData( text ), mIsBinary( false ), mType( type ) { - mId = KApplication::randomString(8); + mId = TDEApplication::randomString(8); } Key::~Key() diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index 31a99f9ea..0a58eeec2 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp @@ -45,7 +45,7 @@ PhoneNumber::~PhoneNumber() void PhoneNumber::init() { - mId = KApplication::randomString( 8 ); + mId = TDEApplication::randomString( 8 ); } void PhoneNumber::validateNumber( const TQString &number ) diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp index db956bc14..64e8f382a 100644 --- a/kabc/scripts/addressee.src.cpp +++ b/kabc/scripts/addressee.src.cpp @@ -105,7 +105,7 @@ void Addressee::detach() mData->empty = true; mData->changed = false; mData->resource = 0; - mData->uid = KApplication::randomString( 10 ); + mData->uid = TDEApplication::randomString( 10 ); return; } else if ( mData.count() == 1 ) return; diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp index 110972b31..c5a1a602f 100644 --- a/kabc/tests/bigread.cpp +++ b/kabc/tests/bigread.cpp @@ -20,7 +20,7 @@ int main(int argc,char **argv) KAboutData aboutData("bigread","BigReadKabc","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); - KApplication app( false, false ); + TDEApplication app( false, false ); AddressBook ab; diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp index 6a5296f91..5d3d2bd6f 100644 --- a/kabc/tests/bigwrite.cpp +++ b/kabc/tests/bigwrite.cpp @@ -17,7 +17,7 @@ int main(int argc,char **argv) KAboutData aboutData("bigwrite","BigWriteKabc","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); - KApplication app( false, false ); + TDEApplication app( false, false ); AddressBook ab; ResourceFile r( "my.kabc", "vcard" ); diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp index d0a0501b3..b1116b2ea 100644 --- a/kabc/tests/kabcargl.cpp +++ b/kabc/tests/kabcargl.cpp @@ -40,7 +40,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); - KApplication app; + TDEApplication app; TQString filename = StdAddressBook::fileName(); diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp index cc91d29b1..39536efbf 100644 --- a/kabc/tests/testaddressee.cpp +++ b/kabc/tests/testaddressee.cpp @@ -26,7 +26,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); kdDebug() << "Creating a" << endl; diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp index 99cd1f3ab..08d73b8db 100644 --- a/kabc/tests/testaddresseelist.cpp +++ b/kabc/tests/testaddresseelist.cpp @@ -23,7 +23,7 @@ int main(int /*argc*/,char /* **argv*/) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); */ kdDebug() << "Creating addressees" << endl; diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp index 9f70a0eec..c9369d756 100644 --- a/kabc/tests/testaddressfmt.cpp +++ b/kabc/tests/testaddressfmt.cpp @@ -23,7 +23,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; Address a; a.setStreet("Lummerlandstr. 1"); diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp index f74af6089..f46604dc5 100644 --- a/kabc/tests/testaddresslineedit.cpp +++ b/kabc/tests/testaddresslineedit.cpp @@ -14,7 +14,7 @@ int main( int argc,char **argv ) I18N_NOOP( "Test Address LineEdit" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; AddressLineEdit *lineEdit = new AddressLineEdit( 0 ); diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp index 1c5454630..2abedb9be 100644 --- a/kabc/tests/testdb.cpp +++ b/kabc/tests/testdb.cpp @@ -15,8 +15,8 @@ int main(int argc,char **argv) KAboutData aboutData("testdb","TestKabcDB","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); -// KApplication app( false, false ); - KApplication app; +// TDEApplication app( false, false ); + TDEApplication app; AddressBook ab; diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp index 4323db30d..3f4b67e0a 100644 --- a/kabc/tests/testdistlist.cpp +++ b/kabc/tests/testdistlist.cpp @@ -26,7 +26,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("list")) { diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp index 04a589eef..ee767e523 100644 --- a/kabc/tests/testkabc.cpp +++ b/kabc/tests/testkabc.cpp @@ -23,7 +23,7 @@ int main(int argc,char **argv) KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication app( false, false ); + TDEApplication app( false, false ); AddressBook *ab = StdAddressBook::self(); #define READ diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp index 322bb1ca9..b78fb4a5f 100644 --- a/kabc/tests/testkabcdlg.cpp +++ b/kabc/tests/testkabcdlg.cpp @@ -22,7 +22,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("multiple")) { diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp index 456bb64e3..bb52afd1a 100644 --- a/kabc/tests/testldapclient.cpp +++ b/kabc/tests/testldapclient.cpp @@ -29,9 +29,9 @@ int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0); - KApplication app; + TDEApplication app; TestLDAPClient test; test.setup(); diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp index 5c52e98ee..31d053208 100644 --- a/kabc/tests/testlock.cpp +++ b/kabc/tests/testlock.cpp @@ -169,7 +169,7 @@ int main(int argc,char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TQString identifier; diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp index 082ca480d..8498fc6d0 100644 --- a/kabc/vcard/testwrite.cpp +++ b/kabc/vcard/testwrite.cpp @@ -11,7 +11,7 @@ int main(int argc,char **argv) KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); - KApplication app; + TDEApplication app; kdDebug() << "Test Write VCard" << endl; diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp index d3eada6c6..3fcbb851e 100644 --- a/kabc/vcardparser/testread.cpp +++ b/kabc/vcardparser/testread.cpp @@ -42,7 +42,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData( "testread", "vCard test reader", "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); @@ -50,7 +50,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp index d9d92e5aa..11c3c7852 100644 --- a/kabc/vcardparser/testwrite.cpp +++ b/kabc/vcardparser/testwrite.cpp @@ -39,7 +39,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app( false, false ); + TDEApplication app( false, false ); KABC::Addressee addressee; diff --git a/kate/ChangeLog b/kate/ChangeLog index 3e54e19db..9797ec671 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -265,7 +265,7 @@ * QPopupMenu for filelist 2001-03-20 Christoph Cullmann - * kate is now a normal KApplication + * kate is now a normal TDEApplication 2001-03-18 Christoph Cullmann * big location changes of source files diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index a5e295888..1978c867c 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem //BEGIN KateSchemaManager TQString KateSchemaManager::normalSchema () { - return KApplication::kApplication()->aboutData()->appName () + TQString (" - Normal"); + return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal"); } TQString KateSchemaManager::printingSchema () { - return KApplication::kApplication()->aboutData()->appName () + TQString (" - Printing"); + return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing"); } KateSchemaManager::KateSchemaManager () @@ -865,7 +865,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc hbHl = new TQHBox( this ); layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); - lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl ); + lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl ); defaultSchemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( defaultSchemaCombo ); diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index d93f81a86..7f916c6e9 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -2213,8 +2213,8 @@ void KateViewInternal::updateCursor( const KateTextCursor& newCursor, bool force if (m_cursorTimer.isActive ()) { - if ( KApplication::cursorFlashTime() > 0 ) - m_cursorTimer.start( KApplication::cursorFlashTime() / 2 ); + if ( TDEApplication::cursorFlashTime() > 0 ) + m_cursorTimer.start( TDEApplication::cursorFlashTime() / 2 ); m_view->renderer()->setDrawCaret(true); } @@ -3154,8 +3154,8 @@ void KateViewInternal::textHintTimeout () void KateViewInternal::focusInEvent (TQFocusEvent *) { - if (KApplication::cursorFlashTime() > 0) - m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 ); + if (TDEApplication::cursorFlashTime() > 0) + m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 ); if (m_textHintEnabled) m_textHintTimer.start( m_textHintTimeout ); @@ -3480,8 +3480,8 @@ void KateViewInternal::imEndEvent( TQIMEvent *e ) if ( e->text().length() > 0 ) { m_doc->insertText( cursor.line(), cursor.col(), e->text() ); - if ( !m_cursorTimer.isActive() && KApplication::cursorFlashTime() > 0 ) - m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 ); + if ( !m_cursorTimer.isActive() && TDEApplication::cursorFlashTime() > 0 ) + m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 ); updateView( true ); updateCursor( cursor, true ); diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 4292c3ad4..da3d96da9 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -461,7 +461,7 @@ int main(int argc, char *argv[]) } } - KApplication a; + TDEApplication a; a.disableAutoDcopRegistration(); a.setStyle("windows"); KSimpleConfig cfg( "testkateregressionrc" ); diff --git a/kcmshell/main.h b/kcmshell/main.h index 6a7c34ee7..f43cf98cb 100644 --- a/kcmshell/main.h +++ b/kcmshell/main.h @@ -28,9 +28,9 @@ #include /** - * The KApplication instance for kcmshell. + * The TDEApplication instance for kcmshell. */ -class KCMShell : public KApplication +class KCMShell : public TDEApplication { Q_OBJECT diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index ec5139d86..483578c72 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -736,11 +736,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) setenv("TDEROOTHOME", "-", 1); } - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); #ifdef KBUILDSYCOCA_GUI - KApplication k; + TDEApplication k; #else - KApplication k(false, false); + TDEApplication k(false, false); #endif k.disableSessionManagement(); diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp index 81887a695..7148a1e6b 100644 --- a/kded/kde-menu.cpp +++ b/kded/kde-menu.cpp @@ -121,8 +121,8 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &d); TDECmdLineArgs::addCmdLineOptions(options); -// KApplication k(false, false); - KApplication k(false); +// TDEApplication k(false, false); + TDEApplication k(false); k.disableSessionManagement(); // this program is in tdelibs so it uses tdelibs as catalog @@ -147,7 +147,7 @@ int main(int argc, char **argv) args.append("--incremental"); args.append("--checkstamps"); TQString command = "kbuildsycoca"; - TQCString _launcher = KApplication::launcher(); + TQCString _launcher = TDEApplication::launcher(); if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { tqWarning("Can't talk to klauncher!"); diff --git a/kded/kded.cpp b/kded/kded.cpp index 40e1983f7..538cfff09 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -73,19 +73,19 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0) TQByteArray data; TQDataStream dataStream( data, IO_WriteOnly ); dataStream << TQString("kbuildsycoca") << args; - TQCString _launcher = KApplication::launcher(); + TQCString _launcher = TDEApplication::launcher(); kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot); } else { - KApplication::tdeinitExecWait( "kbuildsycoca", args ); + TDEApplication::tdeinitExecWait( "kbuildsycoca", args ); } } static void runKonfUpdate() { - KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); + TDEApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); } static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName) @@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new TQStringList args; args.append(TQFile::decodeName(oldName)); args.append(TQFile::decodeName(newName)); - KApplication::tdeinitExecWait( "kdontchangethehostname", args ); + TDEApplication::tdeinitExecWait( "kdontchangethehostname", args ); } Kded::Kded(bool checkUpdates, bool new_startup) @@ -876,7 +876,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) "$Id$", I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed")); - KApplication::installSigpipeHandler(); + TDEApplication::installSigpipeHandler(); TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 60c7ba8f5..0c1dd1b18 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -358,7 +358,7 @@ void KHostName::changeSessionManager() delete client; return; } - TQCString launcher = KApplication::launcher(); + TQCString launcher = TDEApplication::launcher(); client->send(launcher, launcher, "setLaunchEnv(TQCString,TQCString)", params); delete client; } diff --git a/kded/kmimelist.cpp b/kded/kmimelist.cpp index fff626cac..c82f6d9f7 100644 --- a/kded/kmimelist.cpp +++ b/kded/kmimelist.cpp @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { - KApplication k(argc,argv,"blurb",false); + TDEApplication k(argc,argv,"blurb",false); KMimeType::List mtl = KMimeType::allMimeTypes( ); assert( mtl.count() ); diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index e2ee3ba57..457908943 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -155,7 +155,7 @@ void HTMLDocumentImpl::setCookie( const DOMString & value ) "addCookies(TQString,TQCString,long int)", params)) { // Maybe it wasn't running (e.g. we're opening local html files) - KApplication::startServiceByDesktopName( "kcookiejar"); + TDEApplication::startServiceByDesktopName( "kcookiejar"); if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar", "addCookies(TQString,TQCString,long int)", params)) kdWarning(6010) << "Can't communicate with cookiejar!" << endl; diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index adf28d563..b7ae2a8f4 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -83,7 +83,7 @@ HTMLFormElementImpl::HTMLFormElementImpl(DocumentImpl *doc, bool implicit) m_doingsubmit = false; m_inreset = false; m_enctype = "application/x-www-form-urlencoded"; - m_boundary = "----------" + KApplication::randomString( 42 + 13 ); + m_boundary = "----------" + TDEApplication::randomString( 42 + 13 ); m_acceptcharset = "UNKNOWN"; m_malformed = false; } diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/khtml/java/tests/testkjavaappletserver.cpp index cb85550e6..fb5ed8c0d 100644 --- a/khtml/java/tests/testkjavaappletserver.cpp +++ b/khtml/java/tests/testkjavaappletserver.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TQString path_to_tdelibs = "/build/wynnw/kde-src"; diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index a2843a53a..ffa1e0853 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() { void KHTMLPart::launchJSConfigDialog() { TQStringList args; args << "khtml_java_js"; - KApplication::tdeinitExec( "kcmshell", args ); + TDEApplication::tdeinitExec( "kcmshell", args ); } TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script) @@ -7299,7 +7299,7 @@ void KHTMLPart::launchWalletManager() { #ifndef KHTML_NO_WALLET if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) { - KApplication::startServiceByDesktopName("kwalletmanager_show"); + TDEApplication::startServiceByDesktopName("kwalletmanager_show"); } else { DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1"); r.send("show"); diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index c3c0ba23f..e65a41c11 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -450,7 +450,7 @@ public: * Java and Plugins support. This might change in the future if the security model * is becoming more sophisticated, so don't rely on this behaviour. * - * ( default false - everything is loaded unless forbidden by KApplication::authorizeURLAction). + * ( default false - everything is loaded unless forbidden by TDEApplication::authorizeURLAction). */ void setOnlyLocalReferences( bool enable ); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 2831550c3..14169e651 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -637,7 +637,7 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e) }/*end if*/ #endif - KApplication::sendPostedEvents(viewport(), TQEvent::Paint); + TDEApplication::sendPostedEvents(viewport(), TQEvent::Paint); } // this is to get rid of a compiler virtual overload mismatch warning. do not remove @@ -1730,7 +1730,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift ) d->scrollSuspendPreActivate = false; if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == TQt::ShiftButton - && !(KApplication::keyboardMouseState() & TQt::ShiftButton)) + && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) { if (d->scrollTimerId) { @@ -1746,7 +1746,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) { if (d->accessKeysPreActivate && _ke->key() != Key_Control) d->accessKeysPreActivate=false; - if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(KApplication::keyboardMouseState() & TQt::ControlButton)) + if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(TDEApplication::keyboardMouseState() & TQt::ControlButton)) { displayAccessKeys(); m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText); diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index bc3f00be4..2535b534e 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -509,7 +509,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT) { setResizing(true); - KApplication::setOverrideCursor(TQCursor(m_cursor)); + TDEApplication::setOverrideCursor(TQCursor(m_cursor)); m_vSplitPos = _x; m_hSplitPos = _y; m_oldpos = -1; @@ -519,7 +519,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) if(m_resizing && evt->id() == EventImpl::MOUSEUP_EVENT) { setResizing(false); - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); if(m_vSplit != -1 ) { diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp index e387920d6..f931e9ca5 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) if ( !berrorPic ) { //tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight); qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight, - KApplication::palette().inactive(), true, 1 ); + TDEApplication::palette().inactive(), true, 1 ); } TQPixmap const* pix = i ? &i->pixmap() : 0; if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) ) diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 860d54718..8db2c590a 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -511,7 +511,7 @@ int main(int argc, char *argv[]) setenv( "DISPLAY", ":47", 1 ); } - KApplication a; + TDEApplication a; a.disableAutoDcopRegistration(); a.setStyle( "windows" ); KSimpleConfig sc1( "cryptodefaults" ); diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp index 2cea9f5a4..88e95031e 100644 --- a/khtml/test_regression_fontoverload.cpp +++ b/khtml/test_regression_fontoverload.cpp @@ -354,9 +354,9 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool , } #include -void KApplication::dcopFailure( const TQString & ) +void TDEApplication::dcopFailure( const TQString & ) { - tqDebug( "KApplication::dcopFailure" ); + tqDebug( "TDEApplication::dcopFailure" ); } #include diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index a5ffcae26..257b656c2 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) "a basic web browser using the KHTML library", "1.0"); TDECmdLineArgs::addCmdLineOptions(options); - KApplication a; + TDEApplication a; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( ); if ( args->count() == 0 ) { TDECmdLineArgs::usage(); diff --git a/kinit/README b/kinit/README index 97ce088cc..644efbaf6 100644 --- a/kinit/README +++ b/kinit/README @@ -33,7 +33,7 @@ Starting an application linked against libqt, libtdecore and libtdeui in the conventional way takes approx. 150ms on a Pentium III - 500Mhz. Starting the same application via tdeinit takes less than 10ms. -(application without KApplication constructor, the KApplication +(application without TDEApplication constructor, the TDEApplication constructor requires an extra 100ms in both cases) Memory Usage @@ -43,16 +43,16 @@ An application linked against libqt, libtdecore and libtdeui started in the conventional way requires about 498Kb memory. (average of 10 instances) If the same application is started via tdeinit it requires about 142Kb. A difference of 356Kb (application -without KApplication constructor) +without TDEApplication constructor) -If we take the KApplication constructor into account, an application +If we take the TDEApplication constructor into account, an application started in the conventional way takes about 679Kb memory while the same application started via tdeinit requires about 380Kb. Here the difference is somewhat less, 299Kb. This seems to be caused by the fact that the dynamic linker does "lazy linking". We can force the linker to link everything at startup by specifying "LD_BIND_NOW=true". When tdeinit is started with this option on, tdeinit is back to its full efficiency, an -application with a KApplication constructor now uses 338Kb of memory. +application with a TDEApplication constructor now uses 338Kb of memory. A difference of 341Kb with the normal case. Adapting programs to use tdeinit. diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 11fed9c34..478331fd8 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -1764,7 +1764,7 @@ int main(int argc, char **argv, char **envp) // don't change envvars before tdeinit_initsetproctitle() unsetenv("LD_BIND_NOW"); unsetenv("DYLD_BIND_AT_LAUNCH"); - KApplication::loadedByKdeinit = true; + TDEApplication::loadedByKdeinit = true; d.maxname = strlen(argv[0]); d.launcher_pid = 0; diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 2d706e36b..15a0882fe 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -163,8 +163,8 @@ IdleSlave::age(time_t now) } KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) -// : KApplication( false, false ), // No Styles, No GUI - : KApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used +// : TDEApplication( false, false ), // No Styles, No GUI + : TDEApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used DCOPObject("klauncher"), tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ), dontBlockReading(false), newStartup( new_startup ) diff --git a/kinit/klauncher.h b/kinit/klauncher.h index 763d20e53..8058bb31e 100644 --- a/kinit/klauncher.h +++ b/kinit/klauncher.h @@ -105,7 +105,7 @@ struct serviceResult pid_t pid; }; -class KLauncher : public KApplication, public DCOPObject +class KLauncher : public TDEApplication, public DCOPObject { Q_OBJECT diff --git a/kinit/klauncher_main.cpp b/kinit/klauncher_main.cpp index b53b06be0..f22da9386 100644 --- a/kinit/klauncher_main.cpp +++ b/kinit/klauncher_main.cpp @@ -60,7 +60,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) return 1; } - TQCString cname = KApplication::launcher(); + TQCString cname = TDEApplication::launcher(); char *name = cname.data(); TDECmdLineArgs::init(argc, argv, name, "KLauncher", "A service launcher.", "v1.0"); @@ -79,7 +79,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) int maxTry = 3; while(true) { - TQCString dcopName = KApplication::dcopClient()->registerAs(name, false); + TQCString dcopName = TDEApplication::dcopClient()->registerAs(name, false); if (dcopName.isEmpty()) { kdWarning() << "[klauncher] DCOP communication problem!" << endl; diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp index f246e7086..3293c07be 100644 --- a/kinit/tests/klaunchertest.cpp +++ b/kinit/tests/klaunchertest.cpp @@ -28,9 +28,9 @@ int main(int argc, char *argv[]) { - KApplication::tdeinitExec("konsole"); + TDEApplication::tdeinitExec("konsole"); - KApplication k(argc, argv, "klaunchertest"); + TDEApplication k(argc, argv, "klaunchertest"); kapp->dcopClient()->registerAs( kapp->name()) ; @@ -38,13 +38,13 @@ int main(int argc, char *argv[]) TQString error; TQCString dcopService; int pid; - int result = KApplication::startServiceByDesktopName( + int result = TDEApplication::startServiceByDesktopName( TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", result, error.ascii(), dcopService.data(), pid); - result = KApplication::startServiceByDesktopName( + result = TDEApplication::startServiceByDesktopName( TQString::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index c5e339b1a..f9e2d237c 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions) if (whichActions & FileActions) { actionMenu->insert( mkdirAction ); - if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton)) + if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); KConfig *globalconfig = KGlobal::config(); KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); - if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) || + if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); actionMenu->insert( actionSeparator ); diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index 86bd5eeb2..10b8285c1 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -362,7 +362,7 @@ void KFileIconView::slotActivate( TQIconViewItem *item ) void KFileIconView::selected( TQIconViewItem *item ) { - if ( !item || (KApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 ) + if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 ) return; if ( KGlobalSettings::singleClick() ) { diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 165df42f4..2adb2b15a 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -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 - * KApplication constructor or KAboutData. + * TDEApplication constructor or KAboutData. * @see clearApplicationEvents() */ virtual void addApplicationEvents( const char *appName ); diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 8f498aa8d..c8623ced2 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -131,7 +131,7 @@ void KAppTreeListItem::activate() void KAppTreeListItem::setOpen( bool o ) { if( o && !parsed ) { // fill the children before opening - ((KApplicationTree *) parent())->addDesktopGroup( path, this ); + ((TDEApplicationTree *) parent())->addDesktopGroup( path, this ); parsed = true; } TQListViewItem::setOpen( o ); @@ -144,7 +144,7 @@ bool KAppTreeListItem::isDirectory() // ---------------------------------------------------------------------- -KApplicationTree::KApplicationTree( TQWidget *parent ) +TDEApplicationTree::TDEApplicationTree( TQWidget *parent ) : KListView( parent ), currentitem(0) { addColumn( i18n("Known Applications") ); @@ -161,7 +161,7 @@ KApplicationTree::KApplicationTree( TQWidget *parent ) // ---------------------------------------------------------------------- -bool KApplicationTree::isDirSel() +bool TDEApplicationTree::isDirSel() { if (!currentitem) return false; // if currentitem isn't set return currentitem->isDirectory(); @@ -182,7 +182,7 @@ static TQPixmap appIcon(const TQString &iconName) return normal; } -void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item) +void TDEApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item) { KServiceGroup::Ptr root = KServiceGroup::group(relPath); if (!root || !root->isValid()) return; @@ -244,7 +244,7 @@ void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListIte // ---------------------------------------------------------------------- -void KApplicationTree::slotItemHighlighted(TQListViewItem* i) +void TDEApplicationTree::slotItemHighlighted(TQListViewItem* i) { // i may be 0 (see documentation) if(!i) @@ -261,7 +261,7 @@ void KApplicationTree::slotItemHighlighted(TQListViewItem* i) // ---------------------------------------------------------------------- -void KApplicationTree::slotSelectionChanged(TQListViewItem* i) +void TDEApplicationTree::slotSelectionChanged(TQListViewItem* i) { // i may be 0 (see documentation) if(!i) @@ -277,7 +277,7 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i) // ---------------------------------------------------------------------- -void KApplicationTree::resizeEvent( TQResizeEvent * e) +void TDEApplicationTree::resizeEvent( TQResizeEvent * e) { setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent) -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth)); @@ -285,7 +285,7 @@ void KApplicationTree::resizeEvent( TQResizeEvent * e) } // Prune empty directories from the tree -void KApplicationTree::cleanupTree() +void TDEApplicationTree::cleanupTree() { TQListViewItem *item=firstChild(); while(item!=0) @@ -456,7 +456,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) ); connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) ); - m_pTree = new KApplicationTree( this ); + m_pTree = new TDEApplicationTree( this ); topLayout->addWidget(m_pTree); connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString& ) ), diff --git a/kio/kfile/kopenwith.h b/kio/kfile/kopenwith.h index 3dceb10bc..a6c570172 100644 --- a/kio/kfile/kopenwith.h +++ b/kio/kfile/kopenwith.h @@ -26,7 +26,7 @@ #include #include -class KApplicationTree; +class TDEApplicationTree; class KURLRequester; class TQWidget; @@ -161,7 +161,7 @@ protected: KURLRequester * edit; TQString m_command; - KApplicationTree* m_pTree; + TDEApplicationTree* m_pTree; TQLabel *label; TQString qName, qServiceType; diff --git a/kio/kfile/kopenwith_p.h b/kio/kfile/kopenwith_p.h index f395d94bd..8231da27d 100644 --- a/kio/kfile/kopenwith_p.h +++ b/kio/kfile/kopenwith_p.h @@ -61,7 +61,7 @@ protected: virtual void activate(); virtual void setOpen( bool o ); - friend class KApplicationTree; + friend class TDEApplicationTree; }; /* ------------------------------------------------------------------------- */ @@ -69,11 +69,11 @@ protected: /** * @internal */ -class KApplicationTree : public KListView +class TDEApplicationTree : public KListView { Q_OBJECT public: - KApplicationTree( TQWidget *parent ); + TDEApplicationTree( TQWidget *parent ); /** * Add a group of .desktop/.kdelnk entries diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 6bfe09e8d..a1076c134 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -3887,14 +3887,14 @@ void KExecPropsPlugin::slotBrowseExec() execEdit->setText( path ); } -class KApplicationPropsPlugin::KApplicationPropsPluginPrivate +class TDEApplicationPropsPlugin::TDEApplicationPropsPluginPrivate { public: - KApplicationPropsPluginPrivate() + TDEApplicationPropsPluginPrivate() { m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh? } - ~KApplicationPropsPluginPrivate() + ~TDEApplicationPropsPluginPrivate() { } @@ -3902,10 +3902,10 @@ public: bool m_kdesktopMode; }; -KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) +TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props ) : KPropsDlgPlugin( _props ) { - d = new KApplicationPropsPluginPrivate; + d = new TDEApplicationPropsPluginPrivate; d->m_frame = properties->addPage(i18n("&Application")); TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint()); @@ -4043,23 +4043,23 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) this, TQT_SIGNAL( changed() ) ); } -KApplicationPropsPlugin::~KApplicationPropsPlugin() +TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin() { delete d; } -// TQString KApplicationPropsPlugin::tabName () const +// TQString TDEApplicationPropsPlugin::tabName () const // { // return i18n ("&Application"); // } -void KApplicationPropsPlugin::updateButton() +void TDEApplicationPropsPlugin::updateButton() { addExtensionButton->setEnabled(availableExtensionsList->currentItem()>-1); delExtensionButton->setEnabled(extensionsList->currentItem()>-1); } -void KApplicationPropsPlugin::addMimeType( const TQString & name ) +void TDEApplicationPropsPlugin::addMimeType( const TQString & name ) { // Add a mimetype to the list of available mime types if not in the extensionsList @@ -4076,13 +4076,13 @@ void KApplicationPropsPlugin::addMimeType( const TQString & name ) } } -bool KApplicationPropsPlugin::supports( KFileItemList _items ) +bool TDEApplicationPropsPlugin::supports( KFileItemList _items ) { // same constraints as KExecPropsPlugin : desktop file with Type = Application return KExecPropsPlugin::supports( _items ); } -void KApplicationPropsPlugin::applyChanges() +void TDEApplicationPropsPlugin::applyChanges() { TQString path = properties->kurl().path(); @@ -4121,7 +4121,7 @@ void KApplicationPropsPlugin::applyChanges() config.sync(); } -void KApplicationPropsPlugin::slotAddExtension() +void TDEApplicationPropsPlugin::slotAddExtension() { TQListBoxItem *item = availableExtensionsList->firstItem(); TQListBoxItem *nextItem; @@ -4143,7 +4143,7 @@ void KApplicationPropsPlugin::slotAddExtension() updateButton(); } -void KApplicationPropsPlugin::slotDelExtension() +void TDEApplicationPropsPlugin::slotDelExtension() { TQListBoxItem *item = extensionsList->firstItem(); TQListBoxItem *nextItem; diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index 91439f8cc..d6a8223dd 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -878,15 +878,15 @@ private: * @deprecated replaced with KDesktopPropsPlugin */ /// Remove in KDE4 -class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin +class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: /** * Constructor */ - KApplicationPropsPlugin( KPropertiesDialog *_props ); - virtual ~KApplicationPropsPlugin(); + TDEApplicationPropsPlugin( KPropertiesDialog *_props ); + virtual ~TDEApplicationPropsPlugin(); virtual void applyChanges(); @@ -910,8 +910,8 @@ private: TQPushButton *addExtensionButton; TQPushButton *delExtensionButton; - class KApplicationPropsPluginPrivate; - KApplicationPropsPluginPrivate *d; + class TDEApplicationPropsPluginPrivate; + TDEApplicationPropsPluginPrivate *d; }; #endif diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp index 859e75452..9e00687ac 100644 --- a/kio/kfile/tests/kcustommenueditortest.cpp +++ b/kio/kfile/tests/kcustommenueditortest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KCustomMenuEditorTest"); + TDEApplication app(argc, argv, "KCustomMenuEditorTest"); KCustomMenuEditor editor(0); KConfig *cfg = new KConfig("kdesktop_custom_menu2"); editor.load(cfg); diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp index 47fcd02ca..3d15c47d0 100644 --- a/kio/kfile/tests/kdirselectdialogtest.cpp +++ b/kio/kfile/tests/kdirselectdialogtest.cpp @@ -5,7 +5,7 @@ int main( int argc, char **argv ) { - KApplication app(argc, argv, "kdirselectdialogtest"); + TDEApplication app(argc, argv, "kdirselectdialogtest"); KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null ); if ( u.isValid() ) diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index 5c520dd5d..e131bda3a 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -134,7 +134,7 @@ void testFrame::slotSetChildCount( KFileTreeViewItem *item, int c ) int main(int argc, char **argv) { - KApplication a(argc, argv, "kfiletreeviewtest"); + TDEApplication a(argc, argv, "kfiletreeviewtest"); TQString name1; TQStringList names; diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index db3f46e28..f85995a61 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) { - KApplication a(argc, argv, "kfstest"); + TDEApplication a(argc, argv, "kfstest"); TQString name1; TQStringList names; diff --git a/kio/kfile/tests/kicondialogtest.cpp b/kio/kfile/tests/kicondialogtest.cpp index 23301b752..b2c56e159 100644 --- a/kio/kfile/tests/kicondialogtest.cpp +++ b/kio/kfile/tests/kicondialogtest.cpp @@ -3,7 +3,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "kicondialogtest" ); + TDEApplication app( argc, argv, "kicondialogtest" ); // KIconDialog::getIcon(); diff --git a/kio/kfile/tests/knotifytest.cpp b/kio/kfile/tests/knotifytest.cpp index f6e93fa99..0493b59b4 100644 --- a/kio/kfile/tests/knotifytest.cpp +++ b/kio/kfile/tests/knotifytest.cpp @@ -3,7 +3,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "knotifytest" ); + TDEApplication app( argc, argv, "knotifytest" ); KNotifyDialog *dlg = new KNotifyDialog(); dlg->addApplicationEvents( "twin" ); return dlg->exec(); diff --git a/kio/kfile/tests/kopenwithtest.cpp b/kio/kfile/tests/kopenwithtest.cpp index ea348a94c..f78b1830b 100644 --- a/kio/kfile/tests/kopenwithtest.cpp +++ b/kio/kfile/tests/kopenwithtest.cpp @@ -28,7 +28,7 @@ int main(int argc, char **argv) { - KApplication app(argc, argv, "kopenwithtest"); + TDEApplication app(argc, argv, "kopenwithtest"); KURL::List list; list += KURL("file:///tmp/testfile.txt"); diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp index 99af39814..0e4851cfb 100644 --- a/kio/kfile/tests/kurlrequestertest.cpp +++ b/kio/kfile/tests/kurlrequestertest.cpp @@ -5,7 +5,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "kurlrequestertest" ); + TDEApplication app( argc, argv, "kurlrequestertest" ); KURL url = KURLRequesterDlg::getURL( "ftp://ftp.kde.org" ); tqDebug( "Selected url: %s", url.url().latin1()); diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index d937e8700..9d6624dc0 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -230,7 +230,7 @@ namespace KIO { /** * Updates the last user action timestamp to the given time. - * See KApplication::updateUserTimestamp() . + * See TDEApplication::updateUserTimestamp() . * @since 3.5.6 */ void updateUserTimestamp( unsigned long time ); diff --git a/kio/kio/kmessageboxwrapper.h b/kio/kio/kmessageboxwrapper.h index 94a960135..356d98042 100644 --- a/kio/kio/kmessageboxwrapper.h +++ b/kio/kio/kmessageboxwrapper.h @@ -34,7 +34,7 @@ public: const TQString &text, const TQString &caption = TQString::null) { - if (KApplication::guiEnabled()) { + if (TDEApplication::guiEnabled()) { kapp->enableStyles(); KMessageBox::error( parent, text, caption ); } else @@ -45,7 +45,7 @@ public: const TQString &text, const TQString &caption = TQString::null) { - if (KApplication::guiEnabled()) { + if (TDEApplication::guiEnabled()) { kapp->enableStyles(); KMessageBox::sorry( parent, text, caption ); } else diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index 461207d9a..09a45b5ea 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -900,7 +900,7 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & ) args << url.path(); int pid; - if ( !KApplication::tdeinitExec("kfmclient", args, 0, &pid) ) + if ( !TDEApplication::tdeinitExec("kfmclient", args, 0, &pid) ) return pid; KProcess p; diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 93cbe677a..cbc72242e 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -818,7 +818,7 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi } } - int i = KApplication::startServiceByDesktopPath( + int i = TDEApplication::startServiceByDesktopPath( _service.desktopEntryPath(), urls.toStringList(), &error, 0L, &pid, myasn ); diff --git a/kio/kio/observer.cpp b/kio/kio/observer.cpp index 2a468b1e6..599703f9b 100644 --- a/kio/kio/observer.cpp +++ b/kio/kio/observer.cpp @@ -61,7 +61,7 @@ Observer::Observer() : DCOPObject("KIO::Observer") { kdDebug(KDEBUG_OBSERVER) << "Starting kio_uiserver" << endl; TQString error; - int ret = KApplication::startServiceByDesktopPath( "kio_uiserver.desktop", + int ret = TDEApplication::startServiceByDesktopPath( "kio_uiserver.desktop", TQStringList(), &error ); if ( ret > 0 ) { diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index 3a501d681..29b8482fb 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -245,7 +245,7 @@ void Slave::hold(const KURL &url) pid_t pid = m_pid; stream << pid; - TQCString launcher = KApplication::launcher(); + TQCString launcher = TDEApplication::launcher(); client->call(launcher, launcher, "waitForSlave(pid_t)", params, replyType, reply); } @@ -431,7 +431,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error TQDataStream stream(params, IO_WriteOnly); stream << protocol << url.host() << socketfile.name(); - TQCString launcher = KApplication::launcher(); + TQCString launcher = TDEApplication::launcher(); if (!client->call(launcher, launcher, "requestSlave(TQString,TQString,TQString)", params, replyType, reply)) { error_text = i18n("Cannot talk to klauncher"); @@ -491,7 +491,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) TQDataStream stream(params, IO_WriteOnly); stream << url << socketfile.name(); - TQCString launcher = KApplication::launcher(); + TQCString launcher = TDEApplication::launcher(); if (!client->call(launcher, launcher, "requestHoldSlave(KURL,TQString)", params, replyType, reply)) { delete slave; diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index d0734105c..d2e807077 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -246,7 +246,7 @@ DCOPClient *SlaveBase::dcopClient() { if (!d->dcopClient) { - d->dcopClient = KApplication::dcopClient(); + d->dcopClient = TDEApplication::dcopClient(); if (!d->dcopClient->isAttached()) d->dcopClient->attach(); d->dcopClient->setDaemonMode( true ); diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index 672cc0a5c..dc556ea23 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -631,7 +631,7 @@ KSSLCertificateHome::KSSLAuthAction aa; d->dcc = new DCOPClient; d->dcc->attach(); if (!d->dcc->isApplicationRegistered("kio_uiserver")) { - KApplication::startServiceByDesktopPath("kio_uiserver.desktop", + TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop", TQStringList() ); } } @@ -895,7 +895,7 @@ int TCPSlaveBase::verifyCertificate() d->dcc = new DCOPClient; d->dcc->attach(); if (!d->dcc->isApplicationRegistered("kio_uiserver")) { - KApplication::startServiceByDesktopPath("kio_uiserver.desktop", + TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop", TQStringList() ); } @@ -1023,7 +1023,7 @@ int TCPSlaveBase::verifyCertificate() d->dcc = new DCOPClient; d->dcc->attach(); if (!d->dcc->isApplicationRegistered("kio_uiserver")) { - KApplication::startServiceByDesktopPath("kio_uiserver.desktop", + TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop", TQStringList() ); } } @@ -1107,7 +1107,7 @@ int TCPSlaveBase::verifyCertificate() d->dcc = new DCOPClient; d->dcc->attach(); if (!d->dcc->isApplicationRegistered("kio_uiserver")) { - KApplication::startServiceByDesktopPath("kio_uiserver.desktop", + TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop", TQStringList() ); } } diff --git a/kio/kioexec/README b/kio/kioexec/README index 9f844bb97..daaa38bdb 100644 --- a/kio/kioexec/README +++ b/kio/kioexec/README @@ -14,7 +14,7 @@ so we have no way to know when the user finished editing the file... Conclusion: if the application has network transparency built-in, it should put "%u" in its desktop file - and kfmexec isn't used -. If it doesn't, either -it's a KApplication and kfmexec does its job, or it's a KUniqueApplication +it's a TDEApplication and kfmexec does its job, or it's a KUniqueApplication and... kfmexec can't see modifications to the file. Be warned. From Waldo: "The program doesn't return _at once_. It returns diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 772c27f73..18014f08f 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -283,7 +283,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; KIOExec exec; diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp index ac9954563..cba281cc7 100644 --- a/kio/misc/kfile/fileprops.cpp +++ b/kio/misc/kfile/fileprops.cpp @@ -423,7 +423,7 @@ int main( int argc, char **argv ) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool useGUI = args->isSet( "dialog" ); - KApplication app( useGUI, useGUI ); + TDEApplication app( useGUI, useGUI ); TQPtrList m_props; m_props.setAutoDelete( true ); diff --git a/kio/misc/kmailservice.cpp b/kio/misc/kmailservice.cpp index a9f59ca36..3b2eb8cf7 100644 --- a/kio/misc/kmailservice.cpp +++ b/kio/misc/kmailservice.cpp @@ -32,7 +32,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication a( false, false ); + TDEApplication a( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp index 9af382483..dd9cd33ec 100644 --- a/kio/misc/kntlm/kntlm.cpp +++ b/kio/misc/kntlm/kntlm.cpp @@ -265,7 +265,7 @@ TQByteArray KNTLM::getLMv2Response( const TQString &target, const TQString &user TQByteArray hash = ntlmv2Hash( target, user, password ); TQByteArray clientChallenge( 8 ); for ( uint i = 0; i<8; i++ ) { - clientChallenge.data()[i] = KApplication::random() % 0xff; + clientChallenge.data()[i] = TDEApplication::random() % 0xff; } return lmv2Response( hash, clientChallenge, challenge ); } @@ -304,7 +304,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo ) now *= (TQ_UINT64)10000000; bl->timestamp = KFromToLittleEndian( now ); for ( uint i = 0; i<8; i++ ) { - bl->challenge[i] = KApplication::random() % 0xff; + bl->challenge[i] = TDEApplication::random() % 0xff; } memcpy( blob.data() + sizeof(Blob), targetinfo.data(), targetinfo.size() ); return blob; diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index 1f900426f..527d8545f 100644 --- a/kio/misc/ksendbugmail/main.cpp +++ b/kio/misc/ksendbugmail/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char **argv) { TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KApplication a(false, false); + TDEApplication a(false, false); TQCString recipient = args->getOption("recipient"); if (recipient.isEmpty()) diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp index d0f93aaf1..ea8708863 100644 --- a/kio/misc/ktelnetservice.cpp +++ b/kio/misc/ktelnetservice.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) I18N_NOOP("telnet protocol handler"), "unknown"); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index eca13c463..a88f4e5b1 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -95,7 +95,7 @@ KWalletD::KWalletD(const TQCString &name) connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); reconfigure(); KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); - connect(KApplication::dcopClient(), + connect(TDEApplication::dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), this, TQT_SLOT(slotAppUnregistered(const TQCString&))); @@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool } emitDCOPSignal("walletOpened(TQString)", data); if (_wallets.count() == 1 && _launchManager) { - KApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); + TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); } } else { if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { diff --git a/kio/tests/getalltest.cpp b/kio/tests/getalltest.cpp index 58c8d5a3f..07d8723ed 100644 --- a/kio/tests/getalltest.cpp +++ b/kio/tests/getalltest.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - KApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted kdDebug() << "All services" << endl; diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index 34fe93677..cd9a99bb8 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -64,9 +64,9 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0); - KApplication app; + TDEApplication app; JobTest test; test.setup(); diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp index b4bfc9f07..45ace585f 100644 --- a/kio/tests/kacltest.cpp +++ b/kio/tests/kacltest.cpp @@ -67,9 +67,9 @@ static bool check(const TQString& txt, T a, T b) int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0); - KApplication app; + TDEApplication app; KACLTest test; test.setup(); diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp index 7d373824e..1626f2ebc 100644 --- a/kio/tests/kdcopcheck.cpp +++ b/kio/tests/kdcopcheck.cpp @@ -91,7 +91,7 @@ int TestService::exec() int main(int argc, char *argv[]) { putenv("IGNORE_SYCOCA_VERSION=true"); - KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption k.dcopClient()->setNotifications(true); diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp index a831041e1..e62408204 100644 --- a/kio/tests/kdefaultprogresstest.cpp +++ b/kio/tests/kdefaultprogresstest.cpp @@ -7,7 +7,7 @@ using namespace KIO; int main(int argc, char **argv) { - KApplication app(argc, argv, "kdefaultprogresstest"); + TDEApplication app(argc, argv, "kdefaultprogresstest"); DefaultProgress* dlg = new DefaultProgress(); KURL src("http://this.host.doesn't.exist/this/dir/neither/andthisfileneither"); diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 6137f5e71..01d0a36e9 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -151,7 +151,7 @@ void KDirListerTest::completed() int main ( int argc, char *argv[] ) { - KApplication app( argc, argv, "kdirlistertest" ); + TDEApplication app( argc, argv, "kdirlistertest" ); KDirListerTest *test = new KDirListerTest( 0 ); test->show(); diff --git a/kio/tests/kdirwatchtest.cpp b/kio/tests/kdirwatchtest.cpp index 20676ee49..c741b20f0 100644 --- a/kio/tests/kdirwatchtest.cpp +++ b/kio/tests/kdirwatchtest.cpp @@ -28,9 +28,9 @@ int main (int argc, char **argv) TDECmdLineArgs::init(argc, argv, "KDirWatchTest", "Test for KDirWatch", "1.0"); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication a; + TDEApplication a; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); myTest testObject; diff --git a/kio/tests/kionetrctest.cpp b/kio/tests/kionetrctest.cpp index 95b0cf61a..82c669c74 100644 --- a/kio/tests/kionetrctest.cpp +++ b/kio/tests/kionetrctest.cpp @@ -48,7 +48,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); int count = args->count(); - KApplication app; + TDEApplication app; if ( !count ) args->usage(); diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp index f1dd1a9b0..099ce468b 100644 --- a/kio/tests/kiopassdlgtest.cpp +++ b/kio/tests/kiopassdlgtest.cpp @@ -10,7 +10,7 @@ int main ( int argc, char** argv ) { KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0"); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication app; + TDEApplication app; TQString usr, pass, comment, label; label = "Site:"; diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index 2e7e398e4..72a7ffb05 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -496,7 +496,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { TDECmdLineArgs::init( argc, argv, "kioslavetest", description, version ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp index bde2ff5ff..026d4173b 100644 --- a/kio/tests/kmimefromext.cpp +++ b/kio/tests/kmimefromext.cpp @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString fileName = args->arg( 0 ); diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp index 5d01384f6..02a4b6f37 100644 --- a/kio/tests/kpropsdlgtest.cpp +++ b/kio/tests/kpropsdlgtest.cpp @@ -17,7 +17,7 @@ int main ( int argc, char** argv ) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() < 1 ) diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp index e8fd7850d..1f4dc95c6 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -30,7 +30,7 @@ int main(int argc, char **argv) { "1.0"); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication app; + TDEApplication app; KURL url; url.setPath("/tmp"); diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp index 673948374..d8f47859b 100644 --- a/kio/tests/kruntest.cpp +++ b/kio/tests/kruntest.cpp @@ -121,7 +121,7 @@ void checkPDE(const KService &service, const KURL::List &urls, bool hs, bool tf, int main(int argc, char **argv) { - KApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */); + TDEApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */); // First some non-interactive tests checkBN( "/usr/bin/ls", true, "ls"); diff --git a/kio/tests/kscantest.cpp b/kio/tests/kscantest.cpp index 347993af8..14abd1b33 100644 --- a/kio/tests/kscantest.cpp +++ b/kio/tests/kscantest.cpp @@ -3,7 +3,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "kscantest" ); + TDEApplication app( argc, argv, "kscantest" ); KScanDialog *dlg = KScanDialog::getScanDialog(); if ( !dlg ) { tqDebug("*** EEK, no Scan-service available, aborting!"); diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp index 086836f37..45f94ac3c 100644 --- a/kio/tests/ksycocatest.cpp +++ b/kio/tests/ksycocatest.cpp @@ -67,7 +67,7 @@ void debug(const char *format, const char *txt) int main(int argc, char *argv[]) { - KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption TQCString instname = "kword"; TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname ); diff --git a/kio/tests/ksycocaupdatetest.cpp b/kio/tests/ksycocaupdatetest.cpp index 1d9e3fcaa..e7778e056 100644 --- a/kio/tests/ksycocaupdatetest.cpp +++ b/kio/tests/ksycocaupdatetest.cpp @@ -4,7 +4,7 @@ int main(int argc, char *argv[]) { - KApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption KService::rebuildKSycoca(0); return 0; diff --git a/kio/tests/ktradertest.cpp b/kio/tests/ktradertest.cpp index d2ceb4c00..b05444dfd 100644 --- a/kio/tests/ktradertest.cpp +++ b/kio/tests/ktradertest.cpp @@ -37,7 +37,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); // no GUI + TDEApplication app( false, false ); // no GUI TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index 6eb661c70..3dbd8c648 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -162,7 +162,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; app.disableAutoDcopRegistration(); // Allow testing of the search engine using both delimiters... diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp index d777fe0df..c8dc99595 100644 --- a/kio/tests/kurlcompletiontest.cpp +++ b/kio/tests/kurlcompletiontest.cpp @@ -164,9 +164,9 @@ void KURLCompletionTest::testLocalURL() int main( int argc, char **argv ) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0); - KApplication app; + TDEApplication app; { KURLCompletionTest test; diff --git a/kio/tests/metatest.cpp b/kio/tests/metatest.cpp index f450c46c1..034d740ed 100644 --- a/kio/tests/metatest.cpp +++ b/kio/tests/metatest.cpp @@ -187,9 +187,9 @@ int main( int argc, char **argv ) TDECmdLineArgs::addCmdLineOptions( options ); // Add options from other components - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication app; + TDEApplication app; TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); diff --git a/kio/tests/netaccesstest.cpp b/kio/tests/netaccesstest.cpp index 9fb0ff07a..a9aeb66d4 100644 --- a/kio/tests/netaccesstest.cpp +++ b/kio/tests/netaccesstest.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) { - KApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */); + TDEApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */); KURL srcURL( "ftp://ftp.kde.org/pub/kde/README" ); KURL tmpURL( "file:/tmp/netaccesstest_README" ); diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp index f2b740224..52dea6ac7 100644 --- a/kio/tests/previewtest.cpp +++ b/kio/tests/previewtest.cpp @@ -55,7 +55,7 @@ void PreviewTest::slotFailed() int main(int argc, char **argv) { - KApplication app(argc, argv, "previewtest"); + TDEApplication app(argc, argv, "previewtest"); PreviewTest *w = new PreviewTest; w->show(); app.setMainWidget(w); diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp index 77cf13764..ae94d83e6 100644 --- a/kio/tests/speed.cpp +++ b/kio/tests/speed.cpp @@ -69,7 +69,7 @@ int main(int argc, char **argv) { TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index 16b785d03..bb9eb5866 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -5011,7 +5011,7 @@ void HTTPProtocol::cleanCache() { // Touch file. utime(TQFile::encodeName(cleanFile), 0); - KApplication::startServiceByDesktopPath("http_cache_cleaner.desktop"); + TDEApplication::startServiceByDesktopPath("http_cache_cleaner.desktop"); } } @@ -5789,7 +5789,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy ) info.qop = ""; // cnonce is recommended to contain about 64 bits of entropy - info.cnonce = KApplication::randomString(16).latin1(); + info.cnonce = TDEApplication::randomString(16).latin1(); // HACK: Should be fixed according to RFC 2617 section 3.2.2 info.nc = "00000001"; diff --git a/kioslave/metainfo/metainfo.cpp b/kioslave/metainfo/metainfo.cpp index 21e24e428..9bc99981f 100644 --- a/kioslave/metainfo/metainfo.cpp +++ b/kioslave/metainfo/metainfo.cpp @@ -42,7 +42,7 @@ extern "C" int kdemain(int argc, char **argv) { - KApplication app(argc, argv, "kio_metainfo", false, true); + TDEApplication app(argc, argv, "kio_metainfo", false, true); if (argc != 4) { diff --git a/kmdi/test/main.cpp b/kmdi/test/main.cpp index 7a1cab885..4f14a410c 100644 --- a/kmdi/test/main.cpp +++ b/kmdi/test/main.cpp @@ -27,7 +27,7 @@ #ifndef NO_KDE # include - KApplication* theApp; + TDEApplication* theApp; #else # include TQApplication* theApp; @@ -42,7 +42,7 @@ int main( int argc, char **argv ) { #ifndef NO_KDE - KApplication a(argc,argv,"KFourChildren"); + TDEApplication a(argc,argv,"KFourChildren"); #else TQApplication a(argc,argv); #endif diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp index 709460862..1f5c01768 100644 --- a/knewstuff/ghns.cpp +++ b/knewstuff/ghns.cpp @@ -81,7 +81,7 @@ int main(int argc,char **argv) KAboutData aboutData("ghns","Get Hot New Stuff","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); - KApplication app; + TDEApplication app; GhnsWidget wid; app.setMainWidget( &wid ); diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/khotnewstuff.cpp index cf68255a3..bbca71b89 100644 --- a/knewstuff/khotnewstuff.cpp +++ b/knewstuff/khotnewstuff.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions(op); args = TDECmdLineArgs::parsedArgs(); - KApplication i; + TDEApplication i; KNS::DownloadDialog d; if(args->isSet("type")) d.setType(args->getOption("type")); diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp index 6a37aa61d..c572f347d 100644 --- a/knewstuff/knewstuff.cpp +++ b/knewstuff/knewstuff.cpp @@ -72,7 +72,7 @@ void KNewStuff::download() TQString KNewStuff::downloadDestination( Entry * ) { return KGlobal::dirs()->saveLocation( "tmp" ) + - KApplication::randomString( 10 ); + TDEApplication::randomString( 10 ); } void KNewStuff::upload() diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp index 451be8b43..189a90067 100644 --- a/knewstuff/testnewstuff.cpp +++ b/knewstuff/testnewstuff.cpp @@ -110,7 +110,7 @@ int main(int argc,char **argv) KAboutData aboutData("knewstufftest","KNewStuff Test","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); - KApplication app; + TDEApplication app; MyWidget wid; app.setMainWidget( &wid ); diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp index 7792c5d43..3675781ea 100644 --- a/kparts/tests/example.cpp +++ b/kparts/tests/example.cpp @@ -121,7 +121,7 @@ void Shell::slotFileEdit() int main( int argc, char **argv ) { - KApplication app( argc, argv, "kpartstest" ); + TDEApplication app( argc, argv, "kpartstest" ); Shell *shell = new Shell; diff --git a/kparts/tests/ghostview.cpp b/kparts/tests/ghostview.cpp index d7cf9d102..5d1bbe5b3 100644 --- a/kparts/tests/ghostview.cpp +++ b/kparts/tests/ghostview.cpp @@ -103,7 +103,7 @@ int main( int argc, char **argv ) { TDECmdLineArgs::init(argc, argv, "ghostviewtest", description, version); TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options. - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); Shell *shell = new Shell; if ( args->count() == 1 ) diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp index bb54521d1..82c464a5a 100644 --- a/kparts/tests/normalktm.cpp +++ b/kparts/tests/normalktm.cpp @@ -108,7 +108,7 @@ void Shell::slotFileEdit() int main( int argc, char **argv ) { - KApplication app( argc, argv, "kpartstest" ); // we cheat and call ourselves kpartstest for Shell::slotFileOpen() + TDEApplication app( argc, argv, "kpartstest" ); // we cheat and call ourselves kpartstest for Shell::slotFileOpen() Shell *shell = new Shell; diff --git a/krandr/randr.cpp b/krandr/randr.cpp index f1b1aae21..dd54f87be 100644 --- a/krandr/randr.cpp +++ b/krandr/randr.cpp @@ -254,7 +254,7 @@ KDE_EXPORT bool RandRScreen::confirm() // FIXME remember to put the dialog on the right screen KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown, - KApplication::kApplication()->mainWidget(), + TDEApplication::kApplication()->mainWidget(), "mainKTimerDialog", true, i18n("Confirm Display Setting Change"), @@ -846,7 +846,7 @@ KDE_EXPORT bool RandRScreen::showTestConfigurationDialog() // FIXME remember to put the dialog on the right screen KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown, - KApplication::kApplication()->mainWidget(), + TDEApplication::kApplication()->mainWidget(), "mainKTimerDialog", true, i18n("Confirm Display Settings"), diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp index b5d9ec32f..8fa2e03c0 100644 --- a/kresources/managerimpl.cpp +++ b/kresources/managerimpl.cpp @@ -45,7 +45,7 @@ ManagerImpl::ManagerImpl( ManagerNotifier *notifier, const TQString &family ) { kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl; - mId = KApplication::randomString( 8 ); + mId = TDEApplication::randomString( 8 ); // Register with DCOP if ( !kapp->dcopClient()->isRegistered() ) { diff --git a/kresources/resource.cpp b/kresources/resource.cpp index b9cdd95c4..83d24cbf5 100644 --- a/kresources/resource.cpp +++ b/kresources/resource.cpp @@ -61,7 +61,7 @@ Resource::Resource( const KConfig* config ) d->mName = i18n("resource"); d->mReadOnly = false; d->mActive = true; - d->mIdentifier = KApplication::randomString( 10 ); + d->mIdentifier = TDEApplication::randomString( 10 ); } } diff --git a/kresources/testresources.cpp b/kresources/testresources.cpp index 452d9cf27..6624b9ffe 100644 --- a/kresources/testresources.cpp +++ b/kresources/testresources.cpp @@ -32,7 +32,7 @@ int main( int argc, char **argv ) KAboutData aboutData( "testresources", "Kresource Test", "0" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; Manager manager( "test" ); diff --git a/kspell2/tests/backgroundtest.cpp b/kspell2/tests/backgroundtest.cpp index 8050115ad..a732799e5 100644 --- a/kspell2/tests/backgroundtest.cpp +++ b/kspell2/tests/backgroundtest.cpp @@ -159,7 +159,7 @@ void BackgroundTest::slotMisspelling( const TQString& word, int start ) int main( int argc, char** argv ) { - KApplication app(argc, argv, "KSpell2Test"); + TDEApplication app(argc, argv, "KSpell2Test"); BackgroundTest test; diff --git a/kspell2/tests/test.cpp b/kspell2/tests/test.cpp index e9b72a794..e8ceabaf7 100644 --- a/kspell2/tests/test.cpp +++ b/kspell2/tests/test.cpp @@ -30,7 +30,7 @@ using namespace KSpell2; int main( int argc, char** argv ) { - KApplication app(argc, argv, "KSpell2Test"); + TDEApplication app(argc, argv, "KSpell2Test"); Broker::Ptr broker = Broker::openBroker(); diff --git a/kspell2/tests/test_config.cpp b/kspell2/tests/test_config.cpp index 4ef3f588e..2d243bd46 100644 --- a/kspell2/tests/test_config.cpp +++ b/kspell2/tests/test_config.cpp @@ -26,7 +26,7 @@ using namespace KSpell2; int main( int argc, char** argv ) { - KApplication app(argc, argv, "KSpell2Test"); + TDEApplication app(argc, argv, "KSpell2Test"); SettingsDialog *dialog = new SettingsDialog( 0 ); diff --git a/kspell2/tests/test_configdialog.cpp b/kspell2/tests/test_configdialog.cpp index e90d01d7c..a9ff16cdd 100644 --- a/kspell2/tests/test_configdialog.cpp +++ b/kspell2/tests/test_configdialog.cpp @@ -27,7 +27,7 @@ using namespace KSpell2; int main( int argc, char** argv ) { - KApplication app(argc, argv, "KSpell2Test"); + TDEApplication app(argc, argv, "KSpell2Test"); Broker::Ptr broker = Broker::openBroker(); ConfigDialog *dialog = new ConfigDialog( broker, 0 ); diff --git a/kspell2/tests/test_dialog.cpp b/kspell2/tests/test_dialog.cpp index bc5d808a8..19503e307 100644 --- a/kspell2/tests/test_dialog.cpp +++ b/kspell2/tests/test_dialog.cpp @@ -54,7 +54,7 @@ void TestDialog::doneChecking( const TQString& buf ) int main( int argc, char** argv ) { - KApplication app(argc, argv, "KSpell2Test"); + TDEApplication app(argc, argv, "KSpell2Test"); TestDialog test; test.check( "This is a sample buffer. Whih this thingg will " diff --git a/kspell2/tests/test_filter.cpp b/kspell2/tests/test_filter.cpp index eafaf622f..430f157dd 100644 --- a/kspell2/tests/test_filter.cpp +++ b/kspell2/tests/test_filter.cpp @@ -28,7 +28,7 @@ using namespace KSpell2; int main( int argc, char** argv ) { - KApplication app(argc, argv, "Filter"); + TDEApplication app(argc, argv, "Filter"); TQString buffer = TQString( "This is a sample buffer. Please test me." ); diff --git a/kspell2/tests/test_highlighter.cpp b/kspell2/tests/test_highlighter.cpp index ce5c64501..c11972254 100644 --- a/kspell2/tests/test_highlighter.cpp +++ b/kspell2/tests/test_highlighter.cpp @@ -29,7 +29,7 @@ int main( int argc, char** argv ) { - KApplication app(argc, argv, "KSpell2Test"); + TDEApplication app(argc, argv, "KSpell2Test"); TQTextEdit *test = new TQTextEdit(); KSpell2::Highlighter *hl = new KSpell2::Highlighter( test ); diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 11a06f29a..4302976c8 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -93,7 +93,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin); AsteroidStyle::AsteroidStyle() : KStyle(AllowMenuTransparency) { - if (tqApp->inherits("KApplication")) { + if (tqApp->inherits("TDEApplication")) { connect(tqApp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); } diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 56cbeb09f..544f692e0 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -7,7 +7,7 @@ KDE3 port (C) 2001-2002 Maksim Orlovich Port version 0.9.7 - Palette setup code is from KApplication, + Palette setup code is from TDEApplication, Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) Copyright (C) 1998, 1999, 2000 KDE Team diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index 3e2019383..1e002cd4a 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -6,7 +6,7 @@ KDE3 port (C) 2001 Maksim Orlovich - Palette setup code is from KApplication, + Palette setup code is from TDEApplication, Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) Copyright (C) 1998, 1999, 2000 KDE Team diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp index 22986730f..e6ffce721 100644 --- a/kstyles/utils/installtheme/main.cpp +++ b/kstyles/utils/installtheme/main.cpp @@ -38,7 +38,7 @@ static const char ver[] = "0.9.1"; int main(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver); - KApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? + TDEApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc"); diff --git a/kunittest/tester.h b/kunittest/tester.h index 5e47f7ccb..75eebd39c 100644 --- a/kunittest/tester.h +++ b/kunittest/tester.h @@ -152,7 +152,7 @@ SampleTest - 1 test passed, 1 test failed * * TDECmdLineArgs::init(argc, argv, &about); * TDECmdLineArgs::addCmdLineOptions( options ); - * KApplication app; + * TDEApplication app; * * KUnitTest::RunnerGUI runner(0); * runner.show(); diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp index c8327a25e..2238616c2 100644 --- a/kutils/kcmoduleloader.cpp +++ b/kutils/kcmoduleloader.cpp @@ -177,7 +177,7 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep */ if(withfallback) { - KApplication::startServiceByDesktopPath(mod.fileName(), TQString::null); + TDEApplication::startServiceByDesktopPath(mod.fileName(), TQString::null); } else { diff --git a/kutils/tests/kfindtest.cpp b/kutils/tests/kfindtest.cpp index 29710c070..6c64245dc 100644 --- a/kutils/tests/kfindtest.cpp +++ b/kutils/tests/kfindtest.cpp @@ -124,7 +124,7 @@ void KFindTest::slotHighlight(int id, int index, int matchedLength) int main(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false); - KApplication app; + TDEApplication app; TQString text = "This file is part of the KDE project.\n" "This library is free software; you can redistribute it and/or\n" diff --git a/kutils/tests/kreplacetest.cpp b/kutils/tests/kreplacetest.cpp index d7d6d6e6e..26b0f7c9e 100644 --- a/kutils/tests/kreplacetest.cpp +++ b/kutils/tests/kreplacetest.cpp @@ -253,7 +253,7 @@ static void testReplacementHistory() int main( int argc, char **argv ) { TDECmdLineArgs::init(argc, argv, "kreplacetest", 0, 0); - KApplication app; + TDEApplication app; testReplacementHistory(); // #130831 diff --git a/kwallet/backend/tests/backendtest.cpp b/kwallet/backend/tests/backendtest.cpp index e7599b3a2..ea74054b7 100644 --- a/kwallet/backend/tests/backendtest.cpp +++ b/kwallet/backend/tests/backendtest.cpp @@ -7,7 +7,7 @@ #include "kwalletbackend.h" int main(int argc, char **argv) { - KApplication a(argc, argv, "kwalletbackendtest"); + TDEApplication a(argc, argv, "kwalletbackendtest"); KWallet::Backend be("ktestwallet"); printf("KWalletBackend constructed\n"); diff --git a/kwallet/tests/kwalletasync.cpp b/kwallet/tests/kwalletasync.cpp index d25a74395..0900f9d20 100644 --- a/kwallet/tests/kwalletasync.cpp +++ b/kwallet/tests/kwalletasync.cpp @@ -45,7 +45,7 @@ int main( int argc, char *argv[] ) { KAboutData aboutData( "kwalletasync", "kwalletasync", "version" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app( "kwalletasync" ); + TDEApplication app( "kwalletasync" ); // register with DCOP _out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl; diff --git a/kwallet/tests/kwalletboth.cpp b/kwallet/tests/kwalletboth.cpp index 38197691a..cee1cc127 100644 --- a/kwallet/tests/kwalletboth.cpp +++ b/kwallet/tests/kwalletboth.cpp @@ -67,7 +67,7 @@ int main( int argc, char *argv[] ) { KAboutData aboutData( "kwalletboth", "kwalletboth", "version" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app( "kwalletboth" ); + TDEApplication app( "kwalletboth" ); // register with DCOP _out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl; diff --git a/kwallet/tests/kwalletsync.cpp b/kwallet/tests/kwalletsync.cpp index 541f593c0..93baa01ab 100644 --- a/kwallet/tests/kwalletsync.cpp +++ b/kwallet/tests/kwalletsync.cpp @@ -25,7 +25,7 @@ int main( int argc, char *argv[] ) { KAboutData aboutData( "kwalletsync", "kwalletsync", "version" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app( "kwalletsync" ); + TDEApplication app( "kwalletsync" ); // register with DCOP _out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl; diff --git a/libkscreensaver/kscreensaver.cpp b/libkscreensaver/kscreensaver.cpp index 4c7b343cb..e4a1f89a0 100644 --- a/libkscreensaver/kscreensaver.cpp +++ b/libkscreensaver/kscreensaver.cpp @@ -67,7 +67,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget() if ( w == 0 ) w = 600; if ( h == 0 ) h = 420; resize( w, h ); - KApplication::sendPostedEvents(); + TDEApplication::sendPostedEvents(); show(); } @@ -79,12 +79,12 @@ KScreenSaver::~KScreenSaver() void KScreenSaver::embed( TQWidget *w ) { - KApplication::sendPostedEvents(); + TDEApplication::sendPostedEvents(); #ifdef Q_WS_X11 //FIXME XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0); #endif w->setGeometry( 0, 0, width(), height() ); - KApplication::sendPostedEvents(); + TDEApplication::sendPostedEvents(); } bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e ) diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp index da5b2a2df..75c2e72dd 100644 --- a/libkscreensaver/main.cpp +++ b/libkscreensaver/main.cpp @@ -98,7 +98,7 @@ KDE_EXPORT int main(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; KCrash::setCrashHandler( crashHandler ); KGlobal::locale()->insertCatalogue("klock"); diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp index 44211c696..1611721ba 100644 --- a/networkstatus/testservice.cpp +++ b/networkstatus/testservice.cpp @@ -92,7 +92,7 @@ void TestService::slotStatusChange() int main( int argc, char** argv ) { - KApplication app(argc, argv, "testdcop"); + TDEApplication app(argc, argv, "testdcop"); TestService * test = new TestService; Q_UNUSED( test ); return app.exec(); diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS index a76f6be1e..aad1c76e9 100644 --- a/tdecore/AUTHORS +++ b/tdecore/AUTHORS @@ -1,5 +1,5 @@ Matthias Kalle Dalheimer : -classes KConfig, KTextStream, KColorSet, KApplication +classes KConfig, KTextStream, KColorSet, TDEApplication automake, autoconf, maintenance Richard Moore : @@ -40,7 +40,7 @@ Christian Czezatke KProcess class Matthias Ettrich -KWM, Changes to KApplication and KIconLoader +KWM, Changes to TDEApplication and KIconLoader Stephan Kulow heavy modifications to KURL, autoconf and automake stuff diff --git a/tdecore/DESIGN.COLOR b/tdecore/DESIGN.COLOR index b997a6de0..56ffd1774 100644 --- a/tdecore/DESIGN.COLOR +++ b/tdecore/DESIGN.COLOR @@ -25,7 +25,7 @@ contrast at all which can lead to a completely unreadable UI. Color schemes are supported by Qt (see TQColorGroup) and can be configured on a KDE wide basis from the Control Panel. The settings are stored in the global KDE configuration file under the "General" -setting. The KApplication class takes care that the configured +setting. The TDEApplication class takes care that the configured settings are passed on to Qt. Application developers can just use the values provided by TQColorGroup. diff --git a/tdecore/Mainpage.dox b/tdecore/Mainpage.dox index c0e13a339..cbf8f69d9 100644 --- a/tdecore/Mainpage.dox +++ b/tdecore/Mainpage.dox @@ -6,7 +6,7 @@ support, site-independent access to the filesystem and a large number of other (but no less important) things.

    All Trinity applications should link to the tdecore library. Also, using a -KApplication derived class instead of TQApplication is almost +TDEApplication derived class instead of TQApplication is almost mandatory if you expect your application to behave nicely within the Trinity environment. diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index 896981d33..d6d380707 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -657,7 +657,7 @@ Host[$e]=$(hostname) KDE3 Kiosk Application API ========================== -Three new methods have been added to KApplication: +Three new methods have been added to TDEApplication: - bool authorize(QString action); // Generic actions - bool authorizeKAction(QString action); // For KActions exclusively diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo index 496f75ecd..91d87329f 100644 --- a/tdecore/README.kstartupinfo +++ b/tdecore/README.kstartupinfo @@ -30,7 +30,7 @@ ASNs which will stay too long until a timeout ). For improving the quality of ASN and reducing the number of ASNs that don't detect when the application has started, some .desktop file entries may be helpful ( see below ). If you want to start an application in your code, prefer using KRun or -KApplication::startServiceByXXX() calls. Classes like KProcess don't create +TDEApplication::startServiceByXXX() calls. Classes like KProcess don't create ASN, so if you need to use it, you have to send it manually ( only in case ASN is useful in this case, it shouldn't be sent e.g. for system processes ). @@ -148,8 +148,8 @@ forks into background, it sends the PID change. That's how compliant applications should work, and this support for ASN should be provided by toolkits. All KDE application should be compliant by now, since tdelibs do all the necessary things. The KDE_STARTUP_ENV variable -is read and unset in KApplication constructor, and _KDE_STARTUP_ID -is set on every toplevel window in KApplication::setTopWidget(). +is read and unset in TDEApplication constructor, and _KDE_STARTUP_ID +is set on every toplevel window in TDEApplication::setTopWidget(). However, majority of applications aren't compliant now, and even if I succeed making this thing a standard ( part of NETWM_SPEC or whatever ), there still will be old applications that won't behave diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp index 52175e2eb..41660e59a 100644 --- a/tdecore/kaccel.cpp +++ b/tdecore/kaccel.cpp @@ -71,11 +71,11 @@ // 2) If another widget accepts the AccelOverride, it will expect to get a normal // Qt generated KeyPress event afterwards. So we let Qt handle the X11 keyboard event // again. However, this will first generate an AccelOverride event, and we already -// had send that one. To compnesate for this, the global event filter in KApplication +// had send that one. To compnesate for this, the global event filter in TDEApplication // is instructed to eat the next AccelOveride event. Qt will then send a normal KeyPress // event and from then on everything is normal again. // -// kde_g_bKillAccelOverride is used to tell KApplication::notify to eat the next +// kde_g_bKillAccelOverride is used to tell TDEApplication::notify to eat the next // AccelOverride event. bool kde_g_bKillAccelOverride = false; @@ -147,7 +147,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent ) kapp->sendEvent( kapp->focusWidget(), &ke ); // If the Override event was accepted from a non-KAccel widget, - // then kill the next AccelOverride in KApplication::notify. + // then kill the next AccelOverride in TDEApplication::notify. if( ke.isAccepted() && !g_bAccelActivated ) kde_g_bKillAccelOverride = true; diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp index fc0198d87..e3ee63353 100644 --- a/tdecore/kappdcopiface.cpp +++ b/tdecore/kappdcopiface.cpp @@ -24,10 +24,10 @@ #include -KAppDCOPInterface::KAppDCOPInterface(KApplication * theKApp) +KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp) : DCOPObject( "MainApplication-Interface") { - m_KApplication = theKApp; + m_TDEApplication = theKApp; } KAppDCOPInterface::~KAppDCOPInterface() @@ -51,12 +51,12 @@ TQCString KAppDCOPInterface::caption() void KAppDCOPInterface::quit() { - m_KApplication->quit(); + m_TDEApplication->quit(); } void KAppDCOPInterface::updateUserTimestamp( ulong time ) { - m_KApplication->updateUserTimestamp( time ); + m_TDEApplication->updateUserTimestamp( time ); } void KAppDCOPInterface::reparseConfiguration() @@ -65,6 +65,6 @@ void KAppDCOPInterface::reparseConfiguration() } void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) { - m_KApplication->broadcastKeyCode(keyCode); + m_TDEApplication->broadcastKeyCode(keyCode); } diff --git a/tdecore/kappdcopiface.h b/tdecore/kappdcopiface.h index 187c9f5ae..164c8b115 100644 --- a/tdecore/kappdcopiface.h +++ b/tdecore/kappdcopiface.h @@ -26,12 +26,12 @@ #include #include "tdelibs_export.h" -class KApplication; +class TDEApplication; /** -This is the main interface to the KApplication. This will provide a consistant +This is the main interface to the TDEApplication. This will provide a consistant dcop interface to all KDE applications that use it. -@short DCOP interface to KApplication. +@short DCOP interface to TDEApplication. @author Ian Reinhart Geiser */ class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject @@ -41,10 +41,10 @@ K_DCOP public: /** Construct a new interface object. - @param theKapp - The parent KApplication object + @param theKapp - The parent TDEApplication object that will provide us with the functional interface. */ - KAppDCOPInterface( KApplication * theKapp ); + KAppDCOPInterface( TDEApplication * theKapp ); /** Destructor Cleans up the dcop connection. @@ -65,14 +65,14 @@ k_dcop: void updateUserTimestamp( ulong time ); /** - Send a fake keypress to all KApplication instances + Send a fake keypress to all TDEApplication instances For internal use in connecting insecure function keys to KDE applications while the X keyboard is locked. **/ void sendFakeKey( unsigned int keyCode); private: - KApplication *m_KApplication; + TDEApplication *m_TDEApplication; }; #endif diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index dd804107a..1f0dae669 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -175,10 +175,10 @@ KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm bool kde_kiosk_exception = false; // flag to disable kiosk restrictions bool kde_kiosk_admin = false; -KApplication* KApplication::KApp = 0L; -bool KApplication::loadedByKdeinit = false; -DCOPClient *KApplication::s_DCOPClient = 0L; -bool KApplication::s_dcopClientNeedsPostInit = false; +TDEApplication* TDEApplication::KApp = 0L; +bool TDEApplication::loadedByKdeinit = false; +DCOPClient *TDEApplication::s_DCOPClient = 0L; +bool TDEApplication::s_dcopClientNeedsPostInit = false; #ifdef Q_WS_X11 static Atom atom_DesktopWindow; @@ -230,7 +230,7 @@ static void kde_ice_ioerrorhandler( IceConn conn ) #endif #ifdef Q_WS_WIN -void KApplication_init_windows(bool GUIenabled); +void TDEApplication_init_windows(bool GUIenabled); class QAssistantClient; #endif @@ -238,10 +238,10 @@ class QAssistantClient; /* Private data to make keeping binary compatibility easier */ -class KApplicationPrivate +class TDEApplicationPrivate { public: - KApplicationPrivate() + TDEApplicationPrivate() : actionRestrictions( false ), refCount( 1 ), oldIceIOErrorHandler( 0 ), @@ -260,7 +260,7 @@ public: { } - ~KApplicationPrivate() + ~TDEApplicationPrivate() { #ifdef Q_WS_WIN delete qassistantclient; @@ -439,7 +439,7 @@ public: static TQPtrList*x11Filter = 0; static bool autoDcopRegistration = true; -void KApplication::installX11EventFilter( TQWidget* filter ) +void TDEApplication::installX11EventFilter( TQWidget* filter ) { if ( !filter ) return; @@ -449,12 +449,12 @@ void KApplication::installX11EventFilter( TQWidget* filter ) x11Filter->append( filter ); } -void KApplication::x11FilterDestroyed() +void TDEApplication::x11FilterDestroyed() { removeX11EventFilter( static_cast< const TQWidget* >( sender())); } -void KApplication::removeX11EventFilter( const TQWidget* filter ) +void TDEApplication::removeX11EventFilter( const TQWidget* filter ) { if ( !x11Filter || !filter ) return; @@ -471,7 +471,7 @@ void KApplication::removeX11EventFilter( const TQWidget* filter ) // in KAccelEventHandler so that the AccelOverride isn't sent twice. -- ellis, 19/10/02 extern bool kde_g_bKillAccelOverride; -bool KApplication::notify(TQObject *receiver, TQEvent *event) +bool TDEApplication::notify(TQObject *receiver, TQEvent *event) { TQEvent::Type t = event->type(); if (kde_g_bKillAccelOverride) @@ -583,7 +583,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) return TQApplication::notify(receiver, event); } -void KApplication::checkAppStartedSlot() +void TDEApplication::checkAppStartedSlot() { #if defined Q_WS_X11 KStartupInfo::handleAutoAppStartedSending(); @@ -604,7 +604,7 @@ static TQPtrList* sessionClients() instance specific config object. Syntax: "session/_" */ -TQString KApplication::sessionConfigName() const +TQString TDEApplication::sessionConfigName() const { TQString sessKey = sessionKey(); if ( sessKey.isEmpty() && !d->sessionKey.isEmpty() ) @@ -621,14 +621,14 @@ static SmcConn tmpSmcConnection = 0; #endif static TQTime* smModificationTime = 0; -KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName, +TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( argc, argv, GUIenabled ), KInstance(rAppName), #ifdef Q_WS_X11 display(0L), argb_visual(false), #endif - d (new KApplicationPrivate()) + d (new TDEApplicationPrivate()) { aIconPixmap.pm.icon = 0L; aIconPixmap.pm.miniIcon = 0L; @@ -646,7 +646,7 @@ KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName, d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -KApplication::KApplication( bool allowStyles, bool GUIenabled ) : +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), @@ -654,7 +654,7 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled ) : display(0L), argb_visual(false), #endif - d (new KApplicationPrivate) + d (new TDEApplicationPrivate) { aIconPixmap.pm.icon = 0L; aIconPixmap.pm.miniIcon = 0L; @@ -671,10 +671,10 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled ) : } #ifdef Q_WS_X11 -KApplication::KApplication( Display *dpy, bool allowStyles ) : +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 KApplicationPrivate) + KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) { aIconPixmap.pm.icon = 0L; aIconPixmap.pm.miniIcon = 0L; @@ -687,10 +687,10 @@ KApplication::KApplication( Display *dpy, bool allowStyles ) : d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, 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 KApplicationPrivate) + KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) { aIconPixmap.pm.icon = 0L; aIconPixmap.pm.miniIcon = 0L; @@ -704,11 +704,11 @@ KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, +TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, 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 KApplicationPrivate) + KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) { if ((visual) && (colormap)) getX11RGBAInformation(dpy); @@ -723,11 +723,11 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, +TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles, KInstance * _instance ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), - KInstance( _instance ), display(0L), d (new KApplicationPrivate) + KInstance( _instance ), display(0L), d (new TDEApplicationPrivate) { if ((visual) && (colormap)) getX11RGBAInformation(dpy); @@ -743,7 +743,7 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap } #endif -KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) : +TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) : TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), KInstance( _instance ), @@ -751,7 +751,7 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _insta display(0L), #endif argb_visual(false), - d (new KApplicationPrivate) + d (new TDEApplicationPrivate) { aIconPixmap.pm.icon = 0L; aIconPixmap.pm.miniIcon = 0L; @@ -768,12 +768,12 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _insta } #ifdef Q_WS_X11 -KApplication::KApplication(Display *display, int& argc, char** argv, const TQCString& rAppName, +TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( display ), KInstance(rAppName), display(0L), argb_visual(false), - d (new KApplicationPrivate()) + d (new TDEApplicationPrivate()) { aIconPixmap.pm.icon = 0L; aIconPixmap.pm.miniIcon = 0L; @@ -793,7 +793,7 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const TQCSt } #endif -int KApplication::xioErrhandler( Display* dpy ) +int TDEApplication::xioErrhandler( Display* dpy ) { if(kapp) { @@ -808,7 +808,7 @@ int KApplication::xioErrhandler( Display* dpy ) return 0; } -int KApplication::xErrhandler( Display* dpy, void* err_ ) +int TDEApplication::xErrhandler( Display* dpy, void* err_ ) { // no idea how to make forward decl. for XErrorEvent #ifdef Q_WS_X11 XErrorEvent* err = static_cast< XErrorEvent* >( err_ ); @@ -821,7 +821,7 @@ int KApplication::xErrhandler( Display* dpy, void* err_ ) return 0; } -void KApplication::iceIOErrorHandler( _IceConn *conn ) +void TDEApplication::iceIOErrorHandler( _IceConn *conn ) { emit shutDown(); @@ -846,7 +846,7 @@ public: } }; -void KApplication::init(bool GUIenabled) +void TDEApplication::init(bool GUIenabled) { d->guiEnabled = GUIenabled; if ((getuid() != geteuid()) || @@ -1030,7 +1030,7 @@ void KApplication::init(bool GUIenabled) } d->oldIceIOErrorHandler = IceSetIOErrorHandler( kde_ice_ioerrorhandler ); #elif defined(Q_WS_WIN) - KApplication_init_windows(GUIenabled); + TDEApplication_init_windows(GUIenabled); #else // FIXME(E): Implement for Qt Embedded #endif @@ -1057,7 +1057,7 @@ static int my_system (const char *command) { } -DCOPClient *KApplication::dcopClient() +DCOPClient *TDEApplication::dcopClient() { if (s_DCOPClient) return s_DCOPClient; @@ -1081,7 +1081,7 @@ DCOPClient *KApplication::dcopClient() return s_DCOPClient; } -void KApplication::dcopClientPostInit() +void TDEApplication::dcopClientPostInit() { if( s_dcopClientNeedsPostInit ) { @@ -1092,7 +1092,7 @@ void KApplication::dcopClientPostInit() } } -void KApplication::dcopAutoRegistration() +void TDEApplication::dcopAutoRegistration() { if (autoDcopRegistration) { @@ -1102,12 +1102,12 @@ void KApplication::dcopAutoRegistration() } } -void KApplication::disableAutoDcopRegistration() +void TDEApplication::disableAutoDcopRegistration() { autoDcopRegistration = false; } -KConfig* KApplication::sessionConfig() +KConfig* TDEApplication::sessionConfig() { if (pSessionConfig) return pSessionConfig; @@ -1117,16 +1117,16 @@ KConfig* KApplication::sessionConfig() return pSessionConfig; } -void KApplication::ref() +void TDEApplication::ref() { d->refCount++; - //kdDebug() << "KApplication::ref() : refCount = " << d->refCount << endl; + //kdDebug() << "TDEApplication::ref() : refCount = " << d->refCount << endl; } -void KApplication::deref() +void TDEApplication::deref() { d->refCount--; - //kdDebug() << "KApplication::deref() : refCount = " << d->refCount << endl; + //kdDebug() << "TDEApplication::deref() : refCount = " << d->refCount << endl; if ( d->refCount <= 0 ) quit(); } @@ -1153,11 +1153,11 @@ bool KSessionManaged::commitData(TQSessionManager&) } -void KApplication::disableSessionManagement() { +void TDEApplication::disableSessionManagement() { bSessionManagement = false; } -void KApplication::enableSessionManagement() { +void TDEApplication::enableSessionManagement() { bSessionManagement = true; #ifdef Q_WS_X11 // Session management support in Qt/TDE is awfully broken. @@ -1181,7 +1181,7 @@ void KApplication::enableSessionManagement() { } -bool KApplication::requestShutDown( +bool TDEApplication::requestShutDown( ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode ) { #ifdef Q_WS_X11 @@ -1244,7 +1244,7 @@ bool KApplication::requestShutDown( #endif } -void KApplication::propagateSessionManager() +void TDEApplication::propagateSessionManager() { #ifdef Q_WS_X11 TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); @@ -1279,7 +1279,7 @@ void KApplication::propagateSessionManager() #endif } -void KApplication::commitData( TQSessionManager& sm ) +void TDEApplication::commitData( TQSessionManager& sm ) { d->session_save = true; bool canceled = false; @@ -1352,7 +1352,7 @@ static void checkRestartVersion( TQSessionManager& sm ) sm.setRestartCommand( restartCommand ); } -void KApplication::saveState( TQSessionManager& sm ) +void TDEApplication::saveState( TQSessionManager& sm ) { d->session_save = true; #ifdef Q_WS_X11 @@ -1434,12 +1434,12 @@ void KApplication::saveState( TQSessionManager& sm ) d->session_save = false; } -bool KApplication::sessionSaving() const +bool TDEApplication::sessionSaving() const { return d->session_save; } -void KApplication::startKdeinit() +void TDEApplication::startKdeinit() { #ifndef Q_WS_WIN //TODO KInstance inst( "starttdeinitlock" ); @@ -1464,7 +1464,7 @@ void KApplication::startKdeinit() #endif } -void KApplication::dcopFailure(const TQString &msg) +void TDEApplication::dcopFailure(const TQString &msg) { static int failureCount = 0; failureCount++; @@ -1560,13 +1560,13 @@ static const KCmdLineOptions kde_options[] = }; void -KApplication::addCmdLineOptions() +TDEApplication::addCmdLineOptions() { TDECmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt"); TDECmdLineArgs::addCmdLineOptions(kde_options, "TDE", "tde"); } -void KApplication::parseCommandLine( ) +void TDEApplication::parseCommandLine( ) { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("tde"); @@ -1686,12 +1686,12 @@ void KApplication::parseCommandLine( ) } -TQString KApplication::geometryArgument() const +TQString TDEApplication::geometryArgument() const { return d->geometry_arg; } -TQPixmap KApplication::icon() const +TQPixmap TDEApplication::icon() const { if( !aIconPixmap.pm.icon) { aIconPixmap.pm.icon = new TQPixmap; @@ -1702,12 +1702,12 @@ TQPixmap KApplication::icon() const return *aIconPixmap.pm.icon; } -TQString KApplication::iconName() const +TQString TDEApplication::iconName() const { return aIconName.isNull() ? (TQString)instanceName() : aIconName; } -TQPixmap KApplication::miniIcon() const +TQPixmap TDEApplication::miniIcon() const { if (!aIconPixmap.pm.miniIcon) { aIconPixmap.pm.miniIcon = new TQPixmap; @@ -1718,14 +1718,14 @@ TQPixmap KApplication::miniIcon() const return *aIconPixmap.pm.miniIcon; } -TQString KApplication::miniIconName() const +TQString TDEApplication::miniIconName() const { return aMiniIconName.isNull() ? (TQString)instanceName() : aMiniIconName; } extern void kDebugCleanup(); -KApplication::~KApplication() +TDEApplication::~TDEApplication() { delete aIconPixmap.pm.miniIcon; aIconPixmap.pm.miniIcon = 0L; @@ -1784,7 +1784,7 @@ public: #endif #if defined(Q_WS_X11) && defined(COMPOSITE) -bool KApplication::isCompositionManagerAvailable() { +bool TDEApplication::isCompositionManagerAvailable() { bool have_manager = false; const char *home; struct passwd *p; @@ -1816,7 +1816,7 @@ bool KApplication::isCompositionManagerAvailable() { return have_manager; } -bool KApplication::detectCompositionManagerAvailable(bool force_available, bool available) { +bool TDEApplication::detectCompositionManagerAvailable(bool force_available, bool available) { bool compositing_manager_available; if (force_available) { compositing_manager_available = available; @@ -1895,7 +1895,7 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available, bool return compositing_manager_available; } -Display* KApplication::openX11RGBADisplay() { +Display* TDEApplication::openX11RGBADisplay() { TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt"); char *display = 0; if ( qtargs->isSet("display")) @@ -1910,9 +1910,9 @@ Display* KApplication::openX11RGBADisplay() { return dpy; } -Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) { +Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { getX11RGBAInformation(dpy); - if (KApplication::isCompositionManagerAvailable() == true) { + if (TDEApplication::isCompositionManagerAvailable() == true) { return argb_x11_visual; } else { @@ -1920,9 +1920,9 @@ Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) { } } -Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) { +Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { getX11RGBAInformation(dpy); - if (KApplication::isCompositionManagerAvailable() == true) { + if (TDEApplication::isCompositionManagerAvailable() == true) { return argb_x11_colormap; } else { @@ -1930,11 +1930,11 @@ Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) { } } -bool KApplication::isX11CompositionAvailable() { +bool TDEApplication::isX11CompositionAvailable() { return (argb_visual & isCompositionManagerAvailable()); } -void KApplication::getX11RGBAInformation(Display *dpy) { +void TDEApplication::getX11RGBAInformation(Display *dpy) { if ( !dpy ) { argb_visual = false; return; @@ -1976,14 +1976,14 @@ void KApplication::getX11RGBAInformation(Display *dpy) { return; } #else -void KApplication::getX11RGBAInformation(Display *dpy) { +void TDEApplication::getX11RGBAInformation(Display *dpy) { } -bool KApplication::isCompositionManagerAvailable() { +bool TDEApplication::isCompositionManagerAvailable() { return false; } -bool KApplication::detectCompositionManagerAvailable(bool force_available) { +bool TDEApplication::detectCompositionManagerAvailable(bool force_available) { const char *home; struct passwd *p; p = getpwuid(getuid()); @@ -2021,36 +2021,36 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available) { return false; } -Display* KApplication::openX11RGBADisplay() { +Display* TDEApplication::openX11RGBADisplay() { return 0; } -Qt::HANDLE KApplication::getX11RGBAVisual(char *display) { +Qt::HANDLE TDEApplication::getX11RGBAVisual(char *display) { return 0; } -Qt::HANDLE KApplication::getX11RGBAColormap(char *display) { +Qt::HANDLE TDEApplication::getX11RGBAColormap(char *display) { return 0; } -bool KApplication::isX11CompositionAvailable() { +bool TDEApplication::isX11CompositionAvailable() { return false; } -KApplication KApplication::KARGBApplication( bool allowStyles ) { - return KApplication::KApplication(allowStyles, true); +TDEApplication TDEApplication::KARGBApplication( bool allowStyles ) { + return TDEApplication::TDEApplication(allowStyles, true); } #endif static bool kapp_block_user_input = false; -void KApplication::dcopBlockUserInput( bool b ) +void TDEApplication::dcopBlockUserInput( bool b ) { kapp_block_user_input = b; } #ifdef Q_WS_X11 -bool KApplication::x11EventFilter( XEvent *_event ) +bool TDEApplication::x11EventFilter( XEvent *_event ) { switch ( _event->type ) { case ClientMessage: @@ -2185,7 +2185,7 @@ bool KApplication::x11EventFilter( XEvent *_event ) } #endif // Q_WS_X11 -void KApplication::updateUserTimestamp( unsigned long time ) +void TDEApplication::updateUserTimestamp( unsigned long time ) { #if defined Q_WS_X11 if( time == 0 ) @@ -2205,7 +2205,7 @@ void KApplication::updateUserTimestamp( unsigned long time ) #endif } -unsigned long KApplication::userTimestamp() const +unsigned long TDEApplication::userTimestamp() const { #if defined Q_WS_X11 return GET_QT_X_USER_TIME(); @@ -2214,7 +2214,7 @@ unsigned long KApplication::userTimestamp() const #endif } -void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time ) +void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time ) { #if defined Q_WS_X11 if( time == 0 ) @@ -2223,7 +2223,7 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned #endif } -void KApplication::invokeEditSlot( const char *slot ) +void TDEApplication::invokeEditSlot( const char *slot ) { TQObject *object = TQT_TQOBJECT(focusWidget()); if( !object ) @@ -2238,7 +2238,7 @@ void KApplication::invokeEditSlot( const char *slot ) object->tqt_invoke( idx, 0 ); } -void KApplication::addKipcEventMask(int id) +void TDEApplication::addKipcEventMask(int id) { if (id >= 32) { @@ -2248,7 +2248,7 @@ void KApplication::addKipcEventMask(int id) kipcEventMask |= (1 << id); } -void KApplication::removeKipcEventMask(int id) +void TDEApplication::removeKipcEventMask(int id) { if (id >= 32) { @@ -2258,7 +2258,7 @@ void KApplication::removeKipcEventMask(int id) kipcEventMask &= ~(1 << id); } -void KApplication::enableStyles() +void TDEApplication::enableStyles() { if (!useStyles) { @@ -2267,12 +2267,12 @@ void KApplication::enableStyles() } } -void KApplication::disableStyles() +void TDEApplication::disableStyles() { useStyles = false; } -void KApplication::applyGUIStyle() +void TDEApplication::applyGUIStyle() { if ( !useStyles ) return; @@ -2299,7 +2299,7 @@ void KApplication::applyGUIStyle() kdisplaySetPalette(); } -TQString KApplication::caption() const +TQString TDEApplication::caption() const { // Caption set from command line ? if( !aCaption.isNull() ) @@ -2318,7 +2318,7 @@ TQString KApplication::caption() const // 1999-09-20: Espen Sand // An attempt to simplify consistent captions. // -TQString KApplication::makeStdCaption( const TQString &userCaption, +TQString TDEApplication::makeStdCaption( const TQString &userCaption, bool withAppName, bool modified ) const { TQString s = userCaption.isEmpty() ? caption() : userCaption; @@ -2337,14 +2337,14 @@ TQString KApplication::makeStdCaption( const TQString &userCaption, return s; } -TQPalette KApplication::createApplicationPalette() +TQPalette TDEApplication::createApplicationPalette() { KConfig *config = KGlobal::config(); KConfigGroupSaver saver( config, "General" ); return createApplicationPalette( config, KGlobalSettings::contrast() ); } -TQPalette KApplication::createApplicationPalette( KConfig *config, int contrast_ ) +TQPalette TDEApplication::createApplicationPalette( KConfig *config, int contrast_ ) { TQColor trinity4Background( 239, 239, 239 ); TQColor trinity4Blue( 103,141,178 ); @@ -2435,7 +2435,7 @@ TQPalette KApplication::createApplicationPalette( KConfig *config, int contrast_ } -void KApplication::kdisplaySetPalette() +void TDEApplication::kdisplaySetPalette() { #ifdef Q_WS_MACX //Can I have this on other platforms, please!? --Sam @@ -2453,7 +2453,7 @@ void KApplication::kdisplaySetPalette() } -void KApplication::kdisplaySetFont() +void TDEApplication::kdisplaySetFont() { TQApplication::setFont(KGlobalSettings::generalFont(), true); TQApplication::setFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); @@ -2471,7 +2471,7 @@ void KApplication::kdisplaySetFont() } -void KApplication::kdisplaySetStyle() +void TDEApplication::kdisplaySetStyle() { if (useStyles) { @@ -2482,7 +2482,7 @@ void KApplication::kdisplaySetStyle() } -void KApplication::propagateSettings(SettingsCategory arg) +void TDEApplication::propagateSettings(SettingsCategory arg) { KConfigBase* config = KGlobal::config(); KConfigGroupSaver saver( config, "KDE" ); @@ -2524,7 +2524,7 @@ void KApplication::propagateSettings(SettingsCategory arg) emit settingsChanged(arg); } -void KApplication::installKDEPropertyMap() +void TDEApplication::installKDEPropertyMap() { #ifndef QT_NO_SQL static bool installed = false; @@ -2566,7 +2566,7 @@ void KApplication::installKDEPropertyMap() #endif } -void KApplication::invokeHelp( const TQString& anchor, +void TDEApplication::invokeHelp( const TQString& anchor, const TQString& _appname) const { return invokeHelp( anchor, _appname, "" ); @@ -2575,7 +2575,7 @@ void KApplication::invokeHelp( const TQString& anchor, #ifndef Q_WS_WIN // for win32 we're using simple help tools like Qt Assistant, // see kapplication_win.cpp -void KApplication::invokeHelp( const TQString& anchor, +void TDEApplication::invokeHelp( const TQString& anchor, const TQString& _appname, const TQCString& startup_id ) const { @@ -2609,7 +2609,7 @@ void KApplication::invokeHelp( const TQString& anchor, } #endif -void KApplication::invokeHTMLHelp( const TQString& _filename, const TQString& topic ) const +void TDEApplication::invokeHTMLHelp( const TQString& _filename, const TQString& topic ) const { kdWarning() << "invoking HTML help is deprecated! use docbook and invokeHelp!\n"; @@ -2644,28 +2644,28 @@ void KApplication::invokeHTMLHelp( const TQString& _filename, const TQString& to } -void KApplication::invokeMailer(const TQString &address, const TQString &subject) +void TDEApplication::invokeMailer(const TQString &address, const TQString &subject) { return invokeMailer(address,subject,""); } -void KApplication::invokeMailer(const TQString &address, const TQString &subject, const TQCString& startup_id) +void TDEApplication::invokeMailer(const TQString &address, const TQString &subject, const TQCString& startup_id) { invokeMailer(address, TQString::null, TQString::null, subject, TQString::null, TQString::null, TQStringList(), startup_id ); } -void KApplication::invokeMailer(const KURL &mailtoURL) +void TDEApplication::invokeMailer(const KURL &mailtoURL) { return invokeMailer( mailtoURL, "" ); } -void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id ) +void TDEApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id ) { return invokeMailer( mailtoURL, startup_id, false); } -void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id, bool allowAttachments ) +void TDEApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id, bool allowAttachments ) { TQString address = KURL::decode_string(mailtoURL.path()), subject, cc, bcc, body; TQStringList queries = TQStringList::split('&', mailtoURL.query().mid(1)); @@ -2698,7 +2698,7 @@ void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_ invokeMailer( address, cc, bcc, subject, body, TQString::null, attachURLs, startup_id ); } -void KApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc, +void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc, const TQString &subject, const TQString &body, const TQString & messageFile, const TQStringList &attachURLs) { @@ -2780,7 +2780,7 @@ static TQStringList splitEmailAddressList( const TQString & aStr ) return list; } -void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString &_bcc, +void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString &_bcc, const TQString &subject, const TQString &body, const TQString & /*messageFile TODO*/, const TQStringList &attachURLs, const TQCString& startup_id ) @@ -2913,7 +2913,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const } #endif -void KApplication::invokeBrowser( const TQString &url ) +void TDEApplication::invokeBrowser( const TQString &url ) { return invokeBrowser( url, "" ); } @@ -2921,7 +2921,7 @@ void KApplication::invokeBrowser( const TQString &url ) #ifndef Q_WS_WIN // on win32, for invoking browser we're using win32 API // see kapplication_win.cpp -void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) +void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) { TQString error; @@ -2937,38 +2937,38 @@ void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_ } #endif -void KApplication::cut() +void TDEApplication::cut() { invokeEditSlot( TQT_SLOT( cut() ) ); } -void KApplication::copy() +void TDEApplication::copy() { invokeEditSlot( TQT_SLOT( copy() ) ); } -void KApplication::paste() +void TDEApplication::paste() { invokeEditSlot( TQT_SLOT( paste() ) ); } -void KApplication::clear() +void TDEApplication::clear() { invokeEditSlot( TQT_SLOT( clear() ) ); } -void KApplication::selectAll() +void TDEApplication::selectAll() { invokeEditSlot( TQT_SLOT( selectAll() ) ); } -void KApplication::broadcastKeyCode(unsigned int keyCode) +void TDEApplication::broadcastKeyCode(unsigned int keyCode) { emit coreFakeKeyPress(keyCode); } TQCString -KApplication::launcher() +TDEApplication::launcher() { return "klauncher"; } @@ -3010,7 +3010,7 @@ startServiceInternal( const TQCString &function, stream << _name << URLs; TQCString replyType; TQByteArray replyData; - TQCString _launcher = KApplication::launcher(); + TQCString _launcher = TDEApplication::launcher(); TQValueList envs; #ifdef Q_WS_X11 if (tqt_xdisplay()) { @@ -3057,7 +3057,7 @@ startServiceInternal( const TQCString &function, } int -KApplication::startServiceByName( const TQString& _name, const TQString &URL, +TDEApplication::startServiceByName( const TQString& _name, const TQString &URL, TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait ) { TQStringList URLs; @@ -3069,7 +3069,7 @@ KApplication::startServiceByName( const TQString& _name, const TQString &URL, } int -KApplication::startServiceByName( const TQString& _name, const TQStringList &URLs, +TDEApplication::startServiceByName( const TQString& _name, const TQStringList &URLs, TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait ) { return startServiceInternal( @@ -3078,7 +3078,7 @@ KApplication::startServiceByName( const TQString& _name, const TQStringList &URL } int -KApplication::startServiceByDesktopPath( const TQString& _name, const TQString &URL, +TDEApplication::startServiceByDesktopPath( const TQString& _name, const TQString &URL, TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait ) { TQStringList URLs; @@ -3090,7 +3090,7 @@ KApplication::startServiceByDesktopPath( const TQString& _name, const TQString & } int -KApplication::startServiceByDesktopPath( const TQString& _name, const TQStringList &URLs, +TDEApplication::startServiceByDesktopPath( const TQString& _name, const TQStringList &URLs, TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait ) { return startServiceInternal( @@ -3099,7 +3099,7 @@ KApplication::startServiceByDesktopPath( const TQString& _name, const TQStringLi } int -KApplication::startServiceByDesktopName( const TQString& _name, const TQString &URL, +TDEApplication::startServiceByDesktopName( const TQString& _name, const TQString &URL, TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait ) { TQStringList URLs; @@ -3111,7 +3111,7 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQString & } int -KApplication::startServiceByDesktopName( const TQString& _name, const TQStringList &URLs, +TDEApplication::startServiceByDesktopName( const TQString& _name, const TQStringList &URLs, TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait ) { return startServiceInternal( @@ -3120,14 +3120,14 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi } int -KApplication::tdeinitExec( const TQString& name, const TQStringList &args, +TDEApplication::tdeinitExec( const TQString& name, const TQStringList &args, TQString *error, int *pid ) { return tdeinitExec( name, args, error, pid, "" ); } int -KApplication::tdeinitExec( const TQString& name, const TQStringList &args, +TDEApplication::tdeinitExec( const TQString& name, const TQStringList &args, TQString *error, int *pid, const TQCString& startup_id ) { return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList,TQCString)", @@ -3135,27 +3135,27 @@ KApplication::tdeinitExec( const TQString& name, const TQStringList &args, } int -KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args, +TDEApplication::tdeinitExecWait( const TQString& name, const TQStringList &args, TQString *error, int *pid ) { return tdeinitExecWait( name, args, error, pid, "" ); } int -KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args, +TDEApplication::tdeinitExecWait( const TQString& name, const TQStringList &args, TQString *error, int *pid, const TQCString& startup_id ) { return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList,TQCString)", name, args, error, 0, pid, startup_id, false); } -TQString KApplication::tempSaveName( const TQString& pFilename ) const +TQString TDEApplication::tempSaveName( const TQString& pFilename ) const { TQString aFilename; if( TQDir::isRelativePath(pFilename) ) { - kdWarning(101) << "Relative filename passed to KApplication::tempSaveName" << endl; + kdWarning(101) << "Relative filename passed to TDEApplication::tempSaveName" << endl; aFilename = TQFileInfo( TQDir( "." ), pFilename ).absFilePath(); } else @@ -3177,14 +3177,14 @@ TQString KApplication::tempSaveName( const TQString& pFilename ) const } -TQString KApplication::checkRecoverFile( const TQString& pFilename, +TQString TDEApplication::checkRecoverFile( const TQString& pFilename, bool& bRecover ) const { TQString aFilename; if( TQDir::isRelativePath(pFilename) ) { - kdWarning(101) << "Relative filename passed to KApplication::tempSaveName" << endl; + kdWarning(101) << "Relative filename passed to TDEApplication::tempSaveName" << endl; aFilename = TQFileInfo( TQDir( "." ), pFilename ).absFilePath(); } else @@ -3249,7 +3249,7 @@ bool checkAccess(const TQString& pathname, int mode) return false; // No } -void KApplication::setTopWidget( TQWidget *topWidget ) +void TDEApplication::setTopWidget( TQWidget *topWidget ) { if( !topWidget ) return; @@ -3270,12 +3270,12 @@ void KApplication::setTopWidget( TQWidget *topWidget ) #endif } -TQCString KApplication::startupId() const +TQCString TDEApplication::startupId() const { return d->startup_id; } -void KApplication::setStartupId( const TQCString& startup_id ) +void TDEApplication::setStartupId( const TQCString& startup_id ) { if( startup_id == d->startup_id ) return; @@ -3299,7 +3299,7 @@ void KApplication::setStartupId( const TQCString& startup_id ) // read the startup notification env variable, save it and unset it in order // not to propagate it to processes started from this app -void KApplication::read_app_startup_id() +void TDEApplication::read_app_startup_id() { #if defined Q_WS_X11 KStartupInfoId id = KStartupInfo::currentStartupIdEnv(); @@ -3308,7 +3308,7 @@ void KApplication::read_app_startup_id() #endif } -int KApplication::random() +int TDEApplication::random() { static bool init = false; if (!init) @@ -3328,7 +3328,7 @@ int KApplication::random() return rand(); } -TQString KApplication::randomString(int length) +TQString TDEApplication::randomString(int length) { if (length <=0 ) return TQString::null; @@ -3346,7 +3346,7 @@ TQString KApplication::randomString(int length) return str; } -bool KApplication::authorize(const TQString &genericAction) +bool TDEApplication::authorize(const TQString &genericAction) { if (!d->actionRestrictions) return true; @@ -3356,7 +3356,7 @@ bool KApplication::authorize(const TQString &genericAction) return config->readBoolEntry(genericAction, true); } -bool KApplication::authorizeKAction(const char *action) +bool TDEApplication::authorizeKAction(const char *action) { if (!d->actionRestrictions || !action) return true; @@ -3366,7 +3366,7 @@ bool KApplication::authorizeKAction(const char *action) return authorize(action_prefix + action); } -bool KApplication::authorizeControlModule(const TQString &menuId) +bool TDEApplication::authorizeControlModule(const TQString &menuId) { if (menuId.isEmpty() || kde_kiosk_exception) return true; @@ -3375,7 +3375,7 @@ bool KApplication::authorizeControlModule(const TQString &menuId) return config->readBoolEntry(menuId, true); } -TQStringList KApplication::authorizeControlModules(const TQStringList &menuIds) +TQStringList TDEApplication::authorizeControlModules(const TQStringList &menuIds) { KConfig *config = KGlobal::config(); KConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); @@ -3389,41 +3389,41 @@ TQStringList KApplication::authorizeControlModules(const TQStringList &menuIds) return result; } -void KApplication::initUrlActionRestrictions() +void TDEApplication::initUrlActionRestrictions() { d->urlActionRestrictions.setAutoDelete(true); d->urlActionRestrictions.clear(); - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("open", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true)); - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("list", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true)); // TEST: -// d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule +// d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule // ("list", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, false)); -// d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule +// d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule // ("list", TQString::null, TQString::null, TQString::null, "file", TQString::null, TQDir::homeDirPath(), true)); - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("link", TQString::null, TQString::null, TQString::null, ":internet", TQString::null, TQString::null, true)); - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", TQString::null, TQString::null, TQString::null, ":internet", TQString::null, TQString::null, true)); // We allow redirections to file: but not from internet protocols, redirecting to file: // is very popular among io-slaves and we don't want to break them - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", TQString::null, TQString::null, TQString::null, "file", TQString::null, TQString::null, true)); - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", ":internet", TQString::null, TQString::null, "file", TQString::null, TQString::null, false)); // local protocols may redirect everywhere - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", ":local", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true)); // Anyone may redirect to about: - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", TQString::null, TQString::null, TQString::null, "about", TQString::null, TQString::null, true)); // Anyone may redirect to itself, cq. within it's own group - d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", TQString::null, TQString::null, TQString::null, "=", TQString::null, TQString::null, true)); KConfig *config = KGlobal::config(); @@ -3461,22 +3461,22 @@ void KApplication::initUrlActionRestrictions() if (urlPath.startsWith("$TMP")) urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp")); - d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule ( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled)); } } -void KApplication::allowURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL) +void TDEApplication::allowURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL) { if (authorizeURLAction(action, _baseURL, _destURL)) return; - d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule + d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule ( action, _baseURL.protocol(), _baseURL.host(), _baseURL.path(-1), _destURL.protocol(), _destURL.host(), _destURL.path(-1), true)); } -bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL) +bool TDEApplication::authorizeURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL) { if (_destURL.isEmpty()) return true; @@ -3492,7 +3492,7 @@ bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseU destURL.setPath(TQDir::cleanDirPath(destURL.path())); TQString destClass = KProtocolInfo::protocolClass(destURL.protocol()); - for(KApplicationPrivate::URLActionRule *rule = d->urlActionRestrictions.first(); + for(TDEApplicationPrivate::URLActionRule *rule = d->urlActionRestrictions.first(); rule; rule = d->urlActionRestrictions.next()) { if ((result != rule->permission) && // No need to check if it doesn't make a difference @@ -3507,7 +3507,7 @@ bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseU } -uint KApplication::keyboardModifiers() +uint TDEApplication::keyboardModifiers() { #ifdef Q_WS_X11 Window root; @@ -3525,7 +3525,7 @@ uint KApplication::keyboardModifiers() #endif } -uint KApplication::mouseState() +uint TDEApplication::mouseState() { uint mousestate; #ifdef Q_WS_X11 @@ -3550,7 +3550,7 @@ uint KApplication::mouseState() return mousestate & 0xff00; } -TQ_ButtonState KApplication::keyboardMouseState() +TQ_ButtonState TDEApplication::keyboardMouseState() { int ret = 0; #ifdef Q_WS_X11 @@ -3597,7 +3597,7 @@ TQ_ButtonState KApplication::keyboardMouseState() return static_cast< ButtonState >( ret ); } -void KApplication::installSigpipeHandler() +void TDEApplication::installSigpipeHandler() { #ifdef Q_OS_UNIX struct sigaction act; @@ -3608,7 +3608,7 @@ void KApplication::installSigpipeHandler() #endif } -void KApplication::sigpipeHandler(int) +void TDEApplication::sigpipeHandler(int) { int saved_errno = errno; // Using kdDebug from a signal handler is not a good idea. @@ -3624,12 +3624,12 @@ void KApplication::sigpipeHandler(int) errno = saved_errno; } -bool KApplication::guiEnabled() +bool TDEApplication::guiEnabled() { return kapp && kapp->d->guiEnabled; } -void KApplication::virtual_hook( int id, void* data ) +void TDEApplication::virtual_hook( int id, void* data ) { KInstance::virtual_hook( id, data ); } void KSessionManaged::virtual_hook( int, void* ) diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index 6793c9510..89aaab2e2 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -48,9 +48,9 @@ class KSessionManaged; class KStyle; class KURL; -#define kapp KApplication::kApplication() +#define kapp TDEApplication::kApplication() -class KApplicationPrivate; +class TDEApplicationPrivate; /** * Controls and provides information to all KDE applications. @@ -68,10 +68,10 @@ class KApplicationPrivate; * @li Installs a signal handler for the SIGCHLD signal in order to * avoid zombie children. If you want to catch this signal yourself or * don't want it to be caught at all, you have set a new signal handler -* (or SIG_IGN) after KApplication's constructor has run. +* (or SIG_IGN) after TDEApplication's constructor has run. * @li Installs an empty signal handler for the SIGPIPE signal using * installSigpipeHandler(). If you want to catch this signal -* yourself, you have set a new signal handler after KApplication's +* yourself, you have set a new signal handler after TDEApplication's * constructor has run. * @li It can start new services * @@ -93,7 +93,7 @@ class KApplicationPrivate; * @short Controls and provides information to all KDE applications. * @author Matthias Kalle Dalheimer */ -class TDECORE_EXPORT KApplication : public TQApplication, public KInstance +class TDECORE_EXPORT TDEApplication : public TQApplication, public KInstance { Q_OBJECT @@ -115,9 +115,9 @@ public: * * If ARGB (transparent) widgets are to be used in your application, * please use - * KApplication app(KApplication::openX11RGBADisplay()); + * TDEApplication app(TDEApplication::openX11RGBADisplay()); * or - * KApplication app(KApplication::openX11RGBADisplay(), useStyles); + * TDEApplication app(TDEApplication::openX11RGBADisplay(), useStyles); * * @param allowStyles Set to false to disable the loading on plugin based * styles. This is only useful to applications that do not display a GUI @@ -128,7 +128,7 @@ public: * @param GUIenabled Set to false to disable all GUI stuff. This implies * no styles either. */ - KApplication( bool allowStyles=true, bool GUIenabled=true); + TDEApplication( bool allowStyles=true, bool GUIenabled=true); #ifdef Q_WS_X11 /** @@ -148,7 +148,7 @@ public: * * @see RGBADisplay() */ - KApplication(Display *display, bool allowStyles); + TDEApplication(Display *display, bool allowStyles); /** * Constructor. Parses command-line arguments. Use this constructor when you @@ -177,7 +177,7 @@ public: * * @see RGBADisplay() */ - KApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles); + TDEApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles); /** * Constructor. Parses command-line arguments. Use this constructor when you @@ -202,11 +202,11 @@ public: * * @since KDE 3.3 */ - KApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, + TDEApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true); /** - * Constructor. Parses command-line arguments. Use this constructor to use KApplication + * Constructor. Parses command-line arguments. Use this constructor to use TDEApplication * in a Motif or Xt program. * * @param display Will be passed to Qt as the X display. The display must be valid and already @@ -229,7 +229,7 @@ public: * @param GUIenabled Set to false to disable all GUI stuff. This implies * no styles either. */ - KApplication(Display *display, int& argc, char** argv, const TQCString& rAppName, + TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true); #endif @@ -257,7 +257,7 @@ public: */ // REMOVE FOR KDE 4.0 - using it only gives crashing applications because // TDECmdLineArgs::init isn't called - KApplication(int& argc, char** argv, + TDEApplication(int& argc, char** argv, const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true) KDE_DEPRECATED; /** @@ -265,19 +265,19 @@ public: */ static void addCmdLineOptions(); - virtual ~KApplication(); + virtual ~TDEApplication(); /** * Returns the current application object. * * This is similar to the global TQApplication pointer tqApp. It - * allows access to the single global KApplication object, since + * allows access to the single global TDEApplication object, since * more than one cannot be created in the same application. It * saves you the trouble of having to pass the pointer explicitly * to every function that may require it. * @return the current application object */ - static KApplication* kApplication() { return KApp; } + static TDEApplication* kApplication() { return KApp; } /** * Returns the application session config object. @@ -450,7 +450,7 @@ public: /** * Disable automatic dcop registration - * Must be called before creating a KApplication instance to have an effect. + * Must be called before creating a TDEApplication instance to have an effect. */ static void disableAutoDcopRegistration(); @@ -951,10 +951,10 @@ public: /** * @internal * Opens the display - * This can be used to initialize a KApplication with RGBA support like this: - * KApplication app(KApplication::openX11RGBADisplay()); + * This can be used to initialize a TDEApplication with RGBA support like this: + * TDEApplication app(TDEApplication::openX11RGBADisplay()); * or - * KApplication app(KApplication::openX11RGBADisplay(), useStyles); + * TDEApplication app(TDEApplication::openX11RGBADisplay(), useStyles); */ static Display* openX11RGBADisplay(); @@ -978,7 +978,7 @@ public: * You must first call getX11RGBAInformation() * * Note that getX11RGBAInformation() has already - * been called if you used the default KApplication + * been called if you used the default TDEApplication * constructor. * * Additionally, at least one application must have called @@ -994,7 +994,7 @@ public: * Enables style plugins. * * This is useful only to applications that normally - * do not display a GUI and create the KApplication with + * do not display a GUI and create the TDEApplication with * allowStyles set to false. */ void enableStyles(); @@ -1215,7 +1215,7 @@ public: public slots: /** - * Tells KApplication about one more operation that should be finished + * Tells TDEApplication about one more operation that should be finished * before the application exits. The standard behavior is to exit on the * "last window closed" event, but some events should outlive the last window closed * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client). @@ -1223,7 +1223,7 @@ public slots: void ref(); /** - * Tells KApplication that one operation such as those described in ref() just finished. + * Tells TDEApplication that one operation such as those described in ref() just finished. * The application exits if the counter is back to 0. */ void deref(); @@ -1232,13 +1232,13 @@ protected: /** * @internal Used by KUniqueApplication */ - KApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ); + TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ); #ifdef Q_WS_X11 /** * @internal Used by KUniqueApplication */ - KApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, + TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles, KInstance* _instance ); /** @@ -1252,7 +1252,7 @@ protected: int kipcEventMask; /// Current application object. - static KApplication *KApp; + static TDEApplication *KApp; int pArgc; /** @@ -1261,8 +1261,8 @@ protected: * * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() ) * - * This method can be used in KApplication subclasses to implement application wide - * edit actions not supported by the KApplication class. For example (in your subclass): + * This method can be used in TDEApplication subclasses to implement application wide + * edit actions not supported by the TDEApplication class. For example (in your subclass): * * \code * void MyApplication::deselect() @@ -1386,7 +1386,7 @@ public: * Installs a handler for the SIGPIPE signal. It is thrown when you write to * a pipe or socket that has been closed. * The handler is installed automatically in the constructor, but you may - * need it if your application or component does not have a KApplication + * need it if your application or component does not have a TDEApplication * instance. */ static void installSigpipeHandler(); @@ -1401,7 +1401,7 @@ public: signals: /** - * Emitted when KApplication has changed its palette due to a KControl request. + * Emitted when TDEApplication has changed its palette due to a KControl request. * * Normally, widgets will update their palette automatically, but you * should connect to this to program special behavior. @@ -1409,7 +1409,7 @@ signals: void kdisplayPaletteChanged(); /** - * Emitted when KApplication has changed its GUI style in response to a KControl request. + * Emitted when TDEApplication has changed its GUI style in response to a KControl request. * * Normally, widgets will update their styles automatically (as they would * respond to an explicit setGUIStyle() call), but you should connect to @@ -1418,7 +1418,7 @@ signals: void kdisplayStyleChanged(); /** - * Emitted when KApplication has changed its font in response to a KControl request. + * Emitted when TDEApplication has changed its font in response to a KControl request. * * Normally widgets will update their fonts automatically, but you should * connect to this to monitor global font changes, especially if you are @@ -1431,7 +1431,7 @@ signals: void kdisplayFontChanged(); /** - * Emitted when KApplication has changed either its GUI style, its font or its palette + * Emitted when TDEApplication has changed either its GUI style, its font or its palette * in response to a kdisplay request. Normally, widgets will update their styles * automatically, but you should connect to this to program special * behavior. */ @@ -1451,7 +1451,7 @@ signals: /** * Emitted when the global settings have been changed - see KGlobalSettings - * KApplication takes care of calling reparseConfiguration on KGlobal::config() + * TDEApplication takes care of calling reparseConfiguration on KGlobal::config() * so that applications/classes using this only have to re-read the configuration * @param category the category among the enum above */ @@ -1536,12 +1536,12 @@ private: int captionLayout; - KApplication(const KApplication&); - KApplication& operator=(const KApplication&); + TDEApplication(const TDEApplication&); + TDEApplication& operator=(const TDEApplication&); protected: virtual void virtual_hook( int id, void* data ); private: - KApplicationPrivate* d; + TDEApplicationPrivate* d; }; @@ -1572,7 +1572,7 @@ class KSessionManagedPrivate; KSessionManaged makes it possible to provide implementations for TQApplication::commitData() and TQApplication::saveState(), without - subclassing KApplication. KMainWindow internally makes use of this. + subclassing TDEApplication. KMainWindow internally makes use of this. You don't need to do anything with this class when using KMainWindow. Instead, use KMainWindow::saveProperties(), @@ -1591,7 +1591,7 @@ public: /** See TQApplication::saveState() for documentation. - This function is just a convenience version to avoid subclassing KApplication. + This function is just a convenience version to avoid subclassing TDEApplication. Return true to indicate a successful state save or false to indicate a problem and to halt the shutdown process (will @@ -1601,7 +1601,7 @@ public: /** See TQApplication::commitData() for documentation. - This function is just a convenience version to avoid subclassing KApplication. + This function is just a convenience version to avoid subclassing TDEApplication. Return true to indicate a successful commit of data or false to indicate a problem and to halt the shutdown process (will diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index abf0694b4..e5b19a28c 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -32,7 +32,7 @@ #include "shellapi.h" /** - * MS Windows-related actions for KApplication startup. + * MS Windows-related actions for TDEApplication startup. * * - Use Qt translation which will be usable for TQFileDialog * and other Qt-only GUIs. The "qt_.qm" file should be stored @@ -40,7 +40,7 @@ * * @internal */ -void KApplication_init_windows(bool /*GUIenabled*/) +void TDEApplication_init_windows(bool /*GUIenabled*/) { TQString qt_transl_file = ::locate( "locale", KGlobal::locale()->language() + "/LC_MESSAGES/qt_" + KGlobal::locale()->language() + ".qm" ); @@ -54,11 +54,11 @@ void KApplication_init_windows(bool /*GUIenabled*/) //unsafe; create kapplication_p.h instead! typedef void* IceIOErrorHandler; -class KApplicationPrivate +class TDEApplicationPrivate { public: - KApplicationPrivate(); - ~KApplicationPrivate(); + TDEApplicationPrivate(); + ~TDEApplicationPrivate(); bool actionRestrictions : 1; bool guiEnabled : 1; @@ -74,7 +74,7 @@ public: QAssistantClient* qassistantclient; }; -void KApplication::invokeHelp( const TQString& anchor, +void TDEApplication::invokeHelp( const TQString& anchor, const TQString& _appname, const TQCString& startup_id ) const { if (!d->qassistantclient) { @@ -90,14 +90,14 @@ void KApplication::invokeHelp( const TQString& anchor, // on win32, for invoking browser we're using win32 API // see kapplication_win.cpp -void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) +void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) { TQCString s = url.latin1(); const unsigned short *l = (const unsigned short *)s.data(); ShellExecuteA(0, "open", s.data(), 0, 0, SW_NORMAL); } -void KApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc, +void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc, const TQString &subject, const TQString &body, const TQString & /*messageFile TODO*/, const TQStringList &attachURLs, const TQCString& startup_id ) diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 1e3cafbae..4d77c3da2 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -189,7 +189,7 @@ void KClipboardSynchronizer::setReverseSynchronizing( bool enable ) self()->setupSignals(); } -// private, called by KApplication +// private, called by TDEApplication void KClipboardSynchronizer::newConfiguration( int config ) { s_sync = (config & Synchronize); diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h index 7facc86fd..c13959e61 100644 --- a/tdecore/kclipboard.h +++ b/tdecore/kclipboard.h @@ -40,7 +40,7 @@ class TDECORE_EXPORT KClipboardSynchronizer : public TQObject public: /** Systray widget for manipulating the clipboard. */ friend class KlipperWidget; - friend class KApplication; + friend class TDEApplication; /** * Returns the KClipboardSynchronizer singleton object. @@ -115,7 +115,7 @@ private: private: // needed by klipper enum Configuration { Synchronize = 1 }; - // called by KApplication upon kipc message, invoked by klipper + // called by TDEApplication upon kipc message, invoked by klipper static void newConfiguration( int config ); }; diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index 6550f9144..d9e564d4a 100644 --- a/tdecore/kcmdlineargs.cpp +++ b/tdecore/kcmdlineargs.cpp @@ -188,7 +188,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noK win32_slashify(mCwd, PATH_MAX); #endif if (!noKApp) - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); } TQString TDECmdLineArgs::cwd() @@ -671,7 +671,7 @@ TDECmdLineArgs::parseAllArgs() } /** - * For KApplication only: + * For TDEApplication only: * * Return argc */ @@ -679,7 +679,7 @@ int * TDECmdLineArgs::tqt_argc() { if (!argsList) - KApplication::addCmdLineOptions(); // Lazy bastards! + TDEApplication::addCmdLineOptions(); // Lazy bastards! static int tqt_argc = -1; if( tqt_argc != -1 ) @@ -702,7 +702,7 @@ TDECmdLineArgs::tqt_argc() } /** - * For KApplication only: + * For TDEApplication only: * * Return argv */ @@ -710,7 +710,7 @@ char *** TDECmdLineArgs::tqt_argv() { if (!argsList) - KApplication::addCmdLineOptions(); // Lazy bastards! + TDEApplication::addCmdLineOptions(); // Lazy bastards! static char** tqt_argv; if( tqt_argv != NULL ) diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h index 0b89fd3bb..142544aeb 100644 --- a/tdecore/kcmdlineargs.h +++ b/tdecore/kcmdlineargs.h @@ -68,7 +68,7 @@ struct TDECORE_EXPORT KCmdLineOptions #define KCmdLineLastOption { 0, 0, 0 } class TDECmdLineArgsList; -class KApplication; +class TDEApplication; class KUniqueApplication; class KCmdLineParsedOptions; class KCmdLineParsedArgs; @@ -107,7 +107,7 @@ class TDECmdLineArgsPrivate; * .... * * // Handle our own options/arguments - * // A KApplication will usually do this in main but this is not + * // A TDEApplication will usually do this in main but this is not * // necessary. * // A KUniqueApplication might want to handle it in newInstance(). * @@ -221,7 +221,7 @@ class TDECmdLineArgsPrivate; */ class TDECORE_EXPORT TDECmdLineArgs { - friend class KApplication; + friend class TDEApplication; friend class KUniqueApplication; friend class TQPtrList; public: @@ -242,7 +242,7 @@ public: * @param _description A short description of what your application is about. * @param _version A version. * @param noKApp Set this true to not add commandline options for - * TQApplication / KApplication + * TQApplication / TDEApplication * * @since 3.2 */ @@ -270,7 +270,7 @@ public: * @param _argv As passed to @p main(...). * @param about A KAboutData object describing your program. * @param noKApp Set this true to not add commandline options for - * TQApplication / KApplication + * TQApplication / TDEApplication */ static void init(int _argc, char **_argv, const KAboutData *about, bool noKApp = false); @@ -522,8 +522,8 @@ public: /** * Reset all option definitions, i.e. cancel all addCmdLineOptions calls. - * Note that KApplication's options are removed too, you might want to - * call KApplication::addCmdLineOptions if you want them back. + * Note that TDEApplication's options are removed too, you might want to + * call TDEApplication::addCmdLineOptions if you want them back. * * You usually don't want to call this method. */ @@ -582,14 +582,14 @@ private: static void parseAllArgs(); /** - * @internal for KApplication only: + * @internal for TDEApplication only: * * Return argc */ static int *tqt_argc(); /** - * @internal for KApplication only: + * @internal for TDEApplication only: * * Return argv */ @@ -648,7 +648,7 @@ private: void load( TQDataStream &); /** - * @internal for KApplication only + * @internal for TDEApplication only * * Initialize class. * diff --git a/tdecore/kconfig.cpp b/tdecore/kconfig.cpp index 709e39de3..968c45d02 100644 --- a/tdecore/kconfig.cpp +++ b/tdecore/kconfig.cpp @@ -294,7 +294,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile) { TQStringList args; args << "--check" << updateFile; - KApplication::tdeinitExecWait("kconf_update", args); + TDEApplication::tdeinitExecWait("kconf_update", args); reparseConfiguration(); } setGroup(oldGroup); diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp index 494f997f2..eb8f8c4cf 100644 --- a/tdecore/kconfig_compiler/example/autoexample.cpp +++ b/tdecore/kconfig_compiler/example/autoexample.cpp @@ -43,7 +43,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; ExamplePrefsBase configSkeleton( "dummy1", "dummy2" ); configSkeleton.readConfig(); diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/kconfig_compiler/example/example.cpp index b1afe7973..f15b4bb15 100644 --- a/tdecore/kconfig_compiler/example/example.cpp +++ b/tdecore/kconfig_compiler/example/example.cpp @@ -37,7 +37,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; ExamplePrefsBase *prefs = new ExamplePrefsBase("Trans1", "Folder2"); diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp index efb2a20a9..492d4f494 100644 --- a/tdecore/kconfigbackend.cpp +++ b/tdecore/kconfigbackend.cpp @@ -1178,7 +1178,7 @@ bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser) // Note: We don't ask the user if we should not ask this question again because we can't save the answer. errorMsg += i18n("Please contact your system administrator."); TQString cmdToExec = KStandardDirs::findExe(TQString("kdialog")); - KApplication *app = kapp; + TDEApplication *app = kapp; if (!cmdToExec.isEmpty() && app) { KProcess lprocess; diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h index 7c0706e46..600bceb69 100644 --- a/tdecore/kconfigbase.h +++ b/tdecore/kconfigbase.h @@ -1887,7 +1887,7 @@ protected: /** * Reads the locale and put in the configuration data struct. * Note that this should be done in the constructor, but this is not - * possible due to some mutual dependencies in KApplication::init() + * possible due to some mutual dependencies in TDEApplication::init() */ void setLocale(); diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp index af9cc6dd7..4a3b778d9 100644 --- a/tdecore/kcrash.cpp +++ b/tdecore/kcrash.cpp @@ -176,7 +176,7 @@ KCrash::defaultCrashHandler (int sig) // we have already tested this argv[i++] = "--appname"; argv[i++] = appName; - if (KApplication::loadedByKdeinit) + if (TDEApplication::loadedByKdeinit) argv[i++] = "--tdeinit"; // only add apppath if it's not NULL diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index 9f2d1458c..d3cc3c6b6 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -81,7 +81,7 @@ static TQCString getDescrFromNum(unsigned int _num) { if (!KDebugCache) { kdd.setObject(KDebugCache, new TQIntDict( 601 )); - // Do not call this deleter from ~KApplication + // Do not call this deleter from ~TDEApplication KGlobal::unregisterStaticDeleter(&kdd); KDebugCache->setAutoDelete(true); } @@ -175,7 +175,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char if ( !kDebug_data ) { pcd.setObject(kDebug_data, new kDebugPrivate()); - // Do not call this deleter from ~KApplication + // Do not call this deleter from ~TDEApplication KGlobal::unregisterStaticDeleter(&pcd); // create the dcop interface if it has not been created yet diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp index e7d259628..90b2e9444 100644 --- a/tdecore/kdetcompmgr.cpp +++ b/tdecore/kdetcompmgr.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; KConfig config("twinrc", true); config.setGroup( "Notification Messages" ); diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h index d7aadbc3f..931ee6a98 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -242,7 +242,7 @@ int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 ); * of other (but no less important) things. * * All KDE applications should link to the tdecore library. Also, using a - * KApplication derived class instead of TQApplication is almost + * TDEApplication derived class instead of TQApplication is almost * mandatory if you expect your application to behave nicely within the * KDE environment. */ diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index d257097bf..74cdaa603 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -266,7 +266,7 @@ TQColor KGlobalSettings::buttonTextColor() // IMPORTANT: // This function should be kept in sync with -// KApplication::kdisplaySetPalette() +// TDEApplication::kdisplaySetPalette() TQColor KGlobalSettings::baseColor() { KConfigGroup g( KGlobal::config(), "General" ); @@ -275,7 +275,7 @@ TQColor KGlobalSettings::baseColor() // IMPORTANT: // This function should be kept in sync with -// KApplication::kdisplaySetPalette() +// TDEApplication::kdisplaySetPalette() TQColor KGlobalSettings::textColor() { KConfigGroup g( KGlobal::config(), "General" ); @@ -284,7 +284,7 @@ TQColor KGlobalSettings::textColor() // IMPORTANT: // This function should be kept in sync with -// KApplication::kdisplaySetPalette() +// TDEApplication::kdisplaySetPalette() TQColor KGlobalSettings::highlightedTextColor() { KConfigGroup g( KGlobal::config(), "General" ); @@ -293,7 +293,7 @@ TQColor KGlobalSettings::highlightedTextColor() // IMPORTANT: // This function should be kept in sync with -// KApplication::kdisplaySetPalette() +// TDEApplication::kdisplaySetPalette() TQColor KGlobalSettings::highlightColor() { initColors(); diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h index 5fef2f67a..5fad8fa5a 100644 --- a/tdecore/kglobalsettings.h +++ b/tdecore/kglobalsettings.h @@ -543,15 +543,15 @@ private: */ static void initColors(); /** - * drop cached values for fonts (called by KApplication) + * drop cached values for fonts (called by TDEApplication) */ static void rereadFontSettings(); /** - * drop cached values for paths (called by KApplication) + * drop cached values for paths (called by TDEApplication) */ static void rereadPathSettings(); /** - * drop cached values for mouse settings (called by KApplication) + * drop cached values for mouse settings (called by TDEApplication) */ static void rereadMouseSettings(); @@ -578,7 +578,7 @@ private: static TQColor * alternateColor; static KMouseSettings *s_mouseSettings; - friend class KApplication; + friend class TDEApplication; }; #endif diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h index db5a8ff5a..998d7a97f 100644 --- a/tdecore/kiconloader.h +++ b/tdecore/kiconloader.h @@ -88,7 +88,7 @@ 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 - * (typically KApplication's) iconloader. + * (typically TDEApplication's) iconloader. * @see KGlobal::iconLoader() * @see KInstance::iconLoader() */ diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h index 56e2e0106..2d94d10c1 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -55,12 +55,12 @@ class TDECORE_EXPORT KInstance /** * Constructor. - * When building a KInstance that is not your KApplication, + * When building a KInstance that is not your TDEApplication, * make sure that the KAboutData and the KInstance 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 - * TDECmdLineArgs and KApplication (not destroyed until the app exits). + * TDECmdLineArgs and TDEApplication (not destroyed until the app exits). * @param aboutData data about this instance (see KAboutData) */ KInstance( const KAboutData * aboutData ); diff --git a/tdecore/kipc.h b/tdecore/kipc.h index 45e96f194..82bf22748 100644 --- a/tdecore/kipc.h +++ b/tdecore/kipc.h @@ -37,13 +37,13 @@ * Communications Protocol. * * Messages with id code < 32 are called "System Messages". These are - * directly handled by KApplication. Examples are: PaletteChanged and - * StyleChanged. Messages with id code >= 32 are user messages. KApplication + * directly handled by TDEApplication. Examples are: PaletteChanged and + * StyleChanged. Messages with id code >= 32 are user messages. TDEApplication * emits the signal kipcMessage(id,arg) for each user message it receives. * * KIPC is implemented using X11 ClientMessage events. * - * @see KApplication::kipcMessage() + * @see TDEApplication::kipcMessage() * @author Geert Jansen */ class TDECORE_EXPORT KIPC diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h index aa88db925..10df2c445 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -255,7 +255,7 @@ public: /** * @internal - * Internal Method, called by the KApplication destructor. + * Internal Method, called by the TDEApplication destructor. * Do not call it. * This is what makes it possible to rely on ~KLibFactory * being called in all cases, whether the library is unloaded diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp index 15f3909b8..56f4ecd82 100644 --- a/tdecore/klockfile.cpp +++ b/tdecore/klockfile.cpp @@ -336,7 +336,7 @@ KLockFile::LockResult KLockFile::lock(int options) struct timeval tv; tv.tv_sec = 0; - tv.tv_usec = n*((KApplication::random() % 200)+100); + tv.tv_usec = n*((TDEApplication::random() % 200)+100); if (n < 2000) n = n * 2; diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h index bf5b67d4c..2ee6728e6 100644 --- a/tdecore/kmimesourcefactory.h +++ b/tdecore/kmimesourcefactory.h @@ -32,7 +32,7 @@ class KInstance; * An extension to TQMimeSourceFactory that uses KIconLoader to * find images. * - * Normally you don't have to instantiate this class at all, KApplication does that for + * Normally you don't have to instantiate this class at all, TDEApplication does that for * you automagically and sets TQMimeSourceFactory::setDefaultFactory(). * * @author Peter Putzer diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index bfde017af..e4ae533ef 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -241,7 +241,7 @@ bool KNotifyClient::startDaemon() if (!kapp->dcopClient()->isApplicationRegistered(daemonName)) { if( firstTry ) { firstTry = false; - return KApplication::startServiceByDesktopName(daemonName) == 0; + return TDEApplication::startServiceByDesktopName(daemonName) == 0; } return false; } @@ -296,7 +296,7 @@ public: else if (!m_instances.isEmpty()) { kdWarning(160) << "Tried to remove an Instance that is not the current," << endl; - kdWarning(160) << "Resetting to the main KApplication." << endl; + kdWarning(160) << "Resetting to the main TDEApplication." << endl; m_instances.clear(); } else diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h index 1eeebbb0a..66ee95fab 100644 --- a/tdecore/knotifyclient.h +++ b/tdecore/knotifyclient.h @@ -217,7 +217,7 @@ namespace KNotifyClient * placed appropriately. * * Call it by KNotifyClient::event(widget->winId(), "EventName"); - * It will use KApplication::kApplication->dcopClient() to communicate to + * It will use TDEApplication::kApplication->dcopClient() to communicate to * the server * @param winId The winId() of the widget where the event originates * @param message The name of the event diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h index 9a596334b..fbd096cbf 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/kprocctrl.h @@ -32,7 +32,7 @@ class TQSocketNotifier; * @author Christian Czezatke * * A class for internal use by KProcess only. -- Exactly one instance - * of this class is created by KApplication. + * of this class is created by TDEApplication. * * This class takes care of the actual (UN*X) signal handling. */ @@ -43,13 +43,13 @@ class TDECORE_EXPORT KProcessController : public TQObject public: /** * Create an instance if none exists yet. - * Called by KApplication::KApplication() + * Called by TDEApplication::TDEApplication() */ static void ref(); /** * Destroy the instance if one exists and it is not referenced any more. - * Called by KApplication::~KApplication() + * Called by TDEApplication::~TDEApplication() */ static void deref(); diff --git a/tdecore/krandomsequence.cpp b/tdecore/krandomsequence.cpp index 04240733f..9529ccabb 100644 --- a/tdecore/krandomsequence.cpp +++ b/tdecore/krandomsequence.cpp @@ -78,7 +78,7 @@ void KRandomSequence::setSeed( long lngSeed1 ) } else if (lngSeed1 == 0) { - m_lngSeed1 = -((KApplication::random() & ~1)+1); + m_lngSeed1 = -((TDEApplication::random() & ~1)+1); } else { diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h index 8fa6e3c29..256d03f17 100644 --- a/tdecore/krandomsequence.h +++ b/tdecore/krandomsequence.h @@ -50,7 +50,7 @@ public: * * @param lngSeed Seed to initialize the sequence with. * If lngSeed is 0, the sequence is initialized with a value from - * KApplication::random(). + * TDEApplication::random(). */ KRandomSequence( long lngSeed = 0 ); @@ -73,7 +73,7 @@ public: * Restart the sequence based on lngSeed. * @param lngSeed Seed to initialize the sequence with. * If lngSeed is 0, the sequence is initialized with a value from - * KApplication::random(). + * TDEApplication::random(). */ void setSeed( long lngSeed = 0 ); diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h index 77fec4efd..560cca391 100644 --- a/tdecore/kstandarddirs.h +++ b/tdecore/kstandarddirs.h @@ -91,12 +91,12 @@ class KStandardDirsPrivate; * @li socket - UNIX Sockets (specific for both current host and current user) * @li emoticons - Emoticons themes (Since KDE 3.4) * - * A type that is added by the class KApplication if you use it, is + * A type that is added by the class TDEApplication if you use it, is * appdata. This one makes the use of the type data a bit easier as it * 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 KApplication instance - * is called "appname" (as set via KApplication's constructor or KAboutData, if + * also write ::locate("appdata", "filename") if your TDEApplication instance + * is called "appname" (as set via TDEApplication's constructor or KAboutData, 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 diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp index 1cb8ce345..0a0d5d253 100644 --- a/tdecore/kstartupinfo.cpp +++ b/tdecore/kstartupinfo.cpp @@ -129,9 +129,9 @@ KStartupInfo::KStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P, cons void KStartupInfo::init( int flags_P ) { // d == NULL means "disabled" - if( !KApplication::kApplication()) + if( !TDEApplication::kApplication()) return; - if( !KApplication::kApplication()->getDisplay()) + if( !TDEApplication::kApplication()->getDisplay()) return; d = new KStartupInfoPrivate( flags_P ); @@ -171,7 +171,7 @@ void KStartupInfo::got_message( const TQString& msg_P ) // if the application stops responding for a while, KWinModule may get // the information about the already mapped window before KXMessages // actually gets the info about the started application (depends -// on their order in X11 event filter in KApplication) +// on their order in X11 event filter in TDEApplication) // simply delay info from KWinModule a bit // SELI??? namespace @@ -494,7 +494,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P, void KStartupInfo::appStarted() { - if( kapp != NULL ) // KApplication constructor unsets the env. variable + if( kapp != NULL ) // TDEApplication constructor unsets the env. variable appStarted( kapp->startupId()); else appStarted( KStartupInfo::currentStartupIdEnv().id()); diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h index f71a0b830..c2063b7c2 100644 --- a/tdecore/kstartupinfo.h +++ b/tdecore/kstartupinfo.h @@ -248,8 +248,8 @@ class TDECORE_EXPORT KStartupInfo /** * Returns the current startup notification identification for the current - * startup notification environment variable. Note that KApplication constructor - * unsets the variable and you have to use KApplication::startupId . + * startup notification environment variable. Note that TDEApplication constructor + * unsets the variable and you have to use TDEApplication::startupId . * @return the current startup notification identification */ static KStartupInfoId currentStartupIdEnv(); diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp index 3e30aa7c1..fe9e50d57 100644 --- a/tdecore/ksycoca.cpp +++ b/tdecore/ksycoca.cpp @@ -333,7 +333,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id) { triedLaunchingKdeinit = true; kdDebug(7011) << "findFactory: we have no database.... launching tdeinit" << endl; - KApplication::startKdeinit(); + TDEApplication::startKdeinit(); // Ok, the new database should be here now, open it. } if (!openDatabase(false)) diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp index c134914c1..8a4d88c2e 100644 --- a/tdecore/ktempdir.cpp +++ b/tdecore/ktempdir.cpp @@ -72,7 +72,7 @@ bool KTempDir::create(const TQString &directoryPrefix, int mode) { // make sure the random seed is randomized - (void) KApplication::random(); + (void) TDEApplication::random(); TQCString nme = TQFile::encodeName(directoryPrefix) + "XXXXXX"; char *realName; diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp index 4632f0053..db8ba796d 100644 --- a/tdecore/ktempfile.cpp +++ b/tdecore/ktempfile.cpp @@ -93,7 +93,7 @@ KTempFile::create(const TQString &filePrefix, const TQString &fileExtension, int mode) { // make sure the random seed is randomized - (void) KApplication::random(); + (void) TDEApplication::random(); TQCString ext = TQFile::encodeName(fileExtension); TQCString nme = TQFile::encodeName(filePrefix) + "XXXXXX" + ext; diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp index 271264e95..97a8eec1b 100644 --- a/tdecore/kuniqueapplication.cpp +++ b/tdecore/kuniqueapplication.cpp @@ -187,7 +187,7 @@ KUniqueApplication::start() #ifdef Q_WS_X11 // say we're up and running ( probably no new window will appear ) KStartupInfoId id; - if( kapp != NULL ) // KApplication constructor unsets the env. variable + if( kapp != NULL ) // TDEApplication constructor unsets the env. variable id.initId( kapp->startupId()); else id = KStartupInfo::currentStartupIdEnv(); @@ -211,7 +211,7 @@ KUniqueApplication::start() { #ifdef Q_WS_X11 KStartupInfoId id; - if( kapp != NULL ) // KApplication constructor unsets the env. variable + if( kapp != NULL ) // TDEApplication constructor unsets the env. variable id.initId( kapp->startupId()); else id = KStartupInfo::currentStartupIdEnv(); @@ -274,7 +274,7 @@ KUniqueApplication::start() TQCString new_asn_id; #if defined Q_WS_X11 KStartupInfoId id; - if( kapp != NULL ) // KApplication constructor unsets the env. variable + if( kapp != NULL ) // TDEApplication constructor unsets the env. variable id.initId( kapp->startupId()); else id = KStartupInfo::currentStartupIdEnv(); @@ -315,7 +315,7 @@ KUniqueApplication::start() KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool configUnique) - : KApplication( allowStyles, GUIenabled, initHack( configUnique )), + : TDEApplication( allowStyles, GUIenabled, initHack( configUnique )), DCOPObject(TDECmdLineArgs::about->appName()) { d = new KUniqueApplicationPrivate; @@ -331,7 +331,7 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c #ifdef Q_WS_X11 KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles, bool configUnique) - : KApplication( display, visual, colormap, allowStyles, initHack( configUnique )), + : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )), DCOPObject(TDECmdLineArgs::about->appName()) { d = new KUniqueApplicationPrivate; @@ -489,7 +489,7 @@ void KUniqueApplication::setHandleAutoStarted() } void KUniqueApplication::virtual_hook( int id, void* data ) -{ KApplication::virtual_hook( id, data ); +{ TDEApplication::virtual_hook( id, data ); DCOPObject::virtual_hook( id, data ); } #include "kuniqueapplication.moc" diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h index e9dca8d99..eaa79dc57 100644 --- a/tdecore/kuniqueapplication.h +++ b/tdecore/kuniqueapplication.h @@ -42,10 +42,10 @@ class KUniqueApplicationPrivate; * option (see TDECmdLineArgs::addTempFileOption()), to delete tempfiles after use. * Add X-TDE-HasTempFileOption=true to the .desktop file to indicate this. * - * @see KApplication DCOPObject + * @see TDEApplication DCOPObject * @author Preston Brown */ -class TDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject +class TDECORE_EXPORT KUniqueApplication : public TDEApplication, public DCOPObject { Q_OBJECT public: @@ -56,7 +56,7 @@ public: * styles. This is only useful to applications that do not display a GUI * normally. If you do create an application with @p allowStyles set to false * it normally runs in the background but under special circumstances - * displays widgets. Call KApplication::enableStyles() before + * displays widgets. Call TDEApplication::enableStyles() before * displaying any widgets. * @param GUIenabled Set to false to disable all GUI stuff. This implies * no styles either. @@ -82,7 +82,7 @@ public: * styles. This is only useful to applications that do not display a GUI * normally. If you do create an application with @p allowStyles set to false * it normally runs in the background but under special circumstances - * displays widgets. Call KApplication::enableStyles() before + * displays widgets. Call TDEApplication::enableStyles() before * displaying any widgets. * @param configUnique If true, the uniqueness of the application will * depend on the value of the "MultipleInstances" diff --git a/tdecore/libtdecore_weak.nmcheck b/tdecore/libtdecore_weak.nmcheck index dc43acb6b..a72cebff4 100644 --- a/tdecore/libtdecore_weak.nmcheck +++ b/tdecore/libtdecore_weak.nmcheck @@ -1,7 +1,7 @@ # KDE namespace check file # tdelibs classes -KApplication::* +TDEApplication::* # these should preferably go in some namespace in KDE4 kDebugPrivate::* diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp index a3c975d94..02d9daa8d 100644 --- a/tdecore/network/ksockssocketdevice.cpp +++ b/tdecore/network/ksockssocketdevice.cpp @@ -468,7 +468,7 @@ void KSocksSocketDevice::initSocks() return; if (kapp == 0L) - return; // no KApplication, so don't initialise + return; // no TDEApplication, so don't initialise // this should, however, test for KInstance init = true; diff --git a/tdecore/tests/KIDLTest.cpp b/tdecore/tests/KIDLTest.cpp index e714bc52f..f022e307a 100644 --- a/tdecore/tests/KIDLTest.cpp +++ b/tdecore/tests/KIDLTest.cpp @@ -18,7 +18,7 @@ TQString KIDLTest::hello( const TQString& name ) int main( int argc, char** argv ) { - KApplication app( argc, argv, "kidlservertest", false /* No GUI */ ); + TDEApplication app( argc, argv, "kidlservertest", false /* No GUI */ ); app.dcopClient()->attach(); app.dcopClient()->registerAs( "kidlservertest" ); diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp index 87884c05a..75d5949c7 100644 --- a/tdecore/tests/KIDLTestClient.cpp +++ b/tdecore/tests/KIDLTestClient.cpp @@ -5,7 +5,7 @@ int main( int argc, char** argv ) { - KApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ ); + TDEApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ ); kapp->dcopClient()->attach(); // kapp->dcopClient()->registerAs( "kidlclienttest" ); diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp index 8830d34c7..543efd706 100644 --- a/tdecore/tests/dcopkonqtest.cpp +++ b/tdecore/tests/dcopkonqtest.cpp @@ -4,7 +4,7 @@ int main( int argc, char** argv ) { - KApplication app( argc, argv, "KIDLTestClient", false ); + TDEApplication app( argc, argv, "KIDLTestClient", false ); kapp->dcopClient()->attach(); // kapp->dcopClient()->registerAs( "kidlclienttest" ); diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp index 11227517d..6c5e135dc 100644 --- a/tdecore/tests/kapptest.cpp +++ b/tdecore/tests/kapptest.cpp @@ -31,10 +31,10 @@ main(int argc, char *argv[]) KAboutData about("kapptest", "kapptest", "version"); TDECmdLineArgs::init(argc, argv, &about); - KApplication a; + TDEApplication a; KSycoca *s = KSycoca::self(); tqWarning("s->language() %s", s->language().latin1()); - tqWarning("Offset of aIconName: %ld", (long) &(static_cast(0)->aIconName)); + tqWarning("Offset of aIconName: %ld", (long) &(static_cast(0)->aIconName)); } diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp index 85f464c9e..086cae304 100644 --- a/tdecore/tests/kcalendartest.cpp +++ b/tdecore/tests/kcalendartest.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KApplication app(false, false); + TDEApplication app(false, false); TQStringList lst = KCalendarSystemFactory::calendarSystems(); kdDebug() << "Supported calendar types: " << endl; diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp index 4aa05a48b..d04a21bff 100644 --- a/tdecore/tests/kcmdlineargstest.cpp +++ b/tdecore/tests/kcmdlineargstest.cpp @@ -31,7 +31,7 @@ main(int argc, char *argv[]) // MyWidget::addCmdLineOptions(); - KApplication k( false, false /*true, true*/ ); + TDEApplication k( false, false /*true, true*/ ); // Get application specific arguments TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -81,7 +81,7 @@ main(int argc, char *argv[]) { TDECmdLineArgs::init( argc, argv, "testapp", description, version); - KApplication k( true, true ); + TDEApplication k( true, true ); k.exec(); return 0; diff --git a/tdecore/tests/kconfigtestgui.cpp b/tdecore/tests/kconfigtestgui.cpp index af560b496..6f8c6e0e0 100644 --- a/tdecore/tests/kconfigtestgui.cpp +++ b/tdecore/tests/kconfigtestgui.cpp @@ -192,7 +192,7 @@ void KConfigTestView::writeButtonClicked() int main( int argc, char **argv ) { - KApplication a( argc, argv, "bla" ); + TDEApplication a( argc, argv, "bla" ); KConfigTestView *w = new KConfigTestView(); a.setMainWidget( w ); diff --git a/tdecore/tests/kglobaltest.cpp b/tdecore/tests/kglobaltest.cpp index 8904354c5..9c7b081de 100644 --- a/tdecore/tests/kglobaltest.cpp +++ b/tdecore/tests/kglobaltest.cpp @@ -53,9 +53,9 @@ void testkasciistricmp() int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init( argc, argv, "kglobaltest", 0, 0, 0, 0 ); - KApplication app( false, false ); + TDEApplication app( false, false ); testkasciistricmp(); diff --git a/tdecore/tests/kiconloadertest.cpp b/tdecore/tests/kiconloadertest.cpp index 96a7a6813..fba38f8bf 100644 --- a/tdecore/tests/kiconloadertest.cpp +++ b/tdecore/tests/kiconloadertest.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - KApplication app(argc,argv,"kiconloadertest"/*,false,false*/); + TDEApplication app(argc,argv,"kiconloadertest"/*,false,false*/); KIconLoader * mpLoader = KGlobal::iconLoader(); KIcon::Context mContext = KIcon::Application; diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp index 136aa6d70..0f33714b3 100644 --- a/tdecore/tests/kipctest.cpp +++ b/tdecore/tests/kipctest.cpp @@ -18,7 +18,7 @@ MyObject::MyObject() int main(int argc, char **argv) { - KApplication app(argc, argv, "kipc"); + TDEApplication app(argc, argv, "kipc"); if (argc == 3) { diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp index f752467d6..3c8df342e 100644 --- a/tdecore/tests/klocaletest.cpp +++ b/tdecore/tests/klocaletest.cpp @@ -100,7 +100,7 @@ void Test::createFields() int main( int argc, char ** argv ) { KLocale::setMainCatalogue("tdelibs"); - KApplication a( argc, argv, "klocaletest" ); + TDEApplication a( argc, argv, "klocaletest" ); KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); KGlobal::locale()->setCountry(TQString::fromLatin1("C")); diff --git a/tdecore/tests/kmacroexpandertest.cpp b/tdecore/tests/kmacroexpandertest.cpp index 11fb4fd8b..fe3f66c65 100644 --- a/tdecore/tests/kmacroexpandertest.cpp +++ b/tdecore/tests/kmacroexpandertest.cpp @@ -52,7 +52,7 @@ protected: int main(int argc, char *argv[]) { TDECmdLineArgs::init(argc, argv, ":", "", "", ""); - KApplication app(false,false); + TDEApplication app(false,false); TQString s, s2; TQMap map1; diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp index a6ce6431d..87af50f00 100644 --- a/tdecore/tests/kmdcodectest.cpp +++ b/tdecore/tests/kmdcodectest.cpp @@ -339,7 +339,7 @@ int main (int argc, char *argv[]) TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); int count = args->count(); - KApplication app; + TDEApplication app; if (!count) { diff --git a/tdecore/tests/kmemtest.cpp b/tdecore/tests/kmemtest.cpp index 83c452e50..0a2a1bdb8 100644 --- a/tdecore/tests/kmemtest.cpp +++ b/tdecore/tests/kmemtest.cpp @@ -235,9 +235,9 @@ int main(int argc, char *argv[]) } // showMem("second"); - KApplication app(argc,argv,"kurltest"); + TDEApplication app(argc,argv,"kurltest"); -// showMem("After KApplication constructor"); +// showMem("After TDEApplication constructor"); // malloc(10*1024); diff --git a/tdecore/tests/knotifytest.cpp b/tdecore/tests/knotifytest.cpp index 8eb0586c0..27076a1e8 100644 --- a/tdecore/tests/knotifytest.cpp +++ b/tdecore/tests/knotifytest.cpp @@ -3,7 +3,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "knotifytest" ); + TDEApplication app( argc, argv, "knotifytest" ); KNotifyClient::userEvent( "This is a notification to notify you :)", KNotifyClient::Messagebox, KNotifyClient::Error ); diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp index af04cd421..bec7c0dd2 100644 --- a/tdecore/tests/kprocesstest.cpp +++ b/tdecore/tests/kprocesstest.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) { KProcess p1, p2, p3, p4; Dummy dummy; - KApplication app(argc, argv, "kprocesstest"); + TDEApplication app(argc, argv, "kprocesstest"); printf("Welcome to the KProcess Demo Application!\n"); diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp index 446dacb30..c637e35b2 100644 --- a/tdecore/tests/kprociotest.cpp +++ b/tdecore/tests/kprociotest.cpp @@ -32,7 +32,7 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n int main(int argc, char *argv[]) { Dummy dummy; - KApplication app(argc, argv, "kprociotest"); + TDEApplication app(argc, argv, "kprociotest"); printf("Welcome to the KProcIO Demo Application!\n"); diff --git a/tdecore/tests/krandomsequencetest.cpp b/tdecore/tests/krandomsequencetest.cpp index 8f337c2f1..53c42facb 100644 --- a/tdecore/tests/krandomsequencetest.cpp +++ b/tdecore/tests/krandomsequencetest.cpp @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) { - KApplication a(argc, argv, "krandomsequencetest"); + TDEApplication a(argc, argv, "krandomsequencetest"); long seed; KRandomSequence seq; diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp index 368a1106f..cb8bffbfd 100644 --- a/tdecore/tests/krfcdatetest.cpp +++ b/tdecore/tests/krfcdatetest.cpp @@ -21,7 +21,7 @@ bool check(TQString txt, time_t a, time_t b) int main(int argc, char *argv[]) { - KApplication app(argc,argv,"kurltest",false,false); + TDEApplication app(argc,argv,"kurltest",false,false); time_t a; time_t b; diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/ksimpleconfigtest.cpp index 699be34cf..f9fbffa65 100644 --- a/tdecore/tests/ksimpleconfigtest.cpp +++ b/tdecore/tests/ksimpleconfigtest.cpp @@ -20,7 +20,7 @@ int main( int argc, char **argv ) { - KApplication a( argc, argv, "kconfigtest" ); + TDEApplication a( argc, argv, "kconfigtest" ); KSimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" ); diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp index 62fc74905..c599c4570 100644 --- a/tdecore/tests/ksocktest.cpp +++ b/tdecore/tests/ksocktest.cpp @@ -59,9 +59,9 @@ main(int argc, char *argv[]) { KAboutData about("socktest", "SockTest", "version"); TDECmdLineArgs::init(argc, argv, &about); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication app; + TDEApplication app; TQString host, port; diff --git a/tdecore/tests/kstdacceltest.cpp b/tdecore/tests/kstdacceltest.cpp index ff8842139..4540e89d7 100644 --- a/tdecore/tests/kstdacceltest.cpp +++ b/tdecore/tests/kstdacceltest.cpp @@ -23,8 +23,8 @@ static bool check(TQString txt, TQString a, TQString b) int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); - KApplication app(argc,argv,"kstdacceltest",false,false); + TDEApplication::disableAutoDcopRegistration(); + TDEApplication app(argc,argv,"kstdacceltest",false,false); check( "shortcutDefault FullScreen", KStdAccel::shortcutDefault( KStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" ); check( "shortcutDefault BeginningOfLine", KStdAccel::shortcutDefault( KStdAccel::BeginningOfLine ).toString(), "Home" ); diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp index 69e9a0200..973402ffc 100644 --- a/tdecore/tests/kstddirstest.cpp +++ b/tdecore/tests/kstddirstest.cpp @@ -6,7 +6,7 @@ int main(int argc, char **argv) { - KApplication a(argc, argv, "whatever", false); + TDEApplication a(argc, argv, "whatever", false); KStandardDirs t; KConfig config; // to add custom entries - a bit tricky :/ diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp index 60404f03a..ec3a004cd 100644 --- a/tdecore/tests/ktempfiletest.cpp +++ b/tdecore/tests/ktempfiletest.cpp @@ -28,8 +28,8 @@ int main(int argc, char *argv[]) { - KApplication a(argc, argv, "ktempfiletest"); - printf("Making tempfile after KApplication constructor.\n"); + TDEApplication a(argc, argv, "ktempfiletest"); + printf("Making tempfile after TDEApplication constructor.\n"); KTempFile f4; printf("Filename = %s\n", f4.name().ascii()); diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index ddfbc8f7a..47d709a9b 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -81,9 +81,9 @@ void testAdjustPath() int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 ); - KApplication app( false, false ); + TDEApplication app( false, false ); KURL::List lst; diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp index cf9717499..ce30a9642 100644 --- a/tdecore/tests/startserviceby.cpp +++ b/tdecore/tests/startserviceby.cpp @@ -30,7 +30,7 @@ main(int argc, char *argv[]) KAboutData about("kapptest", "kapptest", "version"); TDECmdLineArgs::init(argc, argv, &about); - KApplication a; + TDEApplication a; TQString error; TQCString dcopService; diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp index 97c545e1e..56a3e943d 100644 --- a/tdecore/tests/testqtargs.cpp +++ b/tdecore/tests/testqtargs.cpp @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) tqDebug("qt arg[%d] = %s", i, qtargs->arg(i)); } - KApplication app; + TDEApplication app; TDECmdLineArgs *kdeargs = TDECmdLineArgs::parsedArgs("tde"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index cbf090676..138c38ce4 100644 --- a/tdelfeditor/tdelfeditor.cpp +++ b/tdelfeditor/tdelfeditor.cpp @@ -536,10 +536,10 @@ int main_console(int argc, char **argv) case MODE_TDE_AUTOADD_ICON: { printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]); - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1"); TDECmdLineArgs::init(&aboutd); - KApplication app(false, false); + TDEApplication app(false, false); TQStringList rds = KGlobal::dirs()->resourceDirs("icon"); for ( TQStringList::Iterator it = rds.begin(); it != rds.end(); ++it ) { diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp index 5be5e9330..aba9b3905 100644 --- a/tdeprint/cups/cupsdconf2/main.cpp +++ b/tdeprint/cups/cupsdconf2/main.cpp @@ -36,7 +36,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) I18N_NOOP("A CUPS configuration tool"), I18N_NOOP("A CUPS configuration tool"),"0.0.1"); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL configfile; diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index c9730adba..115f3fd02 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname) if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213) { f.close(); - destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); + destname = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); f.setName(destname); if (f.open(IO_WriteOnly)) diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 05e1aa0df..171daf45d 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile() { TQString f; // be sure the file doesn't exist - do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); + do f = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); while (TQFile::exists(f)); return f; } diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 26a0d8e96..2bfebcfa4 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -21,7 +21,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) KGlobal::locale()->setMainCatalogue("tdelibs"); - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool doConfig = args->isSet("tdeconfig"); bool doSrvConfig = args->isSet("serverconfig"); diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 545d3b94d..d4652878f 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -133,7 +133,7 @@ void KMWDriverTest::slotTest() { if (!m_printer) return; - TQString name = "tmpprinter_"+KApplication::randomString(8); + TQString name = "tmpprinter_"+TDEApplication::randomString(8); // save printer name (can be non empty when modifying a printer) TQString oldname = m_printer->name(); diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 443cc89e8..3f04c9196 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -245,7 +245,7 @@ void DrawView::resizeEvent( TQResizeEvent * ) int main( int argc, char **argv ) { - KApplication app( argc, argv, "drawdemo" ); + TDEApplication app( argc, argv, "drawdemo" ); DrawView draw; app.setMainWidget( &draw ); draw.show(); diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index a1dc6b5e0..332ba1fc4 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -17,7 +17,7 @@ int main( int argc, char ** argv ) { - KApplication a(argc, argv, "helpviewer"); + TDEApplication a(argc, argv, "helpviewer"); TQString home; if (argc > 1) diff --git a/tdeui/AUTHORS b/tdeui/AUTHORS index 9e7ce9592..7d64d96b1 100644 --- a/tdeui/AUTHORS +++ b/tdeui/AUTHORS @@ -10,7 +10,7 @@ Maintainer of KPixmapEffect, KStyle, KThemeStyle, and KThemeBase - as well as general misc coding here and there. Matthias Kalle Dalheimer : -classes KApplication, KConfig, KTextStream, KColorSet, +classes TDEApplication, KConfig, KTextStream, KColorSet, automake, autoconf, maintenance Richard Moore : diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp index 270c00ec4..4937b3a87 100644 --- a/tdeui/kaction.cpp +++ b/tdeui/kaction.cpp @@ -1133,7 +1133,7 @@ void KAction::slotPopupActivated() state = kpm->state(); else { // just a QPopupMenu? We'll ask for the state now then (small race condition?) kdDebug(129) << "KAction::slotPopupActivated not a KPopupMenu -> using keyboardMouseState()" << endl; - state = KApplication::keyboardMouseState(); + state = TDEApplication::keyboardMouseState(); } emit activated( KAction::PopupMenuActivation, state ); slotActivated(); diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index c13d87b27..f1e6995ee 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -186,7 +186,7 @@ void KDETrayProxy::withdrawWindow( Window w ) int main( int argc, char* argv[] ) { TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" ); - KApplication app( false ); // no styles + TDEApplication app( false ); // no styles app.disableSessionManagement(); KDETrayProxy proxy; return app.exec(); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index a26519729..0392f7d50 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -65,7 +65,7 @@ KIconView::KIconView( TQWidget *parent, const char *name, WFlags f ) this, TQT_SLOT( slotOnViewport() ) ); connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); - slotSettingsChanged( KApplication::SETTINGS_MOUSE ); + slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); if ( kapp ) { // maybe null when used inside designer connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); @@ -123,7 +123,7 @@ void KIconView::slotOnViewport() void KIconView::slotSettingsChanged(int category) { - if ( category != KApplication::SETTINGS_MOUSE ) + if ( category != TDEApplication::SETTINGS_MOUSE ) return; m_bUseSingle = KGlobalSettings::singleClick(); //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; @@ -167,7 +167,7 @@ void KIconView::slotAutoSelect() if( !hasFocus() ) setFocus(); - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); TQIconViewItem* previousItem = currentItem(); setCurrentItem( m_pCurrentItem ); @@ -243,7 +243,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) return; } - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); m_pAutoSelect->stop(); diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 0518d870c..6d197d813 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -595,7 +595,7 @@ void KKeyChooser::readGlobalKeys( TQMap< TQString, KShortcut >& map ) void KKeyChooser::slotSettingsChanged( int category ) { - if( category == KApplication::SETTINGS_SHORTCUTS ) + if( category == TDEApplication::SETTINGS_SHORTCUTS ) readGlobalKeys(); // reread } diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp index 13c5ab325..04705ad36 100644 --- a/tdeui/klistbox.cpp +++ b/tdeui/klistbox.cpp @@ -34,7 +34,7 @@ KListBox::KListBox( TQWidget *parent, const char *name, WFlags f ) this, TQT_SLOT( slotOnViewport() ) ); connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) ); - slotSettingsChanged(KApplication::SETTINGS_MOUSE); + slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); @@ -71,7 +71,7 @@ void KListBox::slotOnViewport() void KListBox::slotSettingsChanged(int category) { - if (category != KApplication::SETTINGS_MOUSE) + if (category != TDEApplication::SETTINGS_MOUSE) return; m_bUseSingle = KGlobalSettings::singleClick(); @@ -116,7 +116,7 @@ void KListBox::slotAutoSelect() if( !hasFocus() ) setFocus(); - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); TQListBoxItem* previousItem = item( currentItem() ); setCurrentItem( m_pCurrentItem ); @@ -178,7 +178,7 @@ void KListBox::slotAutoSelect() void KListBox::emitExecute( TQListBoxItem *item, const TQPoint &pos ) { - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); m_pAutoSelect->stop(); diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp index b52fe6876..29f255c3a 100644 --- a/tdeui/klistview.cpp +++ b/tdeui/klistview.cpp @@ -438,7 +438,7 @@ KListView::KListView( TQWidget *parent, const char *name ) connect (this, TQT_SIGNAL(contentsMoving(int,int)), this, TQT_SLOT(cleanItemHighlighter())); - slotSettingsChanged(KApplication::SETTINGS_MOUSE); + slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); @@ -543,7 +543,7 @@ void KListView::slotSettingsChanged(int category) { switch (category) { - case KApplication::SETTINGS_MOUSE: + case TDEApplication::SETTINGS_MOUSE: d->dragDelay = KGlobalSettings::dndEventDelay(); d->bUseSingle = KGlobalSettings::singleClick(); @@ -563,7 +563,7 @@ void KListView::slotSettingsChanged(int category) break; - case KApplication::SETTINGS_POPUPMENU: + case TDEApplication::SETTINGS_POPUPMENU: d->contextMenuKey = KGlobalSettings::contextMenuKey (); d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress (); @@ -604,7 +604,7 @@ void KListView::slotAutoSelect() if( !hasFocus() ) setFocus(); - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); TQListViewItem* previousItem = currentItem(); setCurrentItem( d->pCurrentItem ); @@ -646,7 +646,7 @@ void KListView::slotAutoSelect() if( selectionMode() == TQListView::Single ) emit selectionChanged( d->pCurrentItem ); } - else if( (keybstate & KApplication::ControlModifier) ) + else if( (keybstate & TDEApplication::ControlModifier) ) setSelected( d->pCurrentItem, !d->pCurrentItem->isSelected() ); else { bool block = signalsBlocked(); @@ -691,7 +691,7 @@ void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c ) } else { - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); d->autoSelect.stop(); diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index ffb59588b..5d2a1e705 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -92,7 +92,7 @@ public: } bool saveState( TQSessionManager& ) { - KConfig* config = KApplication::kApplication()->sessionConfig(); + KConfig* config = TDEApplication::kApplication()->sessionConfig(); if ( KMainWindow::memberList->first() ){ // According to Jochen Wilhelmy , this // hook is useful for better document orientation @@ -303,9 +303,9 @@ void KMainWindow::parseGeometry(bool parsewidth) if ( parsewidth && !(m & YValue) ) y = geometry().y(); if ( (m & XNegative) ) - x = KApplication::desktop()->width() + x - w; + x = TDEApplication::desktop()->width() + x - w; if ( (m & YNegative) ) - y = KApplication::desktop()->height() + y - h; + y = TDEApplication::desktop()->height() + y - h; move(x, y); } #endif @@ -1226,7 +1226,7 @@ void KMainWindow::setIcon( const TQPixmap& p ) { TQMainWindow::setIcon( p ); #ifdef Q_WS_X11 - // Qt3 doesn't support _NET_WM_ICON, but KApplication::setTopWidget(), which + // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which // is used by KMainWindow, sets it KWin::setIcons( winId(), p, TQPixmap()); #endif diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h index 8aba596f1..d03a2efcf 100644 --- a/tdeui/kmainwindow.h +++ b/tdeui/kmainwindow.h @@ -73,7 +73,7 @@ class DCOPObject; * not supported. * * KMainWindow will set icon, mini icon and caption, which it gets - * from KApplication. It provides full session management, and + * from TDEApplication. It provides full session management, and * will save its position, geometry and positions of toolbars and * menubar on logout. If you want to save additional data, reimplement * saveProperties() and (to read them again on next login) @@ -90,7 +90,7 @@ class DCOPObject; * window is closed. If you do not want this behavior, specify 0 as * widget flag in the constructor. * - * @see KApplication + * @see TDEApplication * @author Reginald Stadlbauer (reggie@kde.org) Stephan Kulow (coolo@kde.org), Matthias Ettrich (ettrich@kde.org), Chris Schlaeger (cs@kde.org), Sven Radej (radej@kde.org). Maintained by Sven Radej (radej@kde.org) */ @@ -798,9 +798,9 @@ protected: // would be useful only for the annoying 'really quit' dialog, which // also doesn't make sense in apps with multiple mainwindows. // And saving configuration in something called queryExit()? IMHO - // one can e.g. use KApplication::shutDown(), which if nothing else + // one can e.g. use TDEApplication::shutDown(), which if nothing else // has at least better fitting name. - // See also KApplication::sessionSaving(). + // See also TDEApplication::sessionSaving(). // This stuff should get changed somehow, so that it at least doesn't // mess with session management. /** @@ -820,15 +820,15 @@ protected: If you need to do serious things on exit (like shutting a dial-up connection down), connect to the signal - KApplication::shutDown(). + TDEApplication::shutDown(). Default implementation returns @p true. Returning @p false will cancel the exiting. In the latter case, the last window will - remain visible. If KApplication::sessionSaving() is true, refusing + remain visible. If TDEApplication::sessionSaving() is true, refusing the exit will also cancel KDE logout. @see queryClose() - @see KApplication::sessionSaving() + @see TDEApplication::sessionSaving() */ virtual bool queryExit(); @@ -840,7 +840,7 @@ protected: safe to close it, i.e. without the user losing some data. Default implementation returns true. Returning @p false will cancel - the closing, and, if KApplication::sessionSaving() is true, it will also + the closing, and, if TDEApplication::sessionSaving() is true, it will also cancel KDE logout. Reimplement this function to prevent the user from losing data. @@ -864,7 +864,7 @@ protected: may be canceled, in which case the document should remain open. @see queryExit() - @see KApplication::sessionSaving() + @see TDEApplication::sessionSaving() */ virtual bool queryClose(); diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index ee526dcdb..2dd4c8ca5 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -981,7 +981,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text, parent, "about", true, true, KStdGuiItem::ok() ); - TQPixmap ret = KApplication::kApplication()->icon(); + TQPixmap ret = TDEApplication::kApplication()->icon(); if (ret.isNull()) ret = TQMessageBox::standardIcon(TQMessageBox::Information); dialog->setIcon(ret); diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h index 419d1edc7..f9d76688c 100644 --- a/tdeui/kmessagebox.h +++ b/tdeui/kmessagebox.h @@ -74,7 +74,7 @@ public: Notify = 1, ///< Emit a KNotifyClient event AllowLink = 2, ///< The message may contain links. Dangerous = 4, ///< The action to be confirmed by the dialog is a potentially destructive one - PlainCaption = 8, /**< Do not use KApplication::makeStdCaption() + PlainCaption = 8, /**< Do not use TDEApplication::makeStdCaption() @since 3.4 */ NoExec = 16 /**< Do not call exec() in createKMessageBox() diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index 11af50f43..5209c515f 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -55,7 +55,7 @@ class TQPopupMenu; * * \b X-TDE-UniqueApplet \n * - * Similar to KApplication and KUniqueApplication there are + * Similar to TDEApplication and KUniqueApplication there are * two types of panel applets. Use unique applets when it makes no * sence to run more than one instance of a applet in the panel. A * good example for unique applets is the taskbar applet. Use normal diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index fec6bd2ee..e8d7e5a28 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -56,7 +56,7 @@ class KPanelExtensionPrivate; * * \b X-TDE-UniqueExtension \n * - * Similar to KApplication and KUniqueApplication there are + * Similar to TDEApplication and KUniqueApplication there are * two types of panel extensions. Use unique extensions when it makes no * sence to run more than one instance of an extension in the panel. A * good example for unique extensions is the taskbar extension. Use normal diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index aa447ed5c..1f233f23d 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -96,7 +96,7 @@ private: * * KToolBar uses a global config group to load toolbar settings on * construction. It will reread this config group on a - * KApplication::appearanceChanged() signal. + * TDEApplication::appearanceChanged() signal. * * @author Reginald Stadlbauer , Stephan Kulow , Sven Radej . */ diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index a2d3c27fe..1316081c6 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -670,7 +670,7 @@ void KToolBarButton::slotClicked() // emit buttonClicked when the button was clicked while being in an extension popupmenu if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) { - ButtonState state = KApplication::keyboardMouseState(); + ButtonState state = TDEApplication::keyboardMouseState(); if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton ) state = ButtonState( Qt::LeftButton | state ); emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index 1767bec5f..b8b7d40f8 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -54,7 +54,7 @@ static const char * item_xpm[] = { " ...... "}; -KApplication *app; +TDEApplication *app; TopLevel::TopLevel(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -212,7 +212,7 @@ void TopLevel::slotToggleSingleColumn( bool b ) int main( int argc, char ** argv ) { - app = new KApplication ( argc, argv, "ItemContainerTest" ); + app = new TDEApplication ( argc, argv, "ItemContainerTest" ); TopLevel *toplevel = new TopLevel(0, "itemcontainertest"); diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp index 6103c6ba4..e87c7ebf2 100644 --- a/tdeui/tests/kaboutdialogtest.cpp +++ b/tdeui/tests/kaboutdialogtest.cpp @@ -16,7 +16,7 @@ int main(int argc, char** argv) { - (void)new KApplication(argc, argv, "KAboutDialogTest"); + (void)new TDEApplication(argc, argv, "KAboutDialogTest"); TQImage logo; TQImage bg; TQPixmap pix; diff --git a/tdeui/tests/kactiontest.cpp b/tdeui/tests/kactiontest.cpp index ea97883c8..238f912c5 100644 --- a/tdeui/tests/kactiontest.cpp +++ b/tdeui/tests/kactiontest.cpp @@ -8,7 +8,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "kactiontest" ); + TDEApplication app( argc, argv, "kactiontest" ); KActionCollection coll( static_cast( 0 ) ); diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp index 59a57dc6a..dc708f2b5 100644 --- a/tdeui/tests/kblendtest.cpp +++ b/tdeui/tests/kblendtest.cpp @@ -89,7 +89,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/) int main(int argc, char **argv) { - KApplication app(argc, argv, "KBlendTest"); + TDEApplication app(argc, argv, "KBlendTest"); KBlendWidget w; app.setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp index 1773c47f9..8f2052b28 100644 --- a/tdeui/tests/kbuttonboxtest.cpp +++ b/tdeui/tests/kbuttonboxtest.cpp @@ -24,7 +24,7 @@ #include int main(int argc, char **argv) { - KApplication a(argc, argv, "dummy"); + TDEApplication a(argc, argv, "dummy"); // example 1 { diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp index facd17bca..019f6bd43 100644 --- a/tdeui/tests/kcharselecttest.cpp +++ b/tdeui/tests/kcharselecttest.cpp @@ -4,7 +4,7 @@ int main (int argc,char **argv) { - KApplication app( argc, argv, "kcharselecttest" ); + TDEApplication app( argc, argv, "kcharselecttest" ); KCharSelect selector( 0, "char selector" ); selector.resize( selector.sizeHint() ); diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp index f372e6a96..83f29a70e 100644 --- a/tdeui/tests/kcolordlgtest.cpp +++ b/tdeui/tests/kcolordlgtest.cpp @@ -28,7 +28,7 @@ int main( int argc, char *argv[] ) KLocale::setMainCatalogue("tdelibs"); TQApplication::setColorMode( TQApplication::CustomColors ); - KApplication a( argc, argv, "KColorDialogTest" ); + TDEApplication a( argc, argv, "KColorDialogTest" ); KConfig aConfig; aConfig.setGroup( "KColorDialog-test" ); diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp index 68f50371b..3f61da00f 100644 --- a/tdeui/tests/kcolortest.cpp +++ b/tdeui/tests/kcolortest.cpp @@ -160,7 +160,7 @@ int main(int argc, char **argv) else printf("Usage: %s [int_vs_fade | fullscreen [old_way]]\n ", argv[0]); } - KApplication *app = new KApplication(argc, argv, "KColorTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KColorTest"); KColorWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index 44b849b44..234f62543 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -217,7 +217,7 @@ void KComboBoxTest::quitApp() int main ( int argc, char **argv) { - KApplication a(argc, argv, "kcomboboxtest"); + TDEApplication a(argc, argv, "kcomboboxtest"); KComboBoxTest* t= new KComboBoxTest; a.setMainWidget (t); t->show (); diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp index 3e60a0ddd..617957b4c 100644 --- a/tdeui/tests/kcompletiontest.cpp +++ b/tdeui/tests/kcompletiontest.cpp @@ -186,7 +186,7 @@ TQStringList Form1::defaultItems() const int main(int argc, char **argv ) { - KApplication app( argc, argv, "kcompletiontest" ); + TDEApplication app( argc, argv, "kcompletiontest" ); Form1 *form = new Form1(); form->show(); diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp index bea01a434..da5e872e1 100644 --- a/tdeui/tests/kdatepicktest.cpp +++ b/tdeui/tests/kdatepicktest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KDatePickertest"); + TDEApplication app(argc, argv, "KDatePickertest"); KDatePicker picker; app.setMainWidget(&picker); picker.show(); diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp index ab55b0a32..55ba7cbea 100644 --- a/tdeui/tests/kdatetimewidgettest.cpp +++ b/tdeui/tests/kdatetimewidgettest.cpp @@ -5,7 +5,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KDateTimeWidgettest"); + TDEApplication app(argc, argv, "KDateTimeWidgettest"); KDateTimeWidget dateTimeWidget; app.setMainWidget(&dateTimeWidget); dateTimeWidget.show(); diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp index af75b42bc..6e1c8d504 100644 --- a/tdeui/tests/kdatewidgettest.cpp +++ b/tdeui/tests/kdatewidgettest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KDateWidgettest"); + TDEApplication app(argc, argv, "KDateWidgettest"); KDateWidget dateWidget; app.setMainWidget(&dateWidget); dateWidget.show(); diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp index 28f7d4cf2..fbf93bfe8 100644 --- a/tdeui/tests/kdesattest.cpp +++ b/tdeui/tests/kdesattest.cpp @@ -55,7 +55,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KDesatTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KDesatTest"); KDesatWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp index c3653b59f..b1c7d422c 100644 --- a/tdeui/tests/kdialogbasetest.cpp +++ b/tdeui/tests/kdialogbasetest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { - KApplication app(argc, argv, "DialogBaseTest"); + TDEApplication app(argc, argv, "DialogBaseTest"); // ----- TQString text= // the explanation shown by the example dialog "

    DialogBase Example


    " diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp index 84895c414..fbbb799fc 100644 --- a/tdeui/tests/kdocktest.cpp +++ b/tdeui/tests/kdocktest.cpp @@ -54,7 +54,7 @@ DockTest::DockTest( TQWidget* parent ) int main( int argc, char** argv ) { - KApplication a( argc,argv, "docktest" ); + TDEApplication a( argc,argv, "docktest" ); DockTest* ap = new DockTest(); ap->setCaption("DockWidget demo"); a.setMainWidget( ap ); diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index 7847a6299..1720ca09a 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -768,7 +768,7 @@ TQString DirectoryView::selectedDir() /**********************************************************************************************/ int main(int argc, char* argv[]) { - KApplication app(argc,argv,"kdockwidgetdemo"); + TDEApplication app(argc,argv,"kdockwidgetdemo"); #if 0 SFileDialog* openfile = new SFileDialog(); diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp index 74d8ecac4..dfe9bfff7 100644 --- a/tdeui/tests/kdockwidgettest.cpp +++ b/tdeui/tests/kdockwidgettest.cpp @@ -242,7 +242,7 @@ void DockApplication::gSetPix2() { } int main(int argc, char* argv[]) { - KApplication a(argc,argv, "kdockdemoapp1"); + TDEApplication a(argc,argv, "kdockdemoapp1"); DockApplication* ap = new DockApplication("DockWidget demo"); ap->setCaption("DockWidget demo"); a.setMainWidget(ap); diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp index 6fa2d1571..ea749cd6e 100644 --- a/tdeui/tests/kdualcolortest.cpp +++ b/tdeui/tests/kdualcolortest.cpp @@ -51,7 +51,7 @@ void KDualColorWidget::slotCurrentChanged(KDualColorButton::DualColor current) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KDualColorTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KDualColorTest"); KDualColorWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp index 90dbb74d0..177a8b6ec 100644 --- a/tdeui/tests/keditlistboxtest.cpp +++ b/tdeui/tests/keditlistboxtest.cpp @@ -4,7 +4,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "keditlistboxtest" ); + TDEApplication app( argc, argv, "keditlistboxtest" ); KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) ); KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"), diff --git a/tdeui/tests/kedittest.cpp b/tdeui/tests/kedittest.cpp index 17a593e74..42d6f659f 100644 --- a/tdeui/tests/kedittest.cpp +++ b/tdeui/tests/kedittest.cpp @@ -4,7 +4,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "kedittest" ); + TDEApplication app( argc, argv, "kedittest" ); KEdit *edit = new KEdit( 0L ); TQPopupMenu *pop = new TQPopupMenu( 0L ); pop->insertItem( "Popupmenu item" ); diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/kfontdialogtest.cpp index 205fd48f7..4ef49fec7 100644 --- a/tdeui/tests/kfontdialogtest.cpp +++ b/tdeui/tests/kfontdialogtest.cpp @@ -31,7 +31,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "KFontDialogTest" ); + TDEApplication app( argc, argv, "KFontDialogTest" ); KConfig aConfig; aConfig.setGroup( "KFontDialog-test" ); diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp index 6942ca55d..dcd45673c 100644 --- a/tdeui/tests/kgradienttest.cpp +++ b/tdeui/tests/kgradienttest.cpp @@ -98,7 +98,7 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KGradientTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KGradientTest"); KGradientWidget w; w.resize(250 * cols, 250 * rows); app->setMainWidget(&w); diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp index 2f00c9296..af7cc60cd 100644 --- a/tdeui/tests/khashtest.cpp +++ b/tdeui/tests/khashtest.cpp @@ -126,7 +126,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KHashTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KHashTest"); KHashWidget w; w.resize(250 * cols, 250 * rows); app->setMainWidget(&w); diff --git a/tdeui/tests/kinputdialogtest.cpp b/tdeui/tests/kinputdialogtest.cpp index 66db4617a..5db3babff 100644 --- a/tdeui/tests/kinputdialogtest.cpp +++ b/tdeui/tests/kinputdialogtest.cpp @@ -12,7 +12,7 @@ int main( int argc, char *argv[] ) { - KApplication app( argc, argv, "kinputdialogtest" ); + TDEApplication app( argc, argv, "kinputdialogtest" ); bool ok; TQString svalue; diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp index 59db252e2..12a267a02 100644 --- a/tdeui/tests/kjanuswidgettest.cpp +++ b/tdeui/tests/kjanuswidgettest.cpp @@ -7,7 +7,7 @@ int main(int argc, char** argv) { - KApplication app(argc, argv, "JanusWidgetTest"); + TDEApplication app(argc, argv, "JanusWidgetTest"); // ----- KJanusWidget* janus = new KJanusWidget( 0, 0, KJanusWidget::IconList ); diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp index 54ae8b6e1..48f2f1430 100644 --- a/tdeui/tests/kledtest.cpp +++ b/tdeui/tests/kledtest.cpp @@ -134,7 +134,7 @@ KLedTest::timeout() int main( int argc, char **argv ) { - KApplication a( argc, argv, "KLedTest" ); + TDEApplication a( argc, argv, "KLedTest" ); KLedTest widget; // ----- /* diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp index 7db673bb1..012a22b7f 100644 --- a/tdeui/tests/klineeditdlgtest.cpp +++ b/tdeui/tests/klineeditdlgtest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { - KApplication app(argc, argv, "klineedittest"); + TDEApplication app(argc, argv, "klineedittest"); KLineEditDlg dialog( "_text", "_value", 0L ); if(dialog.exec()) { diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp index 409476c20..c9b3485cc 100644 --- a/tdeui/tests/klineedittest.cpp +++ b/tdeui/tests/klineedittest.cpp @@ -120,9 +120,9 @@ int main ( int argc, char **argv) { KAboutData aboutData( "klineedittest", "klineedittest", "1.0" ); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication a; + TDEApplication a; KLineEditTest *t = new KLineEditTest(); //t->lineEdit()->setTrapReturnKey( true ); //t->lineEdit()->completionBox()->setTabHandling( false ); diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp index 6189c76e9..582ae19e9 100644 --- a/tdeui/tests/klistviewtest.cpp +++ b/tdeui/tests/klistviewtest.cpp @@ -6,7 +6,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "klistviewtest" ); + TDEApplication app( argc, argv, "klistviewtest" ); KDialogBase dialog; KListView *view = new KListView( dialog.makeVBoxMainWidget() ); view->setSelectionModeExt( KListView::FileManager ); diff --git a/tdeui/tests/kmainwindowrestoretest.cpp b/tdeui/tests/kmainwindowrestoretest.cpp index 7415085ac..1ef265d92 100644 --- a/tdeui/tests/kmainwindowrestoretest.cpp +++ b/tdeui/tests/kmainwindowrestoretest.cpp @@ -14,7 +14,7 @@ int main( int argc, char * argv[] ) { - KApplication app( argc, argv, "kmainwindowrestoretest" ); + TDEApplication app( argc, argv, "kmainwindowrestoretest" ); if ( kapp->isRestored() ) { kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >(); diff --git a/tdeui/tests/kmainwindowtest.cpp b/tdeui/tests/kmainwindowtest.cpp index 5b7afd36f..6606680e9 100644 --- a/tdeui/tests/kmainwindowtest.cpp +++ b/tdeui/tests/kmainwindowtest.cpp @@ -24,7 +24,7 @@ void MainWindow::showMessage() int main( int argc, char **argv ) { - KApplication app( argc, argv, "kmainwindowtest" ); + TDEApplication app( argc, argv, "kmainwindowtest" ); MainWindow* mw = new MainWindow; // deletes itself when closed mw->show(); diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp index 3603edf57..69f28e8c6 100644 --- a/tdeui/tests/kmessageboxtest.cpp +++ b/tdeui/tests/kmessageboxtest.cpp @@ -63,7 +63,7 @@ void showResult(int test, int i) int main( int argc, char *argv[] ) { int i, test; - new KApplication( argc, argv, "MyApplication" ); + new TDEApplication( argc, argv, "MyApplication" ); ExampleWidget *w = new ExampleWidget(); w->show(); diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp index fdf8697e9..fad4cd50a 100644 --- a/tdeui/tests/knuminputtest.cpp +++ b/tdeui/tests/knuminputtest.cpp @@ -16,7 +16,7 @@ #include "knuminputtest.h" -KApplication *a; +TDEApplication *a; #include void TopLevel::slotPrint( int n ) { @@ -132,7 +132,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) int main( int argc, char ** argv ) { - a = new KApplication ( argc, argv, "KNuminputTest" ); + a = new TDEApplication ( argc, argv, "KNuminputTest" ); TopLevel *toplevel = new TopLevel(0, "knuminputtest"); diff --git a/tdeui/tests/kpalettetest.cpp b/tdeui/tests/kpalettetest.cpp index 32b91ff96..8edb97a57 100644 --- a/tdeui/tests/kpalettetest.cpp +++ b/tdeui/tests/kpalettetest.cpp @@ -12,7 +12,7 @@ int main( int argc, char **argv ) { - KApplication a( argc, argv, "KPalettetest" ); + TDEApplication a( argc, argv, "KPalettetest" ); TQStringList palettes = KPalette::getPaletteList(); for(TQStringList::ConstIterator it = palettes.begin(); diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp index 678a1eeb6..1890ff13e 100644 --- a/tdeui/tests/kpanelmenutest.cpp +++ b/tdeui/tests/kpanelmenutest.cpp @@ -57,7 +57,7 @@ void TestWidget::slotSubMenuCalled(int id) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "menutest"); + TDEApplication *app = new TDEApplication(argc, argv, "menutest"); TestWidget w; app->setMainWidget(&w); diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp index 41dfd0a57..84cc7ae65 100644 --- a/tdeui/tests/kpixmapregionselectordialogtest.cpp +++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp @@ -15,7 +15,7 @@ int main(int argc, char**argv) { TDECmdLineArgs::init(argc, argv, "test", "test" ,"test" ,"1.0"); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app("test"); + TDEApplication app("test"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count()!=1) diff --git a/tdeui/tests/kpopuptest.cpp b/tdeui/tests/kpopuptest.cpp index 3db71106b..e5d01c985 100644 --- a/tdeui/tests/kpopuptest.cpp +++ b/tdeui/tests/kpopuptest.cpp @@ -30,7 +30,7 @@ public: int main(int argc, char **argv) { - KApplication app(argc, argv, "kpopupmenutest"); + TDEApplication app(argc, argv, "kpopupmenutest"); DemoWidget w; app.setMainWidget(&w); w.setFont(TQFont("helvetica", 12, TQFont::Bold), true); diff --git a/tdeui/tests/kprogresstest.cpp b/tdeui/tests/kprogresstest.cpp index 7b7024135..c3665865d 100644 --- a/tdeui/tests/kprogresstest.cpp +++ b/tdeui/tests/kprogresstest.cpp @@ -46,7 +46,7 @@ void MyWidget::timerEvent(TQTimerEvent *) int main(int argc, char *argv[]) { - KApplication app(argc, argv, "KProgressTest"); + TDEApplication app(argc, argv, "KProgressTest"); MyWidget w; app.setMainWidget(&w); diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp index 2f16605d9..f227301b9 100644 --- a/tdeui/tests/krulertest.cpp +++ b/tdeui/tests/krulertest.cpp @@ -358,10 +358,10 @@ KRulerTest::slotSetYTrans(double d) /* --- MAIN -----------------------*/ int main(int argc, char **argv) { - KApplication *testapp; + TDEApplication *testapp; KRulerTest *window; - testapp = new KApplication(argc, argv,"krulertest"); + testapp = new TDEApplication(argc, argv,"krulertest"); testapp->setFont(TQFont("Helvetica",12),true); window = new KRulerTest("main"); diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/kspelltest.cpp index 9180ed376..7941ade87 100644 --- a/tdeui/tests/kspelltest.cpp +++ b/tdeui/tests/kspelltest.cpp @@ -26,7 +26,7 @@ int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KSpellTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KSpellTest"); // test ASCII //TQString text( "I have noo idee of how to wride englisch or englisch" ); diff --git a/tdeui/tests/ksqueezedtextlabeltest.cpp b/tdeui/tests/ksqueezedtextlabeltest.cpp index 62f3c1a76..a0a0e400f 100644 --- a/tdeui/tests/ksqueezedtextlabeltest.cpp +++ b/tdeui/tests/ksqueezedtextlabeltest.cpp @@ -3,7 +3,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "KSqueezedTextLabelTest" ); + TDEApplication app( argc, argv, "KSqueezedTextLabelTest" ); KSqueezedTextLabel l( "This is a rather long string", 0); app.setMainWidget( &l ); diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp index 669044c55..742490aae 100644 --- a/tdeui/tests/kstatusbartest.cpp +++ b/tdeui/tests/kstatusbartest.cpp @@ -22,7 +22,7 @@ testWindow::testWindow (TQWidget *, const char *name) menuBar = new KMenuBar (this); fileMenu = new TQPopupMenu; menuBar->insertItem ("&File", fileMenu); - fileMenu->insertItem ("&Exit", KApplication::kApplication(), + fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), TQT_SLOT( quit() ), ALT + Key_Q ); statusbar = new KStatusBar (this); statusbar->insertItem("Zoom: XXXX", 0); @@ -41,7 +41,7 @@ testWindow::testWindow (TQWidget *, const char *name) setCentralWidget(widget); - setCaption( KApplication::kApplication()->caption() ); + setCaption( TDEApplication::kApplication()->caption() ); smenu = new TQPopupMenu; @@ -104,7 +104,7 @@ testWindow::~testWindow () int main( int argc, char *argv[] ) { - KApplication *myApp = new KApplication( argc, argv, "KStatusBarTest" ); + TDEApplication *myApp = new TDEApplication( argc, argv, "KStatusBarTest" ); testWindow *test = new testWindow; myApp->setMainWidget(test); diff --git a/tdeui/tests/ksystemtraytest.cpp b/tdeui/tests/ksystemtraytest.cpp index dcee78346..07572f8d3 100644 --- a/tdeui/tests/ksystemtraytest.cpp +++ b/tdeui/tests/ksystemtraytest.cpp @@ -3,7 +3,7 @@ int main(int argc, char **argv) { - KApplication app( argc, argv, "ksystemtraytest" ); + TDEApplication app( argc, argv, "ksystemtraytest" ); TQLabel *l = new TQLabel("System Tray Main Window", 0L); KSystemTray *tray = new KSystemTray( l ); tray->setText("Test"); diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp index 33e7fc5b7..b864017b0 100644 --- a/tdeui/tests/ktabctltest.cpp +++ b/tdeui/tests/ktabctltest.cpp @@ -30,7 +30,7 @@ TQFont default_font("Helvetica", 12); -KApplication *a; +TDEApplication *a; TopLevel::TopLevel(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -90,7 +90,7 @@ void TopLevel::okPressed() int main( int argc, char ** argv ) { - a = new KApplication ( argc, argv, "KTabCtlTest" ); + a = new TDEApplication ( argc, argv, "KTabCtlTest" ); a->setFont(default_font); diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp index 0fd72851b..84a35952f 100644 --- a/tdeui/tests/ktabwidgettest.cpp +++ b/tdeui/tests/ktabwidgettest.cpp @@ -355,7 +355,7 @@ void Test::toggleLabels(bool state) int main(int argc, char** argv ) { TDECmdLineArgs::init(argc, argv, "ktabwidgettest", "ktabwidget test app", "1.0"); - KApplication app(argc, argv); + TDEApplication app(argc, argv); Test *t = new Test(); app.setMainWidget( t ); diff --git a/tdeui/tests/ktextedittest.cpp b/tdeui/tests/ktextedittest.cpp index d43f77260..6af109d5a 100644 --- a/tdeui/tests/ktextedittest.cpp +++ b/tdeui/tests/ktextedittest.cpp @@ -24,7 +24,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "ktextedittest" ); + TDEApplication app( argc, argv, "ktextedittest" ); KTextEdit *edit = new KTextEdit(); edit->setReadOnly( true ); edit->setCheckSpellingEnabled( true ); diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp index 324accc7d..fe56c6df7 100644 --- a/tdeui/tests/ktimewidgettest.cpp +++ b/tdeui/tests/ktimewidgettest.cpp @@ -5,7 +5,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KTimeWidgettest"); + TDEApplication app(argc, argv, "KTimeWidgettest"); KTimeWidget timeWidget; app.setMainWidget(&timeWidget); timeWidget.show(); diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp index 020834605..5c1ffa757 100644 --- a/tdeui/tests/ktoolbarlabelactiontest.cpp +++ b/tdeui/tests/ktoolbarlabelactiontest.cpp @@ -84,7 +84,7 @@ public: int main( int argc, char **argv ) { - KApplication app( argc, argv, "ktoolbarlabelactiontest" ); + TDEApplication app( argc, argv, "ktoolbarlabelactiontest" ); KGlobal::instance()->dirs()->addResourceDir("data", "."); diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp index 7f5b2cc78..d9e7448d8 100644 --- a/tdeui/tests/kunbalancedgrdtest.cpp +++ b/tdeui/tests/kunbalancedgrdtest.cpp @@ -166,7 +166,7 @@ void myTopWidget::rebalance() int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KUnbalancedGradientTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KUnbalancedGradientTest"); myTopWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp index 91974263e..f103a114f 100644 --- a/tdeui/tests/kwizardtest.cpp +++ b/tdeui/tests/kwizardtest.cpp @@ -25,7 +25,7 @@ int main(int argc, char **argv) { - KApplication a(argc,argv,"kwizardtest"); + TDEApplication a(argc,argv,"kwizardtest"); KWizard *wiz = new KWizard(0, "kwizardtest", false); TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()), &a, TQT_SLOT(quit())); diff --git a/tdeui/tests/kwordwraptest.cpp b/tdeui/tests/kwordwraptest.cpp index ad60bd897..bd51800e8 100644 --- a/tdeui/tests/kwordwraptest.cpp +++ b/tdeui/tests/kwordwraptest.cpp @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) { - KApplication app(argc, argv, "KWordWrapTest"); + TDEApplication app(argc, argv, "KWordWrapTest"); TQFont font( "helvetica", 12 ); // let's hope we all have the same... TQFontMetrics fm( font ); diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index a903aeb3f..dbe688ebf 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -18,7 +18,7 @@ void Client::slotSec() int main( int argc, char **argv ) { - KApplication app( argc, argv, "kxmlguitest" ); + TDEApplication app( argc, argv, "kxmlguitest" ); // KXMLGUIClient looks in the "data" resource for the .rc files // Let's add $PWD (ideally $srcdir instead...) to it diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index b967987bf..32027bce1 100644 --- a/tdeui/tests/twindowtest.cpp +++ b/tdeui/tests/twindowtest.cpp @@ -55,7 +55,7 @@ setAutoSaveSettings(); menuBar->insertItem ("&File", fileMenu); // We insert item "Exit" with accelerator ALT-Q, and connect // it to application's exit-slot. - fileMenu->insertItem ("&Exit", KApplication::kApplication(), + fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), TQT_SLOT( quit() ), ALT + Key_Q ); // Another popup... @@ -148,7 +148,7 @@ setAutoSaveSettings(); // Now add another button and align it right pix = BarIcon("exit"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(), + tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), TQT_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); @@ -408,7 +408,7 @@ void testWindow::slotExit () { TQPixmap pix; pix = BarIcon("exit"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(), + tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), TQT_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); exitB = true; @@ -504,7 +504,7 @@ int main( int argc, char *argv[] ) int i; TDECmdLineArgs::init(argc, argv, "KWindowTest", "description", "version"); - KApplication *myApp = new KApplication(); + TDEApplication *myApp = new TDEApplication(); testWindow *test = new testWindow; myApp->setMainWidget(test); -- cgit v1.2.3 From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- DEBUG | 2 +- KDE2PORTING.html | 2 +- arts/kde/kconverttest.cc | 2 +- arts/kde/kiotest.cc | 2 +- arts/kde/kiotestslow.cc | 2 +- arts/kde/mcop-dcop/kmcop.cpp | 4 +- arts/knotify/knotify.cpp | 4 +- arts/message/artsmessage.cc | 4 +- interfaces/terminal/test/main.cc | 2 +- kabc/kab2kabc.cpp | 2 +- kabc/tests/bigread.cpp | 2 +- kabc/tests/bigwrite.cpp | 2 +- kabc/tests/kabcargl.cpp | 2 +- kabc/tests/testaddressee.cpp | 2 +- kabc/tests/testaddresseelist.cpp | 2 +- kabc/tests/testaddressfmt.cpp | 2 +- kabc/tests/testaddresslineedit.cpp | 2 +- kabc/tests/testdb.cpp | 2 +- kabc/tests/testdistlist.cpp | 2 +- kabc/tests/testkabc.cpp | 2 +- kabc/tests/testkabcdlg.cpp | 2 +- kabc/tests/testlock.cpp | 2 +- kabc/vcard/testwrite.cpp | 2 +- kabc/vcardparser/testread.cpp | 2 +- kabc/vcardparser/testwrite.cpp | 2 +- kate/part/katefactory.cpp | 2 +- kate/part/katefactory.h | 6 +- kate/plugins/kdatatool/kate_kdatatool.cpp | 2 +- kcert/kcertpart.cc | 6 +- kcert/kcertpart.h | 6 +- kcmshell/main.cpp | 4 +- kconf_update/kconf_update.cpp | 6 +- kded/kbuildsycoca.cpp | 4 +- kded/kde-menu.cpp | 4 +- kded/kded.cpp | 4 +- kded/khostname.cpp | 6 +- kdewidgets/kde.widgets | 2 +- kdewidgets/makekdewidgets.cpp | 4 +- kdewidgets/tests/test.widgets | 2 +- kdoctools/main.cpp | 2 +- kdoctools/main_ghelp.cpp | 2 +- kdoctools/meinproc.cpp | 4 +- kdoctools/xslt.cpp | 2 +- kdoctools/xslt.h | 2 +- khtml/ecma/kjs_debugwin.cpp | 2 +- khtml/ecma/kjs_debugwin.h | 2 +- khtml/java/kjavaappletviewer.cpp | 8 +- khtml/java/kjavaappletviewer.h | 10 +-- khtml/khtml_factory.cpp | 14 ++-- khtml/khtml_factory.h | 10 +-- khtml/khtmlimage.cpp | 4 +- khtml/khtmlimage.h | 6 +- khtml/kmultipart/kmultipart.cpp | 6 +- khtml/kmultipart/kmultipart.h | 4 +- kinit/kdostartupconfig.cpp | 2 +- kinit/kinit.cpp | 6 +- kio/kfile/knotifydialog.cpp | 4 +- kio/kfile/knotifydialog.h | 10 +-- kio/kio/dataprotocol.cpp | 2 +- kio/kio/kdatatool.cpp | 6 +- kio/kio/kdatatool.h | 16 ++-- kio/kio/kscan.h | 16 ++-- kio/kioexec/main.cpp | 4 +- kio/misc/kfile/fileprops.cpp | 4 +- kio/misc/kpac/proxyscout.cpp | 2 +- kio/misc/kpac/proxyscout.h | 4 +- kio/misc/ksendbugmail/main.cpp | 4 +- kio/misc/uiserver.cpp | 4 +- kio/tests/kfiltertest.cpp | 2 +- kio/tests/kiopassdlgtest.cpp | 2 +- kio/tests/kmfitest.cpp | 2 +- kio/tests/kmimemagictest.cpp | 2 +- kio/tests/kmimetypetest.cpp | 2 +- kio/tests/kpropsdlgtest.cpp | 2 +- kio/tests/kprotocolinfotest.cpp | 2 +- kio/tests/ktartest.cpp | 2 +- kio/tests/kurifiltertest.cpp | 2 +- kio/tests/kziptest.cpp | 2 +- kioslave/file/file.cc | 2 +- kioslave/ftp/ftp.cc | 2 +- kioslave/http/http.cc | 2 +- kioslave/http/http_cache_cleaner.cpp | 2 +- kioslave/http/kcookiejar/main.cpp | 2 +- kioslave/http/kcookiejar/tests/kcookiejartest.cpp | 4 +- kioslave/iso/iso.cpp | 2 +- knewstuff/ghns.cpp | 2 +- knewstuff/khotnewstuff.cpp | 2 +- knewstuff/testnewstuff.cpp | 2 +- kparts/factory.cpp | 4 +- kparts/factory.h | 8 +- kparts/genericfactory.h | 34 ++++---- kparts/part.cpp | 6 +- kparts/part.h | 14 ++-- kparts/partmanager.cpp | 2 +- kparts/partmanager.h | 4 +- kparts/plugin.cpp | 12 +-- kparts/plugin.h | 12 +-- kparts/tests/notepad.cpp | 4 +- kparts/tests/notepad.h | 4 +- kparts/tests/parts.cpp | 4 +- kparts/tests/parts.h | 4 +- kresources/kcmkresources.cpp | 6 +- kresources/testresources.cpp | 2 +- kunittest/modrunner.cpp | 6 +- kunittest/tester.h | 4 +- kutils/kcmodulecontainer.cpp | 2 +- kutils/kcmoduleproxy.cpp | 6 +- kutils/kcmoduleproxy.h | 12 +-- kutils/kplugininfo.h | 2 +- kutils/kpluginselector.cpp | 2 +- kutils/kpluginselector.h | 6 +- kutils/ksettings/README.dox | 2 +- kutils/ksettings/dispatcher.cpp | 8 +- kutils/ksettings/dispatcher.h | 14 ++-- kutils/ksettings/pluginpage.cpp | 2 +- kutils/ksettings/pluginpage.h | 2 +- kwallet/tests/kwalletasync.cpp | 2 +- kwallet/tests/kwalletboth.cpp | 2 +- kwallet/tests/kwalletsync.cpp | 2 +- libkmid/deviceman.cc | 4 +- tdecore/kaboutdata.cpp | 90 +++++++++++----------- tdecore/kaboutdata.h | 18 ++--- tdecore/kapplication.cpp | 24 +++--- tdecore/kapplication.h | 6 +- tdecore/kcmdlineargs.cpp | 14 ++-- tdecore/kcmdlineargs.h | 18 ++--- tdecore/kconfig_compiler/example/autoexample.cpp | 2 +- tdecore/kconfig_compiler/example/example.cpp | 2 +- tdecore/kconfig_compiler/kconfig_compiler.cpp | 6 +- tdecore/kconfig_compiler/tests/test1main.cpp | 2 +- tdecore/kconfig_compiler/tests/test2main.cpp | 2 +- tdecore/kconfig_compiler/tests/test3main.cpp | 2 +- tdecore/kconfig_compiler/tests/test4main.cpp | 2 +- tdecore/kconfig_compiler/tests/test5main.cpp | 2 +- tdecore/kconfig_compiler/tests/test6main.cpp | 2 +- tdecore/kconfig_compiler/tests/test7main.cpp | 2 +- tdecore/kconfig_compiler/tests/test8main.cpp | 2 +- tdecore/kconfig_compiler/tests/test9main.cpp | 2 +- .../kconfig_compiler/tests/test_dpointer_main.cpp | 2 +- tdecore/kcrash.cpp | 4 +- tdecore/kdetcompmgr.cpp | 4 +- tdecore/kgenericfactory.h | 54 ++++++------- tdecore/kglobal.cpp | 10 +-- tdecore/kglobal.h | 12 +-- tdecore/kiconloader.cpp | 32 ++++---- tdecore/kiconloader.h | 40 +++++----- tdecore/kinstance.cpp | 56 +++++++------- tdecore/kinstance.h | 34 ++++---- tdecore/klibloader.cpp | 2 +- tdecore/klibloader.h | 12 +-- tdecore/klocale.cpp | 2 +- tdecore/kmimesourcefactory.cpp | 4 +- tdecore/kmimesourcefactory.h | 8 +- tdecore/knotifyclient.cpp | 10 +-- tdecore/knotifyclient.h | 24 +++--- tdecore/kshortcutlist.cpp | 2 +- tdecore/kshortcutlist.h | 8 +- tdecore/kstandarddirs.cpp | 6 +- tdecore/kstandarddirs.h | 8 +- tdecore/kuniqueapplication.cpp | 4 +- tdecore/kuniqueapplication.h | 4 +- tdecore/network/ksockssocketdevice.cpp | 2 +- tdecore/tde-config.cpp.cmake | 4 +- tdecore/tde-config.cpp.in | 4 +- tdecore/tests/kapptest.cpp | 2 +- tdecore/tests/kcalendartest.cpp | 4 +- tdecore/tests/kdebugtest.cpp | 2 +- tdecore/tests/kresolvertest.cpp | 2 +- tdecore/tests/ksocktest.cpp | 2 +- tdecore/tests/ktimezonestest.cpp | 2 +- tdecore/tests/kuniqueapptest.cpp | 2 +- tdecore/tests/startserviceby.cpp | 2 +- tdecore/tests/testqtargs.cpp | 4 +- tdelfeditor/tdelfeditor.cpp | 2 +- tdeui/kaboutapplication.cpp | 8 +- tdeui/kaboutapplication.h | 12 +-- tdeui/kaction.cpp | 4 +- tdeui/kaction.h | 2 +- tdeui/kactionclasses.cpp | 8 +- tdeui/kactionclasses.h | 2 +- tdeui/kactioncollection.cpp | 16 ++-- tdeui/kactioncollection.h | 12 +-- tdeui/kactionshortcutlist.h | 2 +- tdeui/kbugreport.cpp | 2 +- tdeui/kbugreport.h | 10 +-- tdeui/kcmodule.cpp | 16 ++-- tdeui/kcmodule.h | 16 ++-- tdeui/kedittoolbar.cpp | 6 +- tdeui/kguiitem.cpp | 2 +- tdeui/kguiitem.h | 4 +- tdeui/khelpmenu.cpp | 6 +- tdeui/khelpmenu.h | 4 +- tdeui/kkeydialog.h | 2 +- tdeui/kmainwindow.h | 2 +- tdeui/kstdaction.cpp | 4 +- tdeui/ksystemtray.cpp | 4 +- tdeui/ksystemtray.h | 6 +- tdeui/ktoolbar.cpp | 4 +- tdeui/ktoolbar.h | 6 +- tdeui/ktoolbarbutton.cpp | 4 +- tdeui/ktoolbarbutton.h | 4 +- tdeui/kxmlguibuilder.cpp | 10 +-- tdeui/kxmlguibuilder.h | 6 +- tdeui/kxmlguiclient.cpp | 6 +- tdeui/kxmlguiclient.h | 10 +-- tdeui/kxmlguifactory.cpp | 10 +-- tdeui/kxmlguifactory.h | 8 +- tdeui/kxmlguifactory_p.cpp | 2 +- tdeui/tests/klineedittest.cpp | 2 +- tdeui/tests/kxmlguitest.cpp | 2 +- tdeui/tests/kxmlguitest.h | 2 +- 211 files changed, 658 insertions(+), 658 deletions(-) (limited to 'khtml/java') diff --git a/DEBUG b/DEBUG index 042fe54c7..cf3dfbc43 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 a8580e3f5..c69d11732 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -168,7 +168,7 @@ or     this page online.

    TDECmdLineArgs itself will add the command line options supported by Qt and TDEApplication.

    - 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.

    In return for this information you can query TDECmdLineArgs whether an diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc index 10778d6bf..63f5ae536 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 b27978f47..826a3b165 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 f35f2a3e2..e367ea924 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 b95f97de5..0ba9b48a4 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 e6a234fba..3fcaff6e0 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 410419302..37bf4b75e 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 403bde0b5..e1dacc6dc 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 417d62b8e..c23426260 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 c5a1a602f..bb19379bb 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 5d3d2bd6f..b1f705eb9 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 b1116b2ea..62b1df25e 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 39536efbf..9b4993dcc 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 08d73b8db..98e5be506 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 c9369d756..b66c7ad01 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 f46604dc5..474b5fc7a 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 2abedb9be..4759a4bd2 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 3f4b67e0a..e46d90d78 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 ee767e523..b8b9fe3b5 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 b78fb4a5f..1d328f239 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 31d053208..701b94481 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 8498fc6d0..fe218c0b1 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 3fcbb851e..50ff8b09b 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 11c3c7852..73d462d4a 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 64bde8718..aa4c43658 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 0fd939ce3..79d3ac011 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 e78bb4228..3265a77bf 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 tools; tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst ); diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index 5986bcba0..7ae79d874 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 ec011c08d..a5274a926 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 4453cac0d..7196c0e0a 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 b324e53f7..ac4fda768 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 483578c72..958f38303 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 7148a1e6b..7c73fb226 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 538cfff09..84db43b46 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 0c1dd1b18..bd0980a2b 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 bce813f8d..8ca72586d 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 8c5577354..bec6988b3 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 b67abedee..d375f0add 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 8e096d6cf..7ba294bfb 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 281b31f17..bbdb5d7c0 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 8f9b94350..577d0341d 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 f9803ff0d..6653c7cd5 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 975bd3c88..c09e0c9eb 100644 --- a/kdoctools/xslt.h +++ b/kdoctools/xslt.h @@ -7,7 +7,7 @@ TQString transform(const TQString &file, const TQString& stylesheet, const TQValueVector ¶ms = TQValueVector()); 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 8e605d79c..b8d445900 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 8faf71d52..dc2368ac2 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 5948dea22..05c2eb7d0 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 e12b3c1d9..b76f20363 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 7eedc6311..c2eee7d17 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 *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 e9d5c62a8..4d0154128 100644 --- a/khtml/khtml_factory.h +++ b/khtml/khtml_factory.h @@ -25,8 +25,8 @@ #include #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class HistoryProvider; class KHTMLSettings; class KHTMLPart; @@ -52,7 +52,7 @@ public: static TQPtrList *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 *s_parts; }; diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index a8ee4d7ef..7782f1786 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 dda918177..6db0cbf5f 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 55f37f397..65be07e83 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 "); return aboutData; } diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index f3bf95219..7ba5ba2fe 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -29,7 +29,7 @@ #include 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 fceed88e2..650a3e129 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 478331fd8..9bc6b7b1b 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 b3242e905..ebaadaa76 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 2adb2b15a..1f758a01b 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 161c82296..0ee463d87 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 c5e04537e..76cf7836b 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::query( const TQString& datatype, const TQString& mimetype, KInstance* instance ) +TQValueList KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, TDEInstance* instance ) { TQValueList 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 573bf809e..46005ada3 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 query( const TQString& datatype, const TQString& mimetype, KInstance * instance ); + static TQValueList 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 5306156ac..755d4972a 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 18014f08f..2a1494043 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 cba281cc7..bbd34a2a4 100644 --- a/kio/misc/kfile/fileprops.cpp +++ b/kio/misc/kfile/fileprops.cpp @@ -406,10 +406,10 @@ static void processMetaDataOptions( const TQPtrList 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 5d8b008bf..b651e2313 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 c18e5173d..78c8fc237 100644 --- a/kio/misc/kpac/proxyscout.h +++ b/kio/misc/kpac/proxyscout.h @@ -29,7 +29,7 @@ #include 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 527d8545f..be1eb8b96 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 919676fc4..3e890c553 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 e070418e4..1922e207e 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 099ce468b..2bbdaa658 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 df37df997..40530184d 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 \n", argv[0]); diff --git a/kio/tests/kmimemagictest.cpp b/kio/tests/kmimemagictest.cpp index eb01137c9..00c545c3c 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 5802a4084..5d963c81c 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 02a4b6f37..66b02bae0 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 1f4dc95c6..03bbbdac6 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -26,7 +26,7 @@ #include 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 5fe4a4f1f..2c470f6e4 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 3dbd8c648..9f4e09013 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 5b784c40b..84d38d134 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 2deeb3535..4e3865837 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 5f0f993bc..00fe94b2e 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 bb9eb5866..8c732d823 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 a94ce3206..4a140262e 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 87cefe3bb..e24112888 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 d457ae5c0..05f0ac0ea 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 4bd128e49..f5f7f8757 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 1f5c01768..6c0c2a9fc 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 bbca71b89..67c6c70b2 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 189a90067..a1de4c1d0 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 7d04b43d1..a3985fd05 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 26c53b9dc..05b23d9d9 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 f4ab3be16..7deea1248 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 *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 - KInstance *GenericFactoryBase::s_instance = 0; + TDEInstance *GenericFactoryBase::s_instance = 0; /** * @internal */ template - KAboutData *GenericFactoryBase::s_aboutData = 0; + TDEAboutData *GenericFactoryBase::s_aboutData = 0; /** * @internal */ template - KInstance *GenericFactoryBase::instance() + TDEInstance *GenericFactoryBase::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 - KAboutData *GenericFactoryBase::aboutData() + TDEAboutData *GenericFactoryBase::aboutData() { if ( !s_aboutData ) s_aboutData = T::createAboutData(); diff --git a/kparts/part.cpp b/kparts/part.cpp index a76fce282..d2efbeeac 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 0c4023f6c..8a58063af 100644 --- a/kparts/part.h +++ b/kparts/part.h @@ -27,7 +27,7 @@ #include -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 97a8b9961..8d9ff1994 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 33c13d3ed..604e5ff92 100644 --- a/kparts/partmanager.h +++ b/kparts/partmanager.h @@ -27,7 +27,7 @@ #include -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 b5c50be2c..1e5ca9008 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::pluginInfos( const KInstance * instance ) +TQValueList Plugin::pluginInfos( const TDEInstance * instance ) { if ( !instance ) kdError(1000) << "No instance ???" << endl; @@ -138,12 +138,12 @@ TQValueList 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 &pluginInfos, const KInstance *instance ) +void Plugin::loadPlugins( TQObject *parent, const TQValueList &pluginInfos, const TDEInstance *instance ) { TQValueList::ConstIterator pIt = pluginInfos.begin(); TQValueList::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 plugins = pluginInfos( instance ); diff --git a/kparts/plugin.h b/kparts/plugin.h index 0da0a46e0..efebf5af4 100644 --- a/kparts/plugin.h +++ b/kparts/plugin.h @@ -24,7 +24,7 @@ #include #include -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 &pluginInfos, const KInstance * instance ); + static void loadPlugins( TQObject *parent, const TQValueList &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 pluginInfos( const KInstance * instance ); + static TQValueList 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 e0857a51e..844a4ba17 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 d192d42ec..9cc4f2d9a 100644 --- a/kparts/tests/notepad.h +++ b/kparts/tests/notepad.h @@ -5,7 +5,7 @@ #include #include -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 d932a168f..97ebdd4fb 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 6f373a85c..0d4e6480a 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 f517b5eac..ec6a7be48 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 6624b9ffe..515563172 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 c7e545acd..93dcff8ef 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 75eebd39c..e654b1b46 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 c613e4385..258a5d965 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(mod->aboutData()) ); + setAboutData( const_cast(mod->aboutData()) ); } diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 2323cd262..3528ae738 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 11ae06dbb..633652955 100644 --- a/kutils/kcmoduleproxy.h +++ b/kutils/kcmoduleproxy.h @@ -27,10 +27,10 @@ #include #include -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 b75edf1a2..bebd11cb6 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 a385d2719..3b6b4c39a 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -618,7 +618,7 @@ void KPluginSelector::addPluginsInternal( const TQValueList 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 278906793..f018d2f9e 100644 --- a/kutils/kpluginselector.h +++ b/kutils/kpluginselector.h @@ -25,7 +25,7 @@ #include -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/<instancename>/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 4abfc6be5..f42c325eb 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 7f20c1bc3..eb9acf0bc 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 52829f9e7..c04a41b99 100644 --- a/kutils/ksettings/dispatcher.h +++ b/kutils/ksettings/dispatcher.h @@ -28,7 +28,7 @@ class TQCString; class TQSignal; class TQStrList; template 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::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 99ea904f2..4a94d21d4 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 df9acd490..74c7756da 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 0900f9d20..e4371448c 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 cee1cc127..5df7b56ab 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 93baa01ab..743692740 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 c8030f44e..f989f2beb 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 00d75225b..303403ef7 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 -KAboutData::authors() const +TDEAboutData::authors() const { return mAuthorList; } const TQValueList -KAboutData::credits() const +TDEAboutData::credits() const { return mCreditList; } const TQValueList -KAboutData::translators() const +TDEAboutData::translators() const { TQValueList personList; @@ -382,7 +382,7 @@ KAboutData::translators() const } TQString -KAboutData::aboutTranslationTeam() +TDEAboutData::aboutTranslationTeam() { return i18n("replace this with information about your translation team", "

    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 9fe8d8593..b803b779e 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 1f0dae669..62eb373e5 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 89aaab2e2..49abf1202 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 */ -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 d9e564d4a..186f7e3af 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 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 142544aeb..09a6a6558 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 eb8f8c4cf..ec71dea71 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 f15b4bb15..cf808c9b2 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 e0b6422a4..91e8c7998 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 976a7bbd6..79546639f 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 904c57270..5970bf03d 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 9789d697d..f73ae38e3 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 8b38b3dbd..5229d8a87 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 57ad5189d..89f28587f 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 27dff57ff..9b1b7503e 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 9c1ad1931..81cca0184 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 b3c242f68..04864a95c 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 39b904af9..8668d8d8c 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 a6c23c8fe..b62ee17af 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 4a3b778d9..86ec1f39d 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 90b2e9444..c4a903242 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 3faaae7bf..032c14302 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 *s_self; }; /* @internal */ template -KInstance *KGenericFactoryBase::s_instance = 0; +TDEInstance *KGenericFactoryBase::s_instance = 0; /* @internal */ template @@ -103,7 +103,7 @@ KGenericFactoryBase *KGenericFactoryBase::s_self = 0; /* @internal */ template -KInstance *KGenericFactoryBase::instance() +TDEInstance *KGenericFactoryBase::instance() { if ( !s_instance && s_self ) s_instance = s_self->createInstance(); @@ -141,17 +141,17 @@ KInstance *KGenericFactoryBase::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( 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 >( 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 >( data ) {} diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index 6c88302ce..57135a769 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 931ee6a98..5a775ae8c 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -19,7 +19,7 @@ #define _KGLOBAL_H #include "tdelibs_export.h" -#include // KDE4: class KInstance is enough here +#include // 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 d3d8d5239..f413b75f3 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 998d7a97f..2ad23ae38 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 721864e5a..6d37c3dbc 100644 --- a/tdecore/kinstance.cpp +++ b/tdecore/kinstance.cpp @@ -38,26 +38,26 @@ #ifndef NDEBUG #include #include - static TQPtrList *allInstances = 0; + static TQPtrList *allInstances = 0; static TQPtrDict *allOldInstances = 0; - #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList(); allOldInstances = new TQPtrDict(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false); + #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList(); allOldInstances = new TQPtrDict(); } 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() : ""); 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() : ""); 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(this)); + d->mimeSourceFactory->setInstance(const_cast(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 2d94d10c1..36d463d8a 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 2c75989d3..b7cad0fbe 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 10df2c445..9f080b88b 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -27,7 +27,7 @@ #include // 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 * 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 c4ae52b19..43c21ef2e 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 37745d398..ed4265835 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 2ee6728e6..7090b1733 100644 --- a/tdecore/kmimesourcefactory.h +++ b/tdecore/kmimesourcefactory.h @@ -26,7 +26,7 @@ #include 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 e4ae533ef..e84c8c44a 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 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 66ee95fab..ff96b020a 100644 --- a/tdecore/knotifyclient.h +++ b/tdecore/knotifyclient.h @@ -20,7 +20,7 @@ #include #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 865bdc257..7c3fc67da 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 7a1890c1c..ce8f408a1 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 a7cdd3659..1f948653e 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 560cca391..6c6e71ab2 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 97a8eec1b..708a9efb0 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 eaa79dc57..ede89ef19 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 02d9daa8d..6a60ce0a3 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 58c6407d8..9fe328509 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 10a904e3f..61feeea7f 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 6c5e135dc..53bb0f9f3 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 086cae304..62b14aa7a 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 ee49127ea..cc85b4554 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 ca5afe0eb..c5640dc09 100644 --- a/tdecore/tests/kresolvertest.cpp +++ b/tdecore/tests/kresolvertest.cpp @@ -410,7 +410,7 @@ int TestApp::newInstance(TQValueList /*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 c599c4570..48420acfc 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 650cc0512..729c88bb6 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 f696711a5..053956715 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 ce30a9642..5cccaa3dc 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 56a3e943d..fd73923f2 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 138c38ce4..9868dbfca 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 8d5828960..4be70c48c 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() + ""; + text += TDEAboutData::aboutTranslationTeam() + ""; addTextPage( i18n("T&ranslation"), text, true); } diff --git a/tdeui/kaboutapplication.h b/tdeui/kaboutapplication.h index 58145aa45..7fe088d02 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 4937b3a87..89e397450 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( 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 dca99b4b0..a6ebbfb9d 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 9e2241408..e83a9f05d 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 06e00d179..0a6a105f0 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 ba809087c..9cc76902b 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( 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 8111effaf..28c9e530e 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 © ); #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 c61a7e2a8..7c5f5b0dd 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 c3cf0b518..37f84a802 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 419ad3c81..2c60b091b 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 @@ -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 7d82d2957..a047fe6b8 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 bba06ae4a..c237ad163 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 418fb755d..b89a5b97a 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 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 7b73c7401..e4d09bff2 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 586998d48..189dc1292 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 071db1248..670439444 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 e58569bf6..0f2a7078f 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 4df3e2ecd..d291a87d9 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 d03a2efcf..56b5f2666 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 e1adac16a..befd93fc1 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 1ae786d67..668f070dd 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 79d73d3e3..a74dc9be6 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 32e5b9f14..0fd9e5ada 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 1f233f23d..aa3717324 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 1316081c6..66b9d6ee9 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 340761bd0..df26fea7c 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 c31242ff1..43f716870 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 f32c30243..657add5f8 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 ff463e45f..d8548cadb 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 c05a1afd8..78c412602 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 7aa427937..3c3f24668 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 9b4733790..bf49c6b60 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 279753277..26d120de7 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 c9b3485cc..cfb4160d2 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 dbe688ebf..9f764e774 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 1adb1a14b..bc88711f7 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(); -- cgit v1.2.3 From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- KDE2PORTING.html | 34 +-- KDE3PORTING.html | 2 +- TODO | 6 +- arts/kde/kartsserver.cpp | 4 +- arts/knotify/knotify.cpp | 24 +-- arts/knotify/knotify.h | 4 +- arts/message/artsmessage.cc | 2 +- .../kfileaudiopreview/kfileaudiopreview.cpp | 6 +- interfaces/kscript/sample/shellscript.cpp | 16 +- interfaces/kscript/sample/shellscript.h | 8 +- interfaces/ktexteditor/templateinterface.cpp | 10 +- interfaces/terminal/kde_terminal_interface.h | 2 +- kabc/address.cpp | 12 +- kabc/addressbook.cpp | 2 +- kabc/addresseedialog.cpp | 2 +- kabc/addresslineedit.cpp | 18 +- kabc/field.h | 4 +- kabc/formatfactory.cpp | 2 +- kabc/kab2kabc.cpp | 4 +- kabc/lock.cpp | 2 +- kabc/plugins/ldapkio/resourceldapkio.cpp | 2 +- kabc/plugins/ldapkio/resourceldapkioplugin.cpp | 2 +- kabc/scripts/field.src.cpp | 4 +- kate/part/kateconfig.cpp | 16 +- kate/part/katedialogs.cpp | 18 +- kate/part/katedialogs.h | 4 +- kate/part/katedocument.cpp | 2 +- kate/part/katefont.cpp | 8 +- kate/part/katehighlight.cpp | 2 +- kate/part/katejscript.cpp | 4 +- kate/part/kateluaindentscript.cpp | 2 +- kate/part/kateprinter.cpp | 10 +- kate/part/kateschema.cpp | 22 +- kate/part/katesyntaxdocument.cpp | 2 +- kate/part/kateview.cpp | 4 +- kate/part/kateviewhelpers.cpp | 8 +- kate/part/kateviewinternal.cpp | 2 +- kate/part/test_regression.cpp | 2 +- kcert/kcertpart.cc | 2 +- kcmshell/main.cpp | 4 +- kconf_update/kconf_update.cpp | 2 +- kded/kbuildsycoca.cpp | 32 +-- kded/kde-menu.cpp | 2 +- kded/kded.cpp | 4 +- kded/khostname.cpp | 24 +-- kded/vfolder_menu.cpp | 26 +-- kdoctools/kio_help.cpp | 4 +- kdoctools/meinproc.cpp | 4 +- khtml/css/cssstyleselector.cpp | 2 +- khtml/ecma/kjs_debugwin.cpp | 10 +- khtml/ecma/kjs_navigator.cpp | 2 +- khtml/ecma/kjs_window.cpp | 14 +- khtml/html/html_formimpl.cpp | 10 +- khtml/html/htmltokenizer.cpp | 4 +- khtml/java/kjavaprocess.cpp | 20 +- khtml/java/kjavaprocess.h | 8 +- khtml/khtml_ext.cpp | 4 +- khtml/khtml_factory.cpp | 2 +- khtml/khtml_part.cpp | 22 +- khtml/khtml_settings.cc | 10 +- khtml/khtmlimage.cpp | 2 +- khtml/khtmlview.cpp | 16 +- khtml/misc/decoder.cpp | 2 +- khtml/misc/loader.cpp | 6 +- khtml/rendering/render_form.cpp | 2 +- khtml/rendering/render_replaced.cpp | 2 +- khtml/test_regression.cpp | 2 +- khtml/testkhtml.cpp | 2 +- khtml/xml/dom_docimpl.cpp | 2 +- kinit/autostart.cpp | 10 +- kinit/kdostartupconfig.cpp | 2 +- kinit/kinit.cpp | 4 +- kinit/klauncher.cpp | 2 +- kio/bookmarks/kbookmark.cc | 6 +- kio/bookmarks/kbookmarkbar.cc | 4 +- kio/bookmarks/kbookmarkmanager.cc | 10 +- kio/kfile/kcustommenueditor.cpp | 4 +- kio/kfile/kdiroperator.cpp | 4 +- kio/kfile/kdiroperator.h | 4 +- kio/kfile/kdirselectdialog.cpp | 6 +- kio/kfile/kdirsize.cpp | 4 +- kio/kfile/kdiskfreesp.cpp | 12 +- kio/kfile/kdiskfreesp.h | 6 +- kio/kfile/kencodingfiledialog.cpp | 6 +- kio/kfile/kfiledetailview.cpp | 4 +- kio/kfile/kfiledialog.cpp | 30 +-- kio/kfile/kfileiconview.cpp | 4 +- kio/kfile/kfilesharedlg.cpp | 10 +- kio/kfile/kfilespeedbar.cpp | 12 +- kio/kfile/kfileview.cpp | 2 +- kio/kfile/kicondialog.cpp | 6 +- kio/kfile/kimagefilepreview.cpp | 4 +- kio/kfile/kmetaprops.cpp | 2 +- kio/kfile/knotifydialog.cpp | 8 +- kio/kfile/knotifydialog.h | 4 +- kio/kfile/kopenwith.cpp | 14 +- kio/kfile/kpreviewprops.cpp | 2 +- kio/kfile/kpropertiesdialog.cpp | 38 ++-- kio/kfile/krecentdirs.cpp | 6 +- kio/kfile/krecentdocument.cpp | 6 +- kio/kfile/kurlbar.cpp | 10 +- kio/kfile/kurlcombobox.cpp | 2 +- kio/kfile/tests/kfiletreeviewtest.cpp | 2 +- kio/kfile/tests/kfstest.cpp | 2 +- kio/kio/defaultprogress.cpp | 14 +- kio/kio/global.cpp | 20 +- kio/kio/job.cpp | 2 +- kio/kio/kdatatool.cpp | 4 +- kio/kio/kdirlister.cpp | 14 +- kio/kio/kdirwatch.cpp | 2 +- kio/kio/kfilefilter.cpp | 4 +- kio/kio/kfileitem.cpp | 12 +- kio/kio/kfilemetainfo.cpp | 16 +- kio/kio/kfileshare.cpp | 8 +- kio/kio/kmimemagic.cpp | 4 +- kio/kio/kmimetype.cpp | 28 +-- kio/kio/kmimetypechooser.cpp | 8 +- kio/kio/kprotocolmanager.cpp | 4 +- kio/kio/krun.cpp | 46 ++-- kio/kio/krun.h | 20 +- kio/kio/ksambashare.cpp | 2 +- kio/kio/kservice.cpp | 2 +- kio/kio/kurifilter.cpp | 8 +- kio/kio/kurlcompletion.cpp | 16 +- kio/kio/kuserprofile.cpp | 4 +- kio/kio/passdlg.cpp | 6 +- kio/kio/previewjob.cpp | 2 +- kio/kio/renamedlg.cpp | 8 +- kio/kio/sessiondata.cpp | 6 +- kio/kio/slave.cpp | 10 +- kio/kio/slaveconfig.cpp | 2 +- kio/kioexec/main.cpp | 6 +- kio/kssl/ksslcertdlg.cc | 2 +- kio/kssl/ksslcertificate.cc | 6 +- kio/kssl/ksslinfodlg.cc | 4 +- kio/kssl/ksslkeygen.cc | 4 +- kio/kssl/ksslsettings.cc | 4 +- kio/kssl/ksslutils.cc | 2 +- kio/misc/kpac/discovery.cpp | 2 +- kio/misc/kpac/downloader.cpp | 2 +- kio/misc/kssld/kssld.cpp | 10 +- kio/misc/kwalletd/kwalletd.cpp | 8 +- kio/tests/kdcopcheck.cpp | 2 +- kio/tests/kdcopcheck.h | 2 +- kio/tests/kprotocolinfotest.cpp | 2 +- kioslave/file/file.cc | 28 +-- kioslave/ftp/ftp.cc | 2 +- kioslave/http/http.cc | 4 +- kioslave/http/http_cache_cleaner.cpp | 2 +- kioslave/http/kcookiejar/kcookiewin.cpp | 2 +- kmdi/kmdi/dockcontainer.cpp | 2 +- kmdi/kmdichildarea.cpp | 16 +- kmdi/kmdichildarea.h | 4 +- kmdi/kmdidockcontainer.cpp | 2 +- knewstuff/downloaddialog.cpp | 32 +-- knewstuff/downloaddialog.h | 2 +- knewstuff/entry.cpp | 8 +- knewstuff/knewstuff.cpp | 2 +- knewstuff/knewstuffbutton.h | 2 +- knewstuff/knewstuffgeneric.cpp | 6 +- knewstuff/knewstuffsecure.cpp | 4 +- knewstuff/provider.cpp | 2 +- knewstuff/provider.h | 2 +- knewstuff/security.cpp | 18 +- knewstuff/security.h | 4 +- knewstuff/testnewstuff.cpp | 4 +- knewstuff/uploaddialog.cpp | 2 +- kparts/browserrun.cpp | 4 +- kparts/dockmainwindow.cpp | 2 +- kparts/mainwindow.cpp | 6 +- kparts/part.cpp | 4 +- kparts/partmanager.cpp | 4 +- kparts/plugin.cpp | 2 +- kparts/tests/example.cpp | 2 +- kparts/tests/normalktm.cpp | 2 +- kspell2/settings.cpp | 2 +- kstyles/highcontrast/config/highcontrastconfig.cpp | 4 +- kstyles/klegacy/klegacystyle.cpp | 2 +- kstyles/plastik/config/plastikconf.cpp | 4 +- kstyles/utils/installtheme/main.cpp | 6 +- kunittest/runner.cpp | 2 +- kutils/kcmodulecontainer.cpp | 2 +- kutils/kcmoduleproxy.cpp | 10 +- kutils/kcmoduleproxy.h | 2 +- kutils/kcmultidialog.cpp | 4 +- kutils/kplugininfo.cpp | 2 +- kutils/kpluginselector.cpp | 4 +- kutils/kpluginselector.h | 2 +- kutils/ksettings/README.dox | 4 +- kutils/ksettings/dialog.cpp | 6 +- kutils/ksettings/dialog.h | 4 +- kutils/ksettings/pluginpage.h | 4 +- kwallet/backend/kwalletbackend.cc | 6 +- libkmid/deviceman.cc | 2 +- libkmid/midfile.cc | 2 +- libkscreensaver/main.cpp | 4 +- tdecore/AUTHORS | 2 +- tdecore/README.exec | 6 +- tdecore/README.kstartupinfo | 2 +- tdecore/kaboutdata.cpp | 2 +- tdecore/kaccel.h | 6 +- tdecore/kaccelaction.cpp | 10 +- tdecore/kaccelaction.h | 2 +- tdecore/kaccelbase.cpp | 4 +- tdecore/kaccelbase.h | 2 +- tdecore/kappdcopiface.cpp | 2 +- tdecore/kapplication.cpp | 102 ++++----- tdecore/kapplication.h | 10 +- tdecore/kapplication_win.cpp | 4 +- tdecore/kcalendarsystem.cpp | 2 +- tdecore/kcharsets.cpp | 6 +- tdecore/kcharsets.h | 6 +- tdecore/kcheckaccelerators.cpp | 8 +- tdecore/kclipboard.cpp | 34 +-- tdecore/kclipboard.h | 18 +- tdecore/kcmdlineargs.cpp | 6 +- tdecore/kcompletion.cpp | 20 +- tdecore/kcompletion.h | 32 +-- tdecore/kcompletionbase.cpp | 6 +- tdecore/kconfig.cpp | 2 +- tdecore/kconfig.h | 2 +- tdecore/kconfig_compiler/kconfig_compiler.cpp | 4 +- tdecore/kconfig_compiler/tests/test8a.cpp.ref | 4 +- tdecore/kconfig_compiler/tests/test8a.h.ref | 2 +- tdecore/kconfig_compiler/tests/test8a.kcfg | 4 +- tdecore/kconfigbackend.cpp | 18 +- tdecore/kconfigbase.cpp | 18 +- tdecore/kconfigbase.h | 2 +- tdecore/kconfigskeleton.cpp | 2 +- tdecore/kconfigskeleton.h | 4 +- tdecore/kcrash.cpp | 2 +- tdecore/kdebug.areas | 2 +- tdecore/kdebug.cpp | 16 +- tdecore/kdebug.h | 20 +- tdecore/kdesktopfile.cpp | 10 +- tdecore/kgenericfactory.h | 4 +- tdecore/kglobal.cpp | 74 +++---- tdecore/kglobal.h | 20 +- tdecore/kglobalaccel.cpp | 60 +++--- tdecore/kglobalaccel.h | 26 +-- tdecore/kglobalaccel_emb.h | 4 +- tdecore/kglobalaccel_mac.h | 4 +- tdecore/kglobalaccel_win.cpp | 46 ++-- tdecore/kglobalaccel_win.h | 8 +- tdecore/kglobalaccel_x11.cpp | 50 ++--- tdecore/kglobalaccel_x11.h | 8 +- tdecore/kglobalsettings.cpp | 240 ++++++++++----------- tdecore/kglobalsettings.h | 4 +- tdecore/kiconeffect.cpp | 14 +- tdecore/kiconloader.cpp | 44 ++-- tdecore/kiconloader.h | 28 +-- tdecore/kicontheme.cpp | 16 +- tdecore/kinstance.cpp | 26 +-- tdecore/kinstance.h | 2 +- tdecore/kkeyserver_x11.cpp | 12 +- tdecore/klibloader.h | 4 +- tdecore/klocale.cpp | 32 +-- tdecore/klocale.h | 6 +- tdecore/kmimesourcefactory.h | 2 +- tdecore/kpalette.cpp | 2 +- tdecore/kprocctrl.cpp | 58 ++--- tdecore/kprocctrl.h | 26 +-- tdecore/kprocess.cpp | 148 ++++++------- tdecore/kprocess.h | 88 ++++---- tdecore/kprocio.cpp | 42 ++-- tdecore/kprocio.h | 20 +- tdecore/kpty.cpp | 14 +- tdecore/kshortcutlist.cpp | 6 +- tdecore/kshortcutlist.h | 10 +- tdecore/kshortcutmenu.cpp | 2 +- tdecore/ksimpleconfig.cpp | 2 +- tdecore/ksimpledirwatch.cpp | 2 +- tdecore/kstandarddirs.cpp | 4 +- tdecore/kstandarddirs.h | 14 +- tdecore/kstaticdeleter.h | 26 +-- tdecore/kstdaccel.cpp | 2 +- tdecore/kstringhandler.cpp | 2 +- tdecore/ksycoca.cpp | 4 +- tdecore/ktempdir.cpp | 2 +- tdecore/ktempfile.cpp | 2 +- tdecore/ktimezones.cpp | 2 +- tdecore/kurl.cpp | 6 +- tdecore/kurldrag.cpp | 6 +- tdecore/network/kresolverstandardworkers.cpp | 4 +- .../network-manager/network-manager.cpp | 2 +- tdecore/tde-config.cpp.cmake | 18 +- tdecore/tde-config.cpp.in | 18 +- tdecore/tdehardwaredevices.cpp | 38 ++-- tdecore/tdenetworkconnections.cpp | 4 +- tdecore/tests/kcalendartest.cpp | 92 ++++---- tdecore/tests/kiconloadertest.cpp | 2 +- tdecore/tests/klocaletest.cpp | 96 ++++----- tdecore/tests/kprocesstest.cpp | 48 ++--- tdecore/tests/kprocesstest.h | 10 +- tdecore/tests/kprociotest.cpp | 4 +- tdecore/tests/kprociotest.h | 4 +- tdecore/tests/kurltest.cpp | 8 +- tdecore/twin.cpp | 4 +- tdefx/kimageeffect.cpp | 2 +- tdelfeditor/tdelfeditor.cpp | 6 +- tdeprint/ChangeLog | 2 +- tdeprint/cups/cupsaddsmb2.cpp | 12 +- tdeprint/cups/cupsaddsmb2.h | 6 +- tdeprint/cups/cupsdconf2/cupsddialog.cpp | 12 +- tdeprint/cups/ipprequest.cpp | 4 +- tdeprint/cups/kcupsprinterimpl.cpp | 2 +- tdeprint/cups/kmcupsmanager.cpp | 6 +- tdeprint/foomatic/kmfoomaticmanager.cpp | 4 +- tdeprint/kmfactory.cpp | 4 +- tdeprint/kmspecialmanager.cpp | 6 +- tdeprint/kpgeneralpage.cpp | 2 +- tdeprint/kpmarginpage.cpp | 2 +- tdeprint/kpqtpage.cpp | 2 +- tdeprint/kprintdialog.cpp | 4 +- tdeprint/kprinter.cpp | 6 +- tdeprint/kprinterimpl.cpp | 10 +- tdeprint/kprintpreview.cpp | 6 +- tdeprint/kprintpreview.h | 4 +- tdeprint/kprintprocess.cpp | 10 +- tdeprint/kprintprocess.h | 4 +- tdeprint/kxmlcommand.cpp | 4 +- tdeprint/lpd/kmlpdmanager.cpp | 12 +- tdeprint/lpdunix/klpdunixprinterimpl.h | 2 +- tdeprint/lpr/kmlprmanager.cpp | 4 +- tdeprint/lpr/lpchelper.cpp | 6 +- tdeprint/lpr/lpqhelper.cpp | 2 +- tdeprint/lpr/matichandler.cpp | 10 +- tdeprint/management/kaddprinterwizard.cpp | 2 +- tdeprint/management/kmconfigdialog.cpp | 2 +- tdeprint/management/kmdbcreator.cpp | 14 +- tdeprint/management/kmdbcreator.h | 8 +- tdeprint/management/kmmainview.cpp | 6 +- tdeprint/management/kmpropertypage.cpp | 2 +- tdeprint/management/smbview.cpp | 20 +- tdeprint/management/smbview.h | 8 +- tdeprint/marginwidget.cpp | 2 +- tdeprint/posterpreview.cpp | 16 +- tdeprint/posterpreview.h | 8 +- tdeprint/printerfilter.cpp | 4 +- tdeprint/rlpr/krlprprinterimpl.h | 2 +- tdeprint/tdeprintd.cpp | 6 +- tdeprint/tdeprintd.h | 2 +- tdeprint/tools/escputil/escpwidget.cpp | 14 +- tdeprint/tools/escputil/escpwidget.h | 8 +- tdesu/kcookie.cpp | 4 +- tdesu/process.cpp | 2 +- tdesu/su.cpp | 6 +- tdeui/kaboutapplication.cpp | 2 +- tdeui/kaboutdialog.cpp | 6 +- tdeui/kaction.cpp | 4 +- tdeui/kactionclasses.cpp | 10 +- tdeui/kactioncollection.cpp | 2 +- tdeui/kanimwidget.cpp | 4 +- tdeui/kbugreport.cpp | 20 +- tdeui/kbugreport.h | 4 +- tdeui/kcmenumngr.cpp | 2 +- tdeui/kcmodule.cpp | 8 +- tdeui/kcolorbutton.cpp | 2 +- tdeui/kcolordialog.cpp | 8 +- tdeui/kcombobox.cpp | 12 +- tdeui/kcombobox.h | 8 +- tdeui/kcompletionbox.cpp | 2 +- tdeui/kcompletionbox.h | 2 +- tdeui/kcursor.cpp | 4 +- tdeui/kdatepicker.cpp | 28 +-- tdeui/kdatetbl.cpp | 60 +++--- tdeui/kdatewidget.cpp | 8 +- tdeui/kdialog.cpp | 4 +- tdeui/kdialogbase.cpp | 6 +- tdeui/kdialogbase.h | 4 +- tdeui/kdockwidget.cpp | 6 +- tdeui/kdockwidget.h | 2 +- tdeui/kdualcolorbutton.cpp | 2 +- tdeui/kedittoolbar.cpp | 56 ++--- tdeui/kedittoolbar.h | 12 +- tdeui/kfontcombo.cpp | 4 +- tdeui/kfontdialog.cpp | 6 +- tdeui/kguiitem.h | 4 +- tdeui/khelpmenu.cpp | 2 +- tdeui/kiconview.cpp | 10 +- tdeui/kjanuswidget.cpp | 2 +- tdeui/kkeydialog.cpp | 22 +- tdeui/kkeydialog.h | 22 +- tdeui/klineedit.cpp | 110 +++++----- tdeui/klineedit.h | 12 +- tdeui/klistbox.cpp | 6 +- tdeui/klistview.cpp | 26 +-- tdeui/kmainwindow.cpp | 10 +- tdeui/kmainwindow.h | 4 +- tdeui/kmenubar.cpp | 4 +- tdeui/kmessagebox.cpp | 16 +- tdeui/kmessagebox.h | 2 +- tdeui/knuminput.cpp | 4 +- tdeui/knumvalidator.cpp | 6 +- tdeui/kpanelapplet.h | 2 +- tdeui/kpanelextension.h | 2 +- tdeui/kpanelmenu.cpp | 2 +- tdeui/kpassdlg.cpp | 6 +- tdeui/kpassivepopup.cpp | 4 +- tdeui/kpixmapio.cpp | 2 +- tdeui/kpushbutton.cpp | 4 +- tdeui/kpushbutton.h | 2 +- tdeui/ksconfig.cpp | 12 +- tdeui/kscrollview.cpp | 2 +- tdeui/kshortcutdialog.cpp | 4 +- tdeui/kspell.cpp | 12 +- tdeui/kspell.h | 6 +- tdeui/ksplashscreen.cpp | 2 +- tdeui/kstatusbar.cpp | 2 +- tdeui/kstdaction.cpp | 4 +- tdeui/kswitchlanguagedialog.cpp | 14 +- tdeui/ksyntaxhighlighter.cpp | 6 +- tdeui/ksystemtray.cpp | 2 +- tdeui/ksystemtray.h | 4 +- tdeui/ktabbar.cpp | 6 +- tdeui/ktabwidget.cpp | 6 +- tdeui/ktextbrowser.cpp | 2 +- tdeui/ktextedit.cpp | 2 +- tdeui/ktimezonewidget.h | 2 +- tdeui/ktip.cpp | 24 +-- tdeui/ktoolbar.cpp | 44 ++-- tdeui/ktoolbar.h | 4 +- tdeui/ktoolbarbutton.cpp | 12 +- tdeui/ktoolbarbutton.h | 2 +- tdeui/kurllabel.cpp | 4 +- tdeui/kwizard.cpp | 2 +- tdeui/kxmlguibuilder.cpp | 6 +- tdeui/kxmlguiclient.cpp | 32 +-- tdeui/kxmlguifactory.cpp | 20 +- tdeui/kxmlguifactory_p.cpp | 34 +-- tdeui/tests/itemcontainertest.cpp | 2 +- tdeui/tests/kcomboboxtest.cpp | 4 +- tdeui/tests/klistviewtest.cpp | 4 +- tdeui/tests/ktoolbarlabelactiontest.cpp | 2 +- tdeui/tests/kxmlguitest.cpp | 2 +- 435 files changed, 2251 insertions(+), 2251 deletions(-) (limited to 'khtml/java') diff --git a/KDE2PORTING.html b/KDE2PORTING.html index c69d11732..41b9f5379 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -22,7 +22,7 @@ or this page online.

  • TDEApplication
  • TDECmdLineArgs
  • KLocale
    • -
  • KGlobal: access to KDE global objects.
    • +
  • TDEGlobal: access to KDE global objects.
  • KIconLoader
  • KTMainWindow
  • KHelpMenu
    • @@ -37,7 +37,7 @@ or this page online.

  • kcharsets
  • KWizard, KNoteBook
  • KSpinBox, KNumericSpinBox
    • -
  • KClipboard
    • +
  • TDEClipboard
  • KPanner, KNewPanner
  • KTreeList, KTreeListItem
  • KMsgBox
    • @@ -110,11 +110,11 @@ or this page online.

    TDEApplication

    doesn't hold any longer a KLocale instance. With this getLocale() - and isLocaleInstantiated are now replaced by KGlobal::locale()

    + and isLocaleInstantiated are now replaced by TDEGlobal::locale()

    it also doesn't hold a KiconLoader instance. As this also getIconLoader() has been removed. Replace kapp->getIconLoader()->loadIcon() with - BarIcon() or use KGlobal::iconLoader() instead of getIconLoader()

    + BarIcon() or use TDEGlobal::iconLoader() instead of getIconLoader()

    kde_*dir() have been removed as they require a unique top level directory for all applications (TDEDIR). This concept doesn't exist in KDE 2.0 @@ -125,16 +125,16 @@ or this page online.

    Replace code that uses kde_*dir() + filename with calls to locate(filetype, filename) where filetype is what * used to be in kde_*dir(). locate is defined as function in kstddirs.h to call - KGlobal::dirs()->findResource.

    + TDEGlobal::dirs()->findResource.

    Use locateLocal to get the path of a writable file. For instance, TDEApplication::localconfigdir()+filename is now locateLocal( "config", filename ), - but for most cases, simply using KGlobal::config() is enough, if you're happy + but for most cases, simply using TDEGlobal::config() is enough, if you're happy with saving the application's configuration into appnamerc, or KSimpleConfig cfg("anothercfgfile") to create a config file with another name.

    generalFont() and fixedFont() are deprecated and will be removed soon. - Please use KGlobalSettings::generalFont() and KGlobalSettings::fixedFont() instead.

    + Please use TDEGlobalSettings::generalFont() and TDEGlobalSettings::fixedFont() instead.

    appName() is deprecated. Please use TQApplication::name() or instanceName instead.

    @@ -193,9 +193,9 @@ or this page online.

    Return to the Table of Contents

    -

    KGlobal: access to KDE global objects.

    +

    TDEGlobal: access to KDE global objects.

    -KGlobal allows centralized access to KDE global objects without including +TDEGlobal allows centralized access to KDE global objects without including extraneous headers. object creation is deferred if possible.

    All methods are static and headers for returned types are not included. You @@ -215,11 +215,11 @@ must have created a TDEApplication object before the methods can be used.

    		 
         ...
-        	KConfig *appcfg = KGlobal::config();
+        	KConfig *appcfg = TDEGlobal::config();
 	        TQString mystr	 = i18n( "This is a string" );
 
 
-		KIconLoader *loader = KGlobal::iconLoader();
+		KIconLoader *loader = TDEGlobal::iconLoader();
    Inherits stringKConfigSkeletonTDEConfigSkeleton Class the generated class inherits from. This class must inherit - KConfigSkeleton.
    VisibilityItemAccessors bool falseGenerate accessor functions for the KConfigSkeletonItem objects + Generate accessor functions for the TDEConfigSkeletonItem objects corresponding to the configuration options. If SetUserTexts is set, ItemAccessors also has to be set.

    -

  • Don't forget to change the link-flags! (-lkhtml -lkjava instead of -lkhtmlw) +
  • Don't forget to change the link-flags! (-ltdehtml -lkjava instead of -ltdehtmlw)

    Return to the Table of Contents

    diff --git a/KDE3PORTING.html b/KDE3PORTING.html index aa16c489a..645bd7612 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -20,9 +20,9 @@ or this page online.

  • Changes in tdecore
  • Changes in tdeui
  • Changes in kio
    • -
  • Changes in kparts
    • -
  • Changes in kspell
    • -
  • API-cleanup in KHTML
    • +
  • Changes in tdeparts
    • +
  • Changes in tdespell
    • +
  • API-cleanup in KHTML
  • Changes in kfile
  • TDE Control Center
  • Panel Applets and Extensions
    • @@ -416,7 +416,7 @@ TQString&) is not a slot anymore.

    KOpenWithHandler / KFileOpenWithHandler

    Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore. -The merging of libkio, libksycoca, libkfile and libkssl into a single libkio has +The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.

    KMimeType, KService

    @@ -440,7 +440,7 @@ The createFilterDevice method is deprecated. Use deviceForFile instead.

    Return to the Table of Contents

    -

    Changes in kparts

    +

    Changes in tdeparts

    KParts::Factory

    The createPart method is no more virtual and the createPartObject method @@ -468,7 +468,7 @@ setURLArgs does the job.

    Return to the Table of Contents

    -

    Changes in kspell

    +

    Changes in tdespell

    KSpell

    The API has been cleaned up to be in line with the rest of tdelibs, in particular: @@ -495,7 +495,7 @@ The API has been cleaned up to be in line with the rest of tdelibs, in particula

    Return to the Table of Contents

    -

    API-cleanups in KHTML

    +

    API-cleanups in KHTML

    There were a few relatively minor API-adjustements in KHTMLPart. In particular: