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

---
 kaddressbook/features/distributionlistngwidget.cpp | 4 ++--
 kaddressbook/features/distributionlistngwidget.h   | 2 +-
 kaddressbook/features/distributionlistwidget.cpp   | 2 +-
 kaddressbook/features/distributionlistwidget.h     | 2 +-
 kaddressbook/features/resourceselection.h          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kaddressbook/features')

diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 6dda79de6..471769616 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -31,9 +31,9 @@
 
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqevent.h>
 #include <tqguardedptr.h>
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index dc4b036d2..fdeb83864 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -27,7 +27,7 @@
 
 #include <kabc/addressee.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 #include <tqstringlist.h>
 
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index e77e3fc3b..73afa2ea5 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 59a5d88bd..1429aa7bc 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -26,7 +26,7 @@
 
 #include <config.h> // for TDEPIM_NEW_DISTRLISTS
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "extensionwidget.h"
 
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index c986c5fca..4c1a6df61 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -24,7 +24,7 @@
 #ifndef RESOURCESELECTION_H
 #define RESOURCESELECTION_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "extensionwidget.h"
 
-- 
cgit v1.2.1