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

---
 extra/kde342/kkeyserver_x11.h   | 2 +-
 extra/kde342/kpanelmenu.h       | 2 +-
 extra/kde342/kurifilter.h       | 6 +++---
 extra/kde342/tdeaccelaction.h   | 2 +-
 extra/kde342/tdeaccelbase.h     | 2 +-
 extra/kde342/tdetoolbarbutton.h | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'extra/kde342')

diff --git a/extra/kde342/kkeyserver_x11.h b/extra/kde342/kkeyserver_x11.h
index 0dae410..5ae8830 100644
--- a/extra/kde342/kkeyserver_x11.h
+++ b/extra/kde342/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde342/kpanelmenu.h b/extra/kde342/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde342/kpanelmenu.h
+++ b/extra/kde342/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde342/kurifilter.h b/extra/kde342/kurifilter.h
index 53dbaa6..1ec8b77 100644
--- a/extra/kde342/kurifilter.h
+++ b/extra/kde342/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde342/tdeaccelaction.h b/extra/kde342/tdeaccelaction.h
index 963ce24..54a9070 100644
--- a/extra/kde342/tdeaccelaction.h
+++ b/extra/kde342/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde342/tdeaccelbase.h b/extra/kde342/tdeaccelbase.h
index 00ab632..372735c 100644
--- a/extra/kde342/tdeaccelbase.h
+++ b/extra/kde342/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde342/tdetoolbarbutton.h b/extra/kde342/tdetoolbarbutton.h
index 91d1291..8da921f 100644
--- a/extra/kde342/tdetoolbarbutton.h
+++ b/extra/kde342/tdetoolbarbutton.h
@@ -317,7 +317,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $
+* @version $Id: tdetoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
-- 
cgit v1.2.1