From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:48:17 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 karbon/tools/vellipsetool.cc     | 2 +-
 karbon/tools/vgradienttool.cc    | 2 +-
 karbon/tools/vpatterntool.cc     | 2 +-
 karbon/tools/vpenciltool.cc      | 2 +-
 karbon/tools/vpenciltool.h       | 2 +-
 karbon/tools/vpolygontool.cc     | 2 +-
 karbon/tools/vpolylinetool.cc    | 2 +-
 karbon/tools/vrectangletool.cc   | 2 +-
 karbon/tools/vrectangletool.h    | 2 +-
 karbon/tools/vrotatetool.cc      | 2 +-
 karbon/tools/vroundrecttool.h    | 2 +-
 karbon/tools/vselectnodestool.cc | 2 +-
 karbon/tools/vselecttool.h       | 2 +-
 karbon/tools/vsheartool.cc       | 2 +-
 karbon/tools/vsinustool.cc       | 2 +-
 karbon/tools/vspiraltool.cc      | 2 +-
 karbon/tools/vspiraltool.h       | 2 +-
 karbon/tools/vstartool.cc        | 2 +-
 karbon/tools/vstartool.h         | 2 +-
 karbon/tools/vtexttool.cc        | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'karbon/tools')

diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index b8855c50..170a51dd 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -21,7 +21,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "KoUnitWidgets.h"
 #include <KoUnit.h>
 #include <kcombobox.h>
diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc
index 68d7972e..e7d2db3c 100644
--- a/karbon/tools/vgradienttool.cc
+++ b/karbon/tools/vgradienttool.cc
@@ -20,7 +20,7 @@
 #include <tqcursor.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <karbon_part.h>
 #include <karbon_view.h>
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 963f1a61..8c42d5e0 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 #include <koIconChooser.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <karbon_factory.h>
 #include <karbon_resourceserver.h>
diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc
index a15dbf2d..1239923e 100644
--- a/karbon/tools/vpenciltool.cc
+++ b/karbon/tools/vpenciltool.cc
@@ -28,7 +28,7 @@
 #include <tqvbox.h>
 #include <tqwidgetstack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 //#include <KoUnitWidgets.h>
 
diff --git a/karbon/tools/vpenciltool.h b/karbon/tools/vpenciltool.h
index 3667f294..8def1526 100644
--- a/karbon/tools/vpenciltool.h
+++ b/karbon/tools/vpenciltool.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include "KoPoint.h"
 
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index 18895cea..de475691 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -22,7 +22,7 @@
 #include <tqgroupbox.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoUnitWidgets.h>
 
 #include <karbon_view.h>
diff --git a/karbon/tools/vpolylinetool.cc b/karbon/tools/vpolylinetool.cc
index e1689419..38ac9d25 100644
--- a/karbon/tools/vpolylinetool.cc
+++ b/karbon/tools/vpolylinetool.cc
@@ -22,7 +22,7 @@
 #include <tqevent.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <karbon_part.h>
 #include <karbon_view.h>
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index 5b0fcffe..4572cc23 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <karbon_view.h>
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index 7da59745..1915b10a 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -21,7 +21,7 @@
 #define __VRECTANGLETOOL_H__
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 
 #include "vshapetool.h"
diff --git a/karbon/tools/vrotatetool.cc b/karbon/tools/vrotatetool.cc
index f8d341dc..4230cac7 100644
--- a/karbon/tools/vrotatetool.cc
+++ b/karbon/tools/vrotatetool.cc
@@ -22,7 +22,7 @@
 #include <tqcursor.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoRect.h>
 
 #include <karbon_part.h>
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 27e4ca3d..35ee9be1 100644
--- a/karbon/tools/vroundrecttool.h
+++ b/karbon/tools/vroundrecttool.h
@@ -20,7 +20,7 @@
 #ifndef __VROUNDRECTTOOL_H__
 #define __VROUNDRECTTOOL_H__
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <knuminput.h>
 
diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc
index 7123b71a..2a3c38bb 100644
--- a/karbon/tools/vselectnodestool.cc
+++ b/karbon/tools/vselectnodestool.cc
@@ -22,7 +22,7 @@
 #include <tqcursor.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoPoint.h>
 #include <KoRect.h>
 
diff --git a/karbon/tools/vselecttool.h b/karbon/tools/vselecttool.h
index e7791172..464dc6af 100644
--- a/karbon/tools/vselecttool.h
+++ b/karbon/tools/vselecttool.h
@@ -21,7 +21,7 @@
 #define __VSELECTTOOL_H__
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "vtool.h"
 
diff --git a/karbon/tools/vsheartool.cc b/karbon/tools/vsheartool.cc
index d7fd40b9..4bc80810 100644
--- a/karbon/tools/vsheartool.cc
+++ b/karbon/tools/vsheartool.cc
@@ -22,7 +22,7 @@
 #include <tqcursor.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoRect.h>
 
 #include <karbon_part.h>
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index d46c4180..12dbe128 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <karbon_view.h>
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index e0b99c9e..c414be41 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 05694267..48842e9f 100644
--- a/karbon/tools/vspiraltool.h
+++ b/karbon/tools/vspiraltool.h
@@ -21,7 +21,7 @@
 #define __VSPIRALTOOL_H__
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "vshapetool.h"
 
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index e152ad31..9a92cd37 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index 1d35ad43..5c8936dc 100644
--- a/karbon/tools/vstartool.h
+++ b/karbon/tools/vstartool.h
@@ -20,7 +20,7 @@
 #ifndef __VSTARTOOL_H__
 #define __VSTARTOOL_H__
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 
 #include "vshapetool.h"
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 13e037a1..e7fa848d 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -35,7 +35,7 @@
 #include <tdefontdialog.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <karbon_view.h>
 #include <karbon_part.h>
-- 
cgit v1.2.1