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

---
 src/flowparts/callsub.cpp       | 2 +-
 src/flowparts/count.cpp         | 2 +-
 src/flowparts/delay.cpp         | 2 +-
 src/flowparts/embed.cpp         | 2 +-
 src/flowparts/end.cpp           | 2 +-
 src/flowparts/forloop.cpp       | 2 +-
 src/flowparts/inputbutton.cpp   | 2 +-
 src/flowparts/interrupt.cpp     | 2 +-
 src/flowparts/keypad.cpp        | 2 +-
 src/flowparts/pinmapping.cpp    | 2 +-
 src/flowparts/pulse.cpp         | 2 +-
 src/flowparts/readport.cpp      | 2 +-
 src/flowparts/repeat.cpp        | 2 +-
 src/flowparts/setpin.cpp        | 2 +-
 src/flowparts/sevenseg.cpp      | 2 +-
 src/flowparts/start.cpp         | 2 +-
 src/flowparts/sub.cpp           | 2 +-
 src/flowparts/testpin.cpp       | 2 +-
 src/flowparts/unary.cpp         | 2 +-
 src/flowparts/varassignment.cpp | 2 +-
 src/flowparts/varcomparison.cpp | 2 +-
 src/flowparts/while.cpp         | 2 +-
 src/flowparts/writeport.cpp     | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/flowparts')

diff --git a/src/flowparts/callsub.cpp b/src/flowparts/callsub.cpp
index 2b2d30b..1346157 100644
--- a/src/flowparts/callsub.cpp
+++ b/src/flowparts/callsub.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* CallSub::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/count.cpp b/src/flowparts/count.cpp
index e4bbdc3..ac44fb6 100644
--- a/src/flowparts/count.cpp
+++ b/src/flowparts/count.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Count::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/delay.cpp b/src/flowparts/delay.cpp
index ae85595..e9d02f6 100644
--- a/src/flowparts/delay.cpp
+++ b/src/flowparts/delay.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Delay::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/embed.cpp b/src/flowparts/embed.cpp
index 7e5f3a3..68357a6 100644
--- a/src/flowparts/embed.cpp
+++ b/src/flowparts/embed.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Embed::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/end.cpp b/src/flowparts/end.cpp
index 137dae0..6f27989 100644
--- a/src/flowparts/end.cpp
+++ b/src/flowparts/end.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* End::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/forloop.cpp b/src/flowparts/forloop.cpp
index 23f4da5..305ad0f 100644
--- a/src/flowparts/forloop.cpp
+++ b/src/flowparts/forloop.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* ForLoop::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/inputbutton.cpp b/src/flowparts/inputbutton.cpp
index d7c2a98..6ec6249 100644
--- a/src/flowparts/inputbutton.cpp
+++ b/src/flowparts/inputbutton.cpp
@@ -12,7 +12,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* InputButton::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/interrupt.cpp b/src/flowparts/interrupt.cpp
index 9325c33..6162949 100644
--- a/src/flowparts/interrupt.cpp
+++ b/src/flowparts/interrupt.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Interrupt::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/keypad.cpp b/src/flowparts/keypad.cpp
index 47e6f30..d1e99e4 100644
--- a/src/flowparts/keypad.cpp
+++ b/src/flowparts/keypad.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Keypad::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index 80273df..84c8217 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -20,7 +20,7 @@
 #include "viewcontainer.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 #include <tqaccel.h>
diff --git a/src/flowparts/pulse.cpp b/src/flowparts/pulse.cpp
index 77f9dd0..88e7098 100644
--- a/src/flowparts/pulse.cpp
+++ b/src/flowparts/pulse.cpp
@@ -12,7 +12,7 @@
 #include "flowcode.h"
 #include "pulse.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Pulse::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/readport.cpp b/src/flowparts/readport.cpp
index 4385c58..11d3cb8 100644
--- a/src/flowparts/readport.cpp
+++ b/src/flowparts/readport.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* ReadPort::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/repeat.cpp b/src/flowparts/repeat.cpp
index 3dda0ae..a4bdbfa 100644
--- a/src/flowparts/repeat.cpp
+++ b/src/flowparts/repeat.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Repeat::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/setpin.cpp b/src/flowparts/setpin.cpp
index be826da..d5c9985 100644
--- a/src/flowparts/setpin.cpp
+++ b/src/flowparts/setpin.cpp
@@ -16,7 +16,7 @@
 #include "flowcodedocument.h"
 #include "microsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* SetPin::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/sevenseg.cpp b/src/flowparts/sevenseg.cpp
index 90a4e7e..d74586e 100644
--- a/src/flowparts/sevenseg.cpp
+++ b/src/flowparts/sevenseg.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* SevenSeg::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/start.cpp b/src/flowparts/start.cpp
index b365d14..0d3da0c 100644
--- a/src/flowparts/start.cpp
+++ b/src/flowparts/start.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Start::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/sub.cpp b/src/flowparts/sub.cpp
index 6b02944..5be9f8e 100644
--- a/src/flowparts/sub.cpp
+++ b/src/flowparts/sub.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Sub::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/testpin.cpp b/src/flowparts/testpin.cpp
index 05f0a97..012c2a9 100644
--- a/src/flowparts/testpin.cpp
+++ b/src/flowparts/testpin.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* TestPin::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/unary.cpp b/src/flowparts/unary.cpp
index 077afc7..de39d84 100644
--- a/src/flowparts/unary.cpp
+++ b/src/flowparts/unary.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Unary::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/varassignment.cpp b/src/flowparts/varassignment.cpp
index d40af61..9ef2c0b 100644
--- a/src/flowparts/varassignment.cpp
+++ b/src/flowparts/varassignment.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* VarAssignment::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/varcomparison.cpp b/src/flowparts/varcomparison.cpp
index 30eff19..d76ad7c 100644
--- a/src/flowparts/varcomparison.cpp
+++ b/src/flowparts/varcomparison.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* VarComparison::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/while.cpp b/src/flowparts/while.cpp
index be2189d..ef8474f 100644
--- a/src/flowparts/while.cpp
+++ b/src/flowparts/while.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* While::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/writeport.cpp b/src/flowparts/writeport.cpp
index 9816f69..c76c349 100644
--- a/src/flowparts/writeport.cpp
+++ b/src/flowparts/writeport.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* WritePort::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
-- 
cgit v1.2.1