mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: do not use QStringListIterator for iterating
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
4c32d028bc
commit
1b5c5fe630
3 changed files with 10 additions and 13 deletions
|
@ -113,9 +113,8 @@ void KFontSizeAction::setFontSize( int size )
|
|||
// Insert at the correct position in the list (to keep sorting)
|
||||
QList<int> lst;
|
||||
// Convert to list of ints
|
||||
QStringListIterator itemsIt( items() );
|
||||
while ( itemsIt.hasNext() )
|
||||
lst.append( itemsIt.next().toInt() );
|
||||
foreach ( const QString &itemsIt, items() )
|
||||
lst.append( itemsIt.toInt() );
|
||||
// New size
|
||||
lst.append( size );
|
||||
// Sort the list
|
||||
|
|
|
@ -367,22 +367,22 @@ QList<QByteArray> MagickPlugin::mimeTypes() const
|
|||
QImageIOPlugin::Capabilities MagickPlugin::capabilities(QIODevice *device, const QByteArray &format) const
|
||||
{
|
||||
if (format == s_magickpluginformat)
|
||||
return Capabilities(CanRead);
|
||||
return QImageIOPlugin::Capabilities(QImageIOPlugin::CanRead);
|
||||
if (!format.isEmpty())
|
||||
return 0;
|
||||
if (!device->isOpen())
|
||||
return 0;
|
||||
|
||||
Capabilities cap;
|
||||
QImageIOPlugin::Capabilities cap;
|
||||
QByteArray actualformat;
|
||||
if (device->isReadable() && MagickHandler::canRead(device, &actualformat))
|
||||
cap |= CanRead;
|
||||
cap |= QImageIOPlugin::CanRead;
|
||||
return cap;
|
||||
}
|
||||
|
||||
QImageIOHandler *MagickPlugin::create(QIODevice *device, const QByteArray &format) const
|
||||
{
|
||||
QImageIOHandler *handler = new MagickHandler;
|
||||
QImageIOHandler *handler = new MagickHandler();
|
||||
handler->setDevice(device);
|
||||
handler->setFormat(format);
|
||||
return handler;
|
||||
|
|
|
@ -636,16 +636,14 @@ bool KUriFilter::filterUri( KUriFilterData& data, const QStringList& filters )
|
|||
// If no specific filters were requested, iterate through all the plugins.
|
||||
// Otherwise, only use available filters.
|
||||
if( filters.isEmpty() ) {
|
||||
QStringListIterator it (d->pluginNames);
|
||||
while (it.hasNext()) {
|
||||
KUriFilterPlugin* plugin = d->plugins.value(it.next());
|
||||
foreach (const QString &it, d->pluginNames) {
|
||||
KUriFilterPlugin* plugin = d->plugins.value(it);
|
||||
if (plugin && plugin->filterUri( data ))
|
||||
filtered = true;
|
||||
}
|
||||
} else {
|
||||
QStringListIterator it (filters);
|
||||
while (it.hasNext()) {
|
||||
KUriFilterPlugin* plugin = d->plugins.value(it.next());
|
||||
foreach (const QString &it, filters) {
|
||||
KUriFilterPlugin* plugin = d->plugins.value(it);
|
||||
if (plugin && plugin->filterUri( data ))
|
||||
filtered = true;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue