diff --git a/extra/kde320/kurifilter.h b/extra/kde320/kurifilter.h
index d0c54e6..1bb11c2 100644
--- a/extra/kde320/kurifilter.h
+++ b/extra/kde320/kurifilter.h
@@ -138,7 +138,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde320/tdetoolbarbutton.h b/extra/kde320/tdetoolbarbutton.h
index 32f0a37..aa07082 100644
--- a/extra/kde320/tdetoolbarbutton.h
+++ b/extra/kde320/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde321/kurifilter.h b/extra/kde321/kurifilter.h
index d0c54e6..1bb11c2 100644
--- a/extra/kde321/kurifilter.h
+++ b/extra/kde321/kurifilter.h
@@ -138,7 +138,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde321/tdetoolbarbutton.h b/extra/kde321/tdetoolbarbutton.h
index 32f0a37..aa07082 100644
--- a/extra/kde321/tdetoolbarbutton.h
+++ b/extra/kde321/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde322/kurifilter.h b/extra/kde322/kurifilter.h
index d0c54e6..1bb11c2 100644
--- a/extra/kde322/kurifilter.h
+++ b/extra/kde322/kurifilter.h
@@ -138,7 +138,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde322/tdetoolbarbutton.h b/extra/kde322/tdetoolbarbutton.h
index 32f0a37..aa07082 100644
--- a/extra/kde322/tdetoolbarbutton.h
+++ b/extra/kde322/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde323/kurifilter.h b/extra/kde323/kurifilter.h
index d0c54e6..1bb11c2 100644
--- a/extra/kde323/kurifilter.h
+++ b/extra/kde323/kurifilter.h
@@ -138,7 +138,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde323/tdetoolbarbutton.h b/extra/kde323/tdetoolbarbutton.h
index 32f0a37..aa07082 100644
--- a/extra/kde323/tdetoolbarbutton.h
+++ b/extra/kde323/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde330/kurifilter.h b/extra/kde330/kurifilter.h
index d0c54e6..1bb11c2 100644
--- a/extra/kde330/kurifilter.h
+++ b/extra/kde330/kurifilter.h
@@ -138,7 +138,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde330/tdetoolbarbutton.h b/extra/kde330/tdetoolbarbutton.h
index 1fc9c2a..b4f9b95 100644
--- a/extra/kde330/tdetoolbarbutton.h
+++ b/extra/kde330/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde331/kurifilter.h b/extra/kde331/kurifilter.h
index d0c54e6..1bb11c2 100644
--- a/extra/kde331/kurifilter.h
+++ b/extra/kde331/kurifilter.h
@@ -138,7 +138,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde331/tdetoolbarbutton.h b/extra/kde331/tdetoolbarbutton.h
index 1fc9c2a..b4f9b95 100644
--- a/extra/kde331/tdetoolbarbutton.h
+++ b/extra/kde331/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde332/kurifilter.h b/extra/kde332/kurifilter.h
index d0c54e6..1bb11c2 100644
--- a/extra/kde332/kurifilter.h
+++ b/extra/kde332/kurifilter.h
@@ -138,7 +138,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde332/tdetoolbarbutton.h b/extra/kde332/tdetoolbarbutton.h
index 1fc9c2a..b4f9b95 100644
--- a/extra/kde332/tdetoolbarbutton.h
+++ b/extra/kde332/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde340/kurifilter.h b/extra/kde340/kurifilter.h
index 7f35de6..b5b4909 100644
--- a/extra/kde340/kurifilter.h
+++ b/extra/kde340/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde340/tdetoolbarbutton.h b/extra/kde340/tdetoolbarbutton.h
index 1e6246c..bcca769 100644
--- a/extra/kde340/tdetoolbarbutton.h
+++ b/extra/kde340/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde341/kurifilter.h b/extra/kde341/kurifilter.h
index 7f35de6..b5b4909 100644
--- a/extra/kde341/kurifilter.h
+++ b/extra/kde341/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde341/tdetoolbarbutton.h b/extra/kde341/tdetoolbarbutton.h
index 1e6246c..bcca769 100644
--- a/extra/kde341/tdetoolbarbutton.h
+++ b/extra/kde341/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde342/kurifilter.h b/extra/kde342/kurifilter.h
index 7f35de6..b5b4909 100644
--- a/extra/kde342/kurifilter.h
+++ b/extra/kde342/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde342/tdetoolbarbutton.h b/extra/kde342/tdetoolbarbutton.h
index 91c7428..d047d8e 100644
--- a/extra/kde342/tdetoolbarbutton.h
+++ b/extra/kde342/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde343/kurifilter.h b/extra/kde343/kurifilter.h
index 7f35de6..b5b4909 100644
--- a/extra/kde343/kurifilter.h
+++ b/extra/kde343/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde343/tdetoolbarbutton.h b/extra/kde343/tdetoolbarbutton.h
index 91c7428..d047d8e 100644
--- a/extra/kde343/tdetoolbarbutton.h
+++ b/extra/kde343/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde350/kurifilter.h b/extra/kde350/kurifilter.h
index 682b72a..28bc6a8 100644
--- a/extra/kde350/kurifilter.h
+++ b/extra/kde350/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde350/tdetoolbarbutton.h b/extra/kde350/tdetoolbarbutton.h
index 024b921..52d2c5f 100644
--- a/extra/kde350/tdetoolbarbutton.h
+++ b/extra/kde350/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde351/kurifilter.h b/extra/kde351/kurifilter.h
index 682b72a..28bc6a8 100644
--- a/extra/kde351/kurifilter.h
+++ b/extra/kde351/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde351/tdetoolbarbutton.h b/extra/kde351/tdetoolbarbutton.h
index 024b921..52d2c5f 100644
--- a/extra/kde351/tdetoolbarbutton.h
+++ b/extra/kde351/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde352/kurifilter.h b/extra/kde352/kurifilter.h
index 682b72a..28bc6a8 100644
--- a/extra/kde352/kurifilter.h
+++ b/extra/kde352/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde352/tdetoolbarbutton.h b/extra/kde352/tdetoolbarbutton.h
index 024b921..52d2c5f 100644
--- a/extra/kde352/tdetoolbarbutton.h
+++ b/extra/kde352/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/extra/kde353/kurifilter.h b/extra/kde353/kurifilter.h
index 682b72a..28bc6a8 100644
--- a/extra/kde353/kurifilter.h
+++ b/extra/kde353/kurifilter.h
@@ -141,7 +141,7 @@ public:
      *
      * @deprecated
      */
