diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-02 08:41:28 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-02 08:41:28 -0500 |
| commit | 54578ce023227543f531a56fcc178b9e95e9ab5e (patch) | |
| tree | 17258b2bded8681198dd5003bfcd2a212c203e95 /tdeio/tdefile | |
| parent | 09a4688659beb1f585cbd8d59b57eb75b9c1fab9 (diff) | |
| download | tdelibs-54578ce023227543f531a56fcc178b9e95e9ab5e.tar.gz tdelibs-54578ce023227543f531a56fcc178b9e95e9ab5e.zip | |
Add mimeTypePtrFast method to KFileItem
This relates to Bug 699
Clean up a couple of minor build warnings
Classify usbmisc devices
Diffstat (limited to 'tdeio/tdefile')
| -rw-r--r-- | tdeio/tdefile/tdefiledetailview.cpp | 6 | ||||
| -rw-r--r-- | tdeio/tdefile/tdefileiconview.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp index e267bdb60..2f7166ed6 100644 --- a/tdeio/tdefile/tdefiledetailview.cpp +++ b/tdeio/tdefile/tdefiledetailview.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/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index 92bbeba41..d4be8a58f 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -611,7 +611,7 @@ void KFileIconView::slotPreviewResult( TDEIO::Job *job ) void KFileIconView::gotPreview( const KFileItem *item, const TQPixmap& pix ) { KFileIconViewItem *it = viewItem( item ); - if ( it ) + if ( it ) { if( item->overlays() & TDEIcon::HiddenOverlay ) { TQPixmap p( pix ); @@ -619,8 +619,10 @@ void KFileIconView::gotPreview( const KFileItem *item, const TQPixmap& pix ) TDEIconEffect::semiTransparent( p ); it->setPixmap( p ); } - else + else { it->setPixmap( pix ); + } + } } bool KFileIconView::canPreview( const KFileItem *item ) const |