diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-02 08:41:28 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-23 02:22:49 +0100 |
| commit | e25c6429ea1c1578452eb329a7a03457d57948f0 (patch) | |
| tree | 214c54dc615999b7b0a2fc666d8bd7a7dbc72424 /kio/kfile | |
| parent | c6c2d982c0842c05051b4d2494f2ba3048a1e01a (diff) | |
| download | tdelibs-e25c6429ea1c1578452eb329a7a03457d57948f0.tar.gz tdelibs-e25c6429ea1c1578452eb329a7a03457d57948f0.zip | |
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)
Diffstat (limited to 'kio/kfile')
| -rw-r--r-- | kio/kfile/kfiledetailview.cpp | 6 | ||||
| -rw-r--r-- | kio/kfile/kfileiconview.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
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 |