diff --git a/kdeui/actions/kfontsizeaction.cpp b/kdeui/actions/kfontsizeaction.cpp index 8ef143e38b..74e27a8d50 100644 --- a/kdeui/actions/kfontsizeaction.cpp +++ b/kdeui/actions/kfontsizeaction.cpp @@ -1,150 +1,148 @@ /* This file is part of the KDE libraries Copyright (C) 1999 Reginald Stadlbauer (C) 1999 Simon Hausmann (C) 2000 Nicolas Hadacek (C) 2000 Kurt Granroth (C) 2000 Michael Koch (C) 2001 Holger Freyther (C) 2002 Ellis Whitehead (C) 2002 Joseph Wenninger (C) 2003 Andras Mantia (C) 2005-2006 Hamish Rodda This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. 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. */ #include "kfontsizeaction.h" #include #include #include #include #include #include #include "kmenu.h" class KFontSizeAction::Private { public: Private(KFontSizeAction *parent) : q(parent) { } void init(); KFontSizeAction *q; }; // BEGIN KFontSizeAction KFontSizeAction::KFontSizeAction(QObject *parent) : KSelectAction(parent), d(new Private(this)) { d->init(); } KFontSizeAction::KFontSizeAction(const QString &text, QObject *parent) : KSelectAction(text, parent), d(new Private(this)) { d->init(); } KFontSizeAction::KFontSizeAction(const KIcon &icon, const QString &text, QObject *parent) : KSelectAction(icon, text, parent), d(new Private(this)) { d->init(); } KFontSizeAction::~KFontSizeAction() { delete d; } void KFontSizeAction::Private::init() { q->setEditable( true ); QFontDatabase fontDB; QList sizes = fontDB.standardSizes(); QStringList lst; for ( QList::Iterator it = sizes.begin(); it != sizes.end(); ++it ) lst.append( QString::number( *it ) ); q->setItems( lst ); } void KFontSizeAction::setFontSize( int size ) { if ( size == fontSize() ) { - QString test = QString::number( size ); - foreach (QAction* action, actions()) + const QString test = QString::number( size ); + Q_FOREACH(QAction* action, actions()) { if (action->text() == test) { setCurrentAction(action); return; } } } if ( size < 1 ) { kWarning() << "KFontSizeAction: Size " << size << " is out of range"; return; } QAction* a = action( QString::number( size ) ); if ( !a ) { // Insert at the correct position in the list (to keep sorting) QList lst; // Convert to list of ints - QStringList itemsList = items(); - for (QStringList::Iterator it = itemsList.begin() ; it != itemsList.end() ; ++it) - lst.append( (*it).toInt() ); + QStringListIterator itemsIt( items() ); + while ( itemsIt.hasNext() ) + lst.append( itemsIt.next().toInt() ); // New size lst.append( size ); // Sort the list qSort( lst ); - // Convert back to string list - QStringList strLst; - foreach ( int it, lst ) { - QAction* action = new QAction(QString::number(it), selectableActionGroup()); + Q_FOREACH( int it, lst ) { + KAction* const action = addAction( QString::number(it) ); if (it == size) setCurrentAction(action); } } else { setCurrentAction( a ); } } int KFontSizeAction::fontSize() const { return currentText().toInt(); } void KFontSizeAction::actionTriggered( QAction* action ) { emit fontSizeChanged( action->text().toInt() ); KSelectAction::actionTriggered( action ); } /* vim: et sw=2 ts=2 */ #include "kfontsizeaction.moc"