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 /kaddressbook/editors | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/editors')
| -rw-r--r-- | kaddressbook/editors/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kaddressbook/editors/cryptowidget.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/editors/imaddresswidget.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/editors/imeditorwidget.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kaddressbook/editors/CMakeLists.txt b/kaddressbook/editors/CMakeLists.txt index 0fd3d0f8..a2b8c898 100644 --- a/kaddressbook/editors/CMakeLists.txt +++ b/kaddressbook/editors/CMakeLists.txt @@ -48,6 +48,6 @@ tde_add_library( kabim STATIC_PIC AUTOMOC tde_add_kpart( libkaddrbk_cryptosettings AUTOMOC SOURCES cryptowidget.cpp - LINK kabinterfaces-shared kleopatra-shared kabc-shared + LINK kabinterfaces-shared kleopatra-shared tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index f89a068e..89212585 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 4b3516ea..0a3336d6 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kplugininfo.h> #include "imaddresswidget.h" diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 45523de5..b0f1590e 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -32,8 +32,8 @@ #include <kdialogbase.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kplugininfo.h> #include <kpushbutton.h> #include <ktrader.h> |