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 /libkpimexchange/core | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkpimexchange/core')
| -rw-r--r-- | libkpimexchange/core/exchangeaccount.cpp | 4 | ||||
| -rw-r--r-- | libkpimexchange/core/exchangeclient.cpp | 2 | ||||
| -rw-r--r-- | libkpimexchange/core/exchangedownload.cpp | 4 | ||||
| -rw-r--r-- | libkpimexchange/core/exchangeprogress.cpp | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index 75b1446d9..a033b6b02 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -34,8 +34,8 @@ #include <tdeconfig.h> #include <dcopclient.h> #include <kcursor.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeio/authinfo.h> #include <tdeio/davjob.h> diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp index 4f540aee9..5658c7075 100644 --- a/libkpimexchange/core/exchangeclient.cpp +++ b/libkpimexchange/core/exchangeclient.cpp @@ -22,7 +22,7 @@ #include <kurl.h> #include <kdebug.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> // These for test() method #include <tdeio/http.h> diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 9ff3040f5..58bf236e3 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -27,8 +27,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kurl.h> #include <kdebug.h> diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index 0c7393bb7..7d52711f1 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/libkpimexchange/core/exchangeprogress.cpp @@ -22,10 +22,10 @@ #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> |