-    KDE_DEPRECATED bool hasBeenFiltered() const { return true; }
+    TDE_DEPRECATED bool hasBeenFiltered() const { return true; }
 
     /**
      * Returns the filtered or the original URL.
diff --git a/extra/kde353/tdetoolbarbutton.h b/extra/kde353/tdetoolbarbutton.h
index 024b921..52d2c5f 100644
--- a/extra/kde353/tdetoolbarbutton.h
+++ b/extra/kde353/tdetoolbarbutton.h
@@ -100,7 +100,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
@@ -109,7 +109,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
@@ -118,7 +118,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
 
   /**
@@ -161,7 +161,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
@@ -170,7 +170,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
@@ -179,7 +179,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
 
   /**
diff --git a/pytde350.prj b/pytde350.prj
index 09204b7..a9de507 100644
--- a/pytde350.prj
+++ b/pytde350.prj
@@ -53,7 +53,7 @@ importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ./extra/kde350/dcop
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
 retain
@@ -212,7 +212,7 @@ import     = tdeuimod.sip
 import     = tdeiomod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDERESOURCES_EXPORT", ""
 
 retain
@@ -235,7 +235,7 @@ import     = tdeiomod.sip
 import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltdeabc
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDEABC_EXPORT", ""
 define     = "typedef enum", "enum"
 
diff --git a/pytde351.prj b/pytde351.prj
index 63ae164..f908214 100644
--- a/pytde351.prj
+++ b/pytde351.prj
@@ -53,7 +53,7 @@ importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ./extra/kde351/dcop
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
 retain
@@ -212,7 +212,7 @@ import     = tdeuimod.sip
 import     = tdeiomod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDERESOURCES_EXPORT", ""
 
 retain
@@ -235,7 +235,7 @@ import     = tdeiomod.sip
 import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltdeabc -ltdeabc_file
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDEABC_EXPORT", ""
 define     = "typedef enum", "enum"
 
diff --git a/pytde352.prj b/pytde352.prj
index 745b46b..588425d 100644
--- a/pytde352.prj
+++ b/pytde352.prj
@@ -53,7 +53,7 @@ importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ./extra/kde352/dcop
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
 retain
@@ -212,7 +212,7 @@ import     = tdeuimod.sip
 import     = tdeiomod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDERESOURCES_EXPORT", ""
 
 retain
@@ -235,7 +235,7 @@ import     = tdeiomod.sip
 import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltdeabc -ltdeabc_file
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDEABC_EXPORT", ""
 define     = "typedef enum", "enum"
 
diff --git a/pytde353.prj b/pytde353.prj
index 1eed076..3b37c20 100644
--- a/pytde353.prj
+++ b/pytde353.prj
@@ -53,7 +53,7 @@ importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ./extra/kde353/dcop
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
 retain
@@ -212,7 +212,7 @@ import     = tdeuimod.sip
 import     = tdeiomod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltderesources
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDERESOURCES_EXPORT", ""
 
 retain
@@ -235,7 +235,7 @@ import     = tdeiomod.sip
 import     = tderesourcesmod.sip
 importpath = $IMP
 libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -ltdeabc -ltdeabc_file
-define     = "KDE_DEPRECATED", ""
+define     = "TDE_DEPRECATED", ""
 define     = "TDEABC_EXPORT", ""
 define     = "typedef enum", "enum"