diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:49:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:49:33 -0600 |
| commit | 51cb17939cc986de61b7cce799076ee6ddcbf3b2 (patch) | |
| tree | 30b6c628b25f1dece45df9dbb11bfd546dba5406 /conduits/abbrowserconduit | |
| parent | cbf5d0cef8875e3a03b49338d42784e23f96b26d (diff) | |
| download | kpilot-51cb17939cc986de61b7cce799076ee6ddcbf3b2.tar.gz kpilot-51cb17939cc986de61b7cce799076ee6ddcbf3b2.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'conduits/abbrowserconduit')
| -rw-r--r-- | conduits/abbrowserconduit/abbrowser-conduit.cc | 4 | ||||
| -rw-r--r-- | conduits/abbrowserconduit/abbrowser-conduit.h | 2 | ||||
| -rw-r--r-- | conduits/abbrowserconduit/abbrowserconduit.kcfg | 2 | ||||
| -rw-r--r-- | conduits/abbrowserconduit/kabcRecord.cc | 4 | ||||
| -rw-r--r-- | conduits/abbrowserconduit/kabcRecord.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index 93e15ac..b9f2bce 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -38,8 +38,8 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kabc/stdaddressbook.h> -#include <kabc/resourcefile.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/resourcefile.h> #include <tdeio/netaccess.h> #include <ksavefile.h> diff --git a/conduits/abbrowserconduit/abbrowser-conduit.h b/conduits/abbrowserconduit/abbrowser-conduit.h index ee73d4f..61db74b 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.h +++ b/conduits/abbrowserconduit/abbrowser-conduit.h @@ -30,7 +30,7 @@ */ -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <pilotAddress.h> #include <plugin.h> diff --git a/conduits/abbrowserconduit/abbrowserconduit.kcfg b/conduits/abbrowserconduit/abbrowserconduit.kcfg index c02aea1..3295dec 100644 --- a/conduits/abbrowserconduit/abbrowserconduit.kcfg +++ b/conduits/abbrowserconduit/abbrowserconduit.kcfg @@ -13,7 +13,7 @@ <default>eAbookFile</default> </entry> <entry name="FileName" type="Path"> - <default>$HOME/.trinity/share/apps/kabc/std.vcf</default> + <default>$HOME/.trinity/share/apps/tdeabc/std.vcf</default> </entry> <entry name="ArchiveDeleted" type="Bool"> <default>true</default> diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc index a02b83b..210ad9d 100644 --- a/conduits/abbrowserconduit/kabcRecord.cc +++ b/conduits/abbrowserconduit/kabcRecord.cc @@ -35,8 +35,8 @@ #include <tqregexp.h> -#include <kglobal.h> -#include <kabc/addressee.h> +#include <tdeglobal.h> +#include <tdeabc/addressee.h> #include "kabcRecord.h" diff --git a/conduits/abbrowserconduit/kabcRecord.h b/conduits/abbrowserconduit/kabcRecord.h index f27f0b1..4a862db 100644 --- a/conduits/abbrowserconduit/kabcRecord.h +++ b/conduits/abbrowserconduit/kabcRecord.h @@ -35,7 +35,7 @@ #include <tqvaluevector.h> -#include <kabc/phonenumber.h> +#include <tdeabc/phonenumber.h> #include "pilotAddress.h" |