From 238c91031c2376698cd407c2fecdffa916230d3c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:09:06 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 adept/adept/acqprogress.cpp        | 4 ++--
 adept/adept/acqprogress.h          | 2 +-
 adept/adept/dpkgpm-gui.cpp         | 2 +-
 adept/adept/extendablelist.h       | 2 +-
 adept/adept/lister.cpp             | 2 +-
 adept/adept/packagedetails.cpp     | 4 ++--
 adept/adept/packagedetailsui.ui    | 4 ++--
 adept/adept/sourceseditor.cpp      | 2 +-
 adept/adept/sourceseditor.h        | 2 +-
 adept/adept/sourceseditorui.ui     | 2 +-
 adept/batch/app.cpp                | 4 ++--
 adept/batch/app.h                  | 4 ++--
 adept/installer/app.cpp            | 4 ++--
 adept/installer/app.h              | 4 ++--
 adept/libadept/acqprogress.cpp     | 4 ++--
 adept/libadept/acqprogress.h       | 2 +-
 adept/libadept/dpkgpm-gui.cpp      | 2 +-
 adept/libadept/extendablelist.h    | 2 +-
 adept/libadept/lister.cpp          | 2 +-
 adept/libadept/packagedetails.cpp  | 4 ++--
 adept/libadept/packagedetailsui.ui | 4 ++--
 adept/libadept/sourceseditor.cpp   | 2 +-
 adept/libadept/sourceseditor.h     | 2 +-
 adept/libadept/sourceseditorui.ui  | 2 +-
 adept/manager/app.cpp              | 4 ++--
 adept/manager/app.h                | 4 ++--
 adept/notifier/app.cpp             | 4 ++--
 adept/updater/app.cpp              | 4 ++--
 adept/updater/app.h                | 4 ++--
 29 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/adept/adept/acqprogress.cpp b/adept/adept/acqprogress.cpp
index 3f42ad6..d17f702 100644
--- a/adept/adept/acqprogress.cpp
+++ b/adept/adept/acqprogress.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 #include <tqprogressbar.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
@@ -137,7 +137,7 @@ void AcqStatus::clear()
 {
     TDEListView::clear();
     m_idOffset += m_items.size();
-    m_items.clear(); // got deleted by klistview already
+    m_items.clear(); // got deleted by tdelistview already
 }
 
 void AcqStatus::Start()
diff --git a/adept/adept/acqprogress.h b/adept/adept/acqprogress.h
index 3e67668..f75d3bd 100644
--- a/adept/adept/acqprogress.h
+++ b/adept/adept/acqprogress.h
@@ -8,7 +8,7 @@
 
 #include <klocale.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kprogress.h>
 
 #include <vector>
diff --git a/adept/adept/dpkgpm-gui.cpp b/adept/adept/dpkgpm-gui.cpp
index 300c63b..525ccf2 100644
--- a/adept/adept/dpkgpm-gui.cpp
+++ b/adept/adept/dpkgpm-gui.cpp
@@ -8,7 +8,7 @@
 
 #include <tqstrlist.h>
 #include <kapplication.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
 
diff --git a/adept/adept/extendablelist.h b/adept/adept/extendablelist.h
index fb78ebb..acaecb3 100644
--- a/adept/adept/extendablelist.h
+++ b/adept/adept/extendablelist.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
 #include <kglobalsettings.h>
diff --git a/adept/adept/lister.cpp b/adept/adept/lister.cpp
index 0b618af..5dab0c2 100644
--- a/adept/adept/lister.cpp
+++ b/adept/adept/lister.cpp
@@ -8,7 +8,7 @@
 #include <tqpixmap.h>
 #include <tqheader.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/adept/adept/packagedetails.cpp b/adept/adept/packagedetails.cpp
index 7009c8a..119442b 100644
--- a/adept/adept/packagedetails.cpp
+++ b/adept/adept/packagedetails.cpp
@@ -4,8 +4,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tqpushbutton.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include <tdefileitem.h>
 #include <tdefiledetailview.h>
diff --git a/adept/adept/packagedetailsui.ui b/adept/adept/packagedetailsui.ui
index 3cdc418..eaaae35 100644
--- a/adept/adept/packagedetailsui.ui
+++ b/adept/adept/packagedetailsui.ui
@@ -459,7 +459,7 @@
     </customwidget>
     <customwidget>
         <class>TDEToolBar</class>
