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

certmanager/lib/backends/chiasmus/chiasmusjob.h

@@ -52,7 +52,7 @@ namespace Kleo {
   class ChiasmusJob : public Kleo::SpecialJob {
     Q_OBJECT
   
-    Q_ENUMS( Mode )
+    TQ_ENUMS( Mode )
     TQ_PROPERTY( Mode mode READ mode )
     TQ_PROPERTY( TQString key READ key WRITE setKey )
     TQ_PROPERTY( TQString options READ options WRITE setOptions )

kdgantt/KDGanttMinimizeSplitter.h

@@ -44,7 +44,7 @@ class KDGanttMinimizeSplitter : public TQFrame
 {
     Q_OBJECT
     
-    Q_ENUMS( Direction )
+    TQ_ENUMS( Direction )
     TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     TQ_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
 

kdgantt/KDGanttSemiSizingControl.h

@@ -43,7 +43,7 @@ class TQBoxLayout;
 class KDGanttSemiSizingControl : public KDGanttSizingControl
 {
     TQ_PROPERTY( ArrowPosition arrowPosition READ arrowPosition WRITE setArrowPosition )
-    Q_ENUMS( ArrowPosition )
+    TQ_ENUMS( ArrowPosition )
     Q_OBJECT
   
 

kdgantt/KDGanttView.h

@@ -109,9 +109,9 @@ class KDGanttView : public KDGanttMinimizeSplitter
     TQ_PROPERTY( bool dropEnabled READ dropEnabled WRITE setDropEnabled )
     TQ_PROPERTY( bool calendarMode READ calendarMode WRITE setCalendarMode )
 
-    Q_ENUMS( Scale )
-    Q_ENUMS( YearFormat )
-    Q_ENUMS( HourFormat )
+    TQ_ENUMS( Scale )
+    TQ_ENUMS( YearFormat )
+    TQ_ENUMS( HourFormat )
 
 public:
     enum Scale { Minute, Hour, Day, Week, Month, Auto };