Rename a number of classes to enhance compatibility with KDE4

122 files changed, 2474 insertions, 2474 deletions

diff --git a/kdejava/koala/org/kde/koala/KAboutApplication.java b/kdejava/koala/org/kde/koala/KAboutApplication.java
index e65e1a24..174b5c58 100644
--- a/kdejava/koala/org/kde/koala/KAboutApplication.java
+++ b/kdejava/koala/org/kde/koala/KAboutApplication.java
@@ -12,9 +12,9 @@ import org.kde.qt.TQWidget;
  TDEAboutData that is specified at the start of your program in
  main(). Normally you should not use this class directly but rather
  the KHelpMenu class or even better just subclass your toplevel
- window from KMainWindow. If you do the latter, the help menu and
+ window from TDEMainWindow. If you do the latter, the help menu and
  thereby this dialog box is available through the
- KMainWindow.helpMenu() function.
+ TDEMainWindow.helpMenu() function.
 		@author Waldo Bastian (bastian@kde.org) and Espen Sand (espen@kde.org)
  
 		@short Standard "About Application" dialog box.
diff --git a/kdejava/koala/org/kde/koala/KAboutKDE.java b/kdejava/koala/org/kde/koala/KAboutKDE.java
index c985f0da..6f8ff07c 100644
--- a/kdejava/koala/org/kde/koala/KAboutKDE.java
+++ b/kdejava/koala/org/kde/koala/KAboutKDE.java
@@ -10,9 +10,9 @@ import org.kde.qt.TQWidget;
  This class provides the standard "About KDE" dialog box that is used
  KHelpMenu Normally you should not use this class directly but
  rather the KHelpMenu class or even better just subclass your
- toplevel window from KMainWindow. If you do the latter, the help
+ toplevel window from TDEMainWindow. If you do the latter, the help
  menu and thereby this dialog box is available through the
- KMainWindow.helpMenu() function.
+ TDEMainWindow.helpMenu() function.
 		@author Espen Sand (espen@kde.org)
  
 		@short Standard "About KDE" dialog box,.
diff --git a/kdejava/koala/org/kde/koala/KAccelShortcutList.java b/kdejava/koala/org/kde/koala/KAccelShortcutList.java
deleted file mode 100644
index debb614a..00000000
--- a/kdejava/koala/org/kde/koala/KAccelShortcutList.java
+++ /dev/null
@@ -1,73 +0,0 @@
-//Auto-generated by kalyptus. DO NOT EDIT.
-package org.kde.koala;
-
-import org.kde.qt.Qt;
-import org.kde.qt.QtSupport;
-import org.kde.qt.TQVariant;
-
-/**
-
- KShortcutList implementation to access KAccel and
- TDEGlobalAccel lists.
- 		@short    KShortcutList implementation to access KAccel and  TDEGlobalAccel lists.
-
-*/
-public class KAccelShortcutList extends KShortcutList  {
-	protected KAccelShortcutList(Class dummy){super((Class) null);}
-	/**	
-		 Creates a new KShortcutList that accesses the given KAccel.
-			@param accel the accelerators to access
-			 		@short    Creates a new KShortcutList that accesses the given KAccel.
-	*/
-	public KAccelShortcutList(KAccel accel) {
-		super((Class) null);
-		newKAccelShortcutList(accel);
-	}
-	private native void newKAccelShortcutList(KAccel accel);
-	/**	
-		 Creates a new KShortcutList that accesses the given
-		 TDEGlobalAccel.
-			@param accel the accelerators to access
-			 		@short    Creates a new KShortcutList that accesses the given  TDEGlobalAccel.
-	*/
-	public KAccelShortcutList(TDEGlobalAccel accel) {
-		super((Class) null);
-		newKAccelShortcutList(accel);
-	}
-	private native void newKAccelShortcutList(TDEGlobalAccel accel);
-	/**	
-			 Creates a new KShortcutList that accesses the given
-		 KAccelActions collection.
-			@param actions the actions to access
-			@param bGlobal true to save the actions in the global
-		        configuration file
-			 		@short
-	*/
-	public KAccelShortcutList(KAccelActions actions, boolean bGlobal) {
-		super((Class) null);
-		newKAccelShortcutList(actions,bGlobal);
-	}
-	private native void newKAccelShortcutList(KAccelActions actions, boolean bGlobal);
-	public native int count();
-	public native String name(int index);
-	public native String label(int index);
-	public native String whatsThis(int index);
-	public native KShortcut shortcut(int index);
-	public native KShortcut shortcutDefault(int index);
-	public native boolean isConfigurable(int index);
-	public native boolean setShortcut(int index, KShortcut shortcut);
-	public native boolean isGlobal(int index);
-	/**	 \internal 		@short   \internal
-	*/
-	public native TQVariant getOther(int arg1, int index);
-	/**	 \internal 		@short   \internal
-	*/
-	public native boolean setOther(int arg1, int index, TQVariant arg3);
-	public native boolean save();
-	/** Deletes the wrapped C++ instance */
-	protected native void finalize() throws InternalError;
-	/** Delete the wrapped C++ instance ahead of finalize() */
-	public native void dispose();
-	/** Has the wrapped C++ instance been deleted? */
-	public native boolean isDisposed();
-}
diff --git a/kdejava/koala/org/kde/koala/KAnimWidget.java b/kdejava/koala/org/kde/koala/KAnimWidget.java
index fdf1d6e9..5aeef6f9 100644
--- a/kdejava/koala/org/kde/koala/KAnimWidget.java
+++ b/kdejava/koala/org/kde/koala/KAnimWidget.java
@@ -48,7 +48,7 @@ public class KAnimWidget extends TQFrame  {
 			@param icons The icons name (e.g., "kde") to use for the animation
 			@param size The size to load
 		               You don't have to set it if the parent is a
-		               KToolBar; in this case it will use the toolbar's
+		               TDEToolBar; in this case it will use the toolbar's
 		               size.
 			@param parent The standard parent
 			@param name The standard internal name
diff --git a/kdejava/koala/org/kde/koala/KCombiView.java b/kdejava/koala/org/kde/koala/KCombiView.java
index 57668c94..5157f371 100644
--- a/kdejava/koala/org/kde/koala/KCombiView.java
+++ b/kdejava/koala/org/kde/koala/KCombiView.java
@@ -68,7 +68,7 @@ public class KCombiView extends TQSplitter implements KFileViewInterface {
 	public native void writeConfig(TDEConfig arg1, String group);
 	public native void writeConfig(TDEConfig arg1);
 	public native void ensureItemVisible(KFileItem arg1);
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	public native void setAcceptDrops(boolean b);
 	public native boolean eventFilter(TQObject o, TQEvent e);
 	protected native void setDropOptions_impl(int options);
diff --git a/kdejava/koala/org/kde/koala/KComboBox.java b/kdejava/koala/org/kde/koala/KComboBox.java
index c3d6b234..4cd65e9f 100644
--- a/kdejava/koala/org/kde/koala/KComboBox.java
+++ b/kdejava/koala/org/kde/koala/KComboBox.java
@@ -42,7 +42,7 @@ import org.kde.qt.TQComboBox;
  such as setEditable(false) is made.  Store the pointer at your own risk,
  and consider using TQGuardedPtr<KCompletion>.
  The default key-bindings for completion and rotation is determined from the
- global settings in KStdAccel. These values, however, can be overridden
+ global settings in TDEStdAccel. These values, however, can be overridden
  locally by invoking KCompletionBase.setKeyBinding(). The values can
  easily be reverted back to the default setting, by simply calling
  useGlobalSettings(). An alternate method would be to default individual
@@ -562,7 +562,7 @@ public class KComboBox extends TQComboBox implements KCompletionBaseInterface {
 		@short    Sets the key-binding to be used for manual text  completion, text rotation in a history list as  well as a completion list.
 		@see #getKeyBinding
 	*/
-	public native boolean setKeyBinding(int item, KShortcut key);
+	public native boolean setKeyBinding(int item, TDEShortcut key);
 	/**	
 		 Returns the key-binding used for the specified item.
 			 This methods returns the key-binding used to activate
@@ -575,7 +575,7 @@ public class KComboBox extends TQComboBox implements KCompletionBaseInterface {
 		@short    Returns the key-binding used for the specified item.
 		@see #setKeyBinding
 	*/
-	public native KShortcut getKeyBinding(int item);
+	public native TDEShortcut getKeyBinding(int item);
 	/**	
 		 Sets this object to use global values for key-bindings.
 			 This method changes the values of the key bindings for
diff --git a/kdejava/koala/org/kde/koala/KCommandHistory.java b/kdejava/koala/org/kde/koala/KCommandHistory.java
index 37096ceb..0e97f583 100644
--- a/kdejava/koala/org/kde/koala/KCommandHistory.java
+++ b/kdejava/koala/org/kde/koala/KCommandHistory.java
@@ -44,16 +44,16 @@ public class KCommandHistory extends TQObject  {
 			@param actionCollection the parent collection
 		     		@short    Creates a command history, to store commands.
 	*/
-	public KCommandHistory(KActionCollection actionCollection, boolean withMenus) {
+	public KCommandHistory(TDEActionCollection actionCollection, boolean withMenus) {
 		super((Class) null);
 		newKCommandHistory(actionCollection,withMenus);
 	}
-	private native void newKCommandHistory(KActionCollection actionCollection, boolean withMenus);
-	public KCommandHistory(KActionCollection actionCollection) {
+	private native void newKCommandHistory(TDEActionCollection actionCollection, boolean withMenus);
+	public KCommandHistory(TDEActionCollection actionCollection) {
 		super((Class) null);
 		newKCommandHistory(actionCollection);
 	}
-	private native void newKCommandHistory(KActionCollection actionCollection);
+	private native void newKCommandHistory(TDEActionCollection actionCollection);
 	/**	
 		 Erases all the undo/redo history.
 		 Use this when reloading the data, for instance, since this invalidates
@@ -103,13 +103,13 @@ public class KCommandHistory extends TQObject  {
 	public native void updateActions();
 	/**	
 		 Undoes the last action.
-		 Call this if you don't use the builtin KActions.
+		 Call this if you don't use the builtin TDEActions.
 		     		@short    Undoes the last action.
 	*/
 	public native void undo();
 	/**	
 		 Redoes the last undone action.
-		 Call this if you don't use the builtin KActions.
+		 Call this if you don't use the builtin TDEActions.
 		     		@short    Redoes the last undone action.
 	*/
 	public native void redo();
diff --git a/kdejava/koala/org/kde/koala/KCompletionBase.java b/kdejava/koala/org/kde/koala/KCompletionBase.java
index 2cfb446d..00356a4f 100644
--- a/kdejava/koala/org/kde/koala/KCompletionBase.java
+++ b/kdejava/koala/org/kde/koala/KCompletionBase.java
@@ -27,7 +27,7 @@ public class KCompletionBase implements QtSupport, KCompletionBaseInterface {
 	/**	
 		 Constants that represent the items whose short-cut
 		 key-binding is programmable.  The default key-bindings
-		 for these items are defined in KStdAccel.
+		 for these items are defined in TDEStdAccel.
 		     		@short    Constants that represent the items whose short-cut  key-binding is programmable.
 	*/
 	public static final int TextCompletion = 0;
@@ -220,7 +220,7 @@ public class KCompletionBase implements QtSupport, KCompletionBaseInterface {
 		@short    Sets the key-binding to be used for manual text  completion, text rotation in a history list as  well as a completion list.
 		@see #getKeyBinding
 	*/
-	public native boolean setKeyBinding(int item, KShortcut key);
+	public native boolean setKeyBinding(int item, TDEShortcut key);
 	/**	
 		 Returns the key-binding used for the specified item.
 			 This methods returns the key-binding used to activate
@@ -233,7 +233,7 @@ public class KCompletionBase implements QtSupport, KCompletionBaseInterface {
 		@short    Returns the key-binding used for the specified item.
 		@see #setKeyBinding
 	*/
-	public native KShortcut getKeyBinding(int item);
+	public native TDEShortcut getKeyBinding(int item);
 	/**	
 		 Sets this object to use global values for key-bindings.
 			 This method changes the values of the key bindings for
diff --git a/kdejava/koala/org/kde/koala/KCompletionBaseInterface.java b/kdejava/koala/org/kde/koala/KCompletionBaseInterface.java
index 9e0fa101..8d9fe6a3 100644
--- a/kdejava/koala/org/kde/koala/KCompletionBaseInterface.java
+++ b/kdejava/koala/org/kde/koala/KCompletionBaseInterface.java
@@ -16,8 +16,8 @@ public interface KCompletionBaseInterface {
 		boolean emitSignals();
 		void setCompletionMode(int mode);
 		int completionMode();
-		boolean setKeyBinding(int item, KShortcut key);
-		KShortcut getKeyBinding(int item);
+		boolean setKeyBinding(int item, TDEShortcut key);
+		TDEShortcut getKeyBinding(int item);
 		void useGlobalKeyBindings();
 		void setCompletedText(String text);
 		void setCompletedItems(String[] items);
diff --git a/kdejava/koala/org/kde/koala/KCompletionBox.java b/kdejava/koala/org/kde/koala/KCompletionBox.java
index 171449ef..5a048cec 100644
--- a/kdejava/koala/org/kde/koala/KCompletionBox.java
+++ b/kdejava/koala/org/kde/koala/KCompletionBox.java
@@ -26,7 +26,7 @@ import org.kde.qt.TQWidget;
 		@short A helper widget for "completion-widgets" (KLineEdit, KComboBox)).
 
 */
-public class KCompletionBox extends KListBox  {
+public class KCompletionBox extends TDEListBox  {
 	protected KCompletionBox(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
@@ -177,9 +177,9 @@ public class KCompletionBox extends KListBox  {
 	*/
 	protected native void sizeAndPosition();
 	/**	
-		 Reimplemented from KListBox to get events from the viewport (to hide
+		 Reimplemented from TDEListBox to get events from the viewport (to hide
 		 this widget on mouse-click, Escape-presses, etc.
-		     		@short    Reimplemented from KListBox to get events from the viewport (to hide  this widget on mouse-click, Escape-presses, etc.
+		     		@short    Reimplemented from TDEListBox to get events from the viewport (to hide  this widget on mouse-click, Escape-presses, etc.
 	*/
 	public native boolean eventFilter(TQObject arg1, TQEvent arg2);
 	/**	
diff --git a/kdejava/koala/org/kde/koala/KDCOPActionProxy.java b/kdejava/koala/org/kde/koala/KDCOPActionProxy.java
index 17dad039..5f3ae2b2 100644
--- a/kdejava/koala/org/kde/koala/KDCOPActionProxy.java
+++ b/kdejava/koala/org/kde/koala/KDCOPActionProxy.java
@@ -6,9 +6,9 @@ import org.kde.qt.QtSupport;
 
 /**
 
- The KDCOPActionProxy class provides an easy way to publish a collection of KAction objects
+ The KDCOPActionProxy class provides an easy way to publish a collection of TDEAction objects
  through DCOP. For the DCOP client the exported actions behave like full-fledged DCOP objects,
- providing full access to the KAction object functionality in the server.
+ providing full access to the TDEAction object functionality in the server.
  This class can generate DCOP object ids for given action objects, which it automatically
  processes, as being a DCOPObjectProxy .
  		@short A proxy class publishing a DCOP interface for actions.
@@ -18,20 +18,20 @@ public class KDCOPActionProxy extends DCOPObjectProxy  {
 	protected KDCOPActionProxy(Class dummy){super((Class) null);}
 	/**	
 		 Constructs a dcop action proxy, being able to export the actions of the provided
-		 KActionCollection through DCOP, using the parent DCOPObject's object id to
+		 TDEActionCollection through DCOP, using the parent DCOPObject's object id to
 		 generate unique object ids for the actions.
-		   		@short    Constructs a dcop action proxy, being able to export the actions of the provided  KActionCollection through DCOP, using the parent DCOPObject's object id to  generate unique object ids for the actions.
+		   		@short    Constructs a dcop action proxy, being able to export the actions of the provided  TDEActionCollection through DCOP, using the parent DCOPObject's object id to  generate unique object ids for the actions.
 	*/
-	public KDCOPActionProxy(KActionCollection actionCollection, DCOPObjectInterface parent) {
+	public KDCOPActionProxy(TDEActionCollection actionCollection, DCOPObjectInterface parent) {
 		super((Class) null);
 		newKDCOPActionProxy(actionCollection,parent);
 	}
-	private native void newKDCOPActionProxy(KActionCollection actionCollection, DCOPObjectInterface parent);
+	private native void newKDCOPActionProxy(TDEActionCollection actionCollection, DCOPObjectInterface parent);
 	/**	
 		 Use this constructor if do not want to provide the exportable actions through a
-		 KActionCollection . You have to reimplement the actions() and
+		 TDEActionCollection . You have to reimplement the actions() and
 		 action() methods if you use this constructor.
-		   		@short    Use this constructor if do not want to provide the exportable actions through a  KActionCollection .
+		   		@short    Use this constructor if do not want to provide the exportable actions through a  TDEActionCollection .
 	*/
 	public KDCOPActionProxy(DCOPObjectInterface parent) {
 		super((Class) null);
@@ -40,10 +40,10 @@ public class KDCOPActionProxy extends DCOPObjectProxy  {
 	private native void newKDCOPActionProxy(DCOPObjectInterface parent);
 	/**	
 		 Returns an action object with the given name. The default implementation queries the action object
-		 from the KActionCollection, if the first constructor has been used.
+		 from the TDEActionCollection, if the first constructor has been used.
 		   		@short    Returns an action object with the given name.
 	*/
-	public native KAction action(String name);
+	public native TDEAction action(String name);
 	/**	
 		 Use this method to retrieve a DCOP object id for an action with the given name.
 		 This class automatically takes care of processing DCOP object requests for the returned
@@ -73,7 +73,7 @@ public class KDCOPActionProxy extends DCOPObjectProxy  {
 		 action object.
 		   		@short    Called by the #process method and takes care of processing the object request for an  action object.
 	*/
-	public native boolean processAction(String arg1, String fun, byte[] data, StringBuffer replyType, byte[] replyData, KAction action);
+	public native boolean processAction(String arg1, String fun, byte[] data, StringBuffer replyType, byte[] replyData, TDEAction action);
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
 	/** Delete the wrapped C++ instance ahead of finalize() */
diff --git a/kdejava/koala/org/kde/koala/KDataToolAction.java b/kdejava/koala/org/kde/koala/KDataToolAction.java
index 3fa94c13..c47a06e3 100644
--- a/kdejava/koala/org/kde/koala/KDataToolAction.java
+++ b/kdejava/koala/org/kde/koala/KDataToolAction.java
@@ -28,7 +28,7 @@ import org.kde.qt.TQObject;
 		@short    This class helps applications implement support for KDataTool.
 
 */
-public class KDataToolAction extends KAction  {
+public class KDataToolAction extends TDEAction  {
 	protected KDataToolAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
@@ -63,11 +63,11 @@ public class KDataToolAction extends KAction  {
 			@param tools the list of data tool descriptions
 			@param receiver the receiver for toolActivated() signals
 			@param slot the slot that will receive the toolActivated() signals
-				@return the KActions
+				@return the TDEActions
      
 		@short    Creates a list of actions from a list of information about data-tools.
 	*/
-	// TQPtrList<KAction> dataToolActionList(const TQValueList<KDataToolInfo>& arg1,const TQObject* arg2,const char* arg3); >>>> NOT CONVERTED
+	// TQPtrList<TDEAction> dataToolActionList(const TQValueList<KDataToolInfo>& arg1,const TQObject* arg2,const char* arg3); >>>> NOT CONVERTED
 	protected native void slotActivated();
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
diff --git a/kdejava/koala/org/kde/koala/KDateTableSignals.java b/kdejava/koala/org/kde/koala/KDateTableSignals.java
index 2d4b4e72..3317097f 100644
--- a/kdejava/koala/org/kde/koala/KDateTableSignals.java
+++ b/kdejava/koala/org/kde/koala/KDateTableSignals.java
@@ -39,5 +39,5 @@ public interface KDateTableSignals {
 		 the slot where you fill the menu to this signal.
 				@short    A popup menu for a given date is about to be shown (as when the user  right clicks on that date and the popup menu is enabled).
 	*/
-	void aboutToShowContextMenu(KPopupMenu menu, Calendar date);
+	void aboutToShowContextMenu(TDEPopupMenu menu, Calendar date);
 }
diff --git a/kdejava/koala/org/kde/koala/KDirOperator.java b/kdejava/koala/org/kde/koala/KDirOperator.java
index a8eae95f..5543358e 100644
--- a/kdejava/koala/org/kde/koala/KDirOperator.java
+++ b/kdejava/koala/org/kde/koala/KDirOperator.java
@@ -329,7 +329,7 @@ public class KDirOperator extends TQWidget  {
 	/**	
 		 an accessor to a collection of all available Actions. The actions
 		 are static, they will be there all the time (no need to connect to
-		 the signals KActionCollection.inserted() or removed().
+		 the signals TDEActionCollection.inserted() or removed().
 			 There are the following actions:
 		
 			<li>
@@ -440,7 +440,7 @@ public class KDirOperator extends TQWidget  {
      
 		@short    an accessor to a collection of all available Actions.
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	/**	
 		 Sets the config object and the to be used group in KDirOperator. This
 		 will be used to store the view's configuration via
diff --git a/kdejava/koala/org/kde/koala/KDockMainWindow.java b/kdejava/koala/org/kde/koala/KDockMainWindow.java
index ea035134..e749816e 100644
--- a/kdejava/koala/org/kde/koala/KDockMainWindow.java
+++ b/kdejava/koala/org/kde/koala/KDockMainWindow.java
@@ -11,7 +11,7 @@ import org.kde.qt.TQDomElement;
 
 /**
 
- A special kind of KMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
+ A special kind of TDEMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
  The main widget should be a KDockWidget where other KDockWidget can be docked to
  the left, right, top, bottom or to the middle.
  Note: dock to the middle means to drop on a dockwidget and to unite them to a new widget, a tab control.
@@ -48,10 +48,10 @@ import org.kde.qt.TQDomElement;
  See {@link KDockMainWindowSignals} for signals emitted by KDockMainWindow
 		@author Max Judin (documentation: Falk Brettschneider).
  
-		@short    A special kind of KMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
+		@short    A special kind of TDEMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
 
 */
-public class KDockMainWindow extends KMainWindow  {
+public class KDockMainWindow extends TDEMainWindow  {
 	protected KDockMainWindow(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
diff --git a/kdejava/koala/org/kde/koala/KEditToolbar.java b/kdejava/koala/org/kde/koala/KEditToolbar.java
index 865b1b98..7dae02a6 100644
--- a/kdejava/koala/org/kde/koala/KEditToolbar.java
+++ b/kdejava/koala/org/kde/koala/KEditToolbar.java
@@ -24,7 +24,7 @@ import org.kde.qt.TQWidget;
  </pre>
  That code snippet also takes care of redrawing the menu and
  toolbars if you have made any changes.
- If you are using KMainWindow's settings methods (either save/apply manually
+ If you are using TDEMainWindow's settings methods (either save/apply manually
  or autoSaveSettings), you should write something like:
  <pre>
  void MyClass.slotConfigureToolbars()
@@ -83,7 +83,7 @@ public class KEditToolbar extends KDialogBase  {
 		 relative) of your application's UI resource file.  If it is
 		 left blank, then the resource file: share/apps/appname/appnameui.rc
 		 is used.  This is the same resource file that is used by the
-		 default createGUI() function in KMainWindow so you're usually
+		 default createGUI() function in TDEMainWindow so you're usually
 		 pretty safe in leaving it blank.
 			 The third parameter, global(), controls whether or not the
 		 global resource file is used.  If this is <code>true</code>, then you may
@@ -100,56 +100,56 @@ public class KEditToolbar extends KDialogBase  {
 			@param name An internal name.
 		   		@short    Constructor for apps that do not use components.
 	*/
-	public KEditToolbar(KActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name) {
+	public KEditToolbar(TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name) {
 		super((Class) null);
 		newKEditToolbar(collection,xmlfile,global,parent,name);
 	}
-	private native void newKEditToolbar(KActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name);
-	public KEditToolbar(KActionCollection collection, String xmlfile, boolean global, TQWidget parent) {
+	private native void newKEditToolbar(TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name);
+	public KEditToolbar(TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent) {
 		super((Class) null);
 		newKEditToolbar(collection,xmlfile,global,parent);
 	}
-	private native void newKEditToolbar(KActionCollection collection, String xmlfile, boolean global, TQWidget parent);
-	public KEditToolbar(KActionCollection collection, String xmlfile, boolean global) {
+	private native void newKEditToolbar(TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent);
+	public KEditToolbar(TDEActionCollection collection, String xmlfile, boolean global) {
 		super((Class) null);
 		newKEditToolbar(collection,xmlfile,global);
 	}
-	private native void newKEditToolbar(KActionCollection collection, String xmlfile, boolean global);
-	public KEditToolbar(KActionCollection collection, String xmlfile) {
+	private native void newKEditToolbar(TDEActionCollection collection, String xmlfile, boolean global);
+	public KEditToolbar(TDEActionCollection collection, String xmlfile) {
 		super((Class) null);
 		newKEditToolbar(collection,xmlfile);
 	}
-	private native void newKEditToolbar(KActionCollection collection, String xmlfile);
-	public KEditToolbar(KActionCollection collection) {
+	private native void newKEditToolbar(TDEActionCollection collection, String xmlfile);
+	public KEditToolbar(TDEActionCollection collection) {
 		super((Class) null);
 		newKEditToolbar(collection);
 	}
-	private native void newKEditToolbar(KActionCollection collection);
-	public KEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name) {
+	private native void newKEditToolbar(TDEActionCollection collection);
+	public KEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name) {
 		super((Class) null);
 		newKEditToolbar(defaultToolbar,collection,xmlfile,global,parent,name);
 	}
-	private native void newKEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name);
-	public KEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile, boolean global, TQWidget parent) {
+	private native void newKEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent, String name);
+	public KEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent) {
 		super((Class) null);
 		newKEditToolbar(defaultToolbar,collection,xmlfile,global,parent);
 	}
-	private native void newKEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile, boolean global, TQWidget parent);
-	public KEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile, boolean global) {
+	private native void newKEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent);
+	public KEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile, boolean global) {
 		super((Class) null);
 		newKEditToolbar(defaultToolbar,collection,xmlfile,global);
 	}
-	private native void newKEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile, boolean global);
-	public KEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile) {
+	private native void newKEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile, boolean global);
+	public KEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile) {
 		super((Class) null);
 		newKEditToolbar(defaultToolbar,collection,xmlfile);
 	}
-	private native void newKEditToolbar(String defaultToolbar, KActionCollection collection, String xmlfile);
-	public KEditToolbar(String defaultToolbar, KActionCollection collection) {
+	private native void newKEditToolbar(String defaultToolbar, TDEActionCollection collection, String xmlfile);
+	public KEditToolbar(String defaultToolbar, TDEActionCollection collection) {
 		super((Class) null);
 		newKEditToolbar(defaultToolbar,collection);
 	}
-	private native void newKEditToolbar(String defaultToolbar, KActionCollection collection);
+	private native void newKEditToolbar(String defaultToolbar, TDEActionCollection collection);
 	/**	
 		 Constructor for KParts based apps.
 			 The main parameter, factory(), is a pointer to the
@@ -165,9 +165,9 @@ public class KEditToolbar extends KDialogBase  {
 			@param factory Your application's factory object
 			@param parent The usual parent for the dialog.
 			@param name An internal name.
-			 Some people seem tempted to use this also in non-KParts apps, using KMainWindow.guiFactory().
+			 Some people seem tempted to use this also in non-KParts apps, using TDEMainWindow.guiFactory().
 		 This works, but only _if_ setting conserveMemory to false when calling
-		 KMainWindow.createGUI()! If not, use the other KEditToolbar constructor.
+		 TDEMainWindow.createGUI()! If not, use the other KEditToolbar constructor.
 		   		@short    Constructor for KParts based apps.
 	*/
 	public KEditToolbar(KXMLGUIFactory factory, TQWidget parent, String name) {
diff --git a/kdejava/koala/org/kde/koala/KEditToolbarWidget.java b/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
index 1c37e907..e6182b3c 100644
--- a/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
+++ b/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
@@ -44,7 +44,7 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 		 relative) of your application's UI resource file.  If it is
 		 left blank, then the resource file: share/apps/appname/appnameui.rc
 		 is used.  This is the same resource file that is used by the
-		 default createGUI function in KMainWindow so you're usually
+		 default createGUI function in TDEMainWindow so you're usually
 		 pretty safe in leaving it blank.
 			 The third parameter, global, controls whether or not the
 		 global resource file is used.  If this is true, then you may
@@ -61,46 +61,46 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 			@param parent This widget's parent
 		   		@short    Constructor.
 	*/
-	public KEditToolbarWidget(KActionCollection collection, String xmlfile, boolean global, TQWidget parent) {
+	public KEditToolbarWidget(TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent) {
 		super((Class) null);
 		newKEditToolbarWidget(collection,xmlfile,global,parent);
 	}
-	private native void newKEditToolbarWidget(KActionCollection collection, String xmlfile, boolean global, TQWidget parent);
-	public KEditToolbarWidget(KActionCollection collection, String xmlfile, boolean global) {
+	private native void newKEditToolbarWidget(TDEActionCollection collection, String xmlfile, boolean global, TQWidget parent);
+	public KEditToolbarWidget(TDEActionCollection collection, String xmlfile, boolean global) {
 		super((Class) null);
 		newKEditToolbarWidget(collection,xmlfile,global);
 	}
-	private native void newKEditToolbarWidget(KActionCollection collection, String xmlfile, boolean global);
-	public KEditToolbarWidget(KActionCollection collection, String xmlfile) {
+	private native void newKEditToolbarWidget(TDEActionCollection collection, String xmlfile, boolean global);
+	public KEditToolbarWidget(TDEActionCollection collection, String xmlfile) {
 		super((Class) null);
 		newKEditToolbarWidget(collection,xmlfile);
 	}
-	private native void newKEditToolbarWidget(KActionCollection collection, String xmlfile);
-	public KEditToolbarWidget(KActionCollection collection) {
+	private native void newKEditToolbarWidget(TDEActionCollection collection, String xmlfile);
+	public KEditToolbarWidget(TDEActionCollection collection) {
 		super((Class) null);
 		newKEditToolbarWidget(collection);
 	}
-	private native void newKEditToolbarWidget(KActionCollection collection);
-	public KEditToolbarWidget(String defaultToolbar, KActionCollection collection, String file, boolean global, TQWidget parent) {
+	private native void newKEditToolbarWidget(TDEActionCollection collection);
+	public KEditToolbarWidget(String defaultToolbar, TDEActionCollection collection, String file, boolean global, TQWidget parent) {
 		super((Class) null);
 		newKEditToolbarWidget(defaultToolbar,collection,file,global,parent);
 	}
-	private native void newKEditToolbarWidget(String defaultToolbar, KActionCollection collection, String file, boolean global, TQWidget parent);
-	public KEditToolbarWidget(String defaultToolbar, KActionCollection collection, String file, boolean global) {
+	private native void newKEditToolbarWidget(String defaultToolbar, TDEActionCollection collection, String file, boolean global, TQWidget parent);
+	public KEditToolbarWidget(String defaultToolbar, TDEActionCollection collection, String file, boolean global) {
 		super((Class) null);
 		newKEditToolbarWidget(defaultToolbar,collection,file,global);
 	}
-	private native void newKEditToolbarWidget(String defaultToolbar, KActionCollection collection, String file, boolean global);
-	public KEditToolbarWidget(String defaultToolbar, KActionCollection collection, String file) {
+	private native void newKEditToolbarWidget(String defaultToolbar, TDEActionCollection collection, String file, boolean global);
+	public KEditToolbarWidget(String defaultToolbar, TDEActionCollection collection, String file) {
 		super((Class) null);
 		newKEditToolbarWidget(defaultToolbar,collection,file);
 	}
-	private native void newKEditToolbarWidget(String defaultToolbar, KActionCollection collection, String file);
-	public KEditToolbarWidget(String defaultToolbar, KActionCollection collection) {
+	private native void newKEditToolbarWidget(String defaultToolbar, TDEActionCollection collection, String file);
+	public KEditToolbarWidget(String defaultToolbar, TDEActionCollection collection) {
 		super((Class) null);
 		newKEditToolbarWidget(defaultToolbar,collection);
 	}
-	private native void newKEditToolbarWidget(String defaultToolbar, KActionCollection collection);
+	private native void newKEditToolbarWidget(String defaultToolbar, TDEActionCollection collection);
 	/**	
 		 Constructor for KParts based apps.
 			 The first parameter, factory, is a pointer to the XML GUI
@@ -141,7 +141,7 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 	/**	
 			   		@short
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	/**	
 		 Save any changes the user made.  The file will be in the user's
 		 local directory (usually $HOME/.trinity/share/apps/\<appname\>).  The
@@ -162,7 +162,7 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 	// void insertActive(ToolbarItem* arg1,TQListViewItem* arg2); >>>> NOT CONVERTED
 	// void removeActive(ToolbarItem* arg1); >>>> NOT CONVERTED
 	// void moveActive(ToolbarItem* arg1,TQListViewItem* arg2); >>>> NOT CONVERTED
-	protected native void initNonKPart(KActionCollection collection, String file, boolean global);
+	protected native void initNonKPart(TDEActionCollection collection, String file, boolean global);
 	protected native void initKPart(KXMLGUIFactory factory);
 	protected native void loadToolbarCombo(String defaultToolbar);
 	protected native void loadToolbarCombo();
@@ -171,7 +171,7 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 	protected native void slotToolbarSelected(String text);
 	protected native void slotInactiveSelected(TQListViewItem item);
 	protected native void slotActiveSelected(TQListViewItem item);
-	protected native void slotDropped(KListView list, TQDropEvent e, TQListViewItem after);
+	protected native void slotDropped(TDEListView list, TQDropEvent e, TQListViewItem after);
 	protected native void slotInsertButton();
 	protected native void slotRemoveButton();
 	protected native void slotUpButton();
@@ -189,14 +189,14 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 		 to get the action object.
 		   		@short    Retrieves an action of the client by name.
 	*/
-	public native KAction action(String name);
+	public native TDEAction action(String name);
 	/**	
 		 Retrieves an action for a given TQDomElement. The default
 		 implementation uses the "name" attribute to query the action
 		 object via the other action() method.
 		   		@short    Retrieves an action for a given TQDomElement.
 	*/
-	public native KAction action(TQDomElement element);
+	public native TDEAction action(TQDomElement element);
 	/**	
 				@return The instance ( TDEInstance ) for this GUI client.
    
@@ -319,7 +319,7 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 			 This tag will get expanded to a list of actions.  In the example
 		 above ( a file manager with a dynamic file menu ), you would call
 		 <pre>
-		 TQPtrList<KAction> file_actions;
+		 TQPtrList<TDEAction> file_actions;
 		 for( ... )
 		   if( ... )
 		     file_actions.append( cool_action );
@@ -335,7 +335,7 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 		       menu too..
 		   		@short    ActionLists are a way for XMLGUI to support dynamic lists of  actions.
 	*/
-	// void plugActionList(const TQString& arg1,const TQPtrList<KAction>& arg2); >>>> NOT CONVERTED
+	// void plugActionList(const TQString& arg1,const TQPtrList<TDEAction>& arg2); >>>> NOT CONVERTED
 	/**	
 		 The complement of plugActionList() ...
 		   		@short    The complement of plugActionList() .
diff --git a/kdejava/koala/org/kde/koala/KFileDetailView.java b/kdejava/koala/org/kde/koala/KFileDetailView.java
index c9c4b1ca..1e955b35 100644
--- a/kdejava/koala/org/kde/koala/KFileDetailView.java
+++ b/kdejava/koala/org/kde/koala/KFileDetailView.java
@@ -25,7 +25,7 @@ import org.kde.qt.TQDragObject;
 		@see KFileIconView
 
 */
-public class KFileDetailView extends KListView implements KFileViewInterface {
+public class KFileDetailView extends TDEListView implements KFileViewInterface {
 	protected KFileDetailView(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
@@ -184,7 +184,7 @@ public class KFileDetailView extends KListView implements KFileViewInterface {
      
 		@short
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	public native KFileViewSignaler signaler();
 	/**	
 		 Specify DND options. See DropOptions for details.
diff --git a/kdejava/koala/org/kde/koala/KFileDialog.java b/kdejava/koala/org/kde/koala/KFileDialog.java
index 7f8957da..6c790874 100644
--- a/kdejava/koala/org/kde/koala/KFileDialog.java
+++ b/kdejava/koala/org/kde/koala/KFileDialog.java
@@ -323,14 +323,14 @@ public class KFileDialog extends KDialogBase  {
 			 You can use this to insert custom
 		 items into it, e.g.:
 		 <pre>
-		      yourAction = new KAction( i18n("Your Action"), 0,
+		      yourAction = new TDEAction( i18n("Your Action"), 0,
 		                                this, SLOT("yourSlot()"),
 		                                this, "action name" );
 		      yourAction.plug( tdefileDialog.toolBar() );
 		 </pre>
 		     		@short    Returns a pointer to the toolbar.
 	*/
-	public native KToolBar toolBar();
+	public native TDEToolBar toolBar();
 	/**	
 				@return a pointer to the OK-Button in the filedialog. You may use it
  e.g. to set a custom text to it.
@@ -363,11 +363,11 @@ public class KFileDialog extends KDialogBase  {
 	public native KURLBar speedBar();
 	/**	
 				@return a pointer to the action collection, holding all the used
- KActions.
+ TDEActions.
      
 		@short
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	/**	
 				@return the index of the path combobox so when inserting widgets into
  the dialog (e.g. subclasses) they can do so without hardcoding in an index
@@ -756,7 +756,7 @@ public class KFileDialog extends KDialogBase  {
 			@param startDir A url/directory, to be used. May use the ':' and '.' syntax
 		        as documented in the KFileDialog() constructor.
 			@param recentDirClass If the ':' or '.' syntax is used, recentDirClass
-		        will contain the string to be used later for KRecentDir.dir()
+		        will contain the string to be used later for TDERecentDir.dir()
 				@return The URL that should be listed by default (e.g. by KFileDialog or
          KDirSelectDialog).
 
diff --git a/kdejava/koala/org/kde/koala/KFileIconView.java b/kdejava/koala/org/kde/koala/KFileIconView.java
index 486e3e85..3c821713 100644
--- a/kdejava/koala/org/kde/koala/KFileIconView.java
+++ b/kdejava/koala/org/kde/koala/KFileIconView.java
@@ -237,7 +237,7 @@ public class KFileIconView extends KIconView implements KFileViewInterface {
      
 		@short
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	public native KFileViewSignaler signaler();
 	/**	
 		 Specify DND options. See DropOptions for details.
diff --git a/kdejava/koala/org/kde/koala/KFileListViewItem.java b/kdejava/koala/org/kde/koala/KFileListViewItem.java
index b2b9795d..9ab7d7e0 100644
--- a/kdejava/koala/org/kde/koala/KFileListViewItem.java
+++ b/kdejava/koala/org/kde/koala/KFileListViewItem.java
@@ -15,7 +15,7 @@ import org.kde.qt.TQListView;
  		@short    An item for the listiew, that has a reference to its corresponding  KFileItem.
 
 */
-public class KFileListViewItem extends KListViewItem  {
+public class KFileListViewItem extends TDEListViewItem  {
 	protected KFileListViewItem(Class dummy){super((Class) null);}
 	public KFileListViewItem(TQListView parent, String text, TQPixmap icon, KFileItem fi) {
 		super((Class) null);
diff --git a/kdejava/koala/org/kde/koala/KFilePreview.java b/kdejava/koala/org/kde/koala/KFilePreview.java
index f5f4cca4..fd05195f 100644
--- a/kdejava/koala/org/kde/koala/KFilePreview.java
+++ b/kdejava/koala/org/kde/koala/KFilePreview.java
@@ -64,11 +64,11 @@ public class KFilePreview extends TQSplitter implements KFileViewInterface {
 	/**	
 		 This overrides KFileView.actionCollection() by returning
 		 the actionCollection() of the KFileView (member left) it contains.
-		 This means that KFilePreview will never create a KActionCollection
+		 This means that KFilePreview will never create a TDEActionCollection
 		 object of its own.
 		     		@short    This overrides KFileView.actionCollection() by returning  the actionCollection() of the KFileView (member left) it contains.
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	public native void ensureItemVisible(KFileItem arg1);
 	public native void setPreviewWidget(TQWidget w, KURL u);
 	protected native void slotHighlighted(KFileItem arg1);
diff --git a/kdejava/koala/org/kde/koala/KFileTreeView.java b/kdejava/koala/org/kde/koala/KFileTreeView.java
index a0a8002c..51a65d57 100644
--- a/kdejava/koala/org/kde/koala/KFileTreeView.java
+++ b/kdejava/koala/org/kde/koala/KFileTreeView.java
@@ -29,7 +29,7 @@ import org.kde.qt.TQDragObject;
 		@short    The filetreeview offers a treeview on the file system which behaves like  a TQTreeView showing files and/or directories in the file system.
 
 */
-public class KFileTreeView extends KListView  {
+public class KFileTreeView extends TDEListView  {
 	protected KFileTreeView(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
diff --git a/kdejava/koala/org/kde/koala/KFileTreeViewItem.java b/kdejava/koala/org/kde/koala/KFileTreeViewItem.java
index f4a42bf2..1938b7e6 100644
--- a/kdejava/koala/org/kde/koala/KFileTreeViewItem.java
+++ b/kdejava/koala/org/kde/koala/KFileTreeViewItem.java
@@ -10,7 +10,7 @@ import org.kde.qt.QtSupport;
  		@short    An item for a KFileTreeView that knows about its own KFileItem.
 
 */
-public class KFileTreeViewItem extends KListViewItem  {
+public class KFileTreeViewItem extends TDEListViewItem  {
 	protected KFileTreeViewItem(Class dummy){super((Class) null);}
 	public KFileTreeViewItem(KFileTreeViewItem arg1, KFileItem arg2, KFileTreeBranch arg3) {
 		super((Class) null);
diff --git a/kdejava/koala/org/kde/koala/KFileView.java b/kdejava/koala/org/kde/koala/KFileView.java
index cfed91d2..d88bec4a 100644
--- a/kdejava/koala/org/kde/koala/KFileView.java
+++ b/kdejava/koala/org/kde/koala/KFileView.java
@@ -264,7 +264,7 @@ public class KFileView implements QtSupport, KFileViewInterface {
      
 		@short
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	public native KFileViewSignaler signaler();
 	public native void readConfig(TDEConfig arg1, String group);
 	public native void readConfig(TDEConfig arg1);
diff --git a/kdejava/koala/org/kde/koala/KFileViewInterface.java b/kdejava/koala/org/kde/koala/KFileViewInterface.java
index e3d5c83e..b5a05049 100644
--- a/kdejava/koala/org/kde/koala/KFileViewInterface.java
+++ b/kdejava/koala/org/kde/koala/KFileViewInterface.java
@@ -46,7 +46,7 @@ public interface KFileViewInterface {
 		void setOnlyDoubleClickSelectsFiles(boolean enable);
 		boolean onlyDoubleClickSelectsFiles();
 		boolean updateNumbers(KFileItem i);
-		KActionCollection actionCollection();
+		TDEActionCollection actionCollection();
 		KFileViewSignaler signaler();
 		void readConfig(TDEConfig arg1, String group);
 		void readConfig(TDEConfig arg1);
diff --git a/kdejava/koala/org/kde/koala/KFontAction.java b/kdejava/koala/org/kde/koala/KFontAction.java
deleted file mode 100644
index 56241891..00000000
--- a/kdejava/koala/org/kde/koala/KFontAction.java
+++ /dev/null
@@ -1,172 +0,0 @@
-//Auto-generated by kalyptus. DO NOT EDIT.
-package org.kde.koala;
-
-import org.kde.qt.Qt;
-import org.kde.qt.TQMetaObject;
-import org.kde.qt.QtSupport;
-import org.kde.qt.TQObject;
-import org.kde.qt.TQIconSet;
-import org.kde.qt.TQWidget;
-
-/**
-*/
-public class KFontAction extends KSelectAction  {
-	protected KFontAction(Class dummy){super((Class) null);}
-	public native TQMetaObject metaObject();
-	public native String className();
-	public KFontAction(String text, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(text,cut,parent,name);
-	}
-	private native void newKFontAction(String text, KShortcut cut, TQObject parent, String name);
-	public KFontAction(String text, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontAction(text,cut,parent);
-	}
-	private native void newKFontAction(String text, KShortcut cut, TQObject parent);
-	public KFontAction(String text, KShortcut cut) {
-		super((Class) null);
-		newKFontAction(text,cut);
-	}
-	private native void newKFontAction(String text, KShortcut cut);
-	public KFontAction(String text) {
-		super((Class) null);
-		newKFontAction(text);
-	}
-	private native void newKFontAction(String text);
-	public KFontAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(text,cut,receiver,slot,parent,name);
-	}
-	private native void newKFontAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KFontAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKFontAction(text,cut,receiver,slot,parent);
-	}
-	private native void newKFontAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	public KFontAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,parent,name);
-	}
-	private native void newKFontAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name);
-	public KFontAction(String text, TQIconSet pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,parent);
-	}
-	private native void newKFontAction(String text, TQIconSet pix, KShortcut cut, TQObject parent);
-	public KFontAction(String text, TQIconSet pix, KShortcut cut) {
-		super((Class) null);
-		newKFontAction(text,pix,cut);
-	}
-	private native void newKFontAction(String text, TQIconSet pix, KShortcut cut);
-	public KFontAction(String text, TQIconSet pix) {
-		super((Class) null);
-		newKFontAction(text,pix);
-	}
-	private native void newKFontAction(String text, TQIconSet pix);
-	public KFontAction(String text, String pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,parent,name);
-	}
-	private native void newKFontAction(String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KFontAction(String text, String pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,parent);
-	}
-	private native void newKFontAction(String text, String pix, KShortcut cut, TQObject parent);
-	public KFontAction(String text, String pix, KShortcut cut) {
-		super((Class) null);
-		newKFontAction(text,pix,cut);
-	}
-	private native void newKFontAction(String text, String pix, KShortcut cut);
-	public KFontAction(String text, String pix) {
-		super((Class) null);
-		newKFontAction(text,pix);
-	}
-	private native void newKFontAction(String text, String pix);
-	public KFontAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKFontAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KFontAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKFontAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	public KFontAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKFontAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KFontAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKFontAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKFontAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	public KFontAction(int fontListCriteria, String text, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text,cut,parent,name);
-	}
-	private native void newKFontAction(int fontListCriteria, String text, KShortcut cut, TQObject parent, String name);
-	public KFontAction(int fontListCriteria, String text, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text,cut,parent);
-	}
-	private native void newKFontAction(int fontListCriteria, String text, KShortcut cut, TQObject parent);
-	public KFontAction(int fontListCriteria, String text, KShortcut cut) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text,cut);
-	}
-	private native void newKFontAction(int fontListCriteria, String text, KShortcut cut);
-	public KFontAction(int fontListCriteria, String text) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text);
-	}
-	private native void newKFontAction(int fontListCriteria, String text);
-	public KFontAction(int fontListCriteria, String text, String pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text,pix,cut,parent,name);
-	}
-	private native void newKFontAction(int fontListCriteria, String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KFontAction(int fontListCriteria, String text, String pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text,pix,cut,parent);
-	}
-	private native void newKFontAction(int fontListCriteria, String text, String pix, KShortcut cut, TQObject parent);
-	public KFontAction(int fontListCriteria, String text, String pix, KShortcut cut) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text,pix,cut);
-	}
-	private native void newKFontAction(int fontListCriteria, String text, String pix, KShortcut cut);
-	public KFontAction(int fontListCriteria, String text, String pix) {
-		super((Class) null);
-		newKFontAction(fontListCriteria,text,pix);
-	}
-	private native void newKFontAction(int fontListCriteria, String text, String pix);
-	public KFontAction(TQObject parent, String name) {
-		super((Class) null);
-		newKFontAction(parent,name);
-	}
-	private native void newKFontAction(TQObject parent, String name);
-	public KFontAction(TQObject parent) {
-		super((Class) null);
-		newKFontAction(parent);
-	}
-	private native void newKFontAction(TQObject parent);
-	public KFontAction() {
-		super((Class) null);
-		newKFontAction();
-	}
-	private native void newKFontAction();
-	public native String font();
-	public native int plug(TQWidget arg1, int index);
-	public native int plug(TQWidget arg1);
-	public native void setFont(String family);
-	/** Deletes the wrapped C++ instance */
-	protected native void finalize() throws InternalError;
-	/** Delete the wrapped C++ instance ahead of finalize() */
-	public native void dispose();
-	/** Has the wrapped C++ instance been deleted? */
-	public native boolean isDisposed();
-}
diff --git a/kdejava/koala/org/kde/koala/KFontSizeAction.java b/kdejava/koala/org/kde/koala/KFontSizeAction.java
deleted file mode 100644
index 4a970fdf..00000000
--- a/kdejava/koala/org/kde/koala/KFontSizeAction.java
+++ /dev/null
@@ -1,133 +0,0 @@
-//Auto-generated by kalyptus. DO NOT EDIT.
-package org.kde.koala;
-
-import org.kde.qt.Qt;
-import org.kde.qt.TQMetaObject;
-import org.kde.qt.QtSupport;
-import org.kde.qt.TQObject;
-import org.kde.qt.TQIconSet;
-
-/**
- See {@link KFontSizeActionSignals} for signals emitted by KFontSizeAction
-*/
-public class KFontSizeAction extends KSelectAction  {
-	protected KFontSizeAction(Class dummy){super((Class) null);}
-	public native TQMetaObject metaObject();
-	public native String className();
-	public KFontSizeAction(String text, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontSizeAction(text,cut,parent,name);
-	}
-	private native void newKFontSizeAction(String text, KShortcut cut, TQObject parent, String name);
-	public KFontSizeAction(String text, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontSizeAction(text,cut,parent);
-	}
-	private native void newKFontSizeAction(String text, KShortcut cut, TQObject parent);
-	public KFontSizeAction(String text, KShortcut cut) {
-		super((Class) null);
-		newKFontSizeAction(text,cut);
-	}
-	private native void newKFontSizeAction(String text, KShortcut cut);
-	public KFontSizeAction(String text) {
-		super((Class) null);
-		newKFontSizeAction(text);
-	}
-	private native void newKFontSizeAction(String text);
-	public KFontSizeAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKFontSizeAction(text,cut,receiver,slot,parent,name);
-	}
-	private native void newKFontSizeAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KFontSizeAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKFontSizeAction(text,cut,receiver,slot,parent);
-	}
-	private native void newKFontSizeAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	public KFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,parent,name);
-	}
-	private native void newKFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name);
-	public KFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,parent);
-	}
-	private native void newKFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject parent);
-	public KFontSizeAction(String text, TQIconSet pix, KShortcut cut) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut);
-	}
-	private native void newKFontSizeAction(String text, TQIconSet pix, KShortcut cut);
-	public KFontSizeAction(String text, TQIconSet pix) {
-		super((Class) null);
-		newKFontSizeAction(text,pix);
-	}
-	private native void newKFontSizeAction(String text, TQIconSet pix);
-	public KFontSizeAction(String text, String pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,parent,name);
-	}
-	private native void newKFontSizeAction(String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KFontSizeAction(String text, String pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,parent);
-	}
-	private native void newKFontSizeAction(String text, String pix, KShortcut cut, TQObject parent);
-	public KFontSizeAction(String text, String pix, KShortcut cut) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut);
-	}
-	private native void newKFontSizeAction(String text, String pix, KShortcut cut);
-	public KFontSizeAction(String text, String pix) {
-		super((Class) null);
-		newKFontSizeAction(text,pix);
-	}
-	private native void newKFontSizeAction(String text, String pix);
-	public KFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKFontSizeAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	public KFontSizeAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKFontSizeAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KFontSizeAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKFontSizeAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKFontSizeAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	public KFontSizeAction(TQObject parent, String name) {
-		super((Class) null);
-		newKFontSizeAction(parent,name);
-	}
-	private native void newKFontSizeAction(TQObject parent, String name);
-	public KFontSizeAction(TQObject parent) {
-		super((Class) null);
-		newKFontSizeAction(parent);
-	}
-	private native void newKFontSizeAction(TQObject parent);
-	public KFontSizeAction() {
-		super((Class) null);
-		newKFontSizeAction();
-	}
-	private native void newKFontSizeAction();
-	public native int fontSize();
-	public native void setFontSize(int size);
-	protected native void slotActivated(int arg1);
-	protected native void slotActivated(String arg1);
-	protected native void slotActivated();
-	/** Deletes the wrapped C++ instance */
-	protected native void finalize() throws InternalError;
-	/** Delete the wrapped C++ instance ahead of finalize() */
-	public native void dispose();
-	/** Has the wrapped C++ instance been deleted? */
-	public native boolean isDisposed();
-}
diff --git a/kdejava/koala/org/kde/koala/KGradientSelector.java b/kdejava/koala/org/kde/koala/KGradientSelector.java
index 911fca0e..e9269952 100644
--- a/kdejava/koala/org/kde/koala/KGradientSelector.java
+++ b/kdejava/koala/org/kde/koala/KGradientSelector.java
@@ -18,7 +18,7 @@ import org.kde.qt.TQWidget;
 		@short    The KGradientSelector widget allows the user to choose  from a one-dimensional range of colors which is given as a  gradient between two colors provided by the programmer.
 
 */
-public class KGradientSelector extends KSelector  {
+public class KGradientSelector extends TDESelector  {
 	protected KGradientSelector(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
diff --git a/kdejava/koala/org/kde/koala/KHelpMenu.java b/kdejava/koala/org/kde/koala/KHelpMenu.java
index 6f79aeec..48a32b33 100644
--- a/kdejava/koala/org/kde/koala/KHelpMenu.java
+++ b/kdejava/koala/org/kde/koala/KHelpMenu.java
@@ -11,10 +11,10 @@ import org.kde.qt.TQObject;
 
  This class provides the standard %KDE help menu with the default "about"
  dialog boxes and help entry.
- This class is used in KMainWindow so
+ This class is used in TDEMainWindow so
  normally you don't need to use this class yourself. However, if you
  need the help menu or any of its dialog boxes in your code that is
- not subclassed from KMainWindow you should use this class.
+ not subclassed from TDEMainWindow you should use this class.
  The usage is simple:
  <pre>
  mHelpMenu = new KHelpMenu( this, <someText> );
@@ -26,7 +26,7 @@ import org.kde.qt.TQObject;
  connect( this, SIGNAL("someSignal()"), mHelpMenu,SLOT("mHelpMenu.aboutKDE()"));
  </pre>
  IMPORTANT:
- The first time you use KHelpMenu.menu(), a KPopupMenu object is
+ The first time you use KHelpMenu.menu(), a TDEPopupMenu object is
  allocated. Only one object is created by the class so if you call
  KHelpMenu.menu() twice or more, the same pointer is returned. The class
  will destroy the popupmenu in the destructor so do not delete this
@@ -66,7 +66,7 @@ import org.kde.qt.TQObject;
  void MyClass.myFunc()
  {
    KHelpMenu helpMenu = new KHelpMenu( this );
-   KPopupMenu help = mHelpMenu.menu();
+   TDEPopupMenu help = mHelpMenu.menu();
    help.connectItem( KHelpMenu.menuAboutApp, this, SLOT("myDialogSlot()") );
  }
  void MyClass.myDialogSlot()
@@ -132,15 +132,15 @@ public class KHelpMenu extends TQObject  {
 			@param aboutData User and app data used in the About app dialog
 			@param showWhatsThis Decides whether a "Whats this" entry will be
 		        added to the dialog.
-			@param actions KActionCollection that is used instead of the
+			@param actions TDEActionCollection that is used instead of the
 		        standard actions.
 			     		@short    Constructor.
 	*/
-	public KHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis, KActionCollection actions) {
+	public KHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis, TDEActionCollection actions) {
 		super((Class) null);
 		newKHelpMenu(parent,aboutData,showWhatsThis,actions);
 	}
-	private native void newKHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis, KActionCollection actions);
+	private native void newKHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis, TDEActionCollection actions);
 	public KHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis) {
 		super((Class) null);
 		newKHelpMenu(parent,aboutData,showWhatsThis);
@@ -158,7 +158,7 @@ public class KHelpMenu extends TQObject  {
 		 you call this method twice or more the same pointer is returned
 		     		@short    Returns a popup menu you can use in the menu bar or where you  need it.
 	*/
-	public native KPopupMenu menu();
+	public native TDEPopupMenu menu();
 	/**	
 		 Opens the help page for the application. The application name is
 		 used as a key to determine what to display and the system will attempt
diff --git a/kdejava/koala/org/kde/koala/KKey.java b/kdejava/koala/org/kde/koala/KKey.java
index 3bc06cf6..9a021119 100644
--- a/kdejava/koala/org/kde/koala/KKey.java
+++ b/kdejava/koala/org/kde/koala/KKey.java
@@ -15,7 +15,7 @@ import org.kde.qt.TQKeyEvent;
 		@short    A KKey object represents a single key with possible modifiers  (Shift, Ctrl, Alt, Win).
 		@see KKeyNative
 		@see KKeySequence
-		@see KShortcut
+		@see TDEShortcut
 
 */
 public class KKey implements QtSupport {
diff --git a/kdejava/koala/org/kde/koala/KKeyButton.java b/kdejava/koala/org/kde/koala/KKeyButton.java
index 8d7c27e8..e3e034b8 100644
--- a/kdejava/koala/org/kde/koala/KKeyButton.java
+++ b/kdejava/koala/org/kde/koala/KKeyButton.java
@@ -46,8 +46,8 @@ public class KKeyButton extends TQPushButton  {
 		newKKeyButton();
 	}
 	private native void newKKeyButton();
-	public native void setShortcut(KShortcut cut, boolean bQtShortcut);
-	public native KShortcut shortcut();
+	public native void setShortcut(TDEShortcut cut, boolean bQtShortcut);
+	public native TDEShortcut shortcut();
 	/**	
 		 Reimplemented for internal purposes.
 					@short    Reimplemented for internal purposes.
diff --git a/kdejava/koala/org/kde/koala/KKeyButtonSignals.java b/kdejava/koala/org/kde/koala/KKeyButtonSignals.java
index 73f3e25e..ad86343a 100644
--- a/kdejava/koala/org/kde/koala/KKeyButtonSignals.java
+++ b/kdejava/koala/org/kde/koala/KKeyButtonSignals.java
@@ -7,5 +7,5 @@ import org.kde.qt.TQPainter;
 import org.kde.qt.TQWidget;
 
 public interface KKeyButtonSignals {
-	void capturedShortcut(KShortcut arg1);
+	void capturedShortcut(TDEShortcut arg1);
 }
diff --git a/kdejava/koala/org/kde/koala/KKeyChooser.java b/kdejava/koala/org/kde/koala/KKeyChooser.java
index c90616f3..8e23ae50 100644
--- a/kdejava/koala/org/kde/koala/KKeyChooser.java
+++ b/kdejava/koala/org/kde/koala/KKeyChooser.java
@@ -12,7 +12,7 @@ import org.kde.qt.TQWidget;
 
 /**
 
- Configure dictionaries of key/action associations for KAccel and
+ Configure dictionaries of key/action associations for TDEAccel and
  TDEGlobalAccel.
  The class takes care of all aspects of configuration, including
  handling key conflicts internally. Connect to the allDefault()
@@ -21,7 +21,7 @@ import org.kde.qt.TQWidget;
  See {@link KKeyChooserSignals} for signals emitted by KKeyChooser
 		@author Nicolas Hadacek <hadacek@via.ecp.fr>
  
-		@short Widget for configuration of KAccel and TDEGlobalAccel. 
+		@short Widget for configuration of TDEAccel and TDEGlobalAccel. 
 		@see KKeyDialog
 
 */
@@ -56,56 +56,56 @@ public class KKeyChooser extends TQWidget  {
 	/**	
 		 \overload
 			@param parent parent widget
-			@param coll the KActionCollection to configure
+			@param coll the TDEActionCollection to configure
 			@param bAllowLetterShortcuts Set to false if unmodified alphanumeric
 		  keys ('A', '1', etc.) are not permissible shortcuts.
 		     		@short    \overload
 	*/
-	public KKeyChooser(KActionCollection coll, TQWidget parent, boolean bAllowLetterShortcuts) {
+	public KKeyChooser(TDEActionCollection coll, TQWidget parent, boolean bAllowLetterShortcuts) {
 		super((Class) null);
 		newKKeyChooser(coll,parent,bAllowLetterShortcuts);
 	}
-	private native void newKKeyChooser(KActionCollection coll, TQWidget parent, boolean bAllowLetterShortcuts);
-	public KKeyChooser(KActionCollection coll, TQWidget parent) {
+	private native void newKKeyChooser(TDEActionCollection coll, TQWidget parent, boolean bAllowLetterShortcuts);
+	public KKeyChooser(TDEActionCollection coll, TQWidget parent) {
 		super((Class) null);
 		newKKeyChooser(coll,parent);
 	}
-	private native void newKKeyChooser(KActionCollection coll, TQWidget parent);
-	public KKeyChooser(KAccel actions, TQWidget parent, boolean bAllowLetterShortcuts) {
+	private native void newKKeyChooser(TDEActionCollection coll, TQWidget parent);
+	public KKeyChooser(TDEAccel actions, TQWidget parent, boolean bAllowLetterShortcuts) {
 		super((Class) null);
 		newKKeyChooser(actions,parent,bAllowLetterShortcuts);
 	}
-	private native void newKKeyChooser(KAccel actions, TQWidget parent, boolean bAllowLetterShortcuts);
-	public KKeyChooser(KAccel actions, TQWidget parent) {
+	private native void newKKeyChooser(TDEAccel actions, TQWidget parent, boolean bAllowLetterShortcuts);
+	public KKeyChooser(TDEAccel actions, TQWidget parent) {
 		super((Class) null);
 		newKKeyChooser(actions,parent);
 	}
-	private native void newKKeyChooser(KAccel actions, TQWidget parent);
+	private native void newKKeyChooser(TDEAccel actions, TQWidget parent);
 	public KKeyChooser(TDEGlobalAccel actions, TQWidget parent) {
 		super((Class) null);
 		newKKeyChooser(actions,parent);
 	}
 	private native void newKKeyChooser(TDEGlobalAccel actions, TQWidget parent);
-	// KKeyChooser* KKeyChooser(KShortcutList* arg1,TQWidget* arg2,ActionType arg3,bool arg4); >>>> NOT CONVERTED
-	// KKeyChooser* KKeyChooser(KShortcutList* arg1,TQWidget* arg2,ActionType arg3); >>>> NOT CONVERTED
-	public KKeyChooser(KShortcutList arg1, TQWidget parent) {
+	// KKeyChooser* KKeyChooser(TDEShortcutList* arg1,TQWidget* arg2,ActionType arg3,bool arg4); >>>> NOT CONVERTED
+	// KKeyChooser* KKeyChooser(TDEShortcutList* arg1,TQWidget* arg2,ActionType arg3); >>>> NOT CONVERTED
+	public KKeyChooser(TDEShortcutList arg1, TQWidget parent) {
 		super((Class) null);
 		newKKeyChooser(arg1,parent);
 	}
-	private native void newKKeyChooser(KShortcutList arg1, TQWidget parent);
+	private native void newKKeyChooser(TDEShortcutList arg1, TQWidget parent);
 	/**	
 		 Insert an action collection, i.e. add all its actions to the ones
 		 already associated with the KKeyChooser object.
 			 		@short    Insert an action collection, i.
 	*/
-	public native boolean insert(KActionCollection arg1);
+	public native boolean insert(TDEActionCollection arg1);
 	/**	
 		 Insert an action collection, i.e. add all its actions to the ones
 		 already associated with the KKeyChooser object.
 			@param title subtree title of this collection of shortcut.
 				@short    Insert an action collection, i.
 	*/
-	public native boolean insert(KActionCollection arg1, String title);
+	public native boolean insert(TDEActionCollection arg1, String title);
 	public native void syncToConfig(String sConfigGroup, TDEConfigBase pConfig, boolean bClearUnset);
 	/**	
 		 This function writes any shortcut changes back to the original
@@ -115,7 +115,7 @@ public class KKeyChooser extends TQWidget  {
 	public native void commitChanges();
 	/**	
 		 This commits and then saves the actions to disk.
-		 Any KActionCollection objects with the xmlFile() value set
+		 Any TDEActionCollection objects with the xmlFile() value set
 		 will be written to an XML file.  All other will be written
 		 to the application's rc file.
 			 		@short    This commits and then saves the actions to disk.
@@ -151,7 +151,7 @@ public class KKeyChooser extends TQWidget  {
 
 		@short    Checks whether the given shortcut conflicts with global keyboard shortcuts.
 	*/
-	public static native boolean checkGlobalShortcutsConflict(KShortcut cut, boolean warnUser, TQWidget parent);
+	public static native boolean checkGlobalShortcutsConflict(TDEShortcut cut, boolean warnUser, TQWidget parent);
 	/**	
 		 Checks whether the given shortcut conflicts with standard keyboard shortcuts.
 		 If yes, and the warnUser argument is true, warns the user and gives them a chance
@@ -164,26 +164,26 @@ public class KKeyChooser extends TQWidget  {
 
 		@short    Checks whether the given shortcut conflicts with standard keyboard shortcuts.
 	*/
-	public static native boolean checkStandardShortcutsConflict(KShortcut cut, boolean warnUser, TQWidget parent);
+	public static native boolean checkStandardShortcutsConflict(TDEShortcut cut, boolean warnUser, TQWidget parent);
 	// void initGUI(ActionType arg1,bool arg2); >>>> NOT CONVERTED
-	protected native boolean insert(KAccel arg1);
+	protected native boolean insert(TDEAccel arg1);
 	protected native boolean insert(TDEGlobalAccel arg1);
-	protected native boolean insert(KShortcutList arg1);
+	protected native boolean insert(TDEShortcutList arg1);
 	protected native void buildListView(int iList, String title);
 	protected native void buildListView(int iList);
 	protected native void readGlobalKeys();
 	protected native void updateButtons();
 	protected native void fontChange(TQFont _font);
-	protected native void setShortcut(KShortcut cut);
-	protected native boolean isKeyPresent(KShortcut cut, boolean warnuser);
-	protected native boolean isKeyPresent(KShortcut cut);
-	// bool isKeyPresentLocally(const KShortcut& arg1,KKeyChooserItem* arg2,const TQString& arg3); >>>> NOT CONVERTED
+	protected native void setShortcut(TDEShortcut cut);
+	protected native boolean isKeyPresent(TDEShortcut cut, boolean warnuser);
+	protected native boolean isKeyPresent(TDEShortcut cut);
+	// bool isKeyPresentLocally(const TDEShortcut& arg1,KKeyChooserItem* arg2,const TQString& arg3); >>>> NOT CONVERTED
 	protected native void _warning(KKeySequence seq, String sAction, String sTitle);
 	protected native void slotNoKey();
 	protected native void slotDefaultKey();
 	protected native void slotCustomKey();
 	protected native void slotListItemSelected(TQListViewItem item);
-	protected native void capturedShortcut(KShortcut cut);
+	protected native void capturedShortcut(TDEShortcut cut);
 	protected native void slotSettingsChanged(int arg1);
 	protected native void slotListItemDoubleClicked(TQListViewItem ipoTQListViewItem, TQPoint ipoTQPoint, int c);
 	/** Deletes the wrapped C++ instance */
diff --git a/kdejava/koala/org/kde/koala/KKeyDialog.java b/kdejava/koala/org/kde/koala/KKeyDialog.java
index 1e2a9ab6..a94c6831 100644
--- a/kdejava/koala/org/kde/koala/KKeyDialog.java
+++ b/kdejava/koala/org/kde/koala/KKeyDialog.java
@@ -9,16 +9,16 @@ import org.kde.qt.TQWidget;
 /**
 
  The KKeyDialog class is used for configuring dictionaries of key/action
- associations for KActionCollection, KAccel, and TDEGlobalAccel. It uses the KKeyChooser widget
+ associations for TDEActionCollection, TDEAccel, and TDEGlobalAccel. It uses the KKeyChooser widget
  and offers buttons to set all keys to defaults and invoke on-line help.
  Several static methods are supplied which provide the most convenient interface
- to the dialog. The most common and most encouraged use is with KActionCollection.
+ to the dialog. The most common and most encouraged use is with TDEActionCollection.
  <pre>
  KKeyDialog.configure( actionCollection() );
  </pre>
 		@author Nicolas Hadacek <hadacek@via.ecp.fr>
  
-		@short Dialog for configuration of KActionCollection, KAccel, and TDEGlobalAccel.
+		@short Dialog for configuration of TDEActionCollection, TDEAccel, and TDEGlobalAccel.
 
 */
 public class KKeyDialog extends KDialogBase  {
@@ -61,7 +61,7 @@ public class KKeyDialog extends KDialogBase  {
 	 
 		@short    Insert an action collection, i.
 	*/
-	public native boolean insert(KActionCollection arg1);
+	public native boolean insert(TDEActionCollection arg1);
 	/**	
 		 Insert an action collection, i.e. add all its actions to the ones
 		 displayed by the dialog.
@@ -74,7 +74,7 @@ public class KKeyDialog extends KDialogBase  {
 
 		@short    Insert an action collection, i.
 	*/
-	public native boolean insert(KActionCollection arg1, String title);
+	public native boolean insert(TDEActionCollection arg1, String title);
 	/**	
 		 Run the dialog and call commitChanges() if <code>bSaveSettings</code>
 		 is true.
@@ -98,18 +98,18 @@ public class KKeyDialog extends KDialogBase  {
 	 
 		@short    Pops up a modal dialog for configuring key settings.
 	*/
-	public static native int configure(KActionCollection coll, TQWidget parent, boolean bSaveSettings);
-	public static native int configure(KActionCollection coll, TQWidget parent);
-	public static native int configure(KActionCollection coll);
+	public static native int configure(TDEActionCollection coll, TQWidget parent, boolean bSaveSettings);
+	public static native int configure(TDEActionCollection coll, TQWidget parent);
+	public static native int configure(TDEActionCollection coll);
 	/**	
 		 This is an overloaded member function, provided for convenience.
 		 It behaves essentially like the above function, except that settings
 		 are saved to a .rc file using TDEConfig.
 			 		@short    This is an overloaded member function, provided for convenience.
 	*/
-	public static native int configure(KAccel keys, TQWidget parent, boolean bSaveSettings);
-	public static native int configure(KAccel keys, TQWidget parent);
-	public static native int configure(KAccel keys);
+	public static native int configure(TDEAccel keys, TQWidget parent, boolean bSaveSettings);
+	public static native int configure(TDEAccel keys, TQWidget parent);
+	public static native int configure(TDEAccel keys);
 	/**	
 		 This is an overloaded member function, provided for convenience.
 		 It behaves essentially like the above function.
@@ -121,7 +121,7 @@ public class KKeyDialog extends KDialogBase  {
 	/**	
 		 This is an overloaded member function, provided for convenience.
 		 It behaves essentially like the above function.
-			@param coll the KActionCollection to configure
+			@param coll the TDEActionCollection to configure
 			@param bAllowLetterShortcuts Set to false if unmodified alphanumeric
 		  keys ('A', '1', etc.) are not permissible shortcuts.
 			@param parent the parent widget to attach to
@@ -129,17 +129,17 @@ public class KKeyDialog extends KDialogBase  {
 		 the uirc file which they were intially read from.
 			 		@short    This is an overloaded member function, provided for convenience.
 	*/
-	public static native int configure(KActionCollection coll, boolean bAllowLetterShortcuts, TQWidget parent, boolean bSaveSettings);
-	public static native int configure(KActionCollection coll, boolean bAllowLetterShortcuts, TQWidget parent);
-	public static native int configure(KActionCollection coll, boolean bAllowLetterShortcuts);
+	public static native int configure(TDEActionCollection coll, boolean bAllowLetterShortcuts, TQWidget parent, boolean bSaveSettings);
+	public static native int configure(TDEActionCollection coll, boolean bAllowLetterShortcuts, TQWidget parent);
+	public static native int configure(TDEActionCollection coll, boolean bAllowLetterShortcuts);
 	/**	
 		 This is an overloaded member function, provided for convenience.
 		 It behaves essentially like the above function.
 				@short    This is an overloaded member function, provided for convenience.
 	*/
-	public static native int configure(KAccel keys, boolean bAllowLetterShortcuts, TQWidget parent, boolean bSaveSettings);
-	public static native int configure(KAccel keys, boolean bAllowLetterShortcuts, TQWidget parent);
-	public static native int configure(KAccel keys, boolean bAllowLetterShortcuts);
+	public static native int configure(TDEAccel keys, boolean bAllowLetterShortcuts, TQWidget parent, boolean bSaveSettings);
+	public static native int configure(TDEAccel keys, boolean bAllowLetterShortcuts, TQWidget parent);
+	public static native int configure(TDEAccel keys, boolean bAllowLetterShortcuts);
 	/**	
 		 This is an overloaded member function, provided for convenience.
 		 It behaves essentially like the above function.
diff --git a/kdejava/koala/org/kde/koala/KKeySequence.java b/kdejava/koala/org/kde/koala/KKeySequence.java
index 23b725c5..abe0a8fb 100644
--- a/kdejava/koala/org/kde/koala/KKeySequence.java
+++ b/kdejava/koala/org/kde/koala/KKeySequence.java
@@ -11,7 +11,7 @@ import org.kde.qt.QtSupport;
  Ex: Ctrl+X,I
 		@short    A KKeySequence object holds a sequence of up to 4 keys.
 		@see KKey
-		@see KShortcut
+		@see TDEShortcut
 
 */
 public class KKeySequence implements QtSupport {
diff --git a/kdejava/koala/org/kde/koala/KLineEdit.java b/kdejava/koala/org/kde/koala/KLineEdit.java
index fc79bbc9..25b38f18 100644
--- a/kdejava/koala/org/kde/koala/KLineEdit.java
+++ b/kdejava/koala/org/kde/koala/KLineEdit.java
@@ -46,7 +46,7 @@ import org.kde.qt.TQLineEdit;
  simply use KCompletionBase.setHandleSignals( boolean ) or set the
  booleanean parameter in the above functions to false.
  The default key-bindings for completion and rotation is determined
- from the global settings in KStdAccel.  These values, however,
+ from the global settings in TDEStdAccel.  These values, however,
  can be overridden locally by invoking KCompletionBase.setKeyBinding().
  The values can easily be reverted back to the default setting, by simply
  calling useGlobalSettings(). An alternate method would be to default
@@ -541,7 +541,7 @@ public class KLineEdit extends TQLineEdit implements KCompletionBaseInterface {
 		@short    Sets the key-binding to be used for manual text  completion, text rotation in a history list as  well as a completion list.
 		@see #getKeyBinding
 	*/
-	public native boolean setKeyBinding(int item, KShortcut key);
+	public native boolean setKeyBinding(int item, TDEShortcut key);
 	/**	
 		 Returns the key-binding used for the specified item.
 			 This methods returns the key-binding used to activate
@@ -554,7 +554,7 @@ public class KLineEdit extends TQLineEdit implements KCompletionBaseInterface {
 		@short    Returns the key-binding used for the specified item.
 		@see #setKeyBinding
 	*/
-	public native KShortcut getKeyBinding(int item);
+	public native TDEShortcut getKeyBinding(int item);
 	/**	
 		 Sets this object to use global values for key-bindings.
 			 This method changes the values of the key bindings for
diff --git a/kdejava/koala/org/kde/koala/KListAction.java b/kdejava/koala/org/kde/koala/KListAction.java
deleted file mode 100644
index c7efc164..00000000
--- a/kdejava/koala/org/kde/koala/KListAction.java
+++ /dev/null
@@ -1,198 +0,0 @@
-//Auto-generated by kalyptus. DO NOT EDIT.
-package org.kde.koala;
-
-import org.kde.qt.Qt;
-import org.kde.qt.TQMetaObject;
-import org.kde.qt.QtSupport;
-import org.kde.qt.TQObject;
-import org.kde.qt.TQIconSet;
-
-/**
-
- 		@short
-
-*/
-public class KListAction extends KSelectAction  {
-	protected KListAction(Class dummy){super((Class) null);}
-	public native TQMetaObject metaObject();
-	public native String className();
-	/**	
-		 Constructs a list action with text and potential keyboard
-		 accelerator but nothing else. Use this only if you really
-		 know what you are doing.
-			@param text The text that will be displayed.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short    Constructs a list action with text and potential keyboard  accelerator but nothing else.
-	*/
-	public KListAction(String text, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKListAction(text,cut,parent,name);
-	}
-	private native void newKListAction(String text, KShortcut cut, TQObject parent, String name);
-	public KListAction(String text, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKListAction(text,cut,parent);
-	}
-	private native void newKListAction(String text, KShortcut cut, TQObject parent);
-	public KListAction(String text, KShortcut cut) {
-		super((Class) null);
-		newKListAction(text,cut);
-	}
-	private native void newKListAction(String text, KShortcut cut);
-	public KListAction(String text) {
-		super((Class) null);
-		newKListAction(text);
-	}
-	private native void newKListAction(String text);
-	/**	
-			@param text The text that will be displayed.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param receiver The SLOT's parent.
-			@param slot The SLOT to invoke to execute this action.
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KListAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKListAction(text,cut,receiver,slot,parent,name);
-	}
-	private native void newKListAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KListAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKListAction(text,cut,receiver,slot,parent);
-	}
-	private native void newKListAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The icons that go with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KListAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKListAction(text,pix,cut,parent,name);
-	}
-	private native void newKListAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name);
-	public KListAction(String text, TQIconSet pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKListAction(text,pix,cut,parent);
-	}
-	private native void newKListAction(String text, TQIconSet pix, KShortcut cut, TQObject parent);
-	public KListAction(String text, TQIconSet pix, KShortcut cut) {
-		super((Class) null);
-		newKListAction(text,pix,cut);
-	}
-	private native void newKListAction(String text, TQIconSet pix, KShortcut cut);
-	public KListAction(String text, TQIconSet pix) {
-		super((Class) null);
-		newKListAction(text,pix);
-	}
-	private native void newKListAction(String text, TQIconSet pix);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The dynamically loaded icon that goes with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KListAction(String text, String pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKListAction(text,pix,cut,parent,name);
-	}
-	private native void newKListAction(String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KListAction(String text, String pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKListAction(text,pix,cut,parent);
-	}
-	private native void newKListAction(String text, String pix, KShortcut cut, TQObject parent);
-	public KListAction(String text, String pix, KShortcut cut) {
-		super((Class) null);
-		newKListAction(text,pix,cut);
-	}
-	private native void newKListAction(String text, String pix, KShortcut cut);
-	public KListAction(String text, String pix) {
-		super((Class) null);
-		newKListAction(text,pix);
-	}
-	private native void newKListAction(String text, String pix);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The icons that go with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param receiver The SLOT's parent.
-			@param slot The SLOT to invoke to execute this action.
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KListAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKListAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKListAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KListAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKListAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKListAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The dynamically loaded icon that goes with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param receiver The SLOT's parent.
-			@param slot The SLOT to invoke to execute this action.
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KListAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKListAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKListAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KListAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKListAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKListAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	/**	
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KListAction(TQObject parent, String name) {
-		super((Class) null);
-		newKListAction(parent,name);
-	}
-	private native void newKListAction(TQObject parent, String name);
-	public KListAction(TQObject parent) {
-		super((Class) null);
-		newKListAction(parent);
-	}
-	private native void newKListAction(TQObject parent);
-	public KListAction() {
-		super((Class) null);
-		newKListAction();
-	}
-	private native void newKListAction();
-	public native String currentText();
-	public native int currentItem();
-	/**	
-		  Sets the currently checked item.
-			@param index Index of the item (remember the first item is zero).
-		     		@short     Sets the currently checked item.
-	*/
-	public native void setCurrentItem(int index);
-	/** Deletes the wrapped C++ instance */
-	protected native void finalize() throws InternalError;
-	/** Delete the wrapped C++ instance ahead of finalize() */
-	public native void dispose();
-	/** Has the wrapped C++ instance been deleted? */
-	public native boolean isDisposed();
-}
diff --git a/kdejava/koala/org/kde/koala/KListViewItem.java b/kdejava/koala/org/kde/koala/KListViewItem.java
deleted file mode 100644
index 303f3ccf..00000000
--- a/kdejava/koala/org/kde/koala/KListViewItem.java
+++ /dev/null
@@ -1,232 +0,0 @@
-//Auto-generated by kalyptus. DO NOT EDIT.
-package org.kde.koala;
-
-import org.kde.qt.Qt;
-import org.kde.qt.TQColor;
-import org.kde.qt.TQListViewItem;
-import org.kde.qt.QtSupport;
-import org.kde.qt.TQListView;
-import org.kde.qt.TQPainter;
-import org.kde.qt.TQColorGroup;
-import org.kde.qt.TQListViewItem;
-
-/**
-
- A listview item with support for alternate background colors. It is
- a drop-in replacement for TQListViewItem
-		@short listview item with alternate background color support.
-
-*/
-public class KListViewItem extends TQListViewItem  {
-	protected KListViewItem(Class dummy){super((Class) null);}
-	/**	
-		 constructors. The semantics remain as in TQListViewItem.
-		 Although they accept a TQListViewItem as parent, please
-		 don't mix KListViewItem (or subclasses) with TQListViewItem
-		 (or subclasses).
-		   		@short    constructors.
-	*/
-	public KListViewItem(TQListView parent) {
-		super((Class) null);
-		newKListViewItem(parent);
-	}
-	private native void newKListViewItem(TQListView parent);
-	public KListViewItem(TQListViewItem parent) {
-		super((Class) null);
-		newKListViewItem(parent);
-	}
-	private native void newKListViewItem(TQListViewItem parent);
-	public KListViewItem(TQListView parent, TQListViewItem after) {
-		super((Class) null);
-		newKListViewItem(parent,after);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after) {
-		super((Class) null);
-		newKListViewItem(parent,after);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after);
-	public KListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
-	public KListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
-	public KListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7);
-	public KListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6);
-	public KListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5);
-	public KListViewItem(TQListView parent, String arg2, String arg3, String arg4) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2, String arg3, String arg4);
-	public KListViewItem(TQListView parent, String arg2, String arg3) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2, String arg3);
-	public KListViewItem(TQListView parent, String arg2) {
-		super((Class) null);
-		newKListViewItem(parent,arg2);
-	}
-	private native void newKListViewItem(TQListView parent, String arg2);
-	public KListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
-	public KListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
-	public KListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7);
-	public KListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5,arg6);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6);
-	public KListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4,arg5);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5);
-	public KListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3,arg4);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4);
-	public KListViewItem(TQListViewItem parent, String arg2, String arg3) {
-		super((Class) null);
-		newKListViewItem(parent,arg2,arg3);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2, String arg3);
-	public KListViewItem(TQListViewItem parent, String arg2) {
-		super((Class) null);
-		newKListViewItem(parent,arg2);
-	}
-	private native void newKListViewItem(TQListViewItem parent, String arg2);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4);
-	public KListViewItem(TQListView parent, TQListViewItem after, String arg3) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3);
-	}
-	private native void newKListViewItem(TQListView parent, TQListViewItem after, String arg3);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5,arg6);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4,arg5);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3,arg4);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4);
-	public KListViewItem(TQListViewItem parent, TQListViewItem after, String arg3) {
-		super((Class) null);
-		newKListViewItem(parent,after,arg3);
-	}
-	private native void newKListViewItem(TQListViewItem parent, TQListViewItem after, String arg3);
-	public native void insertItem(TQListViewItem item);
-	public native void takeItem(TQListViewItem item);
-	/**	
-		 returns true if this item is to be drawn with the alternate background
-		   		@short    returns true if this item is to be drawn with the alternate background
-	*/
-	public native boolean isAlternate();
-	/**	
-		 returns the background color for this item at given column
-		 This can be different in the column which is sorted due to shading
-		 ### could be merged with above (column = -1) to be source compatible
-		 ### but will only work if sort-shading is not used or the listView has
-		 ### only 1 column
-				@short    returns the background color for this item at given column  This can be different in the column which is sorted due to shading  ### could be merged with above (column = -1) to be source compatible  ### but will only work if sort-shading is not used or the listView has  ### only 1 column
-	*/
-	public native TQColor backgroundColor(int column);
-	public native void paintCell(TQPainter p, TQColorGroup cg, int column, int width, int alignment);
-	/** Deletes the wrapped C++ instance */
-	protected native void finalize() throws InternalError;
-	/** Delete the wrapped C++ instance ahead of finalize() */
-	public native void dispose();
-	/** Has the wrapped C++ instance been deleted? */
-	public native boolean isDisposed();
-}
diff --git a/kdejava/koala/org/kde/koala/KMdiTaskBar.java b/kdejava/koala/org/kde/koala/KMdiTaskBar.java
index 85f14541..f4ed3612 100644
--- a/kdejava/koala/org/kde/koala/KMdiTaskBar.java
+++ b/kdejava/koala/org/kde/koala/KMdiTaskBar.java
@@ -14,7 +14,7 @@ import org.kde.qt.TQResizeEvent;
  		@short Internal class.
 
 */
-public class KMdiTaskBar extends KToolBar  {
+public class KMdiTaskBar extends TDEToolBar  {
 	protected KMdiTaskBar(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
diff --git a/kdejava/koala/org/kde/koala/KPanelMenu.java b/kdejava/koala/org/kde/koala/KPanelMenu.java
index d5fd2308..114769cf 100644
--- a/kdejava/koala/org/kde/koala/KPanelMenu.java
+++ b/kdejava/koala/org/kde/koala/KPanelMenu.java
@@ -24,7 +24,7 @@ import org.kde.qt.TQWidget;
 		@short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
 
 */
-public class KPanelMenu extends KPopupMenu  {
+public class KPanelMenu extends TDEPopupMenu  {
 	protected KPanelMenu(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
diff --git a/kdejava/koala/org/kde/koala/KPrintAction.java b/kdejava/koala/org/kde/koala/KPrintAction.java
index 42c5c686..c32483f5 100644
--- a/kdejava/koala/org/kde/koala/KPrintAction.java
+++ b/kdejava/koala/org/kde/koala/KPrintAction.java
@@ -11,7 +11,7 @@ import org.kde.qt.TQWidget;
 /**
  See {@link KPrintActionSignals} for signals emitted by KPrintAction
 */
-public class KPrintAction extends KActionMenu  {
+public class KPrintAction extends TDEActionMenu  {
 	protected KPrintAction(Class dummy){super((Class) null);}
 	public static final int All = 0;
 	public static final int Regular = 1;
diff --git a/kdejava/koala/org/kde/koala/KRadioAction.java b/kdejava/koala/org/kde/koala/KRadioAction.java
deleted file mode 100644
index 8f59112e..00000000
--- a/kdejava/koala/org/kde/koala/KRadioAction.java
+++ /dev/null
@@ -1,193 +0,0 @@
-//Auto-generated by kalyptus. DO NOT EDIT.
-package org.kde.koala;
-
-import org.kde.qt.Qt;
-import org.kde.qt.TQMetaObject;
-import org.kde.qt.QtSupport;
-import org.kde.qt.TQObject;
-import org.kde.qt.TQIconSet;
-
-/**
-
- An action that operates like a radio button. At any given time
- only a single action from the group will be active.
- 		@short Radiobox like action.
-
-*/
-public class KRadioAction extends KToggleAction  {
-	protected KRadioAction(Class dummy){super((Class) null);}
-	public native TQMetaObject metaObject();
-	public native String className();
-	/**	
-		 Constructs a radio action with text and potential keyboard
-		 accelerator but nothing else. Use this only if you really
-		 know what you are doing.
-			@param text The text that will be displayed.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short    Constructs a radio action with text and potential keyboard  accelerator but nothing else.
-	*/
-	public KRadioAction(String text, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKRadioAction(text,cut,parent,name);
-	}
-	private native void newKRadioAction(String text, KShortcut cut, TQObject parent, String name);
-	public KRadioAction(String text, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKRadioAction(text,cut,parent);
-	}
-	private native void newKRadioAction(String text, KShortcut cut, TQObject parent);
-	public KRadioAction(String text, KShortcut cut) {
-		super((Class) null);
-		newKRadioAction(text,cut);
-	}
-	private native void newKRadioAction(String text, KShortcut cut);
-	public KRadioAction(String text) {
-		super((Class) null);
-		newKRadioAction(text);
-	}
-	private native void newKRadioAction(String text);
-	/**	
-			@param text The text that will be displayed.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param receiver The SLOT's parent.
-			@param slot The SLOT to invoke to execute this action.
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KRadioAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKRadioAction(text,cut,receiver,slot,parent,name);
-	}
-	private native void newKRadioAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KRadioAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKRadioAction(text,cut,receiver,slot,parent);
-	}
-	private native void newKRadioAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The icons that go with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,parent,name);
-	}
-	private native void newKRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name);
-	public KRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,parent);
-	}
-	private native void newKRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject parent);
-	public KRadioAction(String text, TQIconSet pix, KShortcut cut) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut);
-	}
-	private native void newKRadioAction(String text, TQIconSet pix, KShortcut cut);
-	public KRadioAction(String text, TQIconSet pix) {
-		super((Class) null);
-		newKRadioAction(text,pix);
-	}
-	private native void newKRadioAction(String text, TQIconSet pix);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The dynamically loaded icon that goes with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KRadioAction(String text, String pix, KShortcut cut, TQObject parent, String name) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,parent,name);
-	}
-	private native void newKRadioAction(String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KRadioAction(String text, String pix, KShortcut cut, TQObject parent) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,parent);
-	}
-	private native void newKRadioAction(String text, String pix, KShortcut cut, TQObject parent);
-	public KRadioAction(String text, String pix, KShortcut cut) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut);
-	}
-	private native void newKRadioAction(String text, String pix, KShortcut cut);
-	public KRadioAction(String text, String pix) {
-		super((Class) null);
-		newKRadioAction(text,pix);
-	}
-	private native void newKRadioAction(String text, String pix);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The icons that go with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param receiver The SLOT's parent.
-			@param slot The SLOT to invoke to execute this action.
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKRadioAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	/**	
-			@param text The text that will be displayed.
-			@param pix The dynamically loaded icon that goes with this action.
-			@param cut The corresponding keyboard accelerator (shortcut).
-			@param receiver The SLOT's parent.
-			@param slot The SLOT to invoke to execute this action.
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KRadioAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,receiver,slot,parent,name);
-	}
-	private native void newKRadioAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KRadioAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
-		super((Class) null);
-		newKRadioAction(text,pix,cut,receiver,slot,parent);
-	}
-	private native void newKRadioAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	/**	
-			@param parent This action's parent.
-			@param name An internal name for this action.
-		     		@short
-	*/
-	public KRadioAction(TQObject parent, String name) {
-		super((Class) null);
-		newKRadioAction(parent,name);
-	}
-	private native void newKRadioAction(TQObject parent, String name);
-	public KRadioAction(TQObject parent) {
-		super((Class) null);
-		newKRadioAction(parent);
-	}
-	private native void newKRadioAction(TQObject parent);
-	public KRadioAction() {
-		super((Class) null);
-		newKRadioAction();
-	}
-	private native void newKRadioAction();
-	protected native void slotActivated();
-	/** Deletes the wrapped C++ instance */
-	protected native void finalize() throws InternalError;
-	/** Delete the wrapped C++ instance ahead of finalize() */
-	public native void dispose();
-	/** Has the wrapped C++ instance been deleted? */
-	public native boolean isDisposed();
-}
diff --git a/kdejava/koala/org/kde/koala/KSessionManaged.java b/kdejava/koala/org/kde/koala/KSessionManaged.java
index 8e0c6a93..1797c205 100644
--- a/kdejava/koala/org/kde/koala/KSessionManaged.java
+++ b/kdejava/koala/org/kde/koala/KSessionManaged.java
@@ -11,11 +11,11 @@ import org.kde.qt.TQSessionManager;
    base.
    KSessionManaged makes it possible to provide implementations for
  TQApplication.commitData() and TQApplication.saveState(), without
-   subclassing TDEApplication. KMainWindow internally makes use of this.
+   subclassing TDEApplication. TDEMainWindow internally makes use of this.
    You don't need to do anything with this class when using
-   KMainWindow. Instead, use KMainWindow.saveProperties(),
- KMainWindow.readProperties(), KMainWindow.queryClose(),
- KMainWindow.queryExit() and friends.
+   TDEMainWindow. Instead, use TDEMainWindow.saveProperties(),
+ TDEMainWindow.readProperties(), TDEMainWindow.queryClose(),
+ TDEMainWindow.queryExit() and friends.
 		@author Matthias Ettrich <ettrich@kde.org>
  
 		@short Highlevel access to session management.
diff --git a/kdejava/koala/org/kde/koala/KStatusBar.java b/kdejava/koala/org/kde/koala/KStatusBar.java
index f1f414d4..65ec7f8d 100644
--- a/kdejava/koala/org/kde/koala/KStatusBar.java
+++ b/kdejava/koala/org/kde/koala/KStatusBar.java
@@ -12,12 +12,12 @@ import org.kde.qt.TQStatusBar;
   Display status messages.
   You can insert text labels or custom widgets. Their geometry is managed
   internally. KStatusBar resizes itself, but positioning is left to
-  KMainWindow (or to you, if you don't use KMainWindow ).
+  TDEMainWindow (or to you, if you don't use TDEMainWindow ).
   A special type of item is a message which is a temporary text-message
   displayed on top of other items in full-width. Messages are visible for
   specified time, or until you call the slot TQStatusBar.clear(). See
   TQStatusBar.message for details.
-  It is useful to connect the KActionCollection signals to the
+  It is useful to connect the TDEActionCollection signals to the
   TQStatusBar.message slots.
   KStatusBar inherits TQStatusBar, you can freely use all TQStatusBar
   methods.
@@ -27,7 +27,7 @@ import org.kde.qt.TQStatusBar;
 		@author Mark Donohoe (donohoe@kde.org) Maintained by Sven Radej <radej@kde.org>
 
 		@short %KDE statusbar widget.
-		@see KActionCollection
+		@see TDEActionCollection
 
 */
 public class KStatusBar extends TQStatusBar  {
@@ -35,7 +35,7 @@ public class KStatusBar extends TQStatusBar  {
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		  Constructs a status bar. <code>parent</code> is usually KMainWindow.
+		  Constructs a status bar. <code>parent</code> is usually TDEMainWindow.
 		   		@short     Constructs a status bar.
 	*/
 	public KStatusBar(TQWidget parent, String name) {
diff --git a/kdejava/koala/org/kde/koala/KStdAction.java b/kdejava/koala/org/kde/koala/KStdAction.java
index 055a9cf5..fc9948e9 100644
--- a/kdejava/koala/org/kde/koala/KStdAction.java
+++ b/kdejava/koala/org/kde/koala/KStdAction.java
@@ -13,20 +13,20 @@ import org.kde.qt.TQWidget;
  These actions should be used instead of hardcoding menubar and
  toolbar items.  Using these actions helps your application easily
  conform to the KDE UI Style Guide
- All of the documentation for KAction holds for KStdAction
- also.  When in doubt on how things work, check the KAction
+ All of the documentation for TDEAction holds for KStdAction
+ also.  When in doubt on how things work, check the TDEAction
  documention first.
  <li><b>Simple Example:</b></li>
  In general, using standard actions should be a drop in replacement
  for regular actions.  For example, if you previously had:
  <pre>
- KAction newAct = new KAction(i18n("&New"), TQIconSet(BarIcon("filenew")),
-                               KStdAccel.shortcut(KStdAccel.New), this,
+ TDEAction newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")),
+                               TDEStdAccel.shortcut(TDEStdAccel.New), this,
                                SLOT("fileNew()"), actionCollection());
  </pre>
  You could drop that and replace it with:
  <pre>
- KAction newAct = KStdAction.openNew(this, SLOT("fileNew()"),
+ TDEAction newAct = KStdAction.openNew(this, SLOT("fileNew()"),
                                        actionCollection());
  </pre>
  <li><b>Non-standard Usages</b></li>
@@ -57,7 +57,7 @@ import org.kde.qt.TQWidget;
  you instantiate it as in the the 'openNew' example above... or you
  could do it the hard way:
  <pre>
- KAction cut = actionCollection().action(KStdAction.stdName(KStdAction.Cut));
+ TDEAction cut = actionCollection().action(KStdAction.stdName(KStdAction.Cut));
  </pre>
  Another non-standard usage concerns instantiating the action in the
  first place.  Usually, you would use the member functions as
@@ -149,8 +149,8 @@ public class KStdAction {
 		 KStdAction.StdAction enum.
 			 		@short    Creates an action corresponding to the  KStdAction.StdAction enum.
 	*/
-	public static native KAction create(int id, String name, TQObject recvr, String slot, KActionCollection parent);
-	public static native KAction create(int id, TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction create(int id, String name, TQObject recvr, String slot, TDEActionCollection parent);
+	public static native TDEAction create(int id, TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 This will return the internal name of a given standard action.
 			 		@short    This will return the internal name of a given standard action.
@@ -158,7 +158,7 @@ public class KStdAction {
 	public static native String name(int id);
 	public static native String stdName(int act_enum);
 	/**	
-		 Returns a list of all standard names. Used by KAccelManager
+		 Returns a list of all standard names. Used by TDEAccelManager
 		 to give those heigher weight.
 				@short    Returns a list of all standard names.
 	*/
@@ -167,14 +167,14 @@ public class KStdAction {
 		 Create a new document or window.
 			 		@short    Create a new document or window.
 	*/
-	public static native KAction openNew(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction openNew(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction openNew(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction openNew(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Open an existing file.
 			 		@short    Open an existing file.
 	*/
-	public static native KAction open(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction open(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction open(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction open(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Open a recently used document. The signature of the slot being called
 		 is of the form slotURLSelected( KURL ).
@@ -185,360 +185,360 @@ public class KStdAction {
 			@param name name of widget
 			 		@short    Open a recently used document.
 	*/
-	public static native KRecentFilesAction openRecent(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KRecentFilesAction openRecent(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDERecentFilesAction openRecent(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDERecentFilesAction openRecent(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Save the current document.
 			 		@short    Save the current document.
 	*/
-	public static native KAction save(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction save(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction save(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction save(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Save the current document under a different name.
 					@short    Save the current document under a different name.
 	*/
-	public static native KAction saveAs(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction saveAs(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction saveAs(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction saveAs(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Revert the current document to the last saved version
 		 (essentially will undo all changes).
 					@short    Revert the current document to the last saved version  (essentially will undo all changes).
 	*/
-	public static native KAction revert(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction revert(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction revert(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction revert(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Close the current document.
 					@short    Close the current document.
 	*/
-	public static native KAction close(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction close(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction close(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction close(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Print the current document.
 					@short    Print the current document.
 	*/
-	public static native KAction print(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction print(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction print(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction print(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Show a print preview of the current document.
 					@short    Show a print preview of the current document.
 	*/
-	public static native KAction printPreview(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction printPreview(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction printPreview(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction printPreview(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Mail this document.
 					@short    Mail this document.
 	*/
-	public static native KAction mail(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction mail(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction mail(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction mail(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Quit the program.
 					@short    Quit the program.
 	*/
-	public static native KAction quit(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction quit(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction quit(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction quit(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Undo the last operation.
 					@short    Undo the last operation.
 	*/
-	public static native KAction undo(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction undo(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction undo(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction undo(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Redo the last operation.
 					@short    Redo the last operation.
 	*/
-	public static native KAction redo(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction redo(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction redo(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction redo(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Cut selected area and store it in the clipboard.
 					@short    Cut selected area and store it in the clipboard.
 	*/
-	public static native KAction cut(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction cut(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction cut(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction cut(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Copy the selected area into the clipboard.
 					@short    Copy the selected area into the clipboard.
 	*/
-	public static native KAction copy(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction copy(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction copy(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction copy(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Paste the contents of clipboard at the current mouse or cursor
 		 position.
 					@short    Paste the contents of clipboard at the current mouse or cursor  position.
 	*/
-	public static native KAction paste(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction paste(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction paste(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction paste(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Paste the contents of clipboard at the current mouse or cursor
 		 position. Provide a button on the toolbar with the clipboard history
 		 menu if Klipper is running.
 				@short    Paste the contents of clipboard at the current mouse or cursor  position.
 	*/
-	public static native KAction pasteText(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction pasteText(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction pasteText(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction pasteText(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Clear the content of the focus widget
 				@short    Clear the content of the focus widget
 	*/
-	public static native KAction clear(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction clear(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction clear(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction clear(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Select all elements in the current document.
 					@short    Select all elements in the current document.
 	*/
-	public static native KAction selectAll(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction selectAll(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction selectAll(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction selectAll(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Deselect any selected elements in the current document.
 					@short    Deselect any selected elements in the current document.
 	*/
-	public static native KAction deselect(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction deselect(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction deselect(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction deselect(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Initiate a 'find' request in the current document.
 					@short    Initiate a 'find' request in the current document.
 	*/
-	public static native KAction find(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction find(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction find(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction find(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Find the next instance of a stored 'find'.
 					@short    Find the next instance of a stored 'find'.
 	*/
-	public static native KAction findNext(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction findNext(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction findNext(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction findNext(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Find a previous instance of a stored 'find'.
 					@short    Find a previous instance of a stored 'find'.
 	*/
-	public static native KAction findPrev(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction findPrev(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction findPrev(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction findPrev(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Find and replace matches.
 					@short    Find and replace matches.
 	*/
-	public static native KAction replace(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction replace(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction replace(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction replace(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 View the document at its actual size.
 					@short    View the document at its actual size.
 	*/
-	public static native KAction actualSize(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction actualSize(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction actualSize(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction actualSize(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Fit the document view to the size of the current window.
 					@short    Fit the document view to the size of the current window.
 	*/
-	public static native KAction fitToPage(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction fitToPage(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction fitToPage(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction fitToPage(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Fit the document view to the width of the current window.
 					@short    Fit the document view to the width of the current window.
 	*/
-	public static native KAction fitToWidth(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction fitToWidth(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction fitToWidth(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction fitToWidth(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Fit the document view to the height of the current window.
 					@short    Fit the document view to the height of the current window.
 	*/
-	public static native KAction fitToHeight(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction fitToHeight(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction fitToHeight(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction fitToHeight(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Zoom in.
 					@short    Zoom in.
 	*/
-	public static native KAction zoomIn(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction zoomIn(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction zoomIn(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction zoomIn(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Zoom out.
 					@short    Zoom out.
 	*/
-	public static native KAction zoomOut(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction zoomOut(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction zoomOut(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction zoomOut(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Popup a zoom dialog.
 					@short    Popup a zoom dialog.
 	*/
-	public static native KAction zoom(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction zoom(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction zoom(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction zoom(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Redisplay or redraw the document.
 					@short    Redisplay or redraw the document.
 	*/
-	public static native KAction redisplay(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction redisplay(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction redisplay(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction redisplay(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Move up (web style menu).
 					@short    Move up (web style menu).
 	*/
-	public static native KAction up(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction up(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction up(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction up(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Move back (web style menu).
 					@short    Move back (web style menu).
 	*/
-	public static native KAction back(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction back(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction back(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction back(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Move forward (web style menu).
 					@short    Move forward (web style menu).
 	*/
-	public static native KAction forward(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction forward(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction forward(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction forward(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Go to the "Home" position or document.
 					@short    Go to the "Home" position or document.
 	*/
-	public static native KAction home(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction home(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction home(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction home(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Scroll up one page.
 					@short    Scroll up one page.
 	*/
-	public static native KAction prior(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction prior(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction prior(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction prior(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Scroll down one page.
 					@short    Scroll down one page.
 	*/
-	public static native KAction next(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction next(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction next(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction next(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Go to somewhere in general.
 					@short    Go to somewhere in general.
 	*/
-	public static native KAction goTo(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction goTo(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction goTo(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction goTo(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Go to a specific page (dialog).
 					@short    Go to a specific page (dialog).
 	*/
-	public static native KAction gotoPage(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction gotoPage(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction gotoPage(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction gotoPage(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Go to a specific line (dialog).
 					@short    Go to a specific line (dialog).
 	*/
-	public static native KAction gotoLine(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction gotoLine(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction gotoLine(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction gotoLine(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Jump to the first page.
 					@short    Jump to the first page.
 	*/
-	public static native KAction firstPage(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction firstPage(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction firstPage(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction firstPage(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Jump to the last page.
 					@short    Jump to the last page.
 	*/
-	public static native KAction lastPage(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction lastPage(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction lastPage(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction lastPage(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Add the current page to the bookmarks tree.
 					@short    Add the current page to the bookmarks tree.
 	*/
-	public static native KAction addBookmark(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction addBookmark(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction addBookmark(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction addBookmark(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Edit the application bookmarks.
 					@short    Edit the application bookmarks.
 	*/
-	public static native KAction editBookmarks(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction editBookmarks(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction editBookmarks(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction editBookmarks(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Pop up the spell checker.
 					@short    Pop up the spell checker.
 	*/
-	public static native KAction spelling(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction spelling(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction spelling(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction spelling(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Show/Hide the menubar.
 					@short    Show/Hide the menubar.
 	*/
-	public static native KToggleAction showMenubar(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KToggleAction showMenubar(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEToggleAction showMenubar(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEToggleAction showMenubar(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Show/Hide the statusbar.
 					@short    Show/Hide the statusbar.
 	*/
-	public static native KToggleAction showStatusbar(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KToggleAction showStatusbar(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEToggleAction showStatusbar(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEToggleAction showStatusbar(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Switch to/from full screen mode
 				@short    Switch to/from full screen mode
 	*/
-	public static native KToggleFullScreenAction fullScreen(TQObject recvr, String slot, KActionCollection parent, TQWidget window, String name);
-	public static native KToggleFullScreenAction fullScreen(TQObject recvr, String slot, KActionCollection parent, TQWidget window);
+	public static native TDEToggleFullScreenAction fullScreen(TQObject recvr, String slot, TDEActionCollection parent, TQWidget window, String name);
+	public static native TDEToggleFullScreenAction fullScreen(TQObject recvr, String slot, TDEActionCollection parent, TQWidget window);
 	/**	
 		 Display the save options dialog.
 					@short    Display the save options dialog.
 	*/
-	public static native KAction saveOptions(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction saveOptions(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction saveOptions(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction saveOptions(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Display the configure key bindings dialog.
 			  Note that you might be able to use the pre-built KXMLGUIFactory's fuction:
 		  KStdAction.keyBindings(guiFactory(), SLOT("configureShortcuts()"), actionCollection());
 		        		@short    Display the configure key bindings dialog.
 	*/
-	public static native KAction keyBindings(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction keyBindings(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction keyBindings(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction keyBindings(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Display the preferences/options dialog.
 					@short    Display the preferences/options dialog.
 	*/
-	public static native KAction preferences(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction preferences(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction preferences(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction preferences(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 The Customize Toolbar dialog.
 					@short    The Customize Toolbar dialog.
 	*/
-	public static native KAction configureToolbars(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction configureToolbars(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction configureToolbars(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction configureToolbars(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 The Configure Notifications dialog.
 				@short    The Configure Notifications dialog.
 	*/
-	public static native KAction configureNotifications(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction configureNotifications(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction configureNotifications(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction configureNotifications(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Display the help.
 					@short    Display the help.
 	*/
-	public static native KAction help(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction help(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction help(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction help(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Display the help contents.
 					@short    Display the help contents.
 	*/
-	public static native KAction helpContents(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction helpContents(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction helpContents(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction helpContents(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Trigger the What's This cursor.
 					@short    Trigger the What's This cursor.
 	*/
-	public static native KAction whatsThis(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction whatsThis(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction whatsThis(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction whatsThis(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Display "Tip of the Day"
 				@short    Display "Tip of the Day"
 	*/
-	public static native KAction tipOfDay(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction tipOfDay(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction tipOfDay(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction tipOfDay(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Open up the Report Bug dialog.
 					@short    Open up the Report Bug dialog.
 	*/
-	public static native KAction reportBug(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction reportBug(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction reportBug(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction reportBug(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Display the application's About box.
 					@short    Display the application's About box.
 	*/
-	public static native KAction aboutApp(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction aboutApp(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction aboutApp(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction aboutApp(TQObject recvr, String slot, TDEActionCollection parent);
 	/**	
 		 Display the About KDE dialog.
 					@short    Display the About KDE dialog.
 	*/
-	public static native KAction aboutKDE(TQObject recvr, String slot, KActionCollection parent, String name);
-	public static native KAction aboutKDE(TQObject recvr, String slot, KActionCollection parent);
+	public static native TDEAction aboutKDE(TQObject recvr, String slot, TDEActionCollection parent, String name);
+	public static native TDEAction aboutKDE(TQObject recvr, String slot, TDEActionCollection parent);
 }
diff --git a/kdejava/koala/org/kde/koala/KSystemTray.java b/kdejava/koala/org/kde/koala/KSystemTray.java
index 772feec6..d0a818c3 100644
--- a/kdejava/koala/org/kde/koala/KSystemTray.java
+++ b/kdejava/koala/org/kde/koala/KSystemTray.java
@@ -80,13 +80,13 @@ public class KSystemTray extends TQLabel  {
 		       to it.
 		     		@short          Access to the context menu.
 	*/
-	public native KPopupMenu contextMenu();
+	public native TDEPopupMenu contextMenu();
 	/**	
 		       Easy access to the actions in the context menu
 		       Currently includes KStdAction.Quit and minimizeRestore
 				@short          Easy access to the actions in the context menu        Currently includes KStdAction.Quit and minimizeRestore
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	/**	
 		 Changes the tray's icon.
 		     		@short    Changes the tray's icon.
@@ -144,7 +144,7 @@ public class KSystemTray extends TQLabel  {
 		       context menu becomes visible.
 		     		@short          Makes it easy to adjust some menu items right before the        context menu becomes visible.
 	*/
-	protected native void contextMenuAboutToShow(KPopupMenu menu);
+	protected native void contextMenuAboutToShow(TDEPopupMenu menu);
 	/**	
 		       Reimplemented for internal reasons.
 		     		@short          Reimplemented for internal reasons.
diff --git a/kdejava/koala/org/kde/koala/KURLBarListBox.java b/kdejava/koala/org/kde/koala/KURLBarListBox.java
index 5f4e11da..87305d15 100644
--- a/kdejava/koala/org/kde/koala/KURLBarListBox.java
+++ b/kdejava/koala/org/kde/koala/KURLBarListBox.java
@@ -13,7 +13,7 @@ import org.kde.qt.TQDragObject;
 
 /**
 
- This is the listbox used in KURLBar. It is a subclass of KListBox to support
+ This is the listbox used in KURLBar. It is a subclass of TDEListBox to support
  drag & drop and to set up the row / column mode.
  The widget has just one row or one column, depending on orientation().
  See {@link KURLBarListBoxSignals} for signals emitted by KURLBarListBox
@@ -22,7 +22,7 @@ import org.kde.qt.TQDragObject;
 		@short    This is the listbox used in KURLBar.
 
 */
-public class KURLBarListBox extends KListBox  {
+public class KURLBarListBox extends TDEListBox  {
 	protected KURLBarListBox(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
diff --git a/kdejava/koala/org/kde/koala/KURLRequester.java b/kdejava/koala/org/kde/koala/KURLRequester.java
index d245702f..56d55d75 100644
--- a/kdejava/koala/org/kde/koala/KURLRequester.java
+++ b/kdejava/koala/org/kde/koala/KURLRequester.java
@@ -211,7 +211,7 @@ public class KURLRequester extends TQHBox  {
 	protected native void init();
 	/**	
 		 Called when the button is pressed to open the filedialog.
-		 Also called when KStdAccel.Open (default is Ctrl-O) is pressed.
+		 Also called when TDEStdAccel.Open (default is Ctrl-O) is pressed.
 		     		@short    Called when the button is pressed to open the filedialog.
 	*/
 	protected native void slotOpenDialog();
diff --git a/kdejava/koala/org/kde/koala/KValueSelector.java b/kdejava/koala/org/kde/koala/KValueSelector.java
index a34005e3..086c36b0 100644
--- a/kdejava/koala/org/kde/koala/KValueSelector.java
+++ b/kdejava/koala/org/kde/koala/KValueSelector.java
@@ -19,7 +19,7 @@ import org.kde.qt.TQResizeEvent;
 		@see KColorDialog
 
 */
-public class KValueSelector extends KSelector  {
+public class KValueSelector extends TDESelector  {
 	protected KValueSelector(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
@@ -74,10 +74,10 @@ public class KValueSelector extends KSelector  {
 	protected native void drawPalette(TQPixmap pixmap);
 	protected native void resizeEvent(TQResizeEvent arg1);
 	/**	
-		 Reimplemented from KSelector. The drawing is
+		 Reimplemented from TDESelector. The drawing is
 		 buffered in a pixmap here. As real drawing
 		 routine, drawPalette() is used.
-		   		@short    Reimplemented from KSelector.
+		   		@short    Reimplemented from TDESelector.
 	*/
 	protected native void drawContents(TQPainter painter);
 	/** Deletes the wrapped C++ instance */
diff --git a/kdejava/koala/org/kde/koala/KWidgetAction.java b/kdejava/koala/org/kde/koala/KWidgetAction.java
index 79d95331..ab7704dc 100644
--- a/kdejava/koala/org/kde/koala/KWidgetAction.java
+++ b/kdejava/koala/org/kde/koala/KWidgetAction.java
@@ -14,7 +14,7 @@ import org.kde.qt.TQWidget;
  		@short    An action that automatically embeds a widget into a  toolbar.
 
 */
-public class KWidgetAction extends KAction  {
+public class KWidgetAction extends TDEAction  {
 	protected KWidgetAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
@@ -24,11 +24,11 @@ public class KWidgetAction extends KAction  {
 		 a toolbar.
 		     		@short    Create an action that will embed widget into a toolbar  when plugged.
 	*/
-	public KWidgetAction(TQWidget widget, String text, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name) {
+	public KWidgetAction(TQWidget widget, String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) {
 		super((Class) null);
 		newKWidgetAction(widget,text,cut,receiver,slot,parent,name);
 	}
-	private native void newKWidgetAction(TQWidget widget, String text, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name);
+	private native void newKWidgetAction(TQWidget widget, String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name);
 	/**	
 		 Returns the widget associated with this action.
 		     		@short    Returns the widget associated with this action.
@@ -37,7 +37,7 @@ public class KWidgetAction extends KAction  {
 	public native void setAutoSized(boolean arg1);
 	/**	
 		 Plug the action. The widget passed to the constructor
-		 will be reparented to w, which must inherit KToolBar.
+		 will be reparented to w, which must inherit TDEToolBar.
 		     		@short    Plug the action.
 	*/
 	public native int plug(TQWidget widget, int index);
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java b/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java
index c73a0ab7..7096cc87 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java
@@ -10,10 +10,10 @@ import org.kde.qt.TQDomElement;
 /**
 
  Abstract interface for a "GUI builder", used by the GUIFactory
- This interface is implemented by KMainWindow for the case where
- the toplevel widget is a KMainWindow. Other implementations may appear
+ This interface is implemented by TDEMainWindow for the case where
+ the toplevel widget is a TDEMainWindow. Other implementations may appear
  in the future (dialogs for instance)
- 		@short    Abstract interface for a "GUI builder", used by the GUIFactory  This interface is implemented by KMainWindow for the case where  the toplevel widget is a KMainWindow.
+ 		@short    Abstract interface for a "GUI builder", used by the GUIFactory  This interface is implemented by TDEMainWindow for the case where  the toplevel widget is a TDEMainWindow.
 
 */
 public class KXMLGUIBuilder implements QtSupport, KXMLGUIBuilderInterface {
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIClient.java b/kdejava/koala/org/kde/koala/KXMLGUIClient.java
index 0b916257..346f9081 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIClient.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIClient.java
@@ -52,25 +52,25 @@ public class KXMLGUIClient implements QtSupport, KXMLGUIClientInterface {
 		 to get the action object.
 		   		@short    Retrieves an action of the client by name.
 	*/
-	public native KAction action(String name);
+	public native TDEAction action(String name);
 	/**	
 		 Retrieves an action for a given TQDomElement. The default
 		 implementation uses the "name" attribute to query the action
 		 object via the other action() method.
 		   		@short    Retrieves an action for a given TQDomElement.
 	*/
-	public native KAction action(TQDomElement element);
+	public native TDEAction action(TQDomElement element);
 	/**	
 		 Retrieves the entire action collection for the GUI client. If
 		 you subclass KXMLGUIClient you should call
-		 KActionCollection.setWidget( TQWidget ) with this object, or
-		 you will encounter subtle bugs with KAction keyboard shortcuts.
-		 This is not necessary if your KXMLGUIClient is a KMainWindow.
+		 TDEActionCollection.setWidget( TQWidget ) with this object, or
+		 you will encounter subtle bugs with TDEAction keyboard shortcuts.
+		 This is not necessary if your KXMLGUIClient is a TDEMainWindow.
 				@short    Retrieves the entire action collection for the GUI client.
-		@see KActionCollection#setWidget(
+		@see TDEActionCollection#setWidget(
 		@see #org#kde#qt#TQWidget*
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	/**	
 				@return The instance ( TDEInstance ) for this GUI client.
    
@@ -193,7 +193,7 @@ public class KXMLGUIClient implements QtSupport, KXMLGUIClientInterface {
 			 This tag will get expanded to a list of actions.  In the example
 		 above ( a file manager with a dynamic file menu ), you would call
 		 <pre>
-		 TQPtrList<KAction> file_actions;
+		 TQPtrList<TDEAction> file_actions;
 		 for( ... )
 		   if( ... )
 		     file_actions.append( cool_action );
@@ -209,7 +209,7 @@ public class KXMLGUIClient implements QtSupport, KXMLGUIClientInterface {
 		       menu too..
 		   		@short    ActionLists are a way for XMLGUI to support dynamic lists of  actions.
 	*/
-	// void plugActionList(const TQString& arg1,const TQPtrList<KAction>& arg2); >>>> NOT CONVERTED
+	// void plugActionList(const TQString& arg1,const TQPtrList<TDEAction>& arg2); >>>> NOT CONVERTED
 	/**	
 		 The complement of plugActionList() ...
 		   		@short    The complement of plugActionList() .
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java b/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java
index 37982a59..a1fae857 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java
@@ -7,9 +7,9 @@ import org.kde.qt.TQWidget;
 import org.kde.qt.TQDomElement;
 
 public interface KXMLGUIClientInterface {
-		KAction action(String name);
-		KAction action(TQDomElement element);
-		KActionCollection actionCollection();
+		TDEAction action(String name);
+		TDEAction action(TQDomElement element);
+		TDEActionCollection actionCollection();
 		TDEInstanceInterface instance();
 		TQDomDocument domDocument();
 		String xmlFile();
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIFactory.java b/kdejava/koala/org/kde/koala/KXMLGUIFactory.java
index 80da94a4..09b260d7 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIFactory.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIFactory.java
@@ -20,7 +20,7 @@ import org.kde.qt.TQObject;
  actions. KXMLGUIFactory takes care of building (with the help of a KXMLGUIBuilder)
  and merging the GUI from an unlimited number of clients.
  Each client provides XML through a TQDomDocument and actions through a
- KActionCollection . The XML document contains the rules for how to merge the
+ TDEActionCollection . The XML document contains the rules for how to merge the
  GUI.
  KXMLGUIFactory processes the DOM tree provided by a client and plugs in the client's actions,
  according to the XML and the merging rules of previously inserted clients. Container widgets
@@ -74,7 +74,7 @@ public class KXMLGUIFactory extends TQObject  {
 		   		@short    Removes the GUI described by the client, by unplugging all  provided actions and removing all owned containers (and storing  container state information in the given client)
 	*/
 	public native void removeClient(KXMLGUIClientInterface client);
-	// void plugActionList(KXMLGUIClient* arg1,const TQString& arg2,const TQPtrList<KAction>& arg3); >>>> NOT CONVERTED
+	// void plugActionList(KXMLGUIClient* arg1,const TQString& arg2,const TQPtrList<TDEAction>& arg3); >>>> NOT CONVERTED
 	public native void unplugActionList(KXMLGUIClientInterface client, String name);
 	/**	
 		 Returns a list of all clients currently added to this factory
diff --git a/kdejava/koala/org/kde/koala/MainWindow.java b/kdejava/koala/org/kde/koala/MainWindow.java
index a7f7d886..3d344f48 100644
--- a/kdejava/koala/org/kde/koala/MainWindow.java
+++ b/kdejava/koala/org/kde/koala/MainWindow.java
@@ -13,18 +13,18 @@ import org.kde.qt.TQWidget;
  Inherit your main window from this class
  and don't forget to call setXMLFile() in the inherited constructor.
  It implements all internal interfaces in the case of a
- KMainWindow as host: the builder and servant interface (for menu
+ TDEMainWindow as host: the builder and servant interface (for menu
  merging).
  		@short    A KPart-aware main window, whose user interface is described in XML.
 
 */
-public class MainWindow extends KMainWindow implements PartBaseInterface {
+public class MainWindow extends TDEMainWindow implements PartBaseInterface {
 	protected MainWindow(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Constructor, same signature as KMainWindow.
-		   		@short    Constructor, same signature as KMainWindow.
+		 Constructor, same signature as TDEMainWindow.
+		   		@short    Constructor, same signature as TDEMainWindow.
 	*/
 	public MainWindow(TQWidget parent, String name, int f) {
 		super((Class) null);
@@ -61,8 +61,8 @@ public class MainWindow extends KMainWindow implements PartBaseInterface {
 	}
 	private native void newMainWindow();
 	/**	
-		 Constructor with creation flags, see KMainWindow.
-				@short    Constructor with creation flags, see KMainWindow.
+		 Constructor with creation flags, see TDEMainWindow.
+				@short    Constructor with creation flags, see TDEMainWindow.
 	*/
 	public MainWindow(int cflags, TQWidget parent, String name, int f) {
 		super((Class) null);
diff --git a/kdejava/koala/org/kde/koala/Makefile.am b/kdejava/koala/org/kde/koala/Makefile.am
index 6e355cdc..16f2282c 100644
--- a/kdejava/koala/org/kde/koala/Makefile.am
+++ b/kdejava/koala/org/kde/koala/Makefile.am
@@ -1,7 +1,7 @@
 ####### tdevelop will overwrite this part!!! (begin)##########
 
 
-EXTRA_DIST = TDEGlobal.java KMdiToolViewAccessor.java BrowserExtension.java DCOPClient.java DCOPObject.java DCOPObjectInterface.java DCOPObjectProxy.java KAboutApplication.java KAboutContainer.java TDEAboutData.java KAboutDialog.java KAboutKDE.java KAboutPerson.java KAboutWidget.java KAccel.java KAction.java KActionCollection.java KActionMenu.java KActionSeparator.java KAnimWidget.java TDEApplication.java KAudioPlayer.java KAuthIcon.java KBugReport.java KButtonBox.java TDECModule.java KCharSelect.java KCharSelectTable.java KCharsets.java TDECmdLineArgs.java KColorButton.java KColorCombo.java KColorDrag.java KCombiView.java KComboBox.java KCompletion.java KCompletionBase.java KCompletionBaseInterface.java TDEConfig.java TDEConfigBackEnd.java TDEConfigBase.java TDEConfigGroupSaver.java TDEConfigINIBackEnd.java KContextMenuManager.java KCursor.java KDCOPActionProxy.java KDCOPPropertyProxy.java KDEDesktopMimeType.java KDatePicker.java KDateTable.java KDateValidator.java KDesktopFile.java KDialog.java KDialogBase.java KDirOperator.java KDirWatch.java KDockWidgetAbstractHeader.java KDockWidgetAbstractHeaderDrag.java KDockWidgetHeader.java KDockWidgetHeaderDrag.java KDoubleNumInput.java KDualColorButton.java KEdFind.java KEdGotoLine.java KEdReplace.java KEditToolbar.java KEditToolbarWidget.java KEntry.java KEntryKey.java KExecMimeType.java KFile.java KFileDetailView.java KFileDialog.java KFileFilter.java KFileIconView.java KFileIconViewItem.java KFileItem.java KFileListViewItem.java KFilePreview.java KFileView.java KFileViewInterface.java KFileViewSignaler.java KFolderType.java KFontAction.java KFontChooser.java KFontDialog.java KFontSizeAction.java TDEGlobalAccel.java TDEGlobalSettings.java KGradientSelector.java TDEHTMLPart.java TDEHTMLSettings.java TDEHTMLView.java KHelpMenu.java KHistoryCombo.java KIPC.java KIconButton.java KIconCanvas.java KIconDialog.java KIconEffect.java KIconLoader.java KIconView.java KImageEffect.java KImageIO.java TDEInstance.java TDEInstanceInterface.java KIntNumInput.java KIntSpinBox.java KIntValidator.java KJanusWidget.java KKeyChooser.java KLed.java KLibFactory.java KLibLoader.java KLineEdit.java KListBox.java KListView.java TDELocale.java KMainWindow.java KMenuBar.java KMessageBox.java KMimeType.java KNotifyClient.java KNumInput.java KOpenWithDlg.java KPalette.java KPanelApplet.java KPanelMenu.java KPasswordDialog.java KPasswordEdit.java KPixmap.java KPixmapEffect.java KPixmapIO.java KPixmapProvider.java KPopupFrame.java KPopupMenu.java KPopupTitle.java KProcIO.java TDEProcess.java TDEProcessController.java TDEProcessRunner.java KProgress.java KProtocolInfo.java KProtocolManager.java KRFCDate.java KRadioAction.java KRandomSequence.java KRecentDocument.java KRestrictedLine.java KRootPermsIcon.java KRootPixmap.java KRootProp.java KRuler.java KRun.java KSSL.java KSSLCertificate.java KSSLCertificateHome.java KSSLConnectionInfo.java KSSLInfoDlg.java KSSLPeerInfo.java KSSLSettings.java KSSLX509Map.java KSaveFile.java KSelectAction.java KSelector.java KSeparator.java KService.java KServiceGroup.java KServiceOffer.java KServiceType.java KServiceTypeProfile.java KSessionManaged.java TDEShared.java KShellCompletion.java KShred.java KSimpleConfig.java KSpell.java KSpellConfig.java KSpellDlg.java TDEStandardDirs.java KStaticDeleterBase.java KStatusBar.java KStatusBarLabel.java KStdAccel.java KStdAction.java KStringHandler.java KSycoca.java KSycocaEntry.java KSystemTray.java KTabCtl.java KTempFile.java KTextBrowser.java KToggleAction.java KToolBar.java KToolBarButton.java KToolBarRadioGroup.java KToolBarSeparator.java TDETrader.java KURIFilter.java KURIFilterData.java KURIFilterPlugin.java KURL.java KURLComboBox.java KURLCompletion.java KURLDrag.java KURLLabel.java KURLRequester.java KURLRequesterDlg.java KUniqueApplication.java KWizard.java KWritePermsIcon.java KXMLGUIBuilder.java KXMLGUIBuilderInterface.java KXMLGUIClient.java KXMLGUIClientInterface.java KXMLGUIFactory.java KXYSelector.java Part.java PartBaseInterface.java ReadOnlyPart.java NetAccess.java kdejava.java Event.java GUIActivateEvent.java MouseEvent.java OpenURLEvent.java PartActivateEvent.java PartSelectEvent.java ReadWritePart.java DocumentFragment.java DocumentStyle.java DocumentType.java HTMLDocument.java NamedNodeMap.java CSSStyleSheet.java StyleSheet.java CSSException.java CSSPrimitiveValue.java CSSStyleDeclaration.java CSSValue.java Counter.java RGBColor.java Rect.java Element.java HTMLAnchorElement.java HTMLAppletElement.java HTMLAreaElement.java HTMLBRElement.java HTMLBaseElement.java HTMLBaseFontElement.java HTMLBlockquoteElement.java HTMLBodyElement.java HTMLButtonElement.java HTMLCollection.java HTMLDListElement.java HTMLDirectoryElement.java HTMLDivElement.java HTMLElement.java HTMLFieldSetElement.java HTMLFontElement.java HTMLFormElement.java HTMLFrameElement.java HTMLFrameSetElement.java HTMLHRElement.java HTMLHeadElement.java HTMLHeadingElement.java HTMLHtmlElement.java HTMLIFrameElement.java HTMLImageElement.java HTMLInputElement.java HTMLIsIndexElement.java HTMLLIElement.java HTMLLabelElement.java HTMLLegendElement.java HTMLLinkElement.java HTMLMapElement.java HTMLMenuElement.java HTMLMetaElement.java HTMLModElement.java HTMLOListElement.java HTMLObjectElement.java HTMLOptGroupElement.java HTMLOptionElement.java HTMLParagraphElement.java HTMLParamElement.java HTMLPreElement.java HTMLQuoteElement.java HTMLScriptElement.java HTMLSelectElement.java HTMLStyleElement.java HTMLTableCaptionElement.java HTMLTableCellElement.java HTMLTableColElement.java HTMLTableElement.java HTMLTableRowElement.java HTMLTableSectionElement.java HTMLTextAreaElement.java HTMLTitleElement.java HTMLUListElement.java Attr.java DockMainWindow.java MainWindow.java CDATASection.java Comment.java EntityReference.java NodeFilter.java NodeIterator.java ProcessingInstruction.java Range.java Text.java TreeWalker.java CharacterData.java CopyJob.java DeleteJob.java FileCopyJob.java Job.java KDirNotify.java KDirNotifyInterface.java KDirSize.java ListJob.java MimetypeJob.java SimpleJob.java StatJob.java TransferJob.java Connection.java Slave.java KAboutContributor.java KAboutTranslator.java KCodecs.java KCommand.java KCommandHistory.java KCompletionBox.java KDialogQueue.java KEditListBox.java KFilterBase.java KFilterDev.java KFontCombo.java KMacroCommand.java KPanelExtension.java KPixmapSplitter.java KPreviewWidgetBase.java KPushButton.java KScanDialog.java KSqueezedTextLabel.java KToolBarPopupAction.java KTipDatabase.java KTipDialog.java BrowserExtensionSignals.java CopyJobSignals.java DCOPClientSignals.java DeleteJobSignals.java JobSignals.java KAboutContainerSignals.java KAboutContributorSignals.java KAboutDialogSignals.java KAboutWidgetSignals.java KAccelSignals.java KActionCollectionSignals.java KActionSignals.java KAnimWidgetSignals.java TDEApplicationSignals.java TDECModuleSignals.java KCharSelectSignals.java KCharSelectTableSignals.java KColorButtonSignals.java KColorComboSignals.java KComboBoxSignals.java KCommandHistorySignals.java KCompletionBoxSignals.java KCompletionSignals.java KDatePickerSignals.java KDateTableSignals.java KDialogBaseSignals.java KDialogSignals.java KDirListerSignals.java KDirOperatorSignals.java KDirWatchSignals.java KDoubleNumInputSignals.java KDualColorButtonSignals.java KEdFindSignals.java KEdReplaceSignals.java KEditListBoxSignals.java KEditSignals.java KEditToolbarSignals.java KEditToolbarWidgetSignals.java KFileDetailViewSignals.java KFileDialogSignals.java KFileIconViewSignals.java KFilePreviewSignals.java KFontChooserSignals.java KFontDialogSignals.java KFontSizeActionSignals.java TDEHTMLPartSignals.java TDEHTMLViewSignals.java KHelpMenuSignals.java KHistoryComboSignals.java KIconButtonSignals.java KIconCanvasSignals.java KIconDialogSignals.java KIconViewSignals.java KIntNumInputSignals.java KJanusWidgetSignals.java KKeyChooserSignals.java KLineEditSignals.java KListBoxSignals.java KListViewSignals.java KPanelAppletSignals.java KPanelExtensionSignals.java KPopupMenuSignals.java KProcIOSignals.java TDEProcessSignals.java KProgressSignals.java KRecentFilesActionSignals.java KRestrictedLineSignals.java KRootPixmapSignals.java KRunSignals.java KScanDialogSignals.java KSelectActionSignals.java KSelectorSignals.java KShredSignals.java KSpellConfigSignals.java KSpellDlgSignals.java KSpellSignals.java KStatusBarLabelSignals.java KStatusBarSignals.java KSycocaSignals.java KSystemTraySignals.java KTabCtlSignals.java KTextBrowserSignals.java KToggleActionSignals.java KToolBarButtonSignals.java KToolBarSignals.java KURLComboBoxSignals.java KURLLabelSignals.java KURLRequesterSignals.java KXMLGUIFactorySignals.java KXYSelectorSignals.java ListJobSignals.java SlaveSignals.java StatJobSignals.java TransferJobSignals.java KListViewItem.java KTar.java KArchive.java KArchiveDirectory.java KSSLPKCS12.java KArchiveEntry.java KArchiveFile.java KFileMetaInfo.java KFileMetaInfoItem.java KGuiItem.java KIconViewItem.java KStdGuiItem.java KDataTool.java KDataToolAction.java KDataToolInfo.java KDateWidget.java KDirSelectDialog.java KEMailSettings.java KFileFilterCombo.java KFileTreeBranch.java KFileTreeView.java KFileTreeViewItem.java KFileTreeViewToolTip.java KMultipleDrag.java KWordWrap.java KDataToolActionSignals.java KDateWidgetSignals.java KFileFilterComboSignals.java KFileTreeBranchSignals.java KFileTreeViewSignals.java KShortcut.java KKey.java KKeyDialog.java KIO.java Scheduler.java SchedulerSignals.java StatusbarProgress.java ProgressBase.java ProgressBaseSignals.java KKeySequence.java KDockMainWindow.java KDockManager.java KDockManagerSignals.java KDockTabGroup.java KDockWidget.java KDockWidgetSignals.java KURLPixmapProvider.java KAccelAction.java KColor.java KColorCells.java KColorCellsSignals.java KColorDialog.java KColorDialogSignals.java KColorPatch.java KColorPatchSignals.java KHSSelector.java KPaletteTable.java KPaletteTableSignals.java KValueSelector.java DCOPAnswer.java KDE.java KSSLCertDlgRet.java KListAction.java KRecentFilesAction.java KArrowButton.java KDateTimeWidget.java KDateTimeWidgetSignals.java KFindDialog.java KFind.java KFindSignals.java KMultiTabBarButton.java KMultiTabBarButtonSignals.java KMultiTabBarTab.java KPrintAction.java KPrintActionSignals.java KProgressDialog.java KReplaceDialog.java KReplace.java KReplaceSignals.java KURLBarSignals.java KMultiTabBar.java KCatalogue.java KDoubleValidator.java KKeyButton.java KMdiChildArea.java KMdiChildFrmCaption.java KMdiChildFrmDragBeginEvent.java KMdiChildFrmDragEndEvent.java KMdiChildFrm.java KMdiChildFrmMoveEvent.java KMdiChildFrmResizeBeginEvent.java KMdiChildFrmResizeEndEvent.java KMdiChildView.java KMdi.java KMdiMainFrm.java KMdiTaskBarButton.java KMdiTaskBar.java KMdiViewCloseEvent.java KMdiWin32IconButton.java KPasteTextAction.java KStringListValidator.java KTabBar.java KTabWidget.java KTextEdit.java KTimeWidget.java KToggleToolBarAction.java KURLComboRequester.java KMdiChildAreaSignals.java KMdiChildViewSignals.java KMdiMainFrmSignals.java KMdiTaskBarButtonSignals.java KMdiWin32IconButtonSignals.java KTabBarSignals.java KTabWidgetSignals.java KTimeWidgetSignals.java DefaultProgress.java SlaveBase.java KEdit.java KFloatValidator.java KMimeMagic.java KMimeMagicResult.java BrowserInterface.java CSSRule.java CSSRuleList.java CustomNodeFilter.java DavJob.java Document.java DomShared.java EventListener.java Invocation.java KCalendarSystem.java KDirLister.java KFileMetaInfoGroup.java KMimeSourceFactory.java TDESharedConfig.java KShellProcess.java KShortcutList.java KSSLCertBox.java KSSLCertChain.java KSSLSession.java KSSLX509V3.java KToggleFullScreenAction.java KURLBarItem.java KURLBar.java KURLBarListBox.java Marchaller.java MetaInfoJob.java Node.java Observer.java PreviewJob.java SlaveInterface.java UIEvent.java KAsyncIO.java KAsyncIOSignals.java TDEBufferedIO.java TDEBufferedIOSignals.java AuthInfo.java RenameDlg.java AbstractView.java KInputDialog.java KAuthIconSignals.java KFileViewSignalerSignals.java KKeyButtonSignals.java KLibFactorySignals.java KURLBarListBoxSignals.java MetaInfoJobSignals.java PartSignals.java PreviewJobSignals.java ReadOnlyPartSignals.java ReadWritePartSignals.java SlaveInterfaceSignals.java CSSCharsetRule.java CSSFontFaceRule.java CSSImportRule.java CSSMediaRule.java CSSPageRule.java CSSStyleRule.java CSSUnknownRule.java CSSValueList.java DOMException.java DOMImplementation.java Entity.java EventException.java Factory.java HistoryProvider.java HistoryProviderSignals.java HTMLFormCollection.java KAccelShortcutList.java KActionShortcutList.java KActiveLabel.java KAr.java KCalendarSystemFactory.java TDECModuleInfo.java TDECModuleLoader.java KCMultiDialog.java KCMultiDialogSignals.java TDEConfigGroup.java KCPUInfo.java KCustomMenuEditor.java KDCOPServiceStarter.java KDiskFreeSp.java KDiskFreeSpSignals.java KDockArea.java KDockAreaSignals.java KFilePlugin.java KFileShare.java KFontRequester.java KFontRequesterSignals.java KIDNA.java KKeyNative.java KMD5.java KMimeTypeResolverBase.java KMimeTypeResolverHelper.java KMimeTypeValidator.java KMountPoint.java KOCRDialog.java KOCRDialogSignals.java KPanelAppMenu.java KPanelAppMenuSignals.java KPassivePopup.java KPassivePopupSignals.java KPluginSelector.java KPluginSelectorSignals.java KRegExpEditorInterface.java KServiceSeparator.java KShell.java KSimpleFileFilter.java KSMIMECrypto.java KSpellingHighlighter.java KSSLCertDlg.java KSSLCertificateCache.java KSSLCertificateFactory.java KSSLKeyGen.java KSSLPKCS7.java KSSLSigners.java KSyntaxHighlighter.java KTempDir.java KURLBarItemDialog.java KWidgetAction.java KWindowInfo.java KXMLGUI.java KZipFileEntry.java KZip.java LinkStyle.java LiveConnectExtension.java LiveConnectExtensionSignals.java MultiGetJob.java MultiGetJobSignals.java MutationEvent.java Notation.java PartBase.java PasswordDialog.java Plugin.java RangeException.java SessionData.java SkipDlg.java SkipDlgSignals.java SlaveConfigSignals.java StatusBarExtension.java TextEvent.java KNamedCommand.java PartManager.java PartManagerSignals.java URLArgs.java WindowArgs.java BrowserHostExtension.java BrowserRun.java KAccelActions.java KDockMainWindowSignals.java StoredTransferJob.java 
+EXTRA_DIST = TDEGlobal.java KMdiToolViewAccessor.java BrowserExtension.java DCOPClient.java DCOPObject.java DCOPObjectInterface.java DCOPObjectProxy.java KAboutApplication.java KAboutContainer.java TDEAboutData.java KAboutDialog.java KAboutKDE.java KAboutPerson.java KAboutWidget.java TDEAccel.java TDEAction.java TDEActionCollection.java TDEActionMenu.java TDEActionSeparator.java KAnimWidget.java TDEApplication.java KAudioPlayer.java KAuthIcon.java KBugReport.java KButtonBox.java TDECModule.java KCharSelect.java KCharSelectTable.java KCharsets.java TDECmdLineArgs.java KColorButton.java KColorCombo.java KColorDrag.java KCombiView.java KComboBox.java KCompletion.java KCompletionBase.java KCompletionBaseInterface.java TDEConfig.java TDEConfigBackEnd.java TDEConfigBase.java TDEConfigGroupSaver.java TDEConfigINIBackEnd.java KContextMenuManager.java KCursor.java KDCOPActionProxy.java KDCOPPropertyProxy.java KDEDesktopMimeType.java KDatePicker.java KDateTable.java KDateValidator.java KDesktopFile.java KDialog.java KDialogBase.java KDirOperator.java KDirWatch.java KDockWidgetAbstractHeader.java KDockWidgetAbstractHeaderDrag.java KDockWidgetHeader.java KDockWidgetHeaderDrag.java KDoubleNumInput.java KDualColorButton.java KEdFind.java KEdGotoLine.java KEdReplace.java KEditToolbar.java KEditToolbarWidget.java KEntry.java KEntryKey.java KExecMimeType.java KFile.java KFileDetailView.java KFileDialog.java KFileFilter.java KFileIconView.java KFileIconViewItem.java KFileItem.java KFileListViewItem.java KFilePreview.java KFileView.java KFileViewInterface.java KFileViewSignaler.java KFolderType.java TDEFontAction.java TDEFontChooser.java TDEFontDialog.java TDEFontSizeAction.java TDEGlobalAccel.java TDEGlobalSettings.java KGradientSelector.java TDEHTMLPart.java TDEHTMLSettings.java TDEHTMLView.java KHelpMenu.java KHistoryCombo.java KIPC.java KIconButton.java KIconCanvas.java KIconDialog.java KIconEffect.java KIconLoader.java KIconView.java KImageEffect.java KImageIO.java TDEInstance.java TDEInstanceInterface.java KIntNumInput.java KIntSpinBox.java KIntValidator.java KJanusWidget.java KKeyChooser.java KLed.java KLibFactory.java KLibLoader.java KLineEdit.java TDEListBox.java TDEListView.java TDELocale.java TDEMainWindow.java KMenuBar.java KMessageBox.java KMimeType.java KNotifyClient.java KNumInput.java KOpenWithDlg.java KPalette.java KPanelApplet.java KPanelMenu.java KPasswordDialog.java KPasswordEdit.java KPixmap.java KPixmapEffect.java KPixmapIO.java KPixmapProvider.java TDEPopupFrame.java TDEPopupMenu.java TDEPopupTitle.java KProcIO.java TDEProcess.java TDEProcessController.java TDEProcessRunner.java KProgress.java KProtocolInfo.java KProtocolManager.java KRFCDate.java TDERadioAction.java KRandomSequence.java TDERecentDocument.java KRestrictedLine.java KRootPermsIcon.java KRootPixmap.java KRootProp.java KRuler.java KRun.java KSSL.java KSSLCertificate.java KSSLCertificateHome.java KSSLConnectionInfo.java KSSLInfoDlg.java KSSLPeerInfo.java KSSLSettings.java KSSLX509Map.java KSaveFile.java TDESelectAction.java TDESelector.java KSeparator.java KService.java KServiceGroup.java KServiceOffer.java KServiceType.java KServiceTypeProfile.java KSessionManaged.java TDEShared.java KShellCompletion.java KShred.java KSimpleConfig.java KSpell.java KSpellConfig.java KSpellDlg.java TDEStandardDirs.java KStaticDeleterBase.java KStatusBar.java KStatusBarLabel.java TDEStdAccel.java KStdAction.java KStringHandler.java KSycoca.java KSycocaEntry.java KSystemTray.java KTabCtl.java KTempFile.java KTextBrowser.java TDEToggleAction.java TDEToolBar.java TDEToolBarButton.java TDEToolBarRadioGroup.java TDEToolBarSeparator.java TDETrader.java KURIFilter.java KURIFilterData.java KURIFilterPlugin.java KURL.java KURLComboBox.java KURLCompletion.java KURLDrag.java KURLLabel.java KURLRequester.java KURLRequesterDlg.java KUniqueApplication.java KWizard.java KWritePermsIcon.java KXMLGUIBuilder.java KXMLGUIBuilderInterface.java KXMLGUIClient.java KXMLGUIClientInterface.java KXMLGUIFactory.java KXYSelector.java Part.java PartBaseInterface.java ReadOnlyPart.java NetAccess.java kdejava.java Event.java GUIActivateEvent.java MouseEvent.java OpenURLEvent.java PartActivateEvent.java PartSelectEvent.java ReadWritePart.java DocumentFragment.java DocumentStyle.java DocumentType.java HTMLDocument.java NamedNodeMap.java CSSStyleSheet.java StyleSheet.java CSSException.java CSSPrimitiveValue.java CSSStyleDeclaration.java CSSValue.java Counter.java RGBColor.java Rect.java Element.java HTMLAnchorElement.java HTMLAppletElement.java HTMLAreaElement.java HTMLBRElement.java HTMLBaseElement.java HTMLBaseFontElement.java HTMLBlockquoteElement.java HTMLBodyElement.java HTMLButtonElement.java HTMLCollection.java HTMLDListElement.java HTMLDirectoryElement.java HTMLDivElement.java HTMLElement.java HTMLFieldSetElement.java HTMLFontElement.java HTMLFormElement.java HTMLFrameElement.java HTMLFrameSetElement.java HTMLHRElement.java HTMLHeadElement.java HTMLHeadingElement.java HTMLHtmlElement.java HTMLIFrameElement.java HTMLImageElement.java HTMLInputElement.java HTMLIsIndexElement.java HTMLLIElement.java HTMLLabelElement.java HTMLLegendElement.java HTMLLinkElement.java HTMLMapElement.java HTMLMenuElement.java HTMLMetaElement.java HTMLModElement.java HTMLOListElement.java HTMLObjectElement.java HTMLOptGroupElement.java HTMLOptionElement.java HTMLParagraphElement.java HTMLParamElement.java HTMLPreElement.java HTMLQuoteElement.java HTMLScriptElement.java HTMLSelectElement.java HTMLStyleElement.java HTMLTableCaptionElement.java HTMLTableCellElement.java HTMLTableColElement.java HTMLTableElement.java HTMLTableRowElement.java HTMLTableSectionElement.java HTMLTextAreaElement.java HTMLTitleElement.java HTMLUListElement.java Attr.java DockMainWindow.java MainWindow.java CDATASection.java Comment.java EntityReference.java NodeFilter.java NodeIterator.java ProcessingInstruction.java Range.java Text.java TreeWalker.java CharacterData.java CopyJob.java DeleteJob.java FileCopyJob.java Job.java KDirNotify.java KDirNotifyInterface.java KDirSize.java ListJob.java MimetypeJob.java SimpleJob.java StatJob.java TransferJob.java Connection.java Slave.java KAboutContributor.java KAboutTranslator.java KCodecs.java KCommand.java KCommandHistory.java KCompletionBox.java KDialogQueue.java KEditListBox.java KFilterBase.java KFilterDev.java TDEFontCombo.java KMacroCommand.java KPanelExtension.java KPixmapSplitter.java KPreviewWidgetBase.java KPushButton.java KScanDialog.java KSqueezedTextLabel.java TDEToolBarPopupAction.java KTipDatabase.java KTipDialog.java BrowserExtensionSignals.java CopyJobSignals.java DCOPClientSignals.java DeleteJobSignals.java JobSignals.java KAboutContainerSignals.java KAboutContributorSignals.java KAboutDialogSignals.java KAboutWidgetSignals.java TDEAccelSignals.java TDEActionCollectionSignals.java TDEActionSignals.java KAnimWidgetSignals.java TDEApplicationSignals.java TDECModuleSignals.java KCharSelectSignals.java KCharSelectTableSignals.java KColorButtonSignals.java KColorComboSignals.java KComboBoxSignals.java KCommandHistorySignals.java KCompletionBoxSignals.java KCompletionSignals.java KDatePickerSignals.java KDateTableSignals.java KDialogBaseSignals.java KDialogSignals.java KDirListerSignals.java KDirOperatorSignals.java KDirWatchSignals.java KDoubleNumInputSignals.java KDualColorButtonSignals.java KEdFindSignals.java KEdReplaceSignals.java KEditListBoxSignals.java KEditSignals.java KEditToolbarSignals.java KEditToolbarWidgetSignals.java KFileDetailViewSignals.java KFileDialogSignals.java KFileIconViewSignals.java KFilePreviewSignals.java TDEFontChooserSignals.java TDEFontDialogSignals.java TDEFontSizeActionSignals.java TDEHTMLPartSignals.java TDEHTMLViewSignals.java KHelpMenuSignals.java KHistoryComboSignals.java KIconButtonSignals.java KIconCanvasSignals.java KIconDialogSignals.java KIconViewSignals.java KIntNumInputSignals.java KJanusWidgetSignals.java KKeyChooserSignals.java KLineEditSignals.java TDEListBoxSignals.java TDEListViewSignals.java KPanelAppletSignals.java KPanelExtensionSignals.java TDEPopupMenuSignals.java KProcIOSignals.java TDEProcessSignals.java KProgressSignals.java TDERecentFilesActionSignals.java KRestrictedLineSignals.java KRootPixmapSignals.java KRunSignals.java KScanDialogSignals.java TDESelectActionSignals.java TDESelectorSignals.java KShredSignals.java KSpellConfigSignals.java KSpellDlgSignals.java KSpellSignals.java KStatusBarLabelSignals.java KStatusBarSignals.java KSycocaSignals.java KSystemTraySignals.java KTabCtlSignals.java KTextBrowserSignals.java TDEToggleActionSignals.java TDEToolBarButtonSignals.java TDEToolBarSignals.java KURLComboBoxSignals.java KURLLabelSignals.java KURLRequesterSignals.java KXMLGUIFactorySignals.java KXYSelectorSignals.java ListJobSignals.java SlaveSignals.java StatJobSignals.java TransferJobSignals.java TDEListViewItem.java KTar.java KArchive.java KArchiveDirectory.java KSSLPKCS12.java KArchiveEntry.java KArchiveFile.java KFileMetaInfo.java KFileMetaInfoItem.java KGuiItem.java KIconViewItem.java KStdGuiItem.java KDataTool.java KDataToolAction.java KDataToolInfo.java KDateWidget.java KDirSelectDialog.java KEMailSettings.java KFileFilterCombo.java KFileTreeBranch.java KFileTreeView.java KFileTreeViewItem.java KFileTreeViewToolTip.java KMultipleDrag.java KWordWrap.java KDataToolActionSignals.java KDateWidgetSignals.java KFileFilterComboSignals.java KFileTreeBranchSignals.java KFileTreeViewSignals.java TDEShortcut.java KKey.java KKeyDialog.java KIO.java Scheduler.java SchedulerSignals.java StatusbarProgress.java ProgressBase.java ProgressBaseSignals.java KKeySequence.java KDockMainWindow.java KDockManager.java KDockManagerSignals.java KDockTabGroup.java KDockWidget.java KDockWidgetSignals.java KURLPixmapProvider.java TDEAccelAction.java KColor.java KColorCells.java KColorCellsSignals.java KColorDialog.java KColorDialogSignals.java KColorPatch.java KColorPatchSignals.java KHSSelector.java KPaletteTable.java KPaletteTableSignals.java KValueSelector.java DCOPAnswer.java KDE.java KSSLCertDlgRet.java TDEListAction.java TDERecentFilesAction.java KArrowButton.java KDateTimeWidget.java KDateTimeWidgetSignals.java KFindDialog.java KFind.java KFindSignals.java KMultiTabBarButton.java KMultiTabBarButtonSignals.java KMultiTabBarTab.java KPrintAction.java KPrintActionSignals.java KProgressDialog.java KReplaceDialog.java KReplace.java KReplaceSignals.java KURLBarSignals.java KMultiTabBar.java KCatalogue.java KDoubleValidator.java KKeyButton.java KMdiChildArea.java KMdiChildFrmCaption.java KMdiChildFrmDragBeginEvent.java KMdiChildFrmDragEndEvent.java KMdiChildFrm.java KMdiChildFrmMoveEvent.java KMdiChildFrmResizeBeginEvent.java KMdiChildFrmResizeEndEvent.java KMdiChildView.java KMdi.java KMdiMainFrm.java KMdiTaskBarButton.java KMdiTaskBar.java KMdiViewCloseEvent.java KMdiWin32IconButton.java TDEPasteTextAction.java KStringListValidator.java KTabBar.java KTabWidget.java KTextEdit.java KTimeWidget.java TDEToggleToolBarAction.java KURLComboRequester.java KMdiChildAreaSignals.java KMdiChildViewSignals.java KMdiMainFrmSignals.java KMdiTaskBarButtonSignals.java KMdiWin32IconButtonSignals.java KTabBarSignals.java KTabWidgetSignals.java KTimeWidgetSignals.java DefaultProgress.java SlaveBase.java KEdit.java KFloatValidator.java KMimeMagic.java KMimeMagicResult.java BrowserInterface.java CSSRule.java CSSRuleList.java CustomNodeFilter.java DavJob.java Document.java DomShared.java EventListener.java Invocation.java KCalendarSystem.java KDirLister.java KFileMetaInfoGroup.java KMimeSourceFactory.java TDESharedConfig.java KShellProcess.java TDEShortcutList.java KSSLCertBox.java KSSLCertChain.java KSSLSession.java KSSLX509V3.java TDEToggleFullScreenAction.java KURLBarItem.java KURLBar.java KURLBarListBox.java Marchaller.java MetaInfoJob.java Node.java Observer.java PreviewJob.java SlaveInterface.java UIEvent.java KAsyncIO.java KAsyncIOSignals.java TDEBufferedIO.java TDEBufferedIOSignals.java AuthInfo.java RenameDlg.java AbstractView.java KInputDialog.java KAuthIconSignals.java KFileViewSignalerSignals.java KKeyButtonSignals.java KLibFactorySignals.java KURLBarListBoxSignals.java MetaInfoJobSignals.java PartSignals.java PreviewJobSignals.java ReadOnlyPartSignals.java ReadWritePartSignals.java SlaveInterfaceSignals.java CSSCharsetRule.java CSSFontFaceRule.java CSSImportRule.java CSSMediaRule.java CSSPageRule.java CSSStyleRule.java CSSUnknownRule.java CSSValueList.java DOMException.java DOMImplementation.java Entity.java EventException.java Factory.java HistoryProvider.java HistoryProviderSignals.java HTMLFormCollection.java TDEAccelShortcutList.java TDEActionShortcutList.java KActiveLabel.java KAr.java KCalendarSystemFactory.java TDECModuleInfo.java TDECModuleLoader.java KCMultiDialog.java KCMultiDialogSignals.java TDEConfigGroup.java KCPUInfo.java KCustomMenuEditor.java KDCOPServiceStarter.java KDiskFreeSp.java KDiskFreeSpSignals.java KDockArea.java KDockAreaSignals.java KFilePlugin.java KFileShare.java TDEFontRequester.java TDEFontRequesterSignals.java KIDNA.java KKeyNative.java KMD5.java KMimeTypeResolverBase.java KMimeTypeResolverHelper.java KMimeTypeValidator.java KMountPoint.java KOCRDialog.java KOCRDialogSignals.java KPanelAppMenu.java KPanelAppMenuSignals.java KPassivePopup.java KPassivePopupSignals.java KPluginSelector.java KPluginSelectorSignals.java KRegExpEditorInterface.java KServiceSeparator.java KShell.java KSimpleFileFilter.java KSMIMECrypto.java KSpellingHighlighter.java KSSLCertDlg.java KSSLCertificateCache.java KSSLCertificateFactory.java KSSLKeyGen.java KSSLPKCS7.java KSSLSigners.java KSyntaxHighlighter.java KTempDir.java KURLBarItemDialog.java KWidgetAction.java KWindowInfo.java KXMLGUI.java KZipFileEntry.java KZip.java LinkStyle.java LiveConnectExtension.java LiveConnectExtensionSignals.java MultiGetJob.java MultiGetJobSignals.java MutationEvent.java Notation.java PartBase.java PasswordDialog.java Plugin.java RangeException.java SessionData.java SkipDlg.java SkipDlgSignals.java SlaveConfigSignals.java StatusBarExtension.java TextEvent.java KNamedCommand.java PartManager.java PartManagerSignals.java URLArgs.java WindowArgs.java BrowserHostExtension.java BrowserRun.java TDEAccelActions.java KDockMainWindowSignals.java StoredTransferJob.java 
 
 ####### tdevelop will overwrite this part!!! (end)############
 
diff --git a/kdejava/koala/org/kde/koala/Plugin.java b/kdejava/koala/org/kde/koala/Plugin.java
index d6cd3ae8..af4fb0af 100644
--- a/kdejava/koala/org/kde/koala/Plugin.java
+++ b/kdejava/koala/org/kde/koala/Plugin.java
@@ -145,25 +145,25 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 		 to get the action object.
 		   		@short    Retrieves an action of the client by name.
 	*/
-	public native KAction action(String name);
+	public native TDEAction action(String name);
 	/**	
 		 Retrieves an action for a given TQDomElement. The default
 		 implementation uses the "name" attribute to query the action
 		 object via the other action() method.
 		   		@short    Retrieves an action for a given TQDomElement.
 	*/
-	public native KAction action(TQDomElement element);
+	public native TDEAction action(TQDomElement element);
 	/**	
 		 Retrieves the entire action collection for the GUI client. If
 		 you subclass KXMLGUIClient you should call
-		 KActionCollection.setWidget( TQWidget ) with this object, or
-		 you will encounter subtle bugs with KAction keyboard shortcuts.
-		 This is not necessary if your KXMLGUIClient is a KMainWindow.
+		 TDEActionCollection.setWidget( TQWidget ) with this object, or
+		 you will encounter subtle bugs with TDEAction keyboard shortcuts.
+		 This is not necessary if your KXMLGUIClient is a TDEMainWindow.
 				@short    Retrieves the entire action collection for the GUI client.
-		@see KActionCollection#setWidget(
+		@see TDEActionCollection#setWidget(
 		@see #org#kde#qt#TQWidget*
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	/**	
 				@return The instance ( TDEInstance ) for this GUI client.
    
@@ -271,7 +271,7 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 			 This tag will get expanded to a list of actions.  In the example
 		 above ( a file manager with a dynamic file menu ), you would call
 		 <pre>
-		 TQPtrList<KAction> file_actions;
+		 TQPtrList<TDEAction> file_actions;
 		 for( ... )
 		   if( ... )
 		     file_actions.append( cool_action );
@@ -287,7 +287,7 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 		       menu too..
 		   		@short    ActionLists are a way for XMLGUI to support dynamic lists of  actions.
 	*/
-	// void plugActionList(const TQString& arg1,const TQPtrList<KAction>& arg2); >>>> NOT CONVERTED
+	// void plugActionList(const TQString& arg1,const TQPtrList<TDEAction>& arg2); >>>> NOT CONVERTED
 	/**	
 		 The complement of plugActionList() ...
 		   		@short    The complement of plugActionList() .
diff --git a/kdejava/koala/org/kde/koala/ReadWritePart.java b/kdejava/koala/org/kde/koala/ReadWritePart.java
index 4aa0037e..652e58aa 100644
--- a/kdejava/koala/org/kde/koala/ReadWritePart.java
+++ b/kdejava/koala/org/kde/koala/ReadWritePart.java
@@ -52,7 +52,7 @@ public class ReadWritePart extends ReadOnlyPart  {
 	public native boolean isModified();
 	/**	
 		 If the document has been modified, ask the user to save changes.
-		 This method is meant to be called from KMainWindow.queryClose().
+		 This method is meant to be called from TDEMainWindow.queryClose().
 		 It will also be called from closeURL().
 				@return true if closeURL() can be called without the user losing
  important data, false if the user chooses to cancel.
@@ -74,7 +74,7 @@ public class ReadWritePart extends ReadOnlyPart  {
 	/**	
 		 Call this method instead of the above if you need control if
 		 the save prompt is shown. For example, if you call queryClose()
-		 from KMainWindow.queryClose(), you would not want to prompt
+		 from TDEMainWindow.queryClose(), you would not want to prompt
 		 again when closing the url.
 			 Equivalent to promptToSave ? closeURL() : ReadOnlyPart.closeURL()
 				@short    Call this method instead of the above if you need control if  the save prompt is shown.
diff --git a/kdejava/koala/org/kde/koala/Scheduler.java b/kdejava/koala/org/kde/koala/Scheduler.java
index 58ea3a47..68094974 100644
--- a/kdejava/koala/org/kde/koala/Scheduler.java
+++ b/kdejava/koala/org/kde/koala/Scheduler.java
@@ -128,10 +128,10 @@ public class Scheduler extends TQObject implements DCOPObjectInterface {
 	*/
 	public static native void removeSlaveOnHold();
 	/**	
-		 Send the slave that was put on hold back to KLauncher. This
+		 Send the slave that was put on hold back to TDELauncher. This
 		 allows another process to take over the slave and resume the job
 		 that was started.
-		         		@short    Send the slave that was put on hold back to KLauncher.
+		         		@short    Send the slave that was put on hold back to TDELauncher.
 	*/
 	public static native void publishSlaveOnHold();
 	/**	
@@ -150,14 +150,14 @@ public class Scheduler extends TQObject implements DCOPObjectInterface {
 	public static native boolean assignJobToSlave(Slave slave, SimpleJob job);
 	public static native boolean disconnectSlave(Slave slave);
 	/**	
-		 Send the slave that was put on hold back to KLauncher. This
+		 Send the slave that was put on hold back to TDELauncher. This
 		 allows another process to take over the slave and resume the job
 		 the that was started.
 		 Register the mainwindow <code>wid</code> with the KIO subsystem
 		 Do not call this, it is called automatically from
 		 void KIO.Job.setWindow(TQWidget).
 			@param wid the window to register
-				@short    Send the slave that was put on hold back to KLauncher.
+				@short    Send the slave that was put on hold back to TDELauncher.
 	*/
 	public static native void registerWindow(TQWidget wid);
 	/**	
@@ -175,10 +175,10 @@ public class Scheduler extends TQObject implements DCOPObjectInterface {
 	public static native boolean connect(TQObject sender, String signal, TQObject receiver, String member);
 	public static native boolean disconnect(TQObject sender, String signal, TQObject receiver, String member);
 	/**	
-		 When true, the next job will check whether KLauncher has a slave 
+		 When true, the next job will check whether TDELauncher has a slave 
 		 on hold that is suitable for the job.
-			@param b true when KLauncher has a job on hold
-		         		@short    When true, the next job will check whether KLauncher has a slave   on hold that is suitable for the job.
+			@param b true when TDELauncher has a job on hold
+		         		@short    When true, the next job will check whether TDELauncher has a slave   on hold that is suitable for the job.
 	*/
 	public static native void checkSlaveOnHold(boolean b);
 	// void setupSlave(TDEIO::Slave* arg1,const KURL& arg2,const TQString& arg3,const TQString& arg4,bool arg5,const TDEIO::MetaData* arg6); >>>> NOT CONVERTED
diff --git a/kdejava/koala/org/kde/koala/StatusBarExtension.java b/kdejava/koala/org/kde/koala/StatusBarExtension.java
index 9b1369f5..720b1f16 100644
--- a/kdejava/koala/org/kde/koala/StatusBarExtension.java
+++ b/kdejava/koala/org/kde/koala/StatusBarExtension.java
@@ -58,7 +58,7 @@ public class StatusBarExtension extends TQObject  {
 	*/
 	public native void removeStatusBarItem(TQWidget widget);
 	/**	
-				@return the statusbar of the KMainWindow in which this part is currently embedded.
+				@return the statusbar of the TDEMainWindow in which this part is currently embedded.
  WARNING: this could return 0L
        
 		@short
@@ -67,7 +67,7 @@ public class StatusBarExtension extends TQObject  {
 	/**	
 		 This allows the hosting application to set a particular KStatusBar
 		 for this part. If it doesn't do this, the statusbar used will be
-		 the one of the KMainWindow in which the part is embedded.
+		 the one of the TDEMainWindow in which the part is embedded.
 		 Konqueror uses this to assign a view-statusbar to the part.
 		 The part should never call this method!
 		       		@short    This allows the hosting application to set a particular KStatusBar  for this part.
diff --git a/kdejava/koala/org/kde/koala/KAccel.java b/kdejava/koala/org/kde/koala/TDEAccel.java
index 8d438e1d..1c1caef5 100644
--- a/kdejava/koala/org/kde/koala/KAccel.java
+++ b/kdejava/koala/org/kde/koala/TDEAccel.java
@@ -14,15 +14,15 @@ import org.kde.qt.TQAccel;
  Allow a user to configure shortcuts
  through application configuration files or through the
  KKeyChooser GUI.
- A KAccel contains a list of accelerator actions.
+ A TDEAccel contains a list of accelerator actions.
  For example, CTRL+Key_P could be a shortcut for printing a document. The key
  codes are listed in qnamespace.h. "Print" could be the action name for printing.
  The action name identifies the shortcut in configuration files and the
  KKeyChooser GUI.
- A KAccel object handles key events sent to its parent widget and to all
- children of this parent widget.  The most recently created KAccel object
- has precedence over any KAccel objects created before it.
- When a shortcut pressed, KAccel calls the slot to which it has been
+ A TDEAccel object handles key events sent to its parent widget and to all
+ children of this parent widget.  The most recently created TDEAccel object
+ has precedence over any TDEAccel objects created before it.
+ When a shortcut pressed, TDEAccel calls the slot to which it has been
  connected. If you want to set global accelerators, independent of the window
  which has the focus, use TDEGlobalAccel.
  Reconfiguration of a given shortcut can be prevented by specifying
@@ -38,81 +38,81 @@ import org.kde.qt.TQAccel;
  The translated first argument for insertItem() is used only
  in the configuration dialog.
 <pre>
- KAccel pAccel = new KAccel( this );
+ TDEAccel pAccel = new TDEAccel( this );
  // Insert an action "Scroll Up" which is associated with the "Up" key:
  pAccel.insert( "Scroll Up", i18n("Scroll up"),
                        i18n("Scroll up the current document by one line."),
                        Qt.Key_Up, this, SLOT("slotScrollUp()") );
  // Insert an standard acclerator action.
- pAccel.insert( KStdAccel.Print, this, SLOT("slotPrint()") );
+ pAccel.insert( TDEStdAccel.Print, this, SLOT("slotPrint()") );
  // Update the shortcuts by read any user-defined settings from the
  // application's config file.
  pAccel.readSettings();
  </pre>
- See {@link KAccelSignals} for signals emitted by KAccel
+ See {@link TDEAccelSignals} for signals emitted by TDEAccel
 		@short Configurable shortcut support for widgets. 
 		@see TDEGlobalAccel
-		@see KAccelShortcutList
+		@see TDEAccelShortcutList
 		@see KKeyChooser
 		@see KKeyDialog
 
 */
-public class KAccel extends TQAccel  {
-	protected KAccel(Class dummy){super((Class) null);}
+public class TDEAccel extends TQAccel  {
+	protected TDEAccel(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Creates a new KAccel that watches <code>pParent</code>, which is also
+		 Creates a new TDEAccel that watches <code>pParent</code>, which is also
 		 the TQObject's parent.
 			@param pParent the parent and widget to watch for key strokes
 			@param psName the name of the TQObject
-			 		@short    Creates a new KAccel that watches <code>pParent</code>, which is also  the TQObject's parent.
+			 		@short    Creates a new TDEAccel that watches <code>pParent</code>, which is also  the TQObject's parent.
 	*/
-	public KAccel(TQWidget pParent, String psName) {
+	public TDEAccel(TQWidget pParent, String psName) {
 		super((Class) null);
-		newKAccel(pParent,psName);
+		newTDEAccel(pParent,psName);
 	}
-	private native void newKAccel(TQWidget pParent, String psName);
-	public KAccel(TQWidget pParent) {
+	private native void newTDEAccel(TQWidget pParent, String psName);
+	public TDEAccel(TQWidget pParent) {
 		super((Class) null);
-		newKAccel(pParent);
+		newTDEAccel(pParent);
 	}
-	private native void newKAccel(TQWidget pParent);
+	private native void newTDEAccel(TQWidget pParent);
 	/**	
-		 Creates a new KAccel that watches <code>watch.</code>
+		 Creates a new TDEAccel that watches <code>watch.</code>
 			@param watch the widget to watch for key strokes
 			@param parent the parent of the TQObject
 			@param psName the name of the TQObject
-			 		@short    Creates a new KAccel that watches <code>watch.</code>
+			 		@short    Creates a new TDEAccel that watches <code>watch.</code>
 	*/
-	public KAccel(TQWidget watch, TQObject parent, String psName) {
+	public TDEAccel(TQWidget watch, TQObject parent, String psName) {
 		super((Class) null);
-		newKAccel(watch,parent,psName);
+		newTDEAccel(watch,parent,psName);
 	}
-	private native void newKAccel(TQWidget watch, TQObject parent, String psName);
-	public KAccel(TQWidget watch, TQObject parent) {
+	private native void newTDEAccel(TQWidget watch, TQObject parent, String psName);
+	public TDEAccel(TQWidget watch, TQObject parent) {
 		super((Class) null);
-		newKAccel(watch,parent);
+		newTDEAccel(watch,parent);
 	}
-	private native void newKAccel(TQWidget watch, TQObject parent);
+	private native void newTDEAccel(TQWidget watch, TQObject parent);
 	/**	
-			 Returns the KAccel's <code>KAccelActions</code>, a list of <code>KAccelAction.</code>
-				@return the KAccelActions of the KAccel
+			 Returns the TDEAccel's <code>TDEAccelActions</code>, a list of <code>TDEAccelAction.</code>
+				@return the TDEAccelActions of the TDEAccel
 	 
 		@short
 	*/
-	public native KAccelActions actions();
+	public native TDEAccelActions actions();
 	/**	
-		 Checks whether the KAccel is active.
+		 Checks whether the TDEAccel is active.
 				@return true if the TQAccel is enabled
 	 
-		@short    Checks whether the KAccel is active.
+		@short    Checks whether the TDEAccel is active.
 	*/
 	public native boolean isEnabled();
 	/**	
-		 Enables or disables the KAccel.
+		 Enables or disables the TDEAccel.
 			@param bEnabled true to enable, false to disable
-			 		@short    Enables or disables the KAccel.
+			 		@short    Enables or disables the TDEAccel.
 	*/
 	public native void setEnabled(boolean bEnabled);
 	/**	
@@ -147,17 +147,17 @@ public class KAccel extends TQAccel  {
 			@param bEnabled The action will be activated by the shortcut if set to 'true'.
 			 		@short    Create an accelerator action.
 	*/
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef, TQObject pObjSlot, String psMethodSlot);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef, TQObject pObjSlot, String psMethodSlot);
 	/**	
 		 Same as first insert(), but with separate shortcuts defined for
 		 3- and 4- modifier defaults.
 			 		@short    Same as first insert(), but with separate shortcuts defined for  3- and 4- modifier defaults.
 	*/
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef3, KShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef3, KShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef3, KShortcut cutDef4, TQObject pObjSlot, String psMethodSlot);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef3, TDEShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef3, TDEShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef3, TDEShortcut cutDef4, TQObject pObjSlot, String psMethodSlot);
 	/**	
 		 This is an overloaded function provided for convenience.
 		 The advantage of this is when you want to use the same text for the name
@@ -174,19 +174,19 @@ public class KAccel extends TQAccel  {
 			@param bEnabled The action will be activated by the shortcut if set to 'true'.
 			 		@short    This is an overloaded function provided for convenience.
 	*/
-	public native KAccelAction insert(String psAction, KShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
-	public native KAccelAction insert(String psAction, KShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
-	public native KAccelAction insert(String psAction, KShortcut cutDef, TQObject pObjSlot, String psMethodSlot);
+	public native TDEAccelAction insert(String psAction, TDEShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
+	public native TDEAccelAction insert(String psAction, TDEShortcut cutDef, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
+	public native TDEAccelAction insert(String psAction, TDEShortcut cutDef, TQObject pObjSlot, String psMethodSlot);
 	/**	
 		 Similar to the first insert() method, but with the action
 		 name, short description, help text, and default shortcuts all
 		 set according to one of the standard accelerators.
 				@short    Similar to the first insert() method, but with the action  name, short description, help text, and default shortcuts all  set according to one of the standard accelerators.
-		@see KStdAccel#
+		@see TDEStdAccel#
 	*/
-	public native KAccelAction insert(int id, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
-	public native KAccelAction insert(int id, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
-	public native KAccelAction insert(int id, TQObject pObjSlot, String psMethodSlot);
+	public native TDEAccelAction insert(int id, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
+	public native TDEAccelAction insert(int id, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
+	public native TDEAccelAction insert(int id, TQObject pObjSlot, String psMethodSlot);
 	/**	
 		 Removes the accelerator action identified by the name.
 		 Remember to also call updateConnections().
@@ -214,7 +214,7 @@ public class KAccel extends TQAccel  {
 	 
 		@short    Return the shortcut associated with the action named by <code>sAction.</code>
 	*/
-	public native KShortcut shortcut(String sAction);
+	public native TDEShortcut shortcut(String sAction);
 	/**	
 		 Set the shortcut to be associated with the action named by <code>sAction.</code>
 			@param sAction the name of the action
@@ -223,7 +223,7 @@ public class KAccel extends TQAccel  {
 	 
 		@short    Set the shortcut to be associated with the action named by <code>sAction.</code>
 	*/
-	public native boolean setShortcut(String sAction, KShortcut shortcut);
+	public native boolean setShortcut(String sAction, TDEShortcut shortcut);
 	/**	
 		 Set the slot to be called when the shortcut of the action named
 		 by <code>sAction</code> is pressed.
diff --git a/kdejava/koala/org/kde/koala/KAccelAction.java b/kdejava/koala/org/kde/koala/TDEAccelAction.java
index ab4b54e9..067ea7c0 100644
--- a/kdejava/koala/org/kde/koala/KAccelAction.java
+++ b/kdejava/koala/org/kde/koala/TDEAccelAction.java
@@ -1,5 +1,5 @@
 /***************************************************************************
-                            KAccelAction.java -  description
+                            TDEAccelAction.java -  description
                              -------------------
     begin                : Wed Jan 30 16:02:13 2002
     copyright            : (C) 2000-2001 Lost Highway Ltd.
@@ -22,9 +22,9 @@ import org.kde.qt.*;
 import java.util.*;
 import java.lang.Error;
 
-public class  KAccelAction implements QtSupport {
+public class  TDEAccelAction implements QtSupport {
 	private long _qt;
 	private boolean _allocatedInJavaWorld = true;
 
-	protected KAccelAction(Class dummy){}
+	protected TDEAccelAction(Class dummy){}
 }
diff --git a/kdejava/koala/org/kde/koala/KAccelActions.java b/kdejava/koala/org/kde/koala/TDEAccelActions.java
index 8c2f4022..da53ea78 100644
--- a/kdejava/koala/org/kde/koala/KAccelActions.java
+++ b/kdejava/koala/org/kde/koala/TDEAccelActions.java
@@ -1,5 +1,5 @@
 /***************************************************************************
-                            KAccelActions.java -  description
+                            TDEAccelActions.java -  description
                              -------------------
     begin                : Wed Jan 30 16:02:13 2002
     copyright            : (C) 2000-2001 Lost Highway Ltd.
@@ -22,9 +22,9 @@ import org.kde.qt.*;
 import java.util.*;
 import java.lang.Error;
 
-public class  KAccelActions implements QtSupport {
+public class  TDEAccelActions implements QtSupport {
 	private long _qt;
 	private boolean _allocatedInJavaWorld = true;
 
-	protected KAccelActions(Class dummy){}
+	protected TDEAccelActions(Class dummy){}
 }
diff --git a/kdejava/koala/org/kde/koala/TDEAccelShortcutList.java b/kdejava/koala/org/kde/koala/TDEAccelShortcutList.java
new file mode 100644
index 00000000..71db9b9c
--- /dev/null
+++ b/kdejava/koala/org/kde/koala/TDEAccelShortcutList.java
@@ -0,0 +1,73 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+package org.kde.koala;
+
+import org.kde.qt.Qt;
+import org.kde.qt.QtSupport;
+import org.kde.qt.TQVariant;
+
+/**
+
+ TDEShortcutList implementation to access TDEAccel and
+ TDEGlobalAccel lists.
+ 		@short    TDEShortcutList implementation to access TDEAccel and  TDEGlobalAccel lists.
+
+*/
+public class TDEAccelShortcutList extends TDEShortcutList  {
+	protected TDEAccelShortcutList(Class dummy){super((Class) null);}
+	/**	
+		 Creates a new TDEShortcutList that accesses the given TDEAccel.
+			@param accel the accelerators to access
+			 		@short    Creates a new TDEShortcutList that accesses the given TDEAccel.
+	*/
+	public TDEAccelShortcutList(TDEAccel accel) {
+		super((Class) null);
+		newTDEAccelShortcutList(accel);
+	}
+	private native void newTDEAccelShortcutList(TDEAccel accel);
+	/**	
+		 Creates a new TDEShortcutList that accesses the given
+		 TDEGlobalAccel.
+			@param accel the accelerators to access
+			 		@short    Creates a new TDEShortcutList that accesses the given  TDEGlobalAccel.
+	*/
+	public TDEAccelShortcutList(TDEGlobalAccel accel) {
+		super((Class) null);
+		newTDEAccelShortcutList(accel);
+	}
+	private native void newTDEAccelShortcutList(TDEGlobalAccel accel);
+	/**	
+			 Creates a new TDEShortcutList that accesses the given
+		 TDEAccelActions collection.
+			@param actions the actions to access
+			@param bGlobal true to save the actions in the global
+		        configuration file
+			 		@short
+	*/
+	public TDEAccelShortcutList(TDEAccelActions actions, boolean bGlobal) {
+		super((Class) null);
+		newTDEAccelShortcutList(actions,bGlobal);
+	}
+	private native void newTDEAccelShortcutList(TDEAccelActions actions, boolean bGlobal);
+	public native int count();
+	public native String name(int index);
+	public native String label(int index);
+	public native String whatsThis(int index);
+	public native TDEShortcut shortcut(int index);
+	public native TDEShortcut shortcutDefault(int index);
+	public native boolean isConfigurable(int index);
+	public native boolean setShortcut(int index, TDEShortcut shortcut);
+	public native boolean isGlobal(int index);
+	/**	 \internal 		@short   \internal
+	*/
+	public native TQVariant getOther(int arg1, int index);
+	/**	 \internal 		@short   \internal
+	*/
+	public native boolean setOther(int arg1, int index, TQVariant arg3);
+	public native boolean save();
+	/** Deletes the wrapped C++ instance */
+	protected native void finalize() throws InternalError;
+	/** Delete the wrapped C++ instance ahead of finalize() */
+	public native void dispose();
+	/** Has the wrapped C++ instance been deleted? */
+	public native boolean isDisposed();
+}
diff --git a/kdejava/koala/org/kde/koala/KAccelSignals.java b/kdejava/koala/org/kde/koala/TDEAccelSignals.java
index 355be490..ae541f31 100644
--- a/kdejava/koala/org/kde/koala/KAccelSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEAccelSignals.java
@@ -6,7 +6,7 @@ import org.kde.qt.QtSupport;
 import org.kde.qt.TQObject;
 import org.kde.qt.TQWidget;
 
-public interface KAccelSignals {
+public interface TDEAccelSignals {
 	/**	
 		 Emitted when one of the key codes has changed.
 			 		@short    Emitted when one of the key codes has changed.
diff --git a/kdejava/koala/org/kde/koala/KAction.java b/kdejava/koala/org/kde/koala/TDEAction.java
index 76e99f77..caec1930 100644
--- a/kdejava/koala/org/kde/koala/KAction.java
+++ b/kdejava/koala/org/kde/koala/TDEAction.java
@@ -12,21 +12,21 @@ import org.kde.qt.TQObject;
 
 /**
 
- The KAction class (and derived and super classes) provides a way to
+ The TDEAction class (and derived and super classes) provides a way to
  easily encapsulate a "real" user-selected action or event in your
  program.
  For instance, a user may want to <code>paste</code> the contents of
  the clipboard or <code>scroll</code> <code>down</code> a document or <code>quit</code> the
  application.  These are all <code>actions</code> -- events that the
- user causes to happen.  The KAction class allows the developer to
+ user causes to happen.  The TDEAction class allows the developer to
  deal with these actions in an easy and intuitive manner.
- Specifically, the KAction class encapsulated the various attributes
+ Specifically, the TDEAction class encapsulated the various attributes
  to an event/action.  For instance, an action might have an icon
  that goes along with it (a clipboard for a "paste" action or
  scissors for a "cut" action).  The action might have some text to
  describe the action.  It will certainly have a method or function
  that actually <code>executes</code> the action!  All these attributes
- are contained within the KAction object.
+ are contained within the TDEAction object.
  The advantage of dealing with Actions is that you can manipulate
  the Action without regard to the GUI representation of it.  For
  instance, in the "normal" way of dealing with actions like "cut",
@@ -37,7 +37,7 @@ import org.kde.qt.TQObject;
  individually.  Setting the menu item and toolbar item up uses very
  similar code - but has to be done twice!
  With the Action concept, you simply "plug" the Action into whatever
- GUI element you want.  The KAction class will then take care of
+ GUI element you want.  The TDEAction class will then take care of
  correctly defining the menu item (with icons, accelerators, text,
  etc) or toolbar button.. or whatever.  From then on, if you
  manipulate the Action at all, the effect will propogate through all
@@ -48,7 +48,7 @@ import org.kde.qt.TQObject;
  This is the biggest advantage to the Action concept -- there is a
  one-to-one relationship between the "real" action and <code>all</code>
  GUI representations of it.
- KAction emits the activated() signal if the user activated the
+ TDEAction emits the activated() signal if the user activated the
  corresponding GUI element ( menu item, toolbar button, etc. )
  If you are in the situation of wanting to map the activated()
  signal of multiple action objects to one slot, with a special
@@ -59,7 +59,7 @@ import org.kde.qt.TQObject;
  connect( desktopNumberMapper, SIGNAL("mapped( int )"),
           this, SLOT("moveWindowToDesktop( int )") );
  for ( uint i = 0; i < numberOfDesktops; ++i ) {
-     KAction desktopAction = new KAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... );
+     TDEAction desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... );
      connect( desktopAction, SIGNAL("activated()"), desktopNumberMapper, SLOT("map()") );
      desktopNumberMapper.setMapping( desktopAction, i );
  }
@@ -73,7 +73,7 @@ import org.kde.qt.TQObject;
 	</li>
 	
 	<li>
-	Create the action using KAction (or derived or super class).
+	Create the action using TDEAction (or derived or super class).
 	</li>
 	
 	<li>
@@ -83,8 +83,8 @@ import org.kde.qt.TQObject;
 	 <li><b>Detailed Example:</b></li>
  Here is an example of enabling a "New [document]" action
  <pre>
- KAction newAct = new KAction(i18n("&New"), "filenew",
-                               KStdAccel.shortcut(KStdAccel.New),
+ TDEAction newAct = new TDEAction(i18n("&New"), "filenew",
+                               TDEStdAccel.shortcut(TDEStdAccel.New),
                                this, SLOT("fileNew()"),
                                actionCollection(), "new");
  </pre>
@@ -111,24 +111,24 @@ import org.kde.qt.TQObject;
  </pre>
  and both the menuitem in File and the toolbar button will instantly
  be disabled.
- Do not delete a KAction object without unplugging it from all its
+ Do not delete a TDEAction object without unplugging it from all its
  containers. The simplest way to do that is to use the unplugAll()
  as in the following example:
  <pre>
  newAct.unplugAll();
  delete newAct;
  </pre>
- Normally you will not need to do this as KActionCollection manages
+ Normally you will not need to do this as TDEActionCollection manages
  everything for you.
  Note: if you are using a "standard" action like "new", "paste",
  "quit", or any other action described in the KDE UI Standards,
  please use the methods in the KStdAction class rather than
  defining your own.
  <li><b>Usage Within the XML Framework:</b></li>
- If you are using KAction within the context of the XML menu and
+ If you are using TDEAction within the context of the XML menu and
  toolbar building framework, then there are a few tiny changes.  The
  first is that you must insert your new action into an action
- collection.  The action collection (a KActionCollection) is,
+ collection.  The action collection (a TDEActionCollection) is,
  logically enough, a central collection of all of the actions
  defined in your application.  The XML UI framework code in KXMLGUI
  classes needs access to this collection in order to build up the
@@ -137,13 +137,13 @@ import org.kde.qt.TQObject;
  Also, if you use the XML builder framework, then you do not ever
  have to plug your actions into containers manually.  The framework
  does that for you.
- See {@link KActionSignals} for signals emitted by KAction
+ See {@link TDEActionSignals} for signals emitted by TDEAction
 		@short Class to encapsulate user-driven action or event.
 		@see KStdAction
 
 */
-public class KAction extends TQObject  {
-	protected KAction(Class dummy){super((Class) null);}
+public class TDEAction extends TQObject  {
+	protected TDEAction(Class dummy){super((Class) null);}
 	/**	
 				@short
 	*/
@@ -161,7 +161,7 @@ public class KAction extends TQObject  {
 		 the user.
 			 If you do not want or have a keyboard shortcut,
 		 set the <code>cut</code> param to 0.
-			 This is the most common KAction used when you do not have a
+			 This is the most common TDEAction used when you do not have a
 		 corresponding icon (note that it won't appear in the current version
 		 of the "Edit ToolBar" dialog, because an action needs an icon to be
 		 plugged in a toolbar...).
@@ -173,18 +173,18 @@ public class KAction extends TQObject  {
 			@param name An internal name for this action.
 		     		@short    Constructs an action with text, potential keyboard  shortcut, and a SLOT to call when this action is invoked by  the user.
 	*/
-	public KAction(String text, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name) {
+	public TDEAction(String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) {
 		super((Class) null);
-		newKAction(text,cut,receiver,slot,parent,name);
+		newTDEAction(text,cut,receiver,slot,parent,name);
 	}
-	private native void newKAction(String text, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name);
+	private native void newTDEAction(String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name);
 	/**	
 		 Constructs an action with text, icon, potential keyboard
 		 shortcut, and a SLOT to call when this action is invoked by
 		 the user.
 			 If you do not want or have a keyboard shortcut, set the
 		 <code>cut</code> param to 0.
-			 This is the other common KAction used.  Use it when you
+			 This is the other common TDEAction used.  Use it when you
 		 <code>do</code> have a corresponding icon.
 			@param text The text that will be displayed.
 			@param pix The icon to display.
@@ -195,11 +195,11 @@ public class KAction extends TQObject  {
 			@param name An internal name for this action.
 		     		@short    Constructs an action with text, icon, potential keyboard  shortcut, and a SLOT to call when this action is invoked by  the user.
 	*/
-	public KAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name) {
+	public TDEAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) {
 		super((Class) null);
-		newKAction(text,pix,cut,receiver,slot,parent,name);
+		newTDEAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name);
+	private native void newTDEAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name);
 	/**	
 		 Constructs an action with text, icon, potential keyboard
 		 shortcut, and a SLOT to call when this action is invoked by
@@ -207,7 +207,7 @@ public class KAction extends TQObject  {
 		 is plugged in.
 			 If you do not want or have a keyboard shortcut, set the
 		 <code>cut</code> param to 0.
-			 This is the other common KAction used.  Use it when you
+			 This is the other common TDEAction used.  Use it when you
 		 <code>do</code> have a corresponding icon.
 			@param text The text that will be displayed.
 			@param pix The icon to display.
@@ -218,11 +218,11 @@ public class KAction extends TQObject  {
 			@param name An internal name for this action.
 		     		@short    Constructs an action with text, icon, potential keyboard  shortcut, and a SLOT to call when this action is invoked by  the user.
 	*/
-	public KAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name) {
+	public TDEAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) {
 		super((Class) null);
-		newKAction(text,pix,cut,receiver,slot,parent,name);
+		newTDEAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name);
+	private native void newTDEAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name);
 	/**	
 		 The same as the above constructor, but with a KGuiItem providing
 		 the text and icon.
@@ -234,18 +234,18 @@ public class KAction extends TQObject  {
 			@param name An internal name for this action.
 		     		@short    The same as the above constructor, but with a KGuiItem providing  the text and icon.
 	*/
-	public KAction(KGuiItem item, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name) {
+	public TDEAction(KGuiItem item, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) {
 		super((Class) null);
-		newKAction(item,cut,receiver,slot,parent,name);
+		newTDEAction(item,cut,receiver,slot,parent,name);
 	}
-	private native void newKAction(KGuiItem item, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name);
+	private native void newTDEAction(KGuiItem item, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name);
 	/**	
 		 "Plug" or insert this action into a given widget.
 			 This will
 		 typically be a menu or a toolbar.  From this point on, you will
 		 never need to directly manipulate the item in the menu or
 		 toolbar.  You do all enabling/disabling/manipulation directly
-		 with your KAction object.
+		 with your TDEAction object.
 			@param widget The GUI element to display this action
 			@param index The position into which the action is plugged. If
 		 this is negative, the action is inserted at the end.
@@ -304,12 +304,12 @@ public class KAction extends TQObject  {
 		 Get the keyboard shortcut associated with this action.
 		     		@short    Get the keyboard shortcut associated with this action.
 	*/
-	public native KShortcut shortcut();
+	public native TDEShortcut shortcut();
 	/**	
 		 Get the default shortcut for this action.
 		     		@short    Get the default shortcut for this action.
 	*/
-	public native KShortcut shortcutDefault();
+	public native TDEShortcut shortcutDefault();
 	public native String shortcutText();
 	public native void setShortcutText(String arg1);
 	/**	
@@ -348,7 +348,7 @@ public class KAction extends TQObject  {
 	*/
 	public native TQIconSet iconSet();
 	public native String icon();
-	public native KActionCollection parentCollection();
+	public native TDEActionCollection parentCollection();
 	public native void unplugAll();
 	public native String statusText();
 	/**	
@@ -361,7 +361,7 @@ public class KAction extends TQObject  {
 		 Sets the keyboard shortcut associated with this action.
 		     		@short    Sets the keyboard shortcut associated with this action.
 	*/
-	public native boolean setShortcut(KShortcut arg1);
+	public native boolean setShortcut(TDEShortcut arg1);
 	public native void setGroup(String arg1);
 	/**	
 		 Sets the What's this text for the action. This text will be displayed when
@@ -379,9 +379,9 @@ public class KAction extends TQObject  {
 			 For the tooltip to show up on the statusbar you will need to connect
 		 a couple of the actionclass signals to the toolbar.
 		 The easiest way of doing this is in your main window class, when you create
-		 a statusbar.  See the KActionCollection class for more details.
+		 a statusbar.  See the TDEActionCollection class for more details.
 			     		@short    Sets the tooltip text for the action.
-		@see KActionCollection
+		@see TDEActionCollection
 	*/
 	public native void setToolTip(String arg1);
 	/**	
@@ -418,7 +418,7 @@ public class KAction extends TQObject  {
 		     		@short
 	*/
 	public static native int getToolButtonID();
-	protected native KToolBar toolBar(int index);
+	protected native TDEToolBar toolBar(int index);
 	protected native TQPopupMenu popupMenu(int index);
 	protected native void removeContainer(int index);
 	protected native int findContainer(TQWidget widget);
diff --git a/kdejava/koala/org/kde/koala/KActionCollection.java b/kdejava/koala/org/kde/koala/TDEActionCollection.java
index a3e53bbb..6cf636bd 100644
--- a/kdejava/koala/org/kde/koala/KActionCollection.java
+++ b/kdejava/koala/org/kde/koala/TDEActionCollection.java
@@ -11,11 +11,11 @@ import org.kde.qt.TQObject;
 
 /**
 
- A managed set of KAction objects.
- If you set the tooltips on KActions and want the tooltip to show in statusbar
+ A managed set of TDEAction objects.
+ If you set the tooltips on TDEActions and want the tooltip to show in statusbar
  (recommended) then you will need to connect a couple of the actionclass signals
  to the toolbar.
- The easiest way of doing this is in your KMainWindow subclass, where you create
+ The easiest way of doing this is in your TDEMainWindow subclass, where you create
  a statusbar, do:
  <pre>
  actionCollection().setHighlightingEnabled(true);  
@@ -24,55 +24,55 @@ import org.kde.qt.TQObject;
  connect(actionCollection(), SIGNAL("clearStatusText()"),
            statusBar(), SLOT("clear()") );
  </pre>
-  See {@link KActionCollectionSignals} for signals emitted by KActionCollection
-		@short    A managed set of KAction objects.
+  See {@link TDEActionCollectionSignals} for signals emitted by TDEActionCollection
+		@short    A managed set of TDEAction objects.
 
 */
-public class KActionCollection extends TQObject  {
-	protected KActionCollection(Class dummy){super((Class) null);}
+public class TDEActionCollection extends TQObject  {
+	protected TDEActionCollection(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
-	public KActionCollection(TQWidget parent, String name, TDEInstanceInterface instance) {
+	public TDEActionCollection(TQWidget parent, String name, TDEInstanceInterface instance) {
 		super((Class) null);
-		newKActionCollection(parent,name,instance);
+		newTDEActionCollection(parent,name,instance);
 	}
-	private native void newKActionCollection(TQWidget parent, String name, TDEInstanceInterface instance);
-	public KActionCollection(TQWidget parent, String name) {
+	private native void newTDEActionCollection(TQWidget parent, String name, TDEInstanceInterface instance);
+	public TDEActionCollection(TQWidget parent, String name) {
 		super((Class) null);
-		newKActionCollection(parent,name);
+		newTDEActionCollection(parent,name);
 	}
-	private native void newKActionCollection(TQWidget parent, String name);
-	public KActionCollection(TQWidget parent) {
+	private native void newTDEActionCollection(TQWidget parent, String name);
+	public TDEActionCollection(TQWidget parent) {
 		super((Class) null);
-		newKActionCollection(parent);
+		newTDEActionCollection(parent);
 	}
-	private native void newKActionCollection(TQWidget parent);
+	private native void newTDEActionCollection(TQWidget parent);
 	/**	
 		 Use this constructor if you want the collection's actions to restrict
 		 their accelerator keys to <code>watch</code> rather than the <code>parent.</code>  If
 		 you don't require shortcuts, you can pass a null to the <code>watch</code> parameter.
 		   		@short    Use this constructor if you want the collection's actions to restrict  their accelerator keys to <code>watch</code> rather than the <code>parent.</code>
 	*/
-	public KActionCollection(TQWidget watch, TQObject parent, String name, TDEInstanceInterface instance) {
+	public TDEActionCollection(TQWidget watch, TQObject parent, String name, TDEInstanceInterface instance) {
 		super((Class) null);
-		newKActionCollection(watch,parent,name,instance);
+		newTDEActionCollection(watch,parent,name,instance);
 	}
-	private native void newKActionCollection(TQWidget watch, TQObject parent, String name, TDEInstanceInterface instance);
-	public KActionCollection(TQWidget watch, TQObject parent, String name) {
+	private native void newTDEActionCollection(TQWidget watch, TQObject parent, String name, TDEInstanceInterface instance);
+	public TDEActionCollection(TQWidget watch, TQObject parent, String name) {
 		super((Class) null);
-		newKActionCollection(watch,parent,name);
+		newTDEActionCollection(watch,parent,name);
 	}
-	private native void newKActionCollection(TQWidget watch, TQObject parent, String name);
-	public KActionCollection(TQWidget watch, TQObject parent) {
+	private native void newTDEActionCollection(TQWidget watch, TQObject parent, String name);
+	public TDEActionCollection(TQWidget watch, TQObject parent) {
 		super((Class) null);
-		newKActionCollection(watch,parent);
+		newTDEActionCollection(watch,parent);
 	}
-	private native void newKActionCollection(TQWidget watch, TQObject parent);
-	public KActionCollection(KActionCollection copy) {
+	private native void newTDEActionCollection(TQWidget watch, TQObject parent);
+	public TDEActionCollection(TDEActionCollection copy) {
 		super((Class) null);
-		newKActionCollection(copy);
+		newTDEActionCollection(copy);
 	}
-	private native void newKActionCollection(KActionCollection copy);
+	private native void newTDEActionCollection(TDEActionCollection copy);
 	/**	
 		 This sets the widget to which the keyboard shortcuts should be attached.
 		 You only need to call this if a null pointer was passed in the constructor.
@@ -101,38 +101,38 @@ public class KActionCollection extends TQObject  {
 		 to a view's action collection.
 		   		@short    Doc/View model.
 	*/
-	public native boolean addDocCollection(KActionCollection pDoc);
-	/**	 Returns the KAccel object of the most recently set widget. 		@short   Returns the KAccel object of the most recently set widget.
+	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 KAccel kaccel();
-	/**	 @internal, for KAction.kaccelCurrent() 		@short   @internal, for KAction.kaccelCurrent()
+	public native TDEAccel kaccel();
+	/**	 @internal, for TDEAction.kaccelCurrent() 		@short   @internal, for TDEAction.kaccelCurrent()
 	*/
-	public native KAccel builderKAccel();
+	public native TDEAccel builderTDEAccel();
 	/**	 Returns the number of actions in the collection 		@short   Returns the number of actions in the collection
 	*/
 	public native int count();
 	public native boolean isEmpty();
 	/**	
-		 Return the KAction at position "index" in the action collection.
-				@short    Return the KAction  at position "index" in the action collection.
+		 Return the TDEAction at position "index" in the action collection.
+				@short    Return the TDEAction  at position "index" in the action collection.
 		@see #count
 	*/
-	public native KAction action(int index);
+	public native TDEAction action(int index);
 	/**	
-		 Find an action (optionally, of a given subclass of KAction) in the action collection.
-			@param name Name of the KAction.
-			@param classname Name of the KAction subclass.
-				@return A pointer to the first KAction in the collection which matches the parameters or
+		 Find an action (optionally, of a given subclass of TDEAction) in the action collection.
+			@param name Name of the TDEAction.
+			@param classname Name of the TDEAction subclass.
+				@return A pointer to the first TDEAction in the collection which matches the parameters or
  null if nothing matches.
    
-		@short    Find an action (optionally, of a given subclass of KAction) in the action collection.
+		@short    Find an action (optionally, of a given subclass of TDEAction) in the action collection.
 	*/
-	public native KAction action(String name, String classname);
-	public native KAction action(String name);
-	/**	 Returns a list of all the groups of all the KActions in this action collection.
-				@short   Returns a list of all the groups of all the KActions in this action collection.
-		@see KAction#group
-		@see KAction#setGroup
+	public native TDEAction action(String name, String classname);
+	public native TDEAction action(String name);
+	/**	 Returns a list of all the groups of all the TDEActions in this action collection.
+				@short   Returns a list of all the groups of all the TDEActions in this action collection.
+		@see TDEAction#group
+		@see TDEAction#setGroup
 	*/
 	public native ArrayList groups();
 	/**	
@@ -140,10 +140,10 @@ public class KActionCollection extends TQObject  {
 			@param group The name of the group.
 		   		@short    Returns the list of actions in a particular group managed by this action collection.
 	*/
-	// KActionPtrList actions(const TQString& arg1); >>>> NOT CONVERTED
+	// TDEActionPtrList actions(const TQString& arg1); >>>> NOT CONVERTED
 	/**	 Returns the list of actions managed by this action collection. 		@short   Returns the list of actions managed by this action collection.
 	*/
-	// KActionPtrList actions(); >>>> NOT CONVERTED
+	// TDEActionPtrList actions(); >>>> NOT CONVERTED
 	/**	
 		 Used for reading shortcut configuration from a non-XML rc file.
 		   		@short    Used for reading shortcut configuration from a non-XML rc file.
@@ -163,10 +163,10 @@ public class KActionCollection extends TQObject  {
 	*/
 	public native TDEInstanceInterface instance();
 	/**	
-		 Enable highlighting notification for specific KActions.
+		 Enable highlighting notification for specific TDEActions.
 		 This is false by default, so, by default, the highlighting
 		 signals will not be emitted.
-				@short    Enable highlighting notification for specific KActions.
+				@short    Enable highlighting notification for specific TDEActions.
 		@see #connectHighlight
 		@see #disconnectHighlight
 		@see #actionHighlighted
@@ -185,24 +185,24 @@ public class KActionCollection extends TQObject  {
 	*/
 	public native boolean highlightingEnabled();
 	/**	
-		 Call this function if you want to receive a signal whenever a KAction is highlighted in a menu or a toolbar.
+		 Call this function if you want to receive a signal whenever a TDEAction is highlighted in a menu or a toolbar.
 		 This is only needed if you do not add this action to this container.
 		 You will generally not need to call this function.
-			@param container A container in which the KAction is plugged (must inherit TQPopupMenu or KToolBar)
+			@param container A container in which the TDEAction is plugged (must inherit TQPopupMenu or TDEToolBar)
 			@param action The action you are interested in
-				@short    Call this function if you want to receive a signal whenever a KAction is highlighted in a menu or a toolbar.
+				@short    Call this function if you want to receive a signal whenever a TDEAction is highlighted in a menu or a toolbar.
 		@see #disconnectHighlight
 		@see #actionHighlighted
 		@see #setHighlightingEnabled
 		@see #highlightingEnabled
 		@see #actionHighlighted
 	*/
-	public native void connectHighlight(TQWidget container, KAction action);
+	public native void connectHighlight(TQWidget container, TDEAction action);
 	/**	
 		 Disconnect highlight notifications for a particular pair of contianer and action.
 		 This is only needed if you do not add this action to this container.
 		 You will generally not need to call this function.
-			@param container A container in which the KAction is plugged (must inherit TQPopupMenu or KToolBar)
+			@param container A container in which the TDEAction is plugged (must inherit TQPopupMenu or TDEToolBar)
 			@param action The action you are interested in
 				@short    Disconnect highlight notifications for a particular pair of contianer and action.
 		@see #connectHighlight
@@ -211,59 +211,59 @@ public class KActionCollection extends TQObject  {
 		@see #highlightingEnabled
 		@see #actionHighlighted
 	*/
-	public native void disconnectHighlight(TQWidget container, KAction action);
+	public native void disconnectHighlight(TQWidget container, TDEAction action);
 	/**	
 		 The parent KXMLGUIClient, return null if not available.
 		   		@short    The parent KXMLGUIClient, return 0L if not available.
 	*/
 	public native KXMLGUIClientInterface parentGUIClient();
-	public KActionCollection(TQObject parent, String name, TDEInstanceInterface instance) {
+	public TDEActionCollection(TQObject parent, String name, TDEInstanceInterface instance) {
 		super((Class) null);
-		newKActionCollection(parent,name,instance);
+		newTDEActionCollection(parent,name,instance);
 	}
-	private native void newKActionCollection(TQObject parent, String name, TDEInstanceInterface instance);
-	public KActionCollection(TQObject parent, String name) {
+	private native void newTDEActionCollection(TQObject parent, String name, TDEInstanceInterface instance);
+	public TDEActionCollection(TQObject parent, String name) {
 		super((Class) null);
-		newKActionCollection(parent,name);
+		newTDEActionCollection(parent,name);
 	}
-	private native void newKActionCollection(TQObject parent, String name);
-	public KActionCollection(TQObject parent) {
+	private native void newTDEActionCollection(TQObject parent, String name);
+	public TDEActionCollection(TQObject parent) {
 		super((Class) null);
-		newKActionCollection(parent);
+		newTDEActionCollection(parent);
 	}
-	private native void newKActionCollection(TQObject parent);
+	private native void newTDEActionCollection(TQObject parent);
 	/**	
 		 Add an action to the collection.
 		 Generally you don't have to call this. The action inserts itself automatically
 		 into its parent collection. This can be useful however for a short-lived
 		 collection (e.g. for a popupmenu, where the signals from the collection are needed too).
-		 (don't forget that in the simple case, a list of actions should be a simple KActionPtrList).
+		 (don't forget that in the simple case, a list of actions should be a simple TDEActionPtrList).
 		 If you manually insert actions into a 2nd collection, don't forget to take them out
 		 again before destroying the collection.
-			@param action The KAction to add.
+			@param action The TDEAction to add.
 		   		@short    Add an action to the collection.
 	*/
-	public native void insert(KAction action);
+	public native void insert(TDEAction action);
 	/**	
 		 Removes an action from the collection and deletes it.
-		 Since the KAction destructor removes the action from the collection, you generally
+		 Since the TDEAction destructor removes the action from the collection, you generally
 		 don't have to call this.
-			@param action The KAction to remove.
+			@param action The TDEAction to remove.
 		   		@short    Removes an action from the collection and deletes it.
 	*/
-	public native void remove(KAction action);
+	public native void remove(TDEAction action);
 	/**	
 		 Removes an action from the collection.
-		 Since the KAction destructor removes the action from the collection, you generally
+		 Since the TDEAction destructor removes the action from the collection, you generally
 		 don't have to call this.
-			@param action the KAction to remove.
+			@param action the TDEAction to remove.
 		   		@return NULL if not found else returns action.
 
 		@short    Removes an action from the collection.
 	*/
-	public native KAction take(KAction action);
-	public native KActionCollection op_plus(KActionCollection arg1);
-	public native KActionCollection op_plus_assign(KActionCollection arg1);
+	public native TDEAction take(TDEAction action);
+	public native TDEActionCollection op_plus(TDEActionCollection arg1);
+	public native TDEActionCollection op_plus_assign(TDEActionCollection arg1);
 	/**	
 		 Clears the entire actionCollection, deleting all actions.
 				@short    Clears the entire actionCollection, deleting all actions.
diff --git a/kdejava/koala/org/kde/koala/KActionCollectionSignals.java b/kdejava/koala/org/kde/koala/TDEActionCollectionSignals.java
index 8dd6cae1..d2ce96ed 100644
--- a/kdejava/koala/org/kde/koala/KActionCollectionSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEActionCollectionSignals.java
@@ -7,9 +7,9 @@ import org.kde.qt.TQObject;
 import java.util.ArrayList;
 import org.kde.qt.TQWidget;
 
-public interface KActionCollectionSignals {
-	void inserted(KAction arg1);
-	void removed(KAction arg1);
+public interface TDEActionCollectionSignals {
+	void inserted(TDEAction arg1);
+	void removed(TDEAction arg1);
 	/**	 Emitted when <code>action</code> is highlighted.
 		  This is only emitted if you have setHighlightingEnabled()
 				@short   Emitted when <code>action</code> is highlighted.
@@ -19,7 +19,7 @@ public interface KActionCollectionSignals {
 		@see #setHighlightingEnabled
 		@see #highlightingEnabled
 	*/
-	void actionHighlighted(KAction action);
+	void actionHighlighted(TDEAction action);
 	/**	 Emitted when <code>action</code> is highlighed or loses highlighting.
 		  This is only emitted if you have setHighlightingEnabled()
 				@short   Emitted when <code>action</code> is highlighed or loses highlighting.
@@ -29,7 +29,7 @@ public interface KActionCollectionSignals {
 		@see #setHighlightingEnabled
 		@see #highlightingEnabled
 	*/
-	void actionHighlighted(KAction action, boolean highlight);
+	void actionHighlighted(TDEAction action, boolean highlight);
 	/**	 Emitted when an action is highlighted, with text
 		  being the tooltip for the action.
 		  This is only emitted if you have setHighlightingEnabled()
diff --git a/kdejava/koala/org/kde/koala/KActionMenu.java b/kdejava/koala/org/kde/koala/TDEActionMenu.java
index a1ef27c3..f455cd9a 100644
--- a/kdejava/koala/org/kde/koala/KActionMenu.java
+++ b/kdejava/koala/org/kde/koala/TDEActionMenu.java
@@ -11,102 +11,102 @@ import org.kde.qt.TQWidget;
 
 /**
 
- A KActionMenu is an action that holds a sub-menu of other actions.
+ A TDEActionMenu is an action that holds a sub-menu of other actions.
  insert() and remove() allow to insert and remove actions into this action-menu.
  Plugged in a popupmenu, it will create a submenu.
  Plugged in a toolbar, it will create a button with a popup menu.
  This is the action used by the XMLGUI since it holds other actions.
- If you want a submenu for selecting one tool among many (without icons), see KSelectAction.
+ If you want a submenu for selecting one tool among many (without icons), see TDESelectAction.
  See also setDelayed about the main action.
- 		@short    A KActionMenu is an action that holds a sub-menu of other actions.
+ 		@short    A TDEActionMenu is an action that holds a sub-menu of other actions.
 
 */
-public class KActionMenu extends KAction  {
-	protected KActionMenu(Class dummy){super((Class) null);}
+public class TDEActionMenu extends TDEAction  {
+	protected TDEActionMenu(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
-	public KActionMenu(String text, TQObject parent, String name) {
+	public TDEActionMenu(String text, TQObject parent, String name) {
 		super((Class) null);
-		newKActionMenu(text,parent,name);
+		newTDEActionMenu(text,parent,name);
 	}
-	private native void newKActionMenu(String text, TQObject parent, String name);
-	public KActionMenu(String text, TQObject parent) {
+	private native void newTDEActionMenu(String text, TQObject parent, String name);
+	public TDEActionMenu(String text, TQObject parent) {
 		super((Class) null);
-		newKActionMenu(text,parent);
+		newTDEActionMenu(text,parent);
 	}
-	private native void newKActionMenu(String text, TQObject parent);
-	public KActionMenu(String text) {
+	private native void newTDEActionMenu(String text, TQObject parent);
+	public TDEActionMenu(String text) {
 		super((Class) null);
-		newKActionMenu(text);
+		newTDEActionMenu(text);
 	}
-	private native void newKActionMenu(String text);
-	public KActionMenu(String text, TQIconSet icon, TQObject parent, String name) {
+	private native void newTDEActionMenu(String text);
+	public TDEActionMenu(String text, TQIconSet icon, TQObject parent, String name) {
 		super((Class) null);
-		newKActionMenu(text,icon,parent,name);
+		newTDEActionMenu(text,icon,parent,name);
 	}
-	private native void newKActionMenu(String text, TQIconSet icon, TQObject parent, String name);
-	public KActionMenu(String text, TQIconSet icon, TQObject parent) {
+	private native void newTDEActionMenu(String text, TQIconSet icon, TQObject parent, String name);
+	public TDEActionMenu(String text, TQIconSet icon, TQObject parent) {
 		super((Class) null);
-		newKActionMenu(text,icon,parent);
+		newTDEActionMenu(text,icon,parent);
 	}
-	private native void newKActionMenu(String text, TQIconSet icon, TQObject parent);
-	public KActionMenu(String text, TQIconSet icon) {
+	private native void newTDEActionMenu(String text, TQIconSet icon, TQObject parent);
+	public TDEActionMenu(String text, TQIconSet icon) {
 		super((Class) null);
-		newKActionMenu(text,icon);
+		newTDEActionMenu(text,icon);
 	}
-	private native void newKActionMenu(String text, TQIconSet icon);
-	public KActionMenu(String text, String icon, TQObject parent, String name) {
+	private native void newTDEActionMenu(String text, TQIconSet icon);
+	public TDEActionMenu(String text, String icon, TQObject parent, String name) {
 		super((Class) null);
-		newKActionMenu(text,icon,parent,name);
+		newTDEActionMenu(text,icon,parent,name);
 	}
-	private native void newKActionMenu(String text, String icon, TQObject parent, String name);
-	public KActionMenu(String text, String icon, TQObject parent) {
+	private native void newTDEActionMenu(String text, String icon, TQObject parent, String name);
+	public TDEActionMenu(String text, String icon, TQObject parent) {
 		super((Class) null);
-		newKActionMenu(text,icon,parent);
+		newTDEActionMenu(text,icon,parent);
 	}
-	private native void newKActionMenu(String text, String icon, TQObject parent);
-	public KActionMenu(String text, String icon) {
+	private native void newTDEActionMenu(String text, String icon, TQObject parent);
+	public TDEActionMenu(String text, String icon) {
 		super((Class) null);
-		newKActionMenu(text,icon);
+		newTDEActionMenu(text,icon);
 	}
-	private native void newKActionMenu(String text, String icon);
-	public KActionMenu(TQObject parent, String name) {
+	private native void newTDEActionMenu(String text, String icon);
+	public TDEActionMenu(TQObject parent, String name) {
 		super((Class) null);
-		newKActionMenu(parent,name);
+		newTDEActionMenu(parent,name);
 	}
-	private native void newKActionMenu(TQObject parent, String name);
-	public KActionMenu(TQObject parent) {
+	private native void newTDEActionMenu(TQObject parent, String name);
+	public TDEActionMenu(TQObject parent) {
 		super((Class) null);
-		newKActionMenu(parent);
+		newTDEActionMenu(parent);
 	}
-	private native void newKActionMenu(TQObject parent);
-	public KActionMenu() {
+	private native void newTDEActionMenu(TQObject parent);
+	public TDEActionMenu() {
 		super((Class) null);
-		newKActionMenu();
+		newTDEActionMenu();
 	}
-	private native void newKActionMenu();
-	public native void insert(KAction arg1, int index);
-	public native void insert(KAction arg1);
-	public native void remove(KAction arg1);
-	public native KPopupMenu popupMenu();
+	private native void newTDEActionMenu();
+	public native void insert(TDEAction arg1, int index);
+	public native void insert(TDEAction arg1);
+	public native void remove(TDEAction arg1);
+	public native TDEPopupMenu popupMenu();
 	public native void popup(TQPoint global);
 	/**	
 		 Returns true if this action creates a delayed popup menu
-		 when plugged in a KToolbar.
-		     		@short    Returns true if this action creates a delayed popup menu  when plugged in a KToolbar.
+		 when plugged in a TDEToolbar.
+		     		@short    Returns true if this action creates a delayed popup menu  when plugged in a TDEToolbar.
 	*/
 	public native boolean delayed();
 	/**	
 		 If set to true, this action will create a delayed popup menu
-		 when plugged in a KToolbar. Otherwise it creates a normal popup.
+		 when plugged in a TDEToolbar. Otherwise it creates a normal popup.
 		 Default: delayed
 			 Remember that if the "main" action (the toolbar button itself)
 		 cannot be clicked, then you should call setDelayed(false).
 			 On the opposite, if the main action can be clicked, it can only happen
 		 in a toolbar: in a menu, the parent of a submenu can't be activated.
 		 To get a "normal" menu item when plugged a menu (and no submenu)
-		 use KToolBarPopupAction.
-		     		@short    If set to true, this action will create a delayed popup menu  when plugged in a KToolbar.
+		 use TDEToolBarPopupAction.
+		     		@short    If set to true, this action will create a delayed popup menu  when plugged in a TDEToolbar.
 	*/
 	public native void setDelayed(boolean _delayed);
 	/**	
@@ -117,12 +117,12 @@ public class KActionMenu extends KAction  {
 	public native boolean stickyMenu();
 	/**	
 		 If set to true, this action will create a sticky popup menu
-		 when plugged in a KToolbar.
+		 when plugged in a TDEToolbar.
 		 "Sticky", means it's visible until a selection is made or the mouse is
 		 clicked elsewhere. This feature allows you to make a selection without
 		 having to press and hold down the mouse while making a selection.
 		 Default: sticky.
-		     		@short    If set to true, this action will create a sticky popup menu  when plugged in a KToolbar.
+		     		@short    If set to true, this action will create a sticky popup menu  when plugged in a TDEToolbar.
 	*/
 	public native void setStickyMenu(boolean sticky);
 	public native int plug(TQWidget widget, int index);
diff --git a/kdejava/koala/org/kde/koala/KActionSeparator.java b/kdejava/koala/org/kde/koala/TDEActionSeparator.java
index 82dfe2ec..d19d7d86 100644
--- a/kdejava/koala/org/kde/koala/KActionSeparator.java
+++ b/kdejava/koala/org/kde/koala/TDEActionSeparator.java
@@ -9,25 +9,25 @@ import org.kde.qt.TQWidget;
 
 /**
 */
-public class KActionSeparator extends KAction  {
-	protected KActionSeparator(Class dummy){super((Class) null);}
+public class TDEActionSeparator extends TDEAction  {
+	protected TDEActionSeparator(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
-	public KActionSeparator(TQObject parent, String name) {
+	public TDEActionSeparator(TQObject parent, String name) {
 		super((Class) null);
-		newKActionSeparator(parent,name);
+		newTDEActionSeparator(parent,name);
 	}
-	private native void newKActionSeparator(TQObject parent, String name);
-	public KActionSeparator(TQObject parent) {
+	private native void newTDEActionSeparator(TQObject parent, String name);
+	public TDEActionSeparator(TQObject parent) {
 		super((Class) null);
-		newKActionSeparator(parent);
+		newTDEActionSeparator(parent);
 	}
-	private native void newKActionSeparator(TQObject parent);
-	public KActionSeparator() {
+	private native void newTDEActionSeparator(TQObject parent);
+	public TDEActionSeparator() {
 		super((Class) null);
-		newKActionSeparator();
+		newTDEActionSeparator();
 	}
-	private native void newKActionSeparator();
+	private native void newTDEActionSeparator();
 	public native int plug(TQWidget widget, int index);
 	public native int plug(TQWidget widget);
 	/** Deletes the wrapped C++ instance */
diff --git a/kdejava/koala/org/kde/koala/KActionShortcutList.java b/kdejava/koala/org/kde/koala/TDEActionShortcutList.java
index 15b41151..09945088 100644
--- a/kdejava/koala/org/kde/koala/KActionShortcutList.java
+++ b/kdejava/koala/org/kde/koala/TDEActionShortcutList.java
@@ -7,26 +7,26 @@ import org.kde.qt.TQVariant;
 
 /**
 */
-public class KActionShortcutList extends KShortcutList  {
-	protected KActionShortcutList(Class dummy){super((Class) null);}
-	public KActionShortcutList(KActionCollection arg1) {
+public class TDEActionShortcutList extends TDEShortcutList  {
+	protected TDEActionShortcutList(Class dummy){super((Class) null);}
+	public TDEActionShortcutList(TDEActionCollection arg1) {
 		super((Class) null);
-		newKActionShortcutList(arg1);
+		newTDEActionShortcutList(arg1);
 	}
-	private native void newKActionShortcutList(KActionCollection arg1);
+	private native void newTDEActionShortcutList(TDEActionCollection arg1);
 	public native int count();
 	public native String name(int i);
 	public native String label(int arg1);
 	public native String whatsThis(int arg1);
-	public native KShortcut shortcut(int arg1);
-	public native KShortcut shortcutDefault(int arg1);
+	public native TDEShortcut shortcut(int arg1);
+	public native TDEShortcut shortcutDefault(int arg1);
 	public native boolean isConfigurable(int arg1);
-	public native boolean setShortcut(int arg1, KShortcut arg2);
+	public native boolean setShortcut(int arg1, TDEShortcut arg2);
 	public native TDEInstanceInterface instance();
 	public native TQVariant getOther(int arg1, int index);
 	public native boolean setOther(int arg1, int index, TQVariant arg3);
 	public native boolean save();
-	public native KAction action(int arg1);
+	public native TDEAction action(int arg1);
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
 	/** Delete the wrapped C++ instance ahead of finalize() */
diff --git a/kdejava/koala/org/kde/koala/KActionSignals.java b/kdejava/koala/org/kde/koala/TDEActionSignals.java
index 9476caa9..0602f5f8 100644
--- a/kdejava/koala/org/kde/koala/KActionSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEActionSignals.java
@@ -8,7 +8,7 @@ import org.kde.qt.TQPopupMenu;
 import org.kde.qt.TQIconSet;
 import org.kde.qt.TQWidget;
 
-public interface KActionSignals {
+public interface TDEActionSignals {
 	/**	
 		 Emitted when this action is activated
 		     		@short    Emitted when this action is activated
diff --git a/kdejava/koala/org/kde/koala/TDEApplication.java b/kdejava/koala/org/kde/koala/TDEApplication.java
index 4e24cc29..2a1514ef 100644
--- a/kdejava/koala/org/kde/koala/TDEApplication.java
+++ b/kdejava/koala/org/kde/koala/TDEApplication.java
@@ -251,10 +251,10 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac
 	/**	
 		 Returns true if the application is currently saving its session
 		 data (most probably before KDE logout). This is intended for use
-		 mainly in KMainWindow.queryClose() and KMainWindow.queryExit().
+		 mainly in TDEMainWindow.queryClose() and TDEMainWindow.queryExit().
 				@short    Returns true if the application is currently saving its session  data (most probably before KDE logout).
-		@see KMainWindow#queryClose
-		@see KMainWindow#queryExit
+		@see TDEMainWindow#queryClose
+		@see TDEMainWindow#queryExit
 	*/
 	public native boolean sessionSaving();
 	/**	
@@ -289,7 +289,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac
 		  Sets the top widget of the application.
 		  This means basically applying the right window caption and
 		  icon. An application may have several top widgets. You don't
-		  need to call this function manually when using KMainWindow.
+		  need to call this function manually when using TDEMainWindow.
 			@param topWidget A top widget of the application.
 				@short     Sets the top widget of the application.
 		@see #icon
@@ -516,14 +516,14 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac
 	*/
 	public native boolean authorize(String genericAction);
 	/**	
-		 Returns whether a certain KAction is authorized.
-			@param action The name of a KAction action. The name is prepended
+		 Returns whether a certain TDEAction is authorized.
+			@param action The name of a TDEAction action. The name is prepended
 		 with "action/" before being passed to authorize()
-				@return true if the KAction is authorized
+				@return true if the TDEAction is authorized
    
-		@short    Returns whether a certain KAction is authorized.
+		@short    Returns whether a certain TDEAction is authorized.
 	*/
-	public native boolean authorizeKAction(String action);
+	public native boolean authorizeTDEAction(String action);
 	/**	
 		 Returns whether a certain URL related action is authorized.
 			@param action The name of the action. Known actions are
@@ -629,16 +629,16 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac
 		 If the widget with focus provides a clear() slot, call that slot.  Thus for a
 		 simple application clear() can be implemented as:
 		 <pre>
-		 new KAction( i18n( "Clear" ), "editclear", 0, kapp, SLOT("clear()"), actionCollection(), "clear" );
+		 new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, SLOT("clear()"), actionCollection(), "clear" );
 		 </pre>
 			 Note that for some widgets, this may not provide the intended bahavior.  For
-		 example if you make use of the code above and a KListView has the focus, clear()
+		 example if you make use of the code above and a TDEListView has the focus, clear()
 		 will clear all of the items in the list.  If this is not the intened behavior
-		 and you want to make use of this slot, you can subclass KListView and reimplement
-		 this slot.  For example the following code would implement a KListView without this
+		 and you want to make use of this slot, you can subclass TDEListView and reimplement
+		 this slot.  For example the following code would implement a TDEListView without this
 		 behavior:
 			 <pre>
-		 public class MyListView implements KListView {
+		 public class MyListView implements TDEListView {
 		    public    MyListView( TQWidget  parent = 0, String  name = 0, WFlags f = 0 ) {}
 		   
 		 public    void clear() {}
@@ -998,7 +998,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac
 		 }
 		 </pre>
 			 Now in your application calls to MyApplication.deselect() will call this slot on the
-		 focused widget if it provides this slot.  You can combine this with KAction with:
+		 focused widget if it provides this slot.  You can combine this with TDEAction with:
 			 <pre>
 		 KStdAction.deselect( (MyApplication)( kapp ), SLOT("cut()"), actionCollection() );
 		 </pre>
diff --git a/kdejava/koala/org/kde/koala/TDEApplicationSignals.java b/kdejava/koala/org/kde/koala/TDEApplicationSignals.java
index 429e66ec..22e80d3c 100644
--- a/kdejava/koala/org/kde/koala/TDEApplicationSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEApplicationSignals.java
@@ -46,7 +46,7 @@ public interface TDEApplicationSignals {
 	*/
 	void appearanceChanged();
 	/**	
-		 Emitted when the settings for toolbars have been changed. KToolBar will know what to do.
+		 Emitted when the settings for toolbars have been changed. TDEToolBar will know what to do.
 		   		@short    Emitted when the settings for toolbars have been changed.
 	*/
 	void toolbarAppearanceChanged(int arg1);
@@ -84,11 +84,11 @@ public interface TDEApplicationSignals {
 	/**	
 		      Session management asks you to save the state of your application.
 			     This signal is provided for compatibility only. For new
-		     applications, simply use KMainWindow. By reimplementing 
-		     KMainWindow.queryClose(), KMainWindow.saveProperties() and
-		 KMainWindow.readProperties() you can simply handle session
+		     applications, simply use TDEMainWindow. By reimplementing 
+		     TDEMainWindow.queryClose(), TDEMainWindow.saveProperties() and
+		 TDEMainWindow.readProperties() you can simply handle session
 		     management for applications with multiple toplevel windows.
-			     For purposes without KMainWindow, create an instance of
+			     For purposes without TDEMainWindow, create an instance of
 		     KSessionManaged and reimplement the functions 
 		     KSessionManaged.commitData() and/or 
 		     KSessionManaged.saveState()
diff --git a/kdejava/koala/org/kde/koala/TDEFontAction.java b/kdejava/koala/org/kde/koala/TDEFontAction.java
new file mode 100644
index 00000000..c0fa4f0a
--- /dev/null
+++ b/kdejava/koala/org/kde/koala/TDEFontAction.java
@@ -0,0 +1,172 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+package org.kde.koala;
+
+import org.kde.qt.Qt;
+import org.kde.qt.TQMetaObject;
+import org.kde.qt.QtSupport;
+import org.kde.qt.TQObject;
+import org.kde.qt.TQIconSet;
+import org.kde.qt.TQWidget;
+
+/**
+*/
+public class TDEFontAction extends TDESelectAction  {
+	protected TDEFontAction(Class dummy){super((Class) null);}
+	public native TQMetaObject metaObject();
+	public native String className();
+	public TDEFontAction(String text, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(text,cut,parent,name);
+	}
+	private native void newTDEFontAction(String text, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontAction(String text, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(text,cut,parent);
+	}
+	private native void newTDEFontAction(String text, TDEShortcut cut, TQObject parent);
+	public TDEFontAction(String text, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontAction(text,cut);
+	}
+	private native void newTDEFontAction(String text, TDEShortcut cut);
+	public TDEFontAction(String text) {
+		super((Class) null);
+		newTDEFontAction(text);
+	}
+	private native void newTDEFontAction(String text);
+	public TDEFontAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(text,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEFontAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEFontAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(text,cut,receiver,slot,parent);
+	}
+	private native void newTDEFontAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	public TDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,parent,name);
+	}
+	private native void newTDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,parent);
+	}
+	private native void newTDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent);
+	public TDEFontAction(String text, TQIconSet pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut);
+	}
+	private native void newTDEFontAction(String text, TQIconSet pix, TDEShortcut cut);
+	public TDEFontAction(String text, TQIconSet pix) {
+		super((Class) null);
+		newTDEFontAction(text,pix);
+	}
+	private native void newTDEFontAction(String text, TQIconSet pix);
+	public TDEFontAction(String text, String pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,parent,name);
+	}
+	private native void newTDEFontAction(String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontAction(String text, String pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,parent);
+	}
+	private native void newTDEFontAction(String text, String pix, TDEShortcut cut, TQObject parent);
+	public TDEFontAction(String text, String pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut);
+	}
+	private native void newTDEFontAction(String text, String pix, TDEShortcut cut);
+	public TDEFontAction(String text, String pix) {
+		super((Class) null);
+		newTDEFontAction(text,pix);
+	}
+	private native void newTDEFontAction(String text, String pix);
+	public TDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDEFontAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	public TDEFontAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEFontAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEFontAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDEFontAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	public TDEFontAction(int fontListCriteria, String text, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text,cut,parent,name);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontAction(int fontListCriteria, String text, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text,cut,parent);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text, TDEShortcut cut, TQObject parent);
+	public TDEFontAction(int fontListCriteria, String text, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text,cut);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text, TDEShortcut cut);
+	public TDEFontAction(int fontListCriteria, String text) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text);
+	public TDEFontAction(int fontListCriteria, String text, String pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text,pix,cut,parent,name);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontAction(int fontListCriteria, String text, String pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text,pix,cut,parent);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text, String pix, TDEShortcut cut, TQObject parent);
+	public TDEFontAction(int fontListCriteria, String text, String pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text,pix,cut);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text, String pix, TDEShortcut cut);
+	public TDEFontAction(int fontListCriteria, String text, String pix) {
+		super((Class) null);
+		newTDEFontAction(fontListCriteria,text,pix);
+	}
+	private native void newTDEFontAction(int fontListCriteria, String text, String pix);
+	public TDEFontAction(TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontAction(parent,name);
+	}
+	private native void newTDEFontAction(TQObject parent, String name);
+	public TDEFontAction(TQObject parent) {
+		super((Class) null);
+		newTDEFontAction(parent);
+	}
+	private native void newTDEFontAction(TQObject parent);
+	public TDEFontAction() {
+		super((Class) null);
+		newTDEFontAction();
+	}
+	private native void newTDEFontAction();
+	public native String font();
+	public native int plug(TQWidget arg1, int index);
+	public native int plug(TQWidget arg1);
+	public native void setFont(String family);
+	/** Deletes the wrapped C++ instance */
+	protected native void finalize() throws InternalError;
+	/** Delete the wrapped C++ instance ahead of finalize() */
+	public native void dispose();
+	/** Has the wrapped C++ instance been deleted? */
+	public native boolean isDisposed();
+}
diff --git a/kdejava/koala/org/kde/koala/KFontChooser.java b/kdejava/koala/org/kde/koala/TDEFontChooser.java
index d75c5ff6..9504b868 100644
--- a/kdejava/koala/org/kde/koala/KFontChooser.java
+++ b/kdejava/koala/org/kde/koala/TDEFontChooser.java
@@ -12,12 +12,12 @@ import org.kde.qt.TQWidget;
 
 /**
 
- While KFontChooser as an ordinary widget can be embedded in
+ While TDEFontChooser as an ordinary widget can be embedded in
  custom dialogs and therefore is very flexible, in most cases
  it is preferable to use the convenience functions in
- KFontDialog.
+ TDEFontDialog.
  \image html kfontchooser.png "KDE Font Chooser"
- See {@link KFontChooserSignals} for signals emitted by KFontChooser
+ See {@link TDEFontChooserSignals} for signals emitted by TDEFontChooser
 		@author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
 
 		@version $Id$
@@ -25,8 +25,8 @@ import org.kde.qt.TQWidget;
 		@short A font selection widget.
 
 */
-public class KFontChooser extends TQWidget  {
-	protected KFontChooser(Class dummy){super((Class) null);}
+public class TDEFontChooser extends TQWidget  {
+	protected TDEFontChooser(Class dummy){super((Class) null);}
 	/**	
 		
 			<li>
@@ -100,8 +100,8 @@ public class KFontChooser extends TQWidget  {
 		 <p>Consider the following code snippet;
 		 <pre>
 		    ArrayList list;
-		    KFontChooser.getFontList(list,SmoothScalableFonts);
-		    KFontChooser chooseFont = new KFontChooser(0, "FontList", false, list);
+		    TDEFontChooser.getFontList(list,SmoothScalableFonts);
+		    TDEFontChooser chooseFont = new TDEFontChooser(0, "FontList", false, list);
 		 </pre>
 		 <p>
 		 The above creates a font chooser dialog with only SmoothScaleble fonts.
@@ -114,7 +114,7 @@ public class KFontChooser extends TQWidget  {
 		        If that has not been created, X is queried, and all fonts
 		        available on the system are displayed.
 			@param diff Display the difference version dialog.
-		        See KFontDialog.getFontDiff().
+		        See TDEFontDialog.getFontDiff().
 			@param makeFrame Draws a frame with titles around the contents.
 			@param visibleListSize The minimum number of visible entries in the
 		        fontlists.
@@ -126,51 +126,51 @@ public class KFontChooser extends TQWidget  {
 		        calling sizeIsRelative().
 		   		@short    Constructs a font picker widget.
 	*/
-	public KFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff, int sizeIsRelativeState) {
+	public TDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff, int sizeIsRelativeState) {
 		super((Class) null);
-		newKFontChooser(parent,name,onlyFixed,fontList,makeFrame,visibleListSize,diff,sizeIsRelativeState);
+		newTDEFontChooser(parent,name,onlyFixed,fontList,makeFrame,visibleListSize,diff,sizeIsRelativeState);
 	}
-	private native void newKFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff, int sizeIsRelativeState);
-	public KFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff) {
+	private native void newTDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff, int sizeIsRelativeState);
+	public TDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff) {
 		super((Class) null);
-		newKFontChooser(parent,name,onlyFixed,fontList,makeFrame,visibleListSize,diff);
+		newTDEFontChooser(parent,name,onlyFixed,fontList,makeFrame,visibleListSize,diff);
 	}
-	private native void newKFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff);
-	public KFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize) {
+	private native void newTDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize, boolean diff);
+	public TDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize) {
 		super((Class) null);
-		newKFontChooser(parent,name,onlyFixed,fontList,makeFrame,visibleListSize);
+		newTDEFontChooser(parent,name,onlyFixed,fontList,makeFrame,visibleListSize);
 	}
-	private native void newKFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize);
-	public KFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame) {
+	private native void newTDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame, int visibleListSize);
+	public TDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame) {
 		super((Class) null);
-		newKFontChooser(parent,name,onlyFixed,fontList,makeFrame);
+		newTDEFontChooser(parent,name,onlyFixed,fontList,makeFrame);
 	}
-	private native void newKFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame);
-	public KFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList) {
+	private native void newTDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList, boolean makeFrame);
+	public TDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList) {
 		super((Class) null);
-		newKFontChooser(parent,name,onlyFixed,fontList);
+		newTDEFontChooser(parent,name,onlyFixed,fontList);
 	}
-	private native void newKFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList);
-	public KFontChooser(TQWidget parent, String name, boolean onlyFixed) {
+	private native void newTDEFontChooser(TQWidget parent, String name, boolean onlyFixed, String[] fontList);
+	public TDEFontChooser(TQWidget parent, String name, boolean onlyFixed) {
 		super((Class) null);
-		newKFontChooser(parent,name,onlyFixed);
+		newTDEFontChooser(parent,name,onlyFixed);
 	}
-	private native void newKFontChooser(TQWidget parent, String name, boolean onlyFixed);
-	public KFontChooser(TQWidget parent, String name) {
+	private native void newTDEFontChooser(TQWidget parent, String name, boolean onlyFixed);
+	public TDEFontChooser(TQWidget parent, String name) {
 		super((Class) null);
-		newKFontChooser(parent,name);
+		newTDEFontChooser(parent,name);
 	}
-	private native void newKFontChooser(TQWidget parent, String name);
-	public KFontChooser(TQWidget parent) {
+	private native void newTDEFontChooser(TQWidget parent, String name);
+	public TDEFontChooser(TQWidget parent) {
 		super((Class) null);
-		newKFontChooser(parent);
+		newTDEFontChooser(parent);
 	}
-	private native void newKFontChooser(TQWidget parent);
-	public KFontChooser() {
+	private native void newTDEFontChooser(TQWidget parent);
+	public TDEFontChooser() {
 		super((Class) null);
-		newKFontChooser();
+		newTDEFontChooser();
 	}
-	private native void newKFontChooser();
+	private native void newTDEFontChooser();
 	/**	
 		 Enables or disable a font column in the chooser.
 			 Use this
@@ -284,7 +284,7 @@ public class KFontChooser extends TQWidget  {
 			@param list The list is returned here.
 			@param fontListCriteria should contain all the restrictions for font selection as OR-ed values
 				@short    Creates a list of font strings.
-		@see KFontChooser#FontListCriteria
+		@see TDEFontChooser#FontListCriteria
 		@see #for
 		@see #the
 		@see #individual
diff --git a/kdejava/koala/org/kde/koala/KFontChooserSignals.java b/kdejava/koala/org/kde/koala/TDEFontChooserSignals.java
index 93ef6bf3..a9cfca66 100644
--- a/kdejava/koala/org/kde/koala/KFontChooserSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEFontChooserSignals.java
@@ -8,7 +8,7 @@ import org.kde.qt.QtSupport;
 import org.kde.qt.TQSize;
 import org.kde.qt.TQWidget;
 
-public interface KFontChooserSignals {
+public interface TDEFontChooserSignals {
 	/**	
 		 Emitted whenever the selected font changes.
 		   		@short    Emitted whenever the selected font changes.
diff --git a/kdejava/koala/org/kde/koala/KFontCombo.java b/kdejava/koala/org/kde/koala/TDEFontCombo.java
index 6ce80e5d..e00d12ec 100644
--- a/kdejava/koala/org/kde/koala/KFontCombo.java
+++ b/kdejava/koala/org/kde/koala/TDEFontCombo.java
@@ -16,8 +16,8 @@ import org.kde.qt.TQWidget;
 		@short A combobox that lists the available fonts.
 
 */
-public class KFontCombo extends KComboBox  {
-	protected KFontCombo(Class dummy){super((Class) null);}
+public class TDEFontCombo extends KComboBox  {
+	protected TDEFontCombo(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -26,16 +26,16 @@ public class KFontCombo extends KComboBox  {
 			@param name The object name for the widget
 		     		@short    Constructor
 	*/
-	public KFontCombo(TQWidget parent, String name) {
+	public TDEFontCombo(TQWidget parent, String name) {
 		super((Class) null);
-		newKFontCombo(parent,name);
+		newTDEFontCombo(parent,name);
 	}
-	private native void newKFontCombo(TQWidget parent, String name);
-	public KFontCombo(TQWidget parent) {
+	private native void newTDEFontCombo(TQWidget parent, String name);
+	public TDEFontCombo(TQWidget parent) {
 		super((Class) null);
-		newKFontCombo(parent);
+		newTDEFontCombo(parent);
 	}
-	private native void newKFontCombo(TQWidget parent);
+	private native void newTDEFontCombo(TQWidget parent);
 	/**	
 		 Constructor that takes an already initialzed font list
 			@param fonts A list of fonts to show
@@ -43,16 +43,16 @@ public class KFontCombo extends KComboBox  {
 			@param name The object name for the widget
 		     		@short    Constructor that takes an already initialzed font list
 	*/
-	public KFontCombo(String[] fonts, TQWidget parent, String name) {
+	public TDEFontCombo(String[] fonts, TQWidget parent, String name) {
 		super((Class) null);
-		newKFontCombo(fonts,parent,name);
+		newTDEFontCombo(fonts,parent,name);
 	}
-	private native void newKFontCombo(String[] fonts, TQWidget parent, String name);
-	public KFontCombo(String[] fonts, TQWidget parent) {
+	private native void newTDEFontCombo(String[] fonts, TQWidget parent, String name);
+	public TDEFontCombo(String[] fonts, TQWidget parent) {
 		super((Class) null);
-		newKFontCombo(fonts,parent);
+		newTDEFontCombo(fonts,parent);
 	}
-	private native void newKFontCombo(String[] fonts, TQWidget parent);
+	private native void newTDEFontCombo(String[] fonts, TQWidget parent);
 	/**	
 		 Sets the font list.
 			@param fonts Font list to show
diff --git a/kdejava/koala/org/kde/koala/KFontDialog.java b/kdejava/koala/org/kde/koala/TDEFontDialog.java
index d53456a7..2b057cb8 100644
--- a/kdejava/koala/org/kde/koala/KFontDialog.java
+++ b/kdejava/koala/org/kde/koala/TDEFontDialog.java
@@ -9,21 +9,21 @@ import org.kde.qt.TQWidget;
 
 /**
 
- The KFontDialog provides a dialog for interactive font selection.
- It is basically a thin wrapper around the KFontChooser widget,
+ The TDEFontDialog provides a dialog for interactive font selection.
+ It is basically a thin wrapper around the TDEFontChooser widget,
  which can also be used standalone. In most cases, the simplest
- use of this class is the static method KFontDialog.getFont(),
+ use of this class is the static method TDEFontDialog.getFont(),
  which pops up the dialog, allows the user to select a font, and
  returns when the dialog is closed.
  Example:
  <pre>
       TQFont myFont;
-      int result = KFontDialog.getFont( myFont );
-      if ( result == KFontDialog.Accepted )
+      int result = TDEFontDialog.getFont( myFont );
+      if ( result == TDEFontDialog.Accepted )
             ...
  </pre>
  \image html kfontdialog.png "KDE Font Dialog"
- See {@link KFontDialogSignals} for signals emitted by KFontDialog
+ See {@link TDEFontDialogSignals} for signals emitted by TDEFontDialog
 		@author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
 
 		@version $Id$
@@ -31,8 +31,8 @@ import org.kde.qt.TQWidget;
 		@short A font selection dialog.
 
 */
-public class KFontDialog extends KDialogBase  {
-	protected KFontDialog(Class dummy){super((Class) null);}
+public class TDEFontDialog extends KDialogBase  {
+	protected TDEFontDialog(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -56,51 +56,51 @@ public class KFontDialog extends KDialogBase  {
 		        calling sizeIsRelative().
 			   		@short    Constructs a font selection dialog.
 	*/
-	public KFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff, int sizeIsRelativeState) {
+	public TDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff, int sizeIsRelativeState) {
 		super((Class) null);
-		newKFontDialog(parent,name,onlyFixed,modal,fontlist,makeFrame,diff,sizeIsRelativeState);
+		newTDEFontDialog(parent,name,onlyFixed,modal,fontlist,makeFrame,diff,sizeIsRelativeState);
 	}
-	private native void newKFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff, int sizeIsRelativeState);
-	public KFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff) {
+	private native void newTDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff, int sizeIsRelativeState);
+	public TDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff) {
 		super((Class) null);
-		newKFontDialog(parent,name,onlyFixed,modal,fontlist,makeFrame,diff);
+		newTDEFontDialog(parent,name,onlyFixed,modal,fontlist,makeFrame,diff);
 	}
-	private native void newKFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff);
-	public KFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame) {
+	private native void newTDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame, boolean diff);
+	public TDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame) {
 		super((Class) null);
-		newKFontDialog(parent,name,onlyFixed,modal,fontlist,makeFrame);
+		newTDEFontDialog(parent,name,onlyFixed,modal,fontlist,makeFrame);
 	}
-	private native void newKFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame);
-	public KFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist) {
+	private native void newTDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist, boolean makeFrame);
+	public TDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist) {
 		super((Class) null);
-		newKFontDialog(parent,name,onlyFixed,modal,fontlist);
+		newTDEFontDialog(parent,name,onlyFixed,modal,fontlist);
 	}
-	private native void newKFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist);
-	public KFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal) {
+	private native void newTDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal, String[] fontlist);
+	public TDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal) {
 		super((Class) null);
-		newKFontDialog(parent,name,onlyFixed,modal);
+		newTDEFontDialog(parent,name,onlyFixed,modal);
 	}
-	private native void newKFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal);
-	public KFontDialog(TQWidget parent, String name, boolean onlyFixed) {
+	private native void newTDEFontDialog(TQWidget parent, String name, boolean onlyFixed, boolean modal);
+	public TDEFontDialog(TQWidget parent, String name, boolean onlyFixed) {
 		super((Class) null);
-		newKFontDialog(parent,name,onlyFixed);
+		newTDEFontDialog(parent,name,onlyFixed);
 	}
-	private native void newKFontDialog(TQWidget parent, String name, boolean onlyFixed);
-	public KFontDialog(TQWidget parent, String name) {
+	private native void newTDEFontDialog(TQWidget parent, String name, boolean onlyFixed);
+	public TDEFontDialog(TQWidget parent, String name) {
 		super((Class) null);
-		newKFontDialog(parent,name);
+		newTDEFontDialog(parent,name);
 	}
-	private native void newKFontDialog(TQWidget parent, String name);
-	public KFontDialog(TQWidget parent) {
+	private native void newTDEFontDialog(TQWidget parent, String name);
+	public TDEFontDialog(TQWidget parent) {
 		super((Class) null);
-		newKFontDialog(parent);
+		newTDEFontDialog(parent);
 	}
-	private native void newKFontDialog(TQWidget parent);
-	public KFontDialog() {
+	private native void newTDEFontDialog(TQWidget parent);
+	public TDEFontDialog() {
 		super((Class) null);
-		newKFontDialog();
+		newTDEFontDialog();
 	}
-	private native void newKFontDialog();
+	private native void newTDEFontDialog();
 	/**	
 		 Sets the currently selected font in the dialog.
 			@param font The font to select.
@@ -166,11 +166,11 @@ public class KFontDialog extends KDialogBase  {
 		        difference selection bitmask should be written.
 		        Check the returned bitmask like:
 		        <pre>
-		        if ( diffFlags & KFontChooser.FontDiffFamily )
+		        if ( diffFlags & TDEFontChooser.FontDiffFamily )
 		            [...]
-		        if ( diffFlags & KFontChooser.FontDiffStyle )
+		        if ( diffFlags & TDEFontChooser.FontDiffStyle )
 		            [...]
-		        if ( diffFlags & KFontChooser.FontDiffSize )
+		        if ( diffFlags & TDEFontChooser.FontDiffSize )
 		            [...]
 		        </pre>
 			@param onlyFixed if true, only select from fixed-width fonts.
diff --git a/kdejava/koala/org/kde/koala/KFontDialogSignals.java b/kdejava/koala/org/kde/koala/TDEFontDialogSignals.java
index e567a077..f3418777 100644
--- a/kdejava/koala/org/kde/koala/KFontDialogSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEFontDialogSignals.java
@@ -6,7 +6,7 @@ import org.kde.qt.TQMetaObject;
 import org.kde.qt.QtSupport;
 import org.kde.qt.TQWidget;
 
-public interface KFontDialogSignals {
+public interface TDEFontDialogSignals {
 	/**	
 		 Emitted whenever the currently selected font changes.
 		 Connect to this to monitor the font as it is selected if you are
diff --git a/kdejava/koala/org/kde/koala/KFontRequester.java b/kdejava/koala/org/kde/koala/TDEFontRequester.java
index b93ce12a..83a2c64c 100644
--- a/kdejava/koala/org/kde/koala/KFontRequester.java
+++ b/kdejava/koala/org/kde/koala/TDEFontRequester.java
@@ -13,18 +13,18 @@ import org.kde.qt.TQWidget;
 /**
 
  This class provides a widget with a lineedit and a button, which invokes
- a font dialog (KFontDialog).
+ 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"
-  See {@link KFontRequesterSignals} for signals emitted by KFontRequester
+  See {@link TDEFontRequesterSignals} for signals emitted by TDEFontRequester
 		@author Nadeem Hasan <nhasan@kde.org>
 
-		@short    This class provides a widget with a lineedit and a button, which invokes  a font dialog (KFontDialog).
+		@short    This class provides a widget with a lineedit and a button, which invokes  a font dialog (TDEFontDialog).
 
 */
-public class KFontRequester extends TQWidget  {
-	protected KFontRequester(Class dummy){super((Class) null);}
+public class TDEFontRequester extends TQWidget  {
+	protected TDEFontRequester(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -35,26 +35,26 @@ public class KFontRequester extends TQWidget  {
 		        sizes.
 		     		@short    Constructs a font requester widget.
 	*/
-	public KFontRequester(TQWidget parent, String name, boolean onlyFixed) {
+	public TDEFontRequester(TQWidget parent, String name, boolean onlyFixed) {
 		super((Class) null);
-		newKFontRequester(parent,name,onlyFixed);
+		newTDEFontRequester(parent,name,onlyFixed);
 	}
-	private native void newKFontRequester(TQWidget parent, String name, boolean onlyFixed);
-	public KFontRequester(TQWidget parent, String name) {
+	private native void newTDEFontRequester(TQWidget parent, String name, boolean onlyFixed);
+	public TDEFontRequester(TQWidget parent, String name) {
 		super((Class) null);
-		newKFontRequester(parent,name);
+		newTDEFontRequester(parent,name);
 	}
-	private native void newKFontRequester(TQWidget parent, String name);
-	public KFontRequester(TQWidget parent) {
+	private native void newTDEFontRequester(TQWidget parent, String name);
+	public TDEFontRequester(TQWidget parent) {
 		super((Class) null);
-		newKFontRequester(parent);
+		newTDEFontRequester(parent);
 	}
-	private native void newKFontRequester(TQWidget parent);
-	public KFontRequester() {
+	private native void newTDEFontRequester(TQWidget parent);
+	public TDEFontRequester() {
 		super((Class) null);
-		newKFontRequester();
+		newTDEFontRequester();
 	}
-	private native void newKFontRequester();
+	private native void newTDEFontRequester();
 	/**	
 				@return The currently selected font in the requester.
      
diff --git a/kdejava/koala/org/kde/koala/KFontRequesterSignals.java b/kdejava/koala/org/kde/koala/TDEFontRequesterSignals.java
index 21628c5b..678541c2 100644
--- a/kdejava/koala/org/kde/koala/KFontRequesterSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEFontRequesterSignals.java
@@ -8,7 +8,7 @@ import org.kde.qt.TQPushButton;
 import org.kde.qt.TQWidget;
 import org.kde.qt.TQLabel;
 
-public interface KFontRequesterSignals {
+public interface TDEFontRequesterSignals {
 	/**	
 		 Emitted when a new <code>font</code> has been selected in the underlying dialog
 		     		@short    Emitted when a new <code>font</code> has been selected in the underlying dialog
diff --git a/kdejava/koala/org/kde/koala/TDEFontSizeAction.java b/kdejava/koala/org/kde/koala/TDEFontSizeAction.java
new file mode 100644
index 00000000..403beef4
--- /dev/null
+++ b/kdejava/koala/org/kde/koala/TDEFontSizeAction.java
@@ -0,0 +1,133 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+package org.kde.koala;
+
+import org.kde.qt.Qt;
+import org.kde.qt.TQMetaObject;
+import org.kde.qt.QtSupport;
+import org.kde.qt.TQObject;
+import org.kde.qt.TQIconSet;
+
+/**
+ See {@link TDEFontSizeActionSignals} for signals emitted by TDEFontSizeAction
+*/
+public class TDEFontSizeAction extends TDESelectAction  {
+	protected TDEFontSizeAction(Class dummy){super((Class) null);}
+	public native TQMetaObject metaObject();
+	public native String className();
+	public TDEFontSizeAction(String text, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontSizeAction(text,cut,parent,name);
+	}
+	private native void newTDEFontSizeAction(String text, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontSizeAction(String text, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontSizeAction(text,cut,parent);
+	}
+	private native void newTDEFontSizeAction(String text, TDEShortcut cut, TQObject parent);
+	public TDEFontSizeAction(String text, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontSizeAction(text,cut);
+	}
+	private native void newTDEFontSizeAction(String text, TDEShortcut cut);
+	public TDEFontSizeAction(String text) {
+		super((Class) null);
+		newTDEFontSizeAction(text);
+	}
+	private native void newTDEFontSizeAction(String text);
+	public TDEFontSizeAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontSizeAction(text,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEFontSizeAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEFontSizeAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEFontSizeAction(text,cut,receiver,slot,parent);
+	}
+	private native void newTDEFontSizeAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	public TDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,parent,name);
+	}
+	private native void newTDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,parent);
+	}
+	private native void newTDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent);
+	public TDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut);
+	}
+	private native void newTDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut);
+	public TDEFontSizeAction(String text, TQIconSet pix) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix);
+	}
+	private native void newTDEFontSizeAction(String text, TQIconSet pix);
+	public TDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,parent,name);
+	}
+	private native void newTDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,parent);
+	}
+	private native void newTDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject parent);
+	public TDEFontSizeAction(String text, String pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut);
+	}
+	private native void newTDEFontSizeAction(String text, String pix, TDEShortcut cut);
+	public TDEFontSizeAction(String text, String pix) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix);
+	}
+	private native void newTDEFontSizeAction(String text, String pix);
+	public TDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDEFontSizeAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	public TDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEFontSizeAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDEFontSizeAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	public TDEFontSizeAction(TQObject parent, String name) {
+		super((Class) null);
+		newTDEFontSizeAction(parent,name);
+	}
+	private native void newTDEFontSizeAction(TQObject parent, String name);
+	public TDEFontSizeAction(TQObject parent) {
+		super((Class) null);
+		newTDEFontSizeAction(parent);
+	}
+	private native void newTDEFontSizeAction(TQObject parent);
+	public TDEFontSizeAction() {
+		super((Class) null);
+		newTDEFontSizeAction();
+	}
+	private native void newTDEFontSizeAction();
+	public native int fontSize();
+	public native void setFontSize(int size);
+	protected native void slotActivated(int arg1);
+	protected native void slotActivated(String arg1);
+	protected native void slotActivated();
+	/** Deletes the wrapped C++ instance */
+	protected native void finalize() throws InternalError;
+	/** Delete the wrapped C++ instance ahead of finalize() */
+	public native void dispose();
+	/** Has the wrapped C++ instance been deleted? */
+	public native boolean isDisposed();
+}
diff --git a/kdejava/koala/org/kde/koala/KFontSizeActionSignals.java b/kdejava/koala/org/kde/koala/TDEFontSizeActionSignals.java
index 79fed5ac..8f5b73da 100644
--- a/kdejava/koala/org/kde/koala/KFontSizeActionSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEFontSizeActionSignals.java
@@ -6,6 +6,6 @@ import org.kde.qt.QtSupport;
 import org.kde.qt.TQObject;
 import org.kde.qt.TQIconSet;
 
-public interface KFontSizeActionSignals {
+public interface TDEFontSizeActionSignals {
 	void fontSizeChanged(int arg1);
 }
diff --git a/kdejava/koala/org/kde/koala/TDEGlobalAccel.java b/kdejava/koala/org/kde/koala/TDEGlobalAccel.java
index cae065a5..5fcd5014 100644
--- a/kdejava/koala/org/kde/koala/TDEGlobalAccel.java
+++ b/kdejava/koala/org/kde/koala/TDEGlobalAccel.java
@@ -10,11 +10,11 @@ import org.kde.qt.TQObject;
 /**
 
  TDEGlobalAccel allows you to have global accelerators that are independent of
- the focused window. Unlike KAccel it does not matter which window is 
+ the focused window. Unlike TDEAccel it does not matter which window is 
  currently active.
 		@short Configurable global shortcut support.
-		@see KAccel
-		@see KAccelShortcutList
+		@see TDEAccel
+		@see TDEAccelShortcutList
 		@see KKeyChooser
 		@see KKeyDialog
 
@@ -68,9 +68,9 @@ public class TDEGlobalAccel extends TQObject  {
 			@param bEnabled The action will be activated by the shortcut if set to 'true'.
 			 		@short    Create an accelerator action.
 	*/
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef3, KShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef3, KShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
-	public native KAccelAction insert(String sAction, String sLabel, String sWhatsThis, KShortcut cutDef3, KShortcut cutDef4, TQObject pObjSlot, String psMethodSlot);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef3, TDEShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable, boolean bEnabled);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef3, TDEShortcut cutDef4, TQObject pObjSlot, String psMethodSlot, boolean bConfigurable);
+	public native TDEAccelAction insert(String sAction, String sLabel, String sWhatsThis, TDEShortcut cutDef3, TDEShortcut cutDef4, TQObject pObjSlot, String psMethodSlot);
 	/**	
 		 Removes the accelerator action identified by the name.
 		 Remember to also call updateConnections().
@@ -83,11 +83,11 @@ public class TDEGlobalAccel extends TQObject  {
 		 displayed when the user configures shortcuts.
 			@param sName of the of the action to insert
 			@param sLabel a user-readable (i18n!) name for the action
-				@return the KAccelAction of the action
+				@return the TDEAccelAction of the action
 	 
 		@short    Use this to insert a label into the action list.
 	*/
-	public native KAccelAction insert(String sName, String sLabel);
+	public native TDEAccelAction insert(String sName, String sLabel);
 	/**	
 		 Updates the connections of the accelerations after changing them. 
 				@return true if successful, false otherwise
@@ -102,7 +102,7 @@ public class TDEGlobalAccel extends TQObject  {
 	 
 		@short    Return the shortcut associated with the action named by <code>sAction.</code>
 	*/
-	public native KShortcut shortcut(String sAction);
+	public native TDEShortcut shortcut(String sAction);
 	/**	
 		 Set the shortcut to be associated with the action named by <code>sAction.</code>
 			@param sAction the name of the action
@@ -111,7 +111,7 @@ public class TDEGlobalAccel extends TQObject  {
 	 
 		@short    Set the shortcut to be associated with the action named by <code>sAction.</code>
 	*/
-	public native boolean setShortcut(String sAction, KShortcut shortcut);
+	public native boolean setShortcut(String sAction, TDEShortcut shortcut);
 	/**	
 		 Set the slot to be called when the shortcut of the action named
 		 by <code>sAction</code> is pressed.
@@ -193,7 +193,7 @@ public class TDEGlobalAccel extends TQObject  {
 	*/
 	public native void disableBlocking(boolean disable);
 	/**	
-			 KAccelActions.useFourModifierKeys().
+			 TDEAccelActions.useFourModifierKeys().
 			 		@short
 	*/
 	public static native boolean useFourModifierKeys();
diff --git a/kdejava/koala/org/kde/koala/TDEGlobalSettings.java b/kdejava/koala/org/kde/koala/TDEGlobalSettings.java
index d7d48321..af96ba44 100644
--- a/kdejava/koala/org/kde/koala/TDEGlobalSettings.java
+++ b/kdejava/koala/org/kde/koala/TDEGlobalSettings.java
@@ -25,7 +25,7 @@ public class TDEGlobalSettings implements QtSupport {
 	/**	
 		 This enum describes the return type for insertTearOffHandle() whether to insert
 		 a handle or not. Applications who independently want to use handles in their popup menus
-		 should test for Application level before calling the appropriate function in KPopupMenu.
+		 should test for Application level before calling the appropriate function in TDEPopupMenu.
 				@short    This enum describes the return type for insertTearOffHandle() whether to insert  a handle or not.
 	*/
 	public static final int Disable = 0;
@@ -100,10 +100,10 @@ public class TDEGlobalSettings implements QtSupport {
 	*/
 	public static native boolean singleClick();
 	/**	
-		 Returns whether tear-off handles are inserted in KPopupMenus.
-				@return whether tear-off handles are inserted in KPopupMenus.
+		 Returns whether tear-off handles are inserted in TDEPopupMenus.
+				@return whether tear-off handles are inserted in TDEPopupMenus.
 
-		@short    Returns whether tear-off handles are inserted in KPopupMenus.
+		@short    Returns whether tear-off handles are inserted in TDEPopupMenus.
 	*/
 	public static native int insertTearOffHandle();
 	/**	
@@ -299,13 +299,13 @@ public class TDEGlobalSettings implements QtSupport {
 	*/
 	public static native TQColor highlightColor();
 	/**	
-		 Returns the alternate background color used by KListView with
-		 KListViewItem. Any other list that uses alternating background
+		 Returns the alternate background color used by TDEListView with
+		 TDEListViewItem. Any other list that uses alternating background
 		 colors should use this too, to obey to the user's preferences. Returns
 		 an invalid color if the user doesn't want alternating backgrounds.
 				@return the alternate background color
 
-		@short    Returns the alternate background color used by KListView with  KListViewItem.
+		@short    Returns the alternate background color used by TDEListView with  TDEListViewItem.
 		@see #calculateAlternateBackgroundColor
 	*/
 	public static native TQColor alternateBackgroundColor();
@@ -320,11 +320,11 @@ public class TDEGlobalSettings implements QtSupport {
 	*/
 	public static native TQColor calculateAlternateBackgroundColor(TQColor base);
 	/**	
-		 Returns if the sorted column in a KListView shall be drawn with a
+		 Returns if the sorted column in a TDEListView shall be drawn with a
 		 shaded background color.
 				@return true if the sorted column shall be shaded
 
-		@short    Returns if the sorted column in a KListView shall be drawn with a  shaded background color.
+		@short    Returns if the sorted column in a TDEListView shall be drawn with a  shaded background color.
 	*/
 	public static native boolean shadeSortColumn();
 	/**	
diff --git a/kdejava/koala/org/kde/koala/TDEIO.java b/kdejava/koala/org/kde/koala/TDEIO.java
index dbe92bf0..58956636 100644
--- a/kdejava/koala/org/kde/koala/TDEIO.java
+++ b/kdejava/koala/org/kde/koala/TDEIO.java
@@ -1170,7 +1170,7 @@ public class KIO {
 	/**	
 		 Returns the text to use for the Paste action, when the application supports
 		 pasting files, urls, and clipboard data, using pasteClipboard().
-				@return a string suitable for KAction.setText, or an empty string if pasting
+				@return a string suitable for TDEAction.setText, or an empty string if pasting
  isn't possible right now.
 
 		@short    Returns the text to use for the Paste action, when the application supports  pasting files, urls, and clipboard data, using pasteClipboard().
diff --git a/kdejava/koala/org/kde/koala/TDEListAction.java b/kdejava/koala/org/kde/koala/TDEListAction.java
new file mode 100644
index 00000000..70605777
--- /dev/null
+++ b/kdejava/koala/org/kde/koala/TDEListAction.java
@@ -0,0 +1,198 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+package org.kde.koala;
+
+import org.kde.qt.Qt;
+import org.kde.qt.TQMetaObject;
+import org.kde.qt.QtSupport;
+import org.kde.qt.TQObject;
+import org.kde.qt.TQIconSet;
+
+/**
+
+ 		@short
+
+*/
+public class TDEListAction extends TDESelectAction  {
+	protected TDEListAction(Class dummy){super((Class) null);}
+	public native TQMetaObject metaObject();
+	public native String className();
+	/**	
+		 Constructs a list action with text and potential keyboard
+		 accelerator but nothing else. Use this only if you really
+		 know what you are doing.
+			@param text The text that will be displayed.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short    Constructs a list action with text and potential keyboard  accelerator but nothing else.
+	*/
+	public TDEListAction(String text, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEListAction(text,cut,parent,name);
+	}
+	private native void newTDEListAction(String text, TDEShortcut cut, TQObject parent, String name);
+	public TDEListAction(String text, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEListAction(text,cut,parent);
+	}
+	private native void newTDEListAction(String text, TDEShortcut cut, TQObject parent);
+	public TDEListAction(String text, TDEShortcut cut) {
+		super((Class) null);
+		newTDEListAction(text,cut);
+	}
+	private native void newTDEListAction(String text, TDEShortcut cut);
+	public TDEListAction(String text) {
+		super((Class) null);
+		newTDEListAction(text);
+	}
+	private native void newTDEListAction(String text);
+	/**	
+			@param text The text that will be displayed.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param receiver The SLOT's parent.
+			@param slot The SLOT to invoke to execute this action.
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDEListAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEListAction(text,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEListAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEListAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEListAction(text,cut,receiver,slot,parent);
+	}
+	private native void newTDEListAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The icons that go with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,parent,name);
+	}
+	private native void newTDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,parent);
+	}
+	private native void newTDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent);
+	public TDEListAction(String text, TQIconSet pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut);
+	}
+	private native void newTDEListAction(String text, TQIconSet pix, TDEShortcut cut);
+	public TDEListAction(String text, TQIconSet pix) {
+		super((Class) null);
+		newTDEListAction(text,pix);
+	}
+	private native void newTDEListAction(String text, TQIconSet pix);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The dynamically loaded icon that goes with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDEListAction(String text, String pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,parent,name);
+	}
+	private native void newTDEListAction(String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEListAction(String text, String pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,parent);
+	}
+	private native void newTDEListAction(String text, String pix, TDEShortcut cut, TQObject parent);
+	public TDEListAction(String text, String pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut);
+	}
+	private native void newTDEListAction(String text, String pix, TDEShortcut cut);
+	public TDEListAction(String text, String pix) {
+		super((Class) null);
+		newTDEListAction(text,pix);
+	}
+	private native void newTDEListAction(String text, String pix);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The icons that go with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param receiver The SLOT's parent.
+			@param slot The SLOT to invoke to execute this action.
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDEListAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The dynamically loaded icon that goes with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param receiver The SLOT's parent.
+			@param slot The SLOT to invoke to execute this action.
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDEListAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDEListAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEListAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDEListAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDEListAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	/**	
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDEListAction(TQObject parent, String name) {
+		super((Class) null);
+		newTDEListAction(parent,name);
+	}
+	private native void newTDEListAction(TQObject parent, String name);
+	public TDEListAction(TQObject parent) {
+		super((Class) null);
+		newTDEListAction(parent);
+	}
+	private native void newTDEListAction(TQObject parent);
+	public TDEListAction() {
+		super((Class) null);
+		newTDEListAction();
+	}
+	private native void newTDEListAction();
+	public native String currentText();
+	public native int currentItem();
+	/**	
+		  Sets the currently checked item.
+			@param index Index of the item (remember the first item is zero).
+		     		@short     Sets the currently checked item.
+	*/
+	public native void setCurrentItem(int index);
+	/** Deletes the wrapped C++ instance */
+	protected native void finalize() throws InternalError;
+	/** Delete the wrapped C++ instance ahead of finalize() */
+	public native void dispose();
+	/** Has the wrapped C++ instance been deleted? */
+	public native boolean isDisposed();
+}
diff --git a/kdejava/koala/org/kde/koala/KListBox.java b/kdejava/koala/org/kde/koala/TDEListBox.java
index 2a666a09..f60c89f6 100644
--- a/kdejava/koala/org/kde/koala/KListBox.java
+++ b/kdejava/koala/org/kde/koala/TDEListBox.java
@@ -25,34 +25,34 @@ import org.kde.qt.TQListBox;
  mentioned. This way you don't need to care about the current
  settings.  If you want to get informed when the user selects
  something connect to the TQListBox.selectionChanged() signal.
- See {@link KListBoxSignals} for signals emitted by KListBox
+ See {@link TDEListBoxSignals} for signals emitted by TDEListBox
 		@short A variant of TQListBox that honors KDE's system-wide settings.
 
 */
-public class KListBox extends TQListBox  {
-	protected KListBox(Class dummy){super((Class) null);}
+public class TDEListBox extends TQListBox  {
+	protected TDEListBox(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
-	public KListBox(TQWidget parent, String name, int f) {
+	public TDEListBox(TQWidget parent, String name, int f) {
 		super((Class) null);
-		newKListBox(parent,name,f);
+		newTDEListBox(parent,name,f);
 	}
-	private native void newKListBox(TQWidget parent, String name, int f);
-	public KListBox(TQWidget parent, String name) {
+	private native void newTDEListBox(TQWidget parent, String name, int f);
+	public TDEListBox(TQWidget parent, String name) {
 		super((Class) null);
-		newKListBox(parent,name);
+		newTDEListBox(parent,name);
 	}
-	private native void newKListBox(TQWidget parent, String name);
-	public KListBox(TQWidget parent) {
+	private native void newTDEListBox(TQWidget parent, String name);
+	public TDEListBox(TQWidget parent) {
 		super((Class) null);
-		newKListBox(parent);
+		newTDEListBox(parent);
 	}
-	private native void newKListBox(TQWidget parent);
-	public KListBox() {
+	private native void newTDEListBox(TQWidget parent);
+	public TDEListBox() {
 		super((Class) null);
-		newKListBox();
+		newTDEListBox();
 	}
-	private native void newKListBox();
+	private native void newTDEListBox();
 	protected native void emitExecute(TQListBoxItem item, TQPoint pos);
 	protected native void keyPressEvent(TQKeyEvent e);
 	protected native void focusOutEvent(TQFocusEvent fe);
diff --git a/kdejava/koala/org/kde/koala/KListBoxSignals.java b/kdejava/koala/org/kde/koala/TDEListBoxSignals.java
index 86799fe6..167f7567 100644
--- a/kdejava/koala/org/kde/koala/KListBoxSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEListBoxSignals.java
@@ -11,7 +11,7 @@ import org.kde.qt.TQKeyEvent;
 import org.kde.qt.TQEvent;
 import org.kde.qt.TQWidget;
 
-public interface KListBoxSignals {
+public interface TDEListBoxSignals {
 	/**	
 		 Emitted whenever the user executes an listbox item.
 			 That means depending on the KDE wide Single Click/Double Click
diff --git a/kdejava/koala/org/kde/koala/KListView.java b/kdejava/koala/org/kde/koala/TDEListView.java
index b4d5c645..129a3314 100644
--- a/kdejava/koala/org/kde/koala/KListView.java
+++ b/kdejava/koala/org/kde/koala/TDEListView.java
@@ -40,15 +40,15 @@ import org.kde.qt.TQListView;
  and connect it to a suitable slot.
  To see where you are dropping, setDropVisualizer(true).
  And also you'll need acceptDrag(TQDropEvent)
- KListView is drag-enabled, too: to benefit from that you have to derive from it.
+ TDEListView is drag-enabled, too: to benefit from that you have to derive from it.
  Reimplement dragObject() and (possibly) startDrag(),
  and setDragEnabled(true).
-  See {@link KListViewSignals} for signals emitted by KListView
+  See {@link TDEListViewSignals} for signals emitted by TDEListView
 		@short    This Widget extends the functionality of TQListView to honor the system  wide settings for Single Click/Double Click mode, AutoSelection and  ChangeCursorOverLink (TM).
 
 */
-public class KListView extends TQListView  {
-	protected KListView(Class dummy){super((Class) null);}
+public class TDEListView extends TQListView  {
+	protected TDEListView(Class dummy){super((Class) null);}
 	/**	
 		 Possible selection modes.
 			 The first four correspond directly to TQListView.SelectionMode, while
@@ -127,21 +127,21 @@ public class KListView extends TQListView  {
 		 TQListView, as usual.
 		   		@short    Constructor.
 	*/
-	public KListView(TQWidget parent, String name) {
+	public TDEListView(TQWidget parent, String name) {
 		super((Class) null);
-		newKListView(parent,name);
+		newTDEListView(parent,name);
 	}
-	private native void newKListView(TQWidget parent, String name);
-	public KListView(TQWidget parent) {
+	private native void newTDEListView(TQWidget parent, String name);
+	public TDEListView(TQWidget parent) {
 		super((Class) null);
-		newKListView(parent);
+		newTDEListView(parent);
 	}
-	private native void newKListView(TQWidget parent);
-	public KListView() {
+	private native void newTDEListView(TQWidget parent);
+	public TDEListView() {
 		super((Class) null);
-		newKListView();
+		newTDEListView();
 	}
-	private native void newKListView();
+	private native void newTDEListView();
 	/**	
 		 Reimplemented for internal reasons.
 		 Further reimplementations should call this function or else
@@ -325,7 +325,7 @@ public class KListView extends TQListView  {
 	public native void removeColumn(int index);
 	/**	
 		 sets the alternate background background color.
-		 This only has an effect if the items are KListViewItems
+		 This only has an effect if the items are TDEListViewItems
 			@param c the color to use for every other item. Set to an invalid
 		        color to disable alternate colors.
 				@short    sets the alternate background background color.
@@ -404,7 +404,7 @@ public class KListView extends TQListView  {
 		 only the first column is renameable.
 		 Use this function to enable the feature on other columns.
 			 If you want more intelligent (dynamic) selection,
-		 you'll have to derive from KListView,
+		 you'll have to derive from TDEListView,
 		 and override rename() and call only call it
 		 if you want the item to be renamed.
 		   		@short    By default, if you called setItemsRenameable(true),  only the first column is renameable.
@@ -747,7 +747,7 @@ public class KListView extends TQListView  {
 		 Emit the contextMenu signal. This slot is for key presses.
 		   		@short    Emit the contextMenu signal.
 	*/
-	protected native void emitContextMenu(KListView arg1, TQListViewItem arg2);
+	protected native void emitContextMenu(TDEListView arg1, TQListViewItem arg2);
 	/**	
 		 Accessory slot for AutoSelect
 			   		@short    Accessory slot for AutoSelect
diff --git a/kdejava/koala/org/kde/koala/TDEListViewItem.java b/kdejava/koala/org/kde/koala/TDEListViewItem.java
new file mode 100644
index 00000000..1df19007
--- /dev/null
+++ b/kdejava/koala/org/kde/koala/TDEListViewItem.java
@@ -0,0 +1,232 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+package org.kde.koala;
+
+import org.kde.qt.Qt;
+import org.kde.qt.TQColor;
+import org.kde.qt.TQListViewItem;
+import org.kde.qt.QtSupport;
+import org.kde.qt.TQListView;
+import org.kde.qt.TQPainter;
+import org.kde.qt.TQColorGroup;
+import org.kde.qt.TQListViewItem;
+
+/**
+
+ A listview item with support for alternate background colors. It is
+ a drop-in replacement for TQListViewItem
+		@short listview item with alternate background color support.
+
+*/
+public class TDEListViewItem extends TQListViewItem  {
+	protected TDEListViewItem(Class dummy){super((Class) null);}
+	/**	
+		 constructors. The semantics remain as in TQListViewItem.
+		 Although they accept a TQListViewItem as parent, please
+		 don't mix TDEListViewItem (or subclasses) with TQListViewItem
+		 (or subclasses).
+		   		@short    constructors.
+	*/
+	public TDEListViewItem(TQListView parent) {
+		super((Class) null);
+		newTDEListViewItem(parent);
+	}
+	private native void newTDEListViewItem(TQListView parent);
+	public TDEListViewItem(TQListViewItem parent) {
+		super((Class) null);
+		newTDEListViewItem(parent);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent);
+	public TDEListViewItem(TQListView parent, TQListViewItem after) {
+		super((Class) null);
+		newTDEListViewItem(parent,after);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after) {
+		super((Class) null);
+		newTDEListViewItem(parent,after);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after);
+	public TDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
+	public TDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
+	public TDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7);
+	public TDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5, String arg6);
+	public TDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2, String arg3, String arg4, String arg5);
+	public TDEListViewItem(TQListView parent, String arg2, String arg3, String arg4) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2, String arg3, String arg4);
+	public TDEListViewItem(TQListView parent, String arg2, String arg3) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2, String arg3);
+	public TDEListViewItem(TQListView parent, String arg2) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2);
+	}
+	private native void newTDEListViewItem(TQListView parent, String arg2);
+	public TDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
+	public TDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
+	public TDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6,arg7);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7);
+	public TDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5,arg6);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5, String arg6);
+	public TDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4,arg5);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4, String arg5);
+	public TDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3,arg4);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2, String arg3, String arg4);
+	public TDEListViewItem(TQListViewItem parent, String arg2, String arg3) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2,arg3);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2, String arg3);
+	public TDEListViewItem(TQListViewItem parent, String arg2) {
+		super((Class) null);
+		newTDEListViewItem(parent,arg2);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, String arg2);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4, String arg5);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3, String arg4);
+	public TDEListViewItem(TQListView parent, TQListViewItem after, String arg3) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3);
+	}
+	private native void newTDEListViewItem(TQListView parent, TQListViewItem after, String arg3);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9, String arg10);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8, String arg9);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7,arg8);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7, String arg8);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6,arg7);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6, String arg7);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5,arg6);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5, String arg6);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4,arg5);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4, String arg5);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3,arg4);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3, String arg4);
+	public TDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3) {
+		super((Class) null);
+		newTDEListViewItem(parent,after,arg3);
+	}
+	private native void newTDEListViewItem(TQListViewItem parent, TQListViewItem after, String arg3);
+	public native void insertItem(TQListViewItem item);
+	public native void takeItem(TQListViewItem item);
+	/**	
+		 returns true if this item is to be drawn with the alternate background
+		   		@short    returns true if this item is to be drawn with the alternate background
+	*/
+	public native boolean isAlternate();
+	/**	
+		 returns the background color for this item at given column
+		 This can be different in the column which is sorted due to shading
+		 ### could be merged with above (column = -1) to be source compatible
+		 ### but will only work if sort-shading is not used or the listView has
+		 ### only 1 column
+				@short    returns the background color for this item at given column  This can be different in the column which is sorted due to shading  ### could be merged with above (column = -1) to be source compatible  ### but will only work if sort-shading is not used or the listView has  ### only 1 column
+	*/
+	public native TQColor backgroundColor(int column);
+	public native void paintCell(TQPainter p, TQColorGroup cg, int column, int width, int alignment);
+	/** Deletes the wrapped C++ instance */
+	protected native void finalize() throws InternalError;
+	/** Delete the wrapped C++ instance ahead of finalize() */
+	public native void dispose();
+	/** Has the wrapped C++ instance been deleted? */
+	public native boolean isDisposed();
+}
diff --git a/kdejava/koala/org/kde/koala/KListViewSignals.java b/kdejava/koala/org/kde/koala/TDEListViewSignals.java
index 76254966..3952296a 100644
--- a/kdejava/koala/org/kde/koala/KListViewSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEListViewSignals.java
@@ -22,7 +22,7 @@ import org.kde.qt.TQWidget;
 import org.kde.qt.TQResizeEvent;
 import org.kde.qt.TQDragObject;
 
-public interface KListViewSignals {
+public interface TDEListViewSignals {
 	/**	
 		 This signal is emitted whenever the user executes an listview item.
 		 That means depending on the KDE wide Single Click/Double Click
@@ -66,7 +66,7 @@ public interface KListViewSignals {
 		 the drop was above all items
 		   		@short    This signal gets emitted whenever something acceptable is  dropped onto the listview.
 	*/
-	void dropped(KListView list, TQDropEvent e, TQListViewItem after);
+	void dropped(TDEListView list, TQDropEvent e, TQListViewItem after);
 	/**	
 		 This signal gets emitted whenever something acceptable is
 		 dropped onto the listview.
@@ -79,7 +79,7 @@ public interface KListViewSignals {
 		 the drop was above all items
 		   		@short    This signal gets emitted whenever something acceptable is  dropped onto the listview.
 	*/
-	void dropped(KListView list, TQDropEvent e, TQListViewItem parent, TQListViewItem after);
+	void dropped(TDEListView list, TQDropEvent e, TQListViewItem parent, TQListViewItem after);
 	/**	
 		 This signal gets emitted whenever something acceptable is
 		 dropped onto the listview.
@@ -104,7 +104,7 @@ public interface KListViewSignals {
 		 Connect to this signal if you want to do some preprocessing before
 		 a move is made, for example, to disable sorting
 			 This is sent only once per each groups of moves.  That is, for each
-		 drop that is a move this will be emitted once, before KListView calls
+		 drop that is a move this will be emitted once, before TDEListView calls
 				@short    Connect to this signal if you want to do some preprocessing before  a move is made, for example, to disable sorting 
 		@see #moveItem
 	*/
@@ -139,13 +139,13 @@ public interface KListViewSignals {
 	/**	
 		 This signal is emitted when the shortcut key for popup-menus is pressed.
 			 Normally you should not use this, just connect a slot to signal
-		 contextMenu (KListView, TQListViewItem, TQPoint) to correctly
+		 contextMenu (TDEListView, TQListViewItem, TQPoint) to correctly
 		 handle showing context menus regardless of settings.
 			@param list is this listview.
 			@param item is the currentItem() at the time the key was pressed. May be null.
 		   		@short    This signal is emitted when the shortcut key for popup-menus is pressed.
 	*/
-	void menuShortCutPressed(KListView list, TQListViewItem item);
+	void menuShortCutPressed(TDEListView list, TQListViewItem item);
 	/**	
 		 This signal is emitted whenever a context-menu should be shown for item <code>i.</code>
 		 It automatically adjusts for all settings involved (Menu key, showMenuOnPress/Click).
@@ -154,7 +154,7 @@ public interface KListViewSignals {
 			@param p is the point at which the menu should be shown.
 		   		@short    This signal is emitted whenever a context-menu should be shown for item <code>i.</code>
 	*/
-	void contextMenu(KListView l, TQListViewItem i, TQPoint p);
+	void contextMenu(TDEListView l, TQListViewItem i, TQPoint p);
 	void itemAdded(TQListViewItem item);
 	void itemRemoved(TQListViewItem item);
 }
diff --git a/kdejava/koala/org/kde/koala/KMainWindow.java b/kdejava/koala/org/kde/koala/TDEMainWindow.java
index 7f2108a1..f7e132e1 100644
--- a/kdejava/koala/org/kde/koala/KMainWindow.java
+++ b/kdejava/koala/org/kde/koala/TDEMainWindow.java
@@ -22,21 +22,21 @@ import org.kde.qt.TQMainWindow;
  It should be used as a top level (parent-less) widget.
  It manages the geometry for all its children, including your
  main widget.
- Normally, you will inherit from KMainWindow,
+ Normally, you will inherit from TDEMainWindow,
  then construct (or use some existing) widget as
  your main view. You can set only one main view.
  You can add as many toolbars as you like. There can be only one menubar
  and only one statusbar.
  The toolbars, menubar, and statusbar can be created by the
- KMainWindow and - unlike the old KMainWindow - may, but do not
- have to, be deleted by you. KMainWindow will handle that internally.
+ TDEMainWindow and - unlike the old TDEMainWindow - may, but do not
+ have to, be deleted by you. TDEMainWindow will handle that internally.
  Height and width can be operated independently from each other. Simply
  define the minimum/maximum height/width of your main widget and
- KMainWindow will take this into account. For fixed size windows set
+ TDEMainWindow will take this into account. For fixed size windows set
  your main widget to a fixed size.
  Fixed aspect ratios (heightForWidth()) and fixed width widgets are
  not supported.
- KMainWindow will set icon, mini icon and caption, which it gets
+ TDEMainWindow will set icon, mini icon and caption, which it gets
  from TDEApplication. It provides full session management, and
  will save its position, geometry and positions of toolbars and
  menubar on logout. If you want to save additional data, reimplement
@@ -47,7 +47,7 @@ import org.kde.qt.TQMainWindow;
  queryClose() and/or queryExit().
  There are also kRestoreMainWindows convenience functions which
  can restore all your windows on next login.
-  Note that a KMainWindow per-default is created with the
+  Note that a TDEMainWindow per-default is created with the
   WDestructiveClose flag, i.e. it is automatically destroyed when the
   window is closed. If you do not want this behavior, specify 0 as
   widget flag in the constructor.
@@ -57,15 +57,15 @@ import org.kde.qt.TQMainWindow;
 		@see TDEApplication
 
 */
-public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface, KXMLGUIClientInterface {
-	protected KMainWindow(Class dummy){super((Class) null);}
+public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface, KXMLGUIClientInterface {
+	protected TDEMainWindow(Class dummy){super((Class) null);}
 	/**	
 		 Flags that can be passed in an argument to the constructor to
 		 change the behavior.
-			 NoDCOPObject tells KMainWindow not to create a KMainWindowInterface.
+			 NoDCOPObject tells TDEMainWindow not to create a TDEMainWindowInterface.
 		 This can be useful in particular for inherited classes, which
 		 might want to create more specific dcop interfaces. It's a good
-		 idea to use KMainWindowInterface as the base class for such interfaces
+		 idea to use TDEMainWindowInterface as the base class for such interfaces
 		 though (to provide the standard mainwindow functionality via DCOP).
 		     		@short    Flags that can be passed in an argument to the constructor to  change the behavior.
 	*/
@@ -86,14 +86,14 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 	/**	
 		 Construct a main window.
 			@param parent The widget parent. This is usually 0 but it may also be the window
-		 group leader. In that case, the KMainWindow becomes sort of a
+		 group leader. In that case, the TDEMainWindow becomes sort of a
 		 secondary window.
 			@param name The object name. For session management and window management to work
 		 properly, all main windows in the application should have a
-		 different name. When passing 0 (the default), KMainWindow will create
+		 different name. When passing 0 (the default), TDEMainWindow will create
 		 a unique name, but it's recommended to explicitly pass a window name that will
 		 also describe the type of the window. If there can be several windows of the same
-		 type, append '#' (hash) to the name, and KMainWindow will append numbers to make
+		 type, append '#' (hash) to the name, and TDEMainWindow will append numbers to make
 		 the names unique. For example, for a mail client which has one main window showing
 		 the mails and folders, and which can also have one or more windows for composing
 		 mails, the name for the folders window should be e.g. "mainwindow" and
@@ -104,57 +104,57 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 parent or not. DestructiveClose indicates that a main window is
 		 automatically destroyed when its window is closed. Pass 0 if
 		 you do not want this behavior.
-			 KMainWindows must be created on the heap with 'new', like:
+			 TDEMainWindows must be created on the heap with 'new', like:
 		 <pre>
-		 KMainWindow kmw = new KMainWindow (...);
+		 TDEMainWindow kmw = new TDEMainWindow (...);
 		 </pre>
 				@short    Construct a main window.
 		@see #http://doc#trolltech#com/3#2/qt#html#WidgetFlags-enum
 	*/
-	public KMainWindow(TQWidget parent, String name, int f) {
+	public TDEMainWindow(TQWidget parent, String name, int f) {
 		super((Class) null);
-		newKMainWindow(parent,name,f);
+		newTDEMainWindow(parent,name,f);
 	}
-	private native void newKMainWindow(TQWidget parent, String name, int f);
-	public KMainWindow(TQWidget parent, String name) {
+	private native void newTDEMainWindow(TQWidget parent, String name, int f);
+	public TDEMainWindow(TQWidget parent, String name) {
 		super((Class) null);
-		newKMainWindow(parent,name);
+		newTDEMainWindow(parent,name);
 	}
-	private native void newKMainWindow(TQWidget parent, String name);
-	public KMainWindow(TQWidget parent) {
+	private native void newTDEMainWindow(TQWidget parent, String name);
+	public TDEMainWindow(TQWidget parent) {
 		super((Class) null);
-		newKMainWindow(parent);
+		newTDEMainWindow(parent);
 	}
-	private native void newKMainWindow(TQWidget parent);
-	public KMainWindow() {
+	private native void newTDEMainWindow(TQWidget parent);
+	public TDEMainWindow() {
 		super((Class) null);
-		newKMainWindow();
+		newTDEMainWindow();
 	}
-	private native void newKMainWindow();
+	private native void newTDEMainWindow();
 	/**	
-		 Overloaded constructor which allows passing some KMainWindow.CreationFlags.
-				@short    Overloaded constructor which allows passing some KMainWindow.CreationFlags.
+		 Overloaded constructor which allows passing some TDEMainWindow.CreationFlags.
+				@short    Overloaded constructor which allows passing some TDEMainWindow.CreationFlags.
 	*/
-	public KMainWindow(int cflags, TQWidget parent, String name, int f) {
+	public TDEMainWindow(int cflags, TQWidget parent, String name, int f) {
 		super((Class) null);
-		newKMainWindow(cflags,parent,name,f);
+		newTDEMainWindow(cflags,parent,name,f);
 	}
-	private native void newKMainWindow(int cflags, TQWidget parent, String name, int f);
-	public KMainWindow(int cflags, TQWidget parent, String name) {
+	private native void newTDEMainWindow(int cflags, TQWidget parent, String name, int f);
+	public TDEMainWindow(int cflags, TQWidget parent, String name) {
 		super((Class) null);
-		newKMainWindow(cflags,parent,name);
+		newTDEMainWindow(cflags,parent,name);
 	}
-	private native void newKMainWindow(int cflags, TQWidget parent, String name);
-	public KMainWindow(int cflags, TQWidget parent) {
+	private native void newTDEMainWindow(int cflags, TQWidget parent, String name);
+	public TDEMainWindow(int cflags, TQWidget parent) {
 		super((Class) null);
-		newKMainWindow(cflags,parent);
+		newTDEMainWindow(cflags,parent);
 	}
-	private native void newKMainWindow(int cflags, TQWidget parent);
-	public KMainWindow(int cflags) {
+	private native void newTDEMainWindow(int cflags, TQWidget parent);
+	public TDEMainWindow(int cflags) {
 		super((Class) null);
-		newKMainWindow(cflags);
+		newTDEMainWindow(cflags);
 	}
-	private native void newKMainWindow(int cflags);
+	private native void newTDEMainWindow(int cflags);
 	/**	
 		 Retrieve the standard help menu.
 			 It contains entires for the
@@ -163,7 +163,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 and an "About KDE" dialog box.
 			 Example (adding a standard help menu to your application):
 		 <pre>
-		 KPopupMenu help = helpMenu( <myTextString> );
+		 TDEPopupMenu help = helpMenu( <myTextString> );
 		 menuBar().insertItem( i18n("&Help"), help );
 		 </pre>
 			@param aboutAppText The string that is used in the application
@@ -176,9 +176,9 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
      
 		@short    Retrieve the standard help menu.
 	*/
-	public native KPopupMenu helpMenu(String aboutAppText, boolean showWhatsThis);
-	public native KPopupMenu helpMenu(String aboutAppText);
-	public native KPopupMenu helpMenu();
+	public native TDEPopupMenu helpMenu(String aboutAppText, boolean showWhatsThis);
+	public native TDEPopupMenu helpMenu(String aboutAppText);
+	public native TDEPopupMenu helpMenu();
 	/**	
 		 Returns the help menu. Creates a standard help menu if none exists yet.
 			 It contains entries for the
@@ -199,8 +199,8 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
      
 		@short    Returns the help menu.
 	*/
-	public native KPopupMenu customHelpMenu(boolean showWhatsThis);
-	public native KPopupMenu customHelpMenu();
+	public native TDEPopupMenu customHelpMenu(boolean showWhatsThis);
+	public native TDEPopupMenu customHelpMenu();
 	/**	
 		 Reimplementation of TQMainWindow.show()
 		     		@short    Reimplementation of TQMainWindow.show()
@@ -271,9 +271,9 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 			 If there is no status bar yet, one will be created.
 			 Note that tooltips for kactions in actionCollection() are not
 		 automatically connected to this statusBar.
-		 See the KActionCollection documentation for more details.
+		 See the TDEActionCollection documentation for more details.
 				@short    Returns a pointer to the status bar.
-		@see KActionCollection
+		@see TDEActionCollection
 	*/
 	public native KStatusBar kstatusBar();
 	/**	
@@ -286,21 +286,21 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 
 		@short    Returns a pointer to the toolbar with the specified name.
 	*/
-	public native KToolBar toolBar(String name);
-	public native KToolBar toolBar();
+	public native TDEToolBar toolBar(String name);
+	public native TDEToolBar toolBar();
 	/**	
 				@return An iterator over the list of all toolbars for this window.
      
 		@short
 	*/
-	// TQPtrListIterator<KToolBar> toolBarIterator(); >>>> NOT CONVERTED
+	// TQPtrListIterator<TDEToolBar> toolBarIterator(); >>>> NOT CONVERTED
 	/**	
-				@return A KAccel instance bound to this mainwindow. Used automatically
- by KAction to make keybindings work in all cases.
+				@return A TDEAccel instance bound to this mainwindow. Used automatically
+ by TDEAction to make keybindings work in all cases.
      
 		@short
 	*/
-	public native KAccel accel();
+	public native TDEAccel accel();
 	public native void setFrameBorderWidth(int arg1);
 	/**	
 		 Call this to enable "auto-save" of toolbar/menubar/statusbar settings
@@ -312,10 +312,10 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 			@param saveWindowSize set it to true to include the window size
 		 when saving.
 			 Typically, you will call setAutoSaveSettings() in your
-		 KMainWindow-inherited class constructor, and it will take care
+		 TDEMainWindow-inherited class constructor, and it will take care
 		 of restoring and saving automatically. Make sure you call this
 		 _after all_ your bars have been created.
-			 To make sure that KMainWindow propertly obtains the default
+			 To make sure that TDEMainWindow propertly obtains the default
 		 size of the window you should do the following:
 		 - Remove hard coded resize() calls in the constructor or main, they
 		   should be removed in favor of letting the automatic resizing
@@ -378,8 +378,8 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 	public native void saveMainWindowSettings(TDEConfig config, String groupName);
 	public native void saveMainWindowSettings(TDEConfig config);
 	/**	
-		 Sets whether KMainWindow should provide a menu that allows showing/hiding
-		 the available toolbars ( using KToggleToolBarAction ) . In case there
+		 Sets whether TDEMainWindow should provide a menu that allows showing/hiding
+		 the available toolbars ( using TDEToggleToolBarAction ) . In case there
 		 is only one toolbar configured a simple 'Show \<toolbar name here\>' menu item
 		 is shown.
 			 The menu / menu item is implemented using xmlgui. It will be inserted in your
@@ -390,26 +390,26 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 line to the settings menu section of your resource file ( usually appname.rc ).
 			 Note that you should enable this feature before calling createGUI() ( or similar ) .
 		 You enable/disable it anytime if you pass false to the conserveMemory argument of createGUI.
-				@short    Sets whether KMainWindow should provide a menu that allows showing/hiding  the available toolbars ( using KToggleToolBarAction ) .
+				@short    Sets whether TDEMainWindow should provide a menu that allows showing/hiding  the available toolbars ( using TDEToggleToolBarAction ) .
 	*/
 	public native void setStandardToolBarMenuEnabled(boolean enable);
 	public native boolean isStandardToolBarMenuEnabled();
 	/**	
-		 Sets whether KMainWindow should provide a menu that allows showing/hiding
-		 of the statusbar ( using KToggleStatusBarAction ).
+		 Sets whether TDEMainWindow should provide a menu that allows showing/hiding
+		 of the statusbar ( using TDEToggleStatusBarAction ).
 			 The menu / menu item is implemented using xmlgui. It will be inserted
 		 in your menu structure in the 'Settings' menu.
 			 Note that you should enable this feature before calling createGUI()
 		 ( or similar ).
 			 If an application maintains the action on its own (i.e. never calls
-		 this function) a connection needs to be made to let KMainWindow
+		 this function) a connection needs to be made to let TDEMainWindow
 		 know when that status (hidden/shown) of the statusbar has changed.
 		 For example:
 		 connect(action, SIGNAL("activated()"),
 		         kmainwindow, SLOT("setSettingsDirty()"));
 		 Otherwise the status (hidden/show) of the statusbar might not be saved
-		 by KMainWindow.
-				@short    Sets whether KMainWindow should provide a menu that allows showing/hiding  of the statusbar ( using KToggleStatusBarAction ).
+		 by TDEMainWindow.
+				@short    Sets whether TDEMainWindow should provide a menu that allows showing/hiding  of the statusbar ( using TDEToggleStatusBarAction ).
 	*/
 	public native void createStandardStatusBarAction();
 	/**	
@@ -439,7 +439,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 Returns a pointer to the mainwindows action responsible for the toolbars menu
 				@short    Returns a pointer to the mainwindows action responsible for the toolbars menu
 	*/
-	public native KAction toolBarMenuAction();
+	public native TDEAction toolBarMenuAction();
 	/**	
 				@short
 	*/
@@ -551,7 +551,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 <pre>
 		 if (kapp.isRestored()){
 		   int n = 1;
-		   while (KMainWindow.canBeRestored(n)){
+		   while (TDEMainWindow.canBeRestored(n)){
 		     (new childMW).restore(n);
 		     n++;
 		   }
@@ -563,7 +563,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 			 With this you can easily restore all toplevel windows of your
 		 application.
 			 If your application uses different kinds of toplevel
-		 windows, then you can use KMainWindow.classNameOfToplevel(n)
+		 windows, then you can use TDEMainWindow.classNameOfToplevel(n)
 		 to determine the exact type before calling the childMW
 		 constructor in the example from above.
 			 If your client has only one kind of toplevel widgets (which
@@ -579,7 +579,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 			 The macro expands to the term above but is easier to use and
 		 less code to write.
 			 For new code or if you have more than one kind of toplevel
-		 widget (each derived from KMainWindow, of course), you can
+		 widget (each derived from TDEMainWindow, of course), you can
 		 use the templated kRestoreMainWindows global functions:
 			 <pre>
 		 if (kapp.isRestored())
@@ -606,10 +606,10 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 	*/
 	public static native String classNameOfToplevel(int number);
 	/**	
-		 List of members of KMainWindow class.
-				@short    List of members of KMainWindow class.
+		 List of members of TDEMainWindow class.
+				@short    List of members of TDEMainWindow class.
 	*/
-	// TQPtrList<KMainWindow>* getMemberList(); >>>> NOT CONVERTED
+	// TQPtrList<TDEMainWindow>* getMemberList(); >>>> NOT CONVERTED
 	protected native void paintEvent(TQPaintEvent e);
 	protected native void childEvent(TQChildEvent e);
 	protected native void resizeEvent(TQResizeEvent e);
@@ -681,7 +681,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 invoked when the session manager requests your application
 		 to save its state.
 			 You <b>must</b> <b>not</b> change the group of the <code>tdeconfig</code> object, since
-		 KMainWindow uses one group for each window.  Please
+		 TDEMainWindow uses one group for each window.  Please
 		 reimplement these function in childclasses.
 			 Note: No user interaction is allowed
 		 in this function!
@@ -828,25 +828,25 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 to get the action object.
 		   		@short    Retrieves an action of the client by name.
 	*/
-	public native KAction action(String name);
+	public native TDEAction action(String name);
 	/**	
 		 Retrieves an action for a given TQDomElement. The default
 		 implementation uses the "name" attribute to query the action
 		 object via the other action() method.
 		   		@short    Retrieves an action for a given TQDomElement.
 	*/
-	public native KAction action(TQDomElement element);
+	public native TDEAction action(TQDomElement element);
 	/**	
 		 Retrieves the entire action collection for the GUI client. If
 		 you subclass KXMLGUIClient you should call
-		 KActionCollection.setWidget( TQWidget ) with this object, or
-		 you will encounter subtle bugs with KAction keyboard shortcuts.
-		 This is not necessary if your KXMLGUIClient is a KMainWindow.
+		 TDEActionCollection.setWidget( TQWidget ) with this object, or
+		 you will encounter subtle bugs with TDEAction keyboard shortcuts.
+		 This is not necessary if your KXMLGUIClient is a TDEMainWindow.
 				@short    Retrieves the entire action collection for the GUI client.
-		@see KActionCollection#setWidget(
+		@see TDEActionCollection#setWidget(
 		@see org.kde.qt.TQWidget*
 	*/
-	public native KActionCollection actionCollection();
+	public native TDEActionCollection actionCollection();
 	/**	
 				@return The instance ( TDEInstance ) for this GUI client.
    
@@ -969,7 +969,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 			 This tag will get expanded to a list of actions.  In the example
 		 above ( a file manager with a dynamic file menu ), you would call
 		 <pre>
-		 TQPtrList<KAction> file_actions;
+		 TQPtrList<TDEAction> file_actions;
 		 for( ... )
 		   if( ... )
 		     file_actions.append( cool_action );
@@ -985,7 +985,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		       menu too..
 		   		@short    ActionLists are a way for XMLGUI to support dynamic lists of  actions.
 	*/
-	// void plugActionList(const TQString& arg1,const TQPtrList<KAction>& arg2); >>>> NOT CONVERTED
+	// void plugActionList(const TQString& arg1,const TQPtrList<TDEAction>& arg2); >>>> NOT CONVERTED
 	/**	
 		 The complement of plugActionList() ...
 		   		@short    The complement of plugActionList() .
@@ -1058,7 +1058,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 	protected native void stateChanged(String newstate, int reverse);
 	protected native void stateChanged(String newstate);
 	/**
- 		List of members of KMainWindow class.
+ 		List of members of TDEMainWindow class.
 	*/
 	public native ArrayList memberList();
 	
@@ -1068,8 +1068,8 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		try {
 			savedClass = Class.forName(typeName);
 			int n = 1;
-			while (KMainWindow.canBeRestored(n)){
-				((KMainWindow) savedClass.newInstance()).restore(n);
+			while (TDEMainWindow.canBeRestored(n)){
+				((TDEMainWindow) savedClass.newInstance()).restore(n);
 				n++;
 			}
 		} catch(Exception e) {
diff --git a/kdejava/koala/org/kde/koala/KPasteTextAction.java b/kdejava/koala/org/kde/koala/TDEPasteTextAction.java
index 20ebb27d..76a8fd24 100644
--- a/kdejava/koala/org/kde/koala/KPasteTextAction.java
+++ b/kdejava/koala/org/kde/koala/TDEPasteTextAction.java
@@ -18,12 +18,12 @@ import org.kde.qt.TQWidget;
 		@short    An action for pasting text from the clipboard.
 
 */
-public class KPasteTextAction extends KAction  {
-	protected KPasteTextAction(Class dummy){super((Class) null);}
+public class TDEPasteTextAction extends TDEAction  {
+	protected TDEPasteTextAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Create a KPasteTextAction, with a text, an icon, an accelerator,
+		 Create a TDEPasteTextAction, with a text, an icon, an accelerator,
 		 a slot connected to the action, parent and name.
 			 If you do not want or have a keyboard accelerator, set the
 		 <code>cut</code> param to 0.
@@ -34,23 +34,23 @@ public class KPasteTextAction extends KAction  {
 			@param slot The SLOT to invoke to execute this action.
 			@param parent This action's parent.
 			@param name An internal name for this action.
-		     		@short    Create a KPasteTextAction, with a text, an icon, an accelerator,  a slot connected to the action, parent and name.
+		     		@short    Create a TDEPasteTextAction, with a text, an icon, an accelerator,  a slot connected to the action, parent and name.
 	*/
-	public KPasteTextAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDEPasteTextAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKPasteTextAction(text,icon,cut,receiver,slot,parent,name);
+		newTDEPasteTextAction(text,icon,cut,receiver,slot,parent,name);
 	}
-	private native void newKPasteTextAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KPasteTextAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDEPasteTextAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEPasteTextAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKPasteTextAction(text,icon,cut,receiver,slot,parent);
+		newTDEPasteTextAction(text,icon,cut,receiver,slot,parent);
 	}
-	private native void newKPasteTextAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent);
-	public KPasteTextAction(String text, String icon, KShortcut cut, TQObject receiver, String slot) {
+	private native void newTDEPasteTextAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	public TDEPasteTextAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot) {
 		super((Class) null);
-		newKPasteTextAction(text,icon,cut,receiver,slot);
+		newTDEPasteTextAction(text,icon,cut,receiver,slot);
 	}
-	private native void newKPasteTextAction(String text, String icon, KShortcut cut, TQObject receiver, String slot);
+	private native void newTDEPasteTextAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot);
 	/**	
 		 Controls the behavior of the clipboard history menu popup.
 			@param mode If false and the clipboard contains a non-text object
diff --git a/kdejava/koala/org/kde/koala/KPopupFrame.java b/kdejava/koala/org/kde/koala/TDEPopupFrame.java
index 981649b6..9d80bbd9 100644
--- a/kdejava/koala/org/kde/koala/KPopupFrame.java
+++ b/kdejava/koala/org/kde/koala/TDEPopupFrame.java
@@ -20,29 +20,29 @@ import org.kde.qt.TQFrame;
 		@short    Frame with popup menu behavior.
 
 */
-public class KPopupFrame extends TQFrame  {
-	protected KPopupFrame(Class dummy){super((Class) null);}
+public class TDEPopupFrame extends TQFrame  {
+	protected TDEPopupFrame(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
 		 The contructor. Creates a dialog without buttons.
 		   		@short    The contructor.
 	*/
-	public KPopupFrame(TQWidget parent, String name) {
+	public TDEPopupFrame(TQWidget parent, String name) {
 		super((Class) null);
-		newKPopupFrame(parent,name);
+		newTDEPopupFrame(parent,name);
 	}
-	private native void newKPopupFrame(TQWidget parent, String name);
-	public KPopupFrame(TQWidget parent) {
+	private native void newTDEPopupFrame(TQWidget parent, String name);
+	public TDEPopupFrame(TQWidget parent) {
 		super((Class) null);
-		newKPopupFrame(parent);
+		newTDEPopupFrame(parent);
 	}
-	private native void newKPopupFrame(TQWidget parent);
-	public KPopupFrame() {
+	private native void newTDEPopupFrame(TQWidget parent);
+	public TDEPopupFrame() {
 		super((Class) null);
-		newKPopupFrame();
+		newTDEPopupFrame();
 	}
-	private native void newKPopupFrame();
+	private native void newTDEPopupFrame();
 	/**	
 		 Set the main widget. You cannot set the main widget from the constructor,
 		 since it must be a child of the frame itselfes.
diff --git a/kdejava/koala/org/kde/koala/KPopupMenu.java b/kdejava/koala/org/kde/koala/TDEPopupMenu.java
index 75043bdf..8fe4d9ab 100644
--- a/kdejava/koala/org/kde/koala/KPopupMenu.java
+++ b/kdejava/koala/org/kde/koala/TDEPopupMenu.java
@@ -17,7 +17,7 @@ import org.kde.qt.TQPopupMenu;
 
 /**
 
- KPopupMenu is a class for menus with standard title items and keyboard
+ TDEPopupMenu is a class for menus with standard title items and keyboard
  accessibility for popups with many options and/or varying options. It acts
  identically to TQPopupMenu, with the addition of insertTitle(),
  changeTitle(), setKeyboardShortcutsEnabled() and
@@ -26,35 +26,35 @@ import org.kde.qt.TQPopupMenu;
  colors, and background pixmaps.
  The keyboard search algorithm is incremental with additional underlining
  for user feedback.
- See {@link KPopupMenuSignals} for signals emitted by KPopupMenu
+ See {@link TDEPopupMenuSignals} for signals emitted by TDEPopupMenu
 		@author Hamish Rodda <rodda@kde.org>
  
 		@short A menu with title items.
 
 */
-public class KPopupMenu extends TQPopupMenu  {
-	protected KPopupMenu(Class dummy){super((Class) null);}
+public class TDEPopupMenu extends TQPopupMenu  {
+	protected TDEPopupMenu(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Constructs a KPopupMenu.
-		     		@short    Constructs a KPopupMenu.
+		 Constructs a TDEPopupMenu.
+		     		@short    Constructs a TDEPopupMenu.
 	*/
-	public KPopupMenu(TQWidget parent, String name) {
+	public TDEPopupMenu(TQWidget parent, String name) {
 		super((Class) null);
-		newKPopupMenu(parent,name);
+		newTDEPopupMenu(parent,name);
 	}
-	private native void newKPopupMenu(TQWidget parent, String name);
-	public KPopupMenu(TQWidget parent) {
+	private native void newTDEPopupMenu(TQWidget parent, String name);
+	public TDEPopupMenu(TQWidget parent) {
 		super((Class) null);
-		newKPopupMenu(parent);
+		newTDEPopupMenu(parent);
 	}
-	private native void newKPopupMenu(TQWidget parent);
-	public KPopupMenu() {
+	private native void newTDEPopupMenu(TQWidget parent);
+	public TDEPopupMenu() {
 		super((Class) null);
-		newKPopupMenu();
+		newTDEPopupMenu();
 	}
-	private native void newKPopupMenu();
+	private native void newTDEPopupMenu();
 	/**	
 		 Inserts a title item with no icon.
 		     		@short    Inserts a title item with no icon.
@@ -133,10 +133,10 @@ public class KPopupMenu extends TQPopupMenu  {
 	*/
 	public native int state();
 	/**	
-		 Returns the KPopupMenu associated with the current context menu
-				@short    Returns the KPopupMenu associated with the current context menu
+		 Returns the TDEPopupMenu associated with the current context menu
+				@short    Returns the TDEPopupMenu associated with the current context menu
 	*/
-	public static native KPopupMenu contextMenuFocus();
+	public static native TDEPopupMenu contextMenuFocus();
 	/**	
 		 returns the ID of the menuitem associated with the current context menu
 				@short    returns the ID of the menuitem associated with the current context menu
diff --git a/kdejava/koala/org/kde/koala/KPopupMenuSignals.java b/kdejava/koala/org/kde/koala/TDEPopupMenuSignals.java
index 1a7a9d59..0a117bdf 100644
--- a/kdejava/koala/org/kde/koala/KPopupMenuSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEPopupMenuSignals.java
@@ -13,7 +13,7 @@ import org.kde.qt.TQMouseEvent;
 import org.kde.qt.TQKeyEvent;
 import org.kde.qt.TQWidget;
 
-public interface KPopupMenuSignals {
+public interface TDEPopupMenuSignals {
 	/**	
 		 connect to this signal to be notified when a context menu is about to be shown
 			@param menu The menu that the context menu is about to be shown for
@@ -21,5 +21,5 @@ public interface KPopupMenuSignals {
 			@param ctxMenu The context menu itself
 				@short    connect to this signal to be notified when a context menu is about to be shown
 	*/
-	void aboutToShowContextMenu(KPopupMenu menu, int menuItem, TQPopupMenu ctxMenu);
+	void aboutToShowContextMenu(TDEPopupMenu menu, int menuItem, TQPopupMenu ctxMenu);
 }
diff --git a/kdejava/koala/org/kde/koala/KPopupTitle.java b/kdejava/koala/org/kde/koala/TDEPopupTitle.java
index f6bd880d..2f9a38f0 100644
--- a/kdejava/koala/org/kde/koala/KPopupTitle.java
+++ b/kdejava/koala/org/kde/koala/TDEPopupTitle.java
@@ -12,17 +12,17 @@ import org.kde.qt.TQWidget;
 
 /**
 
- Title widget for use in KPopupMenu.
+ Title widget for use in TDEPopupMenu.
  You usually don't have to create this manually since
- KPopupMenu.insertTitle will do it for you, but it is allowed if
+ TDEPopupMenu.insertTitle will do it for you, but it is allowed if
  you wish to customize it's look.
 		@author Daniel M. Duley <mosfet@kde.org>
  
-		@short KPopupMenu title widget.
+		@short TDEPopupMenu title widget.
 
 */
-public class KPopupTitle extends TQWidget  {
-	protected KPopupTitle(Class dummy){super((Class) null);}
+public class TDEPopupTitle extends TQWidget  {
+	protected TDEPopupTitle(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -30,21 +30,21 @@ public class KPopupTitle extends TQWidget  {
 		 and colors.
 		     		@short    Constructs a title widget with the user specified gradient, pixmap,  and colors.
 	*/
-	public KPopupTitle(TQWidget parent, String name) {
+	public TDEPopupTitle(TQWidget parent, String name) {
 		super((Class) null);
-		newKPopupTitle(parent,name);
+		newTDEPopupTitle(parent,name);
 	}
-	private native void newKPopupTitle(TQWidget parent, String name);
-	public KPopupTitle(TQWidget parent) {
+	private native void newTDEPopupTitle(TQWidget parent, String name);
+	public TDEPopupTitle(TQWidget parent) {
 		super((Class) null);
-		newKPopupTitle(parent);
+		newTDEPopupTitle(parent);
 	}
-	private native void newKPopupTitle(TQWidget parent);
-	public KPopupTitle() {
+	private native void newTDEPopupTitle(TQWidget parent);
+	public TDEPopupTitle() {
 		super((Class) null);
-		newKPopupTitle();
+		newTDEPopupTitle();
 	}
-	private native void newKPopupTitle();
+	private native void newTDEPopupTitle();
 	/**	
 		 Sets the title string and optional icon for the title widget.
 			 You will want to call this before inserting into a menu.
diff --git a/kdejava/koala/org/kde/koala/TDERadioAction.java b/kdejava/koala/org/kde/koala/TDERadioAction.java
new file mode 100644
index 00000000..1e9f1ebf
--- /dev/null
+++ b/kdejava/koala/org/kde/koala/TDERadioAction.java
@@ -0,0 +1,193 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+package org.kde.koala;
+
+import org.kde.qt.Qt;
+import org.kde.qt.TQMetaObject;
+import org.kde.qt.QtSupport;
+import org.kde.qt.TQObject;
+import org.kde.qt.TQIconSet;
+
+/**
+
+ An action that operates like a radio button. At any given time
+ only a single action from the group will be active.
+ 		@short Radiobox like action.
+
+*/
+public class TDERadioAction extends TDEToggleAction  {
+	protected TDERadioAction(Class dummy){super((Class) null);}
+	public native TQMetaObject metaObject();
+	public native String className();
+	/**	
+		 Constructs a radio action with text and potential keyboard
+		 accelerator but nothing else. Use this only if you really
+		 know what you are doing.
+			@param text The text that will be displayed.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short    Constructs a radio action with text and potential keyboard  accelerator but nothing else.
+	*/
+	public TDERadioAction(String text, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDERadioAction(text,cut,parent,name);
+	}
+	private native void newTDERadioAction(String text, TDEShortcut cut, TQObject parent, String name);
+	public TDERadioAction(String text, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDERadioAction(text,cut,parent);
+	}
+	private native void newTDERadioAction(String text, TDEShortcut cut, TQObject parent);
+	public TDERadioAction(String text, TDEShortcut cut) {
+		super((Class) null);
+		newTDERadioAction(text,cut);
+	}
+	private native void newTDERadioAction(String text, TDEShortcut cut);
+	public TDERadioAction(String text) {
+		super((Class) null);
+		newTDERadioAction(text);
+	}
+	private native void newTDERadioAction(String text);
+	/**	
+			@param text The text that will be displayed.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param receiver The SLOT's parent.
+			@param slot The SLOT to invoke to execute this action.
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDERadioAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDERadioAction(text,cut,receiver,slot,parent,name);
+	}
+	private native void newTDERadioAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDERadioAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDERadioAction(text,cut,receiver,slot,parent);
+	}
+	private native void newTDERadioAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The icons that go with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,parent,name);
+	}
+	private native void newTDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name);
+	public TDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,parent);
+	}
+	private native void newTDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent);
+	public TDERadioAction(String text, TQIconSet pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut);
+	}
+	private native void newTDERadioAction(String text, TQIconSet pix, TDEShortcut cut);
+	public TDERadioAction(String text, TQIconSet pix) {
+		super((Class) null);
+		newTDERadioAction(text,pix);
+	}
+	private native void newTDERadioAction(String text, TQIconSet pix);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The dynamically loaded icon that goes with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDERadioAction(String text, String pix, TDEShortcut cut, TQObject parent, String name) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,parent,name);
+	}
+	private native void newTDERadioAction(String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDERadioAction(String text, String pix, TDEShortcut cut, TQObject parent) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,parent);
+	}
+	private native void newTDERadioAction(String text, String pix, TDEShortcut cut, TQObject parent);
+	public TDERadioAction(String text, String pix, TDEShortcut cut) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut);
+	}
+	private native void newTDERadioAction(String text, String pix, TDEShortcut cut);
+	public TDERadioAction(String text, String pix) {
+		super((Class) null);
+		newTDERadioAction(text,pix);
+	}
+	private native void newTDERadioAction(String text, String pix);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The icons that go with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param receiver The SLOT's parent.
+			@param slot The SLOT to invoke to execute this action.
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDERadioAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	/**	
+			@param text The text that will be displayed.
+			@param pix The dynamically loaded icon that goes with this action.
+			@param cut The corresponding keyboard accelerator (shortcut).
+			@param receiver The SLOT's parent.
+			@param slot The SLOT to invoke to execute this action.
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDERadioAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,receiver,slot,parent,name);
+	}
+	private native void newTDERadioAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDERadioAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
+		super((Class) null);
+		newTDERadioAction(text,pix,cut,receiver,slot,parent);
+	}
+	private native void newTDERadioAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
+	/**	
+			@param parent This action's parent.
+			@param name An internal name for this action.
+		     		@short
+	*/
+	public TDERadioAction(TQObject parent, String name) {
+		super((Class) null);
+		newTDERadioAction(parent,name);
+	}
+	private native void newTDERadioAction(TQObject parent, String name);
+	public TDERadioAction(TQObject parent) {
+		super((Class) null);
+		newTDERadioAction(parent);
+	}
+	private native void newTDERadioAction(TQObject parent);
+	public TDERadioAction() {
+		super((Class) null);
+		newTDERadioAction();
+	}
+	private native void newTDERadioAction();
+	protected native void slotActivated();
+	/** Deletes the wrapped C++ instance */
+	protected native void finalize() throws InternalError;
+	/** Delete the wrapped C++ instance ahead of finalize() */
+	public native void dispose();
+	/** Has the wrapped C++ instance been deleted? */
+	public native boolean isDisposed();
+}
diff --git a/kdejava/koala/org/kde/koala/KRecentDocument.java b/kdejava/koala/org/kde/koala/TDERecentDocument.java
index 93220ea8..3b85b68d 100644
--- a/kdejava/koala/org/kde/koala/KRecentDocument.java
+++ b/kdejava/koala/org/kde/koala/TDERecentDocument.java
@@ -22,15 +22,15 @@ import java.util.ArrayList;
 		@short    Manage the "Recent Document Menu" entries displayed by  applications such as Kicker and Konqueror.
 
 */
-public class KRecentDocument implements QtSupport {
+public class TDERecentDocument implements QtSupport {
 	private long _qt;
 	private boolean _allocatedInJavaWorld = true;
-	protected KRecentDocument(Class dummy){}
+	protected TDERecentDocument(Class dummy){}
 
-	public KRecentDocument() {
-		newKRecentDocument();
+	public TDERecentDocument() {
+		newTDERecentDocument();
 	}
-	private native void newKRecentDocument();
+	private native void newTDERecentDocument();
 	/**	
 			 Return a list of absolute paths to recent document .desktop files,
 		 sorted by date.
diff --git a/kdejava/koala/org/kde/koala/KRecentFilesAction.java b/kdejava/koala/org/kde/koala/TDERecentFilesAction.java
index e0b08766..b3232290 100644
--- a/kdejava/koala/org/kde/koala/KRecentFilesAction.java
+++ b/kdejava/koala/org/kde/koala/TDERecentFilesAction.java
@@ -14,14 +14,14 @@ import org.kde.qt.TQWidget;
   The best way to create the action is to use KStdAction.openRecent.
   Then you simply need to call loadEntries on startup, saveEntries
   on shutdown, addURL when your application loads/saves a file.
- See {@link KRecentFilesActionSignals} for signals emitted by KRecentFilesAction
+ See {@link TDERecentFilesActionSignals} for signals emitted by TDERecentFilesAction
 		@author Michael Koch
  
 		@short Recent files action.
 
 */
-public class KRecentFilesAction extends KListAction  {
-	protected KRecentFilesAction(Class dummy){super((Class) null);}
+public class TDERecentFilesAction extends TDEListAction  {
+	protected TDERecentFilesAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -32,21 +32,21 @@ public class KRecentFilesAction extends KListAction  {
 			@param maxItems The maximum number of files to display
 		   		@short
 	*/
-	public KRecentFilesAction(String text, KShortcut cut, TQObject parent, String name, int maxItems) {
+	public TDERecentFilesAction(String text, TDEShortcut cut, TQObject parent, String name, int maxItems) {
 		super((Class) null);
-		newKRecentFilesAction(text,cut,parent,name,maxItems);
+		newTDERecentFilesAction(text,cut,parent,name,maxItems);
 	}
-	private native void newKRecentFilesAction(String text, KShortcut cut, TQObject parent, String name, int maxItems);
-	public KRecentFilesAction(String text, KShortcut cut, TQObject parent, String name) {
+	private native void newTDERecentFilesAction(String text, TDEShortcut cut, TQObject parent, String name, int maxItems);
+	public TDERecentFilesAction(String text, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKRecentFilesAction(text,cut,parent,name);
+		newTDERecentFilesAction(text,cut,parent,name);
 	}
-	private native void newKRecentFilesAction(String text, KShortcut cut, TQObject parent, String name);
-	public KRecentFilesAction(String text, KShortcut cut, TQObject parent) {
+	private native void newTDERecentFilesAction(String text, TDEShortcut cut, TQObject parent, String name);
+	public TDERecentFilesAction(String text, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKRecentFilesAction(text,cut,parent);
+		newTDERecentFilesAction(text,cut,parent);
 	}
-	private native void newKRecentFilesAction(String text, KShortcut cut, TQObject parent);
+	private native void newTDERecentFilesAction(String text, TDEShortcut cut, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param cut The corresponding keyboard accelerator (shortcut).
@@ -58,21 +58,21 @@ public class KRecentFilesAction extends KListAction  {
 			@param maxItems The maximum number of files to display
 		   		@short
 	*/
-	public KRecentFilesAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems) {
+	public TDERecentFilesAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems) {
 		super((Class) null);
-		newKRecentFilesAction(text,cut,receiver,slot,parent,name,maxItems);
+		newTDERecentFilesAction(text,cut,receiver,slot,parent,name,maxItems);
 	}
-	private native void newKRecentFilesAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems);
-	public KRecentFilesAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	private native void newTDERecentFilesAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems);
+	public TDERecentFilesAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKRecentFilesAction(text,cut,receiver,slot,parent,name);
+		newTDERecentFilesAction(text,cut,receiver,slot,parent,name);
 	}
-	private native void newKRecentFilesAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KRecentFilesAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDERecentFilesAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDERecentFilesAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKRecentFilesAction(text,cut,receiver,slot,parent);
+		newTDERecentFilesAction(text,cut,receiver,slot,parent);
 	}
-	private native void newKRecentFilesAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDERecentFilesAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The icons that go with this action.
@@ -82,21 +82,21 @@ public class KRecentFilesAction extends KListAction  {
 			@param maxItems The maximum number of files to display
 		   		@short
 	*/
-	public KRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name, int maxItems) {
+	public TDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name, int maxItems) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,parent,name,maxItems);
+		newTDERecentFilesAction(text,pix,cut,parent,name,maxItems);
 	}
-	private native void newKRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name, int maxItems);
-	public KRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name) {
+	private native void newTDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name, int maxItems);
+	public TDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,parent,name);
+		newTDERecentFilesAction(text,pix,cut,parent,name);
 	}
-	private native void newKRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name);
-	public KRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject parent) {
+	private native void newTDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name);
+	public TDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,parent);
+		newTDERecentFilesAction(text,pix,cut,parent);
 	}
-	private native void newKRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject parent);
+	private native void newTDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The dynamically loaded icon that goes with this action.
@@ -106,21 +106,21 @@ public class KRecentFilesAction extends KListAction  {
 			@param maxItems The maximum number of files to display
 		   		@short
 	*/
-	public KRecentFilesAction(String text, String pix, KShortcut cut, TQObject parent, String name, int maxItems) {
+	public TDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject parent, String name, int maxItems) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,parent,name,maxItems);
+		newTDERecentFilesAction(text,pix,cut,parent,name,maxItems);
 	}
-	private native void newKRecentFilesAction(String text, String pix, KShortcut cut, TQObject parent, String name, int maxItems);
-	public KRecentFilesAction(String text, String pix, KShortcut cut, TQObject parent, String name) {
+	private native void newTDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject parent, String name, int maxItems);
+	public TDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,parent,name);
+		newTDERecentFilesAction(text,pix,cut,parent,name);
 	}
-	private native void newKRecentFilesAction(String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KRecentFilesAction(String text, String pix, KShortcut cut, TQObject parent) {
+	private native void newTDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,parent);
+		newTDERecentFilesAction(text,pix,cut,parent);
 	}
-	private native void newKRecentFilesAction(String text, String pix, KShortcut cut, TQObject parent);
+	private native void newTDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The icons that go with this action.
@@ -133,21 +133,21 @@ public class KRecentFilesAction extends KListAction  {
 			@param maxItems The maximum number of files to display
 		   		@short
 	*/
-	public KRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems) {
+	public TDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,receiver,slot,parent,name,maxItems);
+		newTDERecentFilesAction(text,pix,cut,receiver,slot,parent,name,maxItems);
 	}
-	private native void newKRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems);
-	public KRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	private native void newTDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems);
+	public TDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,receiver,slot,parent,name);
+		newTDERecentFilesAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,receiver,slot,parent);
+		newTDERecentFilesAction(text,pix,cut,receiver,slot,parent);
 	}
-	private native void newKRecentFilesAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDERecentFilesAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The dynamically loaded icon that goes with this action.
@@ -160,47 +160,47 @@ public class KRecentFilesAction extends KListAction  {
 			@param maxItems The maximum number of files to display
 		   		@short
 	*/
-	public KRecentFilesAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems) {
+	public TDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,receiver,slot,parent,name,maxItems);
+		newTDERecentFilesAction(text,pix,cut,receiver,slot,parent,name,maxItems);
 	}
-	private native void newKRecentFilesAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems);
-	public KRecentFilesAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	private native void newTDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name, int maxItems);
+	public TDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,receiver,slot,parent,name);
+		newTDERecentFilesAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKRecentFilesAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KRecentFilesAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKRecentFilesAction(text,pix,cut,receiver,slot,parent);
+		newTDERecentFilesAction(text,pix,cut,receiver,slot,parent);
 	}
-	private native void newKRecentFilesAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDERecentFilesAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param parent This action's parent.
 			@param name An internal name for this action.
 			@param maxItems The maximum number of files to display
 		   		@short
 	*/
-	public KRecentFilesAction(TQObject parent, String name, int maxItems) {
+	public TDERecentFilesAction(TQObject parent, String name, int maxItems) {
 		super((Class) null);
-		newKRecentFilesAction(parent,name,maxItems);
+		newTDERecentFilesAction(parent,name,maxItems);
 	}
-	private native void newKRecentFilesAction(TQObject parent, String name, int maxItems);
-	public KRecentFilesAction(TQObject parent, String name) {
+	private native void newTDERecentFilesAction(TQObject parent, String name, int maxItems);
+	public TDERecentFilesAction(TQObject parent, String name) {
 		super((Class) null);
-		newKRecentFilesAction(parent,name);
+		newTDERecentFilesAction(parent,name);
 	}
-	private native void newKRecentFilesAction(TQObject parent, String name);
-	public KRecentFilesAction(TQObject parent) {
+	private native void newTDERecentFilesAction(TQObject parent, String name);
+	public TDERecentFilesAction(TQObject parent) {
 		super((Class) null);
-		newKRecentFilesAction(parent);
+		newTDERecentFilesAction(parent);
 	}
-	private native void newKRecentFilesAction(TQObject parent);
-	public KRecentFilesAction() {
+	private native void newTDERecentFilesAction(TQObject parent);
+	public TDERecentFilesAction() {
 		super((Class) null);
-		newKRecentFilesAction();
+		newTDERecentFilesAction();
 	}
-	private native void newKRecentFilesAction();
+	private native void newTDERecentFilesAction();
 	public native int plug(TQWidget widget, int index);
 	public native int plug(TQWidget widget);
 	/**	
diff --git a/kdejava/koala/org/kde/koala/KRecentFilesActionSignals.java b/kdejava/koala/org/kde/koala/TDERecentFilesActionSignals.java
index cac11f11..bd492c1c 100644
--- a/kdejava/koala/org/kde/koala/KRecentFilesActionSignals.java
+++ b/kdejava/koala/org/kde/koala/TDERecentFilesActionSignals.java
@@ -7,7 +7,7 @@ import org.kde.qt.TQObject;
 import org.kde.qt.TQIconSet;
 import org.kde.qt.TQWidget;
 
-public interface KRecentFilesActionSignals {
+public interface TDERecentFilesActionSignals {
 	/**	
 		  This signal gets emited when the user selects an URL.
 			@param url The URL thats the user selected.
diff --git a/kdejava/koala/org/kde/koala/KSelectAction.java b/kdejava/koala/org/kde/koala/TDESelectAction.java
index cf779ef8..234a65f7 100644
--- a/kdejava/koala/org/kde/koala/KSelectAction.java
+++ b/kdejava/koala/org/kde/koala/TDESelectAction.java
@@ -18,12 +18,12 @@ import org.kde.qt.TQWidget;
   this item will automatically be checked,
   the formerly checked item becomes unchecked.
   There can be only one item checked at a time.
-  See {@link KSelectActionSignals} for signals emitted by KSelectAction
+  See {@link TDESelectActionSignals} for signals emitted by TDESelectAction
 		@short Action for selecting one of several items.
 
 */
-public class KSelectAction extends KAction  {
-	protected KSelectAction(Class dummy){super((Class) null);}
+public class TDESelectAction extends TDEAction  {
+	protected TDESelectAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -36,26 +36,26 @@ public class KSelectAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short    Constructs a select action with text and potential keyboard  accelerator but nothing else.
 	*/
-	public KSelectAction(String text, KShortcut cut, TQObject parent, String name) {
+	public TDESelectAction(String text, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKSelectAction(text,cut,parent,name);
+		newTDESelectAction(text,cut,parent,name);
 	}
-	private native void newKSelectAction(String text, KShortcut cut, TQObject parent, String name);
-	public KSelectAction(String text, KShortcut cut, TQObject parent) {
+	private native void newTDESelectAction(String text, TDEShortcut cut, TQObject parent, String name);
+	public TDESelectAction(String text, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKSelectAction(text,cut,parent);
+		newTDESelectAction(text,cut,parent);
 	}
-	private native void newKSelectAction(String text, KShortcut cut, TQObject parent);
-	public KSelectAction(String text, KShortcut cut) {
+	private native void newTDESelectAction(String text, TDEShortcut cut, TQObject parent);
+	public TDESelectAction(String text, TDEShortcut cut) {
 		super((Class) null);
-		newKSelectAction(text,cut);
+		newTDESelectAction(text,cut);
 	}
-	private native void newKSelectAction(String text, KShortcut cut);
-	public KSelectAction(String text) {
+	private native void newTDESelectAction(String text, TDEShortcut cut);
+	public TDESelectAction(String text) {
 		super((Class) null);
-		newKSelectAction(text);
+		newTDESelectAction(text);
 	}
-	private native void newKSelectAction(String text);
+	private native void newTDESelectAction(String text);
 	/**	
 			@param text The text that will be displayed.
 			@param cut The corresponding keyboard accelerator (shortcut).
@@ -65,16 +65,16 @@ public class KSelectAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KSelectAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDESelectAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKSelectAction(text,cut,receiver,slot,parent,name);
+		newTDESelectAction(text,cut,receiver,slot,parent,name);
 	}
-	private native void newKSelectAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KSelectAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDESelectAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDESelectAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKSelectAction(text,cut,receiver,slot,parent);
+		newTDESelectAction(text,cut,receiver,slot,parent);
 	}
-	private native void newKSelectAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDESelectAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The icons that go with this action.
@@ -83,26 +83,26 @@ public class KSelectAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name) {
+	public TDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,parent,name);
+		newTDESelectAction(text,pix,cut,parent,name);
 	}
-	private native void newKSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name);
-	public KSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject parent) {
+	private native void newTDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name);
+	public TDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,parent);
+		newTDESelectAction(text,pix,cut,parent);
 	}
-	private native void newKSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject parent);
-	public KSelectAction(String text, TQIconSet pix, KShortcut cut) {
+	private native void newTDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent);
+	public TDESelectAction(String text, TQIconSet pix, TDEShortcut cut) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut);
+		newTDESelectAction(text,pix,cut);
 	}
-	private native void newKSelectAction(String text, TQIconSet pix, KShortcut cut);
-	public KSelectAction(String text, TQIconSet pix) {
+	private native void newTDESelectAction(String text, TQIconSet pix, TDEShortcut cut);
+	public TDESelectAction(String text, TQIconSet pix) {
 		super((Class) null);
-		newKSelectAction(text,pix);
+		newTDESelectAction(text,pix);
 	}
-	private native void newKSelectAction(String text, TQIconSet pix);
+	private native void newTDESelectAction(String text, TQIconSet pix);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The dynamically loaded icon that goes with this action.
@@ -111,26 +111,26 @@ public class KSelectAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KSelectAction(String text, String pix, KShortcut cut, TQObject parent, String name) {
+	public TDESelectAction(String text, String pix, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,parent,name);
+		newTDESelectAction(text,pix,cut,parent,name);
 	}
-	private native void newKSelectAction(String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KSelectAction(String text, String pix, KShortcut cut, TQObject parent) {
+	private native void newTDESelectAction(String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDESelectAction(String text, String pix, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,parent);
+		newTDESelectAction(text,pix,cut,parent);
 	}
-	private native void newKSelectAction(String text, String pix, KShortcut cut, TQObject parent);
-	public KSelectAction(String text, String pix, KShortcut cut) {
+	private native void newTDESelectAction(String text, String pix, TDEShortcut cut, TQObject parent);
+	public TDESelectAction(String text, String pix, TDEShortcut cut) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut);
+		newTDESelectAction(text,pix,cut);
 	}
-	private native void newKSelectAction(String text, String pix, KShortcut cut);
-	public KSelectAction(String text, String pix) {
+	private native void newTDESelectAction(String text, String pix, TDEShortcut cut);
+	public TDESelectAction(String text, String pix) {
 		super((Class) null);
-		newKSelectAction(text,pix);
+		newTDESelectAction(text,pix);
 	}
-	private native void newKSelectAction(String text, String pix);
+	private native void newTDESelectAction(String text, String pix);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The icons that go with this action.
@@ -141,16 +141,16 @@ public class KSelectAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,receiver,slot,parent,name);
+		newTDESelectAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,receiver,slot,parent);
+		newTDESelectAction(text,pix,cut,receiver,slot,parent);
 	}
-	private native void newKSelectAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDESelectAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The dynamically loaded icon that goes with this action.
@@ -161,42 +161,42 @@ public class KSelectAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KSelectAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDESelectAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,receiver,slot,parent,name);
+		newTDESelectAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKSelectAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KSelectAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDESelectAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDESelectAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKSelectAction(text,pix,cut,receiver,slot,parent);
+		newTDESelectAction(text,pix,cut,receiver,slot,parent);
 	}
-	private native void newKSelectAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDESelectAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param parent This action's parent.
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KSelectAction(TQObject parent, String name) {
+	public TDESelectAction(TQObject parent, String name) {
 		super((Class) null);
-		newKSelectAction(parent,name);
+		newTDESelectAction(parent,name);
 	}
-	private native void newKSelectAction(TQObject parent, String name);
-	public KSelectAction(TQObject parent) {
+	private native void newTDESelectAction(TQObject parent, String name);
+	public TDESelectAction(TQObject parent) {
 		super((Class) null);
-		newKSelectAction(parent);
+		newTDESelectAction(parent);
 	}
-	private native void newKSelectAction(TQObject parent);
-	public KSelectAction() {
+	private native void newTDESelectAction(TQObject parent);
+	public TDESelectAction() {
 		super((Class) null);
-		newKSelectAction();
+		newTDESelectAction();
 	}
-	private native void newKSelectAction();
+	private native void newTDESelectAction();
 	/**	
 		  "Plug" or insert this action into a given widget.
 			  This will typically be a menu or a toolbar.
 		  From this point on, you will never need to directly
 		  manipulate the item in the menu or toolbar.
-		  You do all enabling/disabling/manipulation directly with your KSelectAction object.
+		  You do all enabling/disabling/manipulation directly with your TDESelectAction object.
 			@param widget The GUI element to display this action.
 			@param index The index of the item.
 		     		@short     "Plug" or insert this action into a given widget.
diff --git a/kdejava/koala/org/kde/koala/KSelectActionSignals.java b/kdejava/koala/org/kde/koala/TDESelectActionSignals.java
index aeaa843d..d37a7a60 100644
--- a/kdejava/koala/org/kde/koala/KSelectActionSignals.java
+++ b/kdejava/koala/org/kde/koala/TDESelectActionSignals.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import org.kde.qt.TQIconSet;
 import org.kde.qt.TQWidget;
 
-public interface KSelectActionSignals {
+public interface TDESelectActionSignals {
 	/**	
 		 This signal is emitted when an item is selected; @param index indicated
 		 the item selected.
diff --git a/kdejava/koala/org/kde/koala/KSelector.java b/kdejava/koala/org/kde/koala/TDESelector.java
index 536b8a8c..e165ded2 100644
--- a/kdejava/koala/org/kde/koala/KSelector.java
+++ b/kdejava/koala/org/kde/koala/TDESelector.java
@@ -17,59 +17,59 @@ import org.kde.qt.TQWidget;
 
 /**
 
- KSelector is the base class for other widgets which
+ TDESelector is the base class for other widgets which
  provides the ability to choose from a one-dimensional
  range of values. An example is the KGradientSelector
  which allows to choose from a range of colors.
  A custom drawing routine for the widget surface has
  to be provided by the subclass.
-  See {@link KSelectorSignals} for signals emitted by KSelector
-		@short    KSelector is the base class for other widgets which  provides the ability to choose from a one-dimensional  range of values.
+  See {@link TDESelectorSignals} for signals emitted by TDESelector
+		@short    TDESelector is the base class for other widgets which  provides the ability to choose from a one-dimensional  range of values.
 
 */
-public class KSelector extends TQWidget implements TQRangeControlInterface {
-	protected KSelector(Class dummy){super((Class) null);}
+public class TDESelector extends TQWidget implements TQRangeControlInterface {
+	protected TDESelector(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
 		 Constructs a horizontal one-dimensional selection widget.
 		   		@short    Constructs a horizontal one-dimensional selection widget.
 	*/
-	public KSelector(TQWidget parent, String name) {
+	public TDESelector(TQWidget parent, String name) {
 		super((Class) null);
-		newKSelector(parent,name);
+		newTDESelector(parent,name);
 	}
-	private native void newKSelector(TQWidget parent, String name);
-	public KSelector(TQWidget parent) {
+	private native void newTDESelector(TQWidget parent, String name);
+	public TDESelector(TQWidget parent) {
 		super((Class) null);
-		newKSelector(parent);
+		newTDESelector(parent);
 	}
-	private native void newKSelector(TQWidget parent);
-	public KSelector() {
+	private native void newTDESelector(TQWidget parent);
+	public TDESelector() {
 		super((Class) null);
-		newKSelector();
+		newTDESelector();
 	}
-	private native void newKSelector();
+	private native void newTDESelector();
 	/**	
 		 Constructs a one-dimensional selection widget with
 		 a given orientation.
 		   		@short    Constructs a one-dimensional selection widget with  a given orientation.
 	*/
-	public KSelector(int o, TQWidget parent, String name) {
+	public TDESelector(int o, TQWidget parent, String name) {
 		super((Class) null);
-		newKSelector(o,parent,name);
+		newTDESelector(o,parent,name);
 	}
-	private native void newKSelector(int o, TQWidget parent, String name);
-	public KSelector(int o, TQWidget parent) {
+	private native void newTDESelector(int o, TQWidget parent, String name);
+	public TDESelector(int o, TQWidget parent) {
 		super((Class) null);
-		newKSelector(o,parent);
+		newTDESelector(o,parent);
 	}
-	private native void newKSelector(int o, TQWidget parent);
-	public KSelector(int o) {
+	private native void newTDESelector(int o, TQWidget parent);
+	public TDESelector(int o) {
 		super((Class) null);
-		newKSelector(o);
+		newTDESelector(o);
 	}
-	private native void newKSelector(int o);
+	private native void newTDESelector(int o);
 	/**	
 				@return the orientation of the widget.
    
diff --git a/kdejava/koala/org/kde/koala/KSelectorSignals.java b/kdejava/koala/org/kde/koala/TDESelectorSignals.java
index 9b7576fc..5f4738ae 100644
--- a/kdejava/koala/org/kde/koala/KSelectorSignals.java
+++ b/kdejava/koala/org/kde/koala/TDESelectorSignals.java
@@ -13,7 +13,7 @@ import org.kde.qt.TQMouseEvent;
 import org.kde.qt.TQWidget;
 import org.kde.qt.TQWheelEvent;
 
-public interface KSelectorSignals {
+public interface TDESelectorSignals {
 	/**	
 		 This signal is emitted whenever the user chooses a value,
 		 e.g. by clicking with the mouse on the widget.
diff --git a/kdejava/koala/org/kde/koala/KShortcut.java b/kdejava/koala/org/kde/koala/TDEShortcut.java
index 269cbd66..c2281727 100644
--- a/kdejava/koala/org/kde/koala/KShortcut.java
+++ b/kdejava/koala/org/kde/koala/TDEShortcut.java
@@ -7,34 +7,34 @@ import org.kde.qt.QtSupport;
 
 /**
 
- The KShortcut class is used to represent a keyboard shortcut to an action.
+ The TDEShortcut class is used to represent a keyboard shortcut to an action.
  A shortcut is normally a single key with modifiers, such as Ctrl+V.
- A KShortcut object may also contain an alternate key which will also
+ A TDEShortcut object may also contain an alternate key which will also
  activate the action it's associated to, as long as no other actions have
  defined that key as their primary key.  Ex: Ctrl+V;Shift+Insert.
- This can be used to add additional accelerators to a KAction.  For example,
+ This can be used to add additional accelerators to a TDEAction.  For example,
  the below code binds the escape key to the close action.
  <pre>
-  KAction closeAction = KStdAction.close( this, SLOT("close()"), actionCollection() );
-  KShortcut closeShortcut = closeAction.shortcut();
+  TDEAction closeAction = KStdAction.close( this, SLOT("close()"), actionCollection() );
+  TDEShortcut closeShortcut = closeAction.shortcut();
   closeShortcut.append( KKey(Key_Escape));
   closeAction.setShortcut(closeShortcut);
  </pre>
  Note that a shortcut cannot have more than 2 key combinations associated with it, so the above
  code would not do anything (and append() would return false) if the closeAction already had
  an key and alternate key.
-		@short    The KShortcut class is used to represent a keyboard shortcut to an action.
+		@short    The TDEShortcut class is used to represent a keyboard shortcut to an action.
 
 */
-public class KShortcut implements QtSupport {
+public class TDEShortcut implements QtSupport {
 	private long _qt;
 	private boolean _allocatedInJavaWorld = true;
-	protected KShortcut(Class dummy){}
+	protected TDEShortcut(Class dummy){}
 
 	/**	
 		 The maximum number of key sequences that can be contained in
-		 a KShortcut.
-		         		@short    The maximum number of key sequences that can be contained in  a KShortcut.
+		 a TDEShortcut.
+		         		@short    The maximum number of key sequences that can be contained in  a TDEShortcut.
 	*/
 	public static final int MAX_SETQUENCES = 2;
 
@@ -45,10 +45,10 @@ public class KShortcut implements QtSupport {
 		@see #isNull
 		@see #clear
 	*/
-	public KShortcut() {
-		newKShortcut();
+	public TDEShortcut() {
+		newTDEShortcut();
 	}
-	private native void newKShortcut();
+	private native void newTDEShortcut();
 	/**	
 		 Creates a new shortcut with the given Qt key code
 		 as the only key sequence.
@@ -56,49 +56,49 @@ public class KShortcut implements QtSupport {
 				@short    Creates a new shortcut with the given Qt key code  as the only key sequence.
 		@see org.kde.qt.Qt#Key
 	*/
-	public KShortcut(int keyQt) {
-		newKShortcut(keyQt);
+	public TDEShortcut(int keyQt) {
+		newTDEShortcut(keyQt);
 	}
-	private native void newKShortcut(int keyQt);
+	private native void newTDEShortcut(int keyQt);
 	/**	
 		 Creates a new shortcut that contains only the given qt key
 		 sequence.
 			@param keySeq the qt key sequence to add
 			 		@short    Creates a new shortcut that contains only the given qt key  sequence.
 	*/
-	public KShortcut(TQKeySequence keySeq) {
-		newKShortcut(keySeq);
+	public TDEShortcut(TQKeySequence keySeq) {
+		newTDEShortcut(keySeq);
 	}
-	private native void newKShortcut(TQKeySequence keySeq);
+	private native void newTDEShortcut(TQKeySequence keySeq);
 	/**	
 		 Creates a new shortcut that contains only the given key
 		 in its only sequence.
 			@param key the key to add
 			 		@short    Creates a new shortcut that contains only the given key  in its only sequence.
 	*/
-	public KShortcut(KKey key) {
-		newKShortcut(key);
+	public TDEShortcut(KKey key) {
+		newTDEShortcut(key);
 	}
-	private native void newKShortcut(KKey key);
+	private native void newTDEShortcut(KKey key);
 	/**	
 		 Creates a new shortcut that contains only the given key
 		 sequence.
 			@param keySeq the key sequence to add
 			 		@short    Creates a new shortcut that contains only the given key  sequence.
 	*/
-	public KShortcut(KKeySequence keySeq) {
-		newKShortcut(keySeq);
+	public TDEShortcut(KKeySequence keySeq) {
+		newTDEShortcut(keySeq);
 	}
-	private native void newKShortcut(KKeySequence keySeq);
+	private native void newTDEShortcut(KKeySequence keySeq);
 	/**	
 		 Copies the given shortcut.
 			@param shortcut the shortcut to add
 			 		@short    Copies the given shortcut.
 	*/
-	public KShortcut(KShortcut shortcut) {
-		newKShortcut(shortcut);
+	public TDEShortcut(TDEShortcut shortcut) {
+		newTDEShortcut(shortcut);
 	}
-	private native void newKShortcut(KShortcut shortcut);
+	private native void newTDEShortcut(TDEShortcut shortcut);
 	/**	
 		 Creates a new key sequence that contains the given key sequence.
 		 The description consists of semicolon-separated keys as
@@ -107,10 +107,10 @@ public class KShortcut implements QtSupport {
 				@short    Creates a new key sequence that contains the given key sequence.
 		@see KKeySequence#KKeySequence(const
 	*/
-	public KShortcut(String shortcut) {
-		newKShortcut(shortcut);
+	public TDEShortcut(String shortcut) {
+		newTDEShortcut(shortcut);
 	}
-	private native void newKShortcut(String shortcut);
+	private native void newTDEShortcut(String shortcut);
 	/**	
 		 Clears the shortcut. The shortcut is null after calling this
 		 function.
@@ -149,7 +149,7 @@ public class KShortcut implements QtSupport {
 			@param shortcut the shortcut to add
 			 		@short    Copies the given shortcut.
 	*/
-	public native boolean init(KShortcut shortcut);
+	public native boolean init(TDEShortcut shortcut);
 	/**	
 		 Initializes the key sequence with the given key sequence.
 		 The description consists of semicolon-separated keys as
@@ -206,32 +206,32 @@ public class KShortcut implements QtSupport {
 		 beginning until an unequal key sequences has been found. If a shortcut
 		 contains more key sequences, it is considered larger.
 			@param shortcut the shortcut to compare to
-				@return a negative number if the given KShortcut is larger, 0 if
- they are equal and a positive number this KShortcut is larger
+				@return a negative number if the given TDEShortcut is larger, 0 if
+ they are equal and a positive number this TDEShortcut is larger
 
 		@short    Compares this object with the given shortcut.
 		@see KKey#compare
 		@see KKeyShortcut#compare
 	*/
-	public native int compare(KShortcut shortcut);
+	public native int compare(TDEShortcut shortcut);
 	/**	
 		 Compares the sequences of both shortcuts.
 				@short    Compares the sequences of both shortcuts.
 		@see #compare
 	*/
-	public native boolean op_equals(KShortcut cut);
+	public native boolean op_equals(TDEShortcut cut);
 	/**	
 		 Compares the sequences of both shortcuts.
 				@short    Compares the sequences of both shortcuts.
 		@see #compare
 	*/
-	public native boolean op_not_equals(KShortcut cut);
+	public native boolean op_not_equals(TDEShortcut cut);
 	/**	
 		 Compares the sequences of both shortcuts.
 				@short    Compares the sequences of both shortcuts.
 		@see #compare
 	*/
-	public native boolean op_lt(KShortcut cut);
+	public native boolean op_lt(TDEShortcut cut);
 	/**	
 		 Checks whether this shortcut contains a sequence that starts
 		 with the given key.
@@ -295,7 +295,7 @@ public class KShortcut implements QtSupport {
 		@short    Appends the sequences from the given shortcut.
 		@see MAX_SETQUENCES
 	*/
-	public native boolean append(KShortcut cut);
+	public native boolean append(TDEShortcut cut);
 	/**	
 		 Returns a description of the shortcut as semicolon-separated
 		 ket sequences, as returned by KKeySequence.toString().
@@ -309,7 +309,7 @@ public class KShortcut implements QtSupport {
 	/**	
 				 		@short
 	*/
-	public native String toStringInternal(KShortcut pcutDefault);
+	public native String toStringInternal(TDEShortcut pcutDefault);
 	public native String toStringInternal();
 	/**	
 		 Returns a null shortcut.
@@ -319,7 +319,7 @@ public class KShortcut implements QtSupport {
 		@see #isNull
 		@see #clear
 	*/
-	public static native KShortcut nil();
+	public static native TDEShortcut nil();
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
 	/** Delete the wrapped C++ instance ahead of finalize() */
diff --git a/kdejava/koala/org/kde/koala/KShortcutList.java b/kdejava/koala/org/kde/koala/TDEShortcutList.java
index 48cc123e..e7a5dfff 100644
--- a/kdejava/koala/org/kde/koala/KShortcutList.java
+++ b/kdejava/koala/org/kde/koala/TDEShortcutList.java
@@ -7,19 +7,19 @@ import org.kde.qt.TQVariant;
 
 /**
 
- KShortcutList is an abstract base class for
- KAccelShortcutList and KStdAccel.ShortcutList. It gives
+ TDEShortcutList is an abstract base class for
+ TDEAccelShortcutList and TDEStdAccel.ShortcutList. It gives
  you an unified interface for accessing the accelerator lists
- of KAccel (using KAccelShortcutList),
- TDEGlobalAccel (using KAccelShortcutList), and
- KStdAccel (using KStdAccel.ShortcutList).
+ of TDEAccel (using TDEAccelShortcutList),
+ TDEGlobalAccel (using TDEAccelShortcutList), and
+ TDEStdAccel (using TDEStdAccel.ShortcutList).
 		@short Base class for accessing accelerator lists.
 
 */
-public class KShortcutList implements QtSupport {
+public class TDEShortcutList implements QtSupport {
 	private long _qt;
 	private boolean _allocatedInJavaWorld = true;
-	protected KShortcutList(Class dummy){}
+	protected TDEShortcutList(Class dummy){}
 
 
 	/**	
@@ -65,7 +65,7 @@ public class KShortcutList implements QtSupport {
 		@short    Returns the shortcut with the given <code>index.</code>
 		@see #shortcutDefault
 	*/
-	public native KShortcut shortcut(int index);
+	public native TDEShortcut shortcut(int index);
 	/**	
 		 Returns default shortcut with the given <code>index.</code>
 			@param index the index of the shortcut (must be < count())
@@ -74,7 +74,7 @@ public class KShortcutList implements QtSupport {
 		@short    Returns default shortcut with the given <code>index.</code>
 		@see #shortcut
 	*/
-	public native KShortcut shortcutDefault(int index);
+	public native TDEShortcut shortcutDefault(int index);
 	/**	
 		 Checks whether the shortcut with the given <code>index</code> is configurable.
 			@param index the index of the shortcut (must be < count())
@@ -89,7 +89,7 @@ public class KShortcutList implements QtSupport {
 			@param shortcut the shortcut
 			 		@short    Sets the shortcut of the given entry
 	*/
-	public native boolean setShortcut(int index, KShortcut shortcut);
+	public native boolean setShortcut(int index, TDEShortcut shortcut);
 	/**	
 		 Checks whether the shortcut with the given <code>index</code> is saved in the
 		 global configuration.
diff --git a/kdejava/koala/org/kde/koala/KStdAccel.java b/kdejava/koala/org/kde/koala/TDEStdAccel.java
index 9a0a0ef6..adb67f6b 100644
--- a/kdejava/koala/org/kde/koala/KStdAccel.java
+++ b/kdejava/koala/org/kde/koala/TDEStdAccel.java
@@ -6,18 +6,18 @@ import org.kde.qt.QtSupport;
 
 /**
 
- \namespace KStdAccel
+ \namespace TDEStdAccel
  Convenient methods for access to the common accelerator keys in
  the key configuration. These are the standard keybindings that should
  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 KAccel in kaccel.h
-		@short    \namespace KStdAccel  Convenient methods for access to the common accelerator keys in  the key configuration.
-		@see KAccelShortcutList
+ please checkout the class TDEAccel in kaccel.h
+		@short    \namespace TDEStdAccel  Convenient methods for access to the common accelerator keys in  the key configuration.
+		@see TDEAccelShortcutList
 
 */
-public class KStdAccel {
+public class TDEStdAccel {
 	/**	
 		 Defines the identifier of all standard accelerators.
 		   		@short    Defines the identifier of all standard accelerators.
@@ -79,7 +79,7 @@ public class KStdAccel {
 			@param id the id of the accelerator
 		   		@short    Returns the keybinding for <code>accel.</code>
 	*/
-	public static native KShortcut shortcut(int id);
+	public static native TDEShortcut shortcut(int id);
 	/**	
 		 Returns a unique name for the given accel.
 			@param id the id of the accelerator
@@ -123,7 +123,7 @@ public class KStdAccel {
    
 		@short    Returns the hardcoded default shortcut for <code>id.</code>
 	*/
-	public static native KShortcut shortcutDefault(int id);
+	public static native TDEShortcut shortcutDefault(int id);
 	/**	
 		 Returns the hardcoded default 3 modifier shortcut for <code>id.</code>
 		 This does not take into account the user's configuration.
@@ -132,7 +132,7 @@ public class KStdAccel {
    
 		@short    Returns the hardcoded default 3 modifier shortcut for <code>id.</code>
 	*/
-	public static native KShortcut shortcutDefault3(int id);
+	public static native TDEShortcut shortcutDefault3(int id);
 	/**	
 		 Returns the hardcoded default 4 modifier shortcut for <code>id.</code>
 		 This does not take into account the user's configuration.
@@ -141,245 +141,245 @@ public class KStdAccel {
    
 		@short    Returns the hardcoded default 4 modifier shortcut for <code>id.</code>
 	*/
-	public static native KShortcut shortcutDefault4(int id);
+	public static native TDEShortcut shortcutDefault4(int id);
 	/**	
 		 Open file. Default: Ctrl-o
 				@return the shortcut of the standard accelerator
    
 		@short    Open file.
 	*/
-	public static native KShortcut open();
+	public static native TDEShortcut open();
 	/**	
 		 Create a new document (or whatever). Default: Ctrl-n
 				@return the shortcut of the standard accelerator
    
 		@short    Create a new document (or whatever).
 	*/
-	public static native KShortcut openNew();
+	public static native TDEShortcut openNew();
 	/**	
 		 Close current document. Default: Ctrl-w
 				@return the shortcut of the standard accelerator
    
 		@short    Close current document.
 	*/
-	public static native KShortcut close();
+	public static native TDEShortcut close();
 	/**	
 		 Save current document. Default: Ctrl-s
 				@return the shortcut of the standard accelerator
    
 		@short    Save current document.
 	*/
-	public static native KShortcut save();
+	public static native TDEShortcut save();
 	/**	
 		 Print current document. Default: Ctrl-p
 				@return the shortcut of the standard accelerator
    
 		@short    Print current document.
 	*/
-	public static native KShortcut print();
+	public static native TDEShortcut print();
 	/**	
 		 Quit the program. Default: Ctrl-q
 				@return the shortcut of the standard accelerator
    
 		@short    Quit the program.
 	*/
-	public static native KShortcut quit();
+	public static native TDEShortcut quit();
 	/**	
 		 Undo last operation. Default: Ctrl-z
 				@return the shortcut of the standard accelerator
    
 		@short    Undo last operation.
 	*/
-	public static native KShortcut undo();
+	public static native TDEShortcut undo();
 	/**	
 		 Redo. Default: Shift-Ctrl-z
 				@return the shortcut of the standard accelerator
    
 		@short    Redo.
 	*/
-	public static native KShortcut redo();
+	public static native TDEShortcut redo();
 	/**	
 		 Cut selected area and store it in the clipboard. Default: Ctrl-x
 				@return the shortcut of the standard accelerator
    
 		@short    Cut selected area and store it in the clipboard.
 	*/
-	public static native KShortcut cut();
+	public static native TDEShortcut cut();
 	/**	
 		 Copy selected area into the clipboard. Default: Ctrl-c
 				@return the shortcut of the standard accelerator
    
 		@short    Copy selected area into the clipboard.
 	*/
-	public static native KShortcut copy();
+	public static native TDEShortcut copy();
 	/**	
 		 Paste contents of clipboard at mouse/cursor position. Default: Ctrl-v
 				@return the shortcut of the standard accelerator
    
 		@short    Paste contents of clipboard at mouse/cursor position.
 	*/
-	public static native KShortcut paste();
+	public static native TDEShortcut paste();
 	/**	
 		 Paste the selection at mouse/cursor position. Default: Ctrl-Shift-Insert
 				@return the shortcut of the standard accelerator
 
 		@short    Paste the selection at mouse/cursor position.
 	*/
-	public static native KShortcut pasteSelection();
+	public static native TDEShortcut pasteSelection();
 	/**	
 		 Reload. Default: Ctrl-A
 				@return the shortcut of the standard accelerator
 
 		@short    Reload.
 	*/
-	public static native KShortcut selectAll();
+	public static native TDEShortcut selectAll();
 	/**	
 		 Delete a word back from mouse/cursor position. Default: Ctrl-Backspace
 				@return the shortcut of the standard accelerator
    
 		@short    Delete a word back from mouse/cursor position.
 	*/
-	public static native KShortcut deleteWordBack();
+	public static native TDEShortcut deleteWordBack();
 	/**	
 		 Delete a word forward from mouse/cursor position. Default: Ctrl-Delete
 				@return the shortcut of the standard accelerator
    
 		@short    Delete a word forward from mouse/cursor position.
 	*/
-	public static native KShortcut deleteWordForward();
+	public static native TDEShortcut deleteWordForward();
 	/**	
 		 Find, search. Default: Ctrl-f
 				@return the shortcut of the standard accelerator
    
 		@short    Find, search.
 	*/
-	public static native KShortcut find();
+	public static native TDEShortcut find();
 	/**	
 		 Find/search next. Default: F3
 				@return the shortcut of the standard accelerator
    
 		@short    Find/search next.
 	*/
-	public static native KShortcut findNext();
+	public static native TDEShortcut findNext();
 	/**	
 		 Find/search previous. Default: Shift-F3
 				@return the shortcut of the standard accelerator
    
 		@short    Find/search previous.
 	*/
-	public static native KShortcut findPrev();
+	public static native TDEShortcut findPrev();
 	/**	
 		 Find and replace matches. Default: Ctrl-r
 				@return the shortcut of the standard accelerator
    
 		@short    Find and replace matches.
 	*/
-	public static native KShortcut replace();
+	public static native TDEShortcut replace();
 	/**	
 		 Zoom in. Default: Ctrl-Plus
 				@return the shortcut of the standard accelerator
    
 		@short    Zoom in.
 	*/
-	public static native KShortcut zoomIn();
+	public static native TDEShortcut zoomIn();
 	/**	
 		 Zoom out. Default: Ctrl-Minus
 				@return the shortcut of the standard accelerator
    
 		@short    Zoom out.
 	*/
-	public static native KShortcut zoomOut();
+	public static native TDEShortcut zoomOut();
 	/**	
 		 Goto beginning of the document. Default: Ctrl-Home
 				@return the shortcut of the standard accelerator
    
 		@short    Goto beginning of the document.
 	*/
-	public static native KShortcut home();
+	public static native TDEShortcut home();
 	/**	
 		 Goto end of the document. Default: Ctrl-End
 				@return the shortcut of the standard accelerator
    
 		@short    Goto end of the document.
 	*/
-	public static native KShortcut end();
+	public static native TDEShortcut end();
 	/**	
 		 Goto beginning of current line. Default: Home
 				@return the shortcut of the standard accelerator
 
 		@short    Goto beginning of current line.
 	*/
-	public static native KShortcut beginningOfLine();
+	public static native TDEShortcut beginningOfLine();
 	/**	
 		 Goto end of current line. Default: End
 				@return the shortcut of the standard accelerator
 
 		@short    Goto end of current line.
 	*/
-	public static native KShortcut endOfLine();
+	public static native TDEShortcut endOfLine();
 	/**	
 		 Scroll up one page. Default: Prior
 				@return the shortcut of the standard accelerator
    
 		@short    Scroll up one page.
 	*/
-	public static native KShortcut prior();
+	public static native TDEShortcut prior();
 	/**	
 		 Scroll down one page. Default: Next
 				@return the shortcut of the standard accelerator
    
 		@short    Scroll down one page.
 	*/
-	public static native KShortcut next();
+	public static native TDEShortcut next();
 	/**	
 		 Go to line. Default: Ctrl+G
 				@return the shortcut of the standard accelerator
    
 		@short    Go to line.
 	*/
-	public static native KShortcut gotoLine();
+	public static native TDEShortcut gotoLine();
 	/**	
 		 Add current page to bookmarks. Default: Ctrl+B
 				@return the shortcut of the standard accelerator
    
 		@short    Add current page to bookmarks.
 	*/
-	public static native KShortcut addBookmark();
+	public static native TDEShortcut addBookmark();
 	/**	
 		 Next Tab. Default: Ctrl-<
 				@return the shortcut of the standard accelerator
 
 		@short    Next Tab.
 	*/
-	public static native KShortcut tabNext();
+	public static native TDEShortcut tabNext();
 	/**	
 		 Previous Tab. Default: Ctrl.
 				@return the shortcut of the standard accelerator
 
 		@short    Previous Tab.
 	*/
-	public static native KShortcut tabPrev();
+	public static native TDEShortcut tabPrev();
 	/**	
 		 Full Screen Mode. Default: Ctrl+Shift+F
 				@return the shortcut of the standard accelerator
 
 		@short    Full Screen Mode.
 	*/
-	public static native KShortcut fullScreen();
+	public static native TDEShortcut fullScreen();
 	/**	
 		 Help the user in the current situation. Default: F1
 				@return the shortcut of the standard accelerator
    
 		@short    Help the user in the current situation.
 	*/
-	public static native KShortcut help();
+	public static native TDEShortcut help();
 	/**	
 		 Complete text in input widgets. Default Ctrl+E
 				@return the shortcut of the standard accelerator
 
 		@short    Complete text in input widgets.
 	*/
-	public static native KShortcut completion();
+	public static native TDEShortcut completion();
 	/**	
 		 Iterate through a list when completion returns
 		 multiple items. Default: Ctrl+Up
@@ -387,7 +387,7 @@ public class KStdAccel {
    
 		@short    Iterate through a list when completion returns  multiple items.
 	*/
-	public static native KShortcut prevCompletion();
+	public static native TDEShortcut prevCompletion();
 	/**	
 		 Iterate through a list when completion returns
 		 multiple items. Default: Ctrl+Down
@@ -395,7 +395,7 @@ public class KStdAccel {
    
 		@short    Iterate through a list when completion returns  multiple items.
 	*/
-	public static native KShortcut nextCompletion();
+	public static native TDEShortcut nextCompletion();
 	/**	
 		 Find a string within another string or list of strings.
 		 Default: Ctrl-T
@@ -403,82 +403,82 @@ public class KStdAccel {
    
 		@short    Find a string within another string or list of strings.
 	*/
-	public static native KShortcut substringCompletion();
+	public static native TDEShortcut substringCompletion();
 	/**	
 		 Help users iterate through a list of entries. Default: Up
 				@return the shortcut of the standard accelerator
    
 		@short    Help users iterate through a list of entries.
 	*/
-	public static native KShortcut rotateUp();
+	public static native TDEShortcut rotateUp();
 	/**	
 		 Help users iterate through a list of entries. Default: Down
 				@return the shortcut of the standard accelerator
    
 		@short    Help users iterate through a list of entries.
 	*/
-	public static native KShortcut rotateDown();
+	public static native TDEShortcut rotateDown();
 	/**	
 		 popup a context menu. Default: Menu
 				@return the shortcut of the standard accelerator
    
 		@short    popup a context menu.
 	*/
-	public static native KShortcut popupMenuContext();
+	public static native TDEShortcut popupMenuContext();
 	/**	
 		 What's This button. Default: Shift+F1
 				@return the shortcut of the standard accelerator
    
 		@short    What's This button.
 	*/
-	public static native KShortcut whatsThis();
+	public static native TDEShortcut whatsThis();
 	/**	
 		 Reload. Default: F5
 				@return the shortcut of the standard accelerator
    
 		@short    Reload.
 	*/
-	public static native KShortcut reload();
+	public static native TDEShortcut reload();
 	/**	
 		 Up. Default: Alt+Up
 				@return the shortcut of the standard accelerator
    
 		@short    Up.
 	*/
-	public static native KShortcut up();
+	public static native TDEShortcut up();
 	/**	
 		 Back. Default: Alt+Left
 				@return the shortcut of the standard accelerator
    
 		@short    Back.
 	*/
-	public static native KShortcut back();
+	public static native TDEShortcut back();
 	/**	
 		 Forward. Default: ALT+Right
 				@return the shortcut of the standard accelerator
    
 		@short    Forward.
 	*/
-	public static native KShortcut forward();
+	public static native TDEShortcut forward();
 	/**	
 		 BackwardWord. Default: Ctrl+Left
 				@return the shortcut of the standard accelerator
 
 		@short    BackwardWord.
 	*/
-	public static native KShortcut backwardWord();
+	public static native TDEShortcut backwardWord();
 	/**	
 		 ForwardWord. Default: Ctrl+Right
 				@return the shortcut of the standard accelerator
 
 		@short    ForwardWord.
 	*/
-	public static native KShortcut forwardWord();
+	public static native TDEShortcut forwardWord();
 	/**	
 		 Show Menu Bar.  Default: Ctrl-M
 				@return the shortcut of the standard accelerator
    
 		@short    Show Menu Bar.
 	*/
-	public static native KShortcut showMenubar();
+	public static native TDEShortcut showMenubar();
 }
diff --git a/kdejava/koala/org/kde/koala/KToggleAction.java b/kdejava/koala/org/kde/koala/TDEToggleAction.java
index d09d7bdc..6d08efea 100644
--- a/kdejava/koala/org/kde/koala/KToggleAction.java
+++ b/kdejava/koala/org/kde/koala/TDEToggleAction.java
@@ -12,12 +12,12 @@ import org.kde.qt.TQWidget;
 
   Checkbox like action.
   This action provides two states: checked or not.
-  See {@link KToggleActionSignals} for signals emitted by KToggleAction
+  See {@link TDEToggleActionSignals} for signals emitted by TDEToggleAction
 		@short Checkbox like action.
 
 */
-public class KToggleAction extends KAction  {
-	protected KToggleAction(Class dummy){super((Class) null);}
+public class TDEToggleAction extends TDEAction  {
+	protected TDEToggleAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -30,26 +30,26 @@ public class KToggleAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short    Constructs a toggle action with text and potential keyboard  accelerator but nothing else.
 	*/
-	public KToggleAction(String text, KShortcut cut, TQObject parent, String name) {
+	public TDEToggleAction(String text, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKToggleAction(text,cut,parent,name);
+		newTDEToggleAction(text,cut,parent,name);
 	}
-	private native void newKToggleAction(String text, KShortcut cut, TQObject parent, String name);
-	public KToggleAction(String text, KShortcut cut, TQObject parent) {
+	private native void newTDEToggleAction(String text, TDEShortcut cut, TQObject parent, String name);
+	public TDEToggleAction(String text, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKToggleAction(text,cut,parent);
+		newTDEToggleAction(text,cut,parent);
 	}
-	private native void newKToggleAction(String text, KShortcut cut, TQObject parent);
-	public KToggleAction(String text, KShortcut cut) {
+	private native void newTDEToggleAction(String text, TDEShortcut cut, TQObject parent);
+	public TDEToggleAction(String text, TDEShortcut cut) {
 		super((Class) null);
-		newKToggleAction(text,cut);
+		newTDEToggleAction(text,cut);
 	}
-	private native void newKToggleAction(String text, KShortcut cut);
-	public KToggleAction(String text) {
+	private native void newTDEToggleAction(String text, TDEShortcut cut);
+	public TDEToggleAction(String text) {
 		super((Class) null);
-		newKToggleAction(text);
+		newTDEToggleAction(text);
 	}
-	private native void newKToggleAction(String text);
+	private native void newTDEToggleAction(String text);
 	/**	
 			@param text The text that will be displayed.
 			@param cut The corresponding keyboard accelerator (shortcut).
@@ -59,16 +59,16 @@ public class KToggleAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KToggleAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDEToggleAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKToggleAction(text,cut,receiver,slot,parent,name);
+		newTDEToggleAction(text,cut,receiver,slot,parent,name);
 	}
-	private native void newKToggleAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KToggleAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDEToggleAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEToggleAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKToggleAction(text,cut,receiver,slot,parent);
+		newTDEToggleAction(text,cut,receiver,slot,parent);
 	}
-	private native void newKToggleAction(String text, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDEToggleAction(String text, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The icons that go with this action.
@@ -77,26 +77,26 @@ public class KToggleAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name) {
+	public TDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,parent,name);
+		newTDEToggleAction(text,pix,cut,parent,name);
 	}
-	private native void newKToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject parent, String name);
-	public KToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject parent) {
+	private native void newTDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,parent);
+		newTDEToggleAction(text,pix,cut,parent);
 	}
-	private native void newKToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject parent);
-	public KToggleAction(String text, TQIconSet pix, KShortcut cut) {
+	private native void newTDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject parent);
+	public TDEToggleAction(String text, TQIconSet pix, TDEShortcut cut) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut);
+		newTDEToggleAction(text,pix,cut);
 	}
-	private native void newKToggleAction(String text, TQIconSet pix, KShortcut cut);
-	public KToggleAction(String text, TQIconSet pix) {
+	private native void newTDEToggleAction(String text, TQIconSet pix, TDEShortcut cut);
+	public TDEToggleAction(String text, TQIconSet pix) {
 		super((Class) null);
-		newKToggleAction(text,pix);
+		newTDEToggleAction(text,pix);
 	}
-	private native void newKToggleAction(String text, TQIconSet pix);
+	private native void newTDEToggleAction(String text, TQIconSet pix);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The dynamically loaded icon that goes with this action.
@@ -105,26 +105,26 @@ public class KToggleAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KToggleAction(String text, String pix, KShortcut cut, TQObject parent, String name) {
+	public TDEToggleAction(String text, String pix, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,parent,name);
+		newTDEToggleAction(text,pix,cut,parent,name);
 	}
-	private native void newKToggleAction(String text, String pix, KShortcut cut, TQObject parent, String name);
-	public KToggleAction(String text, String pix, KShortcut cut, TQObject parent) {
+	private native void newTDEToggleAction(String text, String pix, TDEShortcut cut, TQObject parent, String name);
+	public TDEToggleAction(String text, String pix, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,parent);
+		newTDEToggleAction(text,pix,cut,parent);
 	}
-	private native void newKToggleAction(String text, String pix, KShortcut cut, TQObject parent);
-	public KToggleAction(String text, String pix, KShortcut cut) {
+	private native void newTDEToggleAction(String text, String pix, TDEShortcut cut, TQObject parent);
+	public TDEToggleAction(String text, String pix, TDEShortcut cut) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut);
+		newTDEToggleAction(text,pix,cut);
 	}
-	private native void newKToggleAction(String text, String pix, KShortcut cut);
-	public KToggleAction(String text, String pix) {
+	private native void newTDEToggleAction(String text, String pix, TDEShortcut cut);
+	public TDEToggleAction(String text, String pix) {
 		super((Class) null);
-		newKToggleAction(text,pix);
+		newTDEToggleAction(text,pix);
 	}
-	private native void newKToggleAction(String text, String pix);
+	private native void newTDEToggleAction(String text, String pix);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The icons that go with this action.
@@ -135,16 +135,16 @@ public class KToggleAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,receiver,slot,parent,name);
+		newTDEToggleAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,receiver,slot,parent);
+		newTDEToggleAction(text,pix,cut,receiver,slot,parent);
 	}
-	private native void newKToggleAction(String text, TQIconSet pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDEToggleAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param text The text that will be displayed.
 			@param pix The dynamically loaded icon that goes with this action.
@@ -155,42 +155,42 @@ public class KToggleAction extends KAction  {
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KToggleAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDEToggleAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,receiver,slot,parent,name);
+		newTDEToggleAction(text,pix,cut,receiver,slot,parent,name);
 	}
-	private native void newKToggleAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KToggleAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDEToggleAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEToggleAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKToggleAction(text,pix,cut,receiver,slot,parent);
+		newTDEToggleAction(text,pix,cut,receiver,slot,parent);
 	}
-	private native void newKToggleAction(String text, String pix, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDEToggleAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
 			@param parent This action's parent.
 			@param name An internal name for this action.
 		     		@short
 	*/
-	public KToggleAction(TQObject parent, String name) {
+	public TDEToggleAction(TQObject parent, String name) {
 		super((Class) null);
-		newKToggleAction(parent,name);
+		newTDEToggleAction(parent,name);
 	}
-	private native void newKToggleAction(TQObject parent, String name);
-	public KToggleAction(TQObject parent) {
+	private native void newTDEToggleAction(TQObject parent, String name);
+	public TDEToggleAction(TQObject parent) {
 		super((Class) null);
-		newKToggleAction(parent);
+		newTDEToggleAction(parent);
 	}
-	private native void newKToggleAction(TQObject parent);
-	public KToggleAction() {
+	private native void newTDEToggleAction(TQObject parent);
+	public TDEToggleAction() {
 		super((Class) null);
-		newKToggleAction();
+		newTDEToggleAction();
 	}
-	private native void newKToggleAction();
+	private native void newTDEToggleAction();
 	/**	
 		  "Plug" or insert this action into a given widget.
 			  This will typically be a menu or a toolbar.  From this point
 		  on, you will never need to directly manipulate the item in the
 		  menu or toolbar.  You do all enabling/disabling/manipulation
-		  directly with your KToggleAction object.
+		  directly with your TDEToggleAction object.
 			@param widget The GUI element to display this action.
 			@param index The index of the item.
 		     		@short     "Plug" or insert this action into a given widget.
diff --git a/kdejava/koala/org/kde/koala/KToggleActionSignals.java b/kdejava/koala/org/kde/koala/TDEToggleActionSignals.java
index 1b9b2ca9..51ec9c20 100644
--- a/kdejava/koala/org/kde/koala/KToggleActionSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEToggleActionSignals.java
@@ -7,6 +7,6 @@ import org.kde.qt.TQObject;
 import org.kde.qt.TQIconSet;
 import org.kde.qt.TQWidget;
 
-public interface KToggleActionSignals {
+public interface TDEToggleActionSignals {
 	void toggled(boolean arg1);
 }
diff --git a/kdejava/koala/org/kde/koala/KToggleFullScreenAction.java b/kdejava/koala/org/kde/koala/TDEToggleFullScreenAction.java
index 968d6468..5a07bd11 100644
--- a/kdejava/koala/org/kde/koala/KToggleFullScreenAction.java
+++ b/kdejava/koala/org/kde/koala/TDEToggleFullScreenAction.java
@@ -22,25 +22,25 @@ import org.kde.qt.TQWidget;
 		@short    An action for switching between to/from full screen mode.
 
 */
-public class KToggleFullScreenAction extends KToggleAction  {
-	protected KToggleFullScreenAction(Class dummy){super((Class) null);}
+public class TDEToggleFullScreenAction extends TDEToggleAction  {
+	protected TDEToggleFullScreenAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Create a KToggleFullScreenAction
+		 Create a TDEToggleFullScreenAction
 			@param cut The corresponding keyboard accelerator (shortcut).
 			@param receiver The SLOT's parent.
 			@param slot The SLOT to invoke to execute this action.
 			@param parent This action's parent.
 			@param window the window that will switch to/from full screen mode
 			@param name An internal name for this action.
-		     		@short    Create a KToggleFullScreenAction
+		     		@short    Create a TDEToggleFullScreenAction
 	*/
-	public KToggleFullScreenAction(KShortcut cut, TQObject receiver, String slot, TQObject parent, TQWidget window, String name) {
+	public TDEToggleFullScreenAction(TDEShortcut cut, TQObject receiver, String slot, TQObject parent, TQWidget window, String name) {
 		super((Class) null);
-		newKToggleFullScreenAction(cut,receiver,slot,parent,window,name);
+		newTDEToggleFullScreenAction(cut,receiver,slot,parent,window,name);
 	}
-	private native void newKToggleFullScreenAction(KShortcut cut, TQObject receiver, String slot, TQObject parent, TQWidget window, String name);
+	private native void newTDEToggleFullScreenAction(TDEShortcut cut, TQObject receiver, String slot, TQObject parent, TQWidget window, String name);
 	/**	
 		 Sets the window that will be related to this action.
 		     		@short    Sets the window that will be related to this action.
diff --git a/kdejava/koala/org/kde/koala/KToggleToolBarAction.java b/kdejava/koala/org/kde/koala/TDEToggleToolBarAction.java
index 188eabaa..bea7226c 100644
--- a/kdejava/koala/org/kde/koala/KToggleToolBarAction.java
+++ b/kdejava/koala/org/kde/koala/TDEToggleToolBarAction.java
@@ -20,30 +20,30 @@ import org.kde.qt.TQWidget;
 		@short    An action that takes care of everything associated with  showing or hiding a toolbar by a menu action.
 
 */
-public class KToggleToolBarAction extends KToggleAction  {
-	protected KToggleToolBarAction(Class dummy){super((Class) null);}
+public class TDEToggleToolBarAction extends TDEToggleAction  {
+	protected TDEToggleToolBarAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Create a KToggleToolbarAction that manages the toolbar
+		 Create a TDEToggleToolbarAction that manages the toolbar
 		 named toolBarName. This can be either the name of a
 		 toolbar in an xml ui file, or a toolbar programmatically
 		 created with that name.
-		     		@short    Create a KToggleToolbarAction that manages the toolbar  named toolBarName.
+		     		@short    Create a TDEToggleToolbarAction that manages the toolbar  named toolBarName.
 	*/
-	public KToggleToolBarAction(String toolBarName, String text, KActionCollection parent, String name) {
+	public TDEToggleToolBarAction(String toolBarName, String text, TDEActionCollection parent, String name) {
 		super((Class) null);
-		newKToggleToolBarAction(toolBarName,text,parent,name);
+		newTDEToggleToolBarAction(toolBarName,text,parent,name);
 	}
-	private native void newKToggleToolBarAction(String toolBarName, String text, KActionCollection parent, String name);
-	public KToggleToolBarAction(KToolBar toolBar, String text, KActionCollection parent, String name) {
+	private native void newTDEToggleToolBarAction(String toolBarName, String text, TDEActionCollection parent, String name);
+	public TDEToggleToolBarAction(TDEToolBar toolBar, String text, TDEActionCollection parent, String name) {
 		super((Class) null);
-		newKToggleToolBarAction(toolBar,text,parent,name);
+		newTDEToggleToolBarAction(toolBar,text,parent,name);
 	}
-	private native void newKToggleToolBarAction(KToolBar toolBar, String text, KActionCollection parent, String name);
+	private native void newTDEToggleToolBarAction(TDEToolBar toolBar, String text, TDEActionCollection parent, String name);
 	public native int plug(TQWidget widget, int index);
 	public native int plug(TQWidget widget);
-	public native KToolBar toolBar();
+	public native TDEToolBar toolBar();
 	public native void setChecked(boolean arg1);
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
diff --git a/kdejava/koala/org/kde/koala/KToolBar.java b/kdejava/koala/org/kde/koala/TDEToolBar.java
index 4aad7ca4..87f87b45 100644
--- a/kdejava/koala/org/kde/koala/KToolBar.java
+++ b/kdejava/koala/org/kde/koala/TDEToolBar.java
@@ -23,26 +23,26 @@ import org.kde.qt.TQToolBar;
 /**
 
  A KDE-style toolbar.
- KToolBar can be dragged around in and between different docks.
- A KToolBar can contain all sorts of widgets.
- KToolBar can be used as a standalone widget, but KMainWindow
+ TDEToolBar can be dragged around in and between different docks.
+ A TDEToolBar can contain all sorts of widgets.
+ TDEToolBar can be used as a standalone widget, but TDEMainWindow
  provides easy factories and management of one or more toolbars.
- Once you have a KToolBar object, you can insert items into it with the
+ Once you have a TDEToolBar object, you can insert items into it with the
  insert... methods, or remove them with the removeItem() method. This
  can be done at any time; the toolbar will be automatically updated.
  There are also many methods to set per-child properties like alignment
  and toggle behavior.
- KToolBar uses a global config group to load toolbar settings on
+ TDEToolBar uses a global config group to load toolbar settings on
  construction. It will reread this config group on a
  TDEApplication.appearanceChanged() signal.
- See {@link KToolBarSignals} for signals emitted by KToolBar
+ See {@link TDEToolBarSignals} for signals emitted by TDEToolBar
 		@author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>.
   
 		@short Floatable toolbar with auto resize.
 
 */
-public class KToolBar extends TQToolBar  {
-	protected KToolBar(Class dummy){super((Class) null);}
+public class TDEToolBar extends TQToolBar  {
+	protected TDEToolBar(Class dummy){super((Class) null);}
 	public static final int IconOnly = 0;
 	public static final int IconTextRight = 1;
 	public static final int TextOnly = 2;
@@ -72,32 +72,32 @@ public class KToolBar extends TQToolBar  {
 		 the settings will be honored only if <code>honorStyle</code> is set to
 		 true.  All other toolbars will be IconOnly and use Medium icons.
 			@param parent The standard toolbar parent (usually a
-		 KMainWindow)
+		 TDEMainWindow)
 			@param name The standard internal name
 			@param honorStyle If true, then global settings for IconSize and IconText will be honored
 			@param readConfig whether to apply the configuration (global and application-specific)
 		   		@short    Normal constructor.
 	*/
-	public KToolBar(TQWidget parent, String name, boolean honorStyle, boolean readConfig) {
+	public TDEToolBar(TQWidget parent, String name, boolean honorStyle, boolean readConfig) {
 		super((Class) null);
-		newKToolBar(parent,name,honorStyle,readConfig);
+		newTDEToolBar(parent,name,honorStyle,readConfig);
 	}
-	private native void newKToolBar(TQWidget parent, String name, boolean honorStyle, boolean readConfig);
-	public KToolBar(TQWidget parent, String name, boolean honorStyle) {
+	private native void newTDEToolBar(TQWidget parent, String name, boolean honorStyle, boolean readConfig);
+	public TDEToolBar(TQWidget parent, String name, boolean honorStyle) {
 		super((Class) null);
-		newKToolBar(parent,name,honorStyle);
+		newTDEToolBar(parent,name,honorStyle);
 	}
-	private native void newKToolBar(TQWidget parent, String name, boolean honorStyle);
-	public KToolBar(TQWidget parent, String name) {
+	private native void newTDEToolBar(TQWidget parent, String name, boolean honorStyle);
+	public TDEToolBar(TQWidget parent, String name) {
 		super((Class) null);
-		newKToolBar(parent,name);
+		newTDEToolBar(parent,name);
 	}
-	private native void newKToolBar(TQWidget parent, String name);
-	public KToolBar(TQWidget parent) {
+	private native void newTDEToolBar(TQWidget parent, String name);
+	public TDEToolBar(TQWidget parent) {
 		super((Class) null);
-		newKToolBar(parent);
+		newTDEToolBar(parent);
 	}
-	private native void newKToolBar(TQWidget parent);
+	private native void newTDEToolBar(TQWidget parent);
 	/**	
 		 Constructor for non-XML-GUI applications.
 			 The toolbar will read in various global config settings for
@@ -112,31 +112,31 @@ public class KToolBar extends TQToolBar  {
 			@param readConfig whether to apply the configuration (global and application-specific)
 		   		@short    Constructor for non-XML-GUI applications.
 	*/
-	public KToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle, boolean readConfig) {
+	public TDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle, boolean readConfig) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine,name,honorStyle,readConfig);
+		newTDEToolBar(parentWindow,dock,newLine,name,honorStyle,readConfig);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle, boolean readConfig);
-	public KToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle, boolean readConfig);
+	public TDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine,name,honorStyle);
+		newTDEToolBar(parentWindow,dock,newLine,name,honorStyle);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle);
-	public KToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name, boolean honorStyle);
+	public TDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine,name);
+		newTDEToolBar(parentWindow,dock,newLine,name);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name);
-	public KToolBar(TQMainWindow parentWindow, int dock, boolean newLine) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine, String name);
+	public TDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine);
+		newTDEToolBar(parentWindow,dock,newLine);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, int dock, boolean newLine);
-	public KToolBar(TQMainWindow parentWindow, int dock) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, int dock, boolean newLine);
+	public TDEToolBar(TQMainWindow parentWindow, int dock) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock);
+		newTDEToolBar(parentWindow,dock);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, int dock);
+	private native void newTDEToolBar(TQMainWindow parentWindow, int dock);
 	/**	
 		 Constructor for non-XML-GUI applications.
 			 The toolbar will read in various global config settings for
@@ -151,36 +151,36 @@ public class KToolBar extends TQToolBar  {
 			@param readConfig whether to apply the configuration (global and application-specific)
 		   		@short    Constructor for non-XML-GUI applications.
 	*/
-	public KToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle, boolean readConfig) {
+	public TDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle, boolean readConfig) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine,name,honorStyle,readConfig);
+		newTDEToolBar(parentWindow,dock,newLine,name,honorStyle,readConfig);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle, boolean readConfig);
-	public KToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle, boolean readConfig);
+	public TDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine,name,honorStyle);
+		newTDEToolBar(parentWindow,dock,newLine,name,honorStyle);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle);
-	public KToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name, boolean honorStyle);
+	public TDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine,name);
+		newTDEToolBar(parentWindow,dock,newLine,name);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name);
-	public KToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine, String name);
+	public TDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock,newLine);
+		newTDEToolBar(parentWindow,dock,newLine);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine);
-	public KToolBar(TQMainWindow parentWindow, TQWidget dock) {
+	private native void newTDEToolBar(TQMainWindow parentWindow, TQWidget dock, boolean newLine);
+	public TDEToolBar(TQMainWindow parentWindow, TQWidget dock) {
 		super((Class) null);
-		newKToolBar(parentWindow,dock);
+		newTDEToolBar(parentWindow,dock);
 	}
-	private native void newKToolBar(TQMainWindow parentWindow, TQWidget dock);
+	private native void newTDEToolBar(TQMainWindow parentWindow, TQWidget dock);
 	/**	
-		 Insert a button (a KToolBarButton) with a pixmap.  The
+		 Insert a button (a TDEToolBarButton) with a pixmap.  The
 		 pixmap is loaded by the button itself based on the global icon
 		 settings.
-			 You should connect to one or more signals in KToolBar:
+			 You should connect to one or more signals in TDEToolBar:
 		 clicked() , pressed() , released() , or
 		 highlighted()  and if the button is a toggle button
 		 ( setToggle() ) toggled() .  Those signals have <code>id</code>
@@ -194,7 +194,7 @@ public class KToolBar extends TQToolBar  {
 			@param _instance instance this button will belong to
 				@return The item index.
    
-		@short    Insert a button (a KToolBarButton) with a pixmap.
+		@short    Insert a button (a TDEToolBarButton) with a pixmap.
 	*/
 	public native int insertButton(String icon, int id, boolean enabled, String text, int index, TDEInstanceInterface _instance);
 	public native int insertButton(String icon, int id, boolean enabled, String text, int index);
@@ -224,13 +224,13 @@ public class KToolBar extends TQToolBar  {
 	public native int insertButton(String icon, int id, String signal, TQObject receiver, String slot, boolean enabled);
 	public native int insertButton(String icon, int id, String signal, TQObject receiver, String slot);
 	/**	
-		 Inserts a button (a KToolBarButton) with the specified
+		 Inserts a button (a TDEToolBarButton) with the specified
 		 pixmap.  This pixmap will be used as the "active" one and the
 		 disabled and default ones will be autogenerated.
 			 It is recommended that you use the insertButton function that
 		 allows you to specify the icon name rather then the pixmap
 		 itself.  Specifying the icon name is much more flexible.
-			 You should connect to one or more signals in KToolBar:
+			 You should connect to one or more signals in TDEToolBar:
 		 clicked() , pressed() , released() , or
 		 highlighted()  and if the button is a toggle button
 		 ( setToggle() ) toggled() .  Those signals have <code>id</code>
@@ -243,7 +243,7 @@ public class KToolBar extends TQToolBar  {
 			@param index The position of the button. (-1 = at end).
 				@return The item index.
    
-		@short    Inserts a button (a KToolBarButton) with the specified  pixmap.
+		@short    Inserts a button (a TDEToolBarButton) with the specified  pixmap.
 	*/
 	public native int insertButton(TQPixmap pixmap, int id, boolean enabled, String text, int index);
 	public native int insertButton(TQPixmap pixmap, int id, boolean enabled, String text);
@@ -581,31 +581,31 @@ public class KToolBar extends TQToolBar  {
 	*/
 	public native KComboBox getCombo(int id);
 	/**	
-		 Returns a pointer to KToolBarLined with <code>id.</code>
+		 Returns a pointer to TDEToolBarLined with <code>id.</code>
 			 Example:
 		 <pre>
-		 KLineEdit  lined = toolbar.getKToolBarLined(lined_id);
+		 KLineEdit  lined = toolbar.getTDEToolBarLined(lined_id);
 		 </pre>
 		 That way you can get access to other public methods
 		 that KLineEdit provides. KLineEdit is the same thing
 		 as TQLineEdit plus completion signals.
-		   		@return a pointer to KToolBarLined with <code>id.</code>
+		   		@return a pointer to TDEToolBarLined with <code>id.</code>
 
-		@short    Returns a pointer to KToolBarLined with <code>id.</code>
+		@short    Returns a pointer to TDEToolBarLined with <code>id.</code>
 	*/
 	public native KLineEdit getLined(int id);
 	/**	
-		 Returns a pointer to KToolBarButton.
+		 Returns a pointer to TDEToolBarButton.
 			 Example:
 		 <pre>
-		 KToolBarButton  button = toolbar.getButton(button_id);
+		 TDEToolBarButton  button = toolbar.getButton(button_id);
 		 </pre>
 		 That way you can get access to other public methods
-		 that KToolBarButton provides.
+		 that TDEToolBarButton provides.
 			  Using this method is not recommended.
-		   		@short    Returns a pointer to KToolBarButton.
+		   		@short    Returns a pointer to TDEToolBarButton.
 	*/
-	public native KToolBarButton getButton(int id);
+	public native TDEToolBarButton getButton(int id);
 	/**	
 		 Align item to the right.
 			 This works only if toolbar is set to full width.
diff --git a/kdejava/koala/org/kde/koala/KToolBarButton.java b/kdejava/koala/org/kde/koala/TDEToolBarButton.java
index 25bbd746..538619cc 100644
--- a/kdejava/koala/org/kde/koala/KToolBarButton.java
+++ b/kdejava/koala/org/kde/koala/TDEToolBarButton.java
@@ -18,14 +18,14 @@ import org.kde.qt.TQToolButton;
 
 /**
 
- A toolbar button. This is used internally by KToolBar, use the
- KToolBar methods instead.
-  See {@link KToolBarButtonSignals} for signals emitted by KToolBarButton
+ A toolbar button. This is used internally by TDEToolBar, use the
+ TDEToolBar methods instead.
+  See {@link TDEToolBarButtonSignals} for signals emitted by TDEToolBarButton
 		@short    A toolbar button.
 
 */
-public class KToolBarButton extends TQToolButton  {
-	protected KToolBarButton(Class dummy){super((Class) null);}
+public class TDEToolBarButton extends TQToolButton  {
+	protected TDEToolBarButton(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
@@ -40,26 +40,26 @@ public class KToolBarButton extends TQToolButton  {
 			@param _instance the instance to use for this button
 		   		@short    Construct a button with an icon loaded by the button itself.
 	*/
-	public KToolBarButton(String icon, int id, TQWidget parent, String name, String txt, TDEInstanceInterface _instance) {
+	public TDEToolBarButton(String icon, int id, TQWidget parent, String name, String txt, TDEInstanceInterface _instance) {
 		super((Class) null);
-		newKToolBarButton(icon,id,parent,name,txt,_instance);
+		newTDEToolBarButton(icon,id,parent,name,txt,_instance);
 	}
-	private native void newKToolBarButton(String icon, int id, TQWidget parent, String name, String txt, TDEInstanceInterface _instance);
-	public KToolBarButton(String icon, int id, TQWidget parent, String name, String txt) {
+	private native void newTDEToolBarButton(String icon, int id, TQWidget parent, String name, String txt, TDEInstanceInterface _instance);
+	public TDEToolBarButton(String icon, int id, TQWidget parent, String name, String txt) {
 		super((Class) null);
-		newKToolBarButton(icon,id,parent,name,txt);
+		newTDEToolBarButton(icon,id,parent,name,txt);
 	}
-	private native void newKToolBarButton(String icon, int id, TQWidget parent, String name, String txt);
-	public KToolBarButton(String icon, int id, TQWidget parent, String name) {
+	private native void newTDEToolBarButton(String icon, int id, TQWidget parent, String name, String txt);
+	public TDEToolBarButton(String icon, int id, TQWidget parent, String name) {
 		super((Class) null);
-		newKToolBarButton(icon,id,parent,name);
+		newTDEToolBarButton(icon,id,parent,name);
 	}
-	private native void newKToolBarButton(String icon, int id, TQWidget parent, String name);
-	public KToolBarButton(String icon, int id, TQWidget parent) {
+	private native void newTDEToolBarButton(String icon, int id, TQWidget parent, String name);
+	public TDEToolBarButton(String icon, int id, TQWidget parent) {
 		super((Class) null);
-		newKToolBarButton(icon,id,parent);
+		newTDEToolBarButton(icon,id,parent);
 	}
-	private native void newKToolBarButton(String icon, int id, TQWidget parent);
+	private native void newTDEToolBarButton(String icon, int id, TQWidget parent);
 	/**	
 		 Construct a button with an existing pixmap.  It is not
 		 recommended that you use this as the internal icon loading code
@@ -71,42 +71,42 @@ public class KToolBarButton extends TQToolButton  {
 			@param txt This button's text (in a tooltip or otherwise)
 		   		@short    Construct a button with an existing pixmap.
 	*/
-	public KToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name, String txt) {
+	public TDEToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name, String txt) {
 		super((Class) null);
-		newKToolBarButton(pixmap,id,parent,name,txt);
+		newTDEToolBarButton(pixmap,id,parent,name,txt);
 	}
-	private native void newKToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name, String txt);
-	public KToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name) {
+	private native void newTDEToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name, String txt);
+	public TDEToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name) {
 		super((Class) null);
-		newKToolBarButton(pixmap,id,parent,name);
+		newTDEToolBarButton(pixmap,id,parent,name);
 	}
-	private native void newKToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name);
-	public KToolBarButton(TQPixmap pixmap, int id, TQWidget parent) {
+	private native void newTDEToolBarButton(TQPixmap pixmap, int id, TQWidget parent, String name);
+	public TDEToolBarButton(TQPixmap pixmap, int id, TQWidget parent) {
 		super((Class) null);
-		newKToolBarButton(pixmap,id,parent);
+		newTDEToolBarButton(pixmap,id,parent);
 	}
-	private native void newKToolBarButton(TQPixmap pixmap, int id, TQWidget parent);
+	private native void newTDEToolBarButton(TQPixmap pixmap, int id, TQWidget parent);
 	/**	
 		 Construct a separator button
 			@param parent This button's parent
 			@param name This button's internal name
 		   		@short    Construct a separator button
 	*/
-	public KToolBarButton(TQWidget parent, String name) {
+	public TDEToolBarButton(TQWidget parent, String name) {
 		super((Class) null);
-		newKToolBarButton(parent,name);
+		newTDEToolBarButton(parent,name);
 	}
-	private native void newKToolBarButton(TQWidget parent, String name);
-	public KToolBarButton(TQWidget parent) {
+	private native void newTDEToolBarButton(TQWidget parent, String name);
+	public TDEToolBarButton(TQWidget parent) {
 		super((Class) null);
-		newKToolBarButton(parent);
+		newTDEToolBarButton(parent);
 	}
-	private native void newKToolBarButton(TQWidget parent);
-	public KToolBarButton() {
+	private native void newTDEToolBarButton(TQWidget parent);
+	public TDEToolBarButton() {
 		super((Class) null);
-		newKToolBarButton();
+		newTDEToolBarButton();
 	}
-	private native void newKToolBarButton();
+	private native void newTDEToolBarButton();
 	/**	
 		 Set the text for this button.  The text will be either used as a
 		 tooltip (IconOnly) or will be along side the icon
diff --git a/kdejava/koala/org/kde/koala/KToolBarButtonSignals.java b/kdejava/koala/org/kde/koala/TDEToolBarButtonSignals.java
index 6df48ea4..f393d1f1 100644
--- a/kdejava/koala/org/kde/koala/KToolBarButtonSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEToolBarButtonSignals.java
@@ -14,7 +14,7 @@ import org.kde.qt.TQIconSet;
 import org.kde.qt.TQWidget;
 import org.kde.qt.TQPalette;
 
-public interface KToolBarButtonSignals {
+public interface TDEToolBarButtonSignals {
 	/**	
 		 Emitted when the toolbar button is clicked (with LMB or MMB)
 		   		@short    Emitted when the toolbar button is clicked (with LMB or MMB)
diff --git a/kdejava/koala/org/kde/koala/KToolBarPopupAction.java b/kdejava/koala/org/kde/koala/TDEToolBarPopupAction.java
index 203285c0..fcbdbaea 100644
--- a/kdejava/koala/org/kde/koala/KToolBarPopupAction.java
+++ b/kdejava/koala/org/kde/koala/TDEToolBarPopupAction.java
@@ -17,42 +17,42 @@ import org.kde.qt.TQWidget;
  		@short    This action is a normal action everywhere, except in a toolbar  where it also has a popupmenu (optionnally delayed).
 
 */
-public class KToolBarPopupAction extends KAction  {
-	protected KToolBarPopupAction(Class dummy){super((Class) null);}
+public class TDEToolBarPopupAction extends TDEAction  {
+	protected TDEToolBarPopupAction(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Create a KToolBarPopupAction, with a text, an icon, an optional accelerator,
+		 Create a TDEToolBarPopupAction, with a text, an icon, an optional accelerator,
 		 parent and name.
 			@param text The text that will be displayed.
 			@param icon The icon to display.
 			@param cut The corresponding keyboard accelerator (shortcut).
 			@param parent This action's parent.
 			@param name An internal name for this action.
-		     		@short    Create a KToolBarPopupAction, with a text, an icon, an optional accelerator,  parent and name.
+		     		@short    Create a TDEToolBarPopupAction, with a text, an icon, an optional accelerator,  parent and name.
 	*/
-	public KToolBarPopupAction(String text, String icon, KShortcut cut, TQObject parent, String name) {
+	public TDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject parent, String name) {
 		super((Class) null);
-		newKToolBarPopupAction(text,icon,cut,parent,name);
+		newTDEToolBarPopupAction(text,icon,cut,parent,name);
 	}
-	private native void newKToolBarPopupAction(String text, String icon, KShortcut cut, TQObject parent, String name);
-	public KToolBarPopupAction(String text, String icon, KShortcut cut, TQObject parent) {
+	private native void newTDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject parent, String name);
+	public TDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject parent) {
 		super((Class) null);
-		newKToolBarPopupAction(text,icon,cut,parent);
+		newTDEToolBarPopupAction(text,icon,cut,parent);
 	}
-	private native void newKToolBarPopupAction(String text, String icon, KShortcut cut, TQObject parent);
-	public KToolBarPopupAction(String text, String icon, KShortcut cut) {
+	private native void newTDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject parent);
+	public TDEToolBarPopupAction(String text, String icon, TDEShortcut cut) {
 		super((Class) null);
-		newKToolBarPopupAction(text,icon,cut);
+		newTDEToolBarPopupAction(text,icon,cut);
 	}
-	private native void newKToolBarPopupAction(String text, String icon, KShortcut cut);
-	public KToolBarPopupAction(String text, String icon) {
+	private native void newTDEToolBarPopupAction(String text, String icon, TDEShortcut cut);
+	public TDEToolBarPopupAction(String text, String icon) {
 		super((Class) null);
-		newKToolBarPopupAction(text,icon);
+		newTDEToolBarPopupAction(text,icon);
 	}
-	private native void newKToolBarPopupAction(String text, String icon);
+	private native void newTDEToolBarPopupAction(String text, String icon);
 	/**	
-		 Create a KToolBarPopupAction, with a text, an icon, an accelerator,
+		 Create a TDEToolBarPopupAction, with a text, an icon, an accelerator,
 		 a slot connected to the action, parent and name.
 			 If you do not want or have a keyboard accelerator, set the
 		 <code>cut</code> param to 0.
@@ -63,20 +63,20 @@ public class KToolBarPopupAction extends KAction  {
 			@param slot The SLOT to invoke to execute this action.
 			@param parent This action's parent.
 			@param name An internal name for this action.
-		     		@short    Create a KToolBarPopupAction, with a text, an icon, an accelerator,  a slot connected to the action, parent and name.
+		     		@short    Create a TDEToolBarPopupAction, with a text, an icon, an accelerator,  a slot connected to the action, parent and name.
 	*/
-	public KToolBarPopupAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
+	public TDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name) {
 		super((Class) null);
-		newKToolBarPopupAction(text,icon,cut,receiver,slot,parent,name);
+		newTDEToolBarPopupAction(text,icon,cut,receiver,slot,parent,name);
 	}
-	private native void newKToolBarPopupAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
-	public KToolBarPopupAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent) {
+	private native void newTDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent, String name);
+	public TDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent) {
 		super((Class) null);
-		newKToolBarPopupAction(text,icon,cut,receiver,slot,parent);
+		newTDEToolBarPopupAction(text,icon,cut,receiver,slot,parent);
 	}
-	private native void newKToolBarPopupAction(String text, String icon, KShortcut cut, TQObject receiver, String slot, TQObject parent);
+	private native void newTDEToolBarPopupAction(String text, String icon, TDEShortcut cut, TQObject receiver, String slot, TQObject parent);
 	/**	
-		 Create a KToolBarPopupAction, with a KGuiItem, an accelerator,
+		 Create a TDEToolBarPopupAction, with a KGuiItem, an accelerator,
 		 a slot connected to the action, parent and name. The text and the
 		 icon are taken from the KGuiItem.
 			 If you do not want or have a keyboard accelerator, set the
@@ -87,13 +87,13 @@ public class KToolBarPopupAction extends KAction  {
 			@param slot The SLOT to invoke to execute this action.
 			@param parent This action's parent.
 			@param name An internal name for this action.
-		     		@short    Create a KToolBarPopupAction, with a KGuiItem, an accelerator,  a slot connected to the action, parent and name.
+		     		@short    Create a TDEToolBarPopupAction, with a KGuiItem, an accelerator,  a slot connected to the action, parent and name.
 	*/
-	public KToolBarPopupAction(KGuiItem item, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name) {
+	public TDEToolBarPopupAction(KGuiItem item, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) {
 		super((Class) null);
-		newKToolBarPopupAction(item,cut,receiver,slot,parent,name);
+		newTDEToolBarPopupAction(item,cut,receiver,slot,parent,name);
 	}
-	private native void newKToolBarPopupAction(KGuiItem item, KShortcut cut, TQObject receiver, String slot, KActionCollection parent, String name);
+	private native void newTDEToolBarPopupAction(KGuiItem item, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name);
 	public native int plug(TQWidget widget, int index);
 	public native int plug(TQWidget widget);
 	/**	
@@ -102,18 +102,18 @@ public class KToolBarPopupAction extends KAction  {
 		 aboutToShow for a more dynamic menu.
 		     		@short    The popup menu that is shown when clicking (some time) on the toolbar  button.
 	*/
-	public native KPopupMenu popupMenu();
+	public native TDEPopupMenu popupMenu();
 	/**	
 		 Returns true if this action creates a delayed popup menu
-		 when plugged in a KToolbar.
-		     		@short    Returns true if this action creates a delayed popup menu  when plugged in a KToolbar.
+		 when plugged in a TDEToolbar.
+		     		@short    Returns true if this action creates a delayed popup menu  when plugged in a TDEToolbar.
 	*/
 	public native boolean delayed();
 	/**	
 		 If set to true, this action will create a delayed popup menu
-		 when plugged in a KToolbar. Otherwise it creates a normal popup.
+		 when plugged in a TDEToolbar. Otherwise it creates a normal popup.
 		 Default: delayed.
-		     		@short    If set to true, this action will create a delayed popup menu  when plugged in a KToolbar.
+		     		@short    If set to true, this action will create a delayed popup menu  when plugged in a TDEToolbar.
 	*/
 	public native void setDelayed(boolean delayed);
 	/**	
@@ -124,13 +124,13 @@ public class KToolBarPopupAction extends KAction  {
 	public native boolean stickyMenu();
 	/**	
 		 If set to true, this action will create a sticky popup menu
-		 when plugged in a KToolbar.
+		 when plugged in a TDEToolbar.
 		 "Sticky", means it's visible until a selection is made or the mouse is
 		 clicked elsewhere. This feature allows you to make a selection without
 		 having to press and hold down the mouse while making a selection.
 		 Only available if delayed() is true.
 		 Default: sticky.
-		     		@short    If set to true, this action will create a sticky popup menu  when plugged in a KToolbar.
+		     		@short    If set to true, this action will create a sticky popup menu  when plugged in a TDEToolbar.
 	*/
 	public native void setStickyMenu(boolean sticky);
 	/** Deletes the wrapped C++ instance */
diff --git a/kdejava/koala/org/kde/koala/KToolBarRadioGroup.java b/kdejava/koala/org/kde/koala/TDEToolBarRadioGroup.java
index adf9576f..8a1f0492 100644
--- a/kdejava/koala/org/kde/koala/KToolBarRadioGroup.java
+++ b/kdejava/koala/org/kde/koala/TDEToolBarRadioGroup.java
@@ -8,9 +8,9 @@ import org.kde.qt.TQObject;
 
 /**
 
- KToolBarRadioGroup is class for group of radio butons in toolbar.
+ TDEToolBarRadioGroup is class for group of radio butons in toolbar.
  Take toggle buttons which you already inserted into toolbar,
- create KToolBarRadioGroup instance and add them here.
+ create TDEToolBarRadioGroup instance and add them here.
  All buttons will emit signals toggled (boolean) (or you can
  use sitgnal toggled (int id) from toolbar). When one button is set
  down, all others are unset. All buttons emit signals - those who
@@ -20,24 +20,24 @@ import org.kde.qt.TQObject;
 		@short Class for group of radio butons in toolbar.
 
 */
-public class KToolBarRadioGroup extends TQObject  {
-	protected KToolBarRadioGroup(Class dummy){super((Class) null);}
+public class TDEToolBarRadioGroup extends TQObject  {
+	protected TDEToolBarRadioGroup(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
 	/**	
-		 Constructor. Parent must be KToolBar .
+		 Constructor. Parent must be TDEToolBar .
 		   		@short    Constructor.
 	*/
-	public KToolBarRadioGroup(KToolBar _parent, String _name) {
+	public TDEToolBarRadioGroup(TDEToolBar _parent, String _name) {
 		super((Class) null);
-		newKToolBarRadioGroup(_parent,_name);
+		newTDEToolBarRadioGroup(_parent,_name);
 	}
-	private native void newKToolBarRadioGroup(KToolBar _parent, String _name);
-	public KToolBarRadioGroup(KToolBar _parent) {
+	private native void newTDEToolBarRadioGroup(TDEToolBar _parent, String _name);
+	public TDEToolBarRadioGroup(TDEToolBar _parent) {
 		super((Class) null);
-		newKToolBarRadioGroup(_parent);
+		newTDEToolBarRadioGroup(_parent);
 	}
-	private native void newKToolBarRadioGroup(KToolBar _parent);
+	private native void newTDEToolBarRadioGroup(TDEToolBar _parent);
 	/**	
 		 Adds button to group. Button cannot be unset by mouse clicks (you
 		 must press some other button tounset this one)
diff --git a/kdejava/koala/org/kde/koala/KToolBarSeparator.java b/kdejava/koala/org/kde/koala/TDEToolBarSeparator.java
index 8ac7cf9c..300bf700 100644
--- a/kdejava/koala/org/kde/koala/KToolBarSeparator.java
+++ b/kdejava/koala/org/kde/koala/TDEToolBarSeparator.java
@@ -13,20 +13,20 @@ import org.kde.qt.TQFrame;
 
 /**
 */
-public class KToolBarSeparator extends TQFrame  {
-	protected KToolBarSeparator(Class dummy){super((Class) null);}
+public class TDEToolBarSeparator extends TQFrame  {
+	protected TDEToolBarSeparator(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
-	public KToolBarSeparator(int arg1, boolean l, TQToolBar parent, String name) {
+	public TDEToolBarSeparator(int arg1, boolean l, TQToolBar parent, String name) {
 		super((Class) null);
-		newKToolBarSeparator(arg1,l,parent,name);
+		newTDEToolBarSeparator(arg1,l,parent,name);
 	}
-	private native void newKToolBarSeparator(int arg1, boolean l, TQToolBar parent, String name);
-	public KToolBarSeparator(int arg1, boolean l, TQToolBar parent) {
+	private native void newTDEToolBarSeparator(int arg1, boolean l, TQToolBar parent, String name);
+	public TDEToolBarSeparator(int arg1, boolean l, TQToolBar parent) {
 		super((Class) null);
-		newKToolBarSeparator(arg1,l,parent);
+		newTDEToolBarSeparator(arg1,l,parent);
 	}
-	private native void newKToolBarSeparator(int arg1, boolean l, TQToolBar parent);
+	private native void newTDEToolBarSeparator(int arg1, boolean l, TQToolBar parent);
 	public native TQSize sizeHint();
 	public native int orientation();
 	public native TQSizePolicy sizePolicy();
diff --git a/kdejava/koala/org/kde/koala/KToolBarSignals.java b/kdejava/koala/org/kde/koala/TDEToolBarSignals.java
index a1a98cc2..35737d4e 100644
--- a/kdejava/koala/org/kde/koala/KToolBarSignals.java
+++ b/kdejava/koala/org/kde/koala/TDEToolBarSignals.java
@@ -18,7 +18,7 @@ import org.kde.qt.TQResizeEvent;
 import org.kde.qt.TQDomElement;
 import org.kde.qt.TQChildEvent;
 
-public interface KToolBarSignals {
+public interface TDEToolBarSignals {
 	/**	
 		 Emitted when button <code>id</code> is clicked.
 		     		@short    Emitted when button <code>id</code> is clicked.
@@ -81,8 +81,8 @@ public interface KToolBarSignals {
 	/**	
 		 Emitted when toolbar changes position, or when
 		 an item is removed from toolbar.
-			 If you subclass KMainWindow and reimplement
-		 KMainWindow.resizeEvent() be sure to connect to
+			 If you subclass TDEMainWindow and reimplement
+		 TDEMainWindow.resizeEvent() be sure to connect to
 		 this signal. Note: You can connect this signal to a slot that
 		 doesn't take parameter.
 		     		@short    Emitted when toolbar changes position, or when  an item is removed from toolbar.
@@ -98,10 +98,10 @@ public interface KToolBarSignals {
 	void modechange();
 	/**	
 		 This signal is emitted when the toolbar is getting deleted,
-		 and before ~KToolbar finishes (so it's still time to remove
+		 and before ~TDEToolbar finishes (so it's still time to remove
 		 widgets from the toolbar).
 		 Used by KWidgetAction.
-				@short    This signal is emitted when the toolbar is getting deleted,  and before ~KToolbar finishes (so it's still time to remove  widgets from the toolbar).
+				@short    This signal is emitted when the toolbar is getting deleted,  and before ~TDEToolbar finishes (so it's still time to remove  widgets from the toolbar).
 	*/
 	void toolbarDestroyed();
 }