summaryrefslogtreecommitdiffstats
path: root/lib/widgets/propeditor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:22 -0600
commitbd3c603465110b74a0ddcee72e6f020a78d44e59 (patch)
treef556266a927227ba3f30e337c4ccf06facc55ea3 /lib/widgets/propeditor
parentef5399ae5a952065c7a0679d4a875d154c972945 (diff)
downloadtdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz
tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/widgets/propeditor')
-rw-r--r--lib/widgets/propeditor/pcheckbox.cpp2
-rw-r--r--lib/widgets/propeditor/pfontbutton.cpp2
-rw-r--r--lib/widgets/propeditor/ppixmapedit.cpp2
-rw-r--r--lib/widgets/propeditor/propertyeditor.cpp2
-rw-r--r--lib/widgets/propeditor/propertymachinefactory.cpp2
-rw-r--r--lib/widgets/propeditor/psymbolcombo.cpp2
-rw-r--r--lib/widgets/propeditor/pyesnobutton.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp
index f3bd2673..6e9c06b7 100644
--- a/lib/widgets/propeditor/pcheckbox.cpp
+++ b/lib/widgets/propeditor/pcheckbox.cpp
@@ -24,7 +24,7 @@
#include <tqpainter.h>
#ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
#else
#include "compat_tools.h"
#endif
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index de850890..8932c4ae 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -26,7 +26,7 @@
#include <tdefontrequester.h>
#ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
#else
#include "compat_tools.h"
#endif
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index e7980d66..452b9637 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -27,7 +27,7 @@
#include <tqcursor.h>
#ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
#else
#include "compat_tools.h"
#endif
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index 1bf3adc9..e9bd4786 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -20,7 +20,7 @@
#include "propertyeditor.h"
#ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
#else
diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp
index e8390e18..882964bc 100644
--- a/lib/widgets/propeditor/propertymachinefactory.cpp
+++ b/lib/widgets/propeditor/propertymachinefactory.cpp
@@ -20,7 +20,7 @@
#include "propertymachinefactory.h"
#ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
#else
#define i18n TQObject::tr
#endif
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index f4f947f5..ee91ea48 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -25,7 +25,7 @@
#ifndef PURE_QT
#include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <tqdialog.h>
diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp
index 308570be..dae82868 100644
--- a/lib/widgets/propeditor/pyesnobutton.cpp
+++ b/lib/widgets/propeditor/pyesnobutton.cpp
@@ -24,7 +24,7 @@
#include <tqpushbutton.h>
#ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
#else
#include "compat_tools.h"
#endif