Reverted a couple changes that should not have been made to vanilla KDE/Trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 585650ee25
commit 9cddb219d9

@ -13,7 +13,7 @@
#include <kmimetype.h>
#include <kparts/componentfactory.h>
#include <kdemm/factory.h>
#include <kplayobjectfactory.h>
#include <config-kfile.h>
@ -58,7 +58,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
{
KGlobal::locale()->insertCatalogue("kfileaudiopreview");
TQStringList formats = KDE::Multimedia::Factory::self()->playableMimeTypes();
TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
// ###
TQStringList::ConstIterator it = formats.begin();
for ( ; it != formats.end(); ++it )

@ -1069,13 +1069,17 @@ int KJanusWidget::IconListItem::expandMinimumWidth( int width )
void KJanusWidget::IconListItem::highlight( bool erase )
{
{
// FIXME: Add configuration option to disable highlighting
// For now, always disable highlighting
erase = true;
TQRect r = listBox()->itemRect( this );
r.addCoords( 1, 1, -1, -1 );
r.addCoords( 1, 1, -1, -1 );
TQPainter p( listBox()->viewport() );
p.setClipRegion( r );
const TQColorGroup &cg = listBox()->colorGroup();
if ( erase )
{
@ -1089,9 +1093,9 @@ void KJanusWidget::IconListItem::highlight( bool erase )
p.drawRect( r );
p.setPen( cg.highlight().dark( 140 ) );
p.drawRect( r );
p.drawRect( r );
}
p.setPen( cg.foreground() );
p.translate( r.x() - 1, r.y() - 1 );
paintContents( &p );

Loading…
Cancel
Save