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 /karbon/shapes | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'karbon/shapes')
| -rw-r--r-- | karbon/shapes/vellipse.cc | 2 | ||||
| -rw-r--r-- | karbon/shapes/vpolygon.cc | 2 | ||||
| -rw-r--r-- | karbon/shapes/vpolyline.cc | 2 | ||||
| -rw-r--r-- | karbon/shapes/vrectangle.cc | 2 | ||||
| -rw-r--r-- | karbon/shapes/vsinus.cc | 2 | ||||
| -rw-r--r-- | karbon/shapes/vspiral.cc | 2 | ||||
| -rw-r--r-- | karbon/shapes/vstar.cc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc index ef5bb070..1a9462b8 100644 --- a/karbon/shapes/vellipse.cc +++ b/karbon/shapes/vellipse.cc @@ -20,7 +20,7 @@ #include "vellipse.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <KoStore.h> #include <KoXmlWriter.h> diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc index 1735471f..fdf0f745 100644 --- a/karbon/shapes/vpolygon.cc +++ b/karbon/shapes/vpolygon.cc @@ -23,7 +23,7 @@ #include "vglobal.h" #include "vpolygon.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <KoStore.h> #include <KoXmlWriter.h> diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc index cef5bda2..519422ed 100644 --- a/karbon/shapes/vpolyline.cc +++ b/karbon/shapes/vpolyline.cc @@ -22,7 +22,7 @@ #include <tqdom.h> #include "vglobal.h" -#include <klocale.h> +#include <tdelocale.h> #include <vdocument.h> #include "vtransformcmd.h" diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc index bbeef50f..3190c93c 100644 --- a/karbon/shapes/vrectangle.cc +++ b/karbon/shapes/vrectangle.cc @@ -19,7 +19,7 @@ #include "vrectangle.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <KoStore.h> #include <KoXmlWriter.h> diff --git a/karbon/shapes/vsinus.cc b/karbon/shapes/vsinus.cc index 362ed800..f27cee4b 100644 --- a/karbon/shapes/vsinus.cc +++ b/karbon/shapes/vsinus.cc @@ -23,7 +23,7 @@ #include "vglobal.h" #include "vsinus.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <tqdom.h> #include <vdocument.h> diff --git a/karbon/shapes/vspiral.cc b/karbon/shapes/vspiral.cc index 0df88485..ff2f691e 100644 --- a/karbon/shapes/vspiral.cc +++ b/karbon/shapes/vspiral.cc @@ -26,7 +26,7 @@ #include "vglobal.h" #include "vspiral.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <vdocument.h> diff --git a/karbon/shapes/vstar.cc b/karbon/shapes/vstar.cc index 260c1664..a43413c9 100644 --- a/karbon/shapes/vstar.cc +++ b/karbon/shapes/vstar.cc @@ -26,7 +26,7 @@ #include "vglobal.h" #include "vstar.h" #include "vtransformcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <KoUnit.h> #include <vdocument.h> |