diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 /kaddressbook/xxport | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/xxport')
| -rw-r--r-- | kaddressbook/xxport/csv_xxport.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/csvimportdialog.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/xxport/eudora_xxport.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/kde2_xxport.cpp | 8 | ||||
| -rw-r--r-- | kaddressbook/xxport/ldif_xxport.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/opera_xxport.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/pab_xxport.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index f3d47bfc3..673a0ec73 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -23,8 +23,8 @@ #include <tqfile.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 40c209dce..4a363e76f 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -35,7 +35,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <klocale.h> #include <kinputdialog.h> diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp index 402665ab1..c443cce3b 100644 --- a/kaddressbook/xxport/eudora_xxport.cpp +++ b/kaddressbook/xxport/eudora_xxport.cpp @@ -23,8 +23,8 @@ #include <tqfile.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index f5abefde3..6d8fd80e7 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -24,8 +24,8 @@ #include <tqfile.h> #include <kdebug.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <kprocess.h> @@ -62,10 +62,10 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const TDEProcess proc; if ( result == KMessageBox::Yes ) { - proc << "kab2kabc"; + proc << "tdeab2tdeabc"; proc << "--override"; } else if ( result == KMessageBox::No ) - proc << "kab2kabc"; + proc << "tdeab2tdeabc"; else { kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl; return KABC::AddresseeList(); diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index f0c13e610..67c3684d3 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -35,8 +35,8 @@ #include <tqfile.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmdcodec.h> #include <kmessagebox.h> diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 800f11fa6..f1547481d 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -25,8 +25,8 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 911e92ded..c4db37a9e 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -25,8 +25,8 @@ #include <tqfile.h> #include <kdebug.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <kprocess.h> diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 34a6809fa..8e219fca4 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -30,8 +30,8 @@ #include <kabc/vcardconverter.h> #include <kdialogbase.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> |