diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
| commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
| tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /konq-plugins/kuick | |
| parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
| download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kuick')
| -rw-r--r-- | konq-plugins/kuick/kcmkuick/kcmkuick.cpp | 4 | ||||
| -rw-r--r-- | konq-plugins/kuick/kdirmenu.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kimcontactmenu.cpp | 4 | ||||
| -rw-r--r-- | konq-plugins/kuick/kmetamenu.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kuick_plugin.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index 9816d9b..c32d46e 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -16,8 +16,8 @@ #include <tqlayout.h> #include <tqfile.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 04f0d18..8a9758f 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <ksimpleconfig.h> #include "kdirmenu.h" diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index cdc5566..43abe10 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -28,8 +28,8 @@ #include <tdeimproxy.h> #ifdef KIMCONTACTS_USE_KABC -#include <kabc/addressbook.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/stdaddressbook.h> #endif #include "kimcontactmenu.h" diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 1ec30e7..ecc37de 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -20,7 +20,7 @@ #include <kiconloader.h> #include <tdeimproxy.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdefiledialog.h> #include <kurl.h> diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 0b86358..6545366 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -26,9 +26,9 @@ #include <kinstance.h> #include <kiconloader.h> #include <tdeimproxy.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_popupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kgenericfactory.h> #include <tqobject.h> #include <tdeio/jobclasses.h> |