From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp | 8 ++++---- filesharing/advanced/kcm_sambaconf/kcmsambaconf.h | 2 +- filesharing/advanced/kcm_sambaconf/sambafile.cpp | 14 +++++++------- filesharing/advanced/kcm_sambaconf/sambafile.h | 8 ++++---- filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'filesharing/advanced/kcm_sambaconf') diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 42b56fa0..7940952f 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -175,7 +175,7 @@ TQPixmap ShareListViewItem::createPropertyPixmap() } KcmSambaConf::KcmSambaConf(TQWidget *parent, const char *name) - : KCModule(parent,name) + : TDECModule(parent,name) { _dictMngr = 0L; _sambaFile = 0L; @@ -1414,8 +1414,8 @@ TQString KcmSambaConf::socketOptions() int KcmSambaConf::buttons () { - // KCModule::Default|KCModule::Apply|KCModule::Help; - return KCModule::Apply; + // TDECModule::Default|TDECModule::Apply|TDECModule::Help; + return TDECModule::Apply; } void KcmSambaConf::configChanged() { @@ -1432,7 +1432,7 @@ TQString KcmSambaConf::quickHelp() const extern "C" { - KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kfileshare"); return new KcmSambaConf(parent, name); diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h index a62f536d..bfc93fb0 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h @@ -66,7 +66,7 @@ class TQSpinBox; class DictManager; class SmbConfConfigWidget; -class KcmSambaConf: public KCModule +class KcmSambaConf: public TDECModule { Q_OBJECT diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 3a865c62..6252209e 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -199,9 +199,9 @@ bool SambaFile::slotApply() KURL srcURL; srcURL.setPath( _tempFile->name() ); - KIO::FileCopyJob * job = KIO::file_copy( srcURL, url, -1, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotSaveJobFinished ( KIO::Job * ) ) ); + TDEIO::FileCopyJob * job = TDEIO::file_copy( srcURL, url, -1, true ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotSaveJobFinished ( TDEIO::Job * ) ) ); return (job->error()==0); } @@ -459,12 +459,12 @@ TQString SambaFile::findSambaConf() return KSambaShare::instance()->smbConfPath(); } -void SambaFile::slotSaveJobFinished( KIO::Job * job ) { +void SambaFile::slotSaveJobFinished( TDEIO::Job * job ) { delete _tempFile; _tempFile = 0; } -void SambaFile::slotJobFinished( KIO::Job * job ) +void SambaFile::slotJobFinished( TDEIO::Job * job ) { if (job->error()) emit canceled( job->errorString() ); @@ -488,9 +488,9 @@ bool SambaFile::load() localPath = tempFile.name(); KURL destURL; destURL.setPath( localPath ); - KIO::FileCopyJob * job = KIO::file_copy( url, destURL, 0600, true, false, true ); + TDEIO::FileCopyJob * job = TDEIO::file_copy( url, destURL, 0600, true, false, true ); // emit started( d->m_job ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); return true; } else { localPath = path; diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h index 3696b220..df890129 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.h +++ b/filesharing/advanced/kcm_sambaconf/sambafile.h @@ -31,7 +31,7 @@ class KSimpleConfig; class TDEProcess; -class KConfig; +class TDEConfig; class KTempFile; class SambaFile; @@ -155,7 +155,7 @@ protected: private: - void copyConfigs(KConfig* first, KConfig* second); + void copyConfigs(TDEConfig* first, TDEConfig* second); KTempFile * _tempFile; public slots: @@ -167,8 +167,8 @@ public slots: bool slotApply(); protected slots: void testParmStdOutReceived(TDEProcess *proc, char *buffer, int buflen); - void slotJobFinished( KIO::Job *); - void slotSaveJobFinished( KIO::Job *); + void slotJobFinished( TDEIO::Job *); + void slotSaveJobFinished( TDEIO::Job *); signals: void canceled(const TQString &); diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 00181eaa..02203bbd 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -76,7 +76,7 @@ void SmbConfConfigWidget::btnPressed() { return; } - KConfig config("ksambaplugin"); + TDEConfig config("ksambaplugin"); config.setGroup("KSambaKonqiPlugin"); config.writeEntry("smb.conf",smbConf); -- cgit v1.2.1