Replace KDE_DEPRECATED with TDE_DEPRECATED

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 43e38f2c0a00cdc052660fab01d32df2c7dc24b0)

26 files changed, 71 insertions, 71 deletions

diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h
index 7c46faf2d..af3fb9cb4 100644
--- a/tdeui/kcolordrag.h
+++ b/tdeui/kcolordrag.h
@@ -65,7 +65,7 @@ public:
     /**
      * @deprecated This is equivalent with "new KColorDrag(color, dragsource)".
      */
-    static KColorDrag* makeDrag( const TQColor&,TQWidget *dragsource) KDE_DEPRECATED;
+    static KColorDrag* makeDrag( const TQColor&,TQWidget *dragsource) TDE_DEPRECATED;
 
 private:
      TQColor m_color; // unused
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index 32455144d..e07882a2a 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -104,7 +104,7 @@ public:
    * Returns the selected date.
    * @deprecated
    **/
-  const TQDate& getDate() const KDE_DEPRECATED;
+  const TQDate& getDate() const TDE_DEPRECATED;
 
   /**
    * @returns the selected date.
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index 25f4613ae..d264c525f 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -898,7 +898,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      */
     void setButtonOKText( const TQString &text=TQString::null,
 			  const TQString &tooltip=TQString::null,
-			  const TQString &quickhelp=TQString::null ) KDE_DEPRECATED;
+			  const TQString &quickhelp=TQString::null ) TDE_DEPRECATED;
 
     /**
      * Sets the appearance of the Apply button.
@@ -928,7 +928,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      */
     void setButtonApplyText( const TQString &text=TQString::null,
 			     const TQString &tooltip=TQString::null,
-			     const TQString &quickhelp=TQString::null ) KDE_DEPRECATED;
+			     const TQString &quickhelp=TQString::null ) TDE_DEPRECATED;
 
     /**
      * Sets the appearance of the Cancel button.
@@ -956,7 +956,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      */
     void setButtonCancelText( const TQString &text=TQString::null,
 			      const TQString &tooltip=TQString::null,
-			      const TQString &quickhelp=TQString::null ) KDE_DEPRECATED;
+			      const TQString &quickhelp=TQString::null ) TDE_DEPRECATED;
 
     /**
      * Sets the text of any button.
@@ -1113,7 +1113,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      * @deprecated
      * Use backgroundTile() instead.
      */
-    static const TQPixmap *getBackgroundTile() KDE_DEPRECATED;
+    static const TQPixmap *getBackgroundTile() TDE_DEPRECATED;
 
     /**
      * Sets the background tile.
@@ -1142,7 +1142,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      * The results are differences in pixels from the
      * dialogs corners.
      */
-    void  getBorderWidths( int& ulx, int& uly, int& lrx, int& lry ) const KDE_DEPRECATED;
+    void  getBorderWidths( int& ulx, int& uly, int& lrx, int& lry ) const TDE_DEPRECATED;
 
     /**
      * @deprecated
@@ -1155,7 +1155,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      * If you need the "overhead" the dialog needs for its elements,
      * use getBorderWidths().
      */
-    TQRect getContentsRect() const KDE_DEPRECATED;
+    TQRect getContentsRect() const TDE_DEPRECATED;
 
     /**
      * Calculate the size hint for the dialog.
diff --git a/tdeui/kdockwindow.h b/tdeui/kdockwindow.h
index 851502488..12aadf4b7 100644
--- a/tdeui/kdockwindow.h
+++ b/tdeui/kdockwindow.h
@@ -29,7 +29,7 @@
  * This class is obsolete, it is provided for compatibility only.
  * Use KSystemTray instead.
  */
