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/remote | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/remote')
| -rw-r--r-- | tderesources/remote/resourceremote.cpp | 6 | ||||
| -rw-r--r-- | tderesources/remote/resourceremote_plugin.cpp | 4 | ||||
| -rw-r--r-- | tderesources/remote/resourceremoteconfig.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index 78b650658..3e97eed30 100644 --- a/tderesources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <libkcal/icalformat.h> @@ -41,7 +41,7 @@ #include <libkcal/journal.h> #include <libkcal/filestorage.h> -#include <kabc/lock.h> +#include <tdeabc/lock.h> #include <tderesources/configwidget.h> diff --git a/tderesources/remote/resourceremote_plugin.cpp b/tderesources/remote/resourceremote_plugin.cpp index 67eaa92fe..9c198582a 100644 --- a/tderesources/remote/resourceremote_plugin.cpp +++ b/tderesources/remote/resourceremote_plugin.cpp @@ -22,8 +22,8 @@ #include "resourceremoteconfig.h" #include "resourceremote.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/remote/resourceremoteconfig.cpp b/tderesources/remote/resourceremoteconfig.cpp index 67d7f4b94..381134b01 100644 --- a/tderesources/remote/resourceremoteconfig.cpp +++ b/tderesources/remote/resourceremoteconfig.cpp @@ -24,9 +24,9 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdialog.h> |