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

---
 kate/app/kateconfigdialog.cpp           |  2 +-
 kate/app/kateconfigplugindialogpage.cpp |  2 +-
 kate/app/kateconfigplugindialogpage.h   |  2 +-
 kate/app/kateexternaltools.cpp          |  4 ++--
 kate/app/kateexternaltools.h            |  2 +-
 kate/app/katefilelist.h                 |  2 +-
 kate/app/katefileselector.cpp           | 10 +++++-----
 kate/app/katefileselector.h             |  2 +-
 kate/app/kategrepdialog.cpp             |  2 +-
 kate/app/katemailfilesdialog.cpp        |  2 +-
 kate/app/katemainwindow.cpp             |  4 ++--
 kate/app/katemainwindow.h               |  2 +-
 kate/app/katemdi.cpp                    |  8 ++++----
 kate/app/katemdi.h                      |  2 +-
 kate/app/katemwmodonhddialog.cpp        |  2 +-
 kate/app/katesavemodifieddialog.cpp     |  2 +-
 kate/app/katesession.cpp                |  4 ++--
 kate/app/katesession.h                  |  2 +-
 kate/app/kateviewmanager.cpp            |  6 +++---
 kate/app/kateviewspacecontainer.cpp     |  4 ++--
 kate/app/kbookmarkhandler.cpp           |  8 ++++----
 kate/app/kbookmarkhandler.h             |  2 +-
 kate/app/kwritemain.cpp                 |  2 +-
 23 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'kate/app')

diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index afa77b6a5..0efaa6aa9 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -52,7 +52,7 @@
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>
diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp
index 1b5c29aac..8e12e2d81 100644
--- a/kate/app/kateconfigplugindialogpage.cpp
+++ b/kate/app/kateconfigplugindialogpage.cpp
@@ -22,7 +22,7 @@
 
 #include "katepluginmanager.h"
 #include "kateconfigdialog.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include "kateapp.h"
 #include <tqstringlist.h>
 #include <tqhbox.h>
diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h
index c0294b0e9..009f30739 100644
--- a/kate/app/kateconfigplugindialogpage.h
+++ b/kate/app/kateconfigplugindialogpage.h
@@ -23,7 +23,7 @@
 #include "katemain.h"
 #include "katepluginmanager.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqvbox.h>
 
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 2f2ae3487..90e934409 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -33,7 +33,7 @@
 #include <kate/view.h>
 #include <kate/document.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -41,7 +41,7 @@
 #include <tdeconfig.h>
 #include <krun.h>
 #include <kicondialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include <tqbitmap.h>
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index 1cee371f3..363ae6377 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -24,7 +24,7 @@
 #ifndef _KATE_EXTERNAL_TOOLS_H_
 #define _KATE_EXTERNAL_TOOLS_H_
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kate/document.h>
 #include <kmacroexpander.h>
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index f310562bc..49987edd1 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -25,7 +25,7 @@
 
 #include <kate/document.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqtooltip.h>
 #include <tqcolor.h>
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 7a0e429f8..1ff9ef47f 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -26,7 +26,7 @@
 #include "kateviewmanager.h"
 #include "kbookmarkhandler.h"
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
@@ -56,11 +56,11 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <tqtoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialog.h>
 #include <kdebug.h>
 //END Includes
@@ -166,7 +166,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
            filter, TQT_SLOT( addToHistory(const TQString&) ) );
 
-  // kaction for the dir sync method
+  // tdeaction for the dir sync method
   acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0,
         TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
   toolbar->setIconText( TDEToolBar::IconOnly );
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index ddacb6422..33482faba 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -28,7 +28,7 @@
 #include <tqvbox.h>
 #include <tdefile.h>
 #include <kurl.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqframe.h>
 
 class KateMainWindow;
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index a1f4cac1a..bb0d7e9f8 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -32,7 +32,7 @@
 #include <tqcursor.h>
 
 #include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 651269bb7..b402ca58d 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -21,7 +21,7 @@
 #include "kateviewmanager.h"
 #include "katedocmanager.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kurl.h>
 
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 949166c86..9e27e55b8 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -46,7 +46,7 @@
 #include <dcopclient.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
@@ -63,7 +63,7 @@
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kopenwith.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksimpleconfig.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index 0905f2b6a..30582ed3e 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -29,7 +29,7 @@
 
 #include <tdeparts/part.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KateTabWidget;
 class GrepTool;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 6138915ab..6480d5fd3 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -2,7 +2,7 @@
    Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org>
    Copyright (C) 2002, 2003 Joseph Wenninger <jowenn@kde.org>
 
-   GUIClient partly based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+   GUIClient partly based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -23,7 +23,7 @@
 #include "katemdi.h"
 #include "katemdi.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 
 #include <tqvbox.h>
@@ -134,7 +134,7 @@ GUIClient::GUIClient ( MainWindow *mw )
     setXML( completeDescription, false /*merge*/ );
   }
 
-  if (actionCollection()->kaccel()==0)
+  if (actionCollection()->tdeaccel()==0)
     actionCollection()->setWidget(m_mw);
 
   m_toolMenu = new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu");
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 4cc63abac..a291ebb8c 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -25,7 +25,7 @@
 
 #include <tdemultitabbar.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqdict.h>
 #include <tqintdict.h>
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index d81e0de60..3abf12754 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -25,7 +25,7 @@
 #include <kate/document.h>
 
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocio.h>
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 144e701e2..4925b6e90 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kguiitem.h>
 #include <kactivelabel.h>
 #include <kstdguiitem.h>
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 168b760f1..d55af0c9d 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -27,14 +27,14 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kmdcodec.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqdir.h>
 #include <tqlabel.h>
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index 1b3c4a966..b62e72a48 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -24,7 +24,7 @@
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
 #include <ksharedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqobject.h>
 #include <tqvaluelist.h>
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 39a969b6f..562e41e27 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -28,7 +28,7 @@
 #include "katetabwidget.h"
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kdiroperator.h>
@@ -37,13 +37,13 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include <tdetexteditor/encodinginterface.h>
 
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 059178746..9af161b93 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -29,7 +29,7 @@
 #include "kateviewspace.h"
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kdiroperator.h>
@@ -38,7 +38,7 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index 35fa87fec..2ff3c7e63 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -25,21 +25,21 @@
 #include <tqtextstream.h>
 
 #include <kbookmarkimporter.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kdiroperator.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kbookmarkhandler.h"
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* kpopupmenu )
+KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* tdepopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
-      m_menu( kpopupmenu ),
+      m_menu( tdepopupmenu ),
       m_importStream( 0L )
 {
     if (!m_menu)
diff --git a/kate/app/kbookmarkhandler.h b/kate/app/kbookmarkhandler.h
index 6147a9d73..612c15a18 100644
--- a/kate/app/kbookmarkhandler.h
+++ b/kate/app/kbookmarkhandler.h
@@ -35,7 +35,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
     Q_OBJECT
 
 public:
-    KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *kpopupmenu=0 );
+    KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 641db4865..58a6368d1 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -43,7 +43,7 @@
 #include <kaboutdata.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kapplication.h>
-- 
cgit v1.2.3