summaryrefslogtreecommitdiffstats
path: root/src/profileengine/editor
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 /src/profileengine/editor
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/profileengine/editor')
-rw-r--r--src/profileengine/editor/profileeditor.cpp4
-rw-r--r--src/profileengine/editor/profileeditorbase.ui14
2 files changed, 9 insertions, 9 deletions
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index c10aca8c..bb887f39 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -25,8 +25,8 @@
#include <kdebug.h>
#include <kpushbutton.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
#include <kcombobox.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui
index fc6b99f2..aa5ad8ee 100644
--- a/src/profileengine/editor/profileeditorbase.ui
+++ b/src/profileengine/editor/profileeditorbase.ui
@@ -664,21 +664,21 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistbox.h</includehint>
- <includehint>klistbox.h</includehint>
- <includehint>klistview.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
+ <includehint>tdelistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>