kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

adapt to new kdelibs api (k*iconview* -> k3*iconview*)

Browse source 
svn path=/trunk/KDE/kdebase/kdepasswd/; revision=518154
This commit is contained in:
Laurent Montel 2006-03-13 09:56:18 +00:00
parent 76f32107e9
commit 009b6b4b5a
7 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdepasswd/kcm/chfacedlg.cpp
View file

@ -66,7 +66,7 @@ ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name,
QLabel *header = new QLabel( i18n("Select a new face:"), page );
top->addWidget( header );
m_FacesWidget = new KIconView( page );
m_FacesWidget = new K3IconView( page );
m_FacesWidget->setSelectionMode( Q3IconView::Single );
m_FacesWidget->setItemsMovable( false );
m_FacesWidget->setMinimumSize( 400, 200 );

2
kdepasswd/kcm/chfacedlg.h
View file

@ -65,7 +65,7 @@ private Q_SLOTS:
private:
void addCustomPixmap( QString imPath, bool saveCopy );
KIconView *m_FacesWidget;
K3IconView *m_FacesWidget;
};
#endif // CHFACEDLG_H

2
kdepasswd/kcm/kcm_useraccount.kcfg
View file

@ -37,7 +37,7 @@
<default>$HOME/.face.icon</default>
</entry>
<entry name="CustomKey" type="String">
<label>Sort key for KIconViewItems</label>
<label>Sort key for K3IconViewItems</label>
<default>Zz_custom</default>
</entry>
</group>

6
lib/konq/kfileivi.cc
View file

@ -58,7 +58,7 @@ struct KFileIVI::Private
};
KFileIVI::KFileIVI( KonqIconViewWidget *iconview, KFileItem* fileitem, int size )
: KIconViewItem( iconview, fileitem->text() ),
: K3IconViewItem( iconview, fileitem->text() ),
m_size( size ), m_state( KIcon::DefaultState ),
m_bDisabled( false ), m_bThumbnail( false ), m_fileitem( fileitem )
{
@ -371,7 +371,7 @@ void KFileIVI::paintItem( QPainter *p, const QColorGroup &c )
p->setFont( f );
}*/
KIconViewItem::paintItem( p, cg );
K3IconViewItem::paintItem( p, cg );
paintOverlay(p);
}
@ -425,7 +425,7 @@ void KFileIVI::setMouseOverAnimation( const QString& movieFileName )
{
if ( !movieFileName.isEmpty() )
{
//kDebug(1203) << "KIconViewItem::setMouseOverAnimation " << movieFileName << endl;
//kDebug(1203) << "K3IconViewItem::setMouseOverAnimation " << movieFileName << endl;
d->m_animatedIcon = movieFileName;
}
}

8
lib/konq/kfileivi.h
View file

