Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

52 files changed, 239 insertions, 239 deletions

diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index fc9ba331b..41f49333d 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -428,10 +428,10 @@ LOOP:
 #			);
 #
 
-		next if ( $p =~ /^\s*Q_ENUMS/			# ignore Q_ENUMS
-						|| $p =~ /^\s*Q_PROPERTY/		# and Q_PROPERTY
-						|| $p =~ /^\s*Q_OVERRIDE/		# and Q_OVERRIDE
-						|| $p =~ /^\s*Q_SETS/
+		next if ( $p =~ /^\s*TQ_ENUMS/			# ignore TQ_ENUMS
+						|| $p =~ /^\s*TQ_PROPERTY/		# and TQ_PROPERTY
+						|| $p =~ /^\s*TQ_OVERRIDE/		# and TQ_OVERRIDE
+						|| $p =~ /^\s*TQ_SETS/
 						|| $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/
 						|| $p =~ /^\s*K_SYCOCATYPE/		# and K_SYCOCA stuff
 						|| $p =~ /^\s*K_SYCOCAFACTORY/	#
diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml
index 50b6991d6..2de80b9cb 100644
--- a/kate/data/cpp.xml
+++ b/kate/data/cpp.xml
@@ -91,7 +91,7 @@
       <item> Q_ASSERT </item>
       <item> Q_ASSERT_X </item>
       <item> Q_CHECK_PTR </item>
-      <item> Q_CLASSINFO </item>
+      <item> TQ_CLASSINFO </item>
       <item> Q_CLEANUP_RESOURCE </item>
       <item> Q_D </item>
       <item> Q_DECLARE_FLAGS </item>
@@ -105,7 +105,7 @@
       <item> Q_DECLARE_TYPEINFO </item>
       <item> Q_DISABLE_COPY </item>
       <item> Q_EMIT </item>
-      <item> Q_ENUMS </item>
+      <item> TQ_ENUMS </item>
       <item> Q_EXPORT </item>
       <item> Q_FLAGS </item>
       <item> Q_FOREACH </item>
@@ -118,13 +118,13 @@
       <item> Q_INVOKABLE </item>
       <item> Q_NOREPLY </item>
       <item> Q_OBJECT </item>
-      <item> Q_OVERRIDE </item>
+      <item> TQ_OVERRIDE </item>
       <item> Q_PRIVATE_SLOT </item>
-      <item> Q_PROPERTY </item>
+      <item> TQ_PROPERTY </item>
       <item> Q_Q </item>
       <item> Q_RETURN_ARG </item>
       <item> Q_SCRIPTABLE </item>
-      <item> Q_SETS </item>
+      <item> TQ_SETS </item>
       <item> Q_SIGNALS </item>
       <item> Q_SLOTS </item>
       <item> Q_UNUSED </item>
diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml
index bf038d4a2..94e78f6bc 100644
--- a/kate/data/objectivecpp.xml
+++ b/kate/data/objectivecpp.xml
@@ -84,13 +84,13 @@
       <item> K_DCOP </item>
       <item> SLOT </item>
       <item> SIGNAL </item>
-      <item> Q_CLASSINFO </item>
-      <item> Q_ENUMS </item>
+      <item> TQ_CLASSINFO </item>
+      <item> TQ_ENUMS </item>
       <item> Q_EXPORT </item>
       <item> Q_OBJECT </item>
-      <item> Q_OVERRIDE </item>
-      <item> Q_PROPERTY </item>
-      <item> Q_SETS </item>
+      <item> TQ_OVERRIDE </item>
+      <item> TQ_PROPERTY </item>
+      <item> TQ_SETS </item>
       <item> Q_SIGNALS </item>
       <item> Q_SLOTS </item>
       <item> Q_FOREACH </item>
diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h
index af8a1695d..c3c0ba23f 100644
--- a/khtml/khtml_part.h
+++ b/khtml/khtml_part.h
@@ -217,19 +217,19 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
   friend class KHTMLPartFunction;
   friend class KHTMLPopupGUIClient;
 
-  Q_PROPERTY( bool javaScriptEnabled READ jScriptEnabled WRITE setJScriptEnabled )
-  Q_PROPERTY( bool javaEnabled READ javaEnabled WRITE setJavaEnabled )
-  Q_PROPERTY( bool autoloadImages READ autoloadImages WRITE setAutoloadImages )
-  Q_PROPERTY( bool dndEnabled READ dndEnabled WRITE setDNDEnabled )
-  Q_PROPERTY( bool pluginsEnabled READ pluginsEnabled WRITE setPluginsEnabled )
+  TQ_PROPERTY( bool javaScriptEnabled READ jScriptEnabled WRITE setJScriptEnabled )
+  TQ_PROPERTY( bool javaEnabled READ javaEnabled WRITE setJavaEnabled )
+  TQ_PROPERTY( bool autoloadImages READ autoloadImages WRITE setAutoloadImages )
+  TQ_PROPERTY( bool dndEnabled READ dndEnabled WRITE setDNDEnabled )
+  TQ_PROPERTY( bool pluginsEnabled READ pluginsEnabled WRITE setPluginsEnabled )
 
   /*
    *
    * Don't add setOnlyLocalReferences here. It shouldn't be accessible via DCOP.
    *
    **/
-  Q_PROPERTY( TQCString dcopObjectId READ dcopObjectId )
-  Q_PROPERTY( bool modified READ isModified )
+  TQ_PROPERTY( TQCString dcopObjectId READ dcopObjectId )
+  TQ_PROPERTY( bool modified READ isModified )
 
 public:
   enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ };
diff --git a/kio/bookmarks/kbookmarkmenu_p.h b/kio/bookmarks/kbookmarkmenu_p.h
index 4ea245b1a..cb88607fe 100644
--- a/kio/bookmarks/kbookmarkmenu_p.h
+++ b/kio/bookmarks/kbookmarkmenu_p.h
@@ -54,8 +54,8 @@ class KPopupMenu;
 
 class KImportedBookmarksActionMenu : public KActionMenu {
   Q_OBJECT
-  Q_PROPERTY( TQString type READ type WRITE setType )
-  Q_PROPERTY( TQString location READ location WRITE setLocation )
+  TQ_PROPERTY( TQString type READ type WRITE setType )
+  TQ_PROPERTY( TQString location READ location WRITE setLocation )
 public:
   const TQString type() const { return m_type; }
   void setType(const TQString &type) { m_type = type; }
@@ -75,9 +75,9 @@ public:
 
 class KBookmarkActionMenu : public KActionMenu {
   Q_OBJECT
-  Q_PROPERTY( TQString url READ url WRITE setUrl )
-  Q_PROPERTY( TQString address READ address WRITE setAddress )
-  Q_PROPERTY( bool readOnly READ readOnly WRITE setReadOnly )
+  TQ_PROPERTY( TQString url READ url WRITE setUrl )
+  TQ_PROPERTY( TQString address READ address WRITE setAddress )
+  TQ_PROPERTY( bool readOnly READ readOnly WRITE setReadOnly )
 public:
   const TQString url() const { return m_url; }
   void setUrl(const TQString &url) { m_url = url; }
@@ -100,8 +100,8 @@ public:
 
 class KBookmarkAction : public KAction {
   Q_OBJECT
-  Q_PROPERTY( TQString url READ url WRITE setUrl )
-  Q_PROPERTY( TQString address READ address WRITE setAddress )
+  TQ_PROPERTY( TQString url READ url WRITE setUrl )
+  TQ_PROPERTY( TQString address READ address WRITE setAddress )
 public:
   const TQString url() const { return m_url; }
   void setUrl(const TQString &url) { m_url = url; }
diff --git a/kio/kfile/kicondialog.h b/kio/kfile/kicondialog.h
index e15b76884..e533f6800 100644
--- a/kio/kfile/kicondialog.h
+++ b/kio/kfile/kicondialog.h
@@ -257,9 +257,9 @@ private:
 class KIO_EXPORT KIconButton: public TQPushButton
 {
     Q_OBJECT
-    Q_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
-    Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize)
-    Q_PROPERTY( bool strictIconSize READ strictIconSize WRITE setStrictIconSize )
+    TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
+    TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize)
+    TQ_PROPERTY( bool strictIconSize READ strictIconSize WRITE setStrictIconSize )
 
 public:
     /**
diff --git a/kio/kfile/kurlcombobox.h b/kio/kfile/kurlcombobox.h
index d65cd91f5..0a9451075 100644
--- a/kio/kfile/kurlcombobox.h
+++ b/kio/kfile/kurlcombobox.h
@@ -41,8 +41,8 @@
 class KIO_EXPORT KURLComboBox : public KComboBox
 {
     Q_OBJECT
-    Q_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true)
-    Q_PROPERTY(int maxItems READ maxItems WRITE setMaxItems DESIGNABLE true)
+    TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true)
+    TQ_PROPERTY(int maxItems READ maxItems WRITE setMaxItems DESIGNABLE true)
 
 public:
     /**
diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h
index fa40d0656..f5402788a 100644
--- a/kio/kfile/kurlrequester.h
+++ b/kio/kfile/kurlrequester.h
@@ -56,10 +56,10 @@ class TQTimer;
 class KIO_EXPORT KURLRequester : public TQHBox
 {
     Q_OBJECT
-    Q_PROPERTY( TQString url READ url WRITE setURL )
-    Q_PROPERTY( bool showLocalProtocol READ showLocalProtocol WRITE setShowLocalProtocol )
-    Q_PROPERTY( TQString filter READ filter WRITE setFilter )
-    Q_PROPERTY( uint mode READ mode WRITE setMode )
+    TQ_PROPERTY( TQString url READ url WRITE setURL )
+    TQ_PROPERTY( bool showLocalProtocol READ showLocalProtocol WRITE setShowLocalProtocol )
+    TQ_PROPERTY( TQString filter READ filter WRITE setFilter )
+    TQ_PROPERTY( uint mode READ mode WRITE setMode )
 
 public:
     /**
diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h
index d088cc281..cd657f47a 100644
--- a/kio/kio/kdirlister.h
+++ b/kio/kio/kdirlister.h
@@ -59,12 +59,12 @@ class KIO_EXPORT KDirLister : public TQObject
   friend class KDirListerCache;
 
   Q_OBJECT
-  Q_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate )
-  Q_PROPERTY( bool showingDotFiles READ showingDotFiles WRITE setShowingDotFiles )
-  Q_PROPERTY( bool dirOnlyMode READ dirOnlyMode WRITE setDirOnlyMode )
-  Q_PROPERTY( bool autoErrorHandlingEnabled READ autoErrorHandlingEnabled )
-  Q_PROPERTY( TQString nameFilter READ nameFilter WRITE setNameFilter )
-  Q_PROPERTY( TQStringList mimeFilter READ mimeFilters WRITE setMimeFilter RESET clearMimeFilter )
+  TQ_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate )
+  TQ_PROPERTY( bool showingDotFiles READ showingDotFiles WRITE setShowingDotFiles )
+  TQ_PROPERTY( bool dirOnlyMode READ dirOnlyMode WRITE setDirOnlyMode )
+  TQ_PROPERTY( bool autoErrorHandlingEnabled READ autoErrorHandlingEnabled )
+  TQ_PROPERTY( TQString nameFilter READ nameFilter WRITE setNameFilter )
+  TQ_PROPERTY( TQStringList mimeFilter READ mimeFilters WRITE setMimeFilter RESET clearMimeFilter )
 
 public:
   /**
diff --git a/kparts/browserextension.h b/kparts/browserextension.h
index 17bf9d65e..bc5e9cc92 100644
--- a/kparts/browserextension.h
+++ b/kparts/browserextension.h
@@ -308,7 +308,7 @@ class BrowserExtensionPrivate;
 class KPARTS_EXPORT BrowserExtension : public TQObject
 {
   Q_OBJECT
-  Q_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled )
+  TQ_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled )
 public:
   /**
    * Constructor
diff --git a/kparts/browserinterface.h b/kparts/browserinterface.h
index 302f474d7..82521376f 100644
--- a/kparts/browserinterface.h
+++ b/kparts/browserinterface.h
@@ -26,7 +26,7 @@ namespace KParts
  *
  * Qt properties:
  * <code>
- * Q_PROPERTY( uint historyLength READ historyLength );
+ * TQ_PROPERTY( uint historyLength READ historyLength );
  * </code>
  *
  * Callable methods:
diff --git a/kparts/partmanager.h b/kparts/partmanager.h
index ba5c726cc..33c13d3ed 100644
--- a/kparts/partmanager.h
+++ b/kparts/partmanager.h
@@ -50,10 +50,10 @@ class PartManagerPrivate;
 class KPARTS_EXPORT PartManager : public TQObject
 {
   Q_OBJECT
-  Q_ENUMS( SelectionPolicy )
-  Q_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy )
-  Q_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts )
-  Q_PROPERTY( bool ignoreScrollBars READ ignoreScrollBars WRITE setIgnoreScrollBars )
+  TQ_ENUMS( SelectionPolicy )
+  TQ_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy )
+  TQ_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts )
+  TQ_PROPERTY( bool ignoreScrollBars READ ignoreScrollBars WRITE setIgnoreScrollBars )
 public:
   /// Selection policy. The default policy of a PartManager is Direct.
   enum SelectionPolicy { Direct, TriState };
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index aead92f77..c0ba02d34 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -131,10 +131,10 @@ class TQPopupMenu;
  */
 class TDECORE_EXPORT KCompletion : public TQObject
 {
-    Q_ENUMS( CompOrder )
-    Q_PROPERTY( CompOrder order READ order WRITE setOrder )
-    Q_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase )
-    Q_PROPERTY( TQStringList items READ items WRITE setItems )
+    TQ_ENUMS( CompOrder )
+    TQ_PROPERTY( CompOrder order READ order WRITE setOrder )
+    TQ_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase )
+    TQ_PROPERTY( TQStringList items READ items WRITE setItems )
     Q_OBJECT
 
 public:
diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/kconfigdialogmanager.h
index 46c2b03a6..cc2238d4c 100644
--- a/tdecore/kconfigdialogmanager.h
+++ b/tdecore/kconfigdialogmanager.h
@@ -50,14 +50,14 @@ class TQSqlPropertyMap;
  * database, it simply uses the functionality that is built into the
  * TQSqlPropertyMap class.  New widgets can be added to the map using
  * TQSqlPropertyMap::installDefaultMap().  Note that you can't just add any
- * class.  The class must have a matching Q_PROPERTY(...) macro defined.
+ * class.  The class must have a matching TQ_PROPERTY(...) macro defined.
  *
  * For example (note that KColorButton is already added and it doesn't need to
  * manually added):
  *
  * kcolorbutton.h defines the following property:
  * \code
- * Q_PROPERTY( TQColor color READ color WRITE setColor )
+ * TQ_PROPERTY( TQColor color READ color WRITE setColor )
  * \endcode
  *
  * To add KColorButton the following code would be inserted in the main.
diff --git a/tdeui/kaction.h b/tdeui/kaction.h
index 44e77a4d5..dca99b4b0 100644
--- a/tdeui/kaction.h
+++ b/tdeui/kaction.h
@@ -203,15 +203,15 @@ class TDEUI_EXPORT KAction : public TQObject
 {
   friend class KActionCollection;
   Q_OBJECT
-  Q_PROPERTY( int containerCount READ containerCount )
-  Q_PROPERTY( TQString plainText READ plainText )
-  Q_PROPERTY( TQString text READ text WRITE setText )
-  Q_PROPERTY( TQString shortcut READ shortcutText WRITE setShortcutText )
-  Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
-  Q_PROPERTY( TQString group READ group WRITE setGroup )
-  Q_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis )
-  Q_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip )
-  Q_PROPERTY( TQString icon READ icon WRITE setIcon )
+  TQ_PROPERTY( int containerCount READ containerCount )
+  TQ_PROPERTY( TQString plainText READ plainText )
+  TQ_PROPERTY( TQString text READ text WRITE setText )
+  TQ_PROPERTY( TQString shortcut READ shortcutText WRITE setShortcutText )
+  TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
+  TQ_PROPERTY( TQString group READ group WRITE setGroup )
+  TQ_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis )
+  TQ_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip )
+  TQ_PROPERTY( TQString icon READ icon WRITE setIcon )
 public:
     /**
      * Constructs an action with text, potential keyboard
@@ -436,7 +436,7 @@ public:
      */
     virtual const KShortcut& shortcutDefault() const;
 
