From fccf6d244a4d60c3138afa81266e22ac65adddbc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:21 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp   | 2 +-
 kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui   | 4 ++--
 kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp          | 2 +-
 kvoctrain/kvoctrain/kva_init.cpp                        | 2 +-
 kvoctrain/kvoctrain/kva_io.cpp                          | 2 +-
 kvoctrain/kvoctrain/kvoctrain.h                         | 4 ++--
 kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kvoctrain')

diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index e8e25332..6cdcbb54 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
 #include <kcolorbutton.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kcombobox.h>
 
 #include "kvoctrainprefs.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index fb8c4bf9..1891c80d 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -522,8 +522,8 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index e15f8aef..457daa7b 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <twinmodule.h>
 
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index b2e90a86..389ced39 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -33,7 +33,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 9cf65272..b3c2fddf 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -30,7 +30,7 @@
 #include <tdefiledialog.h>
 #include <kcombobox.h>
 #include <kprogress.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index f6296b5e..df9ae70b 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -36,8 +36,8 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <krandomsequence.h>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index ea7e98ff..fa4fc59a 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -25,7 +25,7 @@
 
 #include "StatistikPage.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kdebug.h>
 
-- 
cgit v1.2.1