From 28ccd51885bd98e62c1756453c3fc638b429e5ee Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:31:27 -0600 Subject: Additional kde to tde renaming --- filesharing/advanced/kcm_sambaconf/CMakeLists.txt | 2 +- filesharing/advanced/kcm_sambaconf/Makefile.am | 2 +- filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp | 4 ++-- filesharing/advanced/kcm_sambaconf/sambafile.cpp | 4 ++-- filesharing/advanced/nfs/nfsfile.cpp | 2 +- filesharing/advanced/propsdlgplugin/propertiespage.cpp | 8 ++++---- filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'filesharing/advanced') diff --git a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt index 9ed92497..41723ee5 100644 --- a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt +++ b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt @@ -46,6 +46,6 @@ tde_add_kpart( kcm_kcmsambaconf AUTOMOC SOURCES kcminterface.ui kcmprinterdlg.ui printerdlgimpl.cpp kcmsambaconf.cpp joindomaindlg.ui - LINK filesharesamba-static kdeprint-shared + LINK filesharesamba-static tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/filesharing/advanced/kcm_sambaconf/Makefile.am b/filesharing/advanced/kcm_sambaconf/Makefile.am index 55cd699d..a955dafc 100644 --- a/filesharing/advanced/kcm_sambaconf/Makefile.am +++ b/filesharing/advanced/kcm_sambaconf/Makefile.am @@ -15,7 +15,7 @@ kcm_kcmsambaconf_la_COMPILE_FIRST = usertab.h share.h kcm_kcmsambaconf_la_LIBADD = \ - -lkdeprint \ + -ltdeprint \ libfilesharesamba.la kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index da11d799..0ba2082b 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 2ba52a57..50df27c0 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -146,7 +146,7 @@ bool SambaFile::slotApply() // we simply save the values to it // if not we have to save the results in // a temporary file and copy it afterwards - // over the smb.conf file with kdesu. + // over the smb.conf file with tdesu. if (TQFileInfo(path).isWritable()) { saveTo(path); @@ -177,7 +177,7 @@ bool SambaFile::slotApply() .tqarg(_tempFile->name()) .tqarg(path) .tqarg(_tempFile->name()); - proc << "kdesu" << "-d" << suCommand; + proc << "tdesu" << "-d" << suCommand; if (! proc.start(KProcess::Block)) { kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl; diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp index ebc33a9c..9eb674c8 100644 --- a/filesharing/advanced/nfs/nfsfile.cpp +++ b/filesharing/advanced/nfs/nfsfile.cpp @@ -248,7 +248,7 @@ bool NFSFile::save() command +=";exportfs -ra"; if (!TQFileInfo(_url.path()).isWritable() ) - proc<<"kdesu" << "-d" << "-c"<saveTo(nfsFileName); } else { nfsNeedsKDEsu = true; - kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs needs kdesu." << endl; + kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs needs tdesu." << endl; } } else kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs has not changed." << endl; @@ -192,7 +192,7 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool sambaFile->saveTo(sambaFileName); } else { sambaNeedsKDEsu = true; - kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba needs kdesu." << endl; + kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba needs tdesu." << endl; } } else kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba has not changed." << endl; @@ -222,10 +222,10 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool .tqarg(KProcess::quote( sambaFileName )); } - proc<<"kdesu" << "-d" << "-c"<