-class KDE_DEPRECATED KDockWindow : public KSystemTray
+class TDE_DEPRECATED KDockWindow : public KSystemTray
 {
     TQ_OBJECT
 public:
diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h
index 03b551679..53ffee8d9 100644
--- a/tdeui/kkeybutton.h
+++ b/tdeui/kkeybutton.h
@@ -52,7 +52,7 @@ class TDEUI_EXPORT KKeyButton: public TQPushButton
 	virtual ~KKeyButton();
 
 	/** @deprecated Use setShortcut( cut, false ) instead */
-	void setShortcut( const TDEShortcut& cut ) KDE_DEPRECATED;
+	void setShortcut( const TDEShortcut& cut ) TDE_DEPRECATED;
 	/// @since 3.1
 	void setShortcut( const TDEShortcut& cut, bool bQtShortcut );
 	const TDEShortcut& shortcut() const
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index bbfa07f59..302d557c4 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -377,19 +377,19 @@ public:
 	 * @deprecated Obsolete.
 	 * Please use KKeyDialog::configure instead
 	 */
-	static KDE_DEPRECATED int configureKeys( TDEAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
+	static TDE_DEPRECATED int configureKeys( TDEAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
 		{ return configure( keys, parent, save_settings ); }
 	/**
 	 * @deprecated Obsolete.
 	 * Please use KKeyDialog::configure instead
 	 */
-	static KDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
+	static TDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
 		{ return configure( keys, parent, save_settings ); }
 	/**
 	 * @deprecated Obsolete.
 	 * Please use KKeyDialog::configure instead
 	 */
-	static KDE_DEPRECATED int configureKeys( TDEActionCollection* coll, const TQString& /*xmlfile*/,
+	static TDE_DEPRECATED int configureKeys( TDEActionCollection* coll, const TQString& /*xmlfile*/,
 		bool save_settings = true, TQWidget* parent = 0 )
 		{ return configure( coll, parent, save_settings ); }
 
diff --git a/tdeui/kled.h b/tdeui/kled.h
index 5bca61467..cab7586f1 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -195,7 +195,7 @@ public:
    * @short Toggles LED on->off / off->on.
    * @deprecated, use #toggle() instead.
    */
-  void toggleState() KDE_DEPRECATED;
+  void toggleState() TDE_DEPRECATED;
 
   /**
    * Set the color of the widget.
diff --git a/tdeui/klineeditdlg.h b/tdeui/klineeditdlg.h
index e0b609dcd..26d1e8dc0 100644
--- a/tdeui/klineeditdlg.h
+++ b/tdeui/klineeditdlg.h
@@ -57,7 +57,7 @@ public:
    * @param _value     Initial value of the inputline
    * @param parent     Parent widget for the line edit dialog
    */
-  KLineEditDlg( const TQString& _text, const TQString& _value, TQWidget *parent ) KDE_DEPRECATED;
+  KLineEditDlg( const TQString& _text, const TQString& _value, TQWidget *parent ) TDE_DEPRECATED;
   virtual ~KLineEditDlg();
 
   /**
@@ -80,7 +80,7 @@ public:
    * @param parent    The parent widget
    */
   static TQString getText(const TQString &text, const TQString& value,
-		 bool *ok, TQWidget *parent, TQValidator *validator=0 ) KDE_DEPRECATED;
+		 bool *ok, TQWidget *parent, TQValidator *validator=0 ) TDE_DEPRECATED;
 
   /**
    * Static convenience function to get a textual input from the user.
@@ -97,7 +97,7 @@ public:
   static TQString getText(const TQString &caption, const TQString &text,
                          const TQString& value=TQString::null,
                          bool *ok=0, TQWidget *parent=0,
-			 TQValidator *validator=0) KDE_DEPRECATED;
+			 TQValidator *validator=0) TDE_DEPRECATED;
 
 public slots:
   /**
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index 28ff17d68..c0bd0f935 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -460,7 +460,7 @@ public:
      * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
-    KDoubleNumInput(double value, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED;
+    KDoubleNumInput(double value, TQWidget *parent=0, const char *name=0) TDE_DEPRECATED;
 
     /**
      * Constructor
@@ -493,7 +493,7 @@ public:
      * @param  parent parent TQWidget
      * @param  name   internal name for this widget
      **/
-    KDoubleNumInput(KNumInput* below, double value, TQWidget* parent=0, const char* name=0) KDE_DEPRECATED;
+    KDoubleNumInput(KNumInput* below, double value, TQWidget* parent=0, const char* name=0) TDE_DEPRECATED;
 
     /**
      * Constructor
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index df3bca44b..76d643b9f 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -361,7 +361,7 @@ protected:
      * @deprecated Reimplement positionChange instead.
      **/
     // FIXME: Remove for KDE 4
-    virtual KDE_DEPRECATED void orientationChange( Orientation /* orientation*/) {}
+    virtual TDE_DEPRECATED void orientationChange( Orientation /* orientation*/) {}
 
     /**
      * A convenience method that translates the position of the applet into which
@@ -376,7 +376,7 @@ protected:
      * @deprecated Reimplement positionChange instead.
      **/
     // FIXME: Remove for KDE 4
-    virtual KDE_DEPRECATED void popupDirectionChange( Direction /*direction*/ ) {}
+    virtual TDE_DEPRECATED void popupDirectionChange( Direction /*direction*/ ) {}
 
     bool eventFilter(TQObject *, TQEvent *);
 
diff --git a/tdeui/kpassdlg.h b/tdeui/kpassdlg.h
index 039f1c506..3eb2ea100 100644
--- a/tdeui/kpassdlg.h
+++ b/tdeui/kpassdlg.h
@@ -67,7 +67,7 @@ public:
      * @deprecated, will be removed in KDE 4.0
      * Creates a password input widget using echoMode as "echo mode".
      */
-    KPasswordEdit(TQWidget *parent, const char *name, int echoMode) KDE_DEPRECATED;
+    KPasswordEdit(TQWidget *parent, const char *name, int echoMode) TDE_DEPRECATED;
 
     /**
      * Destructs the widget.
@@ -192,7 +192,7 @@ public:
      * possibility to specify a parent. Will be removed in KDE 4.0
      */
     KPasswordDialog(int type, TQString prompt, bool enableKeep=false,
-                    int extraBttn=0) KDE_DEPRECATED;
+                    int extraBttn=0) TDE_DEPRECATED;
     // note that this implicitly deprecates the 'prompt' variants of
     // getPassword() below. i guess the above constructor needs to be extended.
 
diff --git a/tdeui/kprogress.h b/tdeui/kprogress.h
index ada1f4fc0..68d88e9cf 100644
--- a/tdeui/kprogress.h
+++ b/tdeui/kprogress.h
@@ -78,7 +78,7 @@ public:
    * @see setValue()
    */
   // ### Remove this KDE 4.0
-  int value() const KDE_DEPRECATED;
+  int value() const TDE_DEPRECATED;
 
   /**
    * Returns @p true if progress text will be displayed,
@@ -99,13 +99,13 @@ public:
    * Use setTotalSteps() instead
    */
   // ### Remove this KDE 4.0
-  void setRange(int min, int max) KDE_DEPRECATED;
+  void setRange(int min, int max) TDE_DEPRECATED;
 
   /**
    * @deprecated Use totalSteps() instead
    */
   // ### Remove this KDE 4.0
-  int maxValue() KDE_DEPRECATED;
+  int maxValue() TDE_DEPRECATED;
 
 public slots:
 
@@ -234,7 +234,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        TQString labelText() KDE_DEPRECATED;
+        TQString labelText() TDE_DEPRECATED;
 
         /**
          * Returns the current dialog text
@@ -257,7 +257,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        bool allowCancel() KDE_DEPRECATED;
+        bool allowCancel() TDE_DEPRECATED;
 
         /**
          * Returns true if the dialog can be canceled, false otherwise
@@ -344,7 +344,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        TQString buttonText() KDE_DEPRECATED;
+        TQString buttonText() TDE_DEPRECATED;
 
         /**
          * Returns the text on the cancel button
@@ -362,7 +362,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        int  minimumDuration() KDE_DEPRECATED;
+        int  minimumDuration() TDE_DEPRECATED;
 
         /**
          * Returns the wait duration in milliseconds
diff --git a/tdeui/kprogressbox.h b/tdeui/kprogressbox.h
index 5d9f3bd8b..b06e85921 100644
--- a/tdeui/kprogressbox.h
+++ b/tdeui/kprogressbox.h
@@ -115,7 +115,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        TQString labelText() KDE_DEPRECATED;
+        TQString labelText() TDE_DEPRECATED;
 
         /**
          * Returns the current dialog text
@@ -145,7 +145,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        bool allowCancel() KDE_DEPRECATED;
+        bool allowCancel() TDE_DEPRECATED;
 
         /**
          * Returns true if the dialog can be canceled, false otherwise
@@ -232,7 +232,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        TQString buttonText() KDE_DEPRECATED;
+        TQString buttonText() TDE_DEPRECATED;
 
         /**
          * Returns the text on the cancel button
@@ -250,7 +250,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
          * @deprecated
          */
         // ### Remove this KDE 4.0
-        int  minimumDuration() KDE_DEPRECATED;
+        int  minimumDuration() TDE_DEPRECATED;
 
         /**
          * Returns the wait duration in milliseconds
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 485580fbb..194d10d3c 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -97,7 +97,7 @@ public:
      * Deprecated, use isAvailable() instead.
      * @deprecated
      */
-    KDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); }
+    TDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); }
 #endif
 
     /** @since 3.2
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index c962fd947..6279d567d 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -275,19 +275,19 @@ public:
    * @deprecated
    * This method has no effect other than an update. Do not use.
    **/
