diff options
Diffstat (limited to 'krusader')
76 files changed, 116 insertions, 116 deletions
diff --git a/krusader/ActionMan/actionproperty.cpp b/krusader/ActionMan/actionproperty.cpp index 7f017d6..6d8eafe 100644 --- a/krusader/ActionMan/actionproperty.cpp +++ b/krusader/ActionMan/actionproperty.cpp @@ -22,7 +22,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp index 664b32b..efdb0cc 100644 --- a/krusader/ActionMan/addplaceholderpopup.cpp +++ b/krusader/ActionMan/addplaceholderpopup.cpp @@ -15,7 +15,7 @@ #include "../UserAction/expander.h" #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> // for ParameterDialog diff --git a/krusader/ActionMan/useractionpage.cpp b/krusader/ActionMan/useractionpage.cpp index 035f9a4..d7736a8 100644 --- a/krusader/ActionMan/useractionpage.cpp +++ b/krusader/ActionMan/useractionpage.cpp @@ -17,7 +17,7 @@ #include <tqtooltip.h> #include <klineedit.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <kclipboard.h> diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp index 350a5d1..1916d76 100644 --- a/krusader/Dialogs/checksumdlg.cpp +++ b/krusader/Dialogs/checksumdlg.cpp @@ -11,7 +11,7 @@ #include <kmessagebox.h> #include <tqfile.h> #include <tqtextstream.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqframe.h> #include <kiconloader.h> #include <kcombobox.h> diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp index 86805fb..bc8df72 100644 --- a/krusader/Dialogs/krkeydialog.cpp +++ b/krusader/Dialogs/krkeydialog.cpp @@ -16,10 +16,10 @@ #include <klocale.h> #include <kpushbutton.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kactionshortcutlist.h> #include <kdebug.h> diff --git a/krusader/Dialogs/krpleasewait.h b/krusader/Dialogs/krpleasewait.h index f88fbd8..153b6fd 100644 --- a/krusader/Dialogs/krpleasewait.h +++ b/krusader/Dialogs/krpleasewait.h @@ -34,7 +34,7 @@ #include <tqprogressdialog.h> #include <tqtimer.h> #include <tqguardedptr.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> class TDEProcess; class KRPleaseWait; diff --git a/krusader/Dialogs/krprogress.cpp b/krusader/Dialogs/krprogress.cpp index df18f27..b037d88 100644 --- a/krusader/Dialogs/krprogress.cpp +++ b/krusader/Dialogs/krprogress.cpp @@ -31,7 +31,7 @@ #include <kstdguiitem.h> #include <twin.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include "krprogress.h" #include "../krusader.h" @@ -109,7 +109,7 @@ KrProgress::KrProgress( TDEIO::Job* job ) resize( sizeHint() ); setMaximumHeight(sizeHint().height()); - setCaption(i18n("Krusader Progress")); // show something better than kio_uiserver + setCaption(i18n("Krusader Progress")); // show something better than tdeio_uiserver setJob(job); setOnlyClean(false); diff --git a/krusader/Dialogs/krprogress.h b/krusader/Dialogs/krprogress.h index 5c3e27c..71e5ed6 100644 --- a/krusader/Dialogs/krprogress.h +++ b/krusader/Dialogs/krprogress.h @@ -23,12 +23,12 @@ #include <tqlabel.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kprogress.h> #include <ksqueezedtextlabel.h> -#include <kio/progressbase.h> +#include <tdeio/progressbase.h> #include <tqobject.h> diff --git a/krusader/Dialogs/krspecialwidgets.cpp b/krusader/Dialogs/krspecialwidgets.cpp index 4f26015..09eb3ff 100644 --- a/krusader/Dialogs/krspecialwidgets.cpp +++ b/krusader/Dialogs/krspecialwidgets.cpp @@ -36,7 +36,7 @@ A #include "../krusader.h" #include "../MountMan/kmountman.h" #include <math.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <klocale.h> #include <klineedit.h> #include <kdebug.h> diff --git a/krusader/Dialogs/krspecialwidgets.h b/krusader/Dialogs/krspecialwidgets.h index ca79093..58f1423 100644 --- a/krusader/Dialogs/krspecialwidgets.h +++ b/krusader/Dialogs/krspecialwidgets.h @@ -38,7 +38,7 @@ A #include <tqptrlist.h> #include <klineedit.h> #include <tqevent.h> -#include <kio/global.h> +#include <tdeio/global.h> class KRPieSlice; diff --git a/krusader/Dialogs/kurllistrequester.cpp b/krusader/Dialogs/kurllistrequester.cpp index 7e3cf1c..8eba338 100644 --- a/krusader/Dialogs/kurllistrequester.cpp +++ b/krusader/Dialogs/kurllistrequester.cpp @@ -33,7 +33,7 @@ #include <tqpixmap.h> #include <tqcursor.h> #include <tqlayout.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpopupmenu.h> #include <kiconloader.h> #include <klocale.h> diff --git a/krusader/Dialogs/packgui.cpp b/krusader/Dialogs/packgui.cpp index 5677471..e57af8e 100644 --- a/krusader/Dialogs/packgui.cpp +++ b/krusader/Dialogs/packgui.cpp @@ -29,7 +29,7 @@ ***************************************************************************/ #include "packgui.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "../krusader.h" #include "../defaults.h" #include <tqlineedit.h> diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp index 51cccdd..f3d7430 100644 --- a/krusader/Dialogs/packguibase.cpp +++ b/krusader/Dialogs/packguibase.cpp @@ -49,7 +49,7 @@ #include <kglobalsettings.h> #include <kcombobox.h> #include <kmessagebox.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "../krusader.h" /* diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp index 526df2c..63292cc 100644 --- a/krusader/DiskUsage/diskusage.cpp +++ b/krusader/DiskUsage/diskusage.cpp @@ -35,7 +35,7 @@ #include <kmimetype.h> #include <kmessagebox.h> #include <kglobalsettings.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <tqpushbutton.h> #include <tqhbox.h> #include <tqapplication.h> diff --git a/krusader/DiskUsage/filelightParts/Config.cpp b/krusader/DiskUsage/filelightParts/Config.cpp index aa0a5aa..48d5065 100644 --- a/krusader/DiskUsage/filelightParts/Config.cpp +++ b/krusader/DiskUsage/filelightParts/Config.cpp @@ -1,6 +1,6 @@ #include "Config.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> @@ -14,7 +14,7 @@ Filelight::MapScheme Config::scheme; inline TDEConfig& -Filelight::Config::kconfig() +Filelight::Config::tdeconfig() { TDEConfig *config = TDEGlobal::config(); config->setGroup( "DiskUsage" ); @@ -24,7 +24,7 @@ Filelight::Config::kconfig() void Filelight::Config::read() { - const TDEConfig &config = kconfig(); + const TDEConfig &config = tdeconfig(); varyLabelFontSizes = config.readBoolEntry( "varyLabelFontSizes", true ); showSmallFiles = config.readBoolEntry( "showSmallFiles", false ); @@ -39,7 +39,7 @@ Filelight::Config::read() void Filelight::Config::write() { - TDEConfig &config = kconfig(); + TDEConfig &config = tdeconfig(); config.writeEntry( "varyLabelFontSizes", varyLabelFontSizes ); config.writeEntry( "showSmallFiles", showSmallFiles); diff --git a/krusader/DiskUsage/filelightParts/Config.h b/krusader/DiskUsage/filelightParts/Config.h index 66de284..52a98b7 100644 --- a/krusader/DiskUsage/filelightParts/Config.h +++ b/krusader/DiskUsage/filelightParts/Config.h @@ -13,7 +13,7 @@ namespace Filelight class Config { - static TDEConfig& kconfig(); + static TDEConfig& tdeconfig(); public: static void read(); diff --git a/krusader/DiskUsage/filelightParts/fileTree.h b/krusader/DiskUsage/filelightParts/fileTree.h index e0a46cc..2ba79ae 100644 --- a/krusader/DiskUsage/filelightParts/fileTree.h +++ b/krusader/DiskUsage/filelightParts/fileTree.h @@ -6,7 +6,7 @@ #include <stdlib.h> #include <sys/types.h> -#include <kio/global.h> +#include <tdeio/global.h> //TODO these are pointlessly general purpose now, make them incredibly specific diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp index 79873b2..53e4c99 100644 --- a/krusader/DiskUsage/radialMap/widgetEvents.cpp +++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp @@ -8,7 +8,7 @@ #include <kcursor.h> //::mouseMoveEvent() #include <kiconeffect.h> //::mousePressEvent() #include <kiconloader.h> //::mousePressEvent() -#include <kio/job.h> //::mousePressEvent() +#include <tdeio/job.h> //::mousePressEvent() #include <klocale.h> #include <kmessagebox.h> //::mousePressEvent() #include <kpopupmenu.h> //::mousePressEvent() diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp index 28b1170..135f353 100644 --- a/krusader/Filter/generalfilter.cpp +++ b/krusader/Filter/generalfilter.cpp @@ -34,7 +34,7 @@ #include "../VFS/vfs.h" #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kiconloader.h> #include <tqwhatsthis.h> diff --git a/krusader/GUI/krremoteencodingmenu.cpp b/krusader/GUI/krremoteencodingmenu.cpp index bb0aee5..f7fae8f 100644 --- a/krusader/GUI/krremoteencodingmenu.cpp +++ b/krusader/GUI/krremoteencodingmenu.cpp @@ -31,7 +31,7 @@ #include <kpopupmenu.h> #include <kcharsets.h> -#include <kio/slaveconfig.h> +#include <tdeio/slaveconfig.h> #include <dcopclient.h> #include "../krusader.h" diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp index 054a62a..4abf1c0 100644 --- a/krusader/GUI/mediabutton.cpp +++ b/krusader/GUI/mediabutton.cpp @@ -44,11 +44,11 @@ #include <kiconloader.h> #include <tdeversion.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kmessagebox.h> #include <kmimetype.h> #include <kprotocolinfo.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kprocess.h> #include <tqcursor.h> diff --git a/krusader/GUI/mediabutton.h b/krusader/GUI/mediabutton.h index 2bf1f9b..960e6fd 100644 --- a/krusader/GUI/mediabutton.h +++ b/krusader/GUI/mediabutton.h @@ -34,7 +34,7 @@ #include <tqwidget.h> #include <tqtoolbutton.h> #include <kurl.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <tqvaluelist.h> #include <kmountpoint.h> #include <tqtimer.h> diff --git a/krusader/KViewer/kimagefilepreview.cpp b/krusader/KViewer/kimagefilepreview.cpp index 8a1577e..782e640 100644 --- a/krusader/KViewer/kimagefilepreview.cpp +++ b/krusader/KViewer/kimagefilepreview.cpp @@ -21,9 +21,9 @@ #include <kstandarddirs.h> #include <kdebug.h> #include <klocale.h> -#include <kfiledialog.h> -#include <kfileitem.h> -#include <kio/previewjob.h> +#include <tdefiledialog.h> +#include <tdefileitem.h> +#include <tdeio/previewjob.h> #include "kimagefilepreview.h" diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp index 48c6b0a..00ae77d 100644 --- a/krusader/KViewer/krviewer.cpp +++ b/krusader/KViewer/krviewer.cpp @@ -28,15 +28,15 @@ #include <kmessagebox.h> #include <klibloader.h> #include <ktrader.h> -#include <kio/netaccess.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kstatusbar.h> #include <kdebug.h> #include <klargefile.h> #include <tdehtml_part.h> #include <kprocess.h> -#include <kfileitem.h> +#include <tdefileitem.h> // Krusader includes #include "krviewer.h" #include "../krusader.h" diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp index 9cde1d2..8d64399 100644 --- a/krusader/KViewer/panelviewer.cpp +++ b/krusader/KViewer/panelviewer.cpp @@ -13,8 +13,8 @@ #include <klibloader.h> #include <kuserprofile.h> #include <kdebug.h> -#include <kfileitem.h> -#include <kio/netaccess.h> +#include <tdefileitem.h> +#include <tdeio/netaccess.h> #include <tqfile.h> #include <klargefile.h> #include "panelviewer.h" diff --git a/krusader/KViewer/panelviewer.h b/krusader/KViewer/panelviewer.h index 84de708..b9431af 100644 --- a/krusader/KViewer/panelviewer.h +++ b/krusader/KViewer/panelviewer.h @@ -5,7 +5,7 @@ #include <tqstring.h> #include <tqwidgetstack.h> #include <tdeparts/part.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <ktempfile.h> #include <tqdict.h> #include <tqlabel.h> diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp index e0e3abd..fdceb2b 100644 --- a/krusader/Konfigurator/kgcolors.cpp +++ b/krusader/Konfigurator/kgcolors.cpp @@ -33,7 +33,7 @@ #include "../Panel/krcolorcache.h" #include <kmessagebox.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobalsettings.h> #include <kstandarddirs.h> #include <tqhbox.h> diff --git a/krusader/Konfigurator/kglookfeel.cpp b/krusader/Konfigurator/kglookfeel.cpp index ff37e3c..115ac00 100644 --- a/krusader/Konfigurator/kglookfeel.cpp +++ b/krusader/Konfigurator/kglookfeel.cpp @@ -38,7 +38,7 @@ #include <tqvalidator.h> #include <tqlistview.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kstandarddirs.h> #include "../Panel/krselectionmode.h" diff --git a/krusader/Konfigurator/konfigurator.cpp b/krusader/Konfigurator/konfigurator.cpp index 3e70c9f..ced3d4b 100644 --- a/krusader/Konfigurator/konfigurator.cpp +++ b/krusader/Konfigurator/konfigurator.cpp @@ -35,7 +35,7 @@ #include "../Dialogs/krdialogs.h" #include "../kicons.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqwidget.h> #include <klocale.h> #include <kglobal.h> diff --git a/krusader/MountMan/kdiskfreesp.cpp b/krusader/MountMan/kdiskfreesp.cpp index 628ed61..53fd009 100644 --- a/krusader/MountMan/kdiskfreesp.cpp +++ b/krusader/MountMan/kdiskfreesp.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kprocess.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "kdiskfreesp.moc" @@ -106,21 +106,21 @@ void KDiskFreeSp::dfDone() s=t.readLine(); s=s.simplifyWhiteSpace(); if ( !s.isEmpty() ) { - //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl; + //kdDebug(tdefile_area) << "GOT: [" << s << "]" << endl; if (s.find(BLANK)<0) // devicename was too long, rest in next line if ( !t.eof() ) { // just appends the next line v=t.readLine(); s=s.append(v); s=s.simplifyWhiteSpace(); - //kdDebug(kfile_area) << "SPECIAL GOT: [" << s << "]" << endl; + //kdDebug(tdefile_area) << "SPECIAL GOT: [" << s << "]" << endl; }//if silly linefeed - //kdDebug(kfile_area) << "[" << s << "]" << endl; + //kdDebug(tdefile_area) << "[" << s << "]" << endl; //TQString deviceName = s.left(s.find(BLANK)); s=s.remove(0,s.find(BLANK)+1 ); - //kdDebug(kfile_area) << " DeviceName: [" << deviceName << "]" << endl; + //kdDebug(tdefile_area) << " DeviceName: [" << deviceName << "]" << endl; if (!NO_FS_TYPE) s=s.remove(0,s.find(BLANK)+1 ); // eat fs type @@ -128,26 +128,26 @@ void KDiskFreeSp::dfDone() u=s.left(s.find(BLANK)); unsigned long kBSize = u.toULong(); s=s.remove(0,s.find(BLANK)+1 ); - //kdDebug(kfile_area) << " Size: [" << kBSize << "]" << endl; + //kdDebug(tdefile_area) << " Size: [" << kBSize << "]" << endl; u=s.left(s.find(BLANK)); unsigned long kBUsed = u.toULong(); s=s.remove(0,s.find(BLANK)+1 ); - //kdDebug(kfile_area) << " Used: [" << kBUsed << "]" << endl; + //kdDebug(tdefile_area) << " Used: [" << kBUsed << "]" << endl; u=s.left(s.find(BLANK)); unsigned long kBAvail = u.toULong(); s=s.remove(0,s.find(BLANK)+1 ); - //kdDebug(kfile_area) << " Avail: [" << kBAvail << "]" << endl; + //kdDebug(tdefile_area) << " Avail: [" << kBAvail << "]" << endl; s=s.remove(0,s.find(BLANK)+1 ); // delete the capacity 94% TQString mountPoint = s.stripWhiteSpace(); - //kdDebug(kfile_area) << " MountPoint: [" << mountPoint << "]" << endl; + //kdDebug(tdefile_area) << " MountPoint: [" << mountPoint << "]" << endl; if ( mountPoint == m_mountPoint ) { - //kdDebug(kfile_area) << "Found mount point. Emitting" << endl; + //kdDebug(tdefile_area) << "Found mount point. Emitting" << endl; emit foundMountPoint( mountPoint, kBSize, kBUsed, kBAvail ); emit foundMountPoint( kBSize, kBUsed, kBAvail, mountPoint ); // sic! } diff --git a/krusader/MountMan/kmountman.h b/krusader/MountMan/kmountman.h index 79708a3..b6a1ae3 100644 --- a/krusader/MountMan/kmountman.h +++ b/krusader/MountMan/kmountman.h @@ -36,9 +36,9 @@ A // KDE includes #include <tdeversion.h> -#include <kio/jobclasses.h> -#include <kio/job.h> -#include <kio/global.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> +#include <tdeio/global.h> #include <kmountpoint.h> // krusader includes diff --git a/krusader/Panel/krbriefviewitem.cpp b/krusader/Panel/krbriefviewitem.cpp index 230f8d2..de38e27 100644 --- a/krusader/Panel/krbriefviewitem.cpp +++ b/krusader/Panel/krbriefviewitem.cpp @@ -4,7 +4,7 @@ #include "../defaults.h" #include "../kicons.h" #include "listpanel.h" -#include <kconfig.h> +#include <tdeconfig.h> #include "krcolorcache.h" #include <tqpainter.h> diff --git a/krusader/Panel/krcalcspacedialog.h b/krusader/Panel/krcalcspacedialog.h index 27bafb3..2213232 100644 --- a/krusader/Panel/krcalcspacedialog.h +++ b/krusader/Panel/krcalcspacedialog.h @@ -36,7 +36,7 @@ // KDE Includes #include <kdialogbase.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> // TQt Includes #include <tqthread.h> // Krusader Includes diff --git a/krusader/Panel/krpreviewpopup.cpp b/krusader/Panel/krpreviewpopup.cpp index aceaf80..0604325 100644 --- a/krusader/Panel/krpreviewpopup.cpp +++ b/krusader/Panel/krpreviewpopup.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include "krpreviewpopup.h" #include <kdebug.h> #include <klocale.h> diff --git a/krusader/Panel/krpreviewpopup.h b/krusader/Panel/krpreviewpopup.h index 607ef31..19b72f6 100644 --- a/krusader/Panel/krpreviewpopup.h +++ b/krusader/Panel/krpreviewpopup.h @@ -20,7 +20,7 @@ #include <tqpopupmenu.h> #include <tqpixmap.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kurl.h> /** diff --git a/krusader/Panel/krviewitem.h b/krusader/Panel/krviewitem.h index b4c2381..b57afbd 100644 --- a/krusader/Panel/krviewitem.h +++ b/krusader/Panel/krviewitem.h @@ -31,7 +31,7 @@ #define KRVIEWITEM_H #include <sys/types.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "../VFS/vfile.h" #include "krview.h" diff --git a/krusader/Panel/listpanel.h b/krusader/Panel/listpanel.h index c48b20d..4c71e87 100644 --- a/krusader/Panel/listpanel.h +++ b/krusader/Panel/listpanel.h @@ -34,7 +34,7 @@ #define LISTPANEL_H #include <kpropsdlg.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kurl.h> #include <tqwidget.h> #include <tqlabel.h> diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp index 82cbc61..0c8f02a 100755 --- a/krusader/Panel/panelfunc.cpp +++ b/krusader/Panel/panelfunc.cpp @@ -46,7 +46,7 @@ A #include <krun.h> #include <kinputdialog.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <ktempdir.h> #include <kurlrequester.h> diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp index 7349686..a43bd50 100644 --- a/krusader/Panel/panelpopup.cpp +++ b/krusader/Panel/panelpopup.cpp @@ -8,7 +8,7 @@ #include <tqtooltip.h> #include <tqbuttongroup.h> #include <tqtoolbutton.h> -#include <kfiletreeview.h> +#include <tdefiletreeview.h> #include <klocale.h> #include <tqcursor.h> #include <tqlayout.h> @@ -17,7 +17,7 @@ #include <krview.h> #include <krviewitem.h> #include <klineedit.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include "../KViewer/kimagefilepreview.h" #include "../KViewer/panelviewer.h" #include "../KViewer/diskusageviewer.h" diff --git a/krusader/Panel/panelpopup.h b/krusader/Panel/panelpopup.h index dddd125..c050a2d 100644 --- a/krusader/Panel/panelpopup.h +++ b/krusader/Panel/panelpopup.h @@ -5,9 +5,9 @@ #include <tqwidgetstack.h> #include <tqpixmap.h> #include <tqvaluelist.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqguardedptr.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include <kurl.h> class TQButtonGroup; diff --git a/krusader/Queue/queue.h b/krusader/Queue/queue.h index 11eb9a7..a0702c6 100644 --- a/krusader/Queue/queue.h +++ b/krusader/Queue/queue.h @@ -2,7 +2,7 @@ #define QUEUE_H #include <tqobject.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <tqptrlist.h> /** diff --git a/krusader/Search/krsearchmod.h b/krusader/Search/krsearchmod.h index 73ef46d..9adfefd 100644 --- a/krusader/Search/krsearchmod.h +++ b/krusader/Search/krsearchmod.h @@ -38,7 +38,7 @@ #include <tqstringlist.h> #include <tqdatetime.h> #include <time.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kurl.h> #include "../VFS/ftp_vfs.h" #include "../VFS/virt_vfs.h" diff --git a/krusader/Splitter/combiner.cpp b/krusader/Splitter/combiner.cpp index 5d65e7c..a4cad65 100644 --- a/krusader/Splitter/combiner.cpp +++ b/krusader/Splitter/combiner.cpp @@ -32,8 +32,8 @@ #include "../VFS/vfs.h" #include <klocale.h> #include <kmessagebox.h> -#include <kfileitem.h> -#include <kio/job.h> +#include <tdefileitem.h> +#include <tdeio/job.h> #include <tqfileinfo.h> Combiner::Combiner( TQWidget* parent, KURL baseURLIn, KURL destinationURLIn, bool unixNamingIn ) : diff --git a/krusader/Splitter/combiner.h b/krusader/Splitter/combiner.h index 5770ebb..5beb039 100644 --- a/krusader/Splitter/combiner.h +++ b/krusader/Splitter/combiner.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqprogressdialog.h> #include <kurl.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> class Combiner : public TQProgressDialog { diff --git a/krusader/Splitter/splitter.cpp b/krusader/Splitter/splitter.cpp index 86df3fd..2d6a6d1 100644 --- a/krusader/Splitter/splitter.cpp +++ b/krusader/Splitter/splitter.cpp @@ -33,8 +33,8 @@ #include <tqlayout.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/job.h> -#include <kfileitem.h> +#include <tdeio/job.h> +#include <tdefileitem.h> #include <tqfileinfo.h> Splitter::Splitter( TQWidget* parent, KURL fileNameIn, KURL destinationDirIn ) : diff --git a/krusader/Splitter/splitter.h b/krusader/Splitter/splitter.h index 75ef97a..dcddeec 100644 --- a/krusader/Splitter/splitter.h +++ b/krusader/Splitter/splitter.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqprogressdialog.h> #include <kurl.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> class Splitter : public TQProgressDialog { diff --git a/krusader/Splitter/splittergui.h b/krusader/Splitter/splittergui.h index 81def94..17d5bd0 100644 --- a/krusader/Splitter/splittergui.h +++ b/krusader/Splitter/splittergui.h @@ -37,7 +37,7 @@ #include <tqvalidator.h> #include <tqcombobox.h> #include <kurlrequester.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "../VFS/vfs.h" diff --git a/krusader/Synchronizer/synchronizer.cpp b/krusader/Synchronizer/synchronizer.cpp index aea51ef..2ceb0a5 100755 --- a/krusader/Synchronizer/synchronizer.cpp +++ b/krusader/Synchronizer/synchronizer.cpp @@ -42,11 +42,11 @@ #include <tqregexp.h> #include <tqdir.h> #include <tqtimer.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kdialogbase.h> -#include <kio/observer.h> -#include <kio/renamedlg.h> -#include <kio/skipdlg.h> +#include <tdeio/observer.h> +#include <tdeio/renamedlg.h> +#include <tdeio/skipdlg.h> #include <unistd.h> #include <tqeventloop.h> #include <tqpushbutton.h> diff --git a/krusader/Synchronizer/synchronizer.h b/krusader/Synchronizer/synchronizer.h index 32e7b84..df739e9 100755 --- a/krusader/Synchronizer/synchronizer.h +++ b/krusader/Synchronizer/synchronizer.h @@ -37,7 +37,7 @@ #include <tqptrvector.h> #include <tqmap.h> #include <tqcolor.h> -#include <kio/job.h> +#include <tdeio/job.h> class KRQuery; class vfile; diff --git a/krusader/Synchronizer/synchronizerdirlist.cpp b/krusader/Synchronizer/synchronizerdirlist.cpp index a194183..f2109bf 100644 --- a/krusader/Synchronizer/synchronizerdirlist.cpp +++ b/krusader/Synchronizer/synchronizerdirlist.cpp @@ -34,7 +34,7 @@ #include <dirent.h> #include <klocale.h> #include <kmessagebox.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <klargefile.h> #include <tqapplication.h> #include <tqdir.h> diff --git a/krusader/Synchronizer/synchronizerdirlist.h b/krusader/Synchronizer/synchronizerdirlist.h index 28a3cc5..31b24c5 100644 --- a/krusader/Synchronizer/synchronizerdirlist.h +++ b/krusader/Synchronizer/synchronizerdirlist.h @@ -34,7 +34,7 @@ #include <tqobject.h> #include <tqdict.h> #include "../VFS/vfile.h" -#include <kio/job.h> +#include <tdeio/job.h> class SynchronizerDirList : public TQObject, public TQDict<vfile> diff --git a/krusader/Synchronizer/synchronizerfileitem.h b/krusader/Synchronizer/synchronizerfileitem.h index 71d9845..715fcc5 100644 --- a/krusader/Synchronizer/synchronizerfileitem.h +++ b/krusader/Synchronizer/synchronizerfileitem.h @@ -32,7 +32,7 @@ #define __SYNCHRONIZER_FILE_ITEM_H__ #include <tqstring.h> -#include <kio/global.h> +#include <tdeio/global.h> typedef enum { diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp index 95dc63d..e3e2656 100755 --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -48,7 +48,7 @@ #include <tqcursor.h> #include <time.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqeventloop.h> #include <tqwhatsthis.h> #include <tqregexp.h> diff --git a/krusader/Synchronizer/synchronizertask.h b/krusader/Synchronizer/synchronizertask.h index 6f4fa35..20696f8 100644 --- a/krusader/Synchronizer/synchronizertask.h +++ b/krusader/Synchronizer/synchronizertask.h @@ -32,7 +32,7 @@ #define __SYNCHRONIZER_TASK_H__ #include <tqobject.h> -#include <kio/job.h> +#include <tdeio/job.h> class Synchronizer; class SynchronizerDirList; diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 733b2ff..67b426d 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -25,7 +25,7 @@ #include <kaction.h> #include <kurl.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "kraction.h" #include "expander.h" #include "useraction.h" diff --git a/krusader/VFS/arc_vfs.cpp b/krusader/VFS/arc_vfs.cpp index a816a3c..ffabdd5 100755 --- a/krusader/VFS/arc_vfs.cpp +++ b/krusader/VFS/arc_vfs.cpp @@ -42,7 +42,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <kprocess.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <tqprogressdialog.h> #include <kglobalsettings.h> #include <kmimetype.h> diff --git a/krusader/VFS/ftp_vfs.cpp b/krusader/VFS/ftp_vfs.cpp index 5eaca46..fc76029 100644 --- a/krusader/VFS/ftp_vfs.cpp +++ b/krusader/VFS/ftp_vfs.cpp @@ -41,9 +41,9 @@ #include <tqtimer.h> #include <tqeventloop.h> // KDE includes -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <klocale.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kmessagebox.h> #include <kprotocolinfo.h> #include <kdebug.h> diff --git a/krusader/VFS/krarchandler.cpp b/krusader/VFS/krarchandler.cpp index 3366a52..23d48d9 100644 --- a/krusader/VFS/krarchandler.cpp +++ b/krusader/VFS/krarchandler.cpp @@ -34,11 +34,11 @@ #include <ktempfile.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/passdlg.h> +#include <tdeio/passdlg.h> #include <tqfile.h> #include <kstandarddirs.h> #include <ktar.h> -#include <kio/global.h> +#include <tdeio/global.h> // Krusader includes #include "krarchandler.h" #include "../krusader.h" diff --git a/krusader/VFS/krpermhandler.h b/krusader/VFS/krpermhandler.h index 26b945a..02a2928 100644 --- a/krusader/VFS/krpermhandler.h +++ b/krusader/VFS/krpermhandler.h @@ -37,7 +37,7 @@ #include <sys/types.h> #include <tqdict.h> #include <tqintdict.h> -#include <kio/global.h> +#include <tdeio/global.h> #define NO_PERM 0 #define UNKNOWN_PERM 1 diff --git a/krusader/VFS/krquery.cpp b/krusader/VFS/krquery.cpp index acd4150..9898d7e 100644 --- a/krusader/VFS/krquery.cpp +++ b/krusader/VFS/krquery.cpp @@ -45,8 +45,8 @@ #include <kmimetype.h> #include <tqfile.h> #include <kurlcompletion.h> -#include <kio/job.h> -#include <kfileitem.h> +#include <tdeio/job.h> +#include <tdefileitem.h> #define STATUS_SEND_DELAY 250 #define MAX_LINE_LEN 500 diff --git a/krusader/VFS/krquery.h b/krusader/VFS/krquery.h index f773c97..e422acc 100644 --- a/krusader/VFS/krquery.h +++ b/krusader/VFS/krquery.h @@ -34,7 +34,7 @@ #include <tqdatetime.h> #include <time.h> #include <kurl.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include "vfile.h" class KFileItem; diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp index 91cee48..d04f243 100644 --- a/krusader/VFS/normal_vfs.cpp +++ b/krusader/VFS/normal_vfs.cpp @@ -38,12 +38,12 @@ // KDE includes #include <kmessagebox.h> #include <kmimetype.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <klocale.h> #include <kglobalsettings.h> #include <kdebug.h> #include <klargefile.h> -#include <kfileitem.h> +#include <tdefileitem.h> // Krusader includes #include "normal_vfs.h" #include "../Dialogs/krdialogs.h" diff --git a/krusader/VFS/normal_vfs.h b/krusader/VFS/normal_vfs.h index b62248b..2c7e366 100644 --- a/krusader/VFS/normal_vfs.h +++ b/krusader/VFS/normal_vfs.h @@ -34,7 +34,7 @@ // QT includes #include <tqstring.h> // KDE includes -#include <kfileitem.h> +#include <tdefileitem.h> #include <kdirwatch.h> #include <kurl.h> // Krusader includes diff --git a/krusader/VFS/preservingcopyjob.cpp b/krusader/VFS/preservingcopyjob.cpp index 32cb122..1ca4397 100644 --- a/krusader/VFS/preservingcopyjob.cpp +++ b/krusader/VFS/preservingcopyjob.cpp @@ -33,9 +33,9 @@ #include "../krusader.h" #include <utime.h> #include <klargefile.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kfileitem.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdefileitem.h> #include <tqfile.h> #include <pwd.h> #include <grp.h> diff --git a/krusader/VFS/preservingcopyjob.h b/krusader/VFS/preservingcopyjob.h index 996b33a..47b57da 100644 --- a/krusader/VFS/preservingcopyjob.h +++ b/krusader/VFS/preservingcopyjob.h @@ -33,7 +33,7 @@ #include "config.h" #include <time.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <tqmap.h> #include <tqvaluelist.h> diff --git a/krusader/VFS/vfile.h b/krusader/VFS/vfile.h index aa5e1dd..eebb196 100644 --- a/krusader/VFS/vfile.h +++ b/krusader/VFS/vfile.h @@ -35,7 +35,7 @@ // System includes #include <sys/types.h> // KDE includes -#include <kio/global.h> +#include <tdeio/global.h> #include <kmimetype.h> #define PERM_ALL -2 diff --git a/krusader/VFS/vfs.h b/krusader/VFS/vfs.h index efbced7..88ac644 100644 --- a/krusader/VFS/vfs.h +++ b/krusader/VFS/vfs.h @@ -37,7 +37,7 @@ #include <tqdict.h> // KDE includes #include <kurl.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> // Krusader includes #include "vfile.h" #include "preservingcopyjob.h" diff --git a/krusader/VFS/virt_vfs.cpp b/krusader/VFS/virt_vfs.cpp index 95bf20f..a3d1f5c 100644 --- a/krusader/VFS/virt_vfs.cpp +++ b/krusader/VFS/virt_vfs.cpp @@ -18,7 +18,7 @@ #include <unistd.h> #include <time.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobalsettings.h> #include <kurl.h> #include <kmessagebox.h> diff --git a/krusader/VFS/virt_vfs.h b/krusader/VFS/virt_vfs.h index af99bdc..8f8f5de 100644 --- a/krusader/VFS/virt_vfs.h +++ b/krusader/VFS/virt_vfs.h @@ -18,7 +18,7 @@ #ifndef VIRT_VFS_H #define VIRT_VFS_H -#include <kconfig.h> +#include <tdeconfig.h> #include "vfs.h" diff --git a/krusader/VFS/virtualcopyjob.cpp b/krusader/VFS/virtualcopyjob.cpp index 226b1aa..8390d8c 100644 --- a/krusader/VFS/virtualcopyjob.cpp +++ b/krusader/VFS/virtualcopyjob.cpp @@ -32,9 +32,9 @@ #include "vfs.h" #include "vfile.h" #include "../krusader.h" -#include <kio/observer.h> -#include <kio/global.h> -#include <kio/jobclasses.h> +#include <tdeio/observer.h> +#include <tdeio/global.h> +#include <tdeio/jobclasses.h> #include <kdirsize.h> #define REPORT_TIMEOUT 200 diff --git a/krusader/VFS/virtualcopyjob.h b/krusader/VFS/virtualcopyjob.h index 88bad99..8acb0a7 100644 --- a/krusader/VFS/virtualcopyjob.h +++ b/krusader/VFS/virtualcopyjob.h @@ -31,7 +31,7 @@ #ifndef __VIRTUAL_COPY_JOB_H__ #define __VIRTUAL_COPY_JOB_H__ -#include <kio/job.h> +#include <tdeio/job.h> #include "preservingcopyjob.h" #include <tqvaluelist.h> #include <tqtimer.h> diff --git a/krusader/kicons.h b/krusader/kicons.h index f97a23b..bdc0c4b 100644 --- a/krusader/kicons.h +++ b/krusader/kicons.h @@ -13,7 +13,7 @@ // of the icon to allow automatic resizing when needed. #define LOADICON(X) TQIconSet(krLoader->loadIcon(X,KIcon::Desktop)).pixmap(TQIconSet::Small,true) -// used only for calls within the kfilelist framework, handles icon sizes +// used only for calls within the tdefilelist framework, handles icon sizes TQPixmap FL_LOADICON(TQString name); extern const char * no_xpm[]; diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp index de65684..b475204 100644 --- a/krusader/krslots.cpp +++ b/krusader/krslots.cpp @@ -40,7 +40,7 @@ #include <kmessagebox.h> #include <klineeditdlg.h> #include <kdirnotify_stub.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kedittoolbar.h> #include <tdeversion.h> #include <kcmdlineargs.h> @@ -504,7 +504,7 @@ void KRslots::homeTerminal(){ void KRslots::sysInfo(){ TDEProcess proc; - proc << "kcmshell" << "System/ksysctrl"; + proc << "tdecmshell" << "System/ksysctrl"; if (!proc.start(TDEProcess::DontCare)){ KMessageBox::sorry(krApp,i18n("Can't find \"KsysCtrl\". Please install the TDE admin package")); } diff --git a/krusader/krusader.h b/krusader/krusader.h index ce7fbd7..c0e7602 100644 --- a/krusader/krusader.h +++ b/krusader/krusader.h @@ -42,7 +42,7 @@ #include <tdeparts/mainwindow.h> #include <kstdaction.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaccel.h> #include <tqstringlist.h> #include <tqtextstream.h> diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp index b76e845..236825b 100644 --- a/krusader/krusaderview.cpp +++ b/krusader/krusaderview.cpp @@ -140,7 +140,7 @@ void KrusaderView::slotCurrentChanged( TQString p ) { cmdLine->setCurrent( p ); if ( konsole_part != 0L && konsole_part->widget() != 0L ) { TDEConfigGroupSaver grp(krConfig, "General"); - if (krConfig->readBoolEntry("Send CDs", _SendCDs)) // hopefully, this is cached in kconfig + if (krConfig->readBoolEntry("Send CDs", _SendCDs)) // hopefully, this is cached in tdeconfig if( !konsole_part->url().equals( KURL( p ), true ) ) konsole_part->openURL( KURL( p ) ); } diff --git a/krusader/panelmanager.cpp b/krusader/panelmanager.cpp index adbfa47..a46adbb 100644 --- a/krusader/panelmanager.cpp +++ b/krusader/panelmanager.cpp @@ -3,7 +3,7 @@ #include <klocale.h> #include <tqimage.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include "panelmanager.h" #include "Panel/listpanel.h" |