Rename additional instances of KDE to TDE

126 files changed, 283 insertions, 283 deletions

diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index 284a37409..08428cc23 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -9,9 +9,9 @@
 #
 #################################################
 
-if( BUILD_KDEUI_TESTS )
+if( BUILD_TDEUI_TESTS )
   add_subdirectory( tests )
-endif( BUILD_KDEUI_TESTS )
+endif( BUILD_TDEUI_TESTS )
 
 add_subdirectory( about )
 add_subdirectory( kdetrayproxy )
diff --git a/tdeui/kaboutapplication.h b/tdeui/kaboutapplication.h
index d8356ce66..58145aa45 100644
--- a/tdeui/kaboutapplication.h
+++ b/tdeui/kaboutapplication.h
@@ -41,7 +41,7 @@
  * @author Waldo Bastian (bastian@kde.org) and Espen Sand (espen@kde.org)
  */
 
-class KDEUI_EXPORT KAboutApplication : public KAboutDialog
+class TDEUI_EXPORT KAboutApplication : public KAboutDialog
 {
   public:
     /**
diff --git a/tdeui/kaboutdialog.h b/tdeui/kaboutdialog.h
index 345bc9f2c..9c87feb8e 100644
--- a/tdeui/kaboutdialog.h
+++ b/tdeui/kaboutdialog.h
@@ -47,7 +47,7 @@ class KAboutContainerPrivate;
 /**
  *  KAboutContainer can be used to make a application specific AboutDialog.
  */
-class KDEUI_EXPORT KAboutContainer : public TQFrame
+class TDEUI_EXPORT KAboutContainer : public TQFrame
 {
   Q_OBJECT
 
@@ -89,7 +89,7 @@ class KAboutContributorPrivate;
  * Used internally by KAboutWidget
  * @internal
  */
-class KDEUI_EXPORT KAboutContributor : public TQFrame
+class TDEUI_EXPORT KAboutContributor : public TQFrame
 {
   Q_OBJECT
 
@@ -147,7 +147,7 @@ class KDEUI_EXPORT KAboutContributor : public TQFrame
  *
  * It has a minimum size set.
  */
-class KDEUI_EXPORT KAboutWidget : public TQWidget
+class TDEUI_EXPORT KAboutWidget : public TQWidget
 {
   Q_OBJECT
 
@@ -280,7 +280,7 @@ class KAboutDialogPrivate;
  * @author Mirko Boehm (mirko@kde.org) and Espen Sand (espensa@online.no)
  * @see KDialogBase
  */
-class KDEUI_EXPORT KAboutDialog : public KDialogBase
+class TDEUI_EXPORT KAboutDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/kaboutkde.h b/tdeui/kaboutkde.h
index 07e325dd8..017d0f220 100644
--- a/tdeui/kaboutkde.h
+++ b/tdeui/kaboutkde.h
@@ -37,7 +37,7 @@
  * @author Espen Sand (espen@kde.org)
  */
 
-class KDEUI_EXPORT KAboutKDE : public KAboutDialog
+class TDEUI_EXPORT KAboutKDE : public KAboutDialog
 {
   public:
     /**
diff --git a/tdeui/kaction.h b/tdeui/kaction.h
index 203272256..44e77a4d5 100644
--- a/tdeui/kaction.h
+++ b/tdeui/kaction.h
@@ -199,7 +199,7 @@ class KMainWindow;
  *
  * @see KStdAction
  */
-class KDEUI_EXPORT KAction : public TQObject
+class TDEUI_EXPORT KAction : public TQObject
 {
   friend class KActionCollection;
   Q_OBJECT
diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h
index 1a1096aa7..2974cbdb2 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/kactionclasses.h
@@ -65,7 +65,7 @@ class KMainWindow;
  *  This action provides two states: checked or not.
  *
  */
-class KDEUI_EXPORT KToggleAction : public KAction
+class TDEUI_EXPORT KToggleAction : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -228,7 +228,7 @@ private:
  * An action that operates like a radio button. At any given time
  * only a single action from the group will be active.
  */
-class KDEUI_EXPORT KRadioAction : public KToggleAction
+class TDEUI_EXPORT KRadioAction : public KToggleAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -328,7 +328,7 @@ private:
  *  the formerly checked item becomes unchecked.
  *  There can be only one item checked at a time.
  */
-class KDEUI_EXPORT KSelectAction : public KAction
+class TDEUI_EXPORT KSelectAction : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -581,7 +581,7 @@ private:
 /**
  * @deprecated Use KSelectAction instead.
  */
-class KDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction
+class TDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -697,7 +697,7 @@ private:
  *
  *  @author Michael Koch
  */
-class KDEUI_EXPORT KRecentFilesAction : public KListAction  // TODO public KSelectAction
+class TDEUI_EXPORT KRecentFilesAction : public KListAction  // TODO public KSelectAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -907,7 +907,7 @@ private:
   KRecentFilesActionPrivate *d;
 };
 
-class KDEUI_EXPORT KFontAction : public KSelectAction
+class TDEUI_EXPORT KFontAction : public KSelectAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -958,7 +958,7 @@ private:
     KFontActionPrivate *d;
 };
 
-class KDEUI_EXPORT KFontSizeAction : public KSelectAction
+class TDEUI_EXPORT KFontSizeAction : public KSelectAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1017,7 +1017,7 @@ private:
  * If you want a submenu for selecting one tool among many (without icons), see KSelectAction.
  * See also setDelayed about the main action.
  */
-class KDEUI_EXPORT KActionMenu : public KAction
+class TDEUI_EXPORT KActionMenu : public KAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1091,7 +1091,7 @@ private:
  * that has more detail in a toolbar than in a menu (e.g. tool chooser
  * with "Other" leading to a dialog...).
  */
-class KDEUI_EXPORT KToolBarPopupAction : public KAction
+class TDEUI_EXPORT KToolBarPopupAction : public KAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1214,7 +1214,7 @@ private:
  * visibility has changed, whenever it changes.
  * @since 3.1
  */
-class KDEUI_EXPORT KToggleToolBarAction : public KToggleAction
+class TDEUI_EXPORT KToggleToolBarAction : public KToggleAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1261,7 +1261,7 @@ private:
  * still needs to explicitly set the window state though.
  * @since 3.2
  */
-class KDEUI_EXPORT KToggleFullScreenAction : public KToggleAction
+class TDEUI_EXPORT KToggleFullScreenAction : public KToggleAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1306,7 +1306,7 @@ private:
  * An action that automatically embeds a widget into a
  * toolbar.
  */
-class KDEUI_EXPORT KWidgetAction : public KAction
+class TDEUI_EXPORT KWidgetAction : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1351,7 +1351,7 @@ private:
     KWidgetActionPrivate *d;
 };
 
-class KDEUI_EXPORT KActionSeparator : public KAction
+class TDEUI_EXPORT KActionSeparator : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1378,7 +1378,7 @@ private:
  *
  * @since 3.2
  */
-class KDEUI_EXPORT KPasteTextAction: public KAction
+class TDEUI_EXPORT KPasteTextAction: public KAction
 {
     Q_OBJECT
     TQ_OBJECT
diff --git a/tdeui/kactioncollection.h b/tdeui/kactioncollection.h
index 971bc862f..8111effaf 100644
--- a/tdeui/kactioncollection.h
+++ b/tdeui/kactioncollection.h
@@ -75,7 +75,7 @@ typedef TQValueList<KAction *> KActionPtrList;
  *           statusBar(), TQT_SLOT( clear() ) );
  * \endcode
  */
-class KDEUI_EXPORT KActionCollection : public TQObject
+class TDEUI_EXPORT KActionCollection : public TQObject
 {
   friend class KAction;
   friend class KXMLGUIClient;
diff --git a/tdeui/kactionselector.h b/tdeui/kactionselector.h
index 03c5ab5da..8d38911bf 100644
--- a/tdeui/kactionselector.h
+++ b/tdeui/kactionselector.h
@@ -76,7 +76,7 @@ class KActionSelectorPrivate;
     @author Anders Lund <anders@alweb.dk>
 */
 
-class KDEUI_EXPORT KActionSelector : public TQWidget {
+class TDEUI_EXPORT KActionSelector : public TQWidget {
   Q_OBJECT
   Q_ENUMS( ButtonIconSize InsertionPolicy )
   Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
diff --git a/tdeui/kactionshortcutlist.h b/tdeui/kactionshortcutlist.h
index a7b8d303e..c61a7e2a8 100644
--- a/tdeui/kactionshortcutlist.h
+++ b/tdeui/kactionshortcutlist.h
@@ -9,7 +9,7 @@
 //---------------------------------------------------------------------
 
 class KAccelShortcutListPrivate;
-class KDEUI_EXPORT KActionShortcutList : public KShortcutList
+class TDEUI_EXPORT KActionShortcutList : public KShortcutList
 {
  public:
 	KActionShortcutList( KActionCollection* );
@@ -47,7 +47,7 @@ class KDEUI_EXPORT KActionShortcutList : public KShortcutList
 //---------------------------------------------------------------------
 
 class KAccelShortcutListPrivate;
-class KDEUI_EXPORT KActionPtrShortcutList : public KShortcutList
+class TDEUI_EXPORT KActionPtrShortcutList : public KShortcutList
 {
  public:
 	KActionPtrShortcutList( KActionPtrList& );
diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h
index 1220c9ce8..422dcfa5c 100644
--- a/tdeui/kactivelabel.h
+++ b/tdeui/kactivelabel.h
@@ -34,7 +34,7 @@ class KActiveLabelPrivate;
   * @author Waldo Bastian (bastian@kde.org)
   * @version $Id$
   */
-class KDEUI_EXPORT KActiveLabel : public TQTextBrowser
+class TDEUI_EXPORT KActiveLabel : public TQTextBrowser
 {
     Q_OBJECT
 public:
diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h
index 68f33d1b0..2caf74b4a 100644
--- a/tdeui/kanimwidget.h
+++ b/tdeui/kanimwidget.h
@@ -52,7 +52,7 @@ class KAnimWidgetPrivate;
  *
  * @author Kurt Granroth <granroth@kde.org>
  */
-class KDEUI_EXPORT KAnimWidget : public TQFrame
+class TDEUI_EXPORT KAnimWidget : public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( int size READ size WRITE setSize )
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index 9c0c1f032..96c2be8e6 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -35,7 +35,7 @@ class KArrowButtonPrivate;
  *
  * @author Frerich Raabe
  */
-class KDEUI_EXPORT KArrowButton : public TQPushButton
+class TDEUI_EXPORT KArrowButton : public TQPushButton
 {
 	Q_OBJECT
 	Q_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )
diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h
index 6c473c9dd..a55819e2b 100644
--- a/tdeui/kauthicon.h
+++ b/tdeui/kauthicon.h
@@ -44,7 +44,7 @@ class KAuthIconPrivate;
  * @see KRootPermsIcon, KWritePermsIcon
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDEUI_EXPORT KAuthIcon : public TQWidget
+class TDEUI_EXPORT KAuthIcon : public TQWidget
 {
   Q_OBJECT
 
@@ -100,7 +100,7 @@ class KRootPermsIconPrivate;
  * @see KAuthIcon
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDEUI_EXPORT KRootPermsIcon : public KAuthIcon
+class TDEUI_EXPORT KRootPermsIcon : public KAuthIcon
 {
   Q_OBJECT
 
@@ -132,7 +132,7 @@ class KWritePermsIconPrivate;
  * @see KAuthIcon
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDEUI_EXPORT KWritePermsIcon : public KAuthIcon
+class TDEUI_EXPORT KWritePermsIcon : public KAuthIcon
 {
   Q_OBJECT
   Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index d97d760f2..cff575dad 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -39,7 +39,7 @@ class KBugReportPrivate;
  *
  * @author David Faure <faure@kde.org>
  */
-class KDEUI_EXPORT KBugReport : public KDialogBase
+class TDEUI_EXPORT KBugReport : public KDialogBase
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h
index 03de09008..d30b1b94d 100644
--- a/tdeui/kbuttonbox.h
+++ b/tdeui/kbuttonbox.h
@@ -39,7 +39,7 @@ class KButtonBoxPrivate;
  * @version $Id$
  **/
 
-class KDEUI_EXPORT KButtonBox : public TQWidget
+class TDEUI_EXPORT KButtonBox : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h
index 5e1532fb6..7aa9ca78f 100644
--- a/tdeui/kcharselect.h
+++ b/tdeui/kcharselect.h
@@ -48,7 +48,7 @@ class KCharSelectPrivate;
  * @author Reginald Stadlbauer <reggie@kde.org>
  */
 
-class KDEUI_EXPORT KCharSelectTable : public TQGridView
+class TDEUI_EXPORT KCharSelectTable : public TQGridView
 {
     Q_OBJECT
 
@@ -137,7 +137,7 @@ private:
  * @author Reginald Stadlbauer <reggie@kde.org>
  */
 
-class KDEUI_EXPORT KCharSelect : public TQVBox
+class TDEUI_EXPORT KCharSelect : public TQVBox
 {
     Q_OBJECT
     Q_PROPERTY( TQString fontFamily READ font WRITE setFont )
diff --git a/tdeui/kcmenumngr.h b/tdeui/kcmenumngr.h
index ce05f6b9d..605fa43c2 100644
--- a/tdeui/kcmenumngr.h
+++ b/tdeui/kcmenumngr.h
@@ -75,7 +75,7 @@ If the popup menu is invoked with the keyboard shortcut, it's shown at
 the position of the micro focus hint of the widget ( TQWidget::microFocusHint() ).
 */
 
-class KDEUI_EXPORT KContextMenuManager : public TQObject
+class TDEUI_EXPORT KContextMenuManager : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdeui/kcmodule.h b/tdeui/kcmodule.h
index 268c3800a..eec6c7f3e 100644
--- a/tdeui/kcmodule.h
+++ b/tdeui/kcmodule.h
@@ -66,7 +66,7 @@ class KInstance;
  *
  * @author Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
  */
-class KDEUI_EXPORT KCModule : public TQWidget
+class TDEUI_EXPORT KCModule : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h
index e1a9b1dc8..ebc3f59a4 100644
--- a/tdeui/kcolorbutton.h
+++ b/tdeui/kcolorbutton.h
@@ -34,7 +34,7 @@ class KColorButtonPrivate;
 *
 * \image html kcolorbutton.png "KDE Color Button"
 */
-class KDEUI_EXPORT KColorButton : public TQPushButton
+class TDEUI_EXPORT KColorButton : public TQPushButton
 {
     Q_OBJECT
     Q_PROPERTY( TQColor color READ color WRITE setColor )
diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h
index aefac504f..cb3970f47 100644
--- a/tdeui/kcolorcombo.h
+++ b/tdeui/kcolorcombo.h
@@ -36,7 +36,7 @@ class KColorComboInternal;
 /**
  * Combobox for colors.
  */
-class KDEUI_EXPORT KColorCombo : public TQComboBox
+class TDEUI_EXPORT KColorCombo : public TQComboBox
 {
     Q_OBJECT
     Q_PROPERTY( TQColor color READ color WRITE setColor )
diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h
index 7a1a66d6d..20c9f799d 100644
--- a/tdeui/kcolordialog.h
+++ b/tdeui/kcolordialog.h
@@ -55,7 +55,7 @@ class KColorCells;
  * @see KXYSelector, KValueSelector, KColorDialog
  * @author Martin Jones (mjones@kde.org)
 */
-class KDEUI_EXPORT KHSSelector : public KXYSelector
+class TDEUI_EXPORT KHSSelector : public KXYSelector
 {
   Q_OBJECT
 
@@ -99,7 +99,7 @@ class KValueSelectorPrivate;
  * @see KHSSelector, KColorDialog
  * @author Martin Jones (mjones@kde.org)
  */
-class KDEUI_EXPORT KValueSelector : public KSelector
+class TDEUI_EXPORT KValueSelector : public KSelector
 {
   Q_OBJECT
 
@@ -161,7 +161,7 @@ private:
  *
  * @author Waldo Bastian <bastian@kde.org>
  **/
-class KDEUI_EXPORT KColor : public TQColor
+class TDEUI_EXPORT KColor : public TQColor
 {
 public:
   KColor();
@@ -195,7 +195,7 @@ private:
  *
  * @author Waldo Bastian <bastian@kde.org>
  **/
-class KDEUI_EXPORT KPaletteTable : public TQWidget
+class TDEUI_EXPORT KPaletteTable : public TQWidget
 {
   Q_OBJECT
 public:
@@ -250,7 +250,7 @@ private:
 *
 * @author Martin Jones <mjones@kde.org>
 */
-class KDEUI_EXPORT KColorCells : public TQGridView
+class TDEUI_EXPORT KColorCells : public TQGridView
 {
   Q_OBJECT
 public:
@@ -308,7 +308,7 @@ private:
  * automatically handles drag and drop from and on the widget.
  *
  */
-class KDEUI_EXPORT KColorPatch : public TQFrame
+class TDEUI_EXPORT KColorPatch : public TQFrame
 {
   Q_OBJECT
 public:
@@ -374,7 +374,7 @@ private:
  * the currently selected color is a KColorPatch.
  *
  **/
-class KDEUI_EXPORT KColorDialog : public KDialogBase
+class TDEUI_EXPORT KColorDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h
index e33e5796f..9c834bdf7 100644
--- a/tdeui/kcolordrag.h
+++ b/tdeui/kcolordrag.h
@@ -33,7 +33,7 @@ class KColorDragPrivate;
  *
  * See the Qt drag'n'drop documentation.
  */
-class KDEUI_EXPORT KColorDrag : public TQStoredDrag {
+class TDEUI_EXPORT KColorDrag : public TQStoredDrag {
     Q_OBJECT
 
 public:
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index d7d07e4b6..93ae6535e 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -148,7 +148,7 @@ class KURL;
  *
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase
+class TDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase
 {
   Q_OBJECT
   Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
@@ -537,7 +537,7 @@ class KPixmapProvider;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDEUI_EXPORT KHistoryCombo : public KComboBox
+class TDEUI_EXPORT KHistoryCombo : public KComboBox
 {
     Q_OBJECT
     Q_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems )
@@ -796,7 +796,7 @@ private:
     KHistoryComboPrivate* const d;
 };
 
-class KDEUI_EXPORT KHistoryComboEditor : public KDialogBase
+class TDEUI_EXPORT KHistoryComboEditor : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h
index 97fa3c2e2..8ba782a2a 100644
--- a/tdeui/kcommand.h
+++ b/tdeui/kcommand.h
@@ -34,7 +34,7 @@ class TQPopupMenu;
  * The abstract base class for all Commands. Commands are used to
  * store information needed for Undo/Redo functionality...
  */
-class KDEUI_EXPORT KCommand
+class TDEUI_EXPORT KCommand
 {
 protected:
     /**
@@ -75,7 +75,7 @@ protected:
  * It is more memory-efficient to use KCommand and to implement the name() method,
  * but in some cases it's more simple or more flexible to store the name at creation time.
  */
-class KDEUI_EXPORT KNamedCommand : public KCommand
+class TDEUI_EXPORT KNamedCommand : public KCommand
 {
 protected:
     /**
@@ -107,7 +107,7 @@ protected:
  * It will appear as one to the user and in the command history,
  * but it can use the implementation of multiple commands internally.
  */
-class KDEUI_EXPORT KMacroCommand : public KNamedCommand
+class TDEUI_EXPORT KMacroCommand : public KNamedCommand
 {
 public:
     /**
@@ -153,7 +153,7 @@ protected:
  * undo/redo actions in the menu and changes the text according
  * to the name of the command.
  */
-class KDEUI_EXPORT KCommandHistory : public TQObject {
+class TDEUI_EXPORT KCommandHistory : public TQObject {
     Q_OBJECT
 public:
     /**
diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h
index 9ae7d124b..9d6b33a49 100644
--- a/tdeui/kcompletionbox.h
+++ b/tdeui/kcompletionbox.h
@@ -40,7 +40,7 @@ class TQEvent;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDEUI_EXPORT KCompletionBox : public KListBox
+class TDEUI_EXPORT KCompletionBox : public KListBox
 {
     Q_OBJECT
     Q_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
diff --git a/tdeui/kconfigdialog.h b/tdeui/kconfigdialog.h
index 6c2061e88..167834c85 100644
--- a/tdeui/kconfigdialog.h
+++ b/tdeui/kconfigdialog.h
@@ -69,7 +69,7 @@ class KConfigDialogManager;
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.2
  */
-class KDEUI_EXPORT KConfigDialog : public KDialogBase {
+class TDEUI_EXPORT KConfigDialog : public KDialogBase {
 Q_OBJECT
 
 signals:
diff --git a/tdeui/kcursor.h b/tdeui/kcursor.h
index 19bcd2348..6838445b2 100644
--- a/tdeui/kcursor.h
+++ b/tdeui/kcursor.h
@@ -42,7 +42,7 @@ class TQWidget;
  *
  * @author Kurt Granroth <granroth@kde.org>
  */
-class KDEUI_EXPORT KCursor : public TQt
+class TDEUI_EXPORT KCursor : public TQt
 {
 public:
     /**
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index fb51732f3..08d030ac5 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -48,7 +48,7 @@ class KDateTable;
  *     @author Tim Gilman, Mirko Boehm
  *
  **/
-class KDEUI_EXPORT KDatePicker: public TQFrame
+class TDEUI_EXPORT KDatePicker: public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( TQDate date READ date WRITE setDate)
diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h
index 8e7ca0022..762089793 100644
--- a/tdeui/kdatetbl.h
+++ b/tdeui/kdatetbl.h
@@ -37,7 +37,7 @@ class KPopupMenu;
 * @version $Id$
 * @author Stephan Binner
 */
-class KDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit
+class TDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit
 {
   Q_OBJECT
 protected:
@@ -64,7 +64,7 @@ private:
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDEUI_EXPORT KDateInternalMonthPicker : public TQGridView
+class TDEUI_EXPORT KDateInternalMonthPicker : public TQGridView
 {
   Q_OBJECT
 protected:
@@ -137,7 +137,7 @@ private:
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit
+class TDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit
 {
   Q_OBJECT
 protected:
@@ -163,7 +163,7 @@ private:
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class KDEUI_EXPORT KPopupFrame : public TQFrame
+class TDEUI_EXPORT KPopupFrame : public TQFrame
 {
   Q_OBJECT
 protected:
@@ -238,7 +238,7 @@ private:
 /**
 * Validates user-entered dates.
 */
-class KDEUI_EXPORT KDateValidator : public TQValidator
+class TDEUI_EXPORT KDateValidator : public TQValidator
 {
 public:
     KDateValidator(TQWidget* parent=0, const char* name=0);
@@ -260,7 +260,7 @@ public:
  * @version $Id$
  * @author Tim Gilman, Mirko Boehm
  */
-class KDEUI_EXPORT KDateTable : public TQGridView
+class TDEUI_EXPORT KDateTable : public TQGridView
 {
     Q_OBJECT
     Q_PROPERTY( TQDate date READ getDate WRITE setDate )
diff --git a/tdeui/kdatetimewidget.h b/tdeui/kdatetimewidget.h
index 5f14ddcef..35439e459 100644
--- a/tdeui/kdatetimewidget.h
+++ b/tdeui/kdatetimewidget.h
@@ -37,7 +37,7 @@
  * @version $Id$
  * @since 3.2
  */
-class KDEUI_EXPORT KDateTimeWidget : public TQWidget
+class TDEUI_EXPORT KDateTimeWidget : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
diff --git a/tdeui/kdatewidget.h b/tdeui/kdatewidget.h
index 63c5b1eea..fbb192434 100644
--- a/tdeui/kdatewidget.h
+++ b/tdeui/kdatewidget.h
@@ -33,7 +33,7 @@
 *
 * @version $Id$
 */
-class KDEUI_EXPORT KDateWidget : public TQWidget
+class TDEUI_EXPORT KDateWidget : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQDate date READ date WRITE setDate )
diff --git a/tdeui/kdcopactionproxy.h b/tdeui/kdcopactionproxy.h
index 5b0ffdc1c..7b5c2039e 100644
--- a/tdeui/kdcopactionproxy.h
+++ b/tdeui/kdcopactionproxy.h
@@ -36,7 +36,7 @@ class KAction;
  * This class can generate DCOP object ids for given action objects, which it automatically
  * processes, as being a DCOPObjectProxy .
  */
-class KDEUI_EXPORT KDCOPActionProxy : public DCOPObjectProxy
+class TDEUI_EXPORT KDCOPActionProxy : public DCOPObjectProxy
 {
 public:
   /**
diff --git a/tdeui/kdetrayproxy/Makefile.am b/tdeui/kdetrayproxy/Makefile.am
index 01dc87082..39782b925 100644
--- a/tdeui/kdetrayproxy/Makefile.am
+++ b/tdeui/kdetrayproxy/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_kdetrayproxy.la
 INCLUDES= -I$(top_srcdir)/kded $(all_includes)
 kded_kdetrayproxy_la_SOURCES = kdetrayproxy.cpp module.cpp module.skel
 kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kdetrayproxy_la_LIBADD = $(LIB_TDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 METASOURCES = AUTO
 
diff --git a/tdeui/kdialog.h b/tdeui/kdialog.h
index 274ce8b33..e829cb4ca 100644
--- a/tdeui/kdialog.h
+++ b/tdeui/kdialog.h
@@ -49,7 +49,7 @@ class TQLayoutItem;
  * @see KDialogBase
  * @author Thomas Tanghus <tanghus@earthling.net>, Espen Sand <espensa@online.no>
  */
-class KDEUI_EXPORT KDialog : public TQDialog
+class TDEUI_EXPORT KDialog : public TQDialog
 {
   Q_OBJECT
 
@@ -186,7 +186,7 @@ class KDEUI_EXPORT KDialog : public TQDialog
   * @author Waldo Bastian <bastian@kde.org>
   */
 class KDialogQueuePrivate;
-class KDEUI_EXPORT KDialogQueue : public TQObject
+class TDEUI_EXPORT KDialogQueue : public TQObject
 {
       Q_OBJECT
 
@@ -215,7 +215,7 @@ protected:
   *
   * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
   */
-class KDEUI_EXPORT KSMModalDialogHeader : public TQWidget
+class TDEUI_EXPORT KSMModalDialogHeader : public TQWidget
 {
       Q_OBJECT
 
@@ -234,7 +234,7 @@ public:
   * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
   */
 class TQLabel;
-class KDEUI_EXPORT KSMModalDialog : public TQWidget
+class TDEUI_EXPORT KSMModalDialog : public TQWidget
 {
       Q_OBJECT
 
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index bd49764bb..ad33e24a0 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -188,7 +188,7 @@ class KDialogBaseTile;
  *
  * @author Mirko Boehm (mirko@kde.org) and Espen Sand (espen@kde.org)
  */
-class KDEUI_EXPORT KDialogBase : public KDialog
+class TDEUI_EXPORT KDialogBase : public KDialog
 {
   Q_OBJECT
 
diff --git a/tdeui/kdialogbase_priv.h b/tdeui/kdialogbase_priv.h
index d38ef884a..84db3b84f 100644
--- a/tdeui/kdialogbase_priv.h
+++ b/tdeui/kdialogbase_priv.h
@@ -28,7 +28,7 @@
  * Used internally by KDialogBase.
  * @internal
  */
-class KDEUI_EXPORT KDialogBaseButton : public KPushButton
+class TDEUI_EXPORT KDialogBaseButton : public KPushButton
 {
   Q_OBJECT
 
@@ -45,7 +45,7 @@ class KDEUI_EXPORT KDialogBaseButton : public KPushButton
  * Used internally by KDialogBase.
  * @internal
  */
-class KDEUI_EXPORT KDialogBaseTile : public TQObject
+class TDEUI_EXPORT KDialogBaseTile : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index 019cd9e55..daf6368b8 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -100,7 +100,7 @@ namespace KMDI
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame
+class TDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame
 {
   Q_OBJECT
   TQ_OBJECT
@@ -150,7 +150,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
+class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
 {
   Q_OBJECT
   TQ_OBJECT
@@ -196,7 +196,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
+class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
 {
   Q_OBJECT
   TQ_OBJECT
@@ -238,7 +238,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
+class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
 {
   Q_OBJECT
   TQ_OBJECT
@@ -364,7 +364,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockTabGroup : public TQTabWidget
+class TDEUI_EXPORT KDockTabGroup : public TQTabWidget
 {
   Q_OBJECT
   TQ_OBJECT
@@ -425,7 +425,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidget: public TQWidget
+class TDEUI_EXPORT KDockWidget: public TQWidget
 {
   Q_OBJECT
   TQ_OBJECT
@@ -912,7 +912,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockManager: public TQObject
+class TDEUI_EXPORT KDockManager: public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1311,7 +1311,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockMainWindow : public KMainWindow
+class TDEUI_EXPORT KDockMainWindow : public KMainWindow
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1482,7 +1482,7 @@ private:
   KDockMainWindowPrivate *d;
 };
 
-class KDEUI_EXPORT KDockArea : public TQWidget
+class TDEUI_EXPORT KDockArea : public TQWidget
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdeui/kdockwidget_p.h b/tdeui/kdockwidget_p.h
index 98af140ff..9ee9e8e73 100644
--- a/tdeui/kdockwidget_p.h
+++ b/tdeui/kdockwidget_p.h
@@ -40,7 +40,7 @@ COMPATIBLE. THIS HEADER IS ONLY INSTALLED, BECAUSE IT IS NEEDED IN
 #include <tqstringlist.h>
 // Add some describing comment !!
 
-class KDEUI_EXPORT KDockContainer
+class TDEUI_EXPORT KDockContainer
 {
 public:
   KDockContainer();
diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h
index 8e7323a7a..e97a5affd 100644
--- a/tdeui/kdockwidget_private.h
+++ b/tdeui/kdockwidget_private.h
@@ -41,9 +41,9 @@ class KDockContainer;
  *
  * @author Max Judin.
  */
-class KDEUI_EXPORT KDockSplitter : public TQWidget
+class TDEUI_EXPORT KDockSplitter : public TQWidget
 {
-  // NOTE: in theory the KDEUI_EXPORT above shouldn't be there, but it's needed for kexi,
+  // NOTE: in theory the TDEUI_EXPORT above shouldn't be there, but it's needed for kexi,
   // which copies the whole definition of the class to be able to access separatorPosInPercent etc. 
   // This needs real fixing in KDE4.
   
@@ -245,7 +245,7 @@ private:
  *
  * @author Max Judin.
 */
-class KDEUI_EXPORT KDockButton_Private : public TQPushButton
+class TDEUI_EXPORT KDockButton_Private : public TQPushButton
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h
index a78b6a82a..aff55c1e1 100644
--- a/tdeui/kdualcolorbutton.h
+++ b/tdeui/kdualcolorbutton.h
@@ -45,7 +45,7 @@ class TQBitmap;
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KDEUI_EXPORT KDualColorButton : public TQWidget
+class TDEUI_EXPORT KDualColorButton : public TQWidget
 {
     Q_OBJECT
     Q_ENUMS( DualColor )
diff --git a/tdeui/keditcl.h b/tdeui/keditcl.h
index 35316027c..a11789d59 100644
--- a/tdeui/keditcl.h
+++ b/tdeui/keditcl.h
@@ -34,7 +34,7 @@ class KHistoryCombo;
 class KIntNumInput;
 class TQVButtonGroup;
 
-class KDEUI_EXPORT KEdGotoLine : public KDialogBase
+class TDEUI_EXPORT KEdGotoLine : public KDialogBase
 {
     Q_OBJECT
 
@@ -56,7 +56,7 @@ private:
 };
 
 ///
-class KDEUI_EXPORT KEdFind : public KDialogBase
+class TDEUI_EXPORT KEdFind : public KDialogBase
 {
     Q_OBJECT
     Q_PROPERTY( TQString text READ getText WRITE setText )
@@ -106,7 +106,7 @@ private:
 };
 
 ///
-class KDEUI_EXPORT KEdReplace : public KDialogBase
+class TDEUI_EXPORT KEdReplace : public KDialogBase
 {
     Q_OBJECT
 
@@ -168,7 +168,7 @@ private:
  * @author Bernd Johannes Wuebben <wuebben@math.cornell.edu>, Waldo Bastian <bastian@kde.org>
  **/
 
-class KDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit
+class TDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit
 {
     Q_OBJECT
 
diff --git a/tdeui/keditlistbox.h b/tdeui/keditlistbox.h
index bd8b19a64..069907a62 100644
--- a/tdeui/keditlistbox.h
+++ b/tdeui/keditlistbox.h
@@ -41,7 +41,7 @@ class KEditListBoxPrivate;
  * \image html keditlistbox.png "KDE Edit List Box Widget"
  *
  */
-class KDEUI_EXPORT KEditListBox : public TQGroupBox
+class TDEUI_EXPORT KEditListBox : public TQGroupBox
 {
    Q_OBJECT
    TQ_OBJECT
@@ -247,25 +247,25 @@ public:
     class CustomEditor
     {
     public:
-        KDEUI_EXPORT CustomEditor()
+        TDEUI_EXPORT CustomEditor()
             : m_representationWidget( 0L ),
               m_lineEdit( 0L ) {}
-        KDEUI_EXPORT CustomEditor( TQWidget *repWidget, KLineEdit *edit )
+        TDEUI_EXPORT CustomEditor( TQWidget *repWidget, KLineEdit *edit )
             : m_representationWidget( repWidget ),
               m_lineEdit( edit ) {}
-        KDEUI_EXPORT CustomEditor( KComboBox *combo );
+        TDEUI_EXPORT CustomEditor( KComboBox *combo );
 
-        KDEUI_EXPORT void setRepresentationWidget( TQWidget *repWidget ) {
+        TDEUI_EXPORT void setRepresentationWidget( TQWidget *repWidget ) {
             m_representationWidget = repWidget;
         }
-        KDEUI_EXPORT void setLineEdit( KLineEdit *edit ) {
+        TDEUI_EXPORT void setLineEdit( KLineEdit *edit ) {
             m_lineEdit = edit;
         }
 
-        KDEUI_EXPORT virtual TQWidget   *representationWidget() const {
+        TDEUI_EXPORT virtual TQWidget   *representationWidget() const {
             return m_representationWidget;
         }
-        KDEUI_EXPORT  virtual KLineEdit *lineEdit() const {
+        TDEUI_EXPORT  virtual KLineEdit *lineEdit() const {
             return m_lineEdit;
         }
 
diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h
index 9033ff17f..4fcd5ac38 100644
--- a/tdeui/kedittoolbar.h
+++ b/tdeui/kedittoolbar.h
@@ -107,7 +107,7 @@ namespace
  * @author Kurt Granroth <granroth@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KEditToolbar : public KDialogBase
+class TDEUI_EXPORT KEditToolbar : public KDialogBase
 {
     Q_OBJECT
 public:
@@ -267,7 +267,7 @@ private:
  * @author Kurt Granroth <granroth@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KEditToolbarWidget : public TQWidget, virtual public KXMLGUIClient
+class TDEUI_EXPORT KEditToolbarWidget : public TQWidget, virtual public KXMLGUIClient
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kfontcombo.h b/tdeui/kfontcombo.h
index 8a2a5f07c..aec6618a4 100644
--- a/tdeui/kfontcombo.h
+++ b/tdeui/kfontcombo.h
@@ -32,7 +32,7 @@
  *
  * @author Malte Starostik <malte@kde.org>
  */
-class KDEUI_EXPORT KFontCombo : public KComboBox
+class TDEUI_EXPORT KFontCombo : public KComboBox
 {
     Q_OBJECT
     Q_PROPERTY(TQString family READ currentFont WRITE setCurrentFont)
diff --git a/tdeui/kfontdialog.h b/tdeui/kfontdialog.h
index bc5b817eb..a4ce7e59b 100644
--- a/tdeui/kfontdialog.h
+++ b/tdeui/kfontdialog.h
@@ -51,7 +51,7 @@ class KIntNumInput;
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KFontChooser : public TQWidget
+class TDEUI_EXPORT KFontChooser : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQFont font READ font WRITE setFont )
@@ -336,7 +336,7 @@ private:
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KFontDialog : public KDialogBase  {
+class TDEUI_EXPORT KFontDialog : public KDialogBase  {
     Q_OBJECT
 
 public:
diff --git a/tdeui/kfontrequester.h b/tdeui/kfontrequester.h
index 859c61499..a397ffcd7 100644
--- a/tdeui/kfontrequester.h
+++ b/tdeui/kfontrequester.h
@@ -41,7 +41,7 @@ class TQPushButton;
  * @author Nadeem Hasan <nhasan@kde.org>
  *
  */
-class KDEUI_EXPORT KFontRequester : public TQWidget
+class TDEUI_EXPORT KFontRequester : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h
index d5946b0d3..586998d48 100644
--- a/tdeui/kguiitem.h
+++ b/tdeui/kguiitem.h
@@ -35,7 +35,7 @@
  * @author Holger Freyther <freyher@yahoo.com>
  * @see KStdGuiItem
  */
-class KDEUI_EXPORT KGuiItem
+class TDEUI_EXPORT KGuiItem
 {
 public:
     KGuiItem();
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index 331ef0875..9a87c4f1b 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -128,7 +128,7 @@ class KHelpMenuPrivate;
  * @author Espen Sand (espen@kde.org)
  */
 
-class KDEUI_EXPORT KHelpMenu : public TQObject
+class TDEUI_EXPORT KHelpMenu : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h
index 5d2735d10..5071f263c 100644
--- a/tdeui/kiconview.h
+++ b/tdeui/kiconview.h
@@ -39,7 +39,7 @@
  * TQIconView::selectionChanged() signal.
  *
  **/
-class KDEUI_EXPORT KIconView : public TQIconView
+class TDEUI_EXPORT KIconView : public TQIconView
 {
   friend class KIconViewItem;
   Q_OBJECT
@@ -223,7 +223,7 @@ class KWordWrap;
  *
  * @author David Faure <david@mandrakesoft.com>
  */
-class KDEUI_EXPORT KIconViewItem : public TQIconViewItem
+class TDEUI_EXPORT KIconViewItem : public TQIconViewItem
 {
 public:
     // Need to redefine all the constructors - I want Java !
diff --git a/tdeui/kiconviewsearchline.h b/tdeui/kiconviewsearchline.h
index 9b11c5f2d..5fb05787f 100644
--- a/tdeui/kiconviewsearchline.h
+++ b/tdeui/kiconviewsearchline.h
@@ -35,7 +35,7 @@ class TQIconViewItem;
  *
  * @since 3.3
  */
-class KDEUI_EXPORT KIconViewSearchLine : public KLineEdit
+class TDEUI_EXPORT KIconViewSearchLine : public KLineEdit
 {
   Q_OBJECT
 
diff --git a/tdeui/kinputdialog.h b/tdeui/kinputdialog.h
index 76a5db2dd..f7326460d 100644
--- a/tdeui/kinputdialog.h
+++ b/tdeui/kinputdialog.h
@@ -45,7 +45,7 @@ class KInputDialogPrivate;
  * @since 3.2
  * @author Nadeem Hasan <nhasan@kde.org>
  */
-class KDEUI_EXPORT KInputDialog : public KDialogBase
+class TDEUI_EXPORT KInputDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index fc3eb2f27..cbf42abca 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -64,7 +64,7 @@ class KGuiItem;
  *
  * @author Espen Sand (espen@kde.org)
  */
-class KDEUI_EXPORT KJanusWidget : public TQWidget
+class TDEUI_EXPORT KJanusWidget : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h
index 97895f8fe..34f5f1ac9 100644
--- a/tdeui/kkeybutton.h
+++ b/tdeui/kkeybutton.h
@@ -37,7 +37,7 @@
  * @author Mark Donohoe <donohoe@kde.org>
  * @internal
  */
-class KDEUI_EXPORT KKeyButton: public TQPushButton
+class TDEUI_EXPORT KKeyButton: public TQPushButton
 {
 	Q_OBJECT
 
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index 8b7390e0e..4df3e2ecd 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -55,7 +55,7 @@ class KKeyChooserItem;
  * @see KKeyDialog
  * @author Nicolas Hadacek <hadacek@via.ecp.fr>
  */
-class KDEUI_EXPORT KKeyChooser : public TQWidget
+class TDEUI_EXPORT KKeyChooser : public TQWidget
 {
 	Q_OBJECT
  public:
@@ -271,7 +271,7 @@ typedef KKeyChooser KKeyChooser;
  *
  * @author Nicolas Hadacek <hadacek@via.ecp.fr>
  */
-class KDEUI_EXPORT KKeyDialog : public KDialogBase
+class TDEUI_EXPORT KKeyDialog : public KDialogBase
 {
 	Q_OBJECT
 
diff --git a/tdeui/klanguagebutton.h b/tdeui/klanguagebutton.h
index 4b381abe9..f15bd5a98 100644
--- a/tdeui/klanguagebutton.h
+++ b/tdeui/klanguagebutton.h
@@ -44,7 +44,7 @@ class TQPopupMenu;
  * Combined version of KTagCombo and KLanguageCombo but using a QPushButton
  * instead.
  */
-class KDEUI_EXPORT KLanguageButton : public TQWidget
+class TDEUI_EXPORT KLanguageButton : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index aebf6ce26..0a2c532ed 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -288,7 +288,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
     paint.drawEllipse( scale, scale, width - scale*2, width - scale*2 );
 
     // Draw the bright light spot of the LED now, using modified "old"
-    // painter routine taken from KDEUI´s KLed widget:
+    // painter routine taken from TDEUI´s KLed widget:
 
     // Setting the new width of the pen is essential to avoid "pixelized"
     // shadow like it can be observed with the old LED code
@@ -384,7 +384,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
     paint.drawEllipse( scale, scale, width - scale*2, width - scale*2 );
 
     // Draw the bright light spot of the LED now, using modified "old"
-    // painter routine taken from KDEUI´s KLed widget:
+    // painter routine taken from TDEUI´s KLed widget:
 
     // Setting the new width of the pen is essential to avoid "pixelized"
     // shadow like it can be observed with the old LED code
diff --git a/tdeui/kled.h b/tdeui/kled.h
index 4e95705e0..f060c8925 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -42,7 +42,7 @@ class TQColor;
  *
  * @author Joerg Habenicht, Richard J. Moore (rich@kde.org) 1998, 1999
  */
-class KDEUI_EXPORT KLed : public TQWidget
+class TDEUI_EXPORT KLed : public TQWidget
 {
     Q_OBJECT
     Q_ENUMS( State Shape Look )
diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h
index 3bc12738a..2f683fea0 100644
--- a/tdeui/klineedit.h
+++ b/tdeui/klineedit.h
@@ -142,7 +142,7 @@ class KURL;
  * @author Dawit Alemayehu <adawit@kde.org>
  */
 
-class KDEUI_EXPORT KLineEdit : public TQLineEdit, public KCompletionBase
+class TDEUI_EXPORT KLineEdit : public TQLineEdit, public KCompletionBase
 {
     friend class KComboBox;
 
diff --git a/tdeui/klineeditdlg.h b/tdeui/klineeditdlg.h
index ac8d834e4..efa4b4a4a 100644
--- a/tdeui/klineeditdlg.h
+++ b/tdeui/klineeditdlg.h
@@ -37,7 +37,7 @@ class TQValidator;
  * @author David Faure <faure@kde.org>, layout management by Preston Brown <pbrown@kde.org>
  */
 
-class KDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase
+class TDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase
 {
   Q_OBJECT
 public:
diff --git a/tdeui/klistbox.h b/tdeui/klistbox.h
index 48d8cd1dc..810c5bfdd 100644
--- a/tdeui/klistbox.h
+++ b/tdeui/klistbox.h
@@ -37,7 +37,7 @@
  * settings.  If you want to get informed when the user selects
  * something connect to the TQListBox::selectionChanged() signal.
  **/
-class KDEUI_EXPORT KListBox : public TQListBox
+class TDEUI_EXPORT KListBox : public TQListBox
 {
     Q_OBJECT
 
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index a4e7d4b85..b15f9c9ce 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -50,7 +50,7 @@ class KLineEdit;
  * Reimplement dragObject() and (possibly) startDrag(),
  * and setDragEnabled(true).
  */
-class KDEUI_EXPORT KListView : public TQListView
+class TDEUI_EXPORT KListView : public TQListView
 {
   friend class KListViewItem;
 
@@ -1007,7 +1007,7 @@ private:
  *
  * @short listview item with alternate background color support
  */
-class KDEUI_EXPORT KListViewItem : public TQListViewItem
+class TDEUI_EXPORT KListViewItem : public TQListViewItem
 {
   friend class KListView;
 public:
diff --git a/tdeui/klistviewlineedit.h b/tdeui/klistviewlineedit.h
index 72f2555ed..f08997925 100644
--- a/tdeui/klistviewlineedit.h
+++ b/tdeui/klistviewlineedit.h
@@ -25,7 +25,7 @@
  * the editor for a KListView.  please don't use this.
  * @internal
  **/
-class KDEUI_EXPORT KListViewLineEdit : public KLineEdit
+class TDEUI_EXPORT KListViewLineEdit : public KLineEdit
 {
 Q_OBJECT
 public:
diff --git a/tdeui/klistviewsearchline.h b/tdeui/klistviewsearchline.h
index 4b7427803..f763aad72 100644
--- a/tdeui/klistviewsearchline.h
+++ b/tdeui/klistviewsearchline.h
@@ -44,7 +44,7 @@ class TQToolButton;
  * @since 3.3
  */
 
-class KDEUI_EXPORT KListViewSearchLine : public KLineEdit
+class TDEUI_EXPORT KListViewSearchLine : public KLineEdit
 {
     Q_OBJECT
 
@@ -216,7 +216,7 @@ private:
  *
  * @since 3.4
  */
-class KDEUI_EXPORT KListViewSearchLineWidget : public TQHBox
+class TDEUI_EXPORT KListViewSearchLineWidget : public TQHBox
 {
     Q_OBJECT
 
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index 035cdb772..d8aa59ff0 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -95,7 +95,7 @@ class DCOPObject;
 
  */
 
-class KDEUI_EXPORT KMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
+class TDEUI_EXPORT KMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
 {
     friend class KMWSessionManaged;
     Q_OBJECT
diff --git a/tdeui/kmainwindowiface.h b/tdeui/kmainwindowiface.h
index f7f7a0bb8..58ca74e2c 100644
--- a/tdeui/kmainwindowiface.h
+++ b/tdeui/kmainwindowiface.h
@@ -37,7 +37,7 @@ class KMainWindow;
  *
  * @author Ian Reinhart Geiser <geiseri@yahoo.com>
  */
-class KDEUI_EXPORT KMainWindowInterface : virtual public DCOPObject
+class TDEUI_EXPORT KMainWindowInterface : virtual public DCOPObject
 {
 K_DCOP
 
diff --git a/tdeui/kmenubar.h b/tdeui/kmenubar.h
index 5dcf56484..68cb24dd8 100644
--- a/tdeui/kmenubar.h
+++ b/tdeui/kmenubar.h
@@ -39,7 +39,7 @@
  * @version $Id$
 */
 
-class KDEUI_EXPORT KMenuBar : public TQMenuBar
+class TDEUI_EXPORT KMenuBar : public TQMenuBar
 {
     Q_OBJECT
 
diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h
index a543e106f..419d1edc7 100644
--- a/tdeui/kmessagebox.h
+++ b/tdeui/kmessagebox.h
@@ -41,7 +41,7 @@ class KDialogBase;
   *
   * @author Waldo Bastian (bastian@kde.org)
   */
-class KDEUI_EXPORT KMessageBox
+class TDEUI_EXPORT KMessageBox
 {
 public:
   /**
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index dd43092ef..3c4cb15f7 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -46,7 +46,7 @@ class KIntSpinBox;
  * for a different variable type
  *
  */
-class KDEUI_EXPORT KNumInput : public TQWidget
+class TDEUI_EXPORT KNumInput : public TQWidget
 {
     Q_OBJECT
     TQ_OBJECT
@@ -185,7 +185,7 @@ private:
  * @version $Id$
  */
 
-class KDEUI_EXPORT KIntNumInput : public KNumInput
+class TDEUI_EXPORT KIntNumInput : public KNumInput
 {
     Q_OBJECT
     TQ_OBJECT
@@ -431,7 +431,7 @@ class KDoubleLine;
  * @see KIntNumInput, KDoubleSpinBox
  */
 
-class KDEUI_EXPORT KDoubleNumInput : public KNumInput
+class TDEUI_EXPORT KDoubleNumInput : public KNumInput
 {
     Q_OBJECT
     TQ_OBJECT
@@ -704,7 +704,7 @@ private:
  *  The class provides an easy interface to use other
  *  numeric systems than the decimal.
  */
-class KDEUI_EXPORT KIntSpinBox : public TQSpinBox
+class TDEUI_EXPORT KIntSpinBox : public TQSpinBox
 {
     Q_OBJECT
     TQ_OBJECT
@@ -835,7 +835,7 @@ private:
    @since 3.1
 **/
 
-class KDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
+class TDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
   Q_OBJECT
   TQ_OBJECT
   Q_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h
index 90bf1cbaf..04d5bf272 100644
--- a/tdeui/knumvalidator.h
+++ b/tdeui/knumvalidator.h
@@ -41,7 +41,7 @@ class TQString;
   @author Glen Parker <glenebob@nwlink.com>
   @version 0.0.1
 */
-class KDEUI_EXPORT KIntValidator : public TQValidator {
+class TDEUI_EXPORT KIntValidator : public TQValidator {
 
   public:
     /**
@@ -106,7 +106,7 @@ class KFloatValidatorPrivate;
   @author Glen Parker <glenebob@nwlink.com>
   @version 0.0.1
 */
-class KDEUI_EXPORT KFloatValidator : public TQValidator {
+class TDEUI_EXPORT KFloatValidator : public TQValidator {
 
   public:
     /**
@@ -178,7 +178,7 @@ class KDEUI_EXPORT KFloatValidator : public TQValidator {
    @since 3.1
 **/
 
-class KDEUI_EXPORT KDoubleValidator : public TQDoubleValidator {
+class TDEUI_EXPORT KDoubleValidator : public TQDoubleValidator {
   Q_OBJECT
   Q_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
 public:
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index 34adf910a..29c62d2d8 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -94,7 +94,7 @@ class TQPopupMenu;
  *
  * @author Matthias Elter <elter@kde.org>
  **/
-class KDEUI_EXPORT KPanelApplet : public TQFrame
+class TDEUI_EXPORT KPanelApplet : public TQFrame
 {
     Q_OBJECT
 
diff --git a/tdeui/kpanelappmenu.h b/tdeui/kpanelappmenu.h
index 8df6c613b..f83d874c5 100644
--- a/tdeui/kpanelappmenu.h
+++ b/tdeui/kpanelappmenu.h
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KDEUI_EXPORT KPanelAppMenu : public TQObject, public DCOPObject
+class TDEUI_EXPORT KPanelAppMenu : public TQObject, public DCOPObject
 {
     Q_OBJECT
 public:
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index d1131638d..c96cc3545 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -94,7 +94,7 @@ class KPanelExtensionPrivate;
  *
  * @author Matthias Elter <elter@kde.org>
  **/
-class KDEUI_EXPORT KPanelExtension : public TQFrame
+class TDEUI_EXPORT KPanelExtension : public TQFrame
 {
     Q_OBJECT
 
diff --git a/tdeui/kpanelmenu.h b/tdeui/kpanelmenu.h
index 7db6393b2..ceffc6995 100644
--- a/tdeui/kpanelmenu.h
+++ b/tdeui/kpanelmenu.h
@@ -50,7 +50,7 @@ class KPanelMenuPrivate;
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
-class KDEUI_EXPORT KPanelMenu : public KPopupMenu
+class TDEUI_EXPORT KPanelMenu : public KPopupMenu
 {
     Q_OBJECT
 
diff --git a/tdeui/kpassdlg.h b/tdeui/kpassdlg.h
index 91a861f40..de83bb36c 100644
--- a/tdeui/kpassdlg.h
+++ b/tdeui/kpassdlg.h
@@ -36,7 +36,7 @@ class TQWidget;
  * The widget uses the user's global "echo mode" setting.
  */
 
-class KDEUI_EXPORT KPasswordEdit
+class TDEUI_EXPORT KPasswordEdit
     : public TQLineEdit
 {
     Q_OBJECT
@@ -163,7 +163,7 @@ private:
  * @author Geert Jansen <jansen@kde.org>
  */
 
-class KDEUI_EXPORT KPasswordDialog
+class TDEUI_EXPORT KPasswordDialog
     : public KDialogBase
 {
     Q_OBJECT
diff --git a/tdeui/kpassivepopup.h b/tdeui/kpassivepopup.h
index f1bbd7298..feacfe314 100644
--- a/tdeui/kpassivepopup.h
+++ b/tdeui/kpassivepopup.h
@@ -65,7 +65,7 @@ class TQVBox;
  * @author Richard Moore, rich@kde.org
  * @author Sascha Cunz, sascha.cunz@tiscali.de
  */
-class KDEUI_EXPORT KPassivePopup : public TQFrame
+class TDEUI_EXPORT KPassivePopup : public TQFrame
 {
     Q_OBJECT
     Q_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete )
diff --git a/tdeui/kpixmapio.h b/tdeui/kpixmapio.h
index 62bde1c35..8d69221fd 100644
--- a/tdeui/kpixmapio.h
+++ b/tdeui/kpixmapio.h
@@ -84,7 +84,7 @@ struct KPixmapIOPrivate;
  * point in using it.
  */
 
-class KDEUI_EXPORT KPixmapIO
+class TDEUI_EXPORT KPixmapIO
 {
 public:
     KPixmapIO();
diff --git a/tdeui/kpixmapregionselectordialog.h b/tdeui/kpixmapregionselectordialog.h
index 5828ecdc1..a78e9439f 100644
--- a/tdeui/kpixmapregionselectordialog.h
+++ b/tdeui/kpixmapregionselectordialog.h
@@ -39,7 +39,7 @@
  * @author Antonio Larrosa <larrosa@kde.org>
  * @since 3.4
  */ 
-class KDEUI_EXPORT KPixmapRegionSelectorDialog : public KDialogBase
+class TDEUI_EXPORT KPixmapRegionSelectorDialog : public KDialogBase
 {
 public:
    /**
diff --git a/tdeui/kpixmapregionselectorwidget.h b/tdeui/kpixmapregionselectorwidget.h
index 6bd518c93..0e7f13e98 100644
--- a/tdeui/kpixmapregionselectorwidget.h
+++ b/tdeui/kpixmapregionselectorwidget.h
@@ -41,7 +41,7 @@ class KPopupMenu;
  * @author Antonio Larrosa <larrosa@kde.org>
  * @since 3.4
  */
-class KDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget
+class TDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget
 {
    Q_OBJECT
 public:
diff --git a/tdeui/kpopupmenu.h b/tdeui/kpopupmenu.h
index 8c593601c..0eab09715 100644
--- a/tdeui/kpopupmenu.h
+++ b/tdeui/kpopupmenu.h
@@ -35,7 +35,7 @@
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KDEUI_EXPORT KPopupTitle : public TQWidget
+class TDEUI_EXPORT KPopupTitle : public TQWidget
 {
     Q_OBJECT
 
@@ -120,7 +120,7 @@ private:
  * @author Daniel M. Duley <mosfet@kde.org>
  * @author Hamish Rodda <rodda@kde.org>
  */
-class KDEUI_EXPORT KPopupMenu : public TQPopupMenu {
+class TDEUI_EXPORT KPopupMenu : public TQPopupMenu {
     Q_OBJECT
     TQ_OBJECT
 public:
diff --git a/tdeui/kprogress.h b/tdeui/kprogress.h
index e17cf0040..49dce88c0 100644
--- a/tdeui/kprogress.h
+++ b/tdeui/kprogress.h
@@ -43,7 +43,7 @@
  *
  * @author Aaron Seigo
  */
-class KDEUI_EXPORT KProgress : public TQProgressBar
+class TDEUI_EXPORT KProgress : public TQProgressBar
 {
   Q_OBJECT
 
@@ -184,7 +184,7 @@ private:
  * @short A dialog with a progress bar
  * @author Aaron J. Seigo
  */
-class KDEUI_EXPORT KProgressDialog : public KDialogBase
+class TDEUI_EXPORT KProgressDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/tdeui/kprogressbox.h b/tdeui/kprogressbox.h
index 08db1be8a..448b37abe 100644
--- a/tdeui/kprogressbox.h
+++ b/tdeui/kprogressbox.h
@@ -51,7 +51,7 @@
  * @short A dialog with a progress bar and text box.
  * @author Timothy Pearson
  */
-class KDEUI_EXPORT KProgressBoxDialog : public KDialogBase
+class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h
index b0664c807..725262947 100644
--- a/tdeui/kpushbutton.h
+++ b/tdeui/kpushbutton.h
@@ -34,7 +34,7 @@ class TQDragObject;
  * @short A TQPushButton with drag-support and KGuiItem support
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDEUI_EXPORT KPushButton : public TQPushButton
+class TDEUI_EXPORT KPushButton : public TQPushButton
 {
     Q_OBJECT
     Q_PROPERTY(int stdItem READ guiItm WRITE setGuiItm )
diff --git a/tdeui/krestrictedline.h b/tdeui/krestrictedline.h
index 7d13f40ca..4ea96219a 100644
--- a/tdeui/krestrictedline.h
+++ b/tdeui/krestrictedline.h
@@ -41,7 +41,7 @@
  *
  * @author Michael Wiedmann <mw@miwie.in-berlin.de>
  */
-class KDEUI_EXPORT KRestrictedLine : public KLineEdit
+class TDEUI_EXPORT KRestrictedLine : public KLineEdit
 {
   Q_OBJECT
   Q_PROPERTY( TQString validChars READ validChars WRITE setValidChars )
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 532bc9758..c773780ed 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -43,7 +43,7 @@ class KRootPixmapData;
  * @author Geert Jansen <jansen@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KRootPixmap: public TQObject
+class TDEUI_EXPORT KRootPixmap: public TQObject
 {
     Q_OBJECT
 
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index 1abeb5985..efb9b1412 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -68,7 +68,7 @@
  * @short A ruler widget.
  * @author Jörg Habenicht
  */
-class KDEUI_EXPORT KRuler : public TQFrame
+class TDEUI_EXPORT KRuler : public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index 7663a2c5f..c3741488f 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -84,7 +84,7 @@ enum KSpellClients {
  * @see KSpell
  */
 
-class KDEUI_EXPORT KSpellConfig : public TQWidget
+class TDEUI_EXPORT KSpellConfig : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kscrollview.h b/tdeui/kscrollview.h
index 5611e6c3e..263e415f1 100644
--- a/tdeui/kscrollview.h
+++ b/tdeui/kscrollview.h
@@ -27,7 +27,7 @@
  *
  *
  **/
-class KDEUI_EXPORT KScrollView : public TQScrollView
+class TDEUI_EXPORT KScrollView : public TQScrollView
 {
   Q_OBJECT
 
diff --git a/tdeui/kselect.h b/tdeui/kselect.h
index 7a1c1ef4d..387f5cf09 100644
--- a/tdeui/kselect.h
+++ b/tdeui/kselect.h
@@ -40,7 +40,7 @@
  * A custom drawing routine for the widget surface has
  * to be provided by the subclass.
  */
-class KDEUI_EXPORT KXYSelector : public TQWidget
+class TDEUI_EXPORT KXYSelector : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( int xValue READ xValue WRITE setXValue )
@@ -156,7 +156,7 @@ private:
  * A custom drawing routine for the widget surface has
  * to be provided by the subclass.
  */
-class KDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl
+class TDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl
 {
   Q_OBJECT
   Q_PROPERTY( int value READ value WRITE setValue )
@@ -290,7 +290,7 @@ private:
  * \image html kgradientselector.png "KDE Gradient Selector Widget"
  *
  **/
-class KDEUI_EXPORT KGradientSelector : public KSelector
+class TDEUI_EXPORT KGradientSelector : public KSelector
 {
   Q_OBJECT
 
diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h
index 885f39ed5..171b13235 100644
--- a/tdeui/kseparator.h
+++ b/tdeui/kseparator.h
@@ -30,7 +30,7 @@
  * @author Michael Roth <mroth@wirlweb.de>
  * @version $Id$
 */
-class KDEUI_EXPORT KSeparator : public TQFrame
+class TDEUI_EXPORT KSeparator : public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( int orientation READ orientation WRITE setOrientation )
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index d1e3f9026..43f110983 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -53,7 +53,7 @@ class KSharedPixmapPrivate;
  * @version $Id$
  *
  */
-class KDEUI_EXPORT KSharedPixmap: 
+class TDEUI_EXPORT KSharedPixmap: 
     public TQWidget,
     public KPixmap
 {
diff --git a/tdeui/kshortcutdialog.h b/tdeui/kshortcutdialog.h
index d843f6fb0..e1f7643be 100644
--- a/tdeui/kshortcutdialog.h
+++ b/tdeui/kshortcutdialog.h
@@ -38,7 +38,7 @@ class KShortcutDialogAdvanced;
  * @see KKeyDialog
  * @since 3.4
  */
-class KDEUI_EXPORT KShortcutDialog : public KDialogBase
+class TDEUI_EXPORT KShortcutDialog : public KDialogBase
 {
 	Q_OBJECT
 public:
diff --git a/tdeui/kspell.h b/tdeui/kspell.h
index def1f4f3a..95f07cee4 100644
--- a/tdeui/kspell.h
+++ b/tdeui/kspell.h
@@ -43,7 +43,7 @@ class KSpellDlg;
  * @see KSpellConfig, KSyntaxHighlighter
  */
 
-class KDEUI_EXPORT KSpell : public TQObject
+class TDEUI_EXPORT KSpell : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kspelldlg.h b/tdeui/kspelldlg.h
index 42960862e..c42476814 100644
--- a/tdeui/kspelldlg.h
+++ b/tdeui/kspelldlg.h
@@ -43,7 +43,7 @@ enum KS_RESULT {
   KS_CONFIG=     9
 };
 
-class KDEUI_EXPORT KSpellDlg : public KDialogBase
+class TDEUI_EXPORT KSpellDlg : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/ksplashscreen.h b/tdeui/ksplashscreen.h
index 38cee3413..79aebf57d 100644
--- a/tdeui/ksplashscreen.h
+++ b/tdeui/ksplashscreen.h
@@ -38,7 +38,7 @@ class TQPixmap;
  *  @author Chris Howells (howells@kde.org)
  *  @since 3.2
  */
-class KDEUI_EXPORT KSplashScreen : public TQSplashScreen
+class TDEUI_EXPORT KSplashScreen : public TQSplashScreen
 {
   Q_OBJECT
 
diff --git a/tdeui/ksqueezedtextlabel.h b/tdeui/ksqueezedtextlabel.h
index 7d69e7ef1..b6a46f57f 100644
--- a/tdeui/ksqueezedtextlabel.h
+++ b/tdeui/ksqueezedtextlabel.h
@@ -43,7 +43,7 @@
 /*
  * QLabel
  */
-class KDEUI_EXPORT KSqueezedTextLabel : public TQLabel {
+class TDEUI_EXPORT KSqueezedTextLabel : public TQLabel {
   Q_OBJECT
 
 public:
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index bacc700bb..11a034552 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -32,7 +32,7 @@ class KStatusBar;
  *  Internal label class for use in KStatusBar
  *  @internal
  */
-class KDEUI_EXPORT KStatusBarLabel : public TQLabel
+class TDEUI_EXPORT KStatusBarLabel : public TQLabel
 {
   Q_OBJECT
 
@@ -84,7 +84,7 @@ signals:
 
  *  @see KActionCollection
  */
-class KDEUI_EXPORT KStatusBar : public TQStatusBar
+class TDEUI_EXPORT KStatusBar : public TQStatusBar
 {
   Q_OBJECT
 
diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h
index ba0845caf..cfbd9a376 100644
--- a/tdeui/kstdaction.h
+++ b/tdeui/kstdaction.h
@@ -165,7 +165,7 @@ namespace KStdAction
 	 * Creates an action corresponding to the
 	 * KStdAction::StdAction enum.
 	 */
-	KDEUI_EXPORT KAction* create( StdAction id, const char *name,
+	TDEUI_EXPORT KAction* create( StdAction id, const char *name,
 		const TQObject *recvr, const char *slot,
 		KActionCollection* parent );
 
@@ -186,7 +186,7 @@ namespace KStdAction
 	/**
 	 * This will return the internal name of a given standard action.
 	 */
-	KDEUI_EXPORT const char* name( StdAction id );
+	TDEUI_EXPORT const char* name( StdAction id );
 
         /// @obsolete. Use name()
 	inline const char* stdName(StdAction act_enum) { return name( act_enum ); }
@@ -196,17 +196,17 @@ namespace KStdAction
          * to give those heigher weight.
 	 * @since 3.1
         */
-        KDEUI_EXPORT TQStringList stdNames();
+        TDEUI_EXPORT TQStringList stdNames();
 
 	/**
 	 * Create a new document or window.
 	 */
-	KDEUI_EXPORT KAction *openNew(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT KAction *openNew(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Open an existing file.
 	 */
-	KDEUI_EXPORT KAction *open(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT KAction *open(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Open a recently used document. The signature of the slot being called
@@ -217,86 +217,86 @@ namespace KStdAction
 	 * @param parent parent widget
 	 * @param name name of widget
 	 */
-	KDEUI_EXPORT KRecentFilesAction *openRecent(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT KRecentFilesAction *openRecent(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Save the current document.
 	 */
-	KDEUI_EXPORT KAction *save(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *save(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Save the current document under a different name.
 	*/
-	KDEUI_EXPORT KAction *saveAs(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *saveAs(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Revert the current document to the last saved version
 	* (essentially will undo all changes).
 	*/
-	KDEUI_EXPORT KAction *revert(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *revert(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Close the current document.
 	*/
-	KDEUI_EXPORT KAction *close(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *close(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Print the current document.
 	*/
-	KDEUI_EXPORT KAction *print(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *print(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Show a print preview of the current document.
 	*/
-	KDEUI_EXPORT KAction *printPreview(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *printPreview(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Mail this document.
 	*/
-	KDEUI_EXPORT KAction *mail(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *mail(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Quit the program.
 	*/
-	KDEUI_EXPORT KAction *quit(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *quit(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Undo the last operation.
 	*/
-	KDEUI_EXPORT KAction *undo(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *undo(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Redo the last operation.
 	*/
-	KDEUI_EXPORT KAction *redo(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *redo(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Cut selected area and store it in the clipboard.
 	*/
-	KDEUI_EXPORT KAction *cut(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *cut(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Copy the selected area into the clipboard.
 	*/
-	KDEUI_EXPORT KAction *copy(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *copy(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Paste the contents of clipboard at the current mouse or cursor
 	* position.
 	*/
-	KDEUI_EXPORT KAction *paste(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *paste(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
@@ -305,190 +305,190 @@ namespace KStdAction
 	* menu if Klipper is running.
 	* @since 3.2
 	*/
-	KDEUI_EXPORT KAction *pasteText(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *pasteText(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Clear the content of the focus widget
 	* @since 3.2
 	*/
-	KDEUI_EXPORT KAction *clear(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *clear(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Select all elements in the current document.
 	*/
-	KDEUI_EXPORT KAction *selectAll(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *selectAll(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Deselect any selected elements in the current document.
 	*/
-	KDEUI_EXPORT KAction *deselect(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *deselect(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Initiate a 'find' request in the current document.
 	*/
-	KDEUI_EXPORT KAction *find(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *find(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find the next instance of a stored 'find'.
 	*/
-	KDEUI_EXPORT KAction *findNext(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *findNext(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find a previous instance of a stored 'find'.
 	*/
-	KDEUI_EXPORT KAction *findPrev(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *findPrev(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find and replace matches.
 	*/
-	KDEUI_EXPORT KAction *replace(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *replace(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* View the document at its actual size.
 	*/
-	KDEUI_EXPORT KAction *actualSize(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *actualSize(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the size of the current window.
 	*/
-	KDEUI_EXPORT KAction *fitToPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *fitToPage(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the width of the current window.
 	*/
-	KDEUI_EXPORT KAction *fitToWidth(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *fitToWidth(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the height of the current window.
 	*/
-	KDEUI_EXPORT KAction *fitToHeight(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *fitToHeight(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Zoom in.
 	*/
-	KDEUI_EXPORT KAction *zoomIn(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *zoomIn(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Zoom out.
 	*/
-	KDEUI_EXPORT KAction *zoomOut(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *zoomOut(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Popup a zoom dialog.
 	*/
-	KDEUI_EXPORT KAction *zoom(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *zoom(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Redisplay or redraw the document.
 	*/
-	KDEUI_EXPORT KAction *redisplay(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *redisplay(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move up (web style menu).
 	*/
-	KDEUI_EXPORT KAction *up(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *up(const TQObject *recvr, const char *slot,
 			KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move back (web style menu).
 	*/
-	KDEUI_EXPORT KAction *back(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *back(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move forward (web style menu).
 	*/
-	KDEUI_EXPORT KAction *forward(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *forward(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to the "Home" position or document.
 	*/
-	KDEUI_EXPORT KAction *home(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *home(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Scroll up one page.
 	*/
-	KDEUI_EXPORT KAction *prior(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *prior(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Scroll down one page.
 	*/
-	KDEUI_EXPORT KAction *next(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *next(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to somewhere in general.
 	*/
-	KDEUI_EXPORT KAction *goTo(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *goTo(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 
 	/**
 	* Go to a specific page (dialog).
 	*/
-	KDEUI_EXPORT KAction *gotoPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *gotoPage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to a specific line (dialog).
 	*/
-	KDEUI_EXPORT KAction *gotoLine(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *gotoLine(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Jump to the first page.
 	*/
-	KDEUI_EXPORT KAction *firstPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *firstPage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Jump to the last page.
 	*/
-	KDEUI_EXPORT KAction *lastPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *lastPage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Add the current page to the bookmarks tree.
 	*/
-	KDEUI_EXPORT KAction *addBookmark(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *addBookmark(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Edit the application bookmarks.
 	*/
-	KDEUI_EXPORT KAction *editBookmarks(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *editBookmarks(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Pop up the spell checker.
 	*/
-	KDEUI_EXPORT KAction *spelling(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *spelling(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 
 	/**
 	* Show/Hide the menubar.
 	*/
-	KDEUI_EXPORT KToggleAction *showMenubar(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleAction *showMenubar(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
@@ -498,7 +498,7 @@ namespace KStdAction
 	* Show/Hide the primary toolbar.
 	* @since 3.1
 	*/
-	KDEUI_EXPORT KToggleAction *showToolbar(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleAction *showToolbar(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
 	/**
 	* @obsolete. toolbar actions are created automatically now in the
@@ -506,26 +506,26 @@ namespace KStdAction
 	* See: KMainWindow::setStandardToolBarMenuEnabled(bool);
 	* Show/Hide the primary toolbar.
 	*/
-	KDEUI_EXPORT KToggleToolBarAction *showToolbar(const char* toolBarName,
+	TDEUI_EXPORT KToggleToolBarAction *showToolbar(const char* toolBarName,
 					KActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
 
 	/**
 	* Show/Hide the statusbar.
 	*/
-	KDEUI_EXPORT KToggleAction *showStatusbar(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleAction *showStatusbar(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Switch to/from full screen mode
 	* @since 3.2
 	*/
-	KDEUI_EXPORT KToggleFullScreenAction *fullScreen(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleFullScreenAction *fullScreen(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, TQWidget* window, const char *name = 0 );
 
 	/**
 	* Display the save options dialog.
 	*/
-	KDEUI_EXPORT KAction *saveOptions(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *saveOptions(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
@@ -534,19 +534,19 @@ namespace KStdAction
 	*  Note that you might be able to use the pre-built KXMLGUIFactory's fuction:
 	*  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
         */
-	KDEUI_EXPORT KAction *keyBindings(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *keyBindings(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the preferences/options dialog.
 	*/
-	KDEUI_EXPORT KAction *preferences(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *preferences(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* The Customize Toolbar dialog.
 	*/
-	KDEUI_EXPORT KAction *configureToolbars(const TQObject *recvr,
+	TDEUI_EXPORT KAction *configureToolbars(const TQObject *recvr,
 					const char *slot,
 					KActionCollection* parent,
 					const char *name = 0 );
@@ -555,7 +555,7 @@ namespace KStdAction
 	* The Configure Notifications dialog.
 	* @since 3.1
 	*/
-	KDEUI_EXPORT KAction *configureNotifications(const TQObject *recvr,
+	TDEUI_EXPORT KAction *configureNotifications(const TQObject *recvr,
 					const char *slot,
 					KActionCollection *parent,
 					const char *name = 0);
@@ -563,51 +563,51 @@ namespace KStdAction
 	/**
 	* Display the help.
 	*/
-	KDEUI_EXPORT KAction *help(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *help(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the help contents.
 	*/
-	KDEUI_EXPORT KAction *helpContents(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *helpContents(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Trigger the What's This cursor.
 	*/
-	KDEUI_EXPORT KAction *whatsThis(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *whatsThis(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display "Tip of the Day"
 	* @since 3.1
 	*/
-	KDEUI_EXPORT KAction *tipOfDay(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *tipOfDay(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Open up the Report Bug dialog.
 	*/
-	KDEUI_EXPORT KAction *reportBug(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *reportBug(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the application's About box.
 	*/
-	KDEUI_EXPORT KAction *aboutApp(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *aboutApp(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the About KDE dialog.
 	*/
-	KDEUI_EXPORT KAction *aboutKDE(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *aboutKDE(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display "Switch application language" dialog.
 	* @since 3.5.8
 	*/
-	KDEUI_EXPORT KAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 }
 
diff --git a/tdeui/kstdguiitem.h b/tdeui/kstdguiitem.h
index 438f419fe..3014737ab 100644
--- a/tdeui/kstdguiitem.h
+++ b/tdeui/kstdguiitem.h
@@ -34,7 +34,7 @@
  *
  * @author Holger Freyther <freyther@kde.org>
  */
-class KDEUI_EXPORT KStdGuiItem
+class TDEUI_EXPORT KStdGuiItem
 {
 public:
     /**
diff --git a/tdeui/kstringvalidator.h b/tdeui/kstringvalidator.h
index 37627abee..55905ab79 100644
--- a/tdeui/kstringvalidator.h
+++ b/tdeui/kstringvalidator.h
@@ -57,7 +57,7 @@
  *
  * @author Marc Mutz <mutz@kde.org>
  **/
-class KDEUI_EXPORT KStringListValidator : public TQValidator {
+class TDEUI_EXPORT KStringListValidator : public TQValidator {
   Q_OBJECT
   Q_PROPERTY( TQStringList stringList READ stringList WRITE setStringList )
   Q_PROPERTY( bool rejecting READ isRejecting WRITE setRejecting )
@@ -116,7 +116,7 @@ private:
  *
  * @author Marc Mutz <mutz@kde.org>
  **/
-class KDEUI_EXPORT KMimeTypeValidator : public TQValidator
+class TDEUI_EXPORT KMimeTypeValidator : public TQValidator
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kswitchlanguagedialog.h b/tdeui/kswitchlanguagedialog.h
index 185941b57..9e0a3ff87 100644
--- a/tdeui/kswitchlanguagedialog.h
+++ b/tdeui/kswitchlanguagedialog.h
@@ -35,7 +35,7 @@ class KSwitchLanguageDialogPrivate;
  * @author Krzysztof Lichota (lichota@mimuw.edu.pl)
  */
 
-class KDEUI_EXPORT KSwitchLanguageDialog : public KDialogBase
+class TDEUI_EXPORT KSwitchLanguageDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/ksyntaxhighlighter.h b/tdeui/ksyntaxhighlighter.h
index 9f6e80158..e5cf5a69c 100644
--- a/tdeui/ksyntaxhighlighter.h
+++ b/tdeui/ksyntaxhighlighter.h
@@ -39,7 +39,7 @@ class KSpellConfig;
 /**
  * \brief Syntax sensitive text highlighter
  */
-class KDEUI_EXPORT KSyntaxHighlighter : public TQSyntaxHighlighter
+class TDEUI_EXPORT KSyntaxHighlighter : public TQSyntaxHighlighter
 {
 public:
     enum SyntaxMode {
@@ -62,7 +62,7 @@ private:
     KSyntaxHighlighterPrivate *d;
 };
 
-class KDEUI_EXPORT KSpellingHighlighter : public KSyntaxHighlighter
+class TDEUI_EXPORT KSpellingHighlighter : public KSyntaxHighlighter
 {
 public:
     KSpellingHighlighter( TQTextEdit *textEdit,
@@ -91,7 +91,7 @@ private:
 /**
  * \brief Dictionary sensitive text highlighter
  */
-class KDEUI_EXPORT KDictSpellingHighlighter : public TQObject, public KSpellingHighlighter
+class TDEUI_EXPORT KDictSpellingHighlighter : public TQObject, public KSpellingHighlighter
 {
 Q_OBJECT
 
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index 26e1b948a..79d73d3e3 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -60,7 +60,7 @@ class KSystemTrayPrivate;
  *
  * @author Matthias Ettrich <ettrich@kde.org>
  **/
-class KDEUI_EXPORT KSystemTray : public TQLabel
+class TDEUI_EXPORT KSystemTray : public TQLabel
 {
     Q_OBJECT
 public:
diff --git a/tdeui/ktabbar.h b/tdeui/ktabbar.h
index 4ec9822ef..b7d93c32d 100644
--- a/tdeui/ktabbar.h
+++ b/tdeui/ktabbar.h
@@ -32,7 +32,7 @@ class KTabBarPrivate;
 /**
  * @since 3.2
  */
-class KDEUI_EXPORT KTabBar: public TQTabBar
+class TDEUI_EXPORT KTabBar: public TQTabBar
 {
     Q_OBJECT
 
diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h
index 1151eb22e..ba353c1f5 100644
--- a/tdeui/ktabctl.h
+++ b/tdeui/ktabctl.h
@@ -45,7 +45,7 @@
  * @author Alexander Sanda (alex@darkstar.ping.at)
  * @version $Id$
 */
-class KDEUI_EXPORT KTabCtl : public TQWidget
+class TDEUI_EXPORT KTabCtl : public TQWidget
 {
     Q_OBJECT
 
diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h
index 9629eb9e8..9b2151916 100644
--- a/tdeui/ktabwidget.h
+++ b/tdeui/ktabwidget.h
@@ -33,7 +33,7 @@ class KTabWidgetPrivate;
  *
  * @since 3.2
  */
-class KDEUI_EXPORT KTabWidget : public TQTabWidget
+class TDEUI_EXPORT KTabWidget : public TQTabWidget
 {
     Q_OBJECT
     Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h
index 9c9fd929d..7401d5263 100644
--- a/tdeui/ktextbrowser.h
+++ b/tdeui/ktextbrowser.h
@@ -39,7 +39,7 @@
  * @author Espen Sand (espensa@online.no)
  */
 
-class KDEUI_EXPORT KTextBrowser : public TQTextBrowser
+class TDEUI_EXPORT KTextBrowser : public TQTextBrowser
 {
   Q_OBJECT
   Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
diff --git a/tdeui/ktextedit.h b/tdeui/ktextedit.h
index a93d36fe1..5150dfb69 100644
--- a/tdeui/ktextedit.h
+++ b/tdeui/ktextedit.h
@@ -40,7 +40,7 @@ class KSpell;
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @since 3.1
  */
-class KDEUI_EXPORT KTextEdit : public TQTextEdit
+class TDEUI_EXPORT KTextEdit : public TQTextEdit
 {
     Q_OBJECT
 
diff --git a/tdeui/ktimewidget.h b/tdeui/ktimewidget.h
index 0d6f18873..24d762a7f 100644
--- a/tdeui/ktimewidget.h
+++ b/tdeui/ktimewidget.h
@@ -34,7 +34,7 @@
  * @author Hans Petter Bieker <bieker@kde.org>
  * @since 3.2
  */
-class KDEUI_EXPORT KTimeWidget : public TQWidget
+class TDEUI_EXPORT KTimeWidget : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQTime time READ time WRITE setTime )
diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h
index a09b1dd56..03764d246 100644
--- a/tdeui/ktimezonewidget.h
+++ b/tdeui/ktimezonewidget.h
@@ -56,7 +56,7 @@ class KTimezoneWidgetPrivate;
  * @author S.R.Haque <srhaque@iee.org>
  * @since 3.5
  */
-class KDEUI_EXPORT KTimezoneWidget :
+class TDEUI_EXPORT KTimezoneWidget :
     public KListView
 {
     Q_OBJECT
diff --git a/tdeui/ktip.h b/tdeui/ktip.h
index 861f1c82e..d18efd27e 100644
--- a/tdeui/ktip.h
+++ b/tdeui/ktip.h
@@ -52,7 +52,7 @@ class KTextBrowser;
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
  *
  */
-class KDEUI_EXPORT KTipDatabase
+class TDEUI_EXPORT KTipDatabase
 {
 public:
     /**
@@ -105,7 +105,7 @@ private:
  *
  * @author Matthias Hoelzer-Kluepfel <mhk@caldera.de>
  */
-class KDEUI_EXPORT KTipDialog : public KDialog
+class TDEUI_EXPORT KTipDialog : public KDialog
 {
     Q_OBJECT
 public:
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index aff0331e6..918ce00a4 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -55,7 +55,7 @@ class KXMLGUIClient;
 
 class KToolBarPrivate;
 
-class KDEUI_EXPORT KToolBarSeparator : public TQFrame
+class TDEUI_EXPORT KToolBarSeparator : public TQFrame
 {
     Q_OBJECT
     TQ_OBJECT
@@ -101,7 +101,7 @@ private:
   * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>.
   */
 
-class KDEUI_EXPORT KToolBar : public TQToolBar
+class TDEUI_EXPORT KToolBar : public TQToolBar
 {
     Q_OBJECT
     TQ_OBJECT
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h
index 7c642aedb..5af5c1b1c 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/ktoolbarbutton.h
@@ -41,7 +41,7 @@ class TQPainter;
  * KToolBar methods instead.
  * @internal
  */
-class KDEUI_EXPORT KToolBarButton : public TQToolButton
+class TDEUI_EXPORT KToolBarButton : public TQToolButton
 {
   Q_OBJECT
   TQ_OBJECT
@@ -321,7 +321,7 @@ private:
 * @internal
 * @version $Id$
 */
-class KDEUI_EXPORT KToolBarButtonList : public TQIntDict<KToolBarButton>
+class TDEUI_EXPORT KToolBarButtonList : public TQIntDict<KToolBarButton>
 {
 public:
    KToolBarButtonList();
diff --git a/tdeui/ktoolbarlabelaction.h b/tdeui/ktoolbarlabelaction.h
index 2cbc27875..2cf7c99be 100644
--- a/tdeui/ktoolbarlabelaction.h
+++ b/tdeui/ktoolbarlabelaction.h
@@ -46,7 +46,7 @@ class TQLabel;
  *
  * @author Felix Berger <felixberger@beldesign.de>
  */
-class KDEUI_EXPORT KToolBarLabelAction : public KWidgetAction
+class TDEUI_EXPORT KToolBarLabelAction : public KWidgetAction
 {
 public:
   /**
diff --git a/tdeui/ktoolbarradiogroup.h b/tdeui/ktoolbarradiogroup.h
index f0e793bf2..7a4ae8be5 100644
--- a/tdeui/ktoolbarradiogroup.h
+++ b/tdeui/ktoolbarradiogroup.h
@@ -46,7 +46,7 @@ class KToolBarRadioGroupPrivate;
   *
   * @author Sven Radej <radej@kde.org>
   */
-class KDEUI_EXPORT KToolBarRadioGroup : public TQObject
+class TDEUI_EXPORT KToolBarRadioGroup : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h
index 5563f77ba..cff7bee84 100644
--- a/tdeui/kurllabel.h
+++ b/tdeui/kurllabel.h
@@ -68,7 +68,7 @@ class TQPixmap;
  * @version $Id$
  *
  */
-class KDEUI_EXPORT KURLLabel : public TQLabel
+class TDEUI_EXPORT KURLLabel : public TQLabel
 {
   Q_OBJECT
   Q_PROPERTY (TQString url READ url WRITE setURL)
diff --git a/tdeui/kwhatsthismanager_p.h b/tdeui/kwhatsthismanager_p.h
index 919ffd197..cce1c8ea5 100644
--- a/tdeui/kwhatsthismanager_p.h
+++ b/tdeui/kwhatsthismanager_p.h
@@ -43,7 +43,7 @@ class TQTextEdit;
  * @see QWhatsThis
  * @author Peter Rockai (mornfall) <mornfall@danill.sk>
  **/
-class KDEUI_EXPORT KWhatsThisManager : public TQObject
+class TDEUI_EXPORT KWhatsThisManager : public TQObject
 {
     Q_OBJECT
     public:
diff --git a/tdeui/kwindowinfo.h b/tdeui/kwindowinfo.h
index 167d3e0a9..780578d75 100644
--- a/tdeui/kwindowinfo.h
+++ b/tdeui/kwindowinfo.h
@@ -38,7 +38,7 @@
  * @author Richard Moore, rich@kde.org
  * @since 3.1
 */
-class KDEUI_EXPORT KWindowInfo : public TQObject
+class TDEUI_EXPORT KWindowInfo : public TQObject
 {
     Q_OBJECT
 
diff --git a/tdeui/kwindowlistmenu.h b/tdeui/kwindowlistmenu.h
index 3e05cf63f..7d796b632 100644
--- a/tdeui/kwindowlistmenu.h
+++ b/tdeui/kwindowlistmenu.h
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class KWinModule;
 class KWindowListMenuPrivate;
 
-class KDEUI_EXPORT KWindowListMenu : public KPopupMenu
+class TDEUI_EXPORT KWindowListMenu : public KPopupMenu
 {
     Q_OBJECT
 
diff --git a/tdeui/kwizard.h b/tdeui/kwizard.h
index 977ea5d86..44df05959 100644
--- a/tdeui/kwizard.h
+++ b/tdeui/kwizard.h
@@ -43,7 +43,7 @@
 * @author Harri Porten <porten@kde.org>
 * @version 0.3 
 */
-class KDEUI_EXPORT KWizard : public TQWizard
+class TDEUI_EXPORT KWizard : public TQWizard
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h
index 5971525da..2681bfa28 100644
--- a/tdeui/kwordwrap.h
+++ b/tdeui/kwordwrap.h
@@ -45,7 +45,7 @@
  *
  * @author David Faure <faure@kde.org>
  */
-class KDEUI_EXPORT KWordWrap
+class TDEUI_EXPORT KWordWrap
 {
 public:
     /**
diff --git a/tdeui/kxmlguibuilder.h b/tdeui/kxmlguibuilder.h
index 4eb6bd46e..2cd77ef4e 100644
--- a/tdeui/kxmlguibuilder.h
+++ b/tdeui/kxmlguibuilder.h
@@ -36,7 +36,7 @@ class KXMLGUIClient;
  * the toplevel widget is a KMainWindow. Other implementations may appear
  * in the future (dialogs for instance)
  */
-class KDEUI_EXPORT KXMLGUIBuilder
+class TDEUI_EXPORT KXMLGUIBuilder
 {
  public:
 
diff --git a/tdeui/kxmlguiclient.h b/tdeui/kxmlguiclient.h
index f3f7393f4..194491d38 100644
--- a/tdeui/kxmlguiclient.h
+++ b/tdeui/kxmlguiclient.h
@@ -40,7 +40,7 @@ class KXMLGUIBuilder;
  * GUI from actions and an XML document, and can be dynamically merged
  * with other KXMLGUIClients.
  */
-class KDEUI_EXPORT KXMLGUIClient
+class TDEUI_EXPORT KXMLGUIClient
 {
     friend class KEditToolbarWidget; // for setXMLFile(3 args)
 public:
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index 59b75c14b..02c759f1b 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -59,7 +59,7 @@ class BuildHelper;
  * according to the XML and the merging rules of previously inserted clients. Container widgets
  * are built via a KXMLGUIBuilder , which has to be provided with the KXMLGUIFactory constructor.
  */
-class KDEUI_EXPORT KXMLGUIFactory : public TQObject
+class TDEUI_EXPORT KXMLGUIFactory : public TQObject
 {
   friend class KXMLGUI::BuildHelper;
   Q_OBJECT
diff --git a/tdeui/kxmlguifactory_p.h b/tdeui/kxmlguifactory_p.h
index 1877a295f..dc263b677 100644
--- a/tdeui/kxmlguifactory_p.h
+++ b/tdeui/kxmlguifactory_p.h
@@ -36,7 +36,7 @@ namespace KXMLGUI
 
 struct BuildState;
 
-class KDEUI_EXPORT ActionList : public TQPtrList<KAction>
+class TDEUI_EXPORT ActionList : public TQPtrList<KAction>
 {
 public:
     ActionList() {}
@@ -107,7 +107,7 @@ typedef TQValueList<MergingIndex> MergingIndexList;
  * position.
  * (used when no merging index is used for a certain action, custom element or sub-container)
  */
-struct KDEUI_EXPORT ContainerNode
+struct TDEUI_EXPORT ContainerNode
 {
     ContainerNode( TQWidget *_container, const TQString &_tagName, const TQString &_name,
                    ContainerNode *_parent = 0L, KXMLGUIClient *_client = 0L,
@@ -178,7 +178,7 @@ struct KDEUI_EXPORT ContainerNode
 typedef TQPtrList<ContainerNode> ContainerNodeList;
 typedef TQPtrListIterator<ContainerNode> ContainerNodeListIt;
 
-class KDEUI_EXPORT BuildHelper
+class TDEUI_EXPORT BuildHelper
 {
 public:
     BuildHelper( BuildState &state, 
@@ -220,7 +220,7 @@ private:
     ContainerNode *parentNode;
 };
 
-struct KDEUI_EXPORT BuildState
+struct TDEUI_EXPORT BuildState
 {
     BuildState() : guiClient( 0 ), builder( 0 ), clientBuilder( 0 ) {}
 
diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h
index c9dcac05d..626f89602 100644
--- a/tdeui/qxembed.h
+++ b/tdeui/qxembed.h
@@ -59,7 +59,7 @@ class QXEmbedData;
  *
  * @short The QXEmbed widget is a graphical socket that can embed an external X-Window.
 */
-class KDEUI_EXPORT QXEmbed : public TQWidget
+class TDEUI_EXPORT QXEmbed : public TQWidget
 {
     Q_OBJECT
     TQ_OBJECT
diff --git a/tdeui/tests/kmainwindowrestoretest.h b/tdeui/tests/kmainwindowrestoretest.h
index 7bd535f74..f29ae2fca 100644
--- a/tdeui/tests/kmainwindowrestoretest.h
+++ b/tdeui/tests/kmainwindowrestoretest.h
@@ -1,5 +1,5 @@
-#ifndef _KDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
-#define _KDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+#ifndef _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+#define _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
 
 #include <kmainwindow.h>
 
@@ -45,4 +45,4 @@ public:
   virtual ~MainWin6() {}
 };
 
-#endif // _KDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+#endif // _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_