From e25c6429ea1c1578452eb329a7a03457d57948f0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 2 Oct 2014 08:41:28 -0500 Subject: Add mimeTypePtrFast method to KFileItem This relates to Bug 699 Clean up a couple of minor build warnings Classify usbmisc devices (cherry picked from commit 54578ce023227543f531a56fcc178b9e95e9ab5e) --- kio/kfile/kfiledetailview.cpp | 6 +++--- kio/kfile/kfileiconview.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'kio/kfile') diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 823714396..e883b76bc 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -360,13 +360,13 @@ void KFileDetailView::slotSortingChanged( int col ) switch( col ) { case COL_NAME: - sortSpec = (sort & ~TQDir::SortByMask | TQDir::Name); + sortSpec = ((sort & ~TQDir::SortByMask) | TQDir::Name); break; case COL_SIZE: - sortSpec = (sort & ~TQDir::SortByMask | TQDir::Size); + sortSpec = ((sort & ~TQDir::SortByMask) | TQDir::Size); break; case COL_DATE: - sortSpec = (sort & ~TQDir::SortByMask | TQDir::Time); + sortSpec = ((sort & ~TQDir::SortByMask) | TQDir::Time); break; // the following columns have no equivalent in TQDir, so we set it diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index fec9158de..a762472cc 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -611,7 +611,7 @@ void KFileIconView::slotPreviewResult( KIO::Job *job ) void KFileIconView::gotPreview( const KFileItem *item, const TQPixmap& pix ) { KFileIconViewItem *it = viewItem( item ); - if ( it ) + if ( it ) { if( item->overlays() & KIcon::HiddenOverlay ) { TQPixmap p( pix ); @@ -619,8 +619,10 @@ void KFileIconView::gotPreview( const KFileItem *item, const TQPixmap& pix ) KIconEffect::semiTransparent( p ); it->setPixmap( p ); } - else + else { it->setPixmap( pix ); + } + } } bool KFileIconView::canPreview( const KFileItem *item ) const -- cgit v1.2.1