diff options
Diffstat (limited to 'filesharing')
18 files changed, 22 insertions, 22 deletions
diff --git a/filesharing/Makefile.am b/filesharing/Makefile.am index 61d66854..9b214a50 100644 --- a/filesharing/Makefile.am +++ b/filesharing/Makefile.am @@ -2,4 +2,4 @@ SUBDIRS = advanced simple messages: rc.cpp $(EXTRACTRC) `find . -name '*.ui'` > rc.cpp - $(XGETTEXT) rc.cpp `find . -name '*.cpp' -or -name '*.h'` -o $(podir)/kfileshare.pot + $(XGETTEXT) rc.cpp `find . -name '*.cpp' -or -name '*.h'` -o $(podir)/tdefileshare.pot diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 2006e1a0..ba0f760c 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -40,7 +40,7 @@ #include <kaction.h> #include <krestrictedline.h> #include <klocale.h> -#include <kfiledetailview.h> +#include <tdefiledetailview.h> #include <kdirlister.h> #include <kmessagebox.h> #include <kurlrequester.h> diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index ed65f016..3d3d0aa8 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -29,7 +29,7 @@ #ifndef _HIDDENFILEVIEW_H_ #define _HIDDENFILEVIEW_H_ -#include <kfileitem.h> +#include <tdefileitem.h> #include <klistview.h> #include "qmultichecklistitem.h" diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 7940952f..622e1f08 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1434,7 +1434,7 @@ extern "C" { KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name) { - TDEGlobal::locale()->insertCatalogue("kfileshare"); + TDEGlobal::locale()->insertCatalogue("tdefileshare"); return new KcmSambaConf(parent, name); } } diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop index 722679ac..8c4404ec 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kcmsambaconf +Exec=tdecmshell kcmsambaconf Icon=samba Type=Application diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 6252209e..2cb66bec 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -24,7 +24,7 @@ #include <ksimpleconfig.h> #include <kdebug.h> #include <tqfileinfo.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kprocess.h> #include <kmessagebox.h> #include <klocale.h> diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h index df890129..34a82f7d 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.h +++ b/filesharing/advanced/kcm_sambaconf/sambafile.h @@ -24,7 +24,7 @@ #include <tqdict.h> #include <tqstring.h> #include <tqobject.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "sambashare.h" diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 2604a34d..099bc0bf 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -58,7 +58,7 @@ #include <kcombobox.h> #include <kiconloader.h> #include <klocale.h> -#include <kfiledetailview.h> +#include <tdefiledetailview.h> #include <kdirlister.h> #include <kmessagebox.h> #include <kpopupmenu.h> diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 02203bbd..ddfb7219 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp index bd4c3cbd..69ec1032 100644 --- a/filesharing/advanced/nfs/nfsdialog.cpp +++ b/filesharing/advanced/nfs/nfsdialog.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <klistview.h> #include <kaccel.h> diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt index bd96ae62..52be30f9 100644 --- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt +++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt @@ -43,6 +43,6 @@ tde_add_kpart( fileshare_propsdlgplugin AUTOMOC SOURCES propsdlgshareplugin.cpp LINK propsdlgplugin_common-static filesharenfs-static - filesharesamba-static kio-shared + filesharesamba-static tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index 91ce79d3..0bf740ef 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -25,13 +25,13 @@ #include <kpushbutton.h> #include <tqtimer.h> -#include <kfileshare.h> +#include <tdefileshare.h> #include <knfsshare.h> #include <ksambashare.h> #include <klocale.h> #include <kurl.h> #include <kdebug.h> -#include <kfile.h> +#include <tdefile.h> #include <kurlrequester.h> #include <kmessagebox.h> #include <klineedit.h> diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.h b/filesharing/advanced/propsdlgplugin/propertiespage.h index ba34ed04..a0717c2d 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.h +++ b/filesharing/advanced/propsdlgplugin/propertiespage.h @@ -20,7 +20,7 @@ #ifndef PROPERTIESPAGE_H #define PROPERTIESPAGE_H -#include <kfileitem.h> +#include <tdefileitem.h> #include "propertiespagegui.h" class NFSFile; diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp index 59155329..96b1f198 100644 --- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp +++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp @@ -24,7 +24,7 @@ #include <kgenericfactory.h> #include <kdebug.h> #include <kpushbutton.h> -#include <kfileshare.h> +#include <tdefileshare.h> #include <kmessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> @@ -49,7 +49,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const TQStringList & ) : KPropsDlgPlugin(dlg), d(0) { - TDEGlobal::locale()->insertCatalogue("kfileshare"); + TDEGlobal::locale()->insertCatalogue("tdefileshare"); if (KFileShare::shareMode() == KFileShare::Simple) { kdDebug(5009) << "PropsDlgSharePlugin: Sharing mode is simple. Aborting." << endl; @@ -101,7 +101,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, void PropsDlgSharePlugin::slotConfigureFileSharing() { TDEProcess proc; - proc << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; + proc << KStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare"; proc.start( TDEProcess::DontCare ); } diff --git a/filesharing/simple/CMakeLists.txt b/filesharing/simple/CMakeLists.txt index 093a80c8..dd06eeb2 100644 --- a/filesharing/simple/CMakeLists.txt +++ b/filesharing/simple/CMakeLists.txt @@ -36,6 +36,6 @@ tde_add_kpart( kcm_fileshare AUTOMOC krichtextlabel.cpp LINK propsdlgplugin_common-static filesharenfs-static filesharesamba-static - kio-shared + tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index dc0c4cbe..6f39975a 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -35,7 +35,7 @@ #include <kiconloader.h> #include <knfsshare.h> #include <ksambashare.h> -#include <kfileshare.h> +#include <tdefileshare.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> #include <kmessagebox.h> @@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") ) KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &): TDECModule(ShareFactory::instance(), parent, name) { - TDEGlobal::locale()->insertCatalogue("kfileshare"); + TDEGlobal::locale()->insertCatalogue("tdefileshare"); TQBoxLayout* layout = new TQVBoxLayout(this,0, KDialog::spacingHint()); diff --git a/filesharing/simple/fileshare.desktop b/filesharing/simple/fileshare.desktop index 2fa28fd9..cf78fc4f 100644 --- a/filesharing/simple/fileshare.desktop +++ b/filesharing/simple/fileshare.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell fileshare +Exec=tdecmshell fileshare Icon=share Type=Application diff --git a/filesharing/simple/fileshare.h b/filesharing/simple/fileshare.h index 283d5125..1877362c 100644 --- a/filesharing/simple/fileshare.h +++ b/filesharing/simple/fileshare.h @@ -19,7 +19,7 @@ #ifndef __fileshare_h__ #define __fileshare_h__ -#include <kfileitem.h> +#include <tdefileitem.h> #include "tdecmodule.h" class TQRadioButton; |