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

---
 tderesources/lib/folderconfig.cpp   | 2 +-
 tderesources/lib/folderlistview.cpp | 4 ++--
 tderesources/lib/folderlistview.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tderesources/lib')

diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp
index 20fa6fa1b..81c65af48 100644
--- a/tderesources/lib/folderconfig.cpp
+++ b/tderesources/lib/folderconfig.cpp
@@ -27,7 +27,7 @@
 #include "groupwaredataadaptor.h"
 #include "folderlistview.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp
index 68995aef2..be719d95a 100644
--- a/tderesources/lib/folderlistview.cpp
+++ b/tderesources/lib/folderlistview.cpp
@@ -24,10 +24,10 @@
 #include "folderlistview.h"
 #include "folderlister.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include <tqlistview.h>
diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h
index f4837ecf6..ce6243df0 100644
--- a/tderesources/lib/folderlistview.h
+++ b/tderesources/lib/folderlistview.h
@@ -24,7 +24,7 @@
 #ifndef FOLDERLISTVIEW_H
 #define FOLDERLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "folderlister.h"
 
 class FolderListItem;
-- 
cgit v1.2.1