summaryrefslogtreecommitdiffstats
path: root/src/widgets/ntqslider.h
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-10-21 18:55:44 -0500
committerDarrell Anderson <[email protected]>2012-10-21 18:55:44 -0500
commit6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d (patch)
treef13bbebb928d6448ff186bc596fa58fa6b8892d9 /src/widgets/ntqslider.h
parent56cd55070ee6c5267fde1aae4d5251e400dea64d (diff)
parent7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (diff)
downloadtqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.tar.gz
tqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets/ntqslider.h')
-rw-r--r--src/widgets/ntqslider.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h
index 881e2abb2..f54179499 100644
--- a/src/widgets/ntqslider.h
+++ b/src/widgets/ntqslider.h
@@ -55,16 +55,16 @@ class TQTimer;
class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl
{
TQ_OBJECT
- Q_ENUMS( TickSetting )
- Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
- Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
- Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
- Q_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
- Q_PROPERTY( int value READ value WRITE setValue )
- Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
- Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
- Q_PROPERTY( TickSetting tickmarks READ tickmarks WRITE setTickmarks )
- Q_PROPERTY( int tickInterval READ tickInterval WRITE setTickInterval )
+ TQ_ENUMS( TickSetting )
+ TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+ TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+ TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
+ TQ_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
+ TQ_PROPERTY( int value READ value WRITE setValue )
+ TQ_PROPERTY( bool tracking READ tracking WRITE setTracking )
+ TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+ TQ_PROPERTY( TickSetting tickmarks READ tickmarks WRITE setTickmarks )
+ TQ_PROPERTY( int tickInterval READ tickInterval WRITE setTickInterval )
public:
enum TickSetting { NoMarks = 0, Above = 1, Left = Above,