Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: de-duplicate code

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-21 01:58:02 +02:00
parent b76733954b
commit 836da4c2ce
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
kdeui/widgets/khistorycombobox.cpp
View file

@ -36,6 +36,14 @@
#include <kmimetype.h> #include <kmimetype.h>
#include <kdebug.h> #include <kdebug.h>
static QPixmap kPixmapForUrl(const QString &item, const int height)
{
#warning implement icon for KUrl/QUrl into KIconLoader?
// the logic is the same as in KIO::pixmapForUrl() but kdeui cannot depend on kio
const QString iconName = KMimeType::iconNameForUrl(KUrl(item));
return KIconLoader::global()->loadMimeTypeIcon(iconName, KIconLoader::Desktop, height);
}
class KHistoryComboBox::Private class KHistoryComboBox::Private
{ {
public: public:
@ -200,11 +208,7 @@ void KHistoryComboBox::addToHistory( const QString& item )
} }
// now add the item // now add the item
#warning implement icon for KUrl/QUrl into KIconLoader? insertItem( 0, kPixmapForUrl(item, iconSize().height()), item );
// the logic is the same as in KIO::pixmapForUrl() but kdeui cannot depend on kio
const QString iconName = KMimeType::iconNameForUrl( KUrl(item), KIconLoader::Desktop );
const QPixmap pixmap = KIconLoader::global()->loadMimeTypeIcon( iconName, KIconLoader::Desktop, iconSize().height() );
insertItem( 0, pixmap, item );
if ( wasCurrent ) if ( wasCurrent )
setCurrentIndex( 0 ); setCurrentIndex( 0 );
@ -376,11 +380,8 @@ void KHistoryComboBox::insertItems( const QStringList& items )
while ( it != itEnd ) { while ( it != itEnd ) {
const QString item = *it; const QString item = *it;
if ( !item.isEmpty() ) { // only insert non-empty items if ( !item.isEmpty() ) { // only insert non-empty items);
// the logic is the same as in KIO::pixmapForUrl() but kdeui cannot depend on kio addItem( kPixmapForUrl(item, iconSize().height()), item );
const QString iconName = KMimeType::iconNameForUrl( KUrl(item), KIconLoader::Desktop );
const QPixmap pixmap = KIconLoader::global()->loadMimeTypeIcon( iconName, KIconLoader::Desktop, iconSize().height() );
addItem( pixmap, item );
} }
++it; ++it;
} }