summaryrefslogtreecommitdiffstats
path: root/kaddressbook-plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
commit20de04ce44f63fb911103d7870d39d2782d14cda (patch)
treebddd13cef2fae98892caf538dc64b5357732c517 /kaddressbook-plugins
parent4c097708c4cc24f3b8e4c21f14644f5715767d47 (diff)
downloadtdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.tar.gz
tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook-plugins')
-rw-r--r--kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp2
-rw-r--r--kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index 7a80f89..cb9e461 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -222,7 +222,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
doExport( tmpFile.file(), list );
tmpFile.close();
- return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+ return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
} else {
TQString filename = url.path();
TQFile file( filename );
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 3d07955..0d0ffbd 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -48,7 +48,7 @@ GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name
bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
{
- KConfig config( "kworldclockrc" );
+ TDEConfig config( "kworldclockrc" );
// At first we read all exiting flags and compare it with ours to
// avoid duplicated flags