summaryrefslogtreecommitdiffstats
path: root/keduca/keducabuilder
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
commitfccf6d244a4d60c3138afa81266e22ac65adddbc (patch)
treece62ccdaca3fffebeb33ad213dc5cea82ceff580 /keduca/keducabuilder
parent273ccce287bccee117bbfff8ca3386d613aec467 (diff)
downloadtdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.tar.gz
tdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'keduca/keducabuilder')
-rw-r--r--keduca/keducabuilder/kcontroladdedit.cpp2
-rw-r--r--keduca/keducabuilder/kcontroladdeditbase.ui2
-rw-r--r--keduca/keducabuilder/keducabuilder.h6
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialog.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index 832c59ac..1646e249 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -24,7 +24,7 @@
#include <kurlrequester.h>
#include <kcombobox.h>
#include <knuminput.h>
-#include <klistview.h>
+#include <tdelistview.h>
//#include <.h>
// TQt includes
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index e0902db1..1eb9e877 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -875,6 +875,6 @@
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h
index d91efb79..11841ab8 100644
--- a/keduca/keducabuilder/keducabuilder.h
+++ b/keduca/keducabuilder/keducabuilder.h
@@ -20,10 +20,10 @@
#include "../libkeduca/fileread.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
-#include <klistbox.h>
-#include <kaction.h>
+#include <tdelistbox.h>
+#include <tdeaction.h>
#include <tqtextview.h>
#include <tqsplitter.h>
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 2c69c146..34d6a82c 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -46,7 +46,7 @@ KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const c
this, TQT_SLOT( slotChoiceChanged(int) ) );
}
-/** based on code in kaction.cpp
+/** based on code in tdeaction.cpp
*/
void KEducaEditorStartDialog::buildRecentFilesList()
{