Commit 2c57fdf0 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Remove KoFontComboBox

parent 71063ae3
/*
* Copyright (c) 2014 Dmitry Kazakov <dimula73@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef _KO_FONT_COMBO_BOX_H_
#define _KO_FONT_COMBO_BOX_H_
#include <QFontComboBox>
typedef QFontComboBox KoFontComboBox;
#endif // _KO_FONT_COMBO_BOX_H_
......@@ -30,7 +30,7 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="KoFontComboBox" name="fontFamily">
<widget class="QFontComboBox" name="fontFamily">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -150,11 +150,6 @@
<extends>QSpinBox</extends>
<header>kis_int_parse_spin_box.h</header>
</customwidget>
<customwidget>
<class>KoFontComboBox</class>
<extends>QComboBox</extends>
<header>KoFontComboBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -38,7 +38,7 @@
#include <QIcon>
#include <klocalizedstring.h>
#include <kfontchooser.h>
#include <KoFontComboBox.h>
#include <QFontComboBox>
class KoFontFamilyAction::KoFontFamilyActionPrivate
{
......@@ -51,7 +51,7 @@ public:
void _ko_slotFontChanged(const QFont &font)
{
qDebug() << "KoFontComboBox - slotFontChanged("
qDebug() << "QFontComboBox - slotFontChanged("
<< font.family() << ") settingFont=" << settingFont;
if (settingFont) {
return;
......@@ -127,7 +127,7 @@ QWidget *KoFontFamilyAction::createWidget(QWidget *parent)
// This is the visual element on the screen. This method overrides
// the KSelectAction one, preventing KSelectAction from creating its
// regular KComboBox.
KoFontComboBox *cb = new KoFontComboBox(parent);
QFontComboBox *cb = new QFontComboBox(parent);
//cb->setFontList(items());
qDebug() << "\tset=" << font();
......@@ -151,7 +151,7 @@ void KoFontFamilyAction::setFont(const QString &family)
d->settingFont++;
Q_FOREACH (QWidget *w, createdWidgets()) {
KoFontComboBox *cb = qobject_cast<KoFontComboBox *>(w);
QFontComboBox *cb = qobject_cast<QFontComboBox *>(w);
qDebug() << "\tw=" << w << "cb=" << cb;
if (!cb) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment