Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 9 insertions, 9 deletions

diff --git a/extra/kde330/kkeyserver_x11.h b/extra/kde330/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde330/kkeyserver_x11.h
+++ b/extra/kde330/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde330/kpanelmenu.h b/extra/kde330/kpanelmenu.h
index fd9c00c..c0ea523 100644
--- a/extra/kde330/kpanelmenu.h
+++ b/extra/kde330/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/kde330/kurifilter.h b/extra/kde330/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde330/kurifilter.h
+++ b/extra/kde330/kurifilter.h
@@ -500,17 +500,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/kde330/tdeaccelaction.h b/extra/kde330/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde330/tdeaccelaction.h
+++ b/extra/kde330/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde330/tdeaccelbase.h b/extra/kde330/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde330/tdeaccelbase.h
+++ b/extra/kde330/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde330/tdetoolbarbutton.h b/extra/kde330/tdetoolbarbutton.h
index 724e26b..27936a8 100644
--- a/extra/kde330/tdetoolbarbutton.h
+++ b/extra/kde330/tdetoolbarbutton.h
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {