From 1e93f91bb4b393d63f1bd73beee4de3cc8945294 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 31 Mar 2024 00:36:31 +0200 Subject: [PATCH] kdeui: remove unused KFontUtils functions Signed-off-by: Ivailo Monev --- includes/CMakeLists.txt | 1 - includes/KFontUtils | 1 - kdeui/CMakeLists.txt | 2 - kdeui/fonts/kfontutils.cpp | 59 ---------------------------- kdeui/fonts/kfontutils.h | 80 -------------------------------------- 5 files changed, 143 deletions(-) delete mode 100644 includes/KFontUtils delete mode 100644 kdeui/fonts/kfontutils.cpp delete mode 100644 kdeui/fonts/kfontutils.h diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt index 53f3bd09..fa37a5d9 100644 --- a/includes/CMakeLists.txt +++ b/includes/CMakeLists.txt @@ -126,7 +126,6 @@ install( KFontDialog KFontRequester KFontSizeAction - KFontUtils KUnitConversion KGlobal KGlobalAccel diff --git a/includes/KFontUtils b/includes/KFontUtils deleted file mode 100644 index 23cf4ce4..00000000 --- a/includes/KFontUtils +++ /dev/null @@ -1 +0,0 @@ -#include "../kfontutils.h" diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index c9930477..2f8941f8 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -114,7 +114,6 @@ set(kdeui_LIB_SRCS fonts/kfontcombobox.cpp fonts/kfontdialog.cpp fonts/kfontrequester.cpp - fonts/kfontutils.cpp icons/kiconeffect.cpp icons/kiconengine.cpp icons/kicon.cpp @@ -404,7 +403,6 @@ install( fonts/kfontcombobox.h fonts/kfontdialog.h fonts/kfontrequester.h - fonts/kfontutils.h icons/kiconeffect.h icons/kicon.h icons/kiconloader.h diff --git a/kdeui/fonts/kfontutils.cpp b/kdeui/fonts/kfontutils.cpp deleted file mode 100644 index 6f90a272..00000000 --- a/kdeui/fonts/kfontutils.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/********************************************************************************* - * * - * Copyright (C) 2005, 2009 by Albert Astals Cid * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) version 3, or any * - * later version accepted by the membership of KDE e.V. (or its * - * successor approved by the membership of KDE e.V.), which shall * - * act as a proxy defined in Section 6 of version 3 of the license. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library. If not, see . * - * * - *********************************************************************************/ - -#include "kfontutils.h" - -#include -#include - -qreal KFontUtils::adaptFontSize(QPainter &painter, const QString &string, qreal width, qreal height, qreal maxFontSize, qreal minFontSize, AdaptFontSizeOptions flags) -{ - qreal size = maxFontSize; - QRectF boundingRect; - bool done = false; - - while (!done && size > minFontSize) { - QFont f = painter.font(); - f.setPointSizeF(size); - painter.setFont(f); - int qtFlags = Qt::AlignCenter | Qt::TextWordWrap; - if (flags & DoNotAllowWordWrap) { - qtFlags = qtFlags & ~Qt::TextWordWrap; - } - boundingRect = painter.boundingRect(QRectF(0, 0, width, height), qtFlags, string); - if (boundingRect.width() == 0 || boundingRect.height() == 0) { - return -1; - } else if (boundingRect.width() > width || boundingRect.height() > height) { - size = qMin(width * size / boundingRect.width(), height * size / boundingRect.height()); - } else { - done = true; - } - } - - return size; -} - -qreal KFontUtils::adaptFontSize(QPainter &painter, const QString &text, const QSizeF &availableSize, qreal maxFontSize, qreal minFontSize, AdaptFontSizeOptions flags) -{ - return adaptFontSize(painter, text, availableSize.width(), availableSize.height(), maxFontSize, minFontSize, flags); -} - diff --git a/kdeui/fonts/kfontutils.h b/kdeui/fonts/kfontutils.h deleted file mode 100644 index cac9bad9..00000000 --- a/kdeui/fonts/kfontutils.h +++ /dev/null @@ -1,80 +0,0 @@ -/********************************************************************************* - * * - * Copyright (C) 2005, 2009 by Albert Astals Cid * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) version 3, or any * - * later version accepted by the membership of KDE e.V. (or its * - * successor approved by the membership of KDE e.V.), which shall * - * act as a proxy defined in Section 6 of version 3 of the license. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library. If not, see . * - * * - *********************************************************************************/ - -#ifndef KFONTMETRICS_H -#define KFONTMETRICS_H - -#include "kdeui_export.h" - -#include -#include -#include - -namespace KFontUtils -{ - /** Modifiers for the adaptFontSize function */ - enum AdaptFontSizeOption { - NoFlags = 0x01 /** No modifier */, - DoNotAllowWordWrap = 0x02 /** Do not use word wrapping */ - }; - Q_DECLARE_FLAGS(AdaptFontSizeOptions, AdaptFontSizeOption) - - /** Helper function that calculates the biggest font size (in points) used - drawing a centered text using word wrapping. - @param painter The painter where the text will be painted. The font set - in the painter is used for the calculation. Note the - painter font size is modified by this call - @param text The text you want to draw - @param width The available width for drawing - @param height The available height for drawing - @param maxFontSize The maximum font size (in points) to consider - @param minFontSize The minimum font size (in points) to consider - @param flags The modifiers for how the text is painted - @return The calculated biggest font size (in points) that draws the text - in the given dimensions. Can return smaller than minFontSize, - that means the text doesn't fit in the given rectangle. Can - return -1 on error - @since KDE 4.7 - */ - qreal KDEUI_EXPORT adaptFontSize(QPainter &painter, - const QString &text, - qreal width, - qreal height, - qreal maxFontSize = 28.0, - qreal minFontSize = 1.0, - AdaptFontSizeOptions flags = NoFlags); - - /** Convenience function for adaptFontSize that accepts a QSizeF instead two qreals - @since KDE 4.7 - */ - qreal KDEUI_EXPORT adaptFontSize(QPainter &painter, - const QString &text, - const QSizeF &availableSize, - qreal maxFontSize = 28.0, - qreal minFontSize = 1.0, - AdaptFontSizeOptions flags = NoFlags); -} - -Q_DECLARE_OPERATORS_FOR_FLAGS(KFontUtils::AdaptFontSizeOptions) - -#endif -