summaryrefslogtreecommitdiffstats
path: root/parts/appwizard
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 /parts/appwizard
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/appwizard')
-rw-r--r--parts/appwizard/appwizarddlg.cpp4
-rw-r--r--parts/appwizard/appwizarddlg.h2
-rw-r--r--parts/appwizard/appwizarddlgbase.ui4
-rw-r--r--parts/appwizard/appwizardpart.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 41e52a03..76ac124c 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -33,7 +33,7 @@
#include <tqtooltip.h>
#include <tqvalidator.h>
#include <tqtimer.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kiconview.h>
#include <tdeconfig.h>
#include <kdebug.h>
@@ -48,7 +48,7 @@
#include <tdefiledialog.h>
#include <tdefile.h>
#include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index 859b1524..cbd2836e 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -30,7 +30,7 @@ class ProfileSupport;
#include <klineedit.h>
#include <tqlabel.h>
#include <tqstringlist.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kiconview.h>
#include "kdevversioncontrol.h"
#include "kdevvcsintegrator.h"
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index a2303139..891c1c10 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -636,7 +636,7 @@
</forwards>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
- <include location="global" impldecl="in implementation">klistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
<include location="global" impldecl="in implementation">kiconview.h</include>
<include location="global" impldecl="in declaration">kurlrequester.h</include>
</includes>
@@ -655,7 +655,7 @@
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kiconview.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index bcc21127..6cec2631 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -22,7 +22,7 @@
#include <kdevcore.h>
#include <kgenericfactory.h>
#include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqmessagebox.h>
#include "importdlg.h"