1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some vestiges of QFontEngineQPF

Browse Source 
amends d7e424ee66.

Change-Id: I9aaef14f8ecba78685ce5f7e908a0b42e554434f
Reviewed-by: thiago
Reviewed-by: paulot
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-10-25 14:05:16 +02:00 committed by The Qt Project
parent 1d03918454
commit 942a59d8fb
3 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/painting/qpaintengine.h
View File

@ -247,12 +247,6 @@ private:
friend class QFontEngineBox;
friend class QFontEngineMac;
friend class QFontEngineWin;
#ifndef QT_NO_QWS_QPF
friend class QFontEngineQPF1;
#endif
#ifndef QT_NO_QWS_QPF2
friend class QFontEngineQPF;
#endif
friend class QMacPrintEngine;
friend class QMacPrintEnginePrivate;
friend class QFontEngineQPA;

1
src/gui/text/qfontengine_ft.cpp
View File

@ -699,7 +699,6 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
line_thickness = QFixed::fromFixed(FT_MulFix(face->underline_thickness, face->size->metrics.y_scale));
underline_position = QFixed::fromFixed(-FT_MulFix(face->underline_position, face->size->metrics.y_scale));
} else {
// copied from QFontEngineQPF
// ad hoc algorithm
int score = fontDef.weight * fontDef.pixelSize;
line_thickness = score / 700;

66
src/gui/text/qpfutil.cpp
View File

@ -1,66 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** 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.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: 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
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
static const QFontEngineQPF::TagType tagTypes[QFontEngineQPF::NumTags] = {
QFontEngineQPF::StringType, // FontName
QFontEngineQPF::StringType, // FileName
QFontEngineQPF::UInt32Type, // FileIndex
QFontEngineQPF::UInt32Type, // FontRevision
QFontEngineQPF::StringType, // FreeText
QFontEngineQPF::FixedType, // Ascent
QFontEngineQPF::FixedType, // Descent
QFontEngineQPF::FixedType, // Leading
QFontEngineQPF::FixedType, // XHeight
QFontEngineQPF::FixedType, // AverageCharWidth
QFontEngineQPF::FixedType, // MaxCharWidth
QFontEngineQPF::FixedType, // LineThickness
QFontEngineQPF::FixedType, // MinLeftBearing
QFontEngineQPF::FixedType, // MinRightBearing
QFontEngineQPF::FixedType, // UnderlinePosition
QFontEngineQPF::UInt8Type, // GlyphFormat
QFontEngineQPF::UInt8Type, // PixelSize
QFontEngineQPF::UInt8Type, // Weight
QFontEngineQPF::UInt8Type, // Style
QFontEngineQPF::StringType, // EndOfHeader
QFontEngineQPF::BitFieldType// WritingSystems
};