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

---
 kpersonalizer/keyecandypage.cpp | 2 +-
 kpersonalizer/kospage.cpp       | 2 +-
 kpersonalizer/kpersonalizer.cpp | 2 +-
 kpersonalizer/kstylepage.cpp    | 2 +-
 kpersonalizer/kstylepagedlg.ui  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kpersonalizer')

diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 1aa8f422f..48c001175 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -31,7 +31,7 @@
 #include <dcopclient.h>
 #include <kipc.h>
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <krun.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 6b7590bd3..26964e0fa 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -42,7 +42,7 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name)
 	slotKDEDescription();
 	// Set the configfiles
 	cglobal = new TDEConfig("kdeglobals");
-	claunch = new TDEConfig("klaunchrc", false, false);
+	claunch = new TDEConfig("tdelaunchrc", false, false);
 	cwin = new TDEConfig("twinrc");
 	cdesktop = new TDEConfig("kdesktoprc");
 	ckcminput = new TDEConfig("kcminputrc");
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 1a3dcc40e..dfd7319e9 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -31,7 +31,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <krun.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index a44084608..09a993916 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kipc.h>
 #include <ksimpleconfig.h>
 #include <dcopclient.h>
diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui
index 9a11887d3..b9b6b7ac8 100644
--- a/kpersonalizer/kstylepagedlg.ui
+++ b/kpersonalizer/kstylepagedlg.ui
@@ -120,7 +120,7 @@
     </image>
 </images>
 <includes>
-    <include location="global" impldecl="in declaration">klistview.h</include>
+    <include location="global" impldecl="in declaration">tdelistview.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-- 
cgit v1.2.1