summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-10-21 13:12:45 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-10-21 13:12:45 -0500
commitefe855bd5d8cb9a0f50e398d426ff5fece3dadfd (patch)
treeca2fd8cd2ba98b878d1c11e1951095000ffeee3c
parenta981b85cb9db7276e530ff0bb538bbafac94c5c4 (diff)
parent47dd01bcf94d2e88c9d548a6b30c9be67f7d7d15 (diff)
downloadtdewebdev-efe855bd5d8cb9a0f50e398d426ff5fece3dadfd.tar.gz
tdewebdev-efe855bd5d8cb9a0f50e398d426ff5fece3dadfd.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdewebdev
-rw-r--r--doc/kommander/extending.docbook6
-rw-r--r--kommander/editor/filechooser.h2
-rw-r--r--kommander/editor/layout.h2
-rw-r--r--kommander/editor/styledbutton.h2
-rw-r--r--kommander/examples/old/widgetgenerator.kmdr6
-rw-r--r--kommander/widgets/execbutton.h2
-rw-r--r--kommander/widgets/fileselector.h2
-rw-r--r--kommander/widgets/wizard.h2
8 files changed, 12 insertions, 12 deletions
diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook
index 473b8ec5..2aa9a1e3 100644
--- a/doc/kommander/extending.docbook
+++ b/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);
diff --git a/kommander/editor/filechooser.h b/kommander/editor/filechooser.h
index 56d6da60..e87ee91e 100644
--- a/kommander/editor/filechooser.h
+++ b/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 )
diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h
index d0e6e737..e42759cb 100644
--- a/kommander/editor/layout.h
+++ b/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 )
diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h
index d0cbafe2..a090b8b5 100644
--- a/kommander/editor/styledbutton.h
+++ b/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 };
diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr
index 97267a62..3d6fe5b5 100644
--- a/kommander/examples/old/widgetgenerator.kmdr
+++ b/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);
diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h
index 0a7aff6c..d2774330 100644
--- a/kommander/widgets/execbutton.h
+++ b/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)
diff --git a/kommander/widgets/fileselector.h b/kommander/widgets/fileselector.h
index c84f49ae..ecdbf402 100644
--- a/kommander/widgets/fileselector.h
+++ b/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:
diff --git a/kommander/widgets/wizard.h b/kommander/widgets/wizard.h
index 67d9beca..d8bbab45 100644
--- a/kommander/widgets/wizard.h
+++ b/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: