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 /kabc/frontend | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kabc/frontend')
| -rw-r--r-- | kabc/frontend/main.cpp | 2 | ||||
| -rw-r--r-- | kabc/frontend/mainWindow.ui.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp index 7367508b..0e941e01 100644 --- a/kabc/frontend/main.cpp +++ b/kabc/frontend/main.cpp @@ -1,7 +1,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "mainWindow.h" diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h index 445b5945..1a88f1de 100644 --- a/kabc/frontend/mainWindow.ui.h +++ b/kabc/frontend/mainWindow.ui.h @@ -10,10 +10,10 @@ #include <kinputdialog.h> #include <tqmessagebox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> using namespace KABC; |