Rename many classes and header files to avoid conflicts with KDE4

plugin/smb4k_konqplugin.cpp

@@ -42,9 +42,9 @@
 #include <kmessagebox.h>
 #include <kdialogbase.h>
 #include <kcombobox.h>
-#include <ktoolbarbutton.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdetoolbarbutton.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <tdeconfigdialog.h>
 
 // plugin specific includes

plugin/smb4k_konqplugin.h

@@ -30,11 +30,11 @@
 #include <tqwidget.h>
 #include <tqvbox.h>
 #include <tqwidgetstack.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
 #include <tdehtml_part.h>
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/dockmainwindow.h>
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
@@ -88,7 +88,7 @@ private:
 
 protected:
      /**
-      * The main plugin widget. Contains a klistview and a ktoolbox objects
+      * The main plugin widget. Contains a tdelistview and a tdetoolbox objects
       */
      smb4kWidget *widget;
 

smb4k/browser/smb4knetworkbrowser.h

@@ -31,7 +31,7 @@
 #endif
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 // forward declarations
 class Smb4KNetworkBrowserItem;

smb4k/browser/smb4knetworkbrowser_part.cpp

@@ -29,10 +29,10 @@
 
 // KDE includes
 #include <kaboutdata.h>
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeversion.h>

smb4k/browser/smb4knetworkbrowser_part.h

@@ -32,7 +32,7 @@
 #endif
 
 // KDE includes
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
 

smb4k/browser/smb4knetworkbrowseritem.h

@@ -34,7 +34,7 @@
 #include <tqpixmap.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 // application specific includes
 #include "../core/smb4knetworkitems.h"

smb4k/configdlg/smb4ksambaoptions.cpp

@@ -39,7 +39,7 @@
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kuser.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 // System includes

smb4k/configdlg/smb4tdeconfigdialog.cpp

@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>

smb4k/dialogs/smb4kbookmarkeditor.cpp

@@ -29,14 +29,14 @@
 
 // KDE includes
 #include <klocale.h>
-#include <kaction.h>
-#include <kactionclasses.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
+#include <tdeaccel.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // application specific includes
 #include "smb4kbookmarkeditor.h"
@@ -216,7 +216,7 @@ void Smb4KBookmarkEditor::slotCancelClicked()
 
   for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
   {
-    m_collection->kaccel()->remove( (*it)->name() );
+    m_collection->tdeaccel()->remove( (*it)->name() );
     m_collection->remove( *it );
   }
 }

smb4k/dialogs/smb4kbookmarkeditor.h

@@ -32,8 +32,8 @@
 
 // KDE includes
 #include <kdialogbase.h>
-#include <klistview.h>
-#include <kactioncollection.h>
+#include <tdelistview.h>
+#include <tdeactioncollection.h>
 
 /**
  * This is the bookmark editor of Smb4K.

smb4k/dialogs/smb4kpreviewdialog.cpp

@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 // application specific includes
 #include "smb4kpreviewdialog.h"

smb4k/dialogs/smb4kpreviewdialog.h

@@ -36,7 +36,7 @@
 // KDE includes
 #include <kdialogbase.h>
 #include <kiconview.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kcombobox.h>
 
 // application specific includes

smb4k/iconview/smb4ksharesiconview_part.cpp

@@ -30,12 +30,12 @@
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 // application specific includes
 #include "smb4ksharesiconview_part.h"

smb4k/listview/smb4kshareslistview.h

@@ -31,7 +31,7 @@
 #endif
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurldrag.h>
 
 // forward declarations

smb4k/listview/smb4kshareslistview_part.cpp

@@ -33,12 +33,12 @@
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 // application specific includes
 #include "smb4kshareslistview_part.h"

smb4k/listview/smb4kshareslistviewitem.h

@@ -35,7 +35,7 @@
 #include <tqpalette.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 // application specific includes

smb4k/searchdlg/smb4ksearchdialog.h

@@ -35,8 +35,8 @@
 #include <tqstring.h>
 
 // KDE includes
-#include <klistview.h>
-#include <ktoolbar.h>
+#include <tdelistview.h>
+#include <tdetoolbar.h>
 
 // forward declarations
 class Smb4KHostItem;

smb4k/searchdlg/smb4ksearchdialogitem.h

@@ -33,7 +33,7 @@
 #endif
 
 // TQt includes
-#include <klistview.h>
+#include <tdelistview.h>
 
 // application specific includes
 #include "../core/smb4knetworkitems.h"

smb4k/smb4k.cpp

@@ -34,11 +34,11 @@
 #include <kmessagebox.h>
 #include <kuniqueapplication.h>
 #include <kiconloader.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kprogress.h>
 #include <tdeconfigdialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 
 // application specific includes
 #include "smb4k.h"

smb4k/smb4k.h

@@ -31,7 +31,7 @@
 #endif
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/dockmainwindow.h>
 
 // Forward declarations

smb4k/smb4ksystemtray.cpp

@@ -33,8 +33,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
 #include <tdeconfigdialog.h>

smb4k/smb4ksystemtray.h

@@ -32,7 +32,7 @@
 
 // KDE includes
 #include <ksystemtray.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 class Smb4KSystemTray : public KSystemTray
 {