diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /tderesources/carddav | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/carddav')
| -rw-r--r-- | tderesources/carddav/config.cpp | 2 | ||||
| -rw-r--r-- | tderesources/carddav/configwidgets.cpp | 2 | ||||
| -rw-r--r-- | tderesources/carddav/job.cpp | 2 | ||||
| -rw-r--r-- | tderesources/carddav/plugin.cpp | 4 | ||||
| -rw-r--r-- | tderesources/carddav/resource.cpp | 6 | ||||
| -rw-r--r-- | tderesources/carddav/resource.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp index ecfff25e0..a71035058 100644 --- a/tderesources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp @@ -20,7 +20,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index b2d505dfe..2c22b3f11 100644 --- a/tderesources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp @@ -36,7 +36,7 @@ #include <kabcresourcecached.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/tderesources/carddav/job.cpp b/tderesources/carddav/job.cpp index 9c2886505..5cab5cdfb 100644 --- a/tderesources/carddav/job.cpp +++ b/tderesources/carddav/job.cpp @@ -15,7 +15,7 @@ #include "job.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmutex.h> diff --git a/tderesources/carddav/plugin.cpp b/tderesources/carddav/plugin.cpp index d0c4724ff..9079ecd33 100644 --- a/tderesources/carddav/plugin.cpp +++ b/tderesources/carddav/plugin.cpp @@ -17,8 +17,8 @@ #include "config.h" #include "export.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> /*========================================================================= | NAMESPACE diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index dae91c322..ddaae59dc 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -21,10 +21,10 @@ #include <tqapplication.h> #include <tqeventloop.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <tqdatetime.h> diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index 8f783ab28..2e2de6284 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -23,7 +23,7 @@ #include <kabcresourcecached.h> #include <libtdepim/progressmanager.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> |