summaryrefslogtreecommitdiffstats
path: root/kaddressbook/xxport
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kaddressbook/xxport
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/xxport')
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp2
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 78cdbf562..728823019 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -792,7 +792,7 @@ void CSVImportDialog::applyTemplate()
TQStringList templates;
// load all template files
- TQStringList list = KGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) +
+ TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) +
"/csv-templates/*.desktop", true, true );
for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it )
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 309bb9b5b..f5abefde3 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -59,7 +59,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
if ( !result ) return KABC::AddresseeList();
- KProcess proc;
+ TDEProcess proc;
if ( result == KMessageBox::Yes ) {
proc << "kab2kabc";
@@ -70,7 +70,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
return KABC::AddresseeList();
}
- proc.start( KProcess::Block );
+ proc.start( TDEProcess::Block );
addressBook()->load();