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 54578ce023)
v3.5.13-sru
Timothy Pearson 10 years ago committed by Slávek Banko
parent c6c2d982c0
commit e25c6429ea

@ -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

@ -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

@ -523,27 +523,32 @@ TQString KFileItem::mimetype() const
TQString KFileItem::mimetypeFast() const
{
if (isMimeTypeKnown()) {
return mimetype();
}
else {
return m_pMimeType->name();
}
if (isMimeTypeKnown()) {
return mimetype();
}
else {
return m_pMimeType->name();
}
}
KMimeType::Ptr KFileItem::determineMimeType()
KMimeType::Ptr KFileItem::mimeTypePtrFast()
{
if ( !m_pMimeType || !m_bMimeTypeKnown )
{
bool isLocalURL;
KURL url = mostLocalURL(isLocalURL);
return m_pMimeType;
}
m_pMimeType = KMimeType::findByURL( url, m_fileMode, isLocalURL );
//kdDebug() << "finding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl;
m_bMimeTypeKnown = true;
}
KMimeType::Ptr KFileItem::determineMimeType()
{
if ( !m_pMimeType || !m_bMimeTypeKnown )
{
bool isLocalURL;
KURL url = mostLocalURL(isLocalURL);
m_pMimeType = KMimeType::findByURL( url, m_fileMode, isLocalURL );
//kdDebug() << "finding mimetype for " << url.url() << " : " << m_pMimeType->name() << endl;
m_bMimeTypeKnown = true;
}
return m_pMimeType;
return m_pMimeType;
}
bool KFileItem::isMimeTypeKnown() const

@ -320,6 +320,14 @@ public:
*/
TQString mimetypeFast() const;
/**
* Returns the mimetype of the file item.
* If @p _determineMimeTypeOnDemand was used in the constructor, this will return
* the mimetype as fast as possible at the expense of accuracy.
* @return the fast mime type
*/
KMimeType::Ptr mimeTypePtrFast();
/**
* Returns the mimetype of the file item.
* If _determineMimeTypeOnDemand was used in the constructor, this will determine

Loading…
Cancel
Save