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

---
 kpackage/debAptInterface.cpp  | 2 +-
 kpackage/debAptInterface.h    | 2 +-
 kpackage/findf.h              | 2 +-
 kpackage/kpackage.cpp         | 4 ++--
 kpackage/kpackage.h           | 2 +-
 kpackage/kplview.h            | 2 +-
 kpackage/managementWidget.cpp | 6 +++---
 kpackage/managementWidget.h   | 6 +++---
 kpackage/packageDisplay.h     | 4 ++--
 kpackage/pkgOptions.cpp       | 2 +-
 kpackage/utils.h              | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'kpackage')

diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index c35013a..b673b4f 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include "klocale.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 
diff --git a/kpackage/debAptInterface.h b/kpackage/debAptInterface.h
index 933622b..af5d7d1 100644
--- a/kpackage/debAptInterface.h
+++ b/kpackage/debAptInterface.h
@@ -29,7 +29,7 @@
 
 #include "../config.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "debInterface.h"
 
diff --git a/kpackage/findf.h b/kpackage/findf.h
index c5100f7..e2aad23 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -46,7 +46,7 @@
 // KDE headers
 #include <kapplication.h>
 #include <kmenubar.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 
 class FindF : public KDialogBase
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 37e7944..71db454 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -41,8 +41,8 @@
 #include <kprogress.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kglobal.h>
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index 216ad22..dfdcc93 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -37,7 +37,7 @@
 
 // KDE headers
 #include <kurl.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kpPty.h>
 
 class KFileDialog;
diff --git a/kpackage/kplview.h b/kpackage/kplview.h
index 239e743..73f5823 100644
--- a/kpackage/kplview.h
+++ b/kpackage/kplview.h
@@ -39,7 +39,7 @@
 #include <tqlayout.h>
 
 // KDE headers
-#include "klistview.h"
+#include "tdelistview.h"
 
 // ksetup headers
 #include "packageInfo.h"
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 958b901..8856276 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -34,10 +34,10 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistviewsearchline.h>
-#include <kaction.h>
+#include <tdelistviewsearchline.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 
 // kpackage.headers
diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h
index f681fc0..5fbe49b 100644
--- a/kpackage/managementWidget.h
+++ b/kpackage/managementWidget.h
@@ -53,9 +53,9 @@
 #include <tqhbox.h>
 
 // KDE headers
-#include <kaction.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdeaction.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 
 // ksetup headers
 #include "packageInfo.h"
diff --git a/kpackage/packageDisplay.h b/kpackage/packageDisplay.h
index 091e031..5a1faf4 100644
--- a/kpackage/packageDisplay.h
+++ b/kpackage/packageDisplay.h
@@ -46,8 +46,8 @@
 #include <tqtabbar.h>
 #include <tqtabwidget.h>
 #include <tqvbox.h>
-#include <kpopupmenu.h>  
-#include <klistview.h>
+#include <tdepopupmenu.h>  
+#include <tdelistview.h>
 
 class packagePropertiesWidget;
 class packageInfo;
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index d7c3fc1..b17d9f5 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kseparator.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
diff --git a/kpackage/utils.h b/kpackage/utils.h
index 4608965..5501f91 100644
--- a/kpackage/utils.h
+++ b/kpackage/utils.h
@@ -29,7 +29,7 @@
 
 #include "../config.h"
 #include <string.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KpTreeListItem;
 
-- 
cgit v1.2.3