-  void setValuePerLittleMark(int) KDE_DEPRECATED;
+  void setValuePerLittleMark(int) TDE_DEPRECATED;
 
   /**
    * @deprecated
    * This method has no effect other than an update. Do not use.
    **/
-  void setValuePerMediumMark(int) KDE_DEPRECATED;
+  void setValuePerMediumMark(int) TDE_DEPRECATED;
 
   /**
    * @deprecated
    * This method has no effect other than an update. Do not use.
    */
-  void setValuePerBigMark(int) KDE_DEPRECATED;
+  void setValuePerBigMark(int) TDE_DEPRECATED;
 
   /**
    * Show/hide number values of the little marks.
diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h
index 76aad98a8..28194455b 100644
--- a/tdeui/kstdaction.h
+++ b/tdeui/kstdaction.h
@@ -499,7 +499,7 @@ namespace KStdAction
 	* @since 3.1
 	*/
 	TDEUI_EXPORT TDEToggleAction *showToolbar(const TQObject *recvr, const char *slot,
-					TDEActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
+					TDEActionCollection* parent, const char *name = 0 ) TDE_DEPRECATED;
 	/**
 	* @obsolete. toolbar actions are created automatically now in the
 	* Settings menu. Don't use this anymore.
@@ -507,7 +507,7 @@ namespace KStdAction
 	* Show/Hide the primary toolbar.
 	*/
 	TDEUI_EXPORT TDEToggleToolBarAction *showToolbar(const char* toolBarName,
-					TDEActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
+					TDEActionCollection* parent, const char *name = 0 ) TDE_DEPRECATED;
 
 	/**
 	* Show/Hide the statusbar.
diff --git a/tdeui/tdeaboutdialog.h b/tdeui/tdeaboutdialog.h
index d637a64b7..3e80bb11d 100644
--- a/tdeui/tdeaboutdialog.h
+++ b/tdeui/tdeaboutdialog.h
@@ -402,7 +402,7 @@ class TDEUI_EXPORT TDEAboutDialog : public KDialogBase
    *
    * @since 3.3
    */
