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 /kugar/kudesigner_lib | |
parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kugar/kudesigner_lib')
-rw-r--r-- | kugar/kudesigner_lib/band.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/calcfield.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/command.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/commdefs.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/detail.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/detailbase.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/detailfooter.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/detailheader.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/field.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/kugartemplate.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/label.cpp | 4 | ||||
-rw-r--r-- | kugar/kudesigner_lib/line.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/pagefooter.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/pageheader.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/reportfooter.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/reportheader.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/reportitem.cpp | 4 | ||||
-rw-r--r-- | kugar/kudesigner_lib/section.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/specialfield.cpp | 2 |
19 files changed, 21 insertions, 21 deletions
diff --git a/kugar/kudesigner_lib/band.cpp b/kugar/kudesigner_lib/band.cpp index 21d0f752..5732ff3a 100644 --- a/kugar/kudesigner_lib/band.cpp +++ b/kugar/kudesigner_lib/band.cpp @@ -22,7 +22,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, #include <tqrect.h> #include <tqpainter.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "propertyserializer.h" #include "kugartemplate.h" diff --git a/kugar/kudesigner_lib/calcfield.cpp b/kugar/kudesigner_lib/calcfield.cpp index 16941b7b..b47597fc 100644 --- a/kugar/kudesigner_lib/calcfield.cpp +++ b/kugar/kudesigner_lib/calcfield.cpp @@ -18,7 +18,7 @@ */ #include "calcfield.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> diff --git a/kugar/kudesigner_lib/command.cpp b/kugar/kudesigner_lib/command.cpp index e65f9f71..f9d2d26f 100644 --- a/kugar/kudesigner_lib/command.cpp +++ b/kugar/kudesigner_lib/command.cpp @@ -18,7 +18,7 @@ */ #include "command.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> //#include "kudesigner_doc.h" diff --git a/kugar/kudesigner_lib/commdefs.cpp b/kugar/kudesigner_lib/commdefs.cpp index 298c3ecc..2be6e6d0 100644 --- a/kugar/kudesigner_lib/commdefs.cpp +++ b/kugar/kudesigner_lib/commdefs.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqsettings.h> diff --git a/kugar/kudesigner_lib/detail.cpp b/kugar/kudesigner_lib/detail.cpp index a9f2faa5..bb8ad3ef 100644 --- a/kugar/kudesigner_lib/detail.cpp +++ b/kugar/kudesigner_lib/detail.cpp @@ -18,7 +18,7 @@ */ #include "detail.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/detailbase.cpp b/kugar/kudesigner_lib/detailbase.cpp index e338baa1..0b157b67 100644 --- a/kugar/kudesigner_lib/detailbase.cpp +++ b/kugar/kudesigner_lib/detailbase.cpp @@ -18,7 +18,7 @@ */ #include "detailbase.h" -#include "klocale.h" +#include "tdelocale.h" namespace Kudesigner { diff --git a/kugar/kudesigner_lib/detailfooter.cpp b/kugar/kudesigner_lib/detailfooter.cpp index b1715920..4544072c 100644 --- a/kugar/kudesigner_lib/detailfooter.cpp +++ b/kugar/kudesigner_lib/detailfooter.cpp @@ -18,7 +18,7 @@ */ #include "detailfooter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/detailheader.cpp b/kugar/kudesigner_lib/detailheader.cpp index d43ce942..5e9ad3b8 100644 --- a/kugar/kudesigner_lib/detailheader.cpp +++ b/kugar/kudesigner_lib/detailheader.cpp @@ -18,7 +18,7 @@ */ #include "detailheader.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/field.cpp b/kugar/kudesigner_lib/field.cpp index c9a5b480..cdbd6253 100644 --- a/kugar/kudesigner_lib/field.cpp +++ b/kugar/kudesigner_lib/field.cpp @@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, */ #include "field.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineeditdlg.h> #include <kdebug.h> diff --git a/kugar/kudesigner_lib/kugartemplate.cpp b/kugar/kudesigner_lib/kugartemplate.cpp index 1945b714..41b7b0f1 100644 --- a/kugar/kudesigner_lib/kugartemplate.cpp +++ b/kugar/kudesigner_lib/kugartemplate.cpp @@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, */ #include "kugartemplate.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcanvas.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/label.cpp b/kugar/kudesigner_lib/label.cpp index 27226774..ec39b317 100644 --- a/kugar/kudesigner_lib/label.cpp +++ b/kugar/kudesigner_lib/label.cpp @@ -18,14 +18,14 @@ */ #include "label.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineeditdlg.h> #include <tqmap.h> #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koproperty/property.h> diff --git a/kugar/kudesigner_lib/line.cpp b/kugar/kudesigner_lib/line.cpp index fb5a56d5..2c7b48e6 100644 --- a/kugar/kudesigner_lib/line.cpp +++ b/kugar/kudesigner_lib/line.cpp @@ -18,7 +18,7 @@ */ #include "line.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/pagefooter.cpp b/kugar/kudesigner_lib/pagefooter.cpp index b4e30fed..8e0b4547 100644 --- a/kugar/kudesigner_lib/pagefooter.cpp +++ b/kugar/kudesigner_lib/pagefooter.cpp @@ -18,7 +18,7 @@ */ #include "pagefooter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/pageheader.cpp b/kugar/kudesigner_lib/pageheader.cpp index b2b76167..33b133d6 100644 --- a/kugar/kudesigner_lib/pageheader.cpp +++ b/kugar/kudesigner_lib/pageheader.cpp @@ -18,7 +18,7 @@ */ #include "pageheader.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/reportfooter.cpp b/kugar/kudesigner_lib/reportfooter.cpp index abed8a21..f6cccd5a 100644 --- a/kugar/kudesigner_lib/reportfooter.cpp +++ b/kugar/kudesigner_lib/reportfooter.cpp @@ -18,7 +18,7 @@ */ #include "reportfooter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/reportheader.cpp b/kugar/kudesigner_lib/reportheader.cpp index aef6351b..a64c9488 100644 --- a/kugar/kudesigner_lib/reportheader.cpp +++ b/kugar/kudesigner_lib/reportheader.cpp @@ -18,7 +18,7 @@ */ #include "reportheader.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/reportitem.cpp b/kugar/kudesigner_lib/reportitem.cpp index 60171583..22234c05 100644 --- a/kugar/kudesigner_lib/reportitem.cpp +++ b/kugar/kudesigner_lib/reportitem.cpp @@ -18,8 +18,8 @@ */ #include "reportitem.h" -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tqrect.h> #include <tqpainter.h> diff --git a/kugar/kudesigner_lib/section.cpp b/kugar/kudesigner_lib/section.cpp index 7a721133..630c8a66 100644 --- a/kugar/kudesigner_lib/section.cpp +++ b/kugar/kudesigner_lib/section.cpp @@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, */ #include "section.h" -#include "klocale.h" +#include "tdelocale.h" namespace Kudesigner { diff --git a/kugar/kudesigner_lib/specialfield.cpp b/kugar/kudesigner_lib/specialfield.cpp index d18c0e17..7842e4ab 100644 --- a/kugar/kudesigner_lib/specialfield.cpp +++ b/kugar/kudesigner_lib/specialfield.cpp @@ -18,7 +18,7 @@ */ #include "specialfield.h" -#include <klocale.h> +#include <tdelocale.h> #include <koproperty/property.h> |