Rename many classes and header files to avoid conflicts with KDE4

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()

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>

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>
 

adept/adept/extendablelist.h

@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
 #include <kglobalsettings.h>

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>

adept/adept/packagedetails.cpp

@@ -4,8 +4,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tqpushbutton.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 #include <tdefileitem.h>
 #include <tdefiledetailview.h>

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>

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"

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 {
 

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>

adept/batch/app.cpp

@@ -7,8 +7,8 @@
 #include <kpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>

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>

adept/installer/app.cpp

@@ -8,8 +8,8 @@
 #include <kpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>

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>

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()

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>

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>
 

adept/libadept/extendablelist.h

@@ -1,5 +1,5 @@
 // -*- C++ -*-
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
 #include <kglobalsettings.h>

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>

adept/libadept/packagedetails.cpp

@@ -4,8 +4,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tqpushbutton.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 #include <tdefileitem.h>
 #include <tdefiledetailview.h>

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>

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"

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 {
 

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>

adept/manager/app.cpp

@@ -6,8 +6,8 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>

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>

adept/notifier/app.cpp

@@ -13,8 +13,8 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kaboutapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kpassivepopup.h>
 #include <kiconloader.h>

adept/updater/app.cpp

@@ -7,8 +7,8 @@
 #include <kpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeparts/part.h>

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>