-  void setIcon( const TQString &fileName ) KDE_DEPRECATED; // KDE4: remove
+  void setIcon( const TQString &fileName ) TDE_DEPRECATED; // KDE4: remove
 
   /**
    * Overloaded version of setProgramLogo(const TQPixmap& pixmap).
diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h
index 9bf232c49..723522d58 100644
--- a/tdeui/tdeaction.h
+++ b/tdeui/tdeaction.h
@@ -364,7 +364,7 @@ public:
      * the TDEAccel configuration dialog (this is somehow deprecated since
      * there is now a TDEAction key configuration dialog).
      */
-    virtual void plugAccel(TDEAccel *accel, bool configurable = true) KDE_DEPRECATED;
+    virtual void plugAccel(TDEAccel *accel, bool configurable = true) TDE_DEPRECATED;
 
     /**
      * "Unplug" or remove this action from a given widget.
@@ -384,7 +384,7 @@ public:
      * @deprecated.  Complement method to plugAccel().
      * Disconnect this action from the TDEAccel.
      */
-    virtual void unplugAccel() KDE_DEPRECATED;
+    virtual void unplugAccel() TDE_DEPRECATED;
 
     /**
      * returns whether the action is plugged into any container widget or not.
@@ -640,7 +640,7 @@ public:
      * @deprecated.  Use shortcut().
      * Get the keyboard accelerator associated with this action.
      */
