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

---
 tdefilereplace/ChangeLog                | 2 +-
 tdefilereplace/report.cpp               | 2 +-
 tdefilereplace/tdefilereplacelib.cpp    | 2 +-
 tdefilereplace/tdefilereplacepart.cpp   | 4 ++--
 tdefilereplace/tdefilereplaceview.cpp   | 4 ++--
 tdefilereplace/tdefilereplaceviewwdg.ui | 8 ++++----
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tdefilereplace')

diff --git a/tdefilereplace/ChangeLog b/tdefilereplace/ChangeLog
index b94d65f5..6f5d74f7 100644
--- a/tdefilereplace/ChangeLog
+++ b/tdefilereplace/ChangeLog
@@ -207,5 +207,5 @@
   *  The file containing the results of the operations  is now a XHTML file.
   *  Two new files UI added: now KOptionDlg inherits from KOptionDlgS and KAddstringDlg inherits  
      from KAddstringDlgS.
-  *  The klistviewstring.(h,cpp) were removed.
+  *  The tdelistviewstring.(h,cpp) were removed.
   *  A lot of clean up has been made in all files.
diff --git a/tdefilereplace/report.cpp b/tdefilereplace/report.cpp
index 6d485eba..48e64031 100644
--- a/tdefilereplace/report.cpp
+++ b/tdefilereplace/report.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 // KDE
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kuser.h>
 
diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp
index 0d2246a1..d638272b 100644
--- a/tdefilereplace/tdefilereplacelib.cpp
+++ b/tdefilereplace/tdefilereplacelib.cpp
@@ -28,7 +28,7 @@
 //KDE
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 //needed for malloc/free
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index 39126044..36f41cb8 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -24,7 +24,7 @@
 #include <dcopref.h>
 #include <kaboutapplication.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbugreport.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kiconeffect.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kuser.h>
 #include <kcombobox.h>
 #include <kguiitem.h>
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index ffefd154..84ec2744 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -21,10 +21,10 @@
 #include <tqfileinfo.h>
 
 // KDE
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
 #include <kapplication.h>
diff --git a/tdefilereplace/tdefilereplaceviewwdg.ui b/tdefilereplace/tdefilereplaceviewwdg.ui
index 4bd2ee37..e823993b 100644
--- a/tdefilereplace/tdefilereplaceviewwdg.ui
+++ b/tdefilereplace/tdefilereplaceviewwdg.ui
@@ -544,10 +544,10 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kled.h</includehint>
     <includehint>kled.h</includehint>
     <includehint>kled.h</includehint>
-- 
cgit v1.2.1