diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:57 -0600 |
| commit | 0ea54195f4400f13a5cc109feee4b3779fbd2f0f (patch) | |
| tree | 14f5fe9a43c0a4bc41119c9d518713a3f91bd4c1 | |
| parent | 0ec14ccb8401eff2be20f861953a77431410955c (diff) | |
| download | tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.tar.gz tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
149 files changed, 193 insertions, 193 deletions
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index afd416f..6e3ff5f 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -35,7 +35,7 @@ #include <kxmlguifactory.h> #include <kstatusbar.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kpushbutton.h> #include <ksqueezedtextlabel.h> diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index c49760d..6a4ddae 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -43,8 +43,8 @@ #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <kopenwith.h> #include <ktempfile.h> #include <kmimemagic.h> @@ -52,12 +52,12 @@ #include <kstandarddirs.h> #include <ktempdir.h> #include <kprocess.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdirselectdialog.h> #include <kurldrag.h> #include <klistviewsearchline.h> #include <ktoolbar.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <ktrader.h> #include <kurl.h> diff --git a/ark/arkwidget.h b/ark/arkwidget.h index 11f6a95..a0f2ab5 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -30,7 +30,7 @@ #ifndef ARKWIDGET_H #define ARKWIDGET_H -#include <kio/job.h> +#include <tdeio/job.h> #include <ktempdir.h> #include <tqvbox.h> diff --git a/ark/artdeutils.h b/ark/artdeutils.h index baed64b..c53791f 100644 --- a/ark/artdeutils.h +++ b/ark/artdeutils.h @@ -34,7 +34,7 @@ #include <tqstring.h> -#include <kio/global.h> +#include <tdeio/global.h> class TQStringList; diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index 2688f6c..7e08c0e 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -40,9 +40,9 @@ #include <ktempdir.h> #include <kprocess.h> #include <kmimetype.h> -#include <kio/netaccess.h> -#include <kio/global.h> -#include <kfileitem.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> +#include <tdefileitem.h> #include <kapplication.h> #include <kglobal.h> diff --git a/ark/filelistview.h b/ark/filelistview.h index d3479f1..9c84e43 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -33,7 +33,7 @@ #include <tqvaluelist.h> #include <klistview.h> -#include <kio/global.h> +#include <tdeio/global.h> class TQString; class TQStringList; diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 21ffb08..1198562 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -29,14 +29,14 @@ #include <klocale.h> #include <kedittoolbar.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kpopupmenu.h> #include <tdeparts/componentfactory.h> #include <tdeparts/browserextension.h> #include <kkeydialog.h> #include <kcombobox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kaccel.h> // ark includes diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 6803562..a1e92e2 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kaboutapplication.h> diff --git a/kcalc/ChangeLog b/kcalc/ChangeLog index 00abb5b..4e96f0c 100644 --- a/kcalc/ChangeLog +++ b/kcalc/ChangeLog @@ -46,7 +46,7 @@ * further refactoring of configuration options for const buttons 2004-12-05 Klaus Niederkrüger <kniederk@math.uni-koeln.de> - * understood how kconfigxt handles indexed configuration options + * understood how tdeconfigxt handles indexed configuration options 2004-12-03 Klaus Niederkrüger <kniederk@math.uni-koeln.de> * moving through history is now done via undo/redo diff --git a/kcalc/Makefile.am b/kcalc/Makefile.am index cd6d8b0..73d3d7c 100644 --- a/kcalc/Makefile.am +++ b/kcalc/Makefile.am @@ -32,7 +32,7 @@ rc_DATA = kcalcui.rc messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcalc.pot -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kcalcrc.upd DOXYGEN_EMPTY = YES diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index c3665c8..7d84ecb 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -47,8 +47,8 @@ #include <kcmdlineargs.h> #include <kcolorbutton.h> #include <kcolordrag.h> -#include <kconfig.h> -#include <kconfigdialog.h> +#include <tdeconfig.h> +#include <tdeconfigdialog.h> #include <kdialog.h> #include <kfontdialog.h> #include <kglobal.h> diff --git a/kcalc/kcalc_settings.kcfgc b/kcalc/kcalc_settings.kcfgc index 1ee30f0..392100c 100644 --- a/kcalc/kcalc_settings.kcfgc +++ b/kcalc/kcalc_settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kcalc.kcfg ClassName=KCalcSettings Singleton=true diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am index 38014b3..665537d 100644 --- a/kcharselect/Makefile.am +++ b/kcharselect/Makefile.am @@ -6,7 +6,7 @@ kcharselect_SOURCES = kcharselectdia.cc main.cc kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcharselect_METASOURCES = kcharselectdia.moc -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kcharselect.upd KDE_ICON = kcharselect diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc index 8d6b399..f5086d6 100644 --- a/kcharselect/kcharselectdia.cc +++ b/kcharselect/kcharselectdia.cc @@ -12,7 +12,7 @@ #include <kdialog.h> #include <kapplication.h> #include <kaccel.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kaction.h> diff --git a/kcharselect/main.cc b/kcharselect/main.cc index 0595370..006d095 100644 --- a/kcharselect/main.cc +++ b/kcharselect/main.cc @@ -7,7 +7,7 @@ #include "kcharselectdia.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcmdlineargs.h> #include <kaboutdata.h> #include <kglobalsettings.h> diff --git a/kdelirc/kcmlirc/CMakeLists.txt b/kdelirc/kcmlirc/CMakeLists.txt index 9f09d3e..e5c6e2b 100644 --- a/kdelirc/kcmlirc/CMakeLists.txt +++ b/kdelirc/kcmlirc/CMakeLists.txt @@ -34,7 +34,7 @@ tde_add_kpart( kcm_kcmlirc AUTOMOC addaction.cpp kcmlirc.skel editactionbase.ui editmodebase.ui editmode.cpp editaction.cpp modeslist.cpp - LINK kdelirc-static tdeui-shared kio-shared + LINK kdelirc-static tdeui-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index c97b203..74856d0 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -21,7 +21,7 @@ #include <kapplication.h> #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kicondialog.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kdelirc/kcmlirc/kcmlirc.desktop b/kdelirc/kcmlirc/kcmlirc.desktop index 94a3503..09033c1 100644 --- a/kdelirc/kcmlirc/kcmlirc.desktop +++ b/kdelirc/kcmlirc/kcmlirc.desktop @@ -50,7 +50,7 @@ Comment[tr]=Uzaktan kontrol ayarlarınızı uygulamalarla kullanmak için ayarla Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ–Ð² диÑтанційного ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð· програмами Comment[zh_CN]=é…置您的远程控制以供应用程åºä½¿ç”¨ Comment[zh_TW]=è¨å®šé™æŽ§æŒ‰éµèˆ‡æ‡‰ç”¨ç¨‹å¼çš„é—œè¯ -Exec=kcmshell kcmlirc +Exec=tdecmshell kcmlirc Keywords=KCMLirc,kcmlirc Keywords[bg]=диÑтанционно уÑтройÑтво, диÑтанционно, инфрачервени, лъчи, KCMLirc, kcmlirc Keywords[nl]=kcmlirc,linux infrarood,infrarood,afstandsbediening diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp index 7e2c26e..00be5da 100644 --- a/kdelirc/kdelirc/iraction.cpp +++ b/kdelirc/kdelirc/iraction.cpp @@ -13,7 +13,7 @@ #include <tqvariant.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "iraction.h" diff --git a/kdelirc/kdelirc/iractions.cpp b/kdelirc/kdelirc/iractions.cpp index fa5d34f..85d144e 100644 --- a/kdelirc/kdelirc/iractions.cpp +++ b/kdelirc/kdelirc/iractions.cpp @@ -10,7 +10,7 @@ // Copyright: See COPYING file that comes with this distribution // // -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "iractions.h" diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp index 3acae0a..9402573 100644 --- a/kdelirc/kdelirc/mode.cpp +++ b/kdelirc/kdelirc/mode.cpp @@ -11,7 +11,7 @@ // // -#include <kconfig.h> +#include <tdeconfig.h> #include "modes.h" #include "mode.h" diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp index bbab16f..8eedce0 100644 --- a/kdelirc/kdelirc/modes.cpp +++ b/kdelirc/kdelirc/modes.cpp @@ -10,7 +10,7 @@ // Copyright: See COPYING file that comes with this distribution // // -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "modes.h" diff --git a/kdelirc/profiles/CMakeLists.txt b/kdelirc/profiles/CMakeLists.txt index c6f8828..7fedebd 100644 --- a/kdelirc/profiles/CMakeLists.txt +++ b/kdelirc/profiles/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# install( FILES profile.dtd noatun.profile.xml - klauncher.profile.xml konqueror.profile.xml + tdelauncher.profile.xml konqueror.profile.xml DESTINATION ${DATA_INSTALL_DIR}/profiles ) diff --git a/kdelirc/profiles/Makefile.am b/kdelirc/profiles/Makefile.am index e25d1d4..9561d73 100644 --- a/kdelirc/profiles/Makefile.am +++ b/kdelirc/profiles/Makefile.am @@ -1,4 +1,4 @@ -profiledata_DATA = profile.dtd noatun.profile.xml klauncher.profile.xml konqueror.profile.xml +profiledata_DATA = profile.dtd noatun.profile.xml tdelauncher.profile.xml konqueror.profile.xml profiledatadir = $(kde_datadir)/profiles EXTRA_DIST = $(profiledata_DATA) diff --git a/kdelirc/profiles/klauncher.profile.xml b/kdelirc/profiles/tdelauncher.profile.xml index 4a19c71..57eca31 100644 --- a/kdelirc/profiles/klauncher.profile.xml +++ b/kdelirc/profiles/tdelauncher.profile.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE profile SYSTEM "profile.dtd"> -<profile id="klauncher"> +<profile id="tdelauncher"> <name>TDE Program Launcher</name> <author>Gav Wood</author> <action objid="default" prototype="void tdeinit_exec(QString, QStringList)" repeat="0" autostart="0"> diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp index 423a8f1..c5b89ab 100644 --- a/kdessh/kdessh.cpp +++ b/kdessh/kdessh.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kapplication.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kaboutdata.h> #include <kcmdlineargs.h> diff --git a/kdf/CMakeLists.txt b/kdf/CMakeLists.txt index 00345df..43725af 100644 --- a/kdf/CMakeLists.txt +++ b/kdf/CMakeLists.txt @@ -30,7 +30,7 @@ tde_add_library( kdf_common STATIC_PIC AUTOMOC SOURCES kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cpp disks.cpp listview.cpp optiondialog.cpp stdoption.cpp - LINK tdeui-shared kio-shared + LINK tdeui-shared tdeio-shared ) diff --git a/kdf/disklist.h b/kdf/disklist.h index 9dba750..cee71b9 100644 --- a/kdf/disklist.h +++ b/kdf/disklist.h @@ -26,7 +26,7 @@ #define __DISKLIST_H__ #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> //#include <kcontrol.h> diff --git a/kdf/disks.h b/kdf/disks.h index b39a9db..83b0d5d 100644 --- a/kdf/disks.h +++ b/kdf/disks.h @@ -32,7 +32,7 @@ #include <tqprogressbar.h> #include <tqfile.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kprogress.h> #include <kprocess.h> #include <klocale.h> diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop index 8bec44c..8fb2198 100644 --- a/kdf/kcmdf.desktop +++ b/kdf/kcmdf.desktop @@ -4,7 +4,7 @@ X-TDE-Library=kdf X-TDE-FactoryName=kdf X-TDE-ParentApp=kinfocenter X-TDE-LocalUser=false -Exec=kcmshell kcmdf +Exec=tdecmshell kcmdf Icon=kcmdf Type=Application Name=Storage Devices diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index 302c4b8..1b86925 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -36,7 +36,7 @@ #include <tqlineedit.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <klocale.h> #include <kiconloader.h> diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index bc4af51..27249aa 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -35,7 +35,7 @@ #undef Unsorted #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kicondialog.h> #include <kmessagebox.h> diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h index 5056507..f0b910a 100644 --- a/kdf/mntconfig.h +++ b/kdf/mntconfig.h @@ -26,7 +26,7 @@ #define __MNTCONFIG_H__ #include <tdecmodule.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include "disks.h" diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp index 9d7447e..ee004cd 100644 --- a/kdf/stdoption.cpp +++ b/kdf/stdoption.cpp @@ -27,7 +27,7 @@ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "stdoption.h" diff --git a/kdf/kconftest.cpp b/kdf/tdeconftest.cpp index 2c14a5c..63d904f 100644 --- a/kdf/kconftest.cpp +++ b/kdf/tdeconftest.cpp @@ -27,14 +27,14 @@ /* compile with -* gcc -I$TQTDIR/include -I$TDEDIR/include -L/opt/kde/lib -L/usr/X11R6/lib -lkfm -ltdeui -ltdecore -lqt -lX11 -lXext -fno-rtti kconftest.cpp +* gcc -I$TQTDIR/include -I$TDEDIR/include -L/opt/kde/lib -L/usr/X11R6/lib -lkfm -ltdeui -ltdecore -lqt -lX11 -lXext -fno-rtti tdeconftest.cpp */ #include <iostream> #include <tqstring.h> #include <tqdict.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kapplication.h> #include <klocale.h> diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index f3a0cb4..dd59fa9 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -34,12 +34,12 @@ #include <kaction.h> #include <kapplication.h> #include <kcmdlineargs.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kcursor.h> #include <keditcl.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kfontdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <kprinter.h> #include <ksavefile.h> diff --git a/kedit/ktextfiledlg.h b/kedit/ktextfiledlg.h index bf673d6..ae16ae9 100644 --- a/kedit/ktextfiledlg.h +++ b/kedit/ktextfiledlg.h @@ -21,7 +21,7 @@ #ifndef __KTEXTFILEDLG_H__ #define __KTEXTFILEDLG_H__ -#include <kfiledialog.h> +#include <tdefiledialog.h> class TQComboBox; class TQTextCodec; diff --git a/kedit/prefs.kcfgc b/kedit/prefs.kcfgc index 0e2e195..e200d53 100644 --- a/kedit/prefs.kcfgc +++ b/kedit/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kedit.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index 8d278ce..d29bf11 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -30,7 +30,7 @@ #include <tqbuttongroup.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp index b8457cf..2f9dd5d 100644 --- a/kfloppy/zip.cpp +++ b/kfloppy/zip.cpp @@ -40,7 +40,7 @@ #include <klocale.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> ZipFormat::ZipFormat(TQWidget *w,const char *n) : DiskFormat(w,n), diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index b0a673d..55135dd 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -40,7 +40,7 @@ #include <kprocio.h> #include <klistview.h> #include <kstatusbar.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <ksimpleconfig.h> #include <kaction.h> diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 34aa268..0dc74a1 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -30,7 +30,7 @@ #include <kactivelabel.h> #include <tdeversion.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kmessagebox.h> #include <kcombobox.h> @@ -40,7 +40,7 @@ #include <kdebug.h> #include <kurlrequesterdlg.h> #include <klineedit.h> -#include <kio/renamedlg.h> +#include <tdeio/renamedlg.h> #include <kpassivepopup.h> #include <tqlayout.h> #include <tqbuttongroup.h> @@ -57,7 +57,7 @@ #include <kzip.h> #include <dcopclient.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpopupmenu.h> #include <tqcursor.h> #include <kdesktopfile.h> diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index 7c69f4f..897bf44 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -18,7 +18,7 @@ #include <stdlib.h> #include <kaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <dcopclient.h> #include <tqpaintdevicemetrics.h> @@ -37,8 +37,8 @@ #include <tqcheckbox.h> #include <kurlrequester.h> #include <ktempfile.h> -#include <kio/netaccess.h> -#include <kio/renamedlg.h> +#include <tdeio/netaccess.h> +#include <tdeio/renamedlg.h> #include <kedittoolbar.h> @@ -470,7 +470,7 @@ void KgpgApp::slotCheckMd5() Md5Widget *mdwidget=new Md5Widget(this,0,url); mdwidget->exec(); delete mdwidget; - // KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+checkfile.hexDigest().data())); + // KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+chectdefile.hexDigest().data())); } } diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index fae5911..28ce7d0 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqlabel.h> #include <tqapplication.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqcheckbox.h> #include <kmessagebox.h> @@ -39,7 +39,7 @@ #include <tqtextcodec.h> #include <kprocess.h> #include <kprocio.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfile.h> #include <kled.h> #include <kdebug.h> @@ -617,10 +617,10 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p mdSum=TQString(); TQFile f(url.path()); f.open( IO_ReadOnly); - KMD5 checkfile; - checkfile.reset(); - checkfile.update(*TQT_TQIODEVICE(&f)); - mdSum=checkfile.hexDigest().data(); + KMD5 chectdefile; + chectdefile.reset(); + chectdefile.update(*TQT_TQIODEVICE(&f)); + mdSum=chectdefile.hexDigest().data(); f.close(); TQWidget *page = new TQWidget(this); diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index 5dc6636..924c91b 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <krun.h> #include <tqfile.h> @@ -29,7 +29,7 @@ #include "kgpglibrary.h" #include "popuppublic.h" #include "kgpginterface.h" -#include <kio/renamedlg.h> +#include <tdeio/renamedlg.h> KgpgLibrary::KgpgLibrary(TQWidget *parent, bool pgpExtension) { diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h index 96f199e..e29563a 100644 --- a/kgpg/kgpglibrary.h +++ b/kgpg/kgpglibrary.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <kurl.h> #include <kshortcut.h> -#include <kio/job.h> +#include <tdeio/job.h> class KPassivePopup; class KProgress; diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 825b413..749f3c5 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqtoolbutton.h> #include <tqfile.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <klocale.h> #include <kprocio.h> @@ -37,7 +37,7 @@ #include <kcombobox.h> #include <kurlrequester.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> #include <kfontdialog.h> #include <kdesktopfile.h> diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h index 7dcc8df..0231ba1 100644 --- a/kgpg/kgpgoptions.h +++ b/kgpg/kgpgoptions.h @@ -17,7 +17,7 @@ #ifndef KGPGOPTIONS_H #define KGPGOPTIONS_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #define GoodColor 0 #define BadColor 1 diff --git a/kgpg/kgpgsettings.kcfgc b/kgpg/kgpgsettings.kcfgc index 2eb79d7..3ea7c6d 100644 --- a/kgpg/kgpgsettings.kcfgc +++ b/kgpg/kgpgsettings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kgpg.kcfg ClassName=KGpgSettings Singleton=true diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 3602156..1f1e166 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -25,7 +25,7 @@ #include <tqscrollview.h> #include <tqregexp.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kstdaction.h> #include <kurldrag.h> diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 0e4a5ca..3d5b20b 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -49,9 +49,9 @@ #include <tqpopupmenu.h> #include <kurlrequester.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kshortcut.h> #include <kstdaccel.h> #include <klocale.h> diff --git a/khexedit/CMakeLists.txt b/khexedit/CMakeLists.txt index fbc83c5..89323d2 100644 --- a/khexedit/CMakeLists.txt +++ b/khexedit/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_executable( khexedit AUTOMOC bitswapwidget.cc chartabledialog.cc hexdrag.cc exportdialog.cc fileinfodialog.cc converterdialog.cc listview.cc searchbar.cc - LINK kio-shared tdeprint-shared + LINK tdeio-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc index 6daed1a..ce9b615 100644 --- a/khexedit/dialog.cc +++ b/khexedit/dialog.cc @@ -27,7 +27,7 @@ #include <tqlayout.h> #include <tqvalidator.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kseparator.h> diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc index 612c245..25ee291 100644 --- a/khexedit/exportdialog.cc +++ b/khexedit/exportdialog.cc @@ -22,7 +22,7 @@ #include <tqbuttongroup.h> #include <tqlineedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index 0656e96..f0ac048 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -24,9 +24,9 @@ #undef Unsorted -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobalsettings.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h index fda0058..1a6ddf4 100644 --- a/khexedit/hextoolwidget.h +++ b/khexedit/hextoolwidget.h @@ -21,7 +21,7 @@ #ifndef _HEX_TOOL_WIDGET_H_ #define _HEX_TOOL_WIDGET_H_ -#include <kconfig.h> +#include <tdeconfig.h> class TQGridLayout; class TQComboBox; diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc index a1367b4..1fa8d1a 100644 --- a/khexedit/stringdialog.cc +++ b/khexedit/stringdialog.cc @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqspinbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 99c3ff9..f674d7e 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -22,12 +22,12 @@ #include <tqheader.h> #include <tqwidgetstack.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kaction.h> #include <kapplication.h> #include <kbookmarkmenu.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <keditcl.h> #include <kencodingfiledialog.h> diff --git a/kjots/KJotsSettings.kcfgc b/kjots/KJotsSettings.kcfgc index f6e99d5..e8338bc 100644 --- a/kjots/KJotsSettings.kcfgc +++ b/kjots/KJotsSettings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kjots.kcfg ClassName=KJotsSettings Singleton=true diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index 83b10e2..35d6ddf 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -35,7 +35,7 @@ #include <kstandarddirs.h> #include <ktempfile.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <assert.h> #include "kjotsedit.h" diff --git a/kjots/main.cpp b/kjots/main.cpp index d2a3e0a..f91298e 100644 --- a/kjots/main.cpp +++ b/kjots/main.cpp @@ -28,7 +28,7 @@ #include <stdlib.h> #include <kuniqueapplication.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutdata.h> #include "KJotsMain.h" diff --git a/klaptopdaemon/CMakeLists.txt b/klaptopdaemon/CMakeLists.txt index 86b0735..2558f04 100644 --- a/klaptopdaemon/CMakeLists.txt +++ b/klaptopdaemon/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( tde_add_executable( klaptop_acpi_helper SOURCES acpi_helper.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -38,7 +38,7 @@ tde_add_executable( klaptop_acpi_helper tde_add_executable( klaptop_check SOURCES laptop_check.cpp - LINK kio-shared kcmlaptop-shared + LINK tdeio-shared kcmlaptop-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -49,7 +49,7 @@ tde_add_library( kcmlaptop SHARED AUTOMOC SOURCES portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp - LINK kio-shared + LINK tdeio-shared VERSION 0.0.0 DESTINATION ${LIB_INSTALL_DIR} ) @@ -62,7 +62,7 @@ tde_add_kpart( kcm_laptop AUTOMOC power.cpp warning.cpp acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp ${CMAKE_CURRENT_BINARY_DIR}/crcresult.h - LINK kio-shared kcmlaptop-shared + LINK tdeio-shared kcmlaptop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) # crcresult.h header is included here cause it is @@ -76,7 +76,7 @@ tde_add_kpart( kded_klaptopdaemon AUTOMOC xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c laptop_daemon.skel - LINK kio-shared kcmlaptop-shared + LINK tdeio-shared kcmlaptop-shared tdeinit_kded-shared ${XTEST_LIBRARIES} ${XSCREENSAVER_LIBRARIES} ${XEXT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index 48b3788..cf04dab 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -30,7 +30,7 @@ // other KDE headers: #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kiconloader.h> #include <kicondialog.h> diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index 80e61b4..8f231e5 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -31,7 +31,7 @@ // other KDE headers: #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kiconloader.h> #include <kicondialog.h> diff --git a/klaptopdaemon/applnk/laptop.desktop b/klaptopdaemon/applnk/laptop.desktop index 98d7435..3312168 100644 --- a/klaptopdaemon/applnk/laptop.desktop +++ b/klaptopdaemon/applnk/laptop.desktop @@ -2,7 +2,7 @@ X-TDE-Library=laptop X-TDE-FactoryName=laptop X-TDE-Init=laptop -Exec=kcmshell laptop +Exec=tdecmshell laptop Icon=laptop_battery Type=Application DocPath=kcontrol/laptop/index.html diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop index 4825dae..0d276d7 100644 --- a/klaptopdaemon/applnk/pcmcia.desktop +++ b/klaptopdaemon/applnk/pcmcia.desktop @@ -3,7 +3,7 @@ X-TDE-ModuleType=Library X-TDE-Library=laptop X-TDE-FactoryName=pcmcia X-TDE-ParentApp=kinfocenter -Exec=kcmshell pcmcia +Exec=tdecmshell pcmcia Icon=laptop_pcmcia Type=Application DocPath=kinfocenter/pcmcia/index.html diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index 4523b4c..12edee7 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -30,7 +30,7 @@ // other KDE headers: #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kiconloader.h> #include <kicondialog.h> diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index 2ab0396..a489944 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -28,7 +28,7 @@ #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knumvalidator.h> #include <kdialog.h> #include <kapplication.h> diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp index 6d1fe7d..9daaca6 100644 --- a/klaptopdaemon/daemon_state.cpp +++ b/klaptopdaemon/daemon_state.cpp @@ -31,7 +31,7 @@ #include <tqtimer.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcmdlineargs.h> #include "daemon_state.h" diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 7c03af8..cdac1e1 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -38,7 +38,7 @@ #include <kapplication.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <kmessagebox.h> #include <tqvbox.h> @@ -526,7 +526,7 @@ void laptop_dock::invokeLockSuspend() void laptop_dock::invokeSetup() { TDEProcess proc; - proc << KStandardDirs::findExe("kcmshell"); + proc << KStandardDirs::findExe("tdecmshell"); proc << "laptop"; proc.start(TDEProcess::DontCare); proc.detach(); diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 8e9c042..3fffeed 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -31,7 +31,7 @@ #include <tqtimer.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcmdlineargs.h> #include "laptop_daemon.h" diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 1687437..27d2451 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <tqlayout.h> #include <unistd.h> diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index d1af1a5..9f551dd 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -92,7 +92,7 @@ #include <tqvaluevector.h> #include <kactivelabel.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kprocess.h> #include <krichtextlabel.h> diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index d2d2ef3..42d8c16 100644 --- a/klaptopdaemon/portable.h +++ b/klaptopdaemon/portable.h @@ -1,6 +1,6 @@ #include <tqlabel.h> #include <kactivelabel.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqvgroupbox.h> #include <tqstringlist.h> diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index b7e387a..e1dfd5e 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -28,7 +28,7 @@ #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knumvalidator.h> #include <kdialog.h> #include <kapplication.h> diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index f60630b..f2c9a3b 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -32,7 +32,7 @@ // other KDE headers: #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kiconloader.h> #include <kicondialog.h> diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index ad2bda2..16d0155 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -32,7 +32,7 @@ // other KDE headers: #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kiconloader.h> #include <kicondialog.h> diff --git a/klaptopdaemon/wake_laptop.cpp b/klaptopdaemon/wake_laptop.cpp index 8902be8..1e9d92b 100644 --- a/klaptopdaemon/wake_laptop.cpp +++ b/klaptopdaemon/wake_laptop.cpp @@ -21,7 +21,7 @@ */ #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdatastream.h> #include <dcopclient.h> #include <kapplication.h> diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index f7f3b85..259c48c 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -26,9 +26,9 @@ #include "version.h" #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> #include <kapplication.h> #include <kcombobox.h> diff --git a/kmilo/asus/CMakeLists.txt b/kmilo/asus/CMakeLists.txt index 377e9e5..3674de6 100644 --- a/kmilo/asus/CMakeLists.txt +++ b/kmilo/asus/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_asus AUTOMOC SOURCES asus.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp index 1af8780..e70f3a6 100644 --- a/kmilo/asus/asus.cpp +++ b/kmilo/asus/asus.cpp @@ -22,7 +22,7 @@ */ #include <kgenericfactory.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <krun.h> #include <kurl.h> diff --git a/kmilo/delli8k/CMakeLists.txt b/kmilo/delli8k/CMakeLists.txt index 9d0ef93..18e83a2 100644 --- a/kmilo/delli8k/CMakeLists.txt +++ b/kmilo/delli8k/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_delli8k AUTOMOC SOURCES delli8k.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/demo/CMakeLists.txt b/kmilo/demo/CMakeLists.txt index fb2098f..270bbca 100644 --- a/kmilo/demo/CMakeLists.txt +++ b/kmilo/demo/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( tde_add_kpart( kmilo_demo AUTOMOC SOURCES demo.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/generic/CMakeLists.txt b/kmilo/generic/CMakeLists.txt index d89ab88..53e8783 100644 --- a/kmilo/generic/CMakeLists.txt +++ b/kmilo/generic/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_generic AUTOMOC SOURCES generic_monitor.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index bbc5f84..b44ab7e 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -26,7 +26,7 @@ #include <kgenericfactory.h> #include <kdebug.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <sys/types.h> #include <unistd.h> diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 18fd4eb..8649e03 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -29,7 +29,7 @@ #include <kglobalaccel.h> #include <dcopref.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kmilod.h" #include "monitor.h" diff --git a/kmilo/kmilo_kvaio/CMakeLists.txt b/kmilo/kmilo_kvaio/CMakeLists.txt index 137bc6a..5fa718e 100644 --- a/kmilo/kmilo_kvaio/CMakeLists.txt +++ b/kmilo/kmilo_kvaio/CMakeLists.txt @@ -37,7 +37,7 @@ tde_add_library( kvaiodriverinterface STATIC_PIC AUTOMOC tde_add_kpart( kmilo_kvaio AUTOMOC SOURCES kmilo_kvaio.cpp kvaio.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared kvaiodriverinterface-static DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop index 8c51255..750c780 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop +++ b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kcmshell kvaio +Exec=tdecmshell kvaio Icon=laptop DocPath=kcontrol/kvaio/index.html diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index ce01438..45af318 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -29,7 +29,7 @@ #include <kgenericfactory.h> #include <kaboutdata.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kled.h> #include <kprogress.h> diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index e8011e7..1129586 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -26,7 +26,7 @@ * Fn+F12 (suspend to disk) */ -#include <kconfig.h> +#include <tdeconfig.h> #include "kvaio.h" #include "kmilointerface.h" diff --git a/kmilo/kmilod/CMakeLists.txt b/kmilo/kmilod/CMakeLists.txt index f3913ab..078e911 100644 --- a/kmilo/kmilod/CMakeLists.txt +++ b/kmilo/kmilod/CMakeLists.txt @@ -37,7 +37,7 @@ tde_add_library( kmilo SHARED tde_add_kpart( kded_kmilod AUTOMOC SOURCES kmilod.cpp kmilod.skel defaultskin.cpp defaultwidget.ui kmilointerface.cpp - LINK kio-shared kmilo-shared tdeinit_kded-shared + LINK tdeio-shared kmilo-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index b9595e2..a89617b 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -33,7 +33,7 @@ #include <netwm.h> #include <kglobalsettings.h> #include <tdeversion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "defaultskin.h" diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index fa2f4a8..cfa121d 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <kservicetype.h> #include <kservice.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeparts/componentfactory.h> #include "kmilointerface.h" diff --git a/kmilo/powerbook/CMakeLists.txt b/kmilo/powerbook/CMakeLists.txt index bb98b70..9a0e7de 100644 --- a/kmilo/powerbook/CMakeLists.txt +++ b/kmilo/powerbook/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_powerbook AUTOMOC SOURCES pb_monitor.cpp - LINK kio-shared kmilo-shared ${PBB_LIBRARY} + LINK tdeio-shared kmilo-shared ${PBB_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/powerbook2/CMakeLists.txt b/kmilo/powerbook2/CMakeLists.txt index bb98b70..9a0e7de 100644 --- a/kmilo/powerbook2/CMakeLists.txt +++ b/kmilo/powerbook2/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_powerbook AUTOMOC SOURCES pb_monitor.cpp - LINK kio-shared kmilo-shared ${PBB_LIBRARY} + LINK tdeio-shared kmilo-shared ${PBB_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/thinkpad/CMakeLists.txt b/kmilo/thinkpad/CMakeLists.txt index 7907fd8..1bee777 100644 --- a/kmilo/thinkpad/CMakeLists.txt +++ b/kmilo/thinkpad/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( tde_add_kpart( kmilo_thinkpad AUTOMOC SOURCES thinkpad.cpp - LINK kio-shared kmilo-shared + LINK tdeio-shared kmilo-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt index 0a79639..11f1409 100644 --- a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt +++ b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt @@ -29,7 +29,7 @@ add_definitions( tde_add_kpart( kcm_thinkpad AUTOMOC SOURCES kcmthinkpad_general.ui main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index bb61c87..5b8d8d3 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -33,7 +33,7 @@ #include <kgenericfactory.h> #include <kaboutdata.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> #include <tdecmodule.h> diff --git a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop index 4b0b0d4..6b76314 100644 --- a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop +++ b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kcmshell thinkpad +Exec=tdecmshell thinkpad Icon=laptop DocPath=kcontrol/thinkpad/index.html diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 2a57daa..16e22a9 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -30,7 +30,7 @@ */ #include <kgenericfactory.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <krun.h> #include <kurl.h> #include "kmilointerface.h" diff --git a/kregexpeditor/CMakeLists.txt b/kregexpeditor/CMakeLists.txt index 1ebb963..777fcaa 100644 --- a/kregexpeditor/CMakeLists.txt +++ b/kregexpeditor/CMakeLists.txt @@ -41,7 +41,7 @@ add_definitions( tde_add_executable( kregexpeditor AUTOMOC SOURCES main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} LINK kregexpeditorcommon-shared ) @@ -77,7 +77,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC emacsregexpconverter.cpp regexphighlighter.cpp util.cpp VERSION 1.0.0 - LINK kio-shared tdemultiformlistbox-static + LINK tdeio-shared tdemultiformlistbox-static kwidgetstreamer-static DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 26b2559..e6a92e7 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -22,7 +22,7 @@ #else #include <klocale.h> #include <kmessagebox.h> -// #include <kfiledialog.h> +// #include <tdefiledialog.h> #include <kstandarddirs.h> #include <kiconloader.h> #include "editorwindow.moc" diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index 65e4735..ed47b7c 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include "verifybuttons.moc" #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <kmessagebox.h> #endif diff --git a/ksim/CMakeLists.txt b/ksim/CMakeLists.txt index 5d915fa..59037f7 100644 --- a/ksim/CMakeLists.txt +++ b/ksim/CMakeLists.txt @@ -43,7 +43,7 @@ tde_add_kpart( ksim_panelextension AUTOMOC ksimsysinfo.cpp ksimsysinfo.skel ksimframe.cpp ksimpref.cpp monitorprefs.cpp generalprefs.cpp themeprefs.cpp - LINK kio-shared ksimcore-shared systeminfo-static + LINK tdeio-shared ksimcore-shared systeminfo-static DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 62a2328..547729c 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <klocale.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <themeloader.h> #include <led.h> diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp index 3619f90..04f4559 100644 --- a/ksim/library/ksimconfig.cpp +++ b/ksim/library/ksimconfig.cpp @@ -18,7 +18,7 @@ */ #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include "ksimconfig.h" diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 91c23a6..954b03f 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> class KSim::Label::Private { diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h index 912297c..974a540 100644 --- a/ksim/library/pluginloader.h +++ b/ksim/library/pluginloader.h @@ -78,7 +78,7 @@ namespace KSim /** * loads a plugin, example: * <pre> - * KDesktopFile deskfile("/home/user/foo.desktop"); + * KDesktopFile destdefile("/home/user/foo.desktop"); * KSim::PluginLoader::self().loadPlugin(deskFile); * </pre> * you can then use @ref pluginList() to access the plugin, view, diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 74128d9..d668e82 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tqregexp.h> #include <tqpopupmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> class KSim::PluginObject::Private diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h index 89ac67b..c70dc92 100644 --- a/ksim/library/themeloader.h +++ b/ksim/library/themeloader.h @@ -430,7 +430,7 @@ namespace KSim */ void reColourImage(TQImage &image); /** - * changes some of the entries in the config file so kconfig + * changes some of the entries in the config file so tdeconfig * can handle the file better. * @return the location of the config file */ diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index aaed602..7a092e1 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -36,7 +36,7 @@ #include <kaboutdata.h> #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kinputdialog.h> diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index 6c91d00..3a38100 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -35,7 +35,7 @@ #include <kapplication.h> #include <klistview.h> #include <kinputdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <chart.h> #include <progress.h> diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 1ffe5a8..d9d55e9 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -20,7 +20,7 @@ #include "fsystemconfig.h" #include "fsystemconfig.moc" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kiconloader.h> #include <klistview.h> diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 46edb3c..7a10595 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -32,7 +32,7 @@ #include <kaboutapplication.h> #include <kaboutdata.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "ksimfsystem.h" #include "fsystemconfig.h" diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index eb7f7ee..354005e 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -30,7 +30,7 @@ #include <label.h> #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutapplication.h> #include <knuminput.h> #include <kdebug.h> diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index c3fcda3..13c4f20 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kaboutapplication.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlayout.h> diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index 7851509..42763c3 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -26,7 +26,7 @@ #include <tqglobal.h> #include <klibloader.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtimer.h> #include <tqfile.h> diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 95e65e5..f32fb96 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -25,7 +25,7 @@ #include <kiconloader.h> #include <klistview.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/ksim/monitors/mail/CMakeLists.txt b/ksim/monitors/mail/CMakeLists.txt index 918f977..0e207ee 100644 --- a/ksim/monitors/mail/CMakeLists.txt +++ b/ksim/monitors/mail/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( tde_add_kpart( ksim_mail AUTOMOC SOURCES ksimmail.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/ksim/monitors/net/CMakeLists.txt b/ksim/monitors/net/CMakeLists.txt index b05a923..a0d6f4b 100644 --- a/ksim/monitors/net/CMakeLists.txt +++ b/ksim/monitors/net/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( ksim_net AUTOMOC SOURCES ksimnet.cpp netdialog.cpp netconfig.cpp - LINK ksimcore-shared kio-shared + LINK ksimcore-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/ksim/monitors/snmp/CMakeLists.txt b/ksim/monitors/snmp/CMakeLists.txt index f25b0bf..b86b909 100644 --- a/ksim/monitors/snmp/CMakeLists.txt +++ b/ksim/monitors/snmp/CMakeLists.txt @@ -37,7 +37,7 @@ tde_add_kpart( ksim_snmp AUTOMOC snmplib.cpp pdu.cpp proberesultdialogbase.ui proberesultdialog.cpp browsedialogbase.ui browsedialog.cpp walker.cpp - LINK kio-shared ksimcore-shared + LINK tdeio-shared ksimcore-shared ${NETSNMP_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp index 47f5864..5b8438f 100644 --- a/ksim/monitors/snmp/chartmonitor.cpp +++ b/ksim/monitors/snmp/chartmonitor.cpp @@ -18,7 +18,7 @@ */ #include "chartmonitor.h" -#include <kio/global.h> +#include <tdeio/global.h> using namespace KSim::Snmp; diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index 8e4102f..1227af1 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -28,7 +28,7 @@ #include <tqgroupbox.h> #include <tqpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kmessagebox.h> #include <klocale.h> diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h index f7fa92c..213fa22 100644 --- a/ksim/monitors/snmp/snmp.h +++ b/ksim/monitors/snmp/snmp.h @@ -20,7 +20,7 @@ #ifndef KSIM_SNMP_H #define KSIM_SNMP_H -#include <kconfigbase.h> +#include <tdeconfigbase.h> #include <tqmap.h> diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index ec26949..d109139 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> -#include <kconfig.h> +#include <tdeconfig.h> using namespace KSim::Snmp; diff --git a/ktimer/CMakeLists.txt b/ktimer/CMakeLists.txt index 72553c8..1220018 100644 --- a/ktimer/CMakeLists.txt +++ b/ktimer/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( tde_add_executable( ktimer AUTOMOC SOURCES main.cpp ktimer.cpp prefwidget.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp index 43808fb..c83dedd 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <kapplication.h> #include <ksystemtray.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "ktimer.h" #include <tqpushbutton.h> diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h index 41b1822..0008e02 100644 --- a/ktimer/ktimer.h +++ b/ktimer/ktimer.h @@ -22,7 +22,7 @@ #include <tqdialog.h> #include <tqwidget.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "prefwidget.h" diff --git a/superkaramba/src/CMakeLists.txt b/superkaramba/src/CMakeLists.txt index add2ef7..07b7ec5 100644 --- a/superkaramba/src/CMakeLists.txt +++ b/superkaramba/src/CMakeLists.txt @@ -54,7 +54,7 @@ tde_add_executable( superkaramba AUTOMOC superkarambasettings.kcfgc themelocale.cpp input.cpp sklineedit.cpp input_python.cpp svcgrp_python.cpp - LINK kio-shared ${PYTHON_LIBRARIES} + LINK tdeio-shared ${PYTHON_LIBRARIES} ${KNEWSTUFF_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index 64c523f..91638b6 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kimageeffect.h> #include <ktempfile.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "karambaapp.h" #include "imagelabel.h" diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h index bf4189c..9ed9672 100644 --- a/superkaramba/src/imagelabel.h +++ b/superkaramba/src/imagelabel.h @@ -32,7 +32,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqregexp.h> #include <tqtimer.h> #include "karamba.h" diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index 572451d..3d4642c 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -35,7 +35,7 @@ #include <twin.h> #include <tqfile.h> -#include <kfile.h> +#include <tdefile.h> #include <tqfileinfo.h> #include <kaction.h> #include <tqtimer.h> @@ -56,13 +56,13 @@ #include <tqcursor.h> #include <netwm.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqmap.h> #include <kurl.h> #include <krun.h> #include <tqdatetime.h> #include <tqbitmap.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kprocess.h> #include <tqdragobject.h> diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index 3e69df6..95f810d 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -11,7 +11,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqdir.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcmdlineargs.h> #include <fcntl.h> #include <klocale.h> diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp index ca41515..46d2805 100644 --- a/superkaramba/src/karambasessionmanaged.cpp +++ b/superkaramba/src/karambasessionmanaged.cpp @@ -21,7 +21,7 @@ ****************************************************************************/ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "karambasessionmanaged.h" #include "karamba.h" #include "tqwidgetlist.h" diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index b0055cc..05809e5 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -26,11 +26,11 @@ #include <kaboutdata.h> #include <kcmdlineargs.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmainwindow.h> #include <tqfileinfo.h> #include <tqstringlist.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <tdeversion.h> diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp index 30ccf61..e0a4f9e 100644 --- a/superkaramba/src/rsssensor.cpp +++ b/superkaramba/src/rsssensor.cpp @@ -13,7 +13,7 @@ #include <tqdom.h> #include <tqregexp.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> RssSensor::RssSensor( const TQString &src, int interval, const TQString &form, const TQString &enc) : Sensor(interval), diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp index 814cf05..1b8b451 100644 --- a/superkaramba/src/sknewstuff.cpp +++ b/superkaramba/src/sknewstuff.cpp @@ -20,8 +20,8 @@ #include <kapplication.h> #include <kdebug.h> -#include <kfilemetainfo.h> -#include <kio/netaccess.h> +#include <tdefilemetainfo.h> +#include <tdeio/netaccess.h> #include <kmimetype.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp index f7d742b..7498b41 100644 --- a/superkaramba/src/taskbartest.cpp +++ b/superkaramba/src/taskbartest.cpp @@ -21,11 +21,11 @@ ****************************************************************************/ #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfileinfo.h> #include <tqstringlist.h> @@ -66,10 +66,10 @@ int main(int argc, char **argv) // // KSGRD::SensorMgr foo ;// p->engage( "" ); -// //TDEConfig *kconfig = TDEGlobal::config(); -// //kconfig->setGroup("karamba"); -// //kconfig->writeEntry("test", "/home/hk/foofoo"); -// //kconfig->sync(); +// //TDEConfig *tdeconfig = TDEGlobal::config(); +// //tdeconfig->setGroup("karamba"); +// //tdeconfig->writeEntry("test", "/home/hk/foofoo"); +// //tdeconfig->sync(); // bool OK = false; diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 7e977d4..34ec17b 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kglobal.h> #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <twinmodule.h> #include <netwm.h> diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index c1392c6..de38b14 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -31,7 +31,7 @@ #include <kmessagebox.h> #include <kstandarddirs.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqtextstream.h> #include <tqfileinfo.h> #include <tqdom.h> diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index 1b7314c..6709ff3 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -30,7 +30,7 @@ #include "themelocale.h" #include "themefile.h" #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <tqbuffer.h> diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index 4b13c6b..9b13ff3 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -36,7 +36,7 @@ #include "superkarambasettings.h" #include <karchive.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <kapplication.h> @@ -48,7 +48,7 @@ #include <tqlabel.h> #include <tqcombobox.h> #include <tqptrlist.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kprotocolinfo.h> ThemesDlg::ThemesDlg(TQWidget *parent, const char *name) @@ -220,7 +220,7 @@ void ThemesDlg::getNewStuff() TDEConfig* config = TDEGlobal::config(); config->setGroup("KNewStuff"); config->writePathEntry("ProvidersUrl", - TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml")); + TQString::fromLatin1("http://download.kde.org/tdehotnewstuff/karamba-providers.xml")); config->sync(); m_newStuffStatus = config->entryMap("KNewStuffStatus").keys(); //This check is b/c KNewStuff will download, throw an error, diff --git a/tdewallet/CMakeLists.txt b/tdewallet/CMakeLists.txt index e4cedbe..7a4817e 100644 --- a/tdewallet/CMakeLists.txt +++ b/tdewallet/CMakeLists.txt @@ -32,7 +32,7 @@ tde_add_executable( tdewalletmanager AUTOMOC tdewalletmanager.skel main.cpp tdewalletpopup.cpp tdewalleteditor.cpp kwmapeditor.cpp allyourbase.cpp kbetterthankdialogbase.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp index 97b55d8..221c9b4 100644 --- a/tdewallet/allyourbase.cpp +++ b/tdewallet/allyourbase.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kglobal.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index 230b4c9..04639fa 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -23,7 +23,7 @@ #include <dcopref.h> #include <kaboutdata.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <kgenericfactory.h> #include <kinputdialog.h> diff --git a/tdewallet/konfigurator/tdewallet_config.desktop b/tdewallet/konfigurator/tdewallet_config.desktop index a30297b..4ae0785 100644 --- a/tdewallet/konfigurator/tdewallet_config.desktop +++ b/tdewallet/konfigurator/tdewallet_config.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Exec=kcmshell --caption %c tdewalletconfig +Exec=tdecmshell --caption %c tdewalletconfig Icon=tdewalletmanager DocPath=tdewallet/index.html Name=TDE Wallet diff --git a/tdewallet/konfigurator/tdewalletconfig.desktop b/tdewallet/konfigurator/tdewalletconfig.desktop index ccae543..3b25017 100644 --- a/tdewallet/konfigurator/tdewalletconfig.desktop +++ b/tdewallet/konfigurator/tdewalletconfig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=tdewalletmanager Type=Application -Exec=kcmshell tdewalletconfig +Exec=tdecmshell tdewalletconfig DocPath=tdewallet/index.html X-TDE-ModuleType=Library X-TDE-Library=tdewallet diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index f85294f..ee07ccf 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -30,10 +30,10 @@ #include <kapplication.h> #include <kdebug.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconview.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klistviewsearchline.h> #include <klocale.h> #include <kmdcodec.h> diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 9e16b74..9b1a7df 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -27,7 +27,7 @@ #include <dcopref.h> #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kiconview.h> |