-    int accel() const KDE_DEPRECATED;
+    int accel() const TDE_DEPRECATED;
 
     TQString statusText() const
         { return toolTip(); }
@@ -649,7 +649,7 @@ public:
      * @deprecated.  Use setShortcut().
      * Sets the keyboard accelerator associated with this action.
      */
-    void setAccel( int key ) KDE_DEPRECATED;
+    void setAccel( int key ) TDE_DEPRECATED;
 
     /**
      * @deprecated. Use setToolTip instead (they do the same thing now).
diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h
index f7536a6b3..52d155710 100644
--- a/tdeui/tdeactionclasses.h
+++ b/tdeui/tdeactionclasses.h
@@ -483,7 +483,7 @@ public:
      * @deprecated See setMenuAccelsEnabled .
      * @since 3.1
      */
-    void setRemoveAmpersandsInCombo( bool b ) KDE_DEPRECATED;
+    void setRemoveAmpersandsInCombo( bool b ) TDE_DEPRECATED;
     /// @since 3.1
     bool removeAmpersandsInCombo() const;
 
diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h
index 4de022d3e..a2b3758b8 100644
--- a/tdeui/tdeactioncollection.h
+++ b/tdeui/tdeactioncollection.h
@@ -143,9 +143,9 @@ public:
   //bool ownsTDEAccel() const;
 
   /** @deprecated  Deprecated because of ambiguous name.  Use tdeaccel() */
-  virtual TDEAccel* accel() KDE_DEPRECATED;
+  virtual TDEAccel* accel() TDE_DEPRECATED;
   /** @deprecated  Deprecated because of ambiguous name.  Use tdeaccel() */
-  virtual const TDEAccel* accel() const KDE_DEPRECATED;
+  virtual const TDEAccel* accel() const TDE_DEPRECATED;
 
   /** Returns the TDEAccel object of the most recently set widget. */
   TDEAccel* tdeaccel();
diff --git a/tdeui/tdelistview.h b/tdeui/tdelistview.h
index c07d040e4..8e42aceaa 100644
--- a/tdeui/tdelistview.h
+++ b/tdeui/tdelistview.h
@@ -286,7 +286,7 @@ public:
    * Do not use.
    * @deprecated
    */
-  bool createChildren() const KDE_DEPRECATED;
+  bool createChildren() const TDE_DEPRECATED;
 
   /**
    * @return true if drawing of the drop-highlighter has been enabled.  False by default.
@@ -329,7 +329,7 @@ public:
    * @deprecated
    * @see setFullWidth()
    */
-  void setFullWidth() KDE_DEPRECATED;
+  void setFullWidth() TDE_DEPRECATED;
 
   /**
    * Let the last column fit exactly all the available width.
@@ -723,7 +723,7 @@ public slots:
    * Do not use.
    * @deprecated
    */
