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

---
 src/svnfrontend/blamedisplay.ui             |  2 +-
 src/svnfrontend/blamedisplay_impl.cpp       |  4 ++--
 src/svnfrontend/filelistviewitem.h          |  2 +-
 src/svnfrontend/fronthelpers/propertyitem.h |  2 +-
 src/svnfrontend/fronthelpers/propertylist.h |  2 +-
 src/svnfrontend/graphtree/revisiontree.cpp  |  2 +-
 src/svnfrontend/opencontextmenu.h           |  2 +-
 src/svnfrontend/svnactions.cpp              |  2 +-
 src/svnfrontend/svnlogdlg.ui                |  4 ++--
 src/svnfrontend/svnlogdlgimp.cpp            |  2 +-
 src/svnfrontend/tdesvnfilelist.cpp          |  4 ++--
 src/svnfrontend/tdesvnfilelist.h            |  2 +-
 src/tdesvn.cpp                              | 18 +++++++++---------
 src/tdesvn.h                                |  2 +-
 src/tdesvn_part.cpp                         |  2 +-
 src/tdesvnview.cpp                          |  4 ++--
 16 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui
index 344d081..0f3a136 100644
--- a/src/svnfrontend/blamedisplay.ui
+++ b/src/svnfrontend/blamedisplay.ui
@@ -106,6 +106,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index e542b9d..0c6fc69 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -25,7 +25,7 @@
 #include "widgetblockstack.h"
 #include "encodingselector_impl.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
 #include <klocale.h>
@@ -35,7 +35,7 @@
 #include <kdialogbase.h>
 #include <kapp.h>
 #include <ktextbrowser.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include <tqpixmap.h>
 #include <tqpainter.h>
diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h
index 525fc93..6886511 100644
--- a/src/svnfrontend/filelistviewitem.h
+++ b/src/svnfrontend/filelistviewitem.h
@@ -21,7 +21,7 @@
 #define FILELISTVIEWITEM_H
 
 #include "svnitem.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdatetime.h>
 #include <tqptrlist.h>
 #include "svnqttypes.hpp"
diff --git a/src/svnfrontend/fronthelpers/propertyitem.h b/src/svnfrontend/fronthelpers/propertyitem.h
index 8a1d8c2..3afe4b6 100644
--- a/src/svnfrontend/fronthelpers/propertyitem.h
+++ b/src/svnfrontend/fronthelpers/propertyitem.h
@@ -1,7 +1,7 @@
 #ifndef _PROPERTYITEM_H
 #define _PROPERTYITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class PropertiesDlg;
 class Propertylist;
diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h
index 1d39a30..71c72e0 100644
--- a/src/svnfrontend/fronthelpers/propertylist.h
+++ b/src/svnfrontend/fronthelpers/propertylist.h
@@ -20,7 +20,7 @@
 #ifndef PROPERTYLIST_H
 #define PROPERTYLIST_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "svnqttypes.hpp"
 
 /**
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index 8392566..da7cf59 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -34,7 +34,7 @@
 #include <kprogress.h>
 #include <klocale.h>
 #include <kapp.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
 
diff --git a/src/svnfrontend/opencontextmenu.h b/src/svnfrontend/opencontextmenu.h
index 5d4c707..d0b32af 100644
--- a/src/svnfrontend/opencontextmenu.h
+++ b/src/svnfrontend/opencontextmenu.h
@@ -21,7 +21,7 @@
 #define OPENCONTEXTMENU_H
 
 #include <ktrader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <tqpopupmenu.h>
 #include <tqmap.h>
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index ad61ee5..06a57e4 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -68,7 +68,7 @@
 #include <tdeio/job.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <ktrader.h>
diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui
index 15f532d..9f29038 100644
--- a/src/svnfrontend/svnlogdlg.ui
+++ b/src/svnfrontend/svnlogdlg.ui
@@ -470,9 +470,9 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>revisionbuttonimpl.h</includehint>
     <includehint>revisionbuttonimpl.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextbrowser.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 3434e46..e7ce9d8 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -24,7 +24,7 @@
 #include "svnactions.h"
 #include "revisionbuttonimpl.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ktextbrowser.h>
 #include <kpushbutton.h>
 #include <kglobal.h>
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 2dd3368..6251385 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -45,8 +45,8 @@
 #include <kiconloader.h>
 #include <kdirwatch.h>
 #include <klocale.h>
-#include <kactioncollection.h>
-#include <kshortcut.h>
+#include <tdeactioncollection.h>
+#include <tdeshortcut.h>
 #include <kmessagebox.h>
 #include <kdirselectdialog.h>
 #include <klineedit.h>
diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h
index 53750ec..85edf6e 100644
--- a/src/svnfrontend/tdesvnfilelist.h
+++ b/src/svnfrontend/tdesvnfilelist.h
@@ -25,7 +25,7 @@
 #include "status.hpp"
 #include "client.hpp"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <ktrader.h>
 #include <tqmap.h>
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index d385a6b..1b90e32 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -43,11 +43,11 @@
 #include <kurlrequesterdlg.h>
 #include <khelpmenu.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
-#include <kactionclasses.h>
+#include <tdepopupmenu.h>
+#include <tdeactionclasses.h>
 #include <kmessagebox.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kbookmarkmanager.h>
@@ -91,11 +91,11 @@ tdesvn::tdesvn()
     m_BookmarksActionmenu->setDelayed(false);
     m_BookmarksActionmenu->setEnabled(true);
 
-    m_Bookmarkactions = new TDEActionCollection( this );
-    m_Bookmarkactions->setHighlightingEnabled( true );
-    connectActionCollection( m_Bookmarkactions );
+    m_Bookmartdeactions = new TDEActionCollection( this );
+    m_Bookmartdeactions->setHighlightingEnabled( true );
+    connectActionCollection( m_Bookmartdeactions );
 
-    m_pBookmarkMenu = new KBookmarkMenu(m_BookmarkManager,this,m_BookmarksActionmenu->popupMenu(),m_Bookmarkactions,true);
+    m_pBookmarkMenu = new KBookmarkMenu(m_BookmarkManager,this,m_BookmarksActionmenu->popupMenu(),m_Bookmartdeactions,true);
 //    m_BookmarksActionmenu->plug(menuBar());
     // this routine will find and load our Part.  it finds the Part by
     // name which is a bad idea usually.. but it's alright in this
diff --git a/src/tdesvn.h b/src/tdesvn.h
index 7ce9d93..9b839ce 100644
--- a/src/tdesvn.h
+++ b/src/tdesvn.h
@@ -102,7 +102,7 @@ private:
     TQString m_bookmarkFile;
     KBookmarkManager * m_BookmarkManager;
     TDEActionMenu* m_BookmarksActionmenu;
-    TDEActionCollection*m_Bookmarkactions;
+    TDEActionCollection*m_Bookmartdeactions;
     KBookmarkMenu * m_pBookmarkMenu;
     KParts::ReadOnlyPart *m_part;
     TDEToggleAction *m_statusbarAction;
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index cab6e14..ad6efca 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -34,7 +34,7 @@
 #include "helpers/sshagent.h"
 
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp
index 2e97010..1eccd2b 100644
--- a/src/tdesvnview.cpp
+++ b/src/tdesvnview.cpp
@@ -52,8 +52,8 @@
 #include <klocale.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
-#include <kshortcut.h>
+#include <tdeactioncollection.h>
+#include <tdeshortcut.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
 #include <kprogress.h>