-        <header location="global">ktoolbar.h</header>
+        <header location="global">tdetoolbar.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
@@ -497,7 +497,7 @@
 </images>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>ktoolbar.h</includehint>
+    <includehint>tdetoolbar.h</includehint>
     <includehint>adept/packageinfo.h</includehint>
     <includehint>adept/lister.h</includehint>
     <includehint>tdefiledetailview.h</includehint>
diff --git a/adept/adept/sourceseditor.cpp b/adept/adept/sourceseditor.cpp
index 345c58d..ef2dcd0 100644
--- a/adept/adept/sourceseditor.cpp
+++ b/adept/adept/sourceseditor.cpp
@@ -6,7 +6,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 #include "sourceseditor.h"
diff --git a/adept/adept/sourceseditor.h b/adept/adept/sourceseditor.h
index 37ae0b0..f3d4912 100644
--- a/adept/adept/sourceseditor.h
+++ b/adept/adept/sourceseditor.h
@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <apt-front/sources.h>
 #include <adept/sourceseditorui.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace adept {
 
diff --git a/adept/adept/sourceseditorui.ui b/adept/adept/sourceseditorui.ui
index 92f0a67..1283684 100644
--- a/adept/adept/sourceseditorui.ui
+++ b/adept/adept/sourceseditorui.ui
@@ -168,6 +168,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/adept/batch/app.cpp b/adept/batch/app.cpp
index 2577b9c..cea33f7 100644
--- a/adept/batch/app.cpp
+++ b/adept/batch/app.cpp
@@ -7,8 +7,8 @@
 #include <kpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>
diff --git a/adept/batch/app.h b/adept/batch/app.h
index 7aa69d4..9ce5ea3 100644
--- a/adept/batch/app.h
+++ b/adept/batch/app.h
@@ -2,9 +2,9 @@
 #ifndef APP_H
 #define APP_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/part.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kcmdlineargs.h>
 #include <apt-front/cache/observer.h>
 #include <apt-front/cache/component/state.h>
diff --git a/adept/installer/app.cpp b/adept/installer/app.cpp
index 0cf9f91..5598832 100644
--- a/adept/installer/app.cpp
+++ b/adept/installer/app.cpp
@@ -8,8 +8,8 @@
 #include <kpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>
diff --git a/adept/installer/app.h b/adept/installer/app.h
index e20640c..c7e1cf0 100644
--- a/adept/installer/app.h
+++ b/adept/installer/app.h
@@ -2,9 +2,9 @@
 #ifndef TESTUI_APP_H
 #define TESTUI_APP_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/part.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <apt-front/cache/observer.h>
 #include <apt-front/cache/component/state.h>
 #include <apt-front/cache/component/history.h>
diff --git a/adept/libadept/acqprogress.cpp b/adept/libadept/acqprogress.cpp
index 3f42ad6..d17f702 100644
--- a/adept/libadept/acqprogress.cpp
+++ b/adept/libadept/acqprogress.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 #include <tqprogressbar.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
@@ -137,7 +137,7 @@ void AcqStatus::clear()
 {
     TDEListView::clear();
     m_idOffset += m_items.size();
-    m_items.clear(); // got deleted by klistview already
+    m_items.clear(); // got deleted by tdelistview already
 }
 
 void AcqStatus::Start()
diff --git a/adept/libadept/acqprogress.h b/adept/libadept/acqprogress.h
index 3e67668..f75d3bd 100644
--- a/adept/libadept/acqprogress.h
+++ b/adept/libadept/acqprogress.h
@@ -8,7 +8,7 @@
 
 #include <klocale.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kprogress.h>
 
 #include <vector>
diff --git a/adept/libadept/dpkgpm-gui.cpp b/adept/libadept/dpkgpm-gui.cpp
index 300c63b..525ccf2 100644
--- a/adept/libadept/dpkgpm-gui.cpp
+++ b/adept/libadept/dpkgpm-gui.cpp
@@ -8,7 +8,7 @@
 
 #include <tqstrlist.h>
 #include <kapplication.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
 
diff --git a/adept/libadept/extendablelist.h b/adept/libadept/extendablelist.h
index c36d5fb..ddaa7b1 100644
--- a/adept/libadept/extendablelist.h
+++ b/adept/libadept/extendablelist.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
 #include <kglobalsettings.h>