-  virtual void setCreateChildren(bool b) KDE_DEPRECATED;
+  virtual void setCreateChildren(bool b) TDE_DEPRECATED;
 
   /**
    * Set the selection mode.
@@ -1165,7 +1165,7 @@ public:
   /**
    * returns the background color for this item
    */
-  const TQColor &backgroundColor() KDE_DEPRECATED;  // #### should be removed in 4.0; use below instead
+  const TQColor &backgroundColor() TDE_DEPRECATED;  // #### should be removed in 4.0; use below instead
 
   /**
    * returns the background color for this item at given column
diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h
index 446b9c937..0a624b040 100644
--- a/tdeui/tdemainwindow.h
+++ b/tdeui/tdemainwindow.h
@@ -668,7 +668,7 @@ public:
      *
      */
     // KDE4 to be removed
-    TQSize sizeForCentralWidgetSize(TQSize size) KDE_DEPRECATED;
+    TQSize sizeForCentralWidgetSize(TQSize size) TDE_DEPRECATED;
 
     /**
      * @internal
diff --git a/tdeui/tdepopupmenu.h b/tdeui/tdepopupmenu.h
index 1a03ad11b..d0bc0b49b 100644
--- a/tdeui/tdepopupmenu.h
+++ b/tdeui/tdepopupmenu.h
@@ -51,14 +51,14 @@ public:
      */
     TDEPopupTitle(KPixmapEffect::GradientType gradient, const TQColor &color,
                 const TQColor &textColor, TQWidget *parent=0,
-                const char *name=0) KDE_DEPRECATED;
+                const char *name=0) TDE_DEPRECATED;
     /**
      * @deprecated
      * Constructs a title widget with the specified pixmap and colors.
      */
     TDEPopupTitle(const KPixmap &background, const TQColor &color,
                 const TQColor &textColor, TQWidget *parent=0,
-                const char *name=0) KDE_DEPRECATED;
+                const char *name=0) TDE_DEPRECATED;
     /**
      * Sets the title string and optional icon for the title widget.
      *
@@ -191,14 +191,14 @@ public:
      * Obsolete method provided for backwards compatibility only. Use the
      * normal constructor and insertTitle instead.
      */
