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

doc/kommander/extending.docbook

@@ -63,9 +63,9 @@ class KomLineEdit : public KLineEdit, public KommanderWidget
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-    Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-    Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+    TQ_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+    TQ_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+    TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
     
 public:
     KomLineEdit(QWidget *a_parent, const char *a_name);

kommander/editor/filechooser.h

@@ -11,7 +11,7 @@ class FileChooser : public TQWidget
     Q_OBJECT
   
 
-    Q_ENUMS( Mode )
+    TQ_ENUMS( Mode )
     TQ_PROPERTY( Mode mode READ mode WRITE setMode )
     TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 

kommander/editor/layout.h

@@ -116,7 +116,7 @@ class Spacer : public TQWidget
 
     TQ_OVERRIDE( TQCString name )
     TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
-    Q_ENUMS( SizeType )
+    TQ_ENUMS( SizeType )
     TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
     TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
     TQ_OVERRIDE( TQRect geometry DESIGNABLE false )

kommander/editor/styledbutton.h

@@ -38,7 +38,7 @@ class StyledButton : public TQButton
     TQ_PROPERTY( EditorType editor READ editor WRITE setEditor )
     TQ_PROPERTY( bool scale READ scale WRITE setScale )
 
-    Q_ENUMS( EditorType )
+    TQ_ENUMS( EditorType )
 
 public:
     enum EditorType { ColorEditor, PixmapEditor };

kommander/examples/old/widgetgenerator.kmdr

@@ -107,9 +107,9 @@ class @className : public @inheritClassName, public KommanderWidget
 {
 	Q_OBJECT
 
-	Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-	Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-	Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+	TQ_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+	TQ_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+	TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 
 public:
 	@className(QWidget *a_parent, const char *a_name);

kommander/widgets/execbutton.h

@@ -38,7 +38,7 @@ class KOMMANDER_EXPORT ExecButton : public KPushButton, public KommanderWidget
   Q_OBJECT
   
 
-  Q_ENUMS(Blocking)
+  TQ_ENUMS(Blocking)
   TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
   TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
   TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)

kommander/widgets/fileselector.h

@@ -46,7 +46,7 @@ class KOMMANDER_EXPORT FileSelector : public TQWidget, public KommanderWidget
   TQ_PROPERTY(TQString selectionFilter READ selectionFilter WRITE setSelectionFilter)
   TQ_PROPERTY(TQString selectionCaption READ selectionCaption WRITE setSelectionCaption)
   TQ_PROPERTY(SelectionType selectionType READ selectionType WRITE setSelectionType)
-  Q_ENUMS(SelectionType)
+  TQ_ENUMS(SelectionType)
   TQ_PROPERTY(bool selectionOpenMultiple READ selectionOpenMultiple WRITE setSelectionOpenMultiple)
   
 public:

kommander/widgets/wizard.h

@@ -36,7 +36,7 @@ class KOMMANDER_EXPORT Wizard : public TQWizard, public KommanderWidget
   TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
   TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
   TQ_PROPERTY(HelpAction helpAction READ helpAction WRITE setHelpAction)
-  Q_ENUMS(HelpAction)
+  TQ_ENUMS(HelpAction)
   TQ_PROPERTY(TQString helpActionText READ helpActionText WRITE setHelpActionText)
 
 public: