From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:14:55 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- libkonq/favicons/favicons.cpp | 6 ++-- libkonq/favicons/favicons.h | 4 +-- libkonq/konq_dirpart.cc | 70 +++++++++++++++++++++--------------------- libkonq/konq_iconviewwidget.cc | 70 +++++++++++++++++++++--------------------- libkonq/konq_iconviewwidget.h | 2 +- libkonq/konq_pixmapprovider.cc | 6 ++-- libkonq/konq_popupmenu.cc | 2 +- libkonq/tdefileivi.cc | 64 +++++++++++++++++++------------------- libkonq/tdefileivi.h | 20 ++++++------ 9 files changed, 122 insertions(+), 122 deletions(-) (limited to 'libkonq') diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index 7bc0bbc22..234bcf19d 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -57,7 +57,7 @@ struct FaviconsModulePrivate FaviconsModule::FaviconsModule(const TQCString &obj) : KDEDModule(obj) { - // create our favicons folder so that KIconLoader knows about it + // create our favicons folder so that TDEIconLoader knows about it d = new FaviconsModulePrivate; d->faviconsDir = TDEGlobal::dirs()->saveLocation( "cache", "favicons/" ); d->faviconsDir.truncate(d->faviconsDir.length()-9); // Strip off "favicons/" @@ -229,8 +229,8 @@ void FaviconsModule::slotResult(TDEIO::Job *job) // Some sites have nasty 32x32 icons, according to the MS docs // IE ignores them, well, we scale them, otherwise the location // combo / menu will look quite ugly - if (io.image().width() != KIcon::SizeSmall || io.image().height() != KIcon::SizeSmall) - io.setImage(io.image().smoothScale(KIcon::SizeSmall, KIcon::SizeSmall)); + if (io.image().width() != TDEIcon::SizeSmall || io.image().height() != TDEIcon::SizeSmall) + io.setImage(io.image().smoothScale(TDEIcon::SizeSmall, TDEIcon::SizeSmall)); if (download.isHost) iconName = download.hostOrURL; diff --git a/libkonq/favicons/favicons.h b/libkonq/favicons/favicons.h index 72767f8de..e42dace1b 100644 --- a/libkonq/favicons/favicons.h +++ b/libkonq/favicons/favicons.h @@ -36,7 +36,7 @@ namespace TDEIO { class Job; } * the default icon for all URLs on the given host. In this case, the * second parameter is a host name, otherwise the second parameter is the * URL which is associated with the icon. The third parameter is the - * @ref KIconLoader friendly name of the downloaded icon, the same as + * @ref TDEIconLoader friendly name of the downloaded icon, the same as * @ref iconForURL will from now on return for any matching URL. * * @short KDED Module for favicons @@ -57,7 +57,7 @@ k_dcop: * been downloaded yet, TQString::null is returned. * * @param url the URL for which the icon is queried - * @return the icon name suitable to pass to @ref KIconLoader or + * @return the icon name suitable to pass to @ref TDEIconLoader or * TQString::null if no icon for this URL was found. */ TQString iconForURL(const KURL &url); diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 6d326d44e..ba89f52df 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -64,10 +64,10 @@ public: void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void) { - KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme(); + TDEIconTheme *root = TDEGlobal::instance()->iconLoader()->theme(); iconSize.resize(1); if (root) { - TQValueList avSizes = root->querySizes(KIcon::Desktop); + TQValueList avSizes = root->querySizes(TDEIcon::Desktop); kdDebug(1203) << "The icon theme handles the sizes:" << avSizes << endl; qHeapSort(avSizes); int oldSize = -1; @@ -95,10 +95,10 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void) } } } else { - iconSize.append(KIcon::SizeSmall); // 16 - iconSize.append(KIcon::SizeMedium); // 32 - iconSize.append(KIcon::SizeLarge); // 48 - iconSize.append(KIcon::SizeHuge); // 64 + iconSize.append(TDEIcon::SizeSmall); // 16 + iconSize.append(TDEIcon::SizeMedium); // 32 + iconSize.append(TDEIcon::SizeLarge); // 48 + iconSize.append(TDEIcon::SizeHuge); // 64 } kdDebug(1203) << "Using " << iconSize.count() << " icon sizes." << endl; } @@ -106,7 +106,7 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void) int KonqDirPart::KonqDirPartPrivate::findNearestIconSize(int preferred) { int s1 = iconSize[1]; - if (preferred == 0) return TDEGlobal::iconLoader()->currentSize(KIcon::Desktop); + if (preferred == 0) return TDEGlobal::iconLoader()->currentSize(TDEIcon::Desktop); if (preferred <= s1) return s1; for (uint i = 2; i <= iconSize.count(); i++) { if (preferred <= iconSize[i]) { @@ -175,18 +175,18 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) // Use these also if the icon theme is scalable. int i; d->iconSize[0] = 0; // Default value - d->iconSize[1] = KIcon::SizeSmall; // 16 - d->iconSize[2] = KIcon::SizeSmallMedium; // 22 - d->iconSize[3] = KIcon::SizeMedium; // 32 - d->iconSize[4] = KIcon::SizeLarge; // 48 - d->iconSize[5] = KIcon::SizeHuge; // 64 - d->iconSize[6] = KIcon::SizeEnormous; // 128 + d->iconSize[1] = TDEIcon::SizeSmall; // 16 + d->iconSize[2] = TDEIcon::SizeSmallMedium; // 22 + d->iconSize[3] = TDEIcon::SizeMedium; // 32 + d->iconSize[4] = TDEIcon::SizeLarge; // 48 + d->iconSize[5] = TDEIcon::SizeHuge; // 64 + d->iconSize[6] = TDEIcon::SizeEnormous; // 128 d->iconSize[7] = 192; d->iconSize[8] = 256; - KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme(); + TDEIconTheme *root = TDEGlobal::instance()->iconLoader()->theme(); if (root) { - TQValueList avSizes = root->querySizes(KIcon::Desktop); + TQValueList avSizes = root->querySizes(TDEIcon::Desktop); kdDebug(1203) << "the icon theme handles the following sizes:" << avSizes << endl; if (avSizes.count() < 10) { // Use the icon sizes supplied by the theme. @@ -213,10 +213,10 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) // Remove in KDE4 ... // These are here in the event subclasses access them. - m_iIconSize[1] = KIcon::SizeSmall; - m_iIconSize[2] = KIcon::SizeMedium; - m_iIconSize[3] = KIcon::SizeLarge; - m_iIconSize[4] = KIcon::SizeHuge; + m_iIconSize[1] = TDEIcon::SizeSmall; + m_iIconSize[2] = TDEIcon::SizeMedium; + m_iIconSize[3] = TDEIcon::SizeLarge; + m_iIconSize[4] = TDEIcon::SizeHuge; // ... up to here TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ), @@ -555,23 +555,23 @@ void KonqDirPart::slotIconSizeToggled( bool toggleOn ) if ( m_paDefaultIcons->isChecked() ) setIconSize(0); else if ( d->aEnormousIcons->isChecked() ) - setIconSize(d->findNearestIconSize(KIcon::SizeEnormous)); + setIconSize(d->findNearestIconSize(TDEIcon::SizeEnormous)); else if ( m_paHugeIcons->isChecked() ) - setIconSize(d->findNearestIconSize(KIcon::SizeHuge)); + setIconSize(d->findNearestIconSize(TDEIcon::SizeHuge)); else if ( m_paLargeIcons->isChecked() ) - setIconSize(d->findNearestIconSize(KIcon::SizeLarge)); + setIconSize(d->findNearestIconSize(TDEIcon::SizeLarge)); else if ( m_paMediumIcons->isChecked() ) - setIconSize(d->findNearestIconSize(KIcon::SizeMedium)); + setIconSize(d->findNearestIconSize(TDEIcon::SizeMedium)); else if ( d->aSmallMediumIcons->isChecked() ) - setIconSize(d->findNearestIconSize(KIcon::SizeSmallMedium)); + setIconSize(d->findNearestIconSize(TDEIcon::SizeSmallMedium)); else if ( m_paSmallIcons->isChecked() ) - setIconSize(d->findNearestIconSize(KIcon::SizeSmall)); + setIconSize(d->findNearestIconSize(TDEIcon::SizeSmall)); } void KonqDirPart::slotIncIconSize() { int s = m_pProps->iconSize(); - s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + s = s ? s : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); uint sizeIndex = 0; for ( uint idx = 1; idx < d->iconSize.count() ; ++idx ) if (s == d->iconSize[idx]) { @@ -587,7 +587,7 @@ void KonqDirPart::slotIncIconSize() void KonqDirPart::slotDecIconSize() { int s = m_pProps->iconSize(); - s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + s = s ? s : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); uint sizeIndex = 0; for ( uint idx = 1; idx < d->iconSize.count() ; ++idx ) if (s == d->iconSize[idx]) { @@ -603,17 +603,17 @@ void KonqDirPart::slotDecIconSize() // Only updates Actions, a GUI update is done in the views by reimplementing this void KonqDirPart::newIconSize( int size /*0=default, or 16,32,48....*/ ) { - int realSize = (size==0) ? TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ) : size; + int realSize = (size==0) ? TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ) : size; m_paDecIconSize->setEnabled(realSize > d->iconSize[1]); m_paIncIconSize->setEnabled(realSize < d->iconSize.back()); m_paDefaultIcons->setChecked(size == 0); - d->aEnormousIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeEnormous)); - m_paHugeIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeHuge)); - m_paLargeIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeLarge)); - m_paMediumIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeMedium)); - d->aSmallMediumIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeSmallMedium)); - m_paSmallIcons->setChecked(size == d->findNearestIconSize(KIcon::SizeSmall)); + d->aEnormousIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeEnormous)); + m_paHugeIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeHuge)); + m_paLargeIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeLarge)); + m_paMediumIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeMedium)); + d->aSmallMediumIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeSmallMedium)); + m_paSmallIcons->setChecked(size == d->findNearestIconSize(TDEIcon::SizeSmall)); } // Stores the new icon size and updates the GUI @@ -688,7 +688,7 @@ void KonqDirPart::slotFindClosed() void KonqDirPart::slotIconChanged( int group ) { - if (group != KIcon::Desktop) return; + if (group != TDEIcon::Desktop) return; adjustIconSizes(); } diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index cd349da99..ef727152c 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -115,7 +115,7 @@ struct KonqIconViewWidgetPrivate }; KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WFlags f, bool kdesktop ) - : KIconView( parent, name, f ), + : TDEIconView( 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 */ @@ -186,7 +186,7 @@ void KonqIconViewWidget::focusOutEvent( TQFocusEvent * ev ) // Matt Newell 2004-09-24 slotOnViewport(); - KIconView::focusOutEvent( ev ); + TDEIconView::focusOutEvent( ev ); } void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &name) @@ -196,7 +196,7 @@ void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &n 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, TDEIconView 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() ); kdDebug(1203)<<" fileItem->text() ;"<text()<loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() ); + TQMovie movie = TDEGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), TDEIcon::Desktop, d->pActiveItem->iconSize() ); if ( !movie.isNull() ) { delete d->m_movie; @@ -398,7 +398,7 @@ void KonqIconViewWidget::slotOnViewport() } #endif d->pActiveItem->refreshIcon( true ); - Q_ASSERT( d->pActiveItem->state() == KIcon::DefaultState ); + Q_ASSERT( d->pActiveItem->state() == TDEIcon::DefaultState ); //delete d->m_movie; //d->m_movie = 0L; // TODO a timer to delete the movie after some time if unused? @@ -427,10 +427,10 @@ void KonqIconViewWidget::slotPreview(const KFileItem *item, const TQPixmap &pix) KFileIVI* current = static_cast(it); if (current->item() == item) { - if (item->overlays() & KIcon::HiddenOverlay) { + if (item->overlays() & TDEIcon::HiddenOverlay) { TQPixmap p(pix); - KIconEffect::semiTransparent(p); + TDEIconEffect::semiTransparent(p); current->setThumbnailPixmap(p); } else { current->setThumbnailPixmap(pix); @@ -464,10 +464,10 @@ void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect ) // seems stopAnimation triggers one last update if ( d->pActiveItem && d->m_movie && d->pActiveItem->isAnimated() ) { const TQPixmap &frame = d->m_movie->framePixmap(); - // This can happen if the icon was scaled to the desired size, so KIconLoader + // This can happen if the icon was scaled to the desired size, so TDEIconLoader // will happily return a movie with different dimensions than the icon int iconSize=d->pActiveItem->iconSize(); - if (iconSize==0) iconSize = TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + if (iconSize==0) iconSize = TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); if ( frame.width() != iconSize || frame.height() != iconSize ) { d->pActiveItem->setAnimated( false ); d->m_movie->pause(); @@ -509,7 +509,7 @@ void KonqIconViewWidget::clear() { d->pFileTip->setItem( 0L ); stopImagePreview(); // Just in case - KIconView::clear(); + TDEIconView::clear(); d->pActiveItem = 0L; } @@ -524,7 +524,7 @@ void KonqIconViewWidget::takeItem( TQIconViewItem *item ) if ( d->pPreviewJob ) d->pPreviewJob->removeItem( static_cast(item)->item() ); - KIconView::takeItem( item ); + TDEIconView::takeItem( item ); } // Currently unused - remove in KDE 4.0 @@ -636,9 +636,9 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie if ( sizeChanged || previewSizeChanged ) { - int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); // choose spacing depending on font, but min 5 (due to KFileIVI move limit) - setSpacing( ( m_bDesktop || ( realSize > KIcon::SizeSmall ) ) ? + setSpacing( ( m_bDesktop || ( realSize > TDEIcon::SizeSmall ) ) ? QMAX( 5, TQFontMetrics(font()).width('n') ) : 0 ); } @@ -707,7 +707,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString void KonqIconViewWidget::setItemTextPos( ItemTextPos pos ) { // can't call gridXValue() because this already would need the new itemTextPos() - int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); if ( m_bSetGridX ) if ( pos == TQIconView::Bottom ) @@ -718,14 +718,14 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos ) setGridX( -1 ); } - KIconView::setItemTextPos( pos ); + TDEIconView::setItemTextPos( pos ); } void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy, int* nx, int* ny ) { int previewSize = previewIconSize( m_size ); - int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); // Grid size // as KFileIVI limits to move an icon to x >= 5, y >= 5, we define a grid cell as: @@ -786,7 +786,7 @@ void KonqIconViewWidget::calculateGridX() int KonqIconViewWidget::gridXValue() const { // this method is only used in konqi as filemanager (not desktop) - int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); int newGridX; if ( itemTextPos() == TQIconView::Bottom ) @@ -858,7 +858,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force ) return; // don't start the preview job if not really necessary } - int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); int size; d->bBoostPreview = boostPreview(); @@ -1017,7 +1017,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e ) } } - KIconView::contentsDragEnterEvent( e ); + TDEIconView::contentsDragEnterEvent( e ); emit dragEntered( true /*accepted*/ ); } @@ -1039,13 +1039,13 @@ void KonqIconViewWidget::contentsDragMoveEvent( TQDragMoveEvent *e ) return; } emit dragMove( true ); - KIconView::contentsDragMoveEvent( e ); + TDEIconView::contentsDragMoveEvent( e ); } void KonqIconViewWidget::contentsDragLeaveEvent( TQDragLeaveEvent *e ) { d->bProgramsURLdrag = false; - KIconView::contentsDragLeaveEvent(e); + TDEIconView::contentsDragLeaveEvent(e); emit dragLeft(); } @@ -1231,7 +1231,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) } } d->renameItem= false; - KIconView::contentsMouseMoveEvent( e ); + TDEIconView::contentsMouseMoveEvent( e ); } void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) @@ -1252,7 +1252,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) // First we need to call TQIconView though, to clear the drag shape bool bMovable = itemsMovable(); setItemsMovable(false); // hack ? call it what you want :-) - KIconView::contentsDropEvent( ev ); + TDEIconView::contentsDropEvent( ev ); setItemsMovable(bMovable); TQValueList lst; @@ -1260,7 +1260,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) } else { - KIconView::contentsDropEvent( ev ); + TDEIconView::contentsDropEvent( ev ); emit dropped(); // What is this for ? (David) KDE4: remove } // Don't do this here, it's too early ! @@ -1302,7 +1302,7 @@ void KonqIconViewWidget::doubleClickTimeout() else { TQMouseEvent e( TQEvent::MouseMove,d->mousePos , 1, d->mouseState); - KIconView::contentsMousePressEvent( &e ); + TDEIconView::contentsMousePressEvent( &e ); } if( d->pActivateDoubleClick->isActive() ) d->pActivateDoubleClick->stop(); @@ -1330,7 +1330,7 @@ void KonqIconViewWidget::wheelEvent(TQWheelEvent* e) return; } - KIconView::wheelEvent(e); + TDEIconView::wheelEvent(e); } void KonqIconViewWidget::leaveEvent( TQEvent *e ) @@ -1338,7 +1338,7 @@ void KonqIconViewWidget::leaveEvent( TQEvent *e ) // when leaving the widget, stop possible pending filetip and icon effect slotOnViewport(); - KIconView::leaveEvent(e); + TDEIconView::leaveEvent(e); } void KonqIconViewWidget::mousePressChangeValue() @@ -1393,13 +1393,13 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e ) mousePressChangeValue(); if(d->pActivateDoubleClick && d->pActivateDoubleClick->isActive()) d->pActivateDoubleClick->stop(); - KIconView::contentsMousePressEvent( e ); + TDEIconView::contentsMousePressEvent( e ); } void KonqIconViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { - KIconView::contentsMouseReleaseEvent( e ); + TDEIconView::contentsMouseReleaseEvent( e ); if(d->releaseMouseEvent && d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ()) d->pActivateDoubleClick->stop(); slotSelectionChanged(); @@ -1475,7 +1475,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item) if (!m_IconRect.isValid()) { - KIconView::insertInGrid(item); + TDEIconView::insertInGrid(item); return; } @@ -1564,7 +1564,7 @@ void KonqIconViewWidget::lineupIcons() return; } - int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); typedef TQValueList Bin; Bin*** bins = new Bin**[nx]; @@ -1809,7 +1809,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) int KonqIconViewWidget::largestPreviewIconSize( int size ) const { - int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); if (iconSize < 28) return 48; @@ -1825,7 +1825,7 @@ int KonqIconViewWidget::largestPreviewIconSize( int size ) const int KonqIconViewWidget::previewIconSize( int size ) const { - int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); if (!d->bBoostPreview) return iconSize; @@ -1849,7 +1849,7 @@ void KonqIconViewWidget::visualActivate(TQIconViewItem * item) rect.moveBy( -contentsX(), -contentsY() ); if (TDEGlobalSettings::showKonqIconActivationEffect() == true) { - KIconEffect::visualActivate(viewport(), rect, item->pixmap()); + TDEIconEffect::visualActivate(viewport(), rect, item->pixmap()); } } diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h index c7c280ca6..d4adf7ed5 100644 --- a/libkonq/konq_iconviewwidget.h +++ b/libkonq/konq_iconviewwidget.h @@ -39,7 +39,7 @@ namespace TDEIO { class Job; } * Used by kdesktop and konq_iconview. * */ -class LIBKONQ_EXPORT KonqIconViewWidget : public KIconView +class LIBKONQ_EXPORT KonqIconViewWidget : public TDEIconView { Q_OBJECT TQ_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst ) diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 72f24b8c6..59e58f33a 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -162,7 +162,7 @@ void KonqPixmapProvider::clear() TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon, int size ) { - if ( size <= KIcon::SizeSmall ) + if ( size <= TDEIcon::SizeSmall ) return SmallIcon( icon, size ); KURL u; @@ -177,7 +177,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon if ( url.startsWith( "http:/" ) && icon.startsWith("favicons/") ) { TQPixmap small = SmallIcon( icon, size ); big = TDEGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"), - KIcon::Panel, size ); + TDEIcon::Panel, size ); int x = big.width() - small.width(); int y = 0; @@ -195,7 +195,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon } else // not a favicon.. - big = TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size ); + big = TDEGlobal::iconLoader()->loadIcon( icon, TDEIcon::Panel, size ); return big; } diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 8dea08489..619cc6c54 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -924,7 +924,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( menu == m_menuElement ) // no submenu -> prefix single offer actionName = i18n( "Open with %1" ).arg( actionName ); - act = new TDEAction( actionName, (*it)->pixmap( KIcon::Small ), 0, + act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), &m_ownActions, nam.prepend( "appservice_" ) ); addAction( act, menu ); diff --git a/libkonq/tdefileivi.cc b/libkonq/tdefileivi.cc index f38fd766d..e91bf359b 100644 --- a/libkonq/tdefileivi.cc +++ b/libkonq/tdefileivi.cc @@ -49,8 +49,8 @@ struct KFileIVI::Private }; KFileIVI::KFileIVI( KonqIconViewWidget *iconview, KFileItem* fileitem, int size ) - : KIconViewItem( iconview, fileitem->text() ), - m_size( size ), m_state( KIcon::DefaultState ), + : TDEIconViewItem( iconview, fileitem->text() ), + m_size( size ), m_state( TDEIcon::DefaultState ), m_bDisabled( false ), m_bThumbnail( false ), m_fileitem( fileitem ) { d = new KFileIVI::Private; @@ -86,20 +86,20 @@ void KFileIVI::invalidateThumb( int state, bool redraw ) TQIconSet::Mode mode; switch( state ) { - case KIcon::DisabledState: + case TDEIcon::DisabledState: mode = TQIconSet::Disabled; break; - case KIcon::ActiveState: + case TDEIcon::ActiveState: mode = TQIconSet::Active; break; - case KIcon::DefaultState: + case TDEIcon::DefaultState: default: mode = TQIconSet::Normal; break; } d->icons = TQIconSet(); d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()-> - apply( d->thumb, KIcon::Desktop, state ), + apply( d->thumb, TDEIcon::Desktop, state ), TQIconSet::Large, mode ); m_state = state; @@ -112,7 +112,7 @@ void KFileIVI::setIcon( int size, int state, bool recalc, bool redraw ) m_size = size; m_bThumbnail = false; if ( m_bDisabled ) - m_state = KIcon::DisabledState; + m_state = TDEIcon::DisabledState; else m_state = state; @@ -121,7 +121,7 @@ void KFileIVI::setIcon( int size, int state, bool recalc, bool redraw ) else { int halfSize; if (m_size == 0) { - halfSize = IconSize(KIcon::Desktop) / 2; + halfSize = IconSize(TDEIcon::Desktop) / 2; } else { halfSize = m_size / 2; } @@ -165,13 +165,13 @@ void KFileIVI::setPixmapDirect( const TQPixmap& pixmap, bool recalc, bool redraw TQIconSet::Mode mode; switch( m_state ) { - case KIcon::DisabledState: + case TDEIcon::DisabledState: mode = TQIconSet::Disabled; break; - case KIcon::ActiveState: + case TDEIcon::ActiveState: mode = TQIconSet::Active; break; - case KIcon::DefaultState: + case TDEIcon::DefaultState: default: mode = TQIconSet::Normal; break; @@ -193,9 +193,9 @@ void KFileIVI::setDisabled( bool disabled ) if ( m_bDisabled != disabled ) { m_bDisabled = disabled; - bool active = ( m_state == KIcon::ActiveState ); - setEffect( m_bDisabled ? KIcon::DisabledState : - ( active ? KIcon::ActiveState : KIcon::DefaultState ) ); + bool active = ( m_state == TDEIcon::ActiveState ); + setEffect( m_bDisabled ? TDEIcon::DisabledState : + ( active ? TDEIcon::ActiveState : TDEIcon::DefaultState ) ); } } @@ -207,10 +207,10 @@ void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap ) // so we just create a blank TQIconSet here d->icons = TQIconSet(); d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()-> - apply( pixmap, KIcon::Desktop, KIcon::DefaultState ), + apply( pixmap, TDEIcon::Desktop, TDEIcon::DefaultState ), TQIconSet::Large, TQIconSet::Normal ); - m_state = KIcon::DefaultState; + m_state = TDEIcon::DefaultState; // Recalc when setting this pixmap! updatePixmapSize(); @@ -221,9 +221,9 @@ void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap ) void KFileIVI::setActive( bool active ) { if ( active ) - setEffect( KIcon::ActiveState ); + setEffect( TDEIcon::ActiveState ); else - setEffect( m_bDisabled ? KIcon::DisabledState : KIcon::DefaultState ); + setEffect( m_bDisabled ? TDEIcon::DisabledState : TDEIcon::DefaultState ); } void KFileIVI::setEffect( int state ) @@ -231,41 +231,41 @@ void KFileIVI::setEffect( int state ) TQIconSet::Mode mode; switch( state ) { - case KIcon::DisabledState: + case TDEIcon::DisabledState: mode = TQIconSet::Disabled; break; - case KIcon::ActiveState: + case TDEIcon::ActiveState: mode = TQIconSet::Active; break; - case KIcon::DefaultState: + case TDEIcon::DefaultState: default: mode = TQIconSet::Normal; break; } // Do not update if the fingerprint is identical (prevents flicker)! - KIconEffect *effect = TDEGlobal::iconLoader()->iconEffect(); + TDEIconEffect *effect = TDEGlobal::iconLoader()->iconEffect(); - bool haveEffect = effect->hasEffect( KIcon::Desktop, m_state ) != - effect->hasEffect( KIcon::Desktop, state ); + bool haveEffect = effect->hasEffect( TDEIcon::Desktop, m_state ) != + effect->hasEffect( TDEIcon::Desktop, state ); //kdDebug(1203) << "desktop;defaultstate=" << - // effect->fingerprint(KIcon::Desktop, KIcon::DefaultState) << + // effect->fingerprint(TDEIcon::Desktop, TDEIcon::DefaultState) << // endl; //kdDebug(1203) << "desktop;activestate=" << - // effect->fingerprint(KIcon::Desktop, KIcon::ActiveState) << + // effect->fingerprint(TDEIcon::Desktop, TDEIcon::ActiveState) << // endl; if( haveEffect && - effect->fingerprint( KIcon::Desktop, m_state ) != - effect->fingerprint( KIcon::Desktop, state ) ) + effect->fingerprint( TDEIcon::Desktop, m_state ) != + effect->fingerprint( TDEIcon::Desktop, state ) ) { // Effects on are not applied until they are first accessed to // save memory. Do this now when needed if( m_bThumbnail ) { if( d->icons.isGenerated( TQIconSet::Large, mode ) ) - d->icons.setPixmap( effect->apply( d->thumb, KIcon::Desktop, state ), + d->icons.setPixmap( effect->apply( d->thumb, TDEIcon::Desktop, state ), TQIconSet::Large, mode ); } else @@ -373,7 +373,7 @@ void KFileIVI::paintItem( TQPainter *p, const TQColorGroup &c ) p->setFont( f ); }*/ - KIconViewItem::paintItem( p, cg ); + TDEIconViewItem::paintItem( p, cg ); paintOverlay(p); } @@ -427,7 +427,7 @@ void KFileIVI::setMouseOverAnimation( const TQString& movieFileName ) { if ( !movieFileName.isEmpty() ) { - //kdDebug(1203) << "KIconViewItem::setMouseOverAnimation " << movieFileName << endl; + //kdDebug(1203) << "TDEIconViewItem::setMouseOverAnimation " << movieFileName << endl; d->m_animatedIcon = movieFileName; } } @@ -459,7 +459,7 @@ int KFileIVI::compare( TQIconViewItem *i ) const void KFileIVI::updatePixmapSize() { int size = m_size ? m_size : - TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); + TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); KonqIconViewWidget* view = static_cast( iconView() ); diff --git a/libkonq/tdefileivi.h b/libkonq/tdefileivi.h index e9e0cf420..9d940a023 100644 --- a/libkonq/tdefileivi.h +++ b/libkonq/tdefileivi.h @@ -30,12 +30,12 @@ class KIVDirectoryOverlay; /** * KFileIVI (short form of "Konq - File - IconViewItem") - * is, as expected, an improved KIconViewItem, because + * is, as expected, an improved TDEIconViewItem, 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 TDEIconViewItem { public: /** @@ -67,12 +67,12 @@ public: /** * Changes the icon for this item. * @param size the icon size (0 for default, otherwise size in pixels) - * @param state the state of the icon (enum in KIcon) + * @param state the state of the icon (enum in TDEIcon) * @param recalc whether to update the layout of the icon view when setting the icon * @param redraw whether to redraw the item after setting the icon */ virtual void setIcon( int size, - int state=KIcon::DefaultState, + int state=TDEIcon::DefaultState, bool recalc=false, bool redraw=false); @@ -92,7 +92,7 @@ public: * e.g. because the effect settings have been changed. The thumb itself * is assumed to be still valid (use setThumbnailPixmap() instead * otherwise). - * @param state the state of the icon (enum in KIcon) + * @param state the state of the icon (enum in TDEIcon) * @param redraw whether to redraw the item after setting the icon */ void invalidateThumb( int state, bool redraw = false ); @@ -108,7 +108,7 @@ public: /** * Return the current state of the icon - * (KIcon::DefaultState, KIcon::ActiveState etc.) + * (TDEIcon::DefaultState, TDEIcon::ActiveState etc.) */ int state() const { return m_state; } @@ -128,8 +128,8 @@ public: void setThumbnailPixmap( const TQPixmap & pixmap ); /** - * Set the icon to use the specified KIconEffect - * See the docs for KIconEffect for details. + * Set the icon to use the specified TDEIconEffect + * See the docs for TDEIconEffect for details. */ void setEffect( /*int group,*/ int state ); @@ -214,9 +214,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 TQPixmap & icon ) { KIconViewItem::setPixmap( icon ); } + virtual void setPixmap ( const TQPixmap & icon ) { TDEIconViewItem::setPixmap( icon ); } virtual void setPixmap ( const TQPixmap & icon, bool recalc, bool redraw = TRUE ) - { KIconViewItem::setPixmap( icon, recalc, redraw ); } + { TDEIconViewItem::setPixmap( icon, recalc, redraw ); } /** Check if a thumbnail will be generated and calc the size of the icon */ void updatePixmapSize(); -- cgit v1.2.1