diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kivio/plugins | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kivio/plugins')
| -rw-r--r-- | kivio/plugins/kivioconnectortool/tool_connector.cpp | 2 | ||||
| -rw-r--r-- | kivio/plugins/kivioselecttool/tool_select.cpp | 2 | ||||
| -rw-r--r-- | kivio/plugins/kiviosmlconnector/tool_connector.cpp | 2 | ||||
| -rw-r--r-- | kivio/plugins/kiviotargettool/kiviotargettool.cpp | 2 | ||||
| -rw-r--r-- | kivio/plugins/kiviotexttool/stenciltexteditor.cpp | 2 | ||||
| -rw-r--r-- | kivio/plugins/kiviotexttool/tool_text.cpp | 2 | ||||
| -rw-r--r-- | kivio/plugins/kiviozoomtool/tool_zoom.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index 26b8feb8..f8b5d015 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -25,7 +25,7 @@ #include <kstandarddirs.h> #include <KoPoint.h> #include <KoZoomHandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoGuides.h> #include "kivio_view.h" diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index b8a529f7..34e53196 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <KoZoomHandler.h> #include <KoPoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoGuides.h> #include "kivio_command.h" diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp index 4cb43bcc..966cb4c5 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp @@ -25,7 +25,7 @@ #include <KoPoint.h> #include <KoZoomHandler.h> #include <tdeactionclasses.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_view.h" #include "kivio_canvas.h" diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.cpp b/kivio/plugins/kiviotargettool/kiviotargettool.cpp index c25fb36b..be6f60d8 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettool.cpp +++ b/kivio/plugins/kiviotargettool/kiviotargettool.cpp @@ -20,7 +20,7 @@ #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include "kivio_stencil.h" #include "kivio_view.h" diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index 0204132f..1f2c7969 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -28,7 +28,7 @@ #include <tdefontcombo.h> #include <kcolorbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <karrowbutton.h> #include "kivio_stenciltexteditorui.h" diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index 5b1ee4fc..bfc54a73 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -24,7 +24,7 @@ #include <kstandarddirs.h> #include <kdebug.h> #include <KoPoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoZoomHandler.h> #include <kinputdialog.h> diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index 9cf9b443..e20b57e8 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdetoolbar.h> #include <KoMainWindow.h> |