summaryrefslogtreecommitdiffstats
path: root/lib/widgets/propeditor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:57 -0600
commit5be945600e2d7776e74663f56c2a25a8f57d7891 (patch)
tree9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /lib/widgets/propeditor
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/widgets/propeditor')
-rw-r--r--lib/widgets/propeditor/pfontbutton.cpp2
-rw-r--r--lib/widgets/propeditor/pfontcombo.cpp2
-rw-r--r--lib/widgets/propeditor/propertyeditor.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index fda1322b..de850890 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -23,7 +23,7 @@
#include <tqpainter.h>
#include <tqpushbutton.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#ifndef PURE_QT
#include <klocale.h>
diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp
index 0675a6e0..cb8a80b2 100644
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@@ -20,7 +20,7 @@
#include "pfontcombo.h"
#ifndef PURE_QT
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
#else
#include <tqcombobox.h>
#endif
diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h
index 3e683a58..852d795a 100644
--- a/lib/widgets/propeditor/propertyeditor.h
+++ b/lib/widgets/propeditor/propertyeditor.h
@@ -21,7 +21,7 @@
#define PROPERTYEDITOR_H
#ifndef PURE_QT
-#include <klistview.h>
+#include <tdelistview.h>
#else
#include <tqlistview.h>
#define TDEListView TQListView