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

---
 kspread/dialogs/SheetSelectWidget.ui    | 4 ++--
 kspread/dialogs/kspread_dlg_database.cc | 2 +-
 kspread/dialogs/kspread_dlg_styles.cc   | 2 +-
 kspread/dialogs/link.cc                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kspread/dialogs')

diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui
index 9e6dfc84..c4f4db58 100644
--- a/kspread/dialogs/SheetSelectWidget.ui
+++ b/kspread/dialogs/SheetSelectWidget.ui
@@ -260,11 +260,11 @@ It is even possible to print a sheet more than once. Just insert the desired she
     <includehint>kpushbutton.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>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 946ee3c5..5f955074 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -28,7 +28,7 @@
 #include "kspread_view.h"
 
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knumvalidator.h>
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 2821f5e2..fdb8d6fe 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -24,7 +24,7 @@
 
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include "kspread_canvas.h"
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index 9523cf83..eb1dfe87 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -35,7 +35,7 @@
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kurlrequester.h>
 
 using namespace KSpread;
-- 
cgit v1.2.1