summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-10-21 12:46:55 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-10-21 12:46:55 -0500
commitb453dab0d1213b773d7cf6a17856918cbab9f665 (patch)
tree874d17ef223a07cd8480a9a1cad9bd8178c41d0b
parent653a31f84c6fc67e799171303537e3c883874e20 (diff)
parentd4bd676206bc4e76cd23f0002ea6ffec5170ef95 (diff)
downloadtdepim-b453dab0d1213b773d7cf6a17856918cbab9f665.tar.gz
tdepim-b453dab0d1213b773d7cf6a17856918cbab9f665.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.h2
-rw-r--r--kdgantt/KDGanttMinimizeSplitter.h2
-rw-r--r--kdgantt/KDGanttSemiSizingControl.h2
-rw-r--r--kdgantt/KDGanttView.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h
index 98d7d7f52..a9e26a04a 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.h
+++ b/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 )
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 14731695e..2a8b98c6d 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/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 )
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 5b83657df..4dfac98d2 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/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
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 30a84abb5..9a12bceb3 100644
--- a/kdgantt/KDGanttView.h
+++ b/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 };