From 5ac308306a9583ca086bb3022b0c25b20feeb7d2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:56:31 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kdejava/koala/kdejava/KComboBox.cpp         | 2 +-
 kdejava/koala/kdejava/KDE.cpp               | 4 ++--
 kdejava/koala/kdejava/KDEJavaSlot.h         | 2 +-
 kdejava/koala/kdejava/KDirOperator.cpp      | 2 +-
 kdejava/koala/kdejava/KEMailSettings.cpp    | 2 +-
 kdejava/koala/kdejava/KLineEdit.cpp         | 2 +-
 kdejava/koala/kdejava/KMenuBar.cpp          | 2 +-
 kdejava/koala/kdejava/KMessageBox.cpp       | 2 +-
 kdejava/koala/kdejava/KProtocolManager.cpp  | 2 +-
 kdejava/koala/kdejava/KTempFile.cpp         | 2 +-
 kdejava/koala/kdejava/TDECompletion.cpp     | 2 +-
 kdejava/koala/kdejava/TDECompletionBase.cpp | 2 +-
 kdejava/koala/kdejava/TDEGlobal.cpp         | 2 +-
 kdejava/koala/kdejava/TDEGlobalSettings.cpp | 2 +-
 kdejava/koala/kdejava/TDELocale.cpp         | 2 +-
 kdejava/koala/org/kde/koala/KHelpMenu.java  | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'kdejava/koala')

diff --git a/kdejava/koala/kdejava/KComboBox.cpp b/kdejava/koala/kdejava/KComboBox.cpp
index 6cc9fedc..c81014db 100644
--- a/kdejava/koala/kdejava/KComboBox.cpp
+++ b/kdejava/koala/kdejava/KComboBox.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcombobox.h>
 #include <kcompletion.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp
index 7a4da366..7d338807 100644
--- a/kdejava/koala/kdejava/KDE.cpp
+++ b/kdejava/koala/kdejava/KDE.cpp
@@ -20,12 +20,12 @@
 #include <tqiconset.h>
 #include <tdeversion.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdrawutil.h>
 #include <tqstring.h>
 #include <kprotocolinfo.h>
 #include <ksslutils.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kprinter.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KDEJavaSlot.h b/kdejava/koala/kdejava/KDEJavaSlot.h
index fb997abe..d7565c9b 100644
--- a/kdejava/koala/kdejava/KDEJavaSlot.h
+++ b/kdejava/koala/kdejava/KDEJavaSlot.h
@@ -32,7 +32,7 @@
 #include <kdockwidget.h>
 #include <kdualcolorbtn.h>
 #include <tdefileview.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdelistview.h>
 #include <kprocio.h>
 #include <kprocess.h>
diff --git a/kdejava/koala/kdejava/KDirOperator.cpp b/kdejava/koala/kdejava/KDirOperator.cpp
index faaea6ae..da2f5dce 100644
--- a/kdejava/koala/kdejava/KDirOperator.cpp
+++ b/kdejava/koala/kdejava/KDirOperator.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tqdir.h>
 #include <tdeparts/browserextension.h>
 #include <tdeaction.h>
diff --git a/kdejava/koala/kdejava/KEMailSettings.cpp b/kdejava/koala/kdejava/KEMailSettings.cpp
index d43c7abf..53d7a6db 100644
--- a/kdejava/koala/kdejava/KEMailSettings.cpp
+++ b/kdejava/koala/kdejava/KEMailSettings.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/KLineEdit.cpp b/kdejava/koala/kdejava/KLineEdit.cpp
index 05a57d0e..a7443c0b 100644
--- a/kdejava/koala/kdejava/KLineEdit.cpp
+++ b/kdejava/koala/kdejava/KLineEdit.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klineedit.h>
 #include <kcompletion.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KMenuBar.cpp b/kdejava/koala/kdejava/KMenuBar.cpp
index 5f96707c..3c91ad48 100644
--- a/kdejava/koala/kdejava/KMenuBar.cpp
+++ b/kdejava/koala/kdejava/KMenuBar.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsize.h>
 #include <tqrect.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMessageBox.cpp b/kdejava/koala/kdejava/KMessageBox.cpp
index 5cd133b6..29365b9b 100644
--- a/kdejava/koala/kdejava/KMessageBox.cpp
+++ b/kdejava/koala/kdejava/KMessageBox.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqpixmap.h>
 #include <tqmessagebox.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KProtocolManager.cpp b/kdejava/koala/kdejava/KProtocolManager.cpp
index ba0bb159..cbc669d7 100644
--- a/kdejava/koala/kdejava/KProtocolManager.cpp
+++ b/kdejava/koala/kdejava/KProtocolManager.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KTempFile.cpp b/kdejava/koala/kdejava/KTempFile.cpp
index 752060c3..f5175045 100644
--- a/kdejava/koala/kdejava/KTempFile.cpp
+++ b/kdejava/koala/kdejava/KTempFile.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDECompletion.cpp b/kdejava/koala/kdejava/TDECompletion.cpp
index fed037fc..86d8c78e 100644
--- a/kdejava/koala/kdejava/TDECompletion.cpp
+++ b/kdejava/koala/kdejava/TDECompletion.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcompletion.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/TDECompletionBase.cpp b/kdejava/koala/kdejava/TDECompletionBase.cpp
index bd790987..fab40c49 100644
--- a/kdejava/koala/kdejava/TDECompletionBase.cpp
+++ b/kdejava/koala/kdejava/TDECompletionBase.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcompletion.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/TDEGlobal.cpp b/kdejava/koala/kdejava/TDEGlobal.cpp
index 954fb27a..52f536a1 100644
--- a/kdejava/koala/kdejava/TDEGlobal.cpp
+++ b/kdejava/koala/kdejava/TDEGlobal.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEGlobalSettings.cpp b/kdejava/koala/kdejava/TDEGlobalSettings.cpp
index 86acf6b0..35f2864f 100644
--- a/kdejava/koala/kdejava/TDEGlobalSettings.cpp
+++ b/kdejava/koala/kdejava/TDEGlobalSettings.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqrect.h>
 #include <tqfont.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/TDELocale.cpp b/kdejava/koala/kdejava/TDELocale.cpp
index 86ea6d9d..f747a285 100644
--- a/kdejava/koala/kdejava/TDELocale.cpp
+++ b/kdejava/koala/kdejava/TDELocale.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdatetime.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/org/kde/koala/KHelpMenu.java b/kdejava/koala/org/kde/koala/KHelpMenu.java
index 48a32b33..bb408c66 100644
--- a/kdejava/koala/org/kde/koala/KHelpMenu.java
+++ b/kdejava/koala/org/kde/koala/KHelpMenu.java
@@ -18,7 +18,7 @@ import org.kde.qt.TQObject;
  The usage is simple:
  <pre>
  mHelpMenu = new KHelpMenu( this, <someText> );
- kmenubar.insertItem(i18n("&Help"), mHelpMenu.menu() );
+ tdemenubar.insertItem(i18n("&Help"), mHelpMenu.menu() );
  </pre>
  or if you just want to open a dialog box:
  <pre>
-- 
cgit v1.2.1