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 /kmobile/devices | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmobile/devices')
| -rw-r--r-- | kmobile/devices/gnokii/gnokii_mobile.cpp | 4 | ||||
| -rw-r--r-- | kmobile/devices/gnokii/gnokii_mobile.h | 2 | ||||
| -rw-r--r-- | kmobile/devices/skeleton/skeleton.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index a999fed0d..e5629f872 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -28,10 +28,10 @@ #include <klibloader.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/global.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <gnokii.h> diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index fbcb3cb6a..5ace3e0b9 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -25,7 +25,7 @@ #define LIBKMOBILE_GNOKII_H #include <kmobiledevice.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> class KMobileGnokii : public KMobileDevice { diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index 564681cd7..3593c7f8e 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -22,11 +22,11 @@ #include <klibloader.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/global.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "skeleton.h" |