@ -34,12 +34,12 @@ class KIVDirectoryOverlay;
/**
* KFileIVI (short form of "Konq - File - IconViewItem")
* is, as expected, an improved KIconViewItem, because
* is, as expected, an improved K3IconViewItem, because
* it represents a file.
* All the information about the file is contained in the KFileItem
* pointer.
*/
class LIBKONQ_EXPORT KFileIVI : public KIconViewItem
class LIBKONQ_EXPORT KFileIVI : public K3IconViewItem
{
public:
/**
@ -218,9 +218,9 @@ protected:
private:
/** You are not supposed to call this on a KFileIVI, from the outside,
* it bypasses the icons cache */
virtual void setPixmap ( const QPixmap & icon ) { KIconViewItem::setPixmap( icon ); }
virtual void setPixmap ( const QPixmap & icon ) { K3IconViewItem::setPixmap( icon ); }
virtual void setPixmap ( const QPixmap & icon, bool recalc, bool redraw = true )
{ KIconViewItem::setPixmap( icon, recalc, redraw ); }
{ K3IconViewItem::setPixmap( icon, recalc, redraw ); }
/** Check if a thumbnail will be generated and calc the size of the icon */
void updatePixmapSize();

36
lib/konq/konq_iconviewwidget.cc
View file

@ -127,7 +127,7 @@ struct KonqIconViewWidgetPrivate
};
KonqIconViewWidget::KonqIconViewWidget( QWidget * parent, const char * name, Qt::WFlags f, bool kdesktop )
: KIconView( parent, name, f ),
: K3IconView( parent, name, f ),
m_rootItem( 0L ), m_size( 0 ) /* default is DesktopIcon size */,
m_bDesktop( kdesktop ),
m_bSetGridX( !kdesktop ) /* No line breaking on the desktop */
@ -198,7 +198,7 @@ void KonqIconViewWidget::focusOutEvent( QFocusEvent * ev )
// Matt Newell 2004-09-24
slotOnViewport();
KIconView::focusOutEvent( ev );
K3IconView::focusOutEvent( ev );
}
void KonqIconViewWidget::slotItemRenamed(Q3IconViewItem *item, const QString &name)
@ -208,7 +208,7 @@ void KonqIconViewWidget::slotItemRenamed(Q3IconViewItem *item, const QString &na
KFileItem *fileItem = viewItem->item();
// The correct behavior is to show the old name until the rename has successfully
// completed. Unfortunately, KIconView forces us to allow the text to be changed
// completed. Unfortunately, K3IconView forces us to allow the text to be changed
// before we try the rename, so set it back to the pre-rename state.
viewItem->setText( fileItem->text() );
kDebug(1203)<<" fileItem->text() ;"<<fileItem->text()<<endl;
@ -506,7 +506,7 @@ void KonqIconViewWidget::clear()
{
d->pFileTip->setItem( 0L );
stopImagePreview(); // Just in case
KIconView::clear();
K3IconView::clear();
d->pActiveItem = 0L;
}
@ -521,7 +521,7 @@ void KonqIconViewWidget::takeItem( Q3IconViewItem *item )
if ( d->pPreviewJob )
d->pPreviewJob->removeItem( static_cast<KFileIVI *>(item)->item() );
KIconView::takeItem( item );
K3IconView::takeItem( item );
}
// Currently unused - remove in KDE 4.0
@ -707,7 +707,7 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
setGridX( -1 );
}
KIconView::setItemTextPos( pos );
K3IconView::setItemTextPos( pos );
}
void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
@ -1005,7 +1005,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( QDragEnterEvent *e )
return;
}
KIconView::contentsDragEnterEvent( e );
K3IconView::contentsDragEnterEvent( e );
emit dragEntered( true /*accepted*/ );
}
@ -1027,13 +1027,13 @@ void KonqIconViewWidget::contentsDragMoveEvent( QDragMoveEvent *e )
return;
}
emit dragMove( true );
KIconView::contentsDragMoveEvent( e );
K3IconView::contentsDragMoveEvent( e );
}
void KonqIconViewWidget::contentsDragLeaveEvent( QDragLeaveEvent *e )
{
d->bProgramsURLdrag = false;
KIconView::contentsDragLeaveEvent(e);
K3IconView::contentsDragLeaveEvent(e);
emit dragLeft();
}
@ -1218,7 +1218,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( QMouseEvent *e )
}
}
d->renameItem= false;
KIconView::contentsMouseMoveEvent( e );
K3IconView::contentsMouseMoveEvent( e );
}
void KonqIconViewWidget::contentsDropEvent( QDropEvent * ev )
@ -1239,7 +1239,7 @@ void KonqIconViewWidget::contentsDropEvent( QDropEvent * ev )
// First we need to call QIconView though, to clear the drag shape
bool bMovable = itemsMovable();
setItemsMovable(false); // hack ? call it what you want :-)
KIconView::contentsDropEvent( ev );
K3IconView::contentsDropEvent( ev );
setItemsMovable(bMovable);
QList<Q3IconDragItem> lst;
@ -1247,7 +1247,7 @@ void KonqIconViewWidget::contentsDropEvent( QDropEvent * ev )
}
else
{
KIconView::contentsDropEvent( ev );
K3IconView::contentsDropEvent( ev );
emit dropped(); // What is this for ? (David) KDE4: remove
}
// Don't do this here, it's too early !
@ -1289,7 +1289,7 @@ void KonqIconViewWidget::doubleClickTimeout()
else
{
QMouseEvent e( QEvent::MouseMove,d->mousePos , 1, d->mouseState);
KIconView::contentsMousePressEvent( &e );
K3IconView::contentsMousePressEvent( &e );
}
if( d->pActivateDoubleClick->isActive() )
d->pActivateDoubleClick->stop();
@ -1317,7 +1317,7 @@ void KonqIconViewWidget::wheelEvent(QWheelEvent* e)
return;
}
KIconView::wheelEvent(e);
K3IconView::wheelEvent(e);
}
void KonqIconViewWidget::leaveEvent( QEvent *e )
@ -1325,7 +1325,7 @@ void KonqIconViewWidget::leaveEvent( QEvent *e )
// when leaving the widget, stop possible pending filetip
d->pFileTip->setItem( 0 );
KIconView::leaveEvent(e);
K3IconView::leaveEvent(e);
}
void KonqIconViewWidget::mousePressChangeValue()
@ -1380,13 +1380,13 @@ void KonqIconViewWidget::contentsMousePressEvent( QMouseEvent *e )
mousePressChangeValue();
if(d->pActivateDoubleClick && d->pActivateDoubleClick->isActive())
d->pActivateDoubleClick->stop();
KIconView::contentsMousePressEvent( e );
K3IconView::contentsMousePressEvent( e );
}
void KonqIconViewWidget::contentsMouseReleaseEvent( QMouseEvent *e )
{
KIconView::contentsMouseReleaseEvent( e );
K3IconView::contentsMouseReleaseEvent( e );
if(d->releaseMouseEvent && d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ())
d->pActivateDoubleClick->stop();
slotSelectionChanged();
@ -1462,7 +1462,7 @@ void KonqIconViewWidget::insertInGrid(Q3IconViewItem *item)
if (!m_IconRect.isValid())
{
KIconView::insertInGrid(item);
K3IconView::insertInGrid(item);
return;
}

2
lib/konq/konq_iconviewwidget.h
View file

@ -50,7 +50,7 @@ namespace KIO { class Job; }
* Used by kdesktop and konq_iconview.
*
*/
class LIBKONQ_EXPORT KonqIconViewWidget : public KIconView
class LIBKONQ_EXPORT KonqIconViewWidget : public K3IconView
{
Q_OBJECT
Q_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst )