Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 12 insertions, 12 deletions

diff --git a/kdejava/koala/org/kde/koala/KURIFilter.java b/kdejava/koala/org/kde/koala/KURIFilter.java
index 0cbad9d8..a3aa5ce1 100644
--- a/kdejava/koala/org/kde/koala/KURIFilter.java
+++ b/kdejava/koala/org/kde/koala/KURIFilter.java
@@ -44,15 +44,15 @@ import java.util.ArrayList;
  of the filters you want to use to an ArrayList 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:
  <pre>
  String text = "kde.org";
- boolean filtered = KURIFilter.self().filterURI( text, "kshorturifilter" );
+ boolean filtered = KURIFilter.self().filterURI( text, "tdeshorturifilter" );
  </pre>
  <pre>
  ArrayList list;
- list << "kshorturifilter" << "localdomainfilter";
+ list << "tdeshorturifilter" << "localdomainfilter";
  boolean filtered = KURIFilter.self().filterURI( text, list );
  </pre>
  KURIFilter also allows richer data exchange through a simple
diff --git a/kdejava/koala/org/kde/koala/TDEAction.java b/kdejava/koala/org/kde/koala/TDEAction.java
index caec1930..5703cedd 100644
--- a/kdejava/koala/org/kde/koala/TDEAction.java
+++ b/kdejava/koala/org/kde/koala/TDEAction.java
@@ -291,7 +291,7 @@ public class TDEAction extends TQObject  {
 	public native int itemId(int index);
 	public native TQWidget representative(int index);
 	public native int containerCount();
-	public native int kaccelCount();
+	public native int tdeaccelCount();
 	public native boolean hasIcon();
 	public native boolean hasIconSet();
 	public native String plainText();
diff --git a/kdejava/koala/org/kde/koala/TDEActionCollection.java b/kdejava/koala/org/kde/koala/TDEActionCollection.java
index 6cf636bd..245790c7 100644
--- a/kdejava/koala/org/kde/koala/TDEActionCollection.java
+++ b/kdejava/koala/org/kde/koala/TDEActionCollection.java
@@ -104,8 +104,8 @@ public class TDEActionCollection extends TQObject  {
 	public native boolean addDocCollection(TDEActionCollection pDoc);
 	/**	 Returns the TDEAccel object of the most recently set widget. 		@short   Returns the TDEAccel object of the most recently set widget.
 	*/
-	public native TDEAccel kaccel();
-	/**	 @internal, for TDEAction.kaccelCurrent() 		@short   @internal, for TDEAction.kaccelCurrent()
+	public native TDEAccel tdeaccel();
+	/**	 @internal, for TDEAction.tdeaccelCurrent() 		@short   @internal, for TDEAction.tdeaccelCurrent()
 	*/
 	public native TDEAccel builderTDEAccel();
 	/**	 Returns the number of actions in the collection 		@short   Returns the number of actions in the collection
diff --git a/kdejava/koala/org/kde/koala/TDEFontChooser.java b/kdejava/koala/org/kde/koala/TDEFontChooser.java
index 9504b868..cdffaa4f 100644
--- a/kdejava/koala/org/kde/koala/TDEFontChooser.java
+++ b/kdejava/koala/org/kde/koala/TDEFontChooser.java
@@ -16,7 +16,7 @@ import org.kde.qt.TQWidget;
  custom dialogs and therefore is very flexible, in most cases
  it is preferable to use the convenience functions in
  TDEFontDialog.
- \image html kfontchooser.png "KDE Font Chooser"
+ \image html tdefontchooser.png "KDE Font Chooser"
  See {@link TDEFontChooserSignals} for signals emitted by TDEFontChooser
 		@author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
 
diff --git a/kdejava/koala/org/kde/koala/TDEFontDialog.java b/kdejava/koala/org/kde/koala/TDEFontDialog.java
index 2b057cb8..7d451036 100644
--- a/kdejava/koala/org/kde/koala/TDEFontDialog.java
+++ b/kdejava/koala/org/kde/koala/TDEFontDialog.java
@@ -22,7 +22,7 @@ import org.kde.qt.TQWidget;
       if ( result == TDEFontDialog.Accepted )
             ...
  </pre>
- \image html kfontdialog.png "KDE Font Dialog"
+ \image html tdefontdialog.png "KDE Font Dialog"
  See {@link TDEFontDialogSignals} for signals emitted by TDEFontDialog
 		@author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
 
diff --git a/kdejava/koala/org/kde/koala/TDEFontRequester.java b/kdejava/koala/org/kde/koala/TDEFontRequester.java
index 83a2c64c..85beb7a5 100644
--- a/kdejava/koala/org/kde/koala/TDEFontRequester.java
+++ b/kdejava/koala/org/kde/koala/TDEFontRequester.java
@@ -16,7 +16,7 @@ import org.kde.qt.TQWidget;
  a font dialog (TDEFontDialog).
  The lineedit provides a preview of the selected font. The preview text can
  be customized. You can also have the font dialog show only the fixed fonts.
- \image html kfontrequester.png "KDE Font Requester"
+ \image html tdefontrequester.png "KDE Font Requester"
   See {@link TDEFontRequesterSignals} for signals emitted by TDEFontRequester
 		@author Nadeem Hasan <nhasan@kde.org>
 
diff --git a/kdejava/koala/org/kde/koala/TDEMainWindow.java b/kdejava/koala/org/kde/koala/TDEMainWindow.java
index f7e132e1..0d426bfe 100644
--- a/kdejava/koala/org/kde/koala/TDEMainWindow.java
+++ b/kdejava/koala/org/kde/koala/TDEMainWindow.java
@@ -269,7 +269,7 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa
 	/**	
 		 Returns a pointer to the status bar.
 			 If there is no status bar yet, one will be created.
-			 Note that tooltips for kactions in actionCollection() are not
+			 Note that tooltips for tdeactions in actionCollection() are not
 		 automatically connected to this statusBar.
 		 See the TDEActionCollection documentation for more details.
 				@short    Returns a pointer to the status bar.
@@ -406,7 +406,7 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa
 		 know when that status (hidden/shown) of the statusbar has changed.
 		 For example:
 		 connect(action, SIGNAL("activated()"),
-		         kmainwindow, SLOT("setSettingsDirty()"));
+		         tdemainwindow, SLOT("setSettingsDirty()"));
 		 Otherwise the status (hidden/show) of the statusbar might not be saved
 		 by TDEMainWindow.
 				@short    Sets whether TDEMainWindow should provide a menu that allows showing/hiding  of the statusbar ( using TDEToggleStatusBarAction ).
diff --git a/kdejava/koala/org/kde/koala/TDEStdAccel.java b/kdejava/koala/org/kde/koala/TDEStdAccel.java
index adb67f6b..e9b71329 100644
--- a/kdejava/koala/org/kde/koala/TDEStdAccel.java
+++ b/kdejava/koala/org/kde/koala/TDEStdAccel.java
@@ -12,7 +12,7 @@ import org.kde.qt.QtSupport;
  be used in all KDE applications. They will be configurable,
  so do not hardcode the default behavior.
  If you want real configurable keybindings in your applications,
- please checkout the class TDEAccel in kaccel.h
+ please checkout the class TDEAccel in tdeaccel.h
 		@short    \namespace TDEStdAccel  Convenient methods for access to the common accelerator keys in  the key configuration.
 		@see TDEAccelShortcutList