Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/widgets/qabstractslider_p.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the QtGui module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    6969    void setSteps(int single, int page);
    7070
    71     int minimum, maximum, singleStep, pageStep, value, position, pressValue;
     71    int minimum, maximum, pageStep, value, position, pressValue;
     72
     73    /**
     74     * Call effectiveSingleStep() when changing the slider value.
     75     */
     76    int singleStep;
     77
     78    float offset_accumulated;
    7279    uint tracking : 1;
    7380    uint blocktracking :1;
     
    8390#ifdef QT_KEYPAD_NAVIGATION
    8491    int origValue;
     92
     93
     94
     95
     96
     97
     98
     99
     100
     101
     102
     103
     104
     105
     106
     107
    85108#endif
     109
     110
     111
     112
     113
     114
     115
     116
     117
    86118
    87119    inline int bound(int val) const { return qMax(minimum, qMin(maximum, val)); }
Note: See TracChangeset for help on using the changeset viewer.