-    // These two methods are for Q_PROPERTY
+    // These two methods are for TQ_PROPERTY
     TQString shortcutText() const;
     void setShortcutText( const TQString& );
 
diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h
index a51701287..06e00d179 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/kactionclasses.h
@@ -69,8 +69,8 @@ class TDEUI_EXPORT KToggleAction : public KAction
 {
     Q_OBJECT
     
-    Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
-    Q_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup )
+    TQ_PROPERTY( bool checked READ isChecked WRITE setChecked )
+    TQ_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup )
 public:
 
     /**
@@ -332,12 +332,12 @@ class TDEUI_EXPORT KSelectAction : public KAction
 {
     Q_OBJECT
     
-    Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
-    Q_PROPERTY( TQStringList items READ items WRITE setItems )
-    Q_PROPERTY( bool editable READ isEditable WRITE setEditable )
-    Q_PROPERTY( int comboWidth READ comboWidth WRITE setComboWidth )
-    Q_PROPERTY( TQString currentText READ currentText )
-    Q_PROPERTY( bool menuAccelsEnabled READ menuAccelsEnabled WRITE setMenuAccelsEnabled )
+    TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
+    TQ_PROPERTY( TQStringList items READ items WRITE setItems )
+    TQ_PROPERTY( bool editable READ isEditable WRITE setEditable )
+    TQ_PROPERTY( int comboWidth READ comboWidth WRITE setComboWidth )
+    TQ_PROPERTY( TQString currentText READ currentText )
+    TQ_PROPERTY( bool menuAccelsEnabled READ menuAccelsEnabled WRITE setMenuAccelsEnabled )
 public:
 
     /**
@@ -701,7 +701,7 @@ class TDEUI_EXPORT KRecentFilesAction : public KListAction  // TODO public KSele
 {
   Q_OBJECT
   
-  Q_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems )
+  TQ_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems )
 public:
   /**
    *  @param text The text that will be displayed.
@@ -911,7 +911,7 @@ class TDEUI_EXPORT KFontAction : public KSelectAction
 {
     Q_OBJECT
     
-    Q_PROPERTY( TQString font READ font WRITE setFont )
+    TQ_PROPERTY( TQString font READ font WRITE setFont )
 public:
     KFontAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0,
                  const char* name = 0 );
@@ -962,7 +962,7 @@ class TDEUI_EXPORT KFontSizeAction : public KSelectAction
 {
     Q_OBJECT
     
-    Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
+    TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
     KFontSizeAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0,
                      const char* name = 0 );
@@ -1021,8 +1021,8 @@ class TDEUI_EXPORT KActionMenu : public KAction
 {
   Q_OBJECT
   
-  Q_PROPERTY( bool delayed READ delayed WRITE setDelayed )
-  Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
+  TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed )
+  TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 
 public:
     KActionMenu( const TQString& text, TQObject* parent = 0,
@@ -1095,8 +1095,8 @@ class TDEUI_EXPORT KToolBarPopupAction : public KAction
 {
   Q_OBJECT
   
-  Q_PROPERTY( bool delayed READ delayed WRITE setDelayed )
-  Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
+  TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed )
+  TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 
 public:
     //Not all constructors - because we need an icon, since this action only makes
diff --git a/tdeui/kactionselector.h b/tdeui/kactionselector.h
index 43dc6822f..5ac58b0ed 100644
--- a/tdeui/kactionselector.h
+++ b/tdeui/kactionselector.h
@@ -78,15 +78,15 @@ class KActionSelectorPrivate;
 
 class TDEUI_EXPORT KActionSelector : public TQWidget {
   Q_OBJECT
-  Q_ENUMS( ButtonIconSize InsertionPolicy )
-  Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
-  Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled )
-  Q_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel )
-  Q_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel )
-  Q_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize )
-  Q_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy )
-  Q_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy )
-  Q_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
+  TQ_ENUMS( ButtonIconSize InsertionPolicy )
+  TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
+  TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled )
+  TQ_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel )
+  TQ_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel )
+  TQ_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize )
+  TQ_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy )
+  TQ_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy )
+  TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
 
 public:
   KActionSelector( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h
index c9090112a..74f663463 100644
--- a/tdeui/kanimwidget.h
+++ b/tdeui/kanimwidget.h
@@ -55,8 +55,8 @@ class KAnimWidgetPrivate;
 class TDEUI_EXPORT KAnimWidget : public TQFrame
 {
   Q_OBJECT
-  Q_PROPERTY( int size READ size WRITE setSize )
-  Q_PROPERTY( TQString icons READ icons WRITE setIcons )
+  TQ_PROPERTY( int size READ size WRITE setSize )
+  TQ_PROPERTY( TQString icons READ icons WRITE setIcons )
 
 public:
   /**
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index 503191d04..df25c69eb 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -38,7 +38,7 @@ class KArrowButtonPrivate;
 class TDEUI_EXPORT KArrowButton : public TQPushButton
 {
 	Q_OBJECT
-	Q_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )
+	TQ_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )
 
 	public:
 		/**
diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h
index 343af5e6e..3aad21dba 100644
--- a/tdeui/kauthicon.h
+++ b/tdeui/kauthicon.h
@@ -135,7 +135,7 @@ class KWritePermsIconPrivate;
 class TDEUI_EXPORT KWritePermsIcon : public KAuthIcon
 {
   Q_OBJECT
-  Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+  TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
   KWritePermsIcon(const TQString & fileName, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h
index 3baf2fc46..a434154f0 100644
--- a/tdeui/kcharselect.h
+++ b/tdeui/kcharselect.h
@@ -140,10 +140,10 @@ private:
 class TDEUI_EXPORT KCharSelect : public TQVBox
 {
     Q_OBJECT
-    Q_PROPERTY( TQString fontFamily READ font WRITE setFont )
-    Q_PROPERTY( int tableNum READ tableNum WRITE setTableNum )
-    Q_PROPERTY( bool fontComboEnabled READ isFontComboEnabled WRITE enableFontCombo )
-    Q_PROPERTY( bool tableSpinBoxEnabled READ isTableSpinBoxEnabled WRITE enableTableSpinBox )
+    TQ_PROPERTY( TQString fontFamily READ font WRITE setFont )
+    TQ_PROPERTY( int tableNum READ tableNum WRITE setTableNum )
+    TQ_PROPERTY( bool fontComboEnabled READ isFontComboEnabled WRITE enableFontCombo )
+    TQ_PROPERTY( bool tableSpinBoxEnabled READ isTableSpinBoxEnabled WRITE enableTableSpinBox )
 
 public:
     /**
diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h
index d750d3dff..a9ca78ea8 100644
--- a/tdeui/kcolorbutton.h
+++ b/tdeui/kcolorbutton.h
@@ -37,8 +37,8 @@ class KColorButtonPrivate;
 class TDEUI_EXPORT KColorButton : public TQPushButton
 {
     Q_OBJECT
-    Q_PROPERTY( TQColor color READ color WRITE setColor )
-    Q_PROPERTY( TQColor defaultColor READ defaultColor WRITE setDefaultColor )
+    TQ_PROPERTY( TQColor color READ color WRITE setColor )
+    TQ_PROPERTY( TQColor defaultColor READ defaultColor WRITE setDefaultColor )
 
 public:
     /**
diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h
index cb3970f47..07127a3f9 100644
--- a/tdeui/kcolorcombo.h
+++ b/tdeui/kcolorcombo.h
@@ -39,7 +39,7 @@ class KColorComboInternal;
 class TDEUI_EXPORT KColorCombo : public TQComboBox
 {
     Q_OBJECT
-    Q_PROPERTY( TQColor color READ color WRITE setColor )
+    TQ_PROPERTY( TQColor color READ color WRITE setColor )
 
 public:
     /**
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index 93ae6535e..de3b07aab 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -151,10 +151,10 @@ class KURL;
 class TDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase
 {
   Q_OBJECT
-  Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
-  Q_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
-  Q_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
-  Q_PROPERTY( bool trapReturnKey READ trapReturnKey WRITE setTrapReturnKey )
+  TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
+  TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
+  TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
+  TQ_PROPERTY( bool trapReturnKey READ trapReturnKey WRITE setTrapReturnKey )
 
 public:
 
@@ -540,7 +540,7 @@ class KPixmapProvider;
 class TDEUI_EXPORT KHistoryCombo : public KComboBox
 {
     Q_OBJECT
-    Q_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems )
+    TQ_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems )
 
 public:
     /**
diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h
index b60962214..8016ceab2 100644
--- a/tdeui/kcompletionbox.h
+++ b/tdeui/kcompletionbox.h
@@ -43,9 +43,9 @@ class TQEvent;
 class TDEUI_EXPORT KCompletionBox : public KListBox
 {
     Q_OBJECT
-    Q_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
-    Q_PROPERTY(TQString cancelledText READ cancelledText WRITE setCancelledText)
-    Q_PROPERTY( bool activateOnSelect READ activateOnSelect WRITE setActivateOnSelect )
+    TQ_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
+    TQ_PROPERTY(TQString cancelledText READ cancelledText WRITE setCancelledText)
+    TQ_PROPERTY( bool activateOnSelect READ activateOnSelect WRITE setActivateOnSelect )
 
 public:
     /**
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index f1a5fd9a6..6d966059c 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -51,9 +51,9 @@ class KDateTable;
 class TDEUI_EXPORT KDatePicker: public TQFrame
 {
   Q_OBJECT
-  Q_PROPERTY( TQDate date READ date WRITE setDate)
-  Q_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton )
-  Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
+  TQ_PROPERTY( TQDate date READ date WRITE setDate)
+  TQ_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton )
+  TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 
 public:
   /** The usual constructor.  The given date will be displayed
diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h
index 04a05804c..5e9adbd15 100644
--- a/tdeui/kdatetbl.h
+++ b/tdeui/kdatetbl.h
@@ -263,8 +263,8 @@ public:
 class TDEUI_EXPORT KDateTable : public TQGridView
 {
     Q_OBJECT
-    Q_PROPERTY( TQDate date READ getDate WRITE setDate )
-    Q_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled )
+    TQ_PROPERTY( TQDate date READ getDate WRITE setDate )
+    TQ_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled )
 
 public:
     /**
diff --git a/tdeui/kdatetimewidget.h b/tdeui/kdatetimewidget.h
index 6c14448ee..26c3cf670 100644
--- a/tdeui/kdatetimewidget.h
+++ b/tdeui/kdatetimewidget.h
@@ -40,7 +40,7 @@
 class TDEUI_EXPORT KDateTimeWidget : public TQWidget
 {
   Q_OBJECT
-  Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
+  TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
 
 public:
   /**
diff --git a/tdeui/kdatewidget.h b/tdeui/kdatewidget.h
index fc32a1e2e..c89b382c1 100644
--- a/tdeui/kdatewidget.h
+++ b/tdeui/kdatewidget.h
@@ -36,7 +36,7 @@
 class TDEUI_EXPORT KDateWidget : public TQWidget
 {
   Q_OBJECT
-  Q_PROPERTY( TQDate date READ date WRITE setDate )
+  TQ_PROPERTY( TQDate date READ date WRITE setDate )
 
 public:
   /**
diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h
index 5b49be30e..2495750f8 100644
--- a/tdeui/kdualcolorbutton.h
+++ b/tdeui/kdualcolorbutton.h
@@ -48,11 +48,11 @@ class TQBitmap;
 class TDEUI_EXPORT KDualColorButton : public TQWidget
 {
     Q_OBJECT
-    Q_ENUMS( DualColor )
-    Q_PROPERTY( TQColor foreground READ foreground WRITE setForeground )
-    Q_PROPERTY( TQColor background READ background WRITE setBackground )
-    Q_PROPERTY( TQColor currentColor READ currentColor WRITE setCurrentColor STORED false DESIGNABLE false )
-    Q_PROPERTY( DualColor current READ current WRITE setCurrent )
+    TQ_ENUMS( DualColor )
+    TQ_PROPERTY( TQColor foreground READ foreground WRITE setForeground )
+    TQ_PROPERTY( TQColor background READ background WRITE setBackground )
+    TQ_PROPERTY( TQColor currentColor READ currentColor WRITE setCurrentColor STORED false DESIGNABLE false )
+    TQ_PROPERTY( DualColor current READ current WRITE setCurrent )
 
 public:
 
diff --git a/tdeui/keditcl.h b/tdeui/keditcl.h
index a11789d59..aefd3df81 100644
--- a/tdeui/keditcl.h
+++ b/tdeui/keditcl.h
@@ -59,9 +59,9 @@ private:
 class TDEUI_EXPORT KEdFind : public KDialogBase
 {
     Q_OBJECT
-    Q_PROPERTY( TQString text READ getText WRITE setText )
-    Q_PROPERTY( bool caseSensitivity READ case_sensitive WRITE setCaseSensitive )
-    Q_PROPERTY( bool direction READ get_direction WRITE setDirection )
+    TQ_PROPERTY( TQString text READ getText WRITE setText )
+    TQ_PROPERTY( bool caseSensitivity READ case_sensitive WRITE setCaseSensitive )
+    TQ_PROPERTY( bool direction READ get_direction WRITE setDirection )
 public:
 
     KEdFind( TQWidget *parent = 0, const char *name=0, bool modal=true);
diff --git a/tdeui/kfontcombo.h b/tdeui/kfontcombo.h
index aec6618a4..9b480ff18 100644
--- a/tdeui/kfontcombo.h
+++ b/tdeui/kfontcombo.h
@@ -35,12 +35,12 @@
 class TDEUI_EXPORT KFontCombo : public KComboBox
 {
     Q_OBJECT
-    Q_PROPERTY(TQString family READ currentFont WRITE setCurrentFont)
-    Q_PROPERTY(bool bold READ bold WRITE setBold DESIGNABLE true)
-    Q_PROPERTY(bool italic READ italic WRITE setItalic DESIGNABLE true)
-    Q_PROPERTY(bool underline READ underline WRITE setUnderline DESIGNABLE true)
-    Q_PROPERTY(bool strikeOut READ strikeOut WRITE setStrikeOut DESIGNABLE true)
-    Q_PROPERTY(int fontSize READ size WRITE setSize DESIGNABLE true)
+    TQ_PROPERTY(TQString family READ currentFont WRITE setCurrentFont)
+    TQ_PROPERTY(bool bold READ bold WRITE setBold DESIGNABLE true)
+    TQ_PROPERTY(bool italic READ italic WRITE setItalic DESIGNABLE true)
+    TQ_PROPERTY(bool underline READ underline WRITE setUnderline DESIGNABLE true)
+    TQ_PROPERTY(bool strikeOut READ strikeOut WRITE setStrikeOut DESIGNABLE true)
+    TQ_PROPERTY(int fontSize READ size WRITE setSize DESIGNABLE true)
 public:
     /**
      * Constructor
diff --git a/tdeui/kfontdialog.h b/tdeui/kfontdialog.h
index bb6789837..7f859543c 100644
--- a/tdeui/kfontdialog.h
+++ b/tdeui/kfontdialog.h
@@ -54,7 +54,7 @@ class KIntNumInput;
 class TDEUI_EXPORT KFontChooser : public TQWidget
 {
   Q_OBJECT
-  Q_PROPERTY( TQFont font READ font WRITE setFont )
+  TQ_PROPERTY( TQFont font READ font WRITE setFont )
 
 public:
   /**
diff --git a/tdeui/kfontrequester.h b/tdeui/kfontrequester.h
index f9a8d06cb..5d59f5897 100644
--- a/tdeui/kfontrequester.h
+++ b/tdeui/kfontrequester.h
@@ -45,9 +45,9 @@ class TDEUI_EXPORT KFontRequester : public TQWidget
 {
   Q_OBJECT
 
-  Q_PROPERTY( TQString title READ title WRITE setTitle )
-  Q_PROPERTY( TQString sampleText READ sampleText WRITE setSampleText )
-  Q_PROPERTY( TQFont font READ font WRITE setFont )
+  TQ_PROPERTY( TQString title READ title WRITE setTitle )
+  TQ_PROPERTY( TQString sampleText READ sampleText WRITE setSampleText )
+  TQ_PROPERTY( TQFont font READ font WRITE setFont )
 
   public:
 
diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h
index 12b120b06..5b1149f7b 100644
--- a/tdeui/kiconview.h
+++ b/tdeui/kiconview.h
@@ -43,8 +43,8 @@ class TDEUI_EXPORT KIconView : public TQIconView
 {
   friend class KIconViewItem;
   Q_OBJECT
-  Q_ENUMS( Mode )
-  Q_PROPERTY( Mode mode READ mode WRITE setMode )
+  TQ_ENUMS( Mode )
+  TQ_PROPERTY( Mode mode READ mode WRITE setMode )
 
 public:
   KIconView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/tdeui/kled.h b/tdeui/kled.h
index b4f828ea4..7307be06a 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -45,13 +45,13 @@ class TQColor;
 class TDEUI_EXPORT KLed : public TQWidget
 {
     Q_OBJECT
-    Q_ENUMS( State Shape Look )
-    Q_PROPERTY( State state READ state WRITE setState )
-    Q_PROPERTY( Shape shape READ shape WRITE setShape )
-    Q_PROPERTY( Look look READ look WRITE setLook )
-    Q_PROPERTY( TQColor color READ color WRITE setColor )
-    Q_PROPERTY( TQColor offColor READ color WRITE setOffColor )
-    Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
+    TQ_ENUMS( State Shape Look )
+    TQ_PROPERTY( State state READ state WRITE setState )
+    TQ_PROPERTY( Shape shape READ shape WRITE setShape )
+    TQ_PROPERTY( Look look READ look WRITE setLook )
+    TQ_PROPERTY( TQColor color READ color WRITE setColor )
+    TQ_PROPERTY( TQColor offColor READ color WRITE setOffColor )
+    TQ_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
 
 public:
 
diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h
index 2f683fea0..fc1f4ba4a 100644
--- a/tdeui/klineedit.h
+++ b/tdeui/klineedit.h
@@ -147,12 +147,12 @@ class TDEUI_EXPORT KLineEdit : public TQLineEdit, public KCompletionBase
     friend class KComboBox;
 
     Q_OBJECT
-    Q_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
-    Q_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
-    Q_PROPERTY( bool trapEnterKeyEvent READ trapReturnKey WRITE setTrapReturnKey )
-    Q_PROPERTY( bool enableSqueezedText READ isSqueezedTextEnabled WRITE setEnableSqueezedText )
+    TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
+    TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
+    TQ_PROPERTY( bool trapEnterKeyEvent READ trapReturnKey WRITE setTrapReturnKey )
+    TQ_PROPERTY( bool enableSqueezedText READ isSqueezedTextEnabled WRITE setEnableSqueezedText )
     // @since 3.5.4
-    Q_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
+    TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
 
 public:
 
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index 4b888ffc3..e60ae70b8 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -56,19 +56,19 @@ class TDEUI_EXPORT KListView : public TQListView
 
   Q_OBJECT
   
-  Q_ENUMS( SelectionModeExt )
-  Q_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth )
-  Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
-  Q_PROPERTY( bool itemsRenameable READ itemsRenameable WRITE setItemsRenameable )
-  Q_PROPERTY( bool dragEnabled READ dragEnabled  WRITE  setDragEnabled )
-  Q_PROPERTY( bool autoOpen READ autoOpen WRITE setAutoOpen )
-  Q_PROPERTY( bool dropVisualizer READ dropVisualizer WRITE setDropVisualizer )
-  Q_PROPERTY( int tooltipColumn READ tooltipColumn WRITE  setTooltipColumn )
-  Q_PROPERTY( int dropVisualizerWidth READ dropVisualizerWidth WRITE  setDropVisualizerWidth )
-  Q_PROPERTY( TQColor alternateBackground READ alternateBackground WRITE  setAlternateBackground )
-  Q_PROPERTY( bool shadeSortColumn READ shadeSortColumn WRITE setShadeSortColumn )
-
-  Q_OVERRIDE( SelectionModeExt selectionMode READ selectionModeExt WRITE setSelectionModeExt )
+  TQ_ENUMS( SelectionModeExt )
+  TQ_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth )
+  TQ_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
+  TQ_PROPERTY( bool itemsRenameable READ itemsRenameable WRITE setItemsRenameable )
+  TQ_PROPERTY( bool dragEnabled READ dragEnabled  WRITE  setDragEnabled )
+  TQ_PROPERTY( bool autoOpen READ autoOpen WRITE setAutoOpen )
+  TQ_PROPERTY( bool dropVisualizer READ dropVisualizer WRITE setDropVisualizer )
+  TQ_PROPERTY( int tooltipColumn READ tooltipColumn WRITE  setTooltipColumn )
+  TQ_PROPERTY( int dropVisualizerWidth READ dropVisualizerWidth WRITE  setDropVisualizerWidth )
+  TQ_PROPERTY( TQColor alternateBackground READ alternateBackground WRITE  setAlternateBackground )
+  TQ_PROPERTY( bool shadeSortColumn READ shadeSortColumn WRITE setShadeSortColumn )
+
+  TQ_OVERRIDE( SelectionModeExt selectionMode READ selectionModeExt WRITE setSelectionModeExt )
 
 public:
   /**
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index dece720d2..9b7121e79 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -50,7 +50,7 @@ class TDEUI_EXPORT KNumInput : public TQWidget
 {
     Q_OBJECT
     
-    Q_PROPERTY( TQString label READ label WRITE setLabel )
+    TQ_PROPERTY( TQString label READ label WRITE setLabel )
 public:
     /**
      * Default constructor
@@ -189,14 +189,14 @@ class TDEUI_EXPORT KIntNumInput : public KNumInput
 {
     Q_OBJECT
     
-    Q_PROPERTY( int value READ value WRITE setValue )
-    Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
-    Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
-    Q_PROPERTY( int referencePoint READ referencePoint WRITE setReferencePoint )
-    Q_PROPERTY( double relativeValue READ relativeValue WRITE setRelativeValue )
-    Q_PROPERTY( TQString suffix READ suffix WRITE setSuffix )
-    Q_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
-    Q_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText )
+    TQ_PROPERTY( int value READ value WRITE setValue )
+    TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+    TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( int referencePoint READ referencePoint WRITE setReferencePoint )
+    TQ_PROPERTY( double relativeValue READ relativeValue WRITE setRelativeValue )
+    TQ_PROPERTY( TQString suffix READ suffix WRITE setSuffix )
+    TQ_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
+    TQ_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText )
 
 public:
     /**
@@ -435,15 +435,15 @@ class TDEUI_EXPORT KDoubleNumInput : public KNumInput
 {
     Q_OBJECT
     
-    Q_PROPERTY( double value READ value WRITE setValue )
-    Q_PROPERTY( double minValue READ minValue WRITE setMinValue )
-    Q_PROPERTY( double maxValue READ maxValue WRITE setMaxValue )
-    Q_PROPERTY( TQString suffix READ suffix WRITE setSuffix )
-    Q_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
-    Q_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText )
-    Q_PROPERTY( int precision READ precision WRITE setPrecision )
-    Q_PROPERTY( double referencePoint READ referencePoint WRITE setReferencePoint )
-    Q_PROPERTY( double relativeValue READ relativeValue  WRITE setRelativeValue )
+    TQ_PROPERTY( double value READ value WRITE setValue )
+    TQ_PROPERTY( double minValue READ minValue WRITE setMinValue )
+    TQ_PROPERTY( double maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( TQString suffix READ suffix WRITE setSuffix )
+    TQ_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
+    TQ_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText )
+    TQ_PROPERTY( int precision READ precision WRITE setPrecision )
+    TQ_PROPERTY( double referencePoint READ referencePoint WRITE setReferencePoint )
+    TQ_PROPERTY( double relativeValue READ relativeValue  WRITE setRelativeValue )
 
 public:
     /**
@@ -708,7 +708,7 @@ class TDEUI_EXPORT KIntSpinBox : public TQSpinBox
 {
     Q_OBJECT
     
-    Q_PROPERTY( int base READ base WRITE setBase )
+    TQ_PROPERTY( int base READ base WRITE setBase )
 
 public:
 
@@ -838,12 +838,12 @@ private:
 class TDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
   Q_OBJECT
   
-  Q_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
-  Q_OVERRIDE( double maxValue READ maxValue WRITE setMaxValue )
-  Q_OVERRIDE( double minValue READ minValue WRITE setMinValue )
-  Q_OVERRIDE( double lineStep READ lineStep WRITE setLineStep )
-  Q_OVERRIDE( double value READ value WRITE setValue )
-  Q_PROPERTY( int precision READ precision WRITE setPrecision )
+  TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
+  TQ_OVERRIDE( double maxValue READ maxValue WRITE setMaxValue )
+  TQ_OVERRIDE( double minValue READ minValue WRITE setMinValue )
+  TQ_OVERRIDE( double lineStep READ lineStep WRITE setLineStep )
+  TQ_OVERRIDE( double value READ value WRITE setValue )
+  TQ_PROPERTY( int precision READ precision WRITE setPrecision )
 
 public:
   /** Constructs a KDoubleSpinBox with parent @p parent and
diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h
index 245969231..8fa2ea76e 100644
--- a/tdeui/knumvalidator.h
+++ b/tdeui/knumvalidator.h
@@ -180,7 +180,7 @@ class TDEUI_EXPORT KFloatValidator : public TQValidator {
 
 class TDEUI_EXPORT KDoubleValidator : public TQDoubleValidator {
   Q_OBJECT
-  Q_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
+  TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
 public:
   /** Constuct a locale-aware KDoubleValidator with default range
       (whatever TQDoubleValidator uses for that) and parent @p
diff --git a/tdeui/kpassivepopup.h b/tdeui/kpassivepopup.h
index 3fc4f3a2f..22828e2d6 100644
--- a/tdeui/kpassivepopup.h
+++ b/tdeui/kpassivepopup.h
@@ -68,8 +68,8 @@ class TQVBox;
 class TDEUI_EXPORT KPassivePopup : public TQFrame
 {
     Q_OBJECT
-    Q_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete )
-    Q_PROPERTY (int timeout READ timeout WRITE setTimeout )
+    TQ_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete )
+    TQ_PROPERTY (int timeout READ timeout WRITE setTimeout )
 
 public:
     /**
diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h
index 725262947..2beed9e52 100644
--- a/tdeui/kpushbutton.h
+++ b/tdeui/kpushbutton.h
@@ -37,8 +37,8 @@ class TQDragObject;
 class TDEUI_EXPORT KPushButton : public TQPushButton
 {
     Q_OBJECT
-    Q_PROPERTY(int stdItem READ guiItm WRITE setGuiItm )
-    Q_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled)
+    TQ_PROPERTY(int stdItem READ guiItm WRITE setGuiItm )
+    TQ_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled)
 
 public:
 
diff --git a/tdeui/krestrictedline.h b/tdeui/krestrictedline.h
index 4ea96219a..142bd5444 100644
--- a/tdeui/krestrictedline.h
+++ b/tdeui/krestrictedline.h
@@ -44,7 +44,7 @@
 class TDEUI_EXPORT KRestrictedLine : public KLineEdit
 {
   Q_OBJECT
-  Q_PROPERTY( TQString validChars READ validChars WRITE setValidChars )
+  TQ_PROPERTY( TQString validChars READ validChars WRITE setValidChars )
 
 public:
 
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index ecfcd7b3d..6b93d99f0 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -71,21 +71,21 @@
 class TDEUI_EXPORT KRuler : public TQFrame
 {
   Q_OBJECT
-  Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
-  Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
-  Q_PROPERTY( int value READ value WRITE setValue )
-  Q_PROPERTY( bool showTinyMarks READ showTinyMarks WRITE setShowTinyMarks )
-  Q_PROPERTY( bool showLittleMarks READ showLittleMarks WRITE setShowLittleMarks )
-  Q_PROPERTY( bool showMediumMarks READ showMediumMarks WRITE setShowMediumMarks )
-  Q_PROPERTY( bool showBigMarks READ showBigMarks WRITE setShowBigMarks )
-  Q_PROPERTY( bool showPointer READ showPointer WRITE setShowPointer )
-  Q_PROPERTY( bool showEndLabel READ showEndLabel WRITE setShowEndLabel )
-  Q_PROPERTY( int tinyMarkDistance READ tinyMarkDistance WRITE setTinyMarkDistance )
-  Q_PROPERTY( int littleMarkDistance READ littleMarkDistance WRITE setLittleMarkDistance )
-  Q_PROPERTY( int mediumMarkDistance READ mediumMarkDistance WRITE setBigMarkDistance )
-  Q_PROPERTY( int bigMarkDistance READ bigMarkDistance WRITE setBigMarkDistance )
-  Q_PROPERTY( double pixelPerMark READ pixelPerMark WRITE setPixelPerMark )
-  Q_PROPERTY( bool lengthFixed READ lengthFixed WRITE setLengthFixed )
+  TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+  TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+  TQ_PROPERTY( int value READ value WRITE setValue )
+  TQ_PROPERTY( bool showTinyMarks READ showTinyMarks WRITE setShowTinyMarks )
+  TQ_PROPERTY( bool showLittleMarks READ showLittleMarks WRITE setShowLittleMarks )
+  TQ_PROPERTY( bool showMediumMarks READ showMediumMarks WRITE setShowMediumMarks )
+  TQ_PROPERTY( bool showBigMarks READ showBigMarks WRITE setShowBigMarks )
+  TQ_PROPERTY( bool showPointer READ showPointer WRITE setShowPointer )
+  TQ_PROPERTY( bool showEndLabel READ showEndLabel WRITE setShowEndLabel )
+  TQ_PROPERTY( int tinyMarkDistance READ tinyMarkDistance WRITE setTinyMarkDistance )
+  TQ_PROPERTY( int littleMarkDistance READ littleMarkDistance WRITE setLittleMarkDistance )
+  TQ_PROPERTY( int mediumMarkDistance READ mediumMarkDistance WRITE setBigMarkDistance )
+  TQ_PROPERTY( int bigMarkDistance READ bigMarkDistance WRITE setBigMarkDistance )
+  TQ_PROPERTY( double pixelPerMark READ pixelPerMark WRITE setPixelPerMark )
+  TQ_PROPERTY( bool lengthFixed READ lengthFixed WRITE setLengthFixed )
 
 public:
 
diff --git a/tdeui/kselect.h b/tdeui/kselect.h
index 58efab293..77b35a175 100644
--- a/tdeui/kselect.h
+++ b/tdeui/kselect.h
@@ -43,8 +43,8 @@
 class TDEUI_EXPORT KXYSelector : public TQWidget
 {
   Q_OBJECT
-  Q_PROPERTY( int xValue READ xValue WRITE setXValue )
-  Q_PROPERTY( int yValue READ yValue WRITE setYValue )
+  TQ_PROPERTY( int xValue READ xValue WRITE setXValue )
+  TQ_PROPERTY( int yValue READ yValue WRITE setYValue )
   
 public:
   /**
@@ -159,9 +159,9 @@ private:
 class TDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl
 {
   Q_OBJECT
-  Q_PROPERTY( int value READ value WRITE setValue )
-  Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
-  Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+  TQ_PROPERTY( int value READ value WRITE setValue )
+  TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+  TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
 public:
 
   /**
@@ -294,10 +294,10 @@ class TDEUI_EXPORT KGradientSelector : public KSelector
 {
   Q_OBJECT
 
-  Q_PROPERTY( TQColor firstColor READ firstColor WRITE setFirstColor )
-  Q_PROPERTY( TQColor secondColor READ secondColor WRITE setSecondColor )
-  Q_PROPERTY( TQString firstText READ firstText WRITE setFirstText )
-  Q_PROPERTY( TQString secondText READ secondText WRITE setSecondText )
+  TQ_PROPERTY( TQColor firstColor READ firstColor WRITE setFirstColor )
+  TQ_PROPERTY( TQColor secondColor READ secondColor WRITE setSecondColor )
+  TQ_PROPERTY( TQString firstText READ firstText WRITE setFirstText )
+  TQ_PROPERTY( TQString secondText READ secondText WRITE setSecondText )
 
 public:
   /**
diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h
index cac498d0a..f21c4c99b 100644
--- a/tdeui/kseparator.h
+++ b/tdeui/kseparator.h
@@ -33,7 +33,7 @@
 class TDEUI_EXPORT KSeparator : public TQFrame
 {
   Q_OBJECT
-  Q_PROPERTY( int orientation READ orientation WRITE setOrientation )
+  TQ_PROPERTY( int orientation READ orientation WRITE setOrientation )
  public:
   /**
    * Constructor.
diff --git a/tdeui/kstringvalidator.h b/tdeui/kstringvalidator.h
index af0ce5efc..b23bc87bd 100644
--- a/tdeui/kstringvalidator.h
+++ b/tdeui/kstringvalidator.h
@@ -59,9 +59,9 @@
  **/
 class TDEUI_EXPORT KStringListValidator : public TQValidator {
   Q_OBJECT
-  Q_PROPERTY( TQStringList stringList READ stringList WRITE setStringList )
-  Q_PROPERTY( bool rejecting READ isRejecting WRITE setRejecting )
-  Q_PROPERTY( bool fixupEnabled READ isFixupEnabled WRITE setFixupEnabled )
+  TQ_PROPERTY( TQStringList stringList READ stringList WRITE setStringList )
+  TQ_PROPERTY( bool rejecting READ isRejecting WRITE setRejecting )
+  TQ_PROPERTY( bool fixupEnabled READ isFixupEnabled WRITE setFixupEnabled )
 public:
   /** Construct a new validator.
    *
diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h
index d63e41c08..ae8f43e5d 100644
--- a/tdeui/ktabwidget.h
+++ b/tdeui/ktabwidget.h
@@ -36,11 +36,11 @@ class KTabWidgetPrivate;
 class TDEUI_EXPORT KTabWidget : public TQTabWidget
 {
     Q_OBJECT
-    Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
-    Q_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton )
-    Q_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed WRITE setHoverCloseButtonDelayed )
-    Q_PROPERTY( bool tabCloseActivatePrevious READ tabCloseActivatePrevious WRITE setTabCloseActivatePrevious )
-    Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE setAutomaticResizeTabs )
+    TQ_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
+    TQ_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton )
+    TQ_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed WRITE setHoverCloseButtonDelayed )
+    TQ_PROPERTY( bool tabCloseActivatePrevious READ tabCloseActivatePrevious WRITE setTabCloseActivatePrevious )
+    TQ_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE setAutomaticResizeTabs )
 
 public:
     KTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h
index 32c81bd47..0d6885329 100644
--- a/tdeui/ktextbrowser.h
+++ b/tdeui/ktextbrowser.h
@@ -42,7 +42,7 @@
 class TDEUI_EXPORT KTextBrowser : public TQTextBrowser
 {
   Q_OBJECT
-  Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
+  TQ_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
 
   public:
     /**
diff --git a/tdeui/ktimewidget.h b/tdeui/ktimewidget.h
index 7cb5239c6..9ac6923f3 100644
--- a/tdeui/ktimewidget.h
+++ b/tdeui/ktimewidget.h
@@ -37,7 +37,7 @@
 class TDEUI_EXPORT KTimeWidget : public TQWidget
 {
   Q_OBJECT
-  Q_PROPERTY( TQTime time READ time WRITE setTime )
+  TQ_PROPERTY( TQTime time READ time WRITE setTime )
 
 public:
   /**
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index 1ef30a3cc..aa447ed5c 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -105,12 +105,12 @@ class TDEUI_EXPORT KToolBar : public TQToolBar
 {
     Q_OBJECT
     
-    Q_ENUMS( IconText BarPosition )
-    Q_PROPERTY( IconText iconText READ iconText WRITE setIconText )
-    Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos )
-    Q_PROPERTY( bool fullSize READ fullSize WRITE setFullSize )
-    Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize )
-    Q_PROPERTY( TQString text READ text WRITE setText )
+    TQ_ENUMS( IconText BarPosition )
+    TQ_PROPERTY( IconText iconText READ iconText WRITE setIconText )
+    TQ_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos )
+    TQ_PROPERTY( bool fullSize READ fullSize WRITE setFullSize )
+    TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
 
 public:
     enum IconText{IconOnly = 0, IconTextRight, TextOnly, IconTextBottom};
diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h
index 8eb086607..c35d3156b 100644
--- a/tdeui/kurllabel.h
+++ b/tdeui/kurllabel.h
@@ -71,13 +71,13 @@ class TQPixmap;
 class TDEUI_EXPORT KURLLabel : public TQLabel
 {
   Q_OBJECT
-  Q_PROPERTY (TQString url READ url WRITE setURL)
-  Q_PROPERTY (TQString tipText READ tipText WRITE setTipText )
-  Q_PROPERTY (TQPixmap altPixmap READ altPixmap WRITE setAltPixmap)
-  Q_PROPERTY (bool glowEnabled READ isGlowEnabled WRITE setGlow )
-  Q_PROPERTY (bool floatEnabled READ isFloatEnabled WRITE setFloat )
-  Q_PROPERTY (bool useTips READ useTips WRITE setUseTips )
-  Q_PROPERTY (bool useCursor READ useCursor WRITE setUseCursor )
+  TQ_PROPERTY (TQString url READ url WRITE setURL)
+  TQ_PROPERTY (TQString tipText READ tipText WRITE setTipText )
+  TQ_PROPERTY (TQPixmap altPixmap READ altPixmap WRITE setAltPixmap)
+  TQ_PROPERTY (bool glowEnabled READ isGlowEnabled WRITE setGlow )
+  TQ_PROPERTY (bool floatEnabled READ isFloatEnabled WRITE setFloat )
+  TQ_PROPERTY (bool useTips READ useTips WRITE setUseTips )
+  TQ_PROPERTY (bool useCursor READ useCursor WRITE setUseCursor )
 
 public:
   /**