diff options
Diffstat (limited to 'src/widgets/widgets/qlcdnumber.cpp')
| -rw-r--r-- | src/widgets/widgets/qlcdnumber.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp index 34230d6b04..d17e3e2470 100644 --- a/src/widgets/widgets/qlcdnumber.cpp +++ b/src/widgets/widgets/qlcdnumber.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -160,13 +160,13 @@ static QString int2string(int num, int base, int ndigits, bool *oflow) } switch(base) { case QLCDNumber::Hex: - s.sprintf("%*x", ndigits, num); + s = QString::asprintf("%*x", ndigits, num); break; case QLCDNumber::Dec: - s.sprintf("%*i", ndigits, num); + s = QString::asprintf("%*i", ndigits, num); break; case QLCDNumber::Oct: - s.sprintf("%*o", ndigits, num); + s = QString::asprintf("%*o", ndigits, num); break; case QLCDNumber::Bin: { @@ -219,7 +219,7 @@ static QString double2string(double num, int base, int ndigits, bool *oflow) } else { // decimal base int nd = ndigits; do { - s.sprintf("%*.*g", ndigits, nd, num); + s = QString::asprintf("%*.*g", ndigits, nd, num); int i = s.indexOf(QLatin1Char('e')); if (i > 0 && s[i+1]==QLatin1Char('+')) { s[i] = QLatin1Char(' '); |