diff --git a/adept/libadept/lister.cpp b/adept/libadept/lister.cpp
index 32283ad..668c523 100644
--- a/adept/libadept/lister.cpp
+++ b/adept/libadept/lister.cpp
@@ -6,7 +6,7 @@
 #include <tqthread.h>
 #include <tqtextbrowser.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/adept/libadept/packagedetails.cpp b/adept/libadept/packagedetails.cpp
index 0092415..34bc057 100644
--- a/adept/libadept/packagedetails.cpp
+++ b/adept/libadept/packagedetails.cpp
@@ -4,8 +4,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tqpushbutton.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include <tdefileitem.h>
 #include <tdefiledetailview.h>
diff --git a/adept/libadept/packagedetailsui.ui b/adept/libadept/packagedetailsui.ui
index 5a3249b..b3ecb87 100644
--- a/adept/libadept/packagedetailsui.ui
+++ b/adept/libadept/packagedetailsui.ui
@@ -417,7 +417,7 @@
     </customwidget>
     <customwidget>
         <class>TDEToolBar</class>
-        <header location="global">ktoolbar.h</header>
+        <header location="global">tdetoolbar.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
@@ -455,7 +455,7 @@
 </images>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>ktoolbar.h</includehint>
+    <includehint>tdetoolbar.h</includehint>
     <includehint>adept/packageinfo.h</includehint>
     <includehint>adept/lister.h</includehint>
     <includehint>tdefiledetailview.h</includehint>
diff --git a/adept/libadept/sourceseditor.cpp b/adept/libadept/sourceseditor.cpp
index 1423e4b..63acb93 100644
--- a/adept/libadept/sourceseditor.cpp
+++ b/adept/libadept/sourceseditor.cpp
@@ -6,7 +6,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 
 #include "sourceseditor.h"
diff --git a/adept/libadept/sourceseditor.h b/adept/libadept/sourceseditor.h
index 284074a..196cab5 100644
--- a/adept/libadept/sourceseditor.h
+++ b/adept/libadept/sourceseditor.h
@@ -5,7 +5,7 @@
 
 #include <apt-front/sources.h>
 #include <adept/sourceseditorui.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace adept {
 
diff --git a/adept/libadept/sourceseditorui.ui b/adept/libadept/sourceseditorui.ui
index 92f0a67..1283684 100644
--- a/adept/libadept/sourceseditorui.ui
+++ b/adept/libadept/sourceseditorui.ui
@@ -168,6 +168,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/adept/manager/app.cpp b/adept/manager/app.cpp
index e1e2254..2847cd3 100644
--- a/adept/manager/app.cpp
+++ b/adept/manager/app.cpp
@@ -6,8 +6,8 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>
diff --git a/adept/manager/app.h b/adept/manager/app.h
index 866b094..a3d5efa 100644
--- a/adept/manager/app.h
+++ b/adept/manager/app.h
@@ -2,9 +2,9 @@
 #ifndef TESTUI_APP_H
 #define TESTUI_APP_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/part.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <apt-front/cache/observer.h>
 #include <apt-front/cache/component/state.h>
 #include <apt-front/cache/component/history.h>
diff --git a/adept/notifier/app.cpp b/adept/notifier/app.cpp
index 81cc7fd..5fe5fc6 100644
--- a/adept/notifier/app.cpp
+++ b/adept/notifier/app.cpp
@@ -13,8 +13,8 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kaboutapplication.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kpassivepopup.h>
 #include <kiconloader.h>
diff --git a/adept/updater/app.cpp b/adept/updater/app.cpp
index 58abdb0..9abeb8d 100644
--- a/adept/updater/app.cpp
+++ b/adept/updater/app.cpp
@@ -7,8 +7,8 @@
 #include <kpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>
diff --git a/adept/updater/app.h b/adept/updater/app.h
index 82696b6..e9741a9 100644
--- a/adept/updater/app.h
+++ b/adept/updater/app.h
@@ -2,9 +2,9 @@
 #ifndef TESTUI_APP_H
 #define TESTUI_APP_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/part.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <apt-front/cache/observer.h>
 #include <apt-front/cache/component/state.h>
 #include <apt-front/cache/component/history.h>