summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:11:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:11:45 -0600
commit4812cdb245fee471edd87f685a3833aeead705b7 (patch)
tree21fd49985e064d2f8a2a3381f4ccc0cbdc9fd1d1 /lib
parentcf989dcd69444c456d60c0eedbc3d5588d653681 (diff)
downloadkpilot-4812cdb245fee471edd87f685a3833aeead705b7.tar.gz
kpilot-4812cdb245fee471edd87f685a3833aeead705b7.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'lib')
-rw-r--r--lib/kpilotlocallink.cc4
-rw-r--r--lib/plugin.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc
index c944a53..5f93a47 100644
--- a/lib/kpilotlocallink.cc
+++ b/lib/kpilotlocallink.cc
@@ -283,11 +283,11 @@ KPilotLocalLink::~KPilotLocalLink()
KURL src = KURL::fromPathOrURL( canonicalSrcPath );
KURL dst = KURL::fromPathOrURL( canonicalDstPath );
- KIO::NetAccess::file_copy(src,dst,-1,true);
+ TDEIO::NetAccess::file_copy(src,dst,-1,true);
if (deletefile)
{
- KIO::NetAccess::del(src, 0L);
+ TDEIO::NetAccess::del(src, 0L);
}
return true;
diff --git a/lib/plugin.h b/lib/plugin.h
index 57761b2..6966a0b 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -108,7 +108,7 @@ public:
/**
* Load or save the config widget's settings in the given
- * KConfig object; leave the group unchanged. load() and
+ * TDEConfig object; leave the group unchanged. load() and
* commit() should both call unmodified() to indicate that
* the current settings match the on-disk ones.
*/