diff options
44 files changed, 51 insertions, 51 deletions
diff --git a/IconThemes/kdeclassic/16x16/apps/kio_uiserver.png b/IconThemes/kdeclassic/16x16/apps/tdeio_uiserver.png Binary files differindex 45dc3405..45dc3405 100644 --- a/IconThemes/kdeclassic/16x16/apps/kio_uiserver.png +++ b/IconThemes/kdeclassic/16x16/apps/tdeio_uiserver.png diff --git a/IconThemes/slick/16x16/apps/kio_uiserver.png b/IconThemes/slick/16x16/apps/tdeio_uiserver.png Binary files differindex 9de8a241..9de8a241 100644 --- a/IconThemes/slick/16x16/apps/kio_uiserver.png +++ b/IconThemes/slick/16x16/apps/tdeio_uiserver.png diff --git a/tdescreensaver/kdesavers/CMakeLists.txt b/tdescreensaver/kdesavers/CMakeLists.txt index f2e3f027..f08693ee 100644 --- a/tdescreensaver/kdesavers/CMakeLists.txt +++ b/tdescreensaver/kdesavers/CMakeLists.txt @@ -39,7 +39,7 @@ set( kblob_DESKTOP KBlob.desktop ) set( kvm_SOURCES kvm.cpp vm.c vm_random.c ) set( kvm_DESKTOP KVm.desktop ) -set( kslideshow_LINK kio-shared ) +set( kslideshow_LINK tdeio-shared ) set( NORMAL_SCREENSAVERS kbanner kpolygon kslideshow klines klorenz kblob kvm ) diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp index 304aaeee..bae407da 100644 --- a/tdescreensaver/kdesavers/Euphoria.cpp +++ b/tdescreensaver/kdesavers/Euphoria.cpp @@ -890,7 +890,7 @@ void EuphoriaWidget::setDefaults(int which) #ifndef UNIT_TEST #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> // libtdescreensaver interface diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp index 0ee9c0d3..507b2433 100644 --- a/tdescreensaver/kdesavers/Flux.cpp +++ b/tdescreensaver/kdesavers/Flux.cpp @@ -774,7 +774,7 @@ void FluxWidget::updateParameters() #ifndef UNIT_TEST #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> // libtdescreensaver interface diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp index c55fe531..ed0856ad 100644 --- a/tdescreensaver/kdesavers/SolarWinds.cpp +++ b/tdescreensaver/kdesavers/SolarWinds.cpp @@ -588,7 +588,7 @@ void SWindsWidget::setDefaults(int which) #ifndef UNIT_TEST #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> // libtdescreensaver interface diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp index 5e907c25..8cfe7e06 100644 --- a/tdescreensaver/kdesavers/banner.cpp +++ b/tdescreensaver/kdesavers/banner.cpp @@ -29,7 +29,7 @@ #include <krandomsequence.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kcolorbutton.h> #include <kfontcombo.h> diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp index 763cf10c..427a7237 100644 --- a/tdescreensaver/kdesavers/blob.cpp +++ b/tdescreensaver/kdesavers/blob.cpp @@ -31,7 +31,7 @@ #include <tqimage.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <klocale.h> diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp index 71954242..7c7c2665 100644 --- a/tdescreensaver/kdesavers/firesaver.cpp +++ b/tdescreensaver/kdesavers/firesaver.cpp @@ -21,7 +21,7 @@ #include <math.h> #include <sys/time.h> #include <stdlib.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kstandarddirs.h> #include <klocale.h> diff --git a/tdescreensaver/kdesavers/firesaversetup.ui.h b/tdescreensaver/kdesavers/firesaversetup.ui.h index da8ed42a..a07d8896 100644 --- a/tdescreensaver/kdesavers/firesaversetup.ui.h +++ b/tdescreensaver/kdesavers/firesaversetup.ui.h @@ -13,7 +13,7 @@ #include <tqcolor.h> #include <tqtimer.h> -#include <kconfig.h> +#include <tdeconfig.h> void KFireSaverSetup::init() diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp index 7e4c13f8..35b5a2cf 100644 --- a/tdescreensaver/kdesavers/fountain.cpp +++ b/tdescreensaver/kdesavers/fountain.cpp @@ -12,7 +12,7 @@ #include <tqlayout.h> #include <kapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcolordialog.h> #include <kbuttonbox.h> #include <kcolorbutton.h> diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp index 8c0accc1..21933e18 100644 --- a/tdescreensaver/kdesavers/gravity.cpp +++ b/tdescreensaver/kdesavers/gravity.cpp @@ -12,7 +12,7 @@ #include <tqlayout.h> #include <kapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcolordialog.h> #include <kbuttonbox.h> #include <kcolorbutton.h> diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp index 5201f222..ce8ef182 100644 --- a/tdescreensaver/kdesavers/kclock.cpp +++ b/tdescreensaver/kdesavers/kclock.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp index 3ba233fa..c110d894 100644 --- a/tdescreensaver/kdesavers/kvm.cpp +++ b/tdescreensaver/kdesavers/kvm.cpp @@ -41,7 +41,7 @@ #include <tqbitmap.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kglobal.h> #include <kmessagebox.h> diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp index a2692217..3349fe8e 100644 --- a/tdescreensaver/kdesavers/lines.cpp +++ b/tdescreensaver/kdesavers/lines.cpp @@ -14,7 +14,7 @@ #include <tqcolor.h> #include <tqlabel.h> #include <tqslider.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kmessagebox.h> #include <kcolorbutton.h> diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp index 91e6bbfc..24a799a8 100644 --- a/tdescreensaver/kdesavers/lorenz.cpp +++ b/tdescreensaver/kdesavers/lorenz.cpp @@ -20,7 +20,7 @@ #include <kapplication.h> #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include "lorenz.h" diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp index d1889877..1b2abc0f 100644 --- a/tdescreensaver/kdesavers/pendulum.cpp +++ b/tdescreensaver/kdesavers/pendulum.cpp @@ -38,7 +38,7 @@ #include <tqtooltip.h> // KDE headers #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp index a28cd34c..f4cb08ba 100644 --- a/tdescreensaver/kdesavers/polygon.cpp +++ b/tdescreensaver/kdesavers/polygon.cpp @@ -15,7 +15,7 @@ #include <tqslider.h> #include <tqlayout.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kmessagebox.h> diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp index fb38b71f..30b49da8 100644 --- a/tdescreensaver/kdesavers/rotation.cpp +++ b/tdescreensaver/kdesavers/rotation.cpp @@ -38,7 +38,7 @@ #include <tqtooltip.h> // KDE headers #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp index 1eea3262..06b780be 100644 --- a/tdescreensaver/kdesavers/science.cpp +++ b/tdescreensaver/kdesavers/science.cpp @@ -24,7 +24,7 @@ #include <kglobal.h> #include <kmessagebox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <krandomsequence.h> diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp index ea216991..738558c6 100644 --- a/tdescreensaver/kdesavers/slideshow.cpp +++ b/tdescreensaver/kdesavers/slideshow.cpp @@ -22,13 +22,13 @@ #include <tqframe.h> #include <tqdesktopwidget.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kapplication.h> #include <klocale.h> #include <kmessagebox.h> #include <kimageio.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstandarddirs.h> #include <kurlrequester.h> #include <kaboutdata.h> diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp index 67357f89..d8e0c8a9 100644 --- a/tdescreensaver/kdesavers/wave.cpp +++ b/tdescreensaver/kdesavers/wave.cpp @@ -9,7 +9,7 @@ #include <tqlayout.h> #include <kapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcolordialog.h> #include <kbuttonbox.h> #include <kcolorbutton.h> diff --git a/tdescreensaver/kxsconfig/CMakeLists.txt b/tdescreensaver/kxsconfig/CMakeLists.txt index 99f44e54..9bb0249a 100644 --- a/tdescreensaver/kxsconfig/CMakeLists.txt +++ b/tdescreensaver/kxsconfig/CMakeLists.txt @@ -30,7 +30,7 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared ${X11_Xt_LIB} + LINK tdeio-shared ${X11_Xt_LIB} DESTINATION ${BIN_INSTALL_DIR} ) @@ -42,7 +42,7 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp index dbe3ea91..ab0b4373 100644 --- a/tdescreensaver/kxsconfig/kxsconfig.cpp +++ b/tdescreensaver/kxsconfig/kxsconfig.cpp @@ -45,7 +45,7 @@ #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp index 08f9b55c..594a0255 100644 --- a/tdescreensaver/kxsconfig/kxscontrol.cpp +++ b/tdescreensaver/kxsconfig/kxscontrol.cpp @@ -28,7 +28,7 @@ #include <tqpushbutton.h> #include <tqxml.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "kxscontrol.h" //=========================================================================== diff --git a/tdescreensaver/kxsconfig/kxsitem.h b/tdescreensaver/kxsconfig/kxsitem.h index 9e4bed3e..4237e603 100644 --- a/tdescreensaver/kxsconfig/kxsitem.h +++ b/tdescreensaver/kxsconfig/kxsitem.h @@ -22,7 +22,7 @@ #ifndef __KXSITEM_H__ #define __KXSITEM_H__ -#include <kconfig.h> +#include <tdeconfig.h> class TQXmlAttributes; diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp index 6ffa1b15..93789e90 100644 --- a/tdescreensaver/kxsconfig/kxsrun.cpp +++ b/tdescreensaver/kxsconfig/kxsrun.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <klocale.h> #include <kcmdlineargs.h> diff --git a/tdescreensaver/tdepartsaver/CMakeLists.txt b/tdescreensaver/tdepartsaver/CMakeLists.txt index e4259969..34e86a8b 100644 --- a/tdescreensaver/tdepartsaver/CMakeLists.txt +++ b/tdescreensaver/tdepartsaver/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES tdepartsaver.desktop tde_add_executable( tdepartsaver.kss AUTOMOC SOURCES tdepartsaver.cpp configwidget.ui - LINK tdescreensaver-shared kio-shared + LINK tdescreensaver-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp index a2c0cc40..e857623e 100644 --- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp +++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp @@ -36,13 +36,13 @@ #include <kapplication.h> #include <kdebug.h> #include <klibloader.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <kurl.h> #include <tdeparts/part.h> #include <ktrader.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kmimetype.h> #include <tdescreensaver.h> diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h index 5c53e773..b91f415a 100644 --- a/tdescreensaver/tdepartsaver/tdepartsaver.h +++ b/tdescreensaver/tdepartsaver/tdepartsaver.h @@ -34,13 +34,13 @@ #include <klocale.h> #include <kapplication.h> #include <kdebug.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <kurl.h> #include <tdeparts/part.h> #include <ktrader.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kmimetype.h> #include <tdescreensaver.h> diff --git a/tdescreensaver/xsavers/demowin.h b/tdescreensaver/xsavers/demowin.h index 6a09b7c3..b6b86275 100644 --- a/tdescreensaver/xsavers/demowin.h +++ b/tdescreensaver/xsavers/demowin.h @@ -15,7 +15,7 @@ #include <stdio.h> #include <stdlib.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kapplication.h> diff --git a/tdescreensaver/xsavers/helpers.h b/tdescreensaver/xsavers/helpers.h index e4125709..24e20065 100644 --- a/tdescreensaver/xsavers/helpers.h +++ b/tdescreensaver/xsavers/helpers.h @@ -2,7 +2,7 @@ #define __HELPERS__H__ #include <tqwidget.h> -#include <kconfig.h> +#include <tdeconfig.h> void min_width(TQWidget *); void fixed_width(TQWidget *); diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp index d7f76dcd..91a88731 100644 --- a/tdescreensaver/xsavers/main.cpp +++ b/tdescreensaver/xsavers/main.cpp @@ -14,7 +14,7 @@ #include <tqcolor.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kapplication.h> diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp index a15dd171..bd87a9b4 100644 --- a/tdescreensaver/xsavers/space.cpp +++ b/tdescreensaver/xsavers/space.cpp @@ -52,7 +52,7 @@ #include <tqslider.h> #include <tqlayout.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <krandomsequence.h> #include <kdebug.h> #include "xlock.h" diff --git a/tdescreensaver/xsavers/swarm.cpp b/tdescreensaver/xsavers/swarm.cpp index b81920ba..9c5a4923 100644 --- a/tdescreensaver/xsavers/swarm.cpp +++ b/tdescreensaver/xsavers/swarm.cpp @@ -23,7 +23,7 @@ #include <tqslider.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <krandomsequence.h> #include "xlock.h" diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index a54df440..5768f1bc 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -28,7 +28,7 @@ #include <tqpainter.h> #include <tqapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> extern "C" KDE_EXPORT KDecorationFactory* create_factory() { diff --git a/twin-styles/cde/config/config.h b/twin-styles/cde/config/config.h index 8a9fc6df..3b1188d1 100644 --- a/twin-styles/cde/config/config.h +++ b/twin-styles/cde/config/config.h @@ -7,7 +7,7 @@ #include <tqlabel.h> #include <tqradiobutton.h> #include <tqhbox.h> -#include <kconfig.h> +#include <tdeconfig.h> class TQCheckBox; class TQGroupBox; diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index 31b34c5e..dad86658 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -28,7 +28,7 @@ #include <tqpushbutton.h> #include <tqsignalmapper.h> #include <tqstringlist.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcolorbutton.h> #include <kdebug.h> #include <kglobal.h> diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 767363de..16d33c6f 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqpainter.h> #include <tqpixmap.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kpixmapeffect.h> diff --git a/twin-styles/icewm/config/CMakeLists.txt b/twin-styles/icewm/config/CMakeLists.txt index 9e2e118d..4be08396 100644 --- a/twin-styles/icewm/config/CMakeLists.txt +++ b/twin-styles/icewm/config/CMakeLists.txt @@ -23,6 +23,6 @@ link_directories( tde_add_kpart( twin_icewm_config AUTOMOC SOURCES config.cpp - LINK tdeui-shared kio-shared + LINK tdeui-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/twin-styles/icewm/config/config.h b/twin-styles/icewm/config/config.h index 89f98e0d..a28e75cf 100644 --- a/twin-styles/icewm/config/config.h +++ b/twin-styles/icewm/config/config.h @@ -33,7 +33,7 @@ #include <tqlistbox.h> #include <tqlabel.h> #include <kurllabel.h> -#include <kconfig.h> +#include <tdeconfig.h> class TQVBox; diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp index 003ec3d5..495562d2 100644 --- a/twin-styles/icewm/icewm.cpp +++ b/twin-styles/icewm/icewm.cpp @@ -40,7 +40,7 @@ */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kglobal.h> #include <klocale.h> @@ -269,7 +269,7 @@ void ThemeHandler::initTheme() if ( !themeName.isEmpty() ) themeName += "/"; - // We use kconfig to read icewm config files... + // We use tdeconfig to read icewm config files... // this is easy since icewm uses key=value pairs! TDEConfig config( locate("data", TQString("twin/icewm-themes/") + themeName + TQString("default.theme")) ); diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc index 58574360..8ed14166 100644 --- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc +++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc @@ -7,7 +7,7 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kglobal.h> #include <tqbuttongroup.h> diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc index e616e49f..de3af31a 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cc +++ b/twin-styles/smooth-blend/client/smoothblend.cc @@ -7,7 +7,7 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kglobal.h> #include <kglobalsettings.h> |