-    TDEPopupMenu(const TQString &title, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED;
+    TDEPopupMenu(const TQString &title, TQWidget *parent=0, const char *name=0) TDE_DEPRECATED;
 
     /**
      * @deprecated
      * Obsolete method provided for backwards compatibility only. Use
      * insertTitle and changeTitle instead.
      */
-    void setTitle(const TQString &title) KDE_DEPRECATED;
+    void setTitle(const TQString &title) TDE_DEPRECATED;
 
     /**
      * Returns the context menu associated with this menu
diff --git a/tdeui/tdespell.h b/tdeui/tdespell.h
index 802c5567b..1ff854cfc 100644
--- a/tdeui/tdespell.h
+++ b/tdeui/tdespell.h
@@ -310,7 +310,7 @@ public:
    * Your application's GUI will still be updated, however.
    *
    */
-  static int modalCheck( TQString& text ) KDE_DEPRECATED;
+  static int modalCheck( TQString& text ) TDE_DEPRECATED;
 
   /**
    * Performs a synchronous spellcheck.
diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h
index 919af5cfe..c2b9d865b 100644
--- a/tdeui/tdetoolbar.h
+++ b/tdeui/tdetoolbar.h
@@ -733,7 +733,7 @@ public:
    * Enable or disable moving of toolbar.
    * @deprecated use setMovingEnabled(bool) instead.
    */
-    void enableMoving(bool flag = true) KDE_DEPRECATED;
+    void enableMoving(bool flag = true) TDE_DEPRECATED;
 
     /**
    * Set position of toolbar.
@@ -755,13 +755,13 @@ public:
    * @see BarStatus
    * @deprecated
    */
-    bool enable(BarStatus stat) KDE_DEPRECATED;
+    bool enable(BarStatus stat) TDE_DEPRECATED;
 
   /**
    * Use setMaximumHeight() instead.
    * @deprecated
    */
-    void setMaxHeight (int h) KDE_DEPRECATED;  // Set max height for vertical toolbars
+    void setMaxHeight (int h) TDE_DEPRECATED;  // Set max height for vertical toolbars
 
   /**
    * Returns the value set with setMaxHeight().
@@ -769,14 +769,14 @@ public:
    * Use maximumHeight() instead.
    * @return the value set with setMaxHeight().
    */
-    int maxHeight() KDE_DEPRECATED;
+    int maxHeight() TDE_DEPRECATED;
 
   /**
    * Use setMaximumWidth() instead.
    * Set maximal width of horizontal (top or bottom) toolbar.
    * @deprecated
    */
-    void setMaxWidth (int dw) KDE_DEPRECATED;
+    void setMaxWidth (int dw) TDE_DEPRECATED;
 
   /**
    * Returns the value set with setMaxWidth().
@@ -784,7 +784,7 @@ public:
    * @return the value set with setMaxWidth().
    * @deprecated
    */
-    int maxWidth() KDE_DEPRECATED;
+    int maxWidth() TDE_DEPRECATED;
 
   /**
    * Set title for toolbar when it floats.
@@ -798,7 +798,7 @@ public:
    * Use setMovingEnabled(bool) instead.
    * @deprecated
    */
-    void enableFloating (bool flag) KDE_DEPRECATED;
+    void enableFloating (bool flag) TDE_DEPRECATED;
 
   /**
    * Set the kind of painting for buttons.
diff --git a/tdeui/tdetoolbarbutton.h b/tdeui/tdetoolbarbutton.h
index 0c2d65fb4..a7b1addf9 100644
--- a/tdeui/tdetoolbarbutton.h
+++ b/tdeui/tdetoolbarbutton.h
@@ -101,7 +101,7 @@ public:
    * @param pixmap The active pixmap
    */
   // this one is from TQButton, so #ifdef-ing it out doesn't break BC
-  virtual void setPixmap(const TQPixmap &pixmap) KDE_DEPRECATED;
+  virtual void setPixmap(const TQPixmap &pixmap) TDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -110,7 +110,7 @@ public:
    *
    * @param pixmap The pixmap to use as the default (normal) one
    */
-  void setDefaultPixmap(const TQPixmap& pixmap) KDE_DEPRECATED;
+  void setDefaultPixmap(const TQPixmap& pixmap) TDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -119,7 +119,7 @@ public:
    *
    * @param pixmap The pixmap to use when disabled
    */
-  void setDisabledPixmap(const TQPixmap& pixmap) KDE_DEPRECATED;
+  void setDisabledPixmap(const TQPixmap& pixmap) TDE_DEPRECATED;
 #endif
 
   /**
@@ -162,7 +162,7 @@ public:
    * @param generate If true, then the other icons are automagically
    *                 generated from this one
    */
-  KDE_DEPRECATED void setIcon(const TQString &icon, bool generate ) { Q_UNUSED(generate); setIcon( icon ); }
+  TDE_DEPRECATED void setIcon(const TQString &icon, bool generate ) { Q_UNUSED(generate); setIcon( icon ); }
 
   /**
    * @deprecated
@@ -171,7 +171,7 @@ public:
    *
    * @param icon The icon to use as the default (normal) one
    */
-  void setDefaultIcon(const TQString& icon) KDE_DEPRECATED;
+  void setDefaultIcon(const TQString& icon) TDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -180,7 +180,7 @@ public:
    *
    * @param icon The icon to use when disabled
    */
-  void setDisabledIcon(const TQString& icon) KDE_DEPRECATED;
+  void setDisabledIcon(const TQString& icon) TDE_DEPRECATED;
 #endif
 
   /**