summaryrefslogtreecommitdiffstats
path: root/filesharing/advanced/kcm_sambaconf/sambafile.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
commitf21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch)
tree78ccb5117063da3e08e3277e11054b912a9f2ae7 /filesharing/advanced/kcm_sambaconf/sambafile.h
parentc48e769eb275917717e2b55eb869f7e559293ac8 (diff)
downloadtdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz
tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'filesharing/advanced/kcm_sambaconf/sambafile.h')
-rw-r--r--filesharing/advanced/kcm_sambaconf/sambafile.h8
1 files changed, 4 insertions, 4